Merge pull request #6104 from commercialhaskell/fix2407-5

Fix #2407 Refactor Stack.Types.Config and Stack.Types.Config.Build
commercialhaskell · Apr 19, 2023 · f317632 · f317632
2 parents 5ddd9e8 + 4e590bf
commit f317632
Show file tree

Hide file tree

Showing 38 changed files with 215 additions and 195 deletions.
diff --git a/package.yaml b/package.yaml
@@ -265,13 +265,13 @@ library:
   - Stack.Types.ApplyGhcOptions
   - Stack.Types.Build
   - Stack.Types.BuildConfig
+  - Stack.Types.BuildOpts
   - Stack.Types.CabalConfigKey
   - Stack.Types.ColorWhen
   - Stack.Types.CompilerBuild
   - Stack.Types.CompilerPaths
   - Stack.Types.Compiler
   - Stack.Types.Config
-  - Stack.Types.Config.Build
   - Stack.Types.Config.Exception
   - Stack.Types.ConfigMonoid
   - Stack.Types.Curator
@@ -282,6 +282,7 @@ library:
   - Stack.Types.DumpPackage
   - Stack.Types.EnvConfig
   - Stack.Types.EnvSettings
+  - Stack.Types.ExtraDirs
   - Stack.Types.GHCDownloadInfo
   - Stack.Types.GHCVariant
   - Stack.Types.GhcOptionKey
@@ -296,6 +297,7 @@ library:
   - Stack.Types.PackageName
   - Stack.Types.Platform
   - Stack.Types.Project
+  - Stack.Types.ProjectAndConfigMonoid
   - Stack.Types.ProjectConfig
   - Stack.Types.PvpBounds
   - Stack.Types.Resolver

diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs
@@ -39,22 +39,24 @@ import           Stack.Types.Build
                    , TaskType (..), taskLocation
                    )
 import           Stack.Types.BuildConfig ( HasBuildConfig, stackYamlL )
+import           Stack.Types.BuildOpts
+                   ( BuildCommand (..), BuildOpts (..), BuildOptsCLI (..)
+                   , FileWatchOpts (..), buildOptsMonoidBenchmarksL
+                   , buildOptsMonoidHaddockL, buildOptsMonoidInstallExesL
+                   , buildOptsMonoidTestsL
+                   )
 import           Stack.Types.Compiler ( getGhcVersion )
 import           Stack.Types.CompilerPaths ( cabalVersionL )
 import           Stack.Types.Config
-                   ( BuildOpts (..), BuildOptsCLI (..), Config (..)
-                   , HasConfig (..), buildOptsL, buildOptsMonoidBenchmarksL
-                   , buildOptsMonoidHaddockL, buildOptsMonoidInstallExesL
-                   , buildOptsMonoidTestsL, globalOptsBuildOptsMonoidL
+                   ( Config (..), HasConfig (..), buildOptsL
                    )
-import           Stack.Types.Config.Build
-                   ( BuildCommand (..), FileWatchOpts (..) )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), HasSourceMap
                    , actualCompilerVersionL, installationRootDeps
                    , installationRootLocal, packageDatabaseDeps
                    , packageDatabaseExtra, packageDatabaseLocal
                    )
+import           Stack.Types.GlobalOpts ( globalOptsBuildOptsMonoidL )
 import           Stack.Types.NamedComponent ( exeComponents )
 import           Stack.Types.Package
                    ( InstallLocation (..), LocalPackage (..), Package (..)

diff --git a/src/Stack/Build/ConstructPlan.hs b/src/Stack/Build/ConstructPlan.hs
@@ -40,13 +40,12 @@ import           Stack.Types.Build
                    )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), stackYamlL )
+import           Stack.Types.BuildOpts
+                   ( BuildOpts (..), BuildOptsCLI (..), BuildSubset (..) )
 import           Stack.Types.Compiler ( WhichCompiler (..) )
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..) )
-import           Stack.Types.Config
-                   ( BuildOpts (..), BuildOptsCLI (..), BuildSubset (..)
-                   , Config (..), HasConfig (..), stackRootL
-                   )
+import           Stack.Types.Config ( Config (..), HasConfig (..), stackRootL )
 import           Stack.Types.Curator ( Curator (..) )
 import           Stack.Types.Dependency
                    ( DepValue (DepValue), DepType (AsLibrary) )

diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
@@ -139,20 +139,20 @@ import           Stack.Types.Build
                    )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), projectRootL )
+import           Stack.Types.BuildOpts
+                   ( BenchmarkOpts (..), BuildOpts (..), BuildOptsCLI (..)
+                   , CabalVerbosity (..), HaddockOpts (..), TestOpts (..)
+                   )
 import           Stack.Types.Compiler
                    ( ActualCompiler (..), WhichCompiler (..)
-                   , compilerVersionString, getGhcVersion
+                   , compilerVersionString, getGhcVersion, whichCompilerL
                    )
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), GhcPkgExe (..), HasCompiler (..)
                    , cabalVersionL, cpWhich, getCompilerPath, getGhcPkgExe
                    )
 import           Stack.Types.Config
-                   ( BenchmarkOpts (..), BuildOpts (..), BuildOptsCLI (..)
-                   , CabalVerbosity (..), Config (..), HaddockOpts (..)
-                   , HasConfig (..), TestOpts (..), buildOptsL, stackRootL
-                   , whichCompilerL
-                   )
+                   ( Config (..), HasConfig (..), buildOptsL, stackRootL )
 import           Stack.Types.DumpLogs ( DumpLogs (..) )
 import           Stack.Types.DumpPackage ( DumpPackage (..) )
 import           Stack.Types.EnvConfig

diff --git a/src/Stack/Build/Haddock.hs b/src/Stack/Build/Haddock.hs
@@ -33,7 +33,7 @@ import           Stack.Prelude
 import           Stack.Types.Build ( BaseConfigOpts (..), BuildException (..) )
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..) )
-import           Stack.Types.Config
+import           Stack.Types.BuildOpts
                    ( BuildOpts (..), BuildOptsCLI (..), HaddockOpts (..) )
 import           Stack.Types.DumpPackage ( DumpPackage (..) )
 import           Stack.Types.GhcPkgId ( GhcPkgId )

diff --git a/src/Stack/Build/Source.hs b/src/Stack/Build/Source.hs
@@ -36,12 +36,13 @@ import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
 import           Stack.Types.Build ( FlagSource (..) )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
-import           Stack.Types.CabalConfigKey ( CabalConfigKey (..) )
-import           Stack.Types.CompilerPaths ( HasCompiler, getCompilerPath )
-import           Stack.Types.Config
+import           Stack.Types.BuildOpts
                    ( ApplyCLIFlag (..), BuildOpts (..), BuildOptsCLI (..)
-                   , Config (..), HasConfig (..), TestOpts (..), buildOptsL
+                   , TestOpts (..)
                    )
+import           Stack.Types.CabalConfigKey ( CabalConfigKey (..) )
+import           Stack.Types.CompilerPaths ( HasCompiler, getCompilerPath )
+import           Stack.Types.Config ( Config (..), HasConfig (..), buildOptsL )
 import           Stack.Types.Curator ( Curator (..) )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), HasSourceMap (..)

diff --git a/src/Stack/Build/Target.hs b/src/Stack/Build/Target.hs
@@ -76,7 +76,8 @@ import           Stack.SourceMap ( additionalDepPackage )
 import           Stack.Prelude
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
-import           Stack.Types.Config ( BuildOptsCLI (..), Config (..) )
+import           Stack.Types.BuildOpts ( BuildOptsCLI (..) )
+import           Stack.Types.Config ( Config (..) )
 import           Stack.Types.NamedComponent
                    ( NamedComponent (..), renderComponent )
 import           Stack.Types.Build ( BuildPrettyException (..) )

diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -101,13 +101,12 @@ import           Stack.Types.AllowNewerDeps ( AllowNewerDeps (..) )
 import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
 import           Stack.Types.Build ( BuildException (..), FlagSource (..) )
 import           Stack.Types.BuildConfig ( BuildConfig (..) )
+import           Stack.Types.BuildOpts ( BuildOpts (..) )
 import           Stack.Types.ColorWhen ( ColorWhen (..) )
 import           Stack.Types.Compiler ( defaultCompilerRepository )
 import           Stack.Types.Config
-                   ( BuildOpts (..), Config (..), HasConfig (..)
-                   , ProjectAndConfigMonoid (..), askLatestSnapshotUrl
-                   , configProjectRoot, parseProjectAndConfigMonoid
-                   , platformOnlyRelDir, stackRootL, workDirL
+                   ( Config (..), HasConfig (..), askLatestSnapshotUrl
+                   , configProjectRoot, stackRootL, workDirL
                    )
 import           Stack.Types.Config.Exception
                    ( ConfigException (..), ConfigPrettyException (..)
@@ -118,8 +117,11 @@ import           Stack.Types.Docker ( DockerOptsMonoid (..), dockerEnable )
 import           Stack.Types.DumpLogs ( DumpLogs (..) )
 import           Stack.Types.GlobalOpts (  GlobalOpts (..) )
 import           Stack.Types.Nix ( nixEnable )
-import           Stack.Types.Platform ( PlatformVariant (..) )
+import           Stack.Types.Platform
+                   ( PlatformVariant (..), platformOnlyRelDir )
 import           Stack.Types.Project ( Project (..) )
+import           Stack.Types.ProjectAndConfigMonoid
+                   ( ProjectAndConfigMonoid (..), parseProjectAndConfigMonoid )
 import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
 import           Stack.Types.PvpBounds ( PvpBounds (..), PvpBoundsType (..) )
 import           Stack.Types.Resolver ( AbstractResolver (..), Snapshots (..) )

diff --git a/src/Stack/Config/Build.hs b/src/Stack/Config/Build.hs
@@ -11,7 +11,7 @@ module Stack.Config.Build
 
 import           Distribution.Verbosity ( normal )
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Types.BuildOpts
                    ( BenchmarkOpts (..), BenchmarkOptsMonoid (..)
                    , BuildOpts (..), BuildOptsMonoid (..), CabalVerbosity (..)
                    , HaddockOpts (..), HaddockOptsMonoid (..), TestOpts (..)

diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs
@@ -46,7 +46,7 @@ import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
 import           Stack.Types.Compiler ( getGhcVersion )
 import           Stack.Types.CompilerPaths ( cabalVersionL )
-import           Stack.Types.Config ( BuildOptsCLI (..), defaultBuildOptsCLI )
+import           Stack.Types.BuildOpts ( BuildOptsCLI (..), defaultBuildOptsCLI )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL
                    , hpcReportDir

diff --git a/src/Stack/Dot.hs b/src/Stack/Dot.hs
@@ -43,14 +43,19 @@ import           Stack.SourceMap
 import           Stack.Types.Build
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.BuildOpts
+                   ( ApplyCLIFlag, BuildOptsCLI (..), buildOptsMonoidBenchmarksL
+                   , buildOptsMonoidTestsL, defaultBuildOptsCLI
+                   )
 import           Stack.Types.Compiler ( wantedToActual )
-import           Stack.Types.Config
+import           Stack.Types.Config ( HasConfig (..) )
 import           Stack.Types.DumpPackage ( DumpPackage (..) )
 import           Stack.Types.EnvConfig ( EnvConfig (..), HasSourceMap (..) )
 import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
 import           Stack.Types.GhcPkgId
+import           Stack.Types.GlobalOpts ( globalOptsBuildOptsMonoidL )
 import           Stack.Types.Platform ( HasPlatform (..) )
-import           Stack.Types.Runner ( HasRunner (..), Runner )
+import           Stack.Types.Runner ( HasRunner (..), Runner, globalOptsL )
 import           Stack.Types.SourceMap
 
 -- | Type representing exceptions thrown by functions exported by the

diff --git a/src/Stack/Exec.hs b/src/Stack/Exec.hs
@@ -25,12 +25,11 @@ import           Stack.Prelude
 import           Stack.Runners ( ShouldReexec (..), withConfig, withEnvConfig )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
+import           Stack.Types.BuildOpts
+                   ( BuildOptsCLI (..), defaultBuildOptsCLI )
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..), getGhcPkgExe )
-import           Stack.Types.Config
-                   ( BuildOptsCLI (..), Config (..), HasConfig (..)
-                   , defaultBuildOptsCLI
-                   )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
 import           Stack.Types.EnvConfig ( EnvConfig )
 import           Stack.Types.EnvSettings ( EnvSettings (..) )
 import           Stack.Types.Runner ( Runner )

diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs
@@ -45,12 +45,11 @@ import           Stack.Runners ( ShouldReexec (..), withConfig, withEnvConfig )
 import           Stack.Types.Build
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), stackYamlL )
+import           Stack.Types.BuildOpts
+                   ( ApplyCLIFlag, BuildOptsCLI (..), defaultBuildOptsCLI )
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..) )
-import           Stack.Types.Config
-                   ( ApplyCLIFlag, BuildOptsCLI (..), Config (..)
-                   , HasConfig (..), buildOptsL, defaultBuildOptsCLI
-                   )
+import           Stack.Types.Config ( Config (..), HasConfig (..), buildOptsL )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL
                    , shaPathForBytes

diff --git a/src/Stack/Hoogle.hs b/src/Stack/Hoogle.hs
@@ -24,17 +24,19 @@ import           Stack.Runners
                    ( ShouldReexec (..), withConfig, withDefaultEnvConfig
                    , withEnvConfig
                    )
-import           Stack.Types.Config
-                   ( BuildOptsCLI (..), Config (..), HasConfig (..)
-                   , buildOptsMonoidHaddockL, defaultBuildOptsCLI
-                   , globalOptsBuildOptsMonoidL
+import           Stack.Types.BuildOpts
+                   ( BuildOptsCLI (..), buildOptsMonoidHaddockL
+                   , defaultBuildOptsCLI
                    )
+import           Stack.Types.Config
+                   ( Config (..), HasConfig (..) )
 import           Stack.Types.EnvConfig
                    ( EnvConfig, HasSourceMap (..), hoogleDatabasePath
                    , hoogleRoot
                    )
 import           Stack.Types.EnvSettings ( EnvSettings (..) )
-import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.GlobalOpts
+                   ( GlobalOpts (..), globalOptsBuildOptsMonoidL )
 import           Stack.Types.Runner ( Runner, globalOptsL )
 import           Stack.Types.SourceMap ( DepPackage (..), SourceMap (..) )
 

diff --git a/src/Stack/Options/BenchParser.hs b/src/Stack/Options/BenchParser.hs
@@ -10,7 +10,7 @@ import           Options.Applicative
 import           Options.Applicative.Builder.Extra ( optionalFirst )
 import           Stack.Prelude
 import           Stack.Options.Utils ( hideMods )
-import           Stack.Types.Config ( BenchmarkOptsMonoid (..) )
+import           Stack.Types.BuildOpts ( BenchmarkOptsMonoid (..) )
 
 -- | Parser for bench arguments.
 -- FIXME hiding options

diff --git a/src/Stack/Options/BuildMonoidParser.hs b/src/Stack/Options/BuildMonoidParser.hs
@@ -23,7 +23,7 @@ import           Stack.Options.BenchParser ( benchOptsParser )
 import           Stack.Options.TestParser ( testOptsParser )
 import           Stack.Options.HaddockParser ( haddockOptsParser )
 import           Stack.Options.Utils ( GlobalOptsContext (..), hideMods )
-import           Stack.Types.Config.Build
+import           Stack.Types.BuildOpts
                    ( BuildOptsMonoid (..), CabalVerbosity
                    , toFirstCabalVerbosity
                    )

diff --git a/src/Stack/Options/BuildParser.hs b/src/Stack/Options/BuildParser.hs
@@ -14,7 +14,11 @@ import           Options.Applicative.Builder.Extra
 import           Stack.Options.Completion
 import           Stack.Options.PackageParser ( readFlag )
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Types.BuildOpts
+                   ( ApplyCLIFlag, BuildCommand, BuildOptsCLI (..)
+                   , BuildSubset (..), FileWatchOpts (..)
+                   )
+import           Stack.Types.Config ()
 
 -- | Parser for CLI-only build arguments
 buildOptsParser :: BuildCommand

diff --git a/src/Stack/Options/HaddockParser.hs b/src/Stack/Options/HaddockParser.hs
@@ -8,7 +8,7 @@ import           Options.Applicative ( Parser, help, long, metavar )
 import           Options.Applicative.Args ( argsOption )
 import           Stack.Options.Utils ( hideMods )
 import           Stack.Prelude
-import           Stack.Types.Config ( HaddockOptsMonoid (..) )
+import           Stack.Types.BuildOpts ( HaddockOptsMonoid (..) )
 
 -- | Parser for haddock arguments.
 haddockOptsParser :: Bool -> Parser HaddockOptsMonoid

diff --git a/src/Stack/Options/PackageParser.hs b/src/Stack/Options/PackageParser.hs
@@ -8,7 +8,7 @@ import qualified Data.Map as Map
 import           Options.Applicative ( ReadM, readerError )
 import           Options.Applicative.Types ( readerAsk )
 import           Stack.Prelude
-import           Stack.Types.Config.Build ( ApplyCLIFlag (..) )
+import           Stack.Types.BuildOpts ( ApplyCLIFlag (..) )
 
 -- | Parser for package:[-]flag
 readFlag :: ReadM (Map ApplyCLIFlag (Map FlagName Bool))

diff --git a/src/Stack/Options/TestParser.hs b/src/Stack/Options/TestParser.hs
@@ -9,7 +9,8 @@ import           Options.Applicative.Args
 import           Options.Applicative.Builder.Extra
 import           Stack.Options.Utils
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Types.BuildOpts ( TestOptsMonoid (..) )
+import           Stack.Types.Config ()
 
 -- | Parser for test arguments.
 -- FIXME hide args

diff --git a/src/Stack/Path.hs b/src/Stack/Path.hs
@@ -28,11 +28,11 @@ import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), projectRootL
                    , stackYamlL
                    )
+import           Stack.Types.BuildOpts ( buildOptsMonoidHaddockL )
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..), getCompilerPath )
 import           Stack.Types.Config
-                   ( Config (..), HasConfig (..), buildOptsMonoidHaddockL
-                   , globalOptsBuildOptsMonoidL, stackGlobalConfigL, stackRootL
+                   ( Config (..), HasConfig (..), stackGlobalConfigL, stackRootL
                    )
 import           Stack.Types.EnvConfig
                    ( EnvConfig, HasEnvConfig (..), bindirCompilerTools
@@ -41,6 +41,7 @@ import           Stack.Types.EnvConfig
                    , packageDatabaseExtra, packageDatabaseLocal
                    )
 import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
+import           Stack.Types.GlobalOpts ( globalOptsBuildOptsMonoidL )
 import           Stack.Types.Platform ( HasPlatform (..) )
 import           Stack.Types.Runner ( HasRunner (..), Runner, globalOptsL )
 import qualified System.FilePath as FP

diff --git a/src/Stack/Runners.hs b/src/Stack/Runners.hs
@@ -33,9 +33,10 @@ import qualified Stack.Nix as Nix
 import           Stack.Prelude
 import           Stack.Setup ( setupEnv )
 import           Stack.Storage.User ( logUpgradeCheck, upgradeChecksSince )
+import           Stack.Types.BuildOpts
+                   ( BuildOptsCLI, defaultBuildOptsCLI )
 import           Stack.Types.ColorWhen ( ColorWhen (..) )
-import           Stack.Types.Config
-                   ( BuildOptsCLI, Config (..), defaultBuildOptsCLI )
+import           Stack.Types.Config ( Config (..) )
 import           Stack.Types.ConfigMonoid ( ConfigMonoid (..) )
 import           Stack.Types.Docker ( dockerEnable )
 import           Stack.Types.EnvConfig ( EnvConfig )

diff --git a/src/Stack/SDist.hs b/src/Stack/SDist.hs
@@ -66,10 +66,9 @@ import           Stack.Types.Build
                    )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), stackYamlL )
-import           Stack.Types.Config
-                   ( BuildOpts (..), Config (..), HasConfig (..)
-                   , defaultBuildOpts, defaultBuildOptsCLI
-                   )
+import           Stack.Types.BuildOpts
+                   ( BuildOpts (..), defaultBuildOpts, defaultBuildOptsCLI )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL )
 import           Stack.Types.GhcPkgId ( GhcPkgId )