Build workspace packages in top-sorted order

bin/src/Main.purs

@@ -819,10 +819,9 @@ mkReplEnv replArgs dependencies = do
 
   purs <- Purs.getPurs
 
-  let
-    selected = case workspace.selected of
-      Just s -> [ s ]
-      Nothing -> Config.getWorkspacePackages workspace.packageSet
+  selected <- case workspace.selected of
+    Just s -> pure s
+    Nothing -> die "The REPL requires you to select a package"
 
   pure
     { purs

src/Spago/Command/Build.purs

@@ -116,16 +116,6 @@ run opts = do
         runCommands "Then" thenCommands
   -}
 
-  let
-    globs = getBuildGlobs
-      { dependencies
-      , depsOnly: opts.depsOnly
-      , withTests: true
-      , selected: case workspace.selected of
-          Just p -> [ p ]
-          Nothing -> Config.getWorkspacePackages workspace.packageSet
-      }
-
   when (isJust $ Cmd.findFlag { flags: [ "-g", "--codegen" ], args: opts.pursArgs }) do
     die
       [ "Can't pass the `--codegen` option to purs, Spago already does that for you."
@@ -140,29 +130,37 @@ run opts = do
           Nothing -> ",js,sourcemaps"
           Just _ -> ""
       ]
-  Psa.psaCompile globs args psaArgs psaOptions
-
-  buildBackend
-
-  when workspace.buildOptions.pedanticPackages do
-    logInfo $ "Looking for unused and undeclared transitive dependencies..."
-    errors <- case workspace.selected of
-      Just selected -> Graph.runGraphCheck selected globs opts.pursArgs
-      Nothing -> do
-        -- TODO: here we could go through all the workspace packages and run the check for each
-        -- The complication is that "dependencies" includes all the dependencies for all packages
-        map Array.fold $ for (Config.getWorkspacePackages workspace.packageSet) \selected -> do
-          Graph.runGraphCheck selected globs opts.pursArgs
-    unless (Array.null errors) do
-      die' errors
+
+  let
+    selectedPackages = case workspace.selected of
+      Just p -> [ p ]
+      Nothing -> Config.getToplogicallySortedWorkspacePackages workspace.packageSet
+
+  for_ selectedPackages \selected -> do
+    let
+      globs = getBuildGlobs
+        { dependencies
+        , depsOnly: opts.depsOnly
+        , withTests: true
+        , selected
+        }
+    Psa.psaCompile globs args psaArgs psaOptions
+
+    buildBackend
+
+    when workspace.buildOptions.pedanticPackages do
+      logInfo $ "Looking for unused and undeclared transitive dependencies..."
+      errors <- Graph.runGraphCheck selected globs opts.pursArgs
+      unless (Array.null errors) do
+        die' errors
 
 -- TODO: if we are building with all the packages (i.e. selected = Nothing),
 -- then we can use the graph to remove outdated modules from `output`!
 
 type BuildGlobsOptions =
   { withTests :: Boolean
   , depsOnly :: Boolean
-  , selected :: Array WorkspacePackage
+  , selected :: WorkspacePackage
   , dependencies :: Map PackageName Package
   }
 
@@ -171,11 +169,11 @@ getBuildGlobs { selected, dependencies, withTests, depsOnly } =
   Set.fromFoldable $ projectGlobs <> monorepoPkgGlobs <> dependencyGlobs <> [ BuildInfo.buildInfoPath ]
   where
   -- Here we select the right globs for a monorepo setup with a bunch of packages
-  projectGlobs = join case depsOnly of
+  projectGlobs = case depsOnly of
     true -> []
     false ->
       -- We just select all the workspace package globs, because it's (1) intuitive and (2) backwards compatible
-      map workspacePackageGlob selected
+      workspacePackageGlob selected
 
   testGlobs = case withTests of
     true -> WithTestGlobs

src/Spago/Command/Publish.purs

@@ -123,7 +123,7 @@ publish _args = do
     )
 
   -- We then need to check that the dependency graph is accurate. If not, queue the errors
-  let globs = Build.getBuildGlobs { selected: [ selected ], withTests: false, dependencies, depsOnly: false }
+  let globs = Build.getBuildGlobs { selected, withTests: false, dependencies, depsOnly: false }
   graphCheckErrors <- Graph.runGraphCheck selected globs []
   for_ graphCheckErrors addError
 

src/Spago/Command/Repl.purs

@@ -20,7 +20,7 @@ type ReplEnv a =
   , depsOnly :: Boolean
   , logOptions :: LogOptions
   , pursArgs :: Array String
-  , selected :: Array WorkspacePackage
+  , selected :: WorkspacePackage
   | a
   }
 

src/Spago/Command/Run.purs

@@ -101,7 +101,7 @@ run = do
           , depsOnly: false
           -- Here we include tests as well, because we use this code for `spago run` and `spago test`
           , withTests: true
-          , selected: [ selected ]
+          , selected
           }
       Purs.graph globs [] >>= case _ of
         Left err -> logWarn $ "Could not decode the output of `purs graph`, error: " <> CA.printJsonDecodeError err

src/Spago/Config.purs

@@ -13,6 +13,7 @@ module Spago.Config
   , getPackageLocation
   , fileSystemCharEscape
   , getWorkspacePackages
+  , getToplogicallySortedWorkspacePackages
   , module Core
   , readWorkspace
   , sourceGlob
@@ -28,6 +29,7 @@ import Data.CodePoint.Unicode as Unicode
 import Data.Codec.Argonaut.Record as CAR
 import Data.Enum as Enum
 import Data.Foldable as Foldable
+import Data.Graph as Graph
 import Data.HTTP.Method as Method
 import Data.Int as Int
 import Data.Map as Map
@@ -47,7 +49,7 @@ import Registry.PackageName as PackageName
 import Registry.Range as Range
 import Registry.Sha256 as Sha256
 import Registry.Version as Version
-import Spago.Core.Config as Core
+import Spago.Core.Config (BackendConfig, BuildOptionsInput, BundleConfig, BundlePlatform(..), BundleType(..), CensorBuildWarnings(..), Config, Dependencies(..), ExtraPackage(..), GitPackage, LegacyPackageSetEntry, LocalPackage, PackageConfig, PublishConfig, RemotePackage(..), RunConfig, SetAddress(..), ShowSourceCode(..), StatVerbosity(..), TestConfig, WorkspaceConfig, configCodec, dependenciesCodec, extraPackageCodec, gitPackageCodec, legacyPackageSetEntryCodec, localPackageCodec, packageConfigCodec, parseBundleType, parsePlatform, printSpagoRange, readConfig, remotePackageCodec, setAddressCodec, widestRange) as Core
 import Spago.FS as FS
 import Spago.Git as Git
 import Spago.Lock (Lockfile)
@@ -456,6 +458,31 @@ getWorkspacePackages = Array.mapMaybe extractWorkspacePackage <<< Map.toUnfoldab
     Tuple _ (WorkspacePackage p) -> Just p
     _ -> Nothing
 
+newtype With a b = With (Tuple a b)
+
+instance Eq b => Eq (With a b) where
+  eq (With (Tuple _ b1)) (With (Tuple _ b2)) = b1 == b2
+
+instance Ord b => Ord (With a b) where
+  compare (With (Tuple _ b1)) (With (Tuple _ b2)) = compare b1 b2
+
+derive instance Newtype (With a b) _
+derive instance Generic (With a b) _
+instance (Show a, Show b) => Show (With a b) where
+  show (With t) = "(With " <> show t <> ")"
+
+getToplogicallySortedWorkspacePackages :: PackageSet -> Array WorkspacePackage
+getToplogicallySortedWorkspacePackages packageSet = do
+  let
+    packageMap = Map.fromFoldable $ map (\p -> Tuple p.package.name p) $ getWorkspacePackages packageSet
+    dependenciesAsList p = Set.toUnfoldable $ Map.keys $ unwrap p.package.dependencies
+    topSortPkgs =
+      Array.fromFoldable
+        $ Graph.topologicalSort
+        $ Graph.fromMap
+        $ map (\p -> Tuple p $ dependenciesAsList p) packageMap
+  Array.mapMaybe (flip Map.lookup packageMap) topSortPkgs
+
 type PackageSetResult = { compiler :: Version, remotePackageSet :: Map PackageName Core.RemotePackage }
 
 packageSetResultCodec :: JsonCodec PackageSetResult