Merge pull request #6103 from commercialhaskell/fix2407-4

Re #2407 Move Project out of Stack.Types.Config
commercialhaskell · Apr 19, 2023 · 5ddd9e8 · 5ddd9e8
2 parents 2d3c9d0 + e99aa3d
commit 5ddd9e8
Show file tree

Hide file tree

Showing 34 changed files with 413 additions and 383 deletions.
diff --git a/package.yaml b/package.yaml
@@ -274,12 +274,14 @@ library:
   - Stack.Types.Config.Build
   - Stack.Types.Config.Exception
   - Stack.Types.ConfigMonoid
+  - Stack.Types.Curator
   - Stack.Types.Docker
   - Stack.Types.DockerEntrypoint
   - Stack.Types.DownloadInfo
   - Stack.Types.DumpLogs
   - Stack.Types.DumpPackage
   - Stack.Types.EnvConfig
+  - Stack.Types.EnvSettings
   - Stack.Types.GHCDownloadInfo
   - Stack.Types.GHCVariant
   - Stack.Types.GhcOptionKey
@@ -293,6 +295,8 @@ library:
   - Stack.Types.Package
   - Stack.Types.PackageName
   - Stack.Types.Platform
+  - Stack.Types.Project
+  - Stack.Types.ProjectConfig
   - Stack.Types.PvpBounds
   - Stack.Types.Resolver
   - Stack.Types.Runner

diff --git a/src/Stack/Build/ConstructPlan.hs b/src/Stack/Build/ConstructPlan.hs
@@ -45,14 +45,15 @@ import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..) )
 import           Stack.Types.Config
                    ( BuildOpts (..), BuildOptsCLI (..), BuildSubset (..)
-                   , Config (..), Curator (..), EnvSettings (..), HasConfig (..)
-                   , minimalEnvSettings, stackRootL
+                   , Config (..), HasConfig (..), stackRootL
                    )
+import           Stack.Types.Curator ( Curator (..) )
 import           Stack.Types.Dependency
                    ( DepValue (DepValue), DepType (AsLibrary) )
 import           Stack.Types.DumpPackage ( DumpPackage (..) )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), HasSourceMap (..) )
+import           Stack.Types.EnvSettings ( EnvSettings (..), minimalEnvSettings )
 import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
 import           Stack.Types.GhcPkgId ( GhcPkgId )
 import           Stack.Types.NamedComponent ( exeComponents, renderComponent )

diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
@@ -149,9 +149,9 @@ import           Stack.Types.CompilerPaths
                    )
 import           Stack.Types.Config
                    ( BenchmarkOpts (..), BuildOpts (..), BuildOptsCLI (..)
-                   , CabalVerbosity (..), Config (..), Curator (..)
-                   , EnvSettings (..), HaddockOpts (..), HasConfig (..)
-                   , TestOpts (..), buildOptsL, stackRootL, whichCompilerL
+                   , CabalVerbosity (..), Config (..), HaddockOpts (..)
+                   , HasConfig (..), TestOpts (..), buildOptsL, stackRootL
+                   , whichCompilerL
                    )
 import           Stack.Types.DumpLogs ( DumpLogs (..) )
 import           Stack.Types.DumpPackage ( DumpPackage (..) )
@@ -162,6 +162,7 @@ import           Stack.Types.EnvConfig
                    , packageDatabaseLocal, platformGhcRelDir
                    , shouldForceGhcColorFlag
                    )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
 import           Stack.Types.GhcPkgId ( GhcPkgId, ghcPkgIdString, unGhcPkgId )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
 import           Stack.Types.NamedComponent
@@ -176,6 +177,7 @@ import           Stack.Types.Package
                    )
 import           Stack.Types.PackageFile ( PackageWarning (..) )
 import           Stack.Types.Platform ( HasPlatform (..) )
+import           Stack.Types.Curator ( Curator (..) )
 import           Stack.Types.Runner ( HasRunner, globalOptsL, terminalL )
 import           Stack.Types.SourceMap ( Target )
 import           Stack.Types.Version ( withinRange )

diff --git a/src/Stack/Build/Source.hs b/src/Stack/Build/Source.hs
@@ -40,10 +40,9 @@ import           Stack.Types.CabalConfigKey ( CabalConfigKey (..) )
 import           Stack.Types.CompilerPaths ( HasCompiler, getCompilerPath )
 import           Stack.Types.Config
                    ( ApplyCLIFlag (..), BuildOpts (..), BuildOptsCLI (..)
-                   , Config (..), Curator (..), HasConfig (..)
-                   , ProjectPackage (..), TestOpts (..), buildOptsL, ppGPD
-                   , ppRoot
+                   , Config (..), HasConfig (..), TestOpts (..), buildOptsL
                    )
+import           Stack.Types.Curator ( Curator (..) )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), HasSourceMap (..)
                    , actualCompilerVersionL
@@ -58,9 +57,9 @@ import           Stack.Types.Package
 import           Stack.Types.PackageFile ( PackageWarning, getPackageFiles )
 import           Stack.Types.Platform ( HasPlatform (..) )
 import           Stack.Types.SourceMap
-                   ( CommonPackage (..), DepPackage (..), SMActual (..)
-                   , SMTargets (..), SourceMap (..), SourceMapHash (..)
-                   , Target (..)
+                   ( CommonPackage (..), DepPackage (..), ProjectPackage (..)
+                   , SMActual (..), SMTargets (..), SourceMap (..)
+                   , SourceMapHash (..), Target (..), ppGPD, ppRoot
                    )
 import           System.FilePath ( takeFileName )
 import           System.IO.Error ( isDoesNotExistError )

diff --git a/src/Stack/Build/Target.hs b/src/Stack/Build/Target.hs
@@ -76,17 +76,15 @@ import           Stack.SourceMap ( additionalDepPackage )
 import           Stack.Prelude
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
-import           Stack.Types.Config
-                   ( BuildOptsCLI (..), Config (..), ProjectConfig (..)
-                   , ppComponents, ppRoot
-                   )
+import           Stack.Types.Config ( BuildOptsCLI (..), Config (..) )
 import           Stack.Types.NamedComponent
                    ( NamedComponent (..), renderComponent )
 import           Stack.Types.Build ( BuildPrettyException (..) )
+import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
 import           Stack.Types.SourceMap
                    ( DepPackage (..), GlobalPackage (..), PackageType (..)
                    , ProjectPackage, SMActual (..), SMTargets (..)
-                   , SMWanted (..), Target (..)
+                   , SMWanted (..), Target (..), ppComponents, ppRoot
                    )
 
 -- | Do we need any targets? For example, `stack build` will fail if

diff --git a/src/Stack/Clean.hs b/src/Stack/Clean.hs
@@ -18,9 +18,9 @@ import           Stack.Prelude
 import           Stack.Runners ( ShouldReexec (..), withConfig )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), getProjectWorkDir )
-import           Stack.Types.Config ( Config, ppRoot )
+import           Stack.Types.Config ( Config )
 import           Stack.Types.Runner ( Runner )
-import           Stack.Types.SourceMap ( SMWanted (..) )
+import           Stack.Types.SourceMap ( SMWanted (..), ppRoot )
 
 -- | Type representing exceptions thrown by functions exported by the
 -- "Stack.Clean" module.

diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -104,11 +104,10 @@ import           Stack.Types.BuildConfig ( BuildConfig (..) )
 import           Stack.Types.ColorWhen ( ColorWhen (..) )
 import           Stack.Types.Compiler ( defaultCompilerRepository )
 import           Stack.Types.Config
-                   ( BuildOpts (..), Config (..), HasConfig (..), Project (..)
-                   , ProjectAndConfigMonoid (..), ProjectConfig (..)
-                   , askLatestSnapshotUrl, configProjectRoot
-                   , parseProjectAndConfigMonoid, platformOnlyRelDir, stackRootL
-                   , workDirL
+                   ( BuildOpts (..), Config (..), HasConfig (..)
+                   , ProjectAndConfigMonoid (..), askLatestSnapshotUrl
+                   , configProjectRoot, parseProjectAndConfigMonoid
+                   , platformOnlyRelDir, stackRootL, workDirL
                    )
 import           Stack.Types.Config.Exception
                    ( ConfigException (..), ConfigPrettyException (..)
@@ -120,6 +119,8 @@ import           Stack.Types.DumpLogs ( DumpLogs (..) )
 import           Stack.Types.GlobalOpts (  GlobalOpts (..) )
 import           Stack.Types.Nix ( nixEnable )
 import           Stack.Types.Platform ( PlatformVariant (..) )
+import           Stack.Types.Project ( Project (..) )
+import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
 import           Stack.Types.PvpBounds ( PvpBounds (..), PvpBoundsType (..) )
 import           Stack.Types.Resolver ( AbstractResolver (..), Snapshots (..) )
 import           Stack.Types.Runner

diff --git a/src/Stack/Config/Docker.hs b/src/Stack/Config/Docker.hs
@@ -13,7 +13,7 @@ import           Data.List ( find )
 import qualified Data.Text as T
 import           Distribution.Version ( simplifyVersionRange )
 import           Stack.Prelude
-import           Stack.Types.Config ( Project (..) )
+import           Stack.Types.Project ( Project (..) )
 import           Stack.Types.Docker
                    ( DockerOpts (..), DockerMonoidRepoOrImage (..)
                    , DockerOptsMonoid (..), dockerImageArgName

diff --git a/src/Stack/ConfigCmd.hs b/src/Stack/ConfigCmd.hs
@@ -38,15 +38,14 @@ import           Stack.Config
                    )
 import           Stack.Constants ( stackDotYaml )
 import           Stack.Prelude
-import           Stack.Types.Config
-                   ( Config (..), EnvSettings (..), HasConfig (..)
-                   , ProjectConfig (..)
-                   )
+import           Stack.Types.Config ( Config (..), HasConfig (..) )
 import           Stack.Types.ConfigMonoid
                    ( configMonoidInstallGHCName, configMonoidSystemGHCName )
 import           Stack.Types.EnvConfig ( EnvConfig )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
 import           Stack.Types.GHCVariant ( HasGHCVariant )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
 import           Stack.Types.Resolver ( AbstractResolver, readAbstractResolver )
 import           Stack.Types.Runner ( globalOptsL )
 import           System.Environment ( getEnvironment )

diff --git a/src/Stack/Constants/Config.hs b/src/Stack/Constants/Config.hs
@@ -28,11 +28,9 @@ import           Stack.Constants ( cabalPackageName )
 import           Stack.Prelude
 import           Stack.Types.BuildConfig ( HasBuildConfig, projectRootL )
 import           Stack.Types.CompilerPaths ( cabalVersionL )
-import           Stack.Types.Config
-                   ( Config, HasConfig, stackRootL, useShaPathOnWindows
-                   , workDirL
-                   )
-import           Stack.Types.EnvConfig ( HasEnvConfig, platformGhcRelDir )
+import           Stack.Types.Config ( Config, HasConfig, stackRootL, workDirL )
+import           Stack.Types.EnvConfig
+                   ( HasEnvConfig, platformGhcRelDir, useShaPathOnWindows )
 
 -- | Output .o/.hi directory.
 objectInterfaceDirL :: HasBuildConfig env => Getting r env (Path Abs Dir)

diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs
@@ -46,8 +46,7 @@ import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
 import           Stack.Types.Compiler ( getGhcVersion )
 import           Stack.Types.CompilerPaths ( cabalVersionL )
-import           Stack.Types.Config
-                   ( BuildOptsCLI (..), defaultBuildOptsCLI, ppRoot )
+import           Stack.Types.Config ( BuildOptsCLI (..), defaultBuildOptsCLI )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL
                    , hpcReportDir
@@ -58,7 +57,7 @@ import           Stack.Types.Package
 import           Stack.Types.Runner ( Runner )
 import           Stack.Types.SourceMap
                    ( PackageType (..), SMTargets (..), SMWanted (..)
-                   , SourceMap (..), Target (..)
+                   , SourceMap (..), Target (..), ppRoot
                    )
 import           System.FilePath ( isPathSeparator )
 import           Trace.Hpc.Tix ( Tix (..), TixModule (..), readTix, writeTix )

diff --git a/src/Stack/Exec.hs b/src/Stack/Exec.hs
@@ -28,13 +28,13 @@ import           Stack.Types.BuildConfig
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..), getGhcPkgExe )
 import           Stack.Types.Config
-                   ( BuildOptsCLI (..), EnvSettings (..), HasConfig (..)
-                   , configProcessContextSettings, defaultBuildOptsCLI
-                   , ppComponents
+                   ( BuildOptsCLI (..), Config (..), HasConfig (..)
+                   , defaultBuildOptsCLI
                    )
 import           Stack.Types.EnvConfig ( EnvConfig )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
 import           Stack.Types.Runner ( Runner )
-import           Stack.Types.SourceMap ( SMWanted (..) )
+import           Stack.Types.SourceMap ( SMWanted (..), ppComponents )
 import           System.Directory ( withCurrentDirectory )
 import           System.FilePath ( isValid )
 

diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs
@@ -48,8 +48,14 @@ import           Stack.Types.BuildConfig
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..) )
 import           Stack.Types.Config
+                   ( ApplyCLIFlag, BuildOptsCLI (..), Config (..)
+                   , HasConfig (..), buildOptsL, defaultBuildOptsCLI
+                   )
 import           Stack.Types.EnvConfig
-                   ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL )
+                   ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL
+                   , shaPathForBytes
+                   )
+import           Stack.Types.EnvSettings ( defaultEnvSettings )
 import           Stack.Types.NamedComponent
 import           Stack.Types.Package
 import           Stack.Types.PackageFile

diff --git a/src/Stack/Hoogle.hs b/src/Stack/Hoogle.hs
@@ -25,14 +25,15 @@ import           Stack.Runners
                    , withEnvConfig
                    )
 import           Stack.Types.Config
-                   ( BuildOptsCLI (..), Config (..), EnvSettings (..)
-                   , HasConfig (..), buildOptsMonoidHaddockL
-                   , defaultBuildOptsCLI, globalOptsBuildOptsMonoidL
+                   ( BuildOptsCLI (..), Config (..), HasConfig (..)
+                   , buildOptsMonoidHaddockL, defaultBuildOptsCLI
+                   , globalOptsBuildOptsMonoidL
                    )
 import           Stack.Types.EnvConfig
                    ( EnvConfig, HasSourceMap (..), hoogleDatabasePath
                    , hoogleRoot
                    )
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
 import           Stack.Types.Runner ( Runner, globalOptsL )
 import           Stack.Types.SourceMap ( DepPackage (..), SourceMap (..) )

diff --git a/src/Stack/IDE.hs b/src/Stack/IDE.hs
@@ -19,11 +19,11 @@ import           Stack.Runners
                    ( ShouldReexec (..), withBuildConfig, withConfig )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
-import           Stack.Types.Config ( ppComponents )
 import           Stack.Types.NamedComponent
                    ( NamedComponent, renderPkgComponent )
 import           Stack.Types.Runner ( Runner )
-import           Stack.Types.SourceMap ( ProjectPackage (..), SMWanted (..) )
+import           Stack.Types.SourceMap
+                   ( ProjectPackage (..), SMWanted (..), ppComponents )
 import           System.IO ( putStrLn )
 
 -- Type representing output channel choices for the @stack ide packages@ and

diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs
@@ -47,10 +47,11 @@ import           Stack.Runners
                    ( ShouldReexec (..), withConfig, withGlobalProject )
 import           Stack.SourceMap
                    ( SnapshotCandidate, loadProjectSnapshotCandidate )
-import           Stack.Types.Config ( HasConfig, Project (..) )
+import           Stack.Types.Config ( HasConfig )
 import           Stack.Types.Config.Exception ( ConfigPrettyException (..) )
 import           Stack.Types.GHCVariant ( HasGHCVariant )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Project ( Project (..) )
 import           Stack.Types.Runner (Runner, globalOptsL )
 import           Stack.Types.Resolver ( AbstractResolver, Snapshots (..) )
 import           Stack.Types.Version ( stackMajorVersion )

diff --git a/src/Stack/Options/Completion.hs b/src/Stack/Options/Completion.hs
@@ -22,9 +22,11 @@ import           Stack.Options.GlobalParser ( globalOptsFromMonoid )
 import           Stack.Runners
 import           Stack.Prelude
 import           Stack.Types.BuildConfig ( BuildConfig (..), HasBuildConfig (..) )
-import           Stack.Types.Config
+import           Stack.Types.Config ( Config (..) )
 import           Stack.Types.EnvConfig ( EnvConfig )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.Project ( Project (..) )
+import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
 import           Stack.Types.NamedComponent
 import           Stack.Types.SourceMap
 

diff --git a/src/Stack/Options/ExecParser.hs b/src/Stack/Options/ExecParser.hs
@@ -14,7 +14,7 @@ import           Stack.Exec
                    ( ExecOpts (..), ExecOptsExtra (..), SpecialExecCmd (..) )
 import           Stack.Options.Completion
 import           Stack.Prelude
-import           Stack.Types.Config
+import           Stack.Types.EnvSettings ( EnvSettings (..) )
 
 -- | Parse command line arguments for Stack's @exec@, @ghc@, @run@,
 -- @runghc@ and @runhaskell@ commands.

diff --git a/src/Stack/Options/GlobalParser.hs b/src/Stack/Options/GlobalParser.hs
@@ -8,13 +8,14 @@ module Stack.Options.GlobalParser
   ) where
 
 import           Options.Applicative
-                   ( Parser, auto, completer, help, hidden, internal, long
-                   , metavar, option, strOption, value
+                   ( Parser, ReadM, auto, completer, help, hidden, internal
+                   , long, metavar, option, strOption, value
                    )
 import           Options.Applicative.Builder.Extra
                    ( fileExtCompleter, firstBoolFlagsFalse
                    , firstBoolFlagsNoDefault, firstBoolFlagsTrue, optionalFirst
                    )
+import           Options.Applicative.Types ( readerAsk )
 import           Path.IO ( getCurrentDir, resolveDir', resolveFile' )
 import qualified Stack.Docker as Docker
 import           Stack.Prelude
@@ -23,7 +24,6 @@ import           Stack.Options.LogLevelParser ( logLevelOptsParser )
 import           Stack.Options.ResolverParser
                    ( abstractResolverOptsParser, compilerOptsParser )
 import           Stack.Options.Utils ( GlobalOptsContext (..), hideMods )
-import           Stack.Types.Config ( defaultLogLevel, readStyles )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
 import           Stack.Types.GlobalOptsMonoid ( GlobalOptsMonoid (..) )
 import           Stack.Types.LockFileBehavior
@@ -143,3 +143,10 @@ globalOptsFromMonoid defaultTerminal GlobalOptsMonoid{..} = do
                 _ -> LFBReadOnly
         in  fromFirst defLFB globalMonoidLockFileBehavior
     }
+
+-- | Default logging level should be something useful but not crazy.
+defaultLogLevel :: LogLevel
+defaultLogLevel = LevelInfo
+
+readStyles :: ReadM StylesUpdate
+readStyles = parseStylesUpdateFromString <$> readerAsk
diff --git a/src/Stack/SDist.hs b/src/Stack/SDist.hs
@@ -68,7 +68,7 @@ import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), stackYamlL )
 import           Stack.Types.Config
                    ( BuildOpts (..), Config (..), HasConfig (..)
-                   , defaultBuildOpts, defaultBuildOptsCLI, ppRoot
+                   , defaultBuildOpts, defaultBuildOptsCLI
                    )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL )
@@ -83,7 +83,7 @@ import           Stack.Types.PvpBounds ( PvpBounds (..), PvpBoundsType (..) )
 import           Stack.Types.Runner ( HasRunner, Runner )
 import           Stack.Types.SourceMap
                    ( CommonPackage (..), ProjectPackage (..), SMWanted (..)
-                   , SourceMap (..)
+                   , SourceMap (..), ppRoot
                    )
 import           Stack.Types.Version
                    ( intersectVersionRanges, nextMajorVersion )