From 0d80b7263002d6a309ced7af55445fc74ed27bcc Mon Sep 17 00:00:00 2001 From: flip111 Date: Mon, 25 Dec 2023 01:24:21 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/src/Main.purs | 6 +-- core/src/Config.purs | 54 +++++++++---------- src/Spago/Command/Build.purs | 4 +- src/Spago/Command/Fetch.purs | 10 ++-- src/Spago/Command/Init.purs | 16 +++--- src/Spago/Command/Publish.purs | 2 +- src/Spago/Command/Upgrade.purs | 2 +- src/Spago/Config.purs | 26 ++++----- src/Spago/Lock.purs | 16 +++--- src/Spago/Psa.purs | 4 +- test-fixtures/check-strict.yaml | 4 +- test-fixtures/local-package-set-config.yaml | 4 +- test-fixtures/local-package-set-config2.yaml | 4 +- test-fixtures/no-test-section.yaml | 4 +- test-fixtures/older-package-set-tag.yaml | 4 +- test-fixtures/polyrepo.lock | 16 +++--- test-fixtures/spago-install-failure.yaml | 4 +- test-fixtures/spago-install-success.yaml | 4 +- .../spago-install-test-deps-success.yaml | 4 +- test-fixtures/spago-publish.yaml | 4 +- test-fixtures/spago-with-maybe.lock | 8 +-- test-fixtures/spago.lock | 8 +-- test/Spago/Build/Pedantic.purs | 10 ++-- test/Spago/Install.purs | 10 ++-- test/Spago/Lock.purs | 24 ++++----- test/Spago/Upgrade.purs | 2 +- 26 files changed, 127 insertions(+), 127 deletions(-) diff --git a/bin/src/Main.purs b/bin/src/Main.purs index be4989e3d..9b52609df 100644 --- a/bin/src/Main.purs +++ b/bin/src/Main.purs @@ -730,7 +730,7 @@ mkBundleEnv bundleArgs = do extraArgs = fromMaybe [] do let cliArgs = Array.fromFoldable bundleArgs.bundlerArgs - (Alternative.guard (Array.length cliArgs > 0) *> pure cliArgs) <|> (bundleConf _.extra_args) + (Alternative.guard (Array.length cliArgs > 0) *> pure cliArgs) <|> (bundleConf _.extraArgs) let bundleOptions = { minify, module: entrypoint, outfile, platform, type: bundleType, sourceMaps: bundleArgs.sourceMaps, extraArgs } let @@ -775,7 +775,7 @@ mkRunEnv runArgs { dependencies, purs } = do runConf f = selected.package.run >>= f moduleName = fromMaybe "Main" (runArgs.main <|> runConf _.main) - execArgs = fromMaybe [] (runArgs.execArgs <|> runConf _.exec_args) + execArgs = fromMaybe [] (runArgs.execArgs <|> runConf _.execArgs) runOptions = { moduleName @@ -804,7 +804,7 @@ mkTestEnv testArgs { dependencies, purs } = do testConf f = selected.package.test >>= f moduleName = fromMaybe "Test.Main" (testConf (_.main >>> Just)) - execArgs = fromMaybe [] (testArgs.execArgs <|> testConf _.exec_args) + execArgs = fromMaybe [] (testArgs.execArgs <|> testConf _.execArgs) in { moduleName , execArgs diff --git a/core/src/Config.purs b/core/src/Config.purs index b7128912c..c6d1db8d9 100644 --- a/core/src/Config.purs +++ b/core/src/Config.purs @@ -111,31 +111,31 @@ publishConfigCodec = CA.object "PublishConfig" type RunConfig = { main :: Maybe String - , exec_args :: Maybe (Array String) + , execArgs :: Maybe (Array String) } runConfigCodec :: JsonCodec RunConfig runConfigCodec = CA.object "RunConfig" $ CA.recordPropOptional (Proxy :: _ "main") CA.string - $ CA.recordPropOptional (Proxy :: _ "exec_args") (CA.array CA.string) + $ CA.recordPropOptional (Proxy :: _ "execArgs") (CA.array CA.string) $ CA.record type TestConfig = { main :: String - , exec_args :: Maybe (Array String) + , execArgs :: Maybe (Array String) , dependencies :: Dependencies - , censor_test_warnings :: Maybe CensorBuildWarnings + , censorTestWarnings :: Maybe CensorBuildWarnings , strict :: Maybe Boolean - , pedantic_packages :: Maybe Boolean + , pedanticPackages :: Maybe Boolean } testConfigCodec :: JsonCodec TestConfig testConfigCodec = CA.object "TestConfig" $ CA.recordProp (Proxy :: _ "main") CA.string - $ CA.recordPropOptional (Proxy :: _ "exec_args") (CA.array CA.string) - $ CA.recordPropOptional (Proxy :: _ "censor_test_warnings") censorBuildWarningsCodec + $ CA.recordPropOptional (Proxy :: _ "execArgs") (CA.array CA.string) + $ CA.recordPropOptional (Proxy :: _ "censorTestWarnings") censorBuildWarningsCodec $ CA.recordPropOptional (Proxy :: _ "strict") CA.boolean - $ CA.recordPropOptional (Proxy :: _ "pedantic_packages") CA.boolean + $ CA.recordPropOptional (Proxy :: _ "pedanticPackages") CA.boolean $ CA.recordProp (Proxy :: _ "dependencies") dependenciesCodec $ CA.record @@ -151,16 +151,16 @@ backendConfigCodec = CA.object "BackendConfig" $ CA.record type PackageBuildOptionsInput = - { censor_project_warnings :: Maybe CensorBuildWarnings + { censorProjectWarnings :: Maybe CensorBuildWarnings , strict :: Maybe Boolean - , pedantic_packages :: Maybe Boolean + , pedanticPackages :: Maybe Boolean } packageBuildOptionsCodec :: JsonCodec PackageBuildOptionsInput packageBuildOptionsCodec = CA.object "PackageBuildOptionsInput" - $ CA.recordPropOptional (Proxy :: _ "censor_project_warnings") censorBuildWarningsCodec + $ CA.recordPropOptional (Proxy :: _ "censorProjectWarnings") censorBuildWarningsCodec $ CA.recordPropOptional (Proxy :: _ "strict") CA.boolean - $ CA.recordPropOptional (Proxy :: _ "pedantic_packages") CA.boolean + $ CA.recordPropOptional (Proxy :: _ "pedanticPackages") CA.boolean $ CA.record type BundleConfig = @@ -169,7 +169,7 @@ type BundleConfig = , outfile :: Maybe FilePath , platform :: Maybe BundlePlatform , type :: Maybe BundleType - , extra_args :: Maybe (Array String) + , extraArgs :: Maybe (Array String) } bundleConfigCodec :: JsonCodec BundleConfig @@ -179,7 +179,7 @@ bundleConfigCodec = CA.object "BundleConfig" $ CA.recordPropOptional (Proxy :: _ "outfile") CA.string $ CA.recordPropOptional (Proxy :: _ "platform") bundlePlatformCodec $ CA.recordPropOptional (Proxy :: _ "type") bundleTypeCodec - $ CA.recordPropOptional (Proxy :: _ "extra_args") (CA.array CA.string) + $ CA.recordPropOptional (Proxy :: _ "extraArgs") (CA.array CA.string) $ CA.record data BundlePlatform = BundleNode | BundleBrowser @@ -284,31 +284,31 @@ printSpagoRange range = else Range.print range type WorkspaceConfig = - { package_set :: Maybe SetAddress - , extra_packages :: Maybe (Map PackageName ExtraPackage) + { packageSet :: Maybe SetAddress + , extraPackages :: Maybe (Map PackageName ExtraPackage) , backend :: Maybe BackendConfig - , build_opts :: Maybe WorkspaceBuildOptionsInput + , buildOpts :: Maybe WorkspaceBuildOptionsInput } workspaceConfigCodec :: JsonCodec WorkspaceConfig workspaceConfigCodec = CA.object "WorkspaceConfig" - $ CA.recordPropOptional (Proxy :: _ "package_set") setAddressCodec + $ CA.recordPropOptional (Proxy :: _ "packageSet") setAddressCodec $ CA.recordPropOptional (Proxy :: _ "backend") backendConfigCodec - $ CA.recordPropOptional (Proxy :: _ "build_opts") buildOptionsCodec - $ CA.recordPropOptional (Proxy :: _ "extra_packages") (Internal.Codec.packageMap extraPackageCodec) + $ CA.recordPropOptional (Proxy :: _ "buildOpts") buildOptionsCodec + $ CA.recordPropOptional (Proxy :: _ "extraPackages") (Internal.Codec.packageMap extraPackageCodec) $ CA.record type WorkspaceBuildOptionsInput = { output :: Maybe FilePath - , censor_library_warnings :: Maybe CensorBuildWarnings - , stat_verbosity :: Maybe StatVerbosity + , censorLibraryWarnings :: Maybe CensorBuildWarnings + , statVerbosity :: Maybe StatVerbosity } buildOptionsCodec :: JsonCodec WorkspaceBuildOptionsInput buildOptionsCodec = CA.object "WorkspaceBuildOptionsInput" $ CA.recordPropOptional (Proxy :: _ "output") CA.string - $ CA.recordPropOptional (Proxy :: _ "censor_library_warnings") censorBuildWarningsCodec - $ CA.recordPropOptional (Proxy :: _ "stat_verbosity") statVerbosityCodec + $ CA.recordPropOptional (Proxy :: _ "censorLibraryWarnings") censorBuildWarningsCodec + $ CA.recordPropOptional (Proxy :: _ "statVerbosity") statVerbosityCodec $ CA.record data CensorBuildWarnings @@ -354,14 +354,14 @@ warningCensorTestCodec = CA.codec' parse print where print = case _ of ByCode str -> CA.encode CA.string str - ByMessagePrefix str -> CA.encode byMessagePrefixCodec { by_prefix: str } + ByMessagePrefix str -> CA.encode byMessagePrefixCodec { byPrefix: str } parse j = byCode <|> byPrefix where byCode = ByCode <$> CA.decode CA.string j - byPrefix = (ByMessagePrefix <<< _.by_prefix) <$> CA.decode byMessagePrefixCodec j + byPrefix = (ByMessagePrefix <<< _.byPrefix) <$> CA.decode byMessagePrefixCodec j - byMessagePrefixCodec = CAR.object "ByMessagePrefix" { by_prefix: CA.string } + byMessagePrefixCodec = CAR.object "ByMessagePrefix" { byPrefix: CA.string } data StatVerbosity = NoStats diff --git a/src/Spago/Command/Build.purs b/src/Spago/Command/Build.purs index 527870e4d..849af2199 100644 --- a/src/Spago/Command/Build.purs +++ b/src/Spago/Command/Build.purs @@ -141,8 +141,8 @@ run opts = do let pedanticPkgs = NEA.toArray selectedPackages # Array.mapMaybe \p -> do - let reportSrc = pedanticPackages || (fromMaybe false $ p.package.build >>= _.pedantic_packages) - let reportTest = pedanticPackages || (fromMaybe false $ p.package.test >>= _.pedantic_packages) + let reportSrc = pedanticPackages || (fromMaybe false $ p.package.build >>= _.pedanticPackages) + let reportTest = pedanticPackages || (fromMaybe false $ p.package.test >>= _.pedanticPackages) Alternative.guard (reportSrc || reportTest) pure $ Tuple p { reportSrc, reportTest } unless (Array.null pedanticPkgs || opts.depsOnly) do diff --git a/src/Spago/Command/Fetch.purs b/src/Spago/Command/Fetch.purs index b9e064483..e8e23a8bb 100644 --- a/src/Spago/Command/Fetch.purs +++ b/src/Spago/Command/Fetch.purs @@ -287,7 +287,7 @@ writeNewLockfile reason allTransitiveDeps = do { workspacePackages = Map.alter ( case _ of Nothing -> Nothing - Just pkg -> Just $ pkg { build_plan = Set.insert dependencyName (pkg.build_plan) } + Just pkg -> Just $ pkg { buildPlan = Set.insert dependencyName (pkg.buildPlan) } ) workspacePackageName r.workspacePackages @@ -322,11 +322,11 @@ writeNewLockfile reason allTransitiveDeps = do lockfile = { packages , workspace: - { package_set: case workspace.packageSet.buildType of + { packageSet: case workspace.packageSet.buildType of RegistrySolverBuild _ -> Nothing PackageSetBuild info _ -> Just info , packages: workspacePackages - , extra_packages: fromMaybe Map.empty workspace.workspaceConfig.extra_packages + , extraPackages: fromMaybe Map.empty workspace.workspaceConfig.extraPackages } } liftAff $ FS.writeYamlFile Lock.lockfileCodec "spago.lock" lockfile @@ -404,12 +404,12 @@ getTransitiveDeps workspacePackage = do Right lockfile -> do case Map.lookup workspacePackage.package.name lockfile.workspace.packages of Nothing -> die $ "Package " <> PackageName.print workspacePackage.package.name <> " not found in lockfile" - Just { build_plan } -> do + Just { buildPlan } -> do let allWorkspacePackages = Map.fromFoldable $ map (\p -> Tuple p.package.name (WorkspacePackage p)) (Config.getWorkspacePackages workspace.packageSet) isInBuildPlan :: forall v. PackageName -> v -> Boolean - isInBuildPlan name _package = Set.member name build_plan + isInBuildPlan name _package = Set.member name buildPlan workspacePackagesWeNeed = Map.filterWithKey isInBuildPlan allWorkspacePackages otherPackages = map fromLockEntry $ Map.filterWithKey isInBuildPlan lockfile.packages diff --git a/src/Spago/Command/Init.purs b/src/Spago/Command/Init.purs index 0743af4d8..614054673 100644 --- a/src/Spago/Command/Init.purs +++ b/src/Spago/Command/Init.purs @@ -154,26 +154,26 @@ defaultConfig' opts = , dependencies: Dependencies $ Map.fromFoldable $ map mkDep dependencies , description: Nothing , build: build <#> \{ censorProjectWarnings, strict, pedanticPackages } -> - { censor_project_warnings: censorProjectWarnings + { censorProjectWarnings: censorProjectWarnings , strict - , pedantic_packages: pedanticPackages + , pedanticPackages: pedanticPackages } , run: Nothing , test: test <#> \{ moduleMain, censorTestWarnings, strict, pedanticPackages, dependencies: testDeps } -> { dependencies: fromMaybe (Dependencies Map.empty) testDeps - , exec_args: Nothing + , execArgs: Nothing , main: moduleMain - , censor_test_warnings: censorTestWarnings + , censorTestWarnings: censorTestWarnings , strict - , pedantic_packages: pedanticPackages + , pedanticPackages: pedanticPackages } , publish: Nothing , bundle: Nothing } , workspace: (getDefaultConfigWorkspaceOptions opts) <#> \{ setVersion } -> - { extra_packages: Just Map.empty - , package_set: setVersion # map \set -> SetFromRegistry { registry: set } - , build_opts: Nothing + { extraPackages: Just Map.empty + , packageSet: setVersion # map \set -> SetFromRegistry { registry: set } + , buildOpts: Nothing , backend: Nothing } } diff --git a/src/Spago/Command/Publish.purs b/src/Spago/Command/Publish.purs index 15ab7a09d..55e560a26 100644 --- a/src/Spago/Command/Publish.purs +++ b/src/Spago/Command/Publish.purs @@ -195,7 +195,7 @@ publish _args = do if Array.length fail > 0 then do addError $ toDoc - [ "Some of the packages you specified as `extra_packages` do not point to the Registry." + [ "Some of the packages you specified as `extraPackages` do not point to the Registry." , "To be able to publish a package to the registry, all of its dependencies have to be packages registered on the Registry." , "Please replace the following packages with versions that are present in the Registry:" -- TODO point to docs ] diff --git a/src/Spago/Command/Upgrade.purs b/src/Spago/Command/Upgrade.purs index ee12497ea..0d28c1af3 100644 --- a/src/Spago/Command/Upgrade.purs +++ b/src/Spago/Command/Upgrade.purs @@ -11,7 +11,7 @@ import Spago.Db as Db run :: forall a. Spago (FetchEnv a) Unit run = do { workspace, db, purs } <- ask - case workspace.workspaceConfig.package_set of + case workspace.workspaceConfig.packageSet of Just (Core.SetFromRegistry { registry }) -> do maybeLatestPackageSet <- liftEffect $ Db.selectLatestPackageSetByCompiler db purs.version case maybeLatestPackageSet of diff --git a/src/Spago/Config.purs b/src/Spago/Config.purs index 2a6d8b0d0..59902f58c 100644 --- a/src/Spago/Config.purs +++ b/src/Spago/Config.purs @@ -262,7 +262,7 @@ readWorkspace { maybeSelectedPackage, pureBuild } = do -- Read in the package database { offline } <- ask - packageSetInfo <- case maybeLockfileContents, workspace.package_set of + packageSetInfo <- case maybeLockfileContents, workspace.packageSet of _, Nothing -> do logDebug "Did not find a package set in your config, using Registry solver" pure Nothing @@ -271,7 +271,7 @@ readWorkspace { maybeSelectedPackage, pureBuild } = do -- repo nor from the internet, since we already have the whole set right there Right lockfile, _ -> do logDebug "Found lockfile, using the package set from there" - pure lockfile.workspace.package_set + pure lockfile.workspace.packageSet Left _, Just address@(Core.SetFromRegistry { registry: v }) -> do logDebug "Reading the package set from the Registry repo..." @@ -330,7 +330,7 @@ readWorkspace { maybeSelectedPackage, pureBuild } = do , address } - -- Mix in the package set (a) the workspace packages, and (b) the extra_packages + -- Mix in the package set (a) the workspace packages, and (b) the extraPackages -- Note: -- 1. we error out if any workspace package collides with any package in the database, -- because it's just a confusing situation. @@ -339,7 +339,7 @@ readWorkspace { maybeSelectedPackage, pureBuild } = do -- This is to (1) easily allow overriding packages, (2) easily allow "private registries" -- and (3) prevent the security hole where people can register new names and take precedence in your build. let - extraPackages = map fromExtraPackage (fromMaybe Map.empty workspace.extra_packages) + extraPackages = map fromExtraPackage (fromMaybe Map.empty workspace.extraPackages) localPackagesOverlap = Set.intersection (Map.keys workspacePackages) (Map.keys extraPackages) buildType = let @@ -357,7 +357,7 @@ readWorkspace { maybeSelectedPackage, pureBuild } = do die $ [ toDoc "Some packages in your local tree overlap with ones you have declared in your workspace configuration." - , toDoc "To resolve this error, rename these packages declared in `extra_packages` to a different name:" + , toDoc "To resolve this error, rename these packages declared in `extraPackages` to a different name:" ] <> map (\p -> indent $ toDoc $ "- " <> PackageName.print p) (Array.fromFoldable localPackagesOverlap) @@ -375,9 +375,9 @@ readWorkspace { maybeSelectedPackage, pureBuild } = do let buildOptions :: BuildOptions buildOptions = - { output: _.output =<< workspace.build_opts - , censorLibWarnings: _.censor_library_warnings =<< workspace.build_opts - , statVerbosity: _.stat_verbosity =<< workspace.build_opts + { output: _.output =<< workspace.buildOpts + , censorLibWarnings: _.censorLibraryWarnings =<< workspace.buildOpts + , statVerbosity: _.statVerbosity =<< workspace.buildOpts } pure @@ -404,18 +404,18 @@ workspacePackageToLockfilePackage :: WorkspacePackage -> Tuple PackageName Lock. workspacePackageToLockfilePackage { path, package } = Tuple package.name { path , dependencies: package.dependencies - , test_dependencies: foldMap _.dependencies package.test - , build_plan: mempty -- Note: this is filled in later + , testDependencies: foldMap _.dependencies package.test + , buildPlan: mempty -- Note: this is filled in later } shouldComputeNewLockfile :: { workspace :: Core.WorkspaceConfig, workspacePackages :: Map PackageName WorkspacePackage } -> Lock.WorkspaceLock -> Boolean shouldComputeNewLockfile { workspace, workspacePackages } workspaceLock = -- the workspace packages should exactly match, except for the needed_by field, which is filled in during build plan construction - (map (workspacePackageToLockfilePackage >>> snd) workspacePackages /= (map (_ { build_plan = mempty }) workspaceLock.packages)) + (map (workspacePackageToLockfilePackage >>> snd) workspacePackages /= (map (_ { buildPlan = mempty }) workspaceLock.packages)) -- and the extra packages should exactly match - || (fromMaybe Map.empty workspace.extra_packages /= workspaceLock.extra_packages) + || (fromMaybe Map.empty workspace.extraPackages /= workspaceLock.extraPackages) -- and the package set address needs to match - we have no way to match the package set contents at this point, so we let it be - || (workspace.package_set /= map _.address workspaceLock.package_set) + || (workspace.packageSet /= map _.address workspaceLock.packageSet) getPackageLocation :: PackageName -> Package -> FilePath getPackageLocation name = Paths.mkRelative <<< case _ of diff --git a/src/Spago/Lock.purs b/src/Spago/Lock.purs index 3edca3a17..5bc5f97d2 100644 --- a/src/Spago/Lock.purs +++ b/src/Spago/Lock.purs @@ -39,9 +39,9 @@ data LockEntry derive instance Eq LockEntry type WorkspaceLock = - { package_set :: Maybe PackageSetInfo + { packageSet :: Maybe PackageSetInfo , packages :: Map PackageName WorkspaceLockPackage - , extra_packages :: Map PackageName Core.ExtraPackage + , extraPackages :: Map PackageName Core.ExtraPackage } type PackageSetInfo = @@ -52,9 +52,9 @@ type PackageSetInfo = type WorkspaceLockPackage = { dependencies :: Core.Dependencies - , test_dependencies :: Core.Dependencies + , testDependencies :: Core.Dependencies , path :: FilePath - , build_plan :: Set PackageName + , buildPlan :: Set PackageName } lockfileCodec :: JsonCodec Lockfile @@ -66,15 +66,15 @@ lockfileCodec = CA.object "Lockfile" workspaceLockCodec :: JsonCodec WorkspaceLock workspaceLockCodec = CA.object "WorkspaceLock" $ CA.recordProp (Proxy :: _ "packages") (Registry.Codec.packageMap dependenciesCodec) - $ CA.recordPropOptional (Proxy :: _ "package_set") packageSetCodec - $ CA.recordProp (Proxy :: _ "extra_packages") (Registry.Codec.packageMap Config.extraPackageCodec) + $ CA.recordPropOptional (Proxy :: _ "packageSet") packageSetCodec + $ CA.recordProp (Proxy :: _ "extraPackages") (Registry.Codec.packageMap Config.extraPackageCodec) $ CA.record where dependenciesCodec = CA.object "Dependencies" $ CA.recordProp (Proxy :: _ "path") CA.string $ CA.recordProp (Proxy :: _ "dependencies") Config.dependenciesCodec - $ CA.recordProp (Proxy :: _ "test_dependencies") Config.dependenciesCodec - $ CA.recordProp (Proxy :: _ "build_plan") (CA.Common.set PackageName.codec) + $ CA.recordProp (Proxy :: _ "testDependencies") Config.dependenciesCodec + $ CA.recordProp (Proxy :: _ "buildPlan") (CA.Common.set PackageName.codec) $ CA.record packageSetCodec :: JsonCodec PackageSetInfo diff --git a/src/Spago/Psa.purs b/src/Spago/Psa.purs index 9d5b91961..d4a6ed402 100644 --- a/src/Spago/Psa.purs +++ b/src/Spago/Psa.purs @@ -141,13 +141,13 @@ toWorkspacePackagePathDecision { selected: { path, package }, psaCliFlags } = do { pathIsFromPackage: isJust <<< String.stripPrefix (String.Pattern srcPath) , pathType: IsSrc , strict: fromMaybe false $ psaCliFlags.strict <|> (package.build >>= _.strict) - , censorWarnings: package.build >>= _.censor_project_warnings + , censorWarnings: package.build >>= _.censorProjectWarnings } , toPathDecision { pathIsFromPackage: isJust <<< String.stripPrefix (String.Pattern testPath) , pathType: IsSrc , strict: fromMaybe false $ psaCliFlags.strict <|> (package.test >>= _.strict) - , censorWarnings: package.test >>= _.censor_test_warnings + , censorWarnings: package.test >>= _.censorTestWarnings } ] diff --git a/test-fixtures/check-strict.yaml b/test-fixtures/check-strict.yaml index 62841a9b9..c31ca750f 100644 --- a/test-fixtures/check-strict.yaml +++ b/test-fixtures/check-strict.yaml @@ -7,6 +7,6 @@ package: build: strict: true workspace: - package_set: + packageSet: registry: 41.5.0 - extra_packages: {} + extraPackages: {} diff --git a/test-fixtures/local-package-set-config.yaml b/test-fixtures/local-package-set-config.yaml index 0dde24b4a..38dec293e 100644 --- a/test-fixtures/local-package-set-config.yaml +++ b/test-fixtures/local-package-set-config.yaml @@ -8,6 +8,6 @@ package: main: Test.Main dependencies: [] workspace: - package_set: + packageSet: path: local-package-set.json - extra_packages: {} + extraPackages: {} diff --git a/test-fixtures/local-package-set-config2.yaml b/test-fixtures/local-package-set-config2.yaml index f7649e376..d67cc1539 100644 --- a/test-fixtures/local-package-set-config2.yaml +++ b/test-fixtures/local-package-set-config2.yaml @@ -8,6 +8,6 @@ package: main: Test.Main dependencies: [] workspace: - package_set: + packageSet: path: ../local-package-set.json - extra_packages: {} + extraPackages: {} diff --git a/test-fixtures/no-test-section.yaml b/test-fixtures/no-test-section.yaml index 4d519b943..d521cc419 100644 --- a/test-fixtures/no-test-section.yaml +++ b/test-fixtures/no-test-section.yaml @@ -5,6 +5,6 @@ package: - effect - prelude workspace: - package_set: + packageSet: registry: 29.3.0 - extra_packages: {} + extraPackages: {} diff --git a/test-fixtures/older-package-set-tag.yaml b/test-fixtures/older-package-set-tag.yaml index 7cc3fa03e..284b630d6 100644 --- a/test-fixtures/older-package-set-tag.yaml +++ b/test-fixtures/older-package-set-tag.yaml @@ -8,6 +8,6 @@ package: main: Test.Main dependencies: [] workspace: - package_set: + packageSet: registry: 9.0.0 - extra_packages: {} + extraPackages: {} diff --git a/test-fixtures/polyrepo.lock b/test-fixtures/polyrepo.lock index 5fd05e893..01a8b3a06 100644 --- a/test-fixtures/polyrepo.lock +++ b/test-fixtures/polyrepo.lock @@ -6,11 +6,11 @@ workspace: - package-b - package-c - prelude - test_dependencies: + testDependencies: - console - effect - prelude - build_plan: + buildPlan: - console - effect - package-b @@ -21,11 +21,11 @@ workspace: dependencies: - package-c - prelude - test_dependencies: + testDependencies: - console - effect - prelude - build_plan: + buildPlan: - console - effect - package-c @@ -34,15 +34,15 @@ workspace: path: package-c dependencies: - prelude - test_dependencies: + testDependencies: - console - effect - prelude - build_plan: + buildPlan: - console - effect - prelude - package_set: + packageSet: address: registry: 0.0.1 compiler: ">=0.15.4 <0.16.0" @@ -405,7 +405,7 @@ workspace: yoga-fetch: 1.0.1 yoga-json: 3.0.2 yoga-postgres: 6.0.0 - extra_packages: {} + extraPackages: {} packages: console: type: registry diff --git a/test-fixtures/spago-install-failure.yaml b/test-fixtures/spago-install-failure.yaml index ee4cdbf39..46a17ad3c 100644 --- a/test-fixtures/spago-install-failure.yaml +++ b/test-fixtures/spago-install-failure.yaml @@ -8,6 +8,6 @@ package: main: Test.Main dependencies: [] workspace: - package_set: + packageSet: registry: 29.3.0 - extra_packages: {} + extraPackages: {} diff --git a/test-fixtures/spago-install-success.yaml b/test-fixtures/spago-install-success.yaml index f3130cbd6..9ac715000 100644 --- a/test-fixtures/spago-install-success.yaml +++ b/test-fixtures/spago-install-success.yaml @@ -9,6 +9,6 @@ package: main: Test.Main dependencies: [] workspace: - package_set: + packageSet: registry: 29.3.0 - extra_packages: {} + extraPackages: {} diff --git a/test-fixtures/spago-install-test-deps-success.yaml b/test-fixtures/spago-install-test-deps-success.yaml index 653b26de6..d64e77fcf 100644 --- a/test-fixtures/spago-install-test-deps-success.yaml +++ b/test-fixtures/spago-install-test-deps-success.yaml @@ -9,6 +9,6 @@ package: dependencies: - foreign workspace: - package_set: + packageSet: registry: 29.3.0 - extra_packages: {} + extraPackages: {} diff --git a/test-fixtures/spago-publish.yaml b/test-fixtures/spago-publish.yaml index bd1e89f90..5457363af 100644 --- a/test-fixtures/spago-publish.yaml +++ b/test-fixtures/spago-publish.yaml @@ -14,7 +14,7 @@ package: githubOwner: purescript githubRepo: aaa workspace: - package_set: + packageSet: registry: 28.1.1 - extra_packages: + extraPackages: console: "6.1.0" diff --git a/test-fixtures/spago-with-maybe.lock b/test-fixtures/spago-with-maybe.lock index fb7085d92..068c53ad7 100644 --- a/test-fixtures/spago-with-maybe.lock +++ b/test-fixtures/spago-with-maybe.lock @@ -7,8 +7,8 @@ workspace: - effect - maybe - prelude - test_dependencies: [] - build_plan: + testDependencies: [] + buildPlan: - console - control - effect @@ -18,7 +18,7 @@ workspace: - prelude - safe-coerce - unsafe-coerce - package_set: + packageSet: address: registry: 33.0.0 compiler: ">=0.15.10 <0.16.0" @@ -499,7 +499,7 @@ workspace: yoga-postgres: 6.0.0 yoga-tree: 1.0.0 z3: 0.0.2 - extra_packages: {} + extraPackages: {} packages: console: type: registry diff --git a/test-fixtures/spago.lock b/test-fixtures/spago.lock index ec80c9f3d..ea586e62b 100644 --- a/test-fixtures/spago.lock +++ b/test-fixtures/spago.lock @@ -6,12 +6,12 @@ workspace: - console - effect - prelude - test_dependencies: [] - build_plan: + testDependencies: [] + buildPlan: - console - effect - prelude - package_set: + packageSet: address: registry: 33.0.0 compiler: ">=0.15.10 <0.16.0" @@ -492,7 +492,7 @@ workspace: yoga-postgres: 6.0.0 yoga-tree: 1.0.0 z3: 0.0.2 - extra_packages: {} + extraPackages: {} packages: console: type: registry diff --git a/test/Spago/Build/Pedantic.purs b/test/Spago/Build/Pedantic.purs index ed23fff87..8db75f092 100644 --- a/test/Spago/Build/Pedantic.purs +++ b/test/Spago/Build/Pedantic.purs @@ -219,9 +219,9 @@ addPedanticFlagToSrc :: Config -> Config addPedanticFlagToSrc config = config { package = config.package <#> \r -> r { build = Just - { pedantic_packages: Just true + { pedanticPackages: Just true , strict: Nothing - , censor_project_warnings: Nothing + , censorProjectWarnings: Nothing } } } @@ -231,11 +231,11 @@ addPedanticFlagToTest config = config { package = config.package <#> \r -> r { test = Just { main: "Test.Main" - , pedantic_packages: Just true + , pedanticPackages: Just true , strict: Nothing - , censor_test_warnings: Nothing + , censorTestWarnings: Nothing , dependencies: maybe (Dependencies Map.empty) _.dependencies r.test - , exec_args: r.test >>= _.exec_args + , execArgs: r.test >>= _.execArgs } } } diff --git a/test/Spago/Install.purs b/test/Spago/Install.purs index f902c9807..938dff71e 100644 --- a/test/Spago/Install.purs +++ b/test/Spago/Install.purs @@ -75,7 +75,7 @@ spec = Spec.around withTempDir do ( conf { workspace = conf.workspace # map ( _ - { extra_packages = Just $ Map.fromFoldable + { extraPackages = Just $ Map.fromFoldable [ Tuple (mkPackageName "a") $ Config.ExtraRemotePackage $ Config.RemoteGitPackage { git: "https://github.com/purescript/spago.git" , ref: "master" @@ -119,7 +119,7 @@ spec = Spec.around withTempDir do ( conf { workspace = conf.workspace # map ( _ - { extra_packages = Just $ Map.fromFoldable + { extraPackages = Just $ Map.fromFoldable [ Tuple (mkPackageName "nonexistent-package") $ Config.ExtraRemotePackage $ Config.RemoteGitPackage { git: "https://github.com/spacchetti/purescript-metadata.git" , ref: "spago-test/branch-with-slash" @@ -153,7 +153,7 @@ spec = Spec.around withTempDir do ( conf { workspace = conf.workspace # map ( _ - { extra_packages = Just $ Map.fromFoldable + { extraPackages = Just $ Map.fromFoldable [ Tuple (mkPackageName "spago") $ Config.ExtraRemotePackage $ Config.RemoteGitPackage { git: "https://github.com/purescript/spago.git" , ref: "cbdbbf8f8771a7e43f04b18cdefffbcb0f03a990" @@ -181,7 +181,7 @@ spec = Spec.around withTempDir do ( conf { workspace = conf.workspace # map ( _ - { extra_packages = Just $ Map.fromFoldable + { extraPackages = Just $ Map.fromFoldable [ Tuple (mkPackageName "either") $ Config.ExtraRemotePackage $ Config.RemoteGitPackage { git: "https://github.com/purescript/spago.git" , ref: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" @@ -248,7 +248,7 @@ writeConfigWithEither = do ( conf { workspace = conf.workspace # map ( _ - { extra_packages = Just $ Map.fromFoldable + { extraPackages = Just $ Map.fromFoldable [ Tuple (mkPackageName "either") $ Config.ExtraRemotePackage $ Config.RemoteGitPackage { git: "https://github.com/purescript/purescript-either.git" , ref: "af655a04ed2fd694b6688af39ee20d7907ad0763" diff --git a/test/Spago/Lock.purs b/test/Spago/Lock.purs index 31cd15be3..13d57dd42 100644 --- a/test/Spago/Lock.purs +++ b/test/Spago/Lock.purs @@ -37,9 +37,9 @@ validLockfile = [ packageTuple "effect" (Just (unsafeFromRight (Range.parse ">=1.0.0 <5.0.0"))) , packageTuple "my-library" Nothing ] - , test_dependencies: Dependencies Map.empty + , testDependencies: Dependencies Map.empty , path: "my-app" - , build_plan: Set.fromFoldable + , buildPlan: Set.fromFoldable [ mkPackageName "my-library" , mkPackageName "effect" , mkPackageName "prelude" @@ -47,12 +47,12 @@ validLockfile = } , packageTuple "my-library" { dependencies: Dependencies $ Map.fromFoldable [ packageTuple "prelude" Nothing ] - , test_dependencies: Dependencies $ Map.fromFoldable [ packageTuple "console" (Just Config.widestRange) ] + , testDependencies: Dependencies $ Map.fromFoldable [ packageTuple "console" (Just Config.widestRange) ] , path: "my-library" - , build_plan: Set.fromFoldable [ mkPackageName "prelude" ] + , buildPlan: Set.fromFoldable [ mkPackageName "prelude" ] } ] - , package_set: Just + , packageSet: Just { address: SetFromRegistry { registry: unsafeFromRight (Version.parse "22.1.1") } , compiler: unsafeFromRight (Range.parse ">=0.13.8 <0.14.0") -- This is not actually the content of the package set, but you get the idea @@ -62,7 +62,7 @@ validLockfile = , Tuple (mkPackageName "console") (Core.RemoteRegistryVersion $ mkVersion "4.0.0") ] } - , extra_packages: Map.fromFoldable + , extraPackages: Map.fromFoldable [ packageTuple "console" $ ExtraRemotePackage $ RemoteGitPackage { git: "https://github.com/purescript/purescript-console.git" , ref: "v1.0.0" @@ -115,25 +115,25 @@ workspace: packages: my-app: path: my-app - build_plan: + buildPlan: - effect - my-library - prelude dependencies: - effect: ">=1.0.0 <5.0.0" - my-library - test_dependencies: [] + testDependencies: [] my-library: path: my-library - build_plan: + buildPlan: - prelude dependencies: - prelude - test_dependencies: + testDependencies: - console: "*" - package_set: + packageSet: address: registry: 22.1.1 compiler: ">=0.13.8 <0.14.0" @@ -141,7 +141,7 @@ workspace: console: 4.0.0 effect: 4.0.0 prelude: 4.0.0 - extra_packages: + extraPackages: console: git: https://github.com/purescript/purescript-console.git ref: v1.0.0 diff --git a/test/Spago/Upgrade.purs b/test/Spago/Upgrade.purs index 6765867fe..997ae2870 100644 --- a/test/Spago/Upgrade.purs +++ b/test/Spago/Upgrade.purs @@ -23,6 +23,6 @@ spec = Spec.around withTempDir do startingTime <- liftEffect $ Now.now maybeConfig <- runSpago { logOptions: { color: false, verbosity: LogQuiet, startingTime } } (Core.readConfig "spago.yaml") case maybeConfig of - Right { yaml: { workspace: Just { package_set: Just (SetFromRegistry { registry }) } } } | registry > initialVersion -> pure unit + Right { yaml: { workspace: Just { packageSet: Just (SetFromRegistry { registry }) } } } | registry > initialVersion -> pure unit Right { yaml: c } -> Assert.fail $ "Could not upgrade the package set, config: " <> printJson Core.configCodec c Left err -> Assert.fail $ "Could not read config: " <> show err