Run Spago from a nested directory other than workspace root

CHANGELOG.md

@@ -43,6 +43,8 @@ Other improvements:
 - When the `publish.location` field is missing, `spago publish` will attempt to
   figure out the location from Git remotes and write it back to `spago.yaml`.
 - Internally Spago uses stricter-typed file paths.
+- Spago can now be launched from a directory nested within the workspace, not
+  just from workspace root.
 - `spago install` warns the user when the installed versions of packages are outside
   their specified dependency ranges.
 - `spago publish` no longer tries to validate all workspace dependencies, but

bin/src/Main.purs

@@ -536,8 +536,7 @@ main = do
     \c -> Aff.launchAff_ case c of
       Cmd'SpagoCmd (SpagoCmd globalArgs@{ offline, migrateConfig } command) -> do
         logOptions <- mkLogOptions startingTime globalArgs
-        rootPath <- Path.mkRoot =<< Paths.cwd
-        runSpago { logOptions, rootPath } case command of
+        runSpago { logOptions } case command of
           Sources args -> do
             { env } <- mkFetchEnv
               { packages: mempty
@@ -552,6 +551,7 @@ main = do
             void $ runSpago env (Sources.run { json: args.json })
           Init args@{ useSolver } -> do
             -- Fetch the registry here so we can select the right package set later
+            rootPath <- Path.mkRoot =<< Paths.cwd
             env <- mkRegistryEnv offline <#> Record.union { rootPath }
             setVersion <- parseSetVersion args.setVersion
             void $ runSpago env $ Init.run { mode: args.mode, setVersion, useSolver }
@@ -599,7 +599,8 @@ main = do
             void $ runSpago publishEnv (Publish.publish {})
 
           Repl args@{ selectedPackage } -> do
-            packages <- FS.exists (rootPath </> "spago.yaml") >>= case _ of
+            cwd <- Paths.cwd
+            packages <- FS.exists (cwd </> "spago.yaml") >>= case _ of
               true -> do
                 -- if we have a config then we assume it's a workspace, and we can run a repl in the project
                 pure mempty -- TODO newPackages
@@ -661,13 +662,14 @@ main = do
               testEnv <- runSpago env (mkTestEnv args buildEnv)
               runSpago testEnv Test.run
           LsPaths args -> do
-            runSpago { logOptions, rootPath } $ Ls.listPaths args
+            let fetchArgs = { packages: mempty, selectedPackage: Nothing, pure: false, ensureRanges: false, testDeps: false, isRepl: false, migrateConfig, offline }
+            { env } <- mkFetchEnv fetchArgs
+            runSpago env $ Ls.listPaths args
           LsPackages args@{ pure } -> do
             let fetchArgs = { packages: mempty, selectedPackage: Nothing, pure, ensureRanges: false, testDeps: false, isRepl: false, migrateConfig, offline }
-            { env: env@{ workspace }, fetchOpts } <- mkFetchEnv fetchArgs
+            { env, fetchOpts } <- mkFetchEnv fetchArgs
             dependencies <- runSpago env (Fetch.run fetchOpts)
-            let lsEnv = { workspace, dependencies, logOptions, rootPath }
-            runSpago lsEnv (Ls.listPackageSet args)
+            runSpago (Record.union env { dependencies }) (Ls.listPackageSet args)
           LsDeps { selectedPackage, json, transitive, pure } -> do
             let fetchArgs = { packages: mempty, selectedPackage, pure, ensureRanges: false, testDeps: false, isRepl: false, migrateConfig, offline }
             { env, fetchOpts } <- mkFetchEnv fetchArgs
@@ -690,13 +692,11 @@ main = do
           GraphModules args -> do
             { env, fetchOpts } <- mkFetchEnv { packages: mempty, selectedPackage: Nothing, pure: false, ensureRanges: false, testDeps: false, isRepl: false, migrateConfig, offline }
             dependencies <- runSpago env (Fetch.run fetchOpts)
-            purs <- Purs.getPurs
-            runSpago { dependencies, logOptions, rootPath, purs, workspace: env.workspace } (Graph.graphModules args)
+            runSpago (Record.union env { dependencies }) (Graph.graphModules args)
           GraphPackages args -> do
             { env, fetchOpts } <- mkFetchEnv { packages: mempty, selectedPackage: Nothing, pure: false, ensureRanges: false, testDeps: false, isRepl: false, migrateConfig, offline }
             dependencies <- runSpago env (Fetch.run fetchOpts)
-            purs <- Purs.getPurs
-            runSpago { dependencies, logOptions, rootPath, purs, workspace: env.workspace } (Graph.graphPackages args)
+            runSpago (Record.union env { dependencies }) (Graph.graphPackages args)
 
       Cmd'VersionCmd v -> when v do
         output (OutputLines [ BuildInfo.packages."spago-bin" ])
@@ -951,7 +951,14 @@ mkReplEnv replArgs dependencies supportPackage = do
     , selected
     }
 
-mkFetchEnv :: forall a b. { offline :: OnlineStatus, migrateConfig :: Boolean, isRepl :: Boolean | FetchArgsRow b } -> Spago (SpagoBaseEnv a) { env :: Fetch.FetchEnv (), fetchOpts :: Fetch.FetchOpts }
+mkFetchEnv
+  :: ∀ a b
+   . { offline :: OnlineStatus
+     , migrateConfig :: Boolean
+     , isRepl :: Boolean
+     | FetchArgsRow b
+     }
+  -> Spago { logOptions :: LogOptions | a } { env :: Fetch.FetchEnv (), fetchOpts :: Fetch.FetchOpts }
 mkFetchEnv args@{ migrateConfig, offline } = do
   let
     parsePackageName p =
@@ -966,24 +973,26 @@ mkFetchEnv args@{ migrateConfig, offline } = do
     Left _err -> die $ "Failed to parse selected package name, was: " <> show args.selectedPackage
 
   env <- mkRegistryEnv offline
-  { rootPath } <- ask
-  workspace <-
-    runSpago (Record.union env { rootPath })
-      (Config.readWorkspace { maybeSelectedPackage, pureBuild: args.pure, migrateConfig })
+  cwd <- Paths.cwd
+  { workspace, rootPath } <-
+    runSpago env
+      (Config.discoverWorkspace { maybeSelectedPackage, pureBuild: args.pure, migrateConfig } cwd)
+
+  FS.mkdirp $ rootPath </> Paths.localCachePath
+  FS.mkdirp $ rootPath </> Paths.localCachePackagesPath
+  logDebug $ "Workspace root path: " <> Path.quote rootPath
+  logDebug $ "Local cache: " <> Paths.localCachePath
+
   let fetchOpts = { packages: packageNames, ensureRanges: args.ensureRanges, isTest: args.testDeps, isRepl: args.isRepl }
   pure { fetchOpts, env: Record.union { workspace, rootPath } env }
 
 mkRegistryEnv :: forall a. OnlineStatus -> Spago (SpagoBaseEnv a) (Registry.RegistryEnv ())
 mkRegistryEnv offline = do
-  { logOptions, rootPath } <- ask
+  { logOptions } <- ask
 
   -- Take care of the caches
   FS.mkdirp Paths.globalCachePath
-  FS.mkdirp $ rootPath </> Paths.localCachePath
-  FS.mkdirp $ rootPath </> Paths.localCachePackagesPath
-  logDebug $ "Workspace root path: " <> Path.quote rootPath
   logDebug $ "Global cache: " <> Path.quote Paths.globalCachePath
-  logDebug $ "Local cache: " <> Paths.localCachePath
 
   -- Make sure we have git and purs
   git <- Git.getGit
@@ -1004,7 +1013,7 @@ mkRegistryEnv offline = do
     , db
     }
 
-mkLsEnv :: forall a. Fetch.PackageTransitiveDeps -> Spago (Fetch.FetchEnv a) Ls.LsEnv
+mkLsEnv :: ∀ a. Fetch.PackageTransitiveDeps -> Spago (Fetch.FetchEnv a) (Ls.LsEnv ())
 mkLsEnv dependencies = do
   { logOptions, workspace, rootPath } <- ask
   selected <- case workspace.selected of

core/src/Log.purs

@@ -22,7 +22,6 @@ module Spago.Log
   , rightOrDie
   , rightOrDie_
   , rightOrDieWith
-  , rightOrDieWith'
   , toDoc
   ) where
 
@@ -185,25 +184,18 @@ justOrDieWith' value msg = case value of
     die' msg
 
 rightOrDie :: ∀ b m err x. MonadEffect m => MonadAsk (LogEnv b) m => Loggable err => Either err x -> m x
-rightOrDie value = rightOrDieWith value identity
+rightOrDie = rightOrDieWith identity
 
 rightOrDie_ :: ∀ b m err x. MonadEffect m => MonadAsk (LogEnv b) m => Loggable err => Either err x -> m Unit
 rightOrDie_ = void <<< rightOrDie
 
-rightOrDieWith :: ∀ a b m err x. MonadEffect m => MonadAsk (LogEnv b) m => Loggable a => Either err x -> (err -> a) -> m x
-rightOrDieWith value toMsg = case value of
+rightOrDieWith :: ∀ a b m err x. MonadEffect m => MonadAsk (LogEnv b) m => Loggable a => (err -> a) -> Either err x -> m x
+rightOrDieWith toMsg value = case value of
   Right a ->
     pure a
   Left err ->
     die $ toMsg err
 
-rightOrDieWith' :: ∀ a b m err x. MonadEffect m => MonadAsk (LogEnv b) m => Loggable a => Either err x -> (err -> Array a) -> m x
-rightOrDieWith' value toMsg = case value of
-  Right a ->
-    pure a
-  Left err ->
-    die' $ toMsg err
-
 data OutputFormat a
   = OutputJson (CJ.Codec a) a
   | OutputYaml (CJ.Codec a) a

core/src/Prelude.purs

@@ -21,6 +21,7 @@ import Data.DateTime.Instant (Instant) as Extra
 import Data.Either (Either(..), isLeft, isRight, either, hush) as Extra
 import Data.Filterable (partition, partitionMap) as Extra
 import Data.Foldable (foldMap, for_, foldl, and, or) as Extra
+import Data.FoldableWithIndex (forWithIndex_) as Extra
 import Data.Function (on) as Extra
 import Data.Generic.Rep (class Generic) as Extra
 import Data.Identity (Identity(..)) as Extra
@@ -47,7 +48,7 @@ import Partial.Unsafe (unsafeCrashWith)
 import Registry.ManifestIndex (ManifestIndex) as Extra
 import Registry.Types (PackageName, Version, Range, Location, License, Manifest(..), Metadata(..), Sha256) as Extra
 import Spago.Json (printJson, parseJson) as Extra
-import Spago.Log (logDebug, logError, logInfo, Docc, logSuccess, logWarn, die, die', justOrDieWith, justOrDieWith', rightOrDie, rightOrDie_, rightOrDieWith, rightOrDieWith', toDoc, indent, indent2, output, LogEnv, LogOptions, OutputFormat(..)) as Extra
+import Spago.Log (logDebug, logError, logInfo, Docc, logSuccess, logWarn, die, die', justOrDieWith, justOrDieWith', rightOrDie, rightOrDie_, rightOrDieWith, toDoc, indent, indent2, output, LogEnv, LogOptions, OutputFormat(..)) as Extra
 import Spago.Path (RawFilePath, GlobalPath, LocalPath, RootPath, class AppendPath, appendPath, (</>)) as Extra
 import Spago.Yaml (YamlDoc, printYaml, parseYaml) as Extra
 

src/Spago/Command/Ls.purs

@@ -50,22 +50,24 @@ type LsPathsArgs =
   { json :: Boolean
   }
 
-type LsSetEnv =
+type LsSetEnv r =
   { dependencies :: Fetch.PackageTransitiveDeps
   , logOptions :: LogOptions
   , workspace :: Workspace
   , rootPath :: RootPath
+  | r
   }
 
-type LsEnv =
+type LsEnv r =
   { dependencies :: Fetch.PackageTransitiveDeps
   , logOptions :: LogOptions
   , workspace :: Workspace
   , selected :: WorkspacePackage
   , rootPath :: RootPath
+  | r
   }
 
-listPaths :: LsPathsArgs -> Spago { logOptions :: LogOptions, rootPath :: RootPath } Unit
+listPaths :: ∀ r. LsPathsArgs -> Spago { logOptions :: LogOptions, rootPath :: RootPath | r } Unit
 listPaths { json } = do
   logDebug "Running `listPaths`"
   { rootPath } <- ask
@@ -90,7 +92,7 @@ listPaths { json } = do
 
 -- TODO: add LICENSE field
 
-listPackageSet :: LsPackagesArgs -> Spago LsSetEnv Unit
+listPackageSet :: ∀ r. LsPackagesArgs -> Spago (LsSetEnv r) Unit
 listPackageSet { json } = do
   logDebug "Running `listPackageSet`"
   { workspace, rootPath } <- ask
@@ -102,7 +104,7 @@ listPackageSet { json } = do
         true -> formatPackagesJson rootPath packages
         false -> formatPackagesTable packages
 
-listPackages :: LsDepsOpts -> Spago LsEnv Unit
+listPackages :: ∀ r. LsDepsOpts -> Spago (LsEnv r) Unit
 listPackages { transitive, json } = do
   logDebug "Running `listPackages`"
   { dependencies, selected, rootPath } <- ask

src/Spago/Prelude.purs

@@ -51,8 +51,7 @@ data OnlineStatus = Offline | Online | OnlineBypassCache
 derive instance Eq OnlineStatus
 
 type SpagoBaseEnv a =
-  { rootPath :: Path.RootPath
-  , logOptions :: LogOptions
+  { logOptions :: LogOptions
   | a
   }
 

test-fixtures/config/discovery/a/spago.yaml

@@ -0,0 +1,4 @@
+package:
+  name: a
+  dependencies:
+    - prelude

test-fixtures/config/discovery/b/spago.yaml

@@ -0,0 +1,4 @@
+package:
+  name: b
+  dependencies:
+    - prelude

test-fixtures/config/discovery/from-a.txt

@@ -0,0 +1,12 @@
+Reading Spago workspace configuration...
+
+✓ Selecting package to build: a
+
+Downloading dependencies...
+Building...
+purs compile: No files found using pattern: a/src/**/*.purs
+           Src   Lib   All
+Warnings     0     0     0
+Errors       0     0     0
+
+✓ Build succeeded.

test-fixtures/config/discovery/from-d.txt

@@ -0,0 +1,12 @@
+Reading Spago workspace configuration...
+
+✓ Selecting package to build: d
+
+Downloading dependencies...
+Building...
+purs compile: No files found using pattern: d/src/**/*.purs
+           Src   Lib   All
+Warnings     0     0     0
+Errors       0     0     0
+
+✓ Build succeeded.

test-fixtures/config/discovery/from-nested.txt

@@ -0,0 +1,17 @@
+Reading Spago workspace configuration...
+
+✓ Selecting 3 packages to build:
+    c
+    d
+    nested-workspace
+
+Downloading dependencies...
+Building...
+purs compile: No files found using pattern: c/src/**/*.purs
+purs compile: No files found using pattern: d/src/**/*.purs
+purs compile: No files found using pattern: src/**/*.purs
+           Src   Lib   All
+Warnings     0     0     0
+Errors       0     0     0
+
+✓ Build succeeded.

test-fixtures/config/discovery/from-root.txt

@@ -0,0 +1,17 @@
+Reading Spago workspace configuration...
+
+✓ Selecting 3 packages to build:
+    a
+    b
+    foo
+
+Downloading dependencies...
+Building...
+purs compile: No files found using pattern: a/src/**/*.purs
+purs compile: No files found using pattern: b/src/**/*.purs
+purs compile: No files found using pattern: src/**/*.purs
+           Src   Lib   All
+Warnings     0     0     0
+Errors       0     0     0
+
+✓ Build succeeded.

test-fixtures/config/discovery/nested-workspace/c/spago.yaml

@@ -0,0 +1,4 @@
+package:
+  name: c
+  dependencies:
+    - prelude

test-fixtures/config/discovery/nested-workspace/d/spago.yaml

@@ -0,0 +1,4 @@
+package:
+  name: d
+  dependencies:
+    - prelude

test-fixtures/config/discovery/nested-workspace/spago.yaml

@@ -0,0 +1,8 @@
+package:
+  name: nested-workspace
+  dependencies:
+    - prelude
+
+workspace:
+  packageSet:
+    registry: 41.5.0

test-fixtures/config/discovery/spago.yaml

@@ -0,0 +1,10 @@
+package:
+  name: foo
+  dependencies:
+    - console
+    - effect
+    - prelude
+
+workspace:
+  packageSet:
+    registry: 41.5.0

test-fixtures/config/malformed-configs/a/b/c/spago.yaml

@@ -0,0 +1,3 @@
+package:
+  name: c
+  dependencies: []

test-fixtures/config/malformed-configs/a/b/spago.yaml

@@ -0,0 +1,3 @@
+package:
+  title: b # `title` is not a valid field, this config will error out on parsing.
+  dependencies: []

test-fixtures/config/malformed-configs/a/d/spago.yaml

@@ -0,0 +1,3 @@
+package:
+  name: d
+  dependencies: []

test-fixtures/config/malformed-configs/a/spago.yaml

@@ -0,0 +1,3 @@
+package:
+  name: a
+  dependencies: []

test-fixtures/config/malformed-configs/from-root.txt

@@ -0,0 +1,9 @@
+Reading Spago workspace configuration...
+‼ Failed to read config at "<test-dir>/a/b/spago.yaml"
+Skipping it and all its subprojects
+
+✘ Selected package bogus was not found in the local packages.
+All available packages:
+  a
+  d
+  root

test-fixtures/config/malformed-configs/spago.yaml

@@ -0,0 +1,6 @@
+package:
+  name: root
+  dependencies: []
+workspace:
+  packageSet:
+    registry: 0.0.1

test-fixtures/config/misnamed-configs/from-a.txt

@@ -0,0 +1,10 @@
+Reading Spago workspace configuration...
+
+✘ No spago.yaml found in the current directory or any of its parents.
+
+
+  Instead found "../spago.yml"
+  Note that Spago config files should be named spago.yaml, not spago.yml.
+
+
+The configuration file help can be found here https://github.com/purescript/spago#the-configuration-file

test-fixtures/config/misnamed-configs/from-b.txt

@@ -0,0 +1,12 @@
+Reading Spago workspace configuration...
+
+✘ No spago.yaml found in the current directory or any of its parents.
+
+
+  Instead found these:
+    "../../spago.yml"
+    "spago.yml"
+  Note that Spago config files should be named spago.yaml, not spago.yml.
+
+
+The configuration file help can be found here https://github.com/purescript/spago#the-configuration-file

test-fixtures/config/misnamed-configs/from-c.txt

@@ -0,0 +1,13 @@
+Reading Spago workspace configuration...
+
+✘ No spago.yaml found in the current directory or any of its parents.
+
+
+  Instead found these:
+    "../../../spago.yml"
+    "../spago.yml"
+    "spago.yml"
+  Note that Spago config files should be named spago.yaml, not spago.yml.
+
+
+The configuration file help can be found here https://github.com/purescript/spago#the-configuration-file

test-fixtures/config/misnamed-configs/from-d.txt

@@ -0,0 +1,12 @@
+Reading Spago workspace configuration...
+
+✘ No spago.yaml found in the current directory or any of its parents.
+
+
+  Instead found these:
+    "../../../spago.yml"
+    "../spago.yml"
+  Note that Spago config files should be named spago.yaml, not spago.yml.
+
+
+The configuration file help can be found here https://github.com/purescript/spago#the-configuration-file

test-fixtures/config/misnamed-configs/from-root.txt

@@ -0,0 +1,10 @@
+Reading Spago workspace configuration...
+
+✘ No spago.yaml found in the current directory or any of its parents.
+
+
+  Instead found "spago.yml"
+  Note that Spago config files should be named spago.yaml, not spago.yml.
+
+
+The configuration file help can be found here https://github.com/purescript/spago#the-configuration-file

test-fixtures/config/no-workspace-anywhere.txt

@@ -0,0 +1,3 @@
+Reading Spago workspace configuration...
+
+✘ No spago.yaml found in the current directory or any of its parents.

test-fixtures/list-dependencies.json

@@ -33,7 +33,7 @@
   "prelude": {
     "type": "registry",
     "value": {
-      "version": "6.0.1"
+      "version": "6.0.2"
     }
   }
 }

test-fixtures/list-dependencies.txt

@@ -3,5 +3,5 @@
 +---------+---------+----------+
 | console | 6.1.0   | -        |
 | effect  | 4.0.0   | -        |
-| prelude | 6.0.1   | -        |
+| prelude | 6.0.2   | -        |
 +---------+---------+----------+

test-fixtures/publish/1110-solver-different-version/spago.yaml

@@ -3,7 +3,7 @@ package:
   dependencies:
     - console: ">=6.0.0 <7.0.0"
     - effect: ">=4.0.0 <5.0.0"
-    - prelude: ">=6.0.1 <7.0.0"
+    - prelude: ">=6.0.2 <7.0.0"
     - maybe: ">=6.0.0 <7.0.0"
   publish:
     version: 0.0.1
@@ -13,6 +13,6 @@ package:
       githubRepo: aaa
 workspace:
   packageSet:
-    registry: 58.0.0
+    registry: 63.3.0
   extraPackages:
     console: "6.0.0"

test-fixtures/publish/1307-publish-dependencies/spago.yaml

@@ -1,7 +1,7 @@
 package:
   name: root
   dependencies:
-    - prelude: ">=6.0.1 <7.0.0"
+    - prelude: ">=6.0.2 <7.0.0"
     - effect: ">=4.0.0 <5.0.0"
   publish:
     version: 0.0.1
@@ -11,4 +11,4 @@ package:
       githubRepo: aaa
 workspace:
   packageSet:
-    registry: 62.2.5
+    registry: 63.3.0

test-fixtures/publish/basic.yaml

@@ -3,7 +3,7 @@ package:
   dependencies:
     - console: ">=6.0.0 <7.0.0"
     - effect: ">=4.0.0 <5.0.0"
-    - prelude: ">=6.0.1 <7.0.0"
+    - prelude: ">=6.0.2 <7.0.0"
   test:
     main: Test.Main
     dependencies: []
@@ -15,6 +15,6 @@ package:
       githubRepo: aaa
 workspace:
   packageSet:
-    registry: 28.1.1
+    registry: 63.3.0
   extraPackages:
     console: "6.1.0"

test-fixtures/publish/extra-package-core/spago.yaml

@@ -3,7 +3,7 @@ package:
   dependencies:
     - console: ">=6.0.0 <7.0.0"
     - effect: ">=4.0.0 <5.0.0"
-    - prelude: ">=6.0.1 <7.0.0"
+    - prelude: ">=6.0.2 <7.0.0"
     - maybe: ">=6.0.0 <7.0.0"
   test:
     main: Test.Main
@@ -17,7 +17,7 @@ package:
       githubRepo: aaa
 workspace:
   packageSet:
-    registry: 28.1.1
+    registry: 63.3.0
   extraPackages:
     console: "6.1.0"
     maybe:

test-fixtures/publish/extra-package-test/spago.yaml

@@ -3,7 +3,7 @@ package:
   dependencies:
     - console: ">=6.0.0 <7.0.0"
     - effect: ">=4.0.0 <5.0.0"
-    - prelude: ">=6.0.1 <7.0.0"
+    - prelude: ">=6.0.2 <7.0.0"
   test:
     main: Test.Main
     dependencies:
@@ -16,7 +16,7 @@ package:
       githubRepo: aaa
 workspace:
   packageSet:
-    registry: 28.1.1
+    registry: 63.3.0
   extraPackages:
     console: "6.1.0"
     maybe:

test-fixtures/sources-output.txt

@@ -2,4 +2,4 @@ src/**/*.purs
 test/**/*.purs
 .spago/p/console-6.1.0/src/**/*.purs
 .spago/p/effect-4.0.0/src/**/*.purs
-.spago/p/prelude-6.0.1/src/**/*.purs
+.spago/p/prelude-6.0.2/src/**/*.purs

test-fixtures/sources-output.win.txt

@@ -2,4 +2,4 @@ src\**\*.purs
 test\**\*.purs
 .spago\p\console-6.1.0\src\**\*.purs
 .spago\p\effect-4.0.0\src\**\*.purs
-.spago\p\prelude-6.0.1\src\**\*.purs
+.spago\p\prelude-6.0.2\src\**\*.purs

test-fixtures/sources-subproject-output.txt

@@ -1,5 +1,5 @@
 .spago/p/console-6.1.0/src/**/*.purs
 .spago/p/effect-4.0.0/src/**/*.purs
-.spago/p/prelude-6.0.1/src/**/*.purs
+.spago/p/prelude-6.0.2/src/**/*.purs
 subpackage/src/**/*.purs
 subpackage/test/**/*.purs

test-fixtures/sources-subproject-output.win.txt

@@ -1,5 +1,5 @@
 .spago\p\console-6.1.0\src\**\*.purs
 .spago\p\effect-4.0.0\src\**\*.purs
-.spago\p\prelude-6.0.1\src\**\*.purs
+.spago\p\prelude-6.0.2\src\**\*.purs
 subpackage\src\**\*.purs
 subpackage\test\**\*.purs

test-fixtures/spago-yml-check-stderr.txt

@@ -1,10 +1,10 @@
 Reading Spago workspace configuration...
 
-✘ Couldn't parse Spago config, error:
+✘ No spago.yaml found in the current directory or any of its parents.
 
 
-  Did not find "spago.yaml". Spago's configuration files must end with `.yaml`, not `.yml`.
-  Try renaming "spago.yml" to "spago.yaml" or run `spago init` to initialize a new project.
+  Instead found "spago.yml"
+  Note that Spago config files should be named spago.yaml, not spago.yml.
 
 
 The configuration file help can be found here https://github.com/purescript/spago#the-configuration-file

test/Prelude.purs

@@ -49,9 +49,10 @@ withTempDir = Aff.bracket createTempDir cleanupTempDir
   where
   createTempDir = do
     oldCwd <- Paths.cwd
-    temp <- Path.mkRoot =<< mkTemp' (Just "spago-test-")
-    FS.mkdirp temp
-    Paths.chdir temp
+    temp' <- mkTemp' (Just "spago-test-")
+    FS.mkdirp temp'
+    Paths.chdir temp'
+    temp <- Path.mkRoot =<< Paths.cwd
     isDebug <- liftEffect $ map isJust $ Process.lookupEnv "SPAGO_TEST_DEBUG"
     when isDebug do
       log $ "Running test in " <> Path.quote temp

test/Spago/Config.purs

@@ -3,12 +3,16 @@ module Test.Spago.Config where
 import Test.Prelude
 
 import Codec.JSON.DecodeError as CJ
+import Data.String as String
 import Registry.License as License
 import Registry.Location (Location(..))
 import Registry.PackageName as PackageName
 import Registry.Version as Version
 import Spago.Core.Config (SetAddress(..))
 import Spago.Core.Config as C
+import Spago.FS as FS
+import Spago.Path as Path
+import Spago.Paths as Paths
 import Spago.Yaml as Yaml
 import Test.Spec (Spec)
 import Test.Spec as Spec
@@ -64,11 +68,92 @@ spec =
               <> "\n        - Could not decode GitHub:"
               <> "\n            Unknown field(s): bogus_field"
           )
-  where
-  shouldFailWith result expectedError =
-    case result of
-      Right _ -> Assert.fail "Expected an error, but parsed successfully"
-      Left err -> CJ.print err `shouldEqual` expectedError
+
+    Spec.around withTempDir $
+      Spec.describe "spago.yaml discovery" do
+        Spec.it "discovers config up the directory tree" \{ testCwd, fixture, spago } -> do
+          FS.copyTree { src: fixture "config/discovery", dst: testCwd }
+          spago [ "build" ] >>= shouldBeSuccess
+          spago [ "build" ] >>= shouldBeSuccessErr' (fixture "config/discovery/from-root.txt")
+
+          -- Running from `./a`, Spago should discover the workspace root at
+          -- './' and select package 'a'
+          Paths.chdir $ testCwd </> "a"
+          spago [ "build" ] >>= shouldBeSuccessErr' (fixture "config/discovery/from-a.txt")
+
+          -- Running from `./nested-workspace`, Spago should use the workspace
+          -- root at './nested-workspace' and not the one at './'
+          Paths.chdir $ testCwd </> "nested-workspace"
+          spago [ "build" ] >>= shouldBeSuccess
+          spago [ "build" ] >>= shouldBeSuccessErr' (fixture "config/discovery/from-nested.txt")
+
+          -- Running from `./nested-workspace/d`, Spago should use the workspace
+          -- root at './nested-workspace', because that's the closest one, and
+          -- select package 'd'
+          Paths.chdir $ testCwd </> "nested-workspace" </> "d"
+          spago [ "build" ] >>= shouldBeSuccessErr' (fixture "config/discovery/from-d.txt")
+
+          -- At workspace roots, a ".spago" directory should be created for
+          -- local cache, but not in subdirs
+          FS.exists (testCwd </> ".spago") `Assert.shouldReturn` true
+          FS.exists (testCwd </> "a" </> ".spago") `Assert.shouldReturn` false
+          FS.exists (testCwd </> "nested-workspace" </> ".spago") `Assert.shouldReturn` true
+          FS.exists (testCwd </> "nested-workspace" </> "d" </> ".spago") `Assert.shouldReturn` false
+
+        Spec.it "reports no config in any parent directories" \{ spago, fixture } ->
+          spago [ "build" ] >>= shouldBeFailureErr' (fixture "config/no-workspace-anywhere.txt")
+
+        Spec.it "reports possible misnamed configs up the directory tree" \{ testCwd, spago, fixture } -> do
+          FS.copyTree { src: fixture "config/misnamed-configs", dst: testCwd }
+          spago [ "build" ] >>= shouldBeFailureErr' (fixture "config/misnamed-configs/from-root.txt")
+
+          Paths.chdir $ testCwd </> "a"
+          spago [ "build" ] >>= shouldBeFailureErr' (fixture "config/misnamed-configs/from-a.txt")
+
+          Paths.chdir $ testCwd </> "a" </> "b"
+          spago [ "build" ] >>= shouldBeFailureErr' (fixture "config/misnamed-configs/from-b.txt")
+
+          Paths.chdir $ testCwd </> "a" </> "b" </> "c"
+          spago [ "build" ] >>= shouldBeFailureErr' (fixture "config/misnamed-configs/from-c.txt")
+
+          Paths.chdir $ testCwd </> "a" </> "b" </> "d"
+          spago [ "build" ] >>= shouldBeFailureErr' (fixture "config/misnamed-configs/from-d.txt")
+
+        Spec.it "warns about a malformed config, but stops parsing down the tree" \{ spago, fixture, testCwd } -> do
+          FS.copyTree { src: fixture "config/malformed-configs", dst: testCwd }
+
+          -- Running with "-p bogus" to get Spago to list all available
+          -- packages. Packages `b` and `c` shouldn't be in that list because
+          -- b's config is malformatted, so Spago should warn about it and stop
+          -- loading configs down the tree from `b`, thus skipping `c`.
+          spago [ "build", "-p", "bogus" ] >>= checkOutputs'
+            { result: isLeft
+            , stdoutFile: Nothing
+            , stderrFile: Just (fixture "config/malformed-configs/from-root.txt")
+            , sanitize:
+                String.trim
+                  >>> String.replaceAll (String.Pattern $ Path.toRaw testCwd) (String.Replacement "<test-dir>")
+                  >>> String.replaceAll (String.Pattern "\\") (String.Replacement "/")
+            }
+
+    where
+    shouldFailWith result expectedError =
+      case result of
+        Right _ -> Assert.fail "Expected an error, but parsed successfully"
+        Left err -> CJ.print err `shouldEqual` expectedError
+
+    shouldBeSuccessErr' = shouldBeErr isRight
+    shouldBeFailureErr' = shouldBeErr isLeft
+
+    shouldBeErr result file = checkOutputs'
+        { stdoutFile: Nothing
+        , stderrFile: Just file
+        , result
+        , sanitize:
+            String.trim
+              >>> String.replaceAll (String.Pattern "\\") (String.Replacement "/")
+              >>> String.replaceAll (String.Pattern "\r\n") (String.Replacement "\n")
+        }
 
 validSpagoYaml :: { serialized :: String, parsed :: C.Config }
 validSpagoYaml =