TS config cleanup - Part 2

waspc/cli/src/Wasp/Cli/Command/CreateNewProject/StarterTemplates/Templating.hs

@@ -10,9 +10,10 @@ import StrongPath (Abs, Dir, File, Path')
 import Wasp.Cli.Command.CreateNewProject.Common (defaultWaspVersionBounds)
 import Wasp.Cli.Command.CreateNewProject.ProjectDescription (NewProjectAppName, NewProjectName)
 import Wasp.NodePackageFFI (InstallablePackage (WaspConfigPackage), getPackageInstallationPath)
-import Wasp.Project.Analyze (WaspFilePath (..), findWaspFile)
+import Wasp.Project.Analyze (WaspFilePath (..))
 import Wasp.Project.Common (WaspProjectDir)
 import Wasp.Project.ExternalConfig.PackageJson (findPackageJsonFile)
+import Wasp.Project.WaspFile (findWaspFile)
 import qualified Wasp.Util.IO as IOUtil
 
 replaceTemplatePlaceholdersInTemplateFiles :: NewProjectAppName -> NewProjectName -> Path' Abs (Dir WaspProjectDir) -> IO ()

waspc/cli/src/Wasp/Cli/Command/Db/Studio.hs

@@ -11,7 +11,7 @@ import Wasp.Cli.Command (Command)
 import Wasp.Cli.Command.Message (cliSendMessageC)
 import Wasp.Cli.Command.Require (InWaspProject (InWaspProject), require)
 import Wasp.Generator.DbGenerator.Jobs (runStudio)
-import Wasp.Generator.Job.IO (readJobMessagesAndPrintThemPrefixed)
+import Wasp.Job.IO (readJobMessagesAndPrintThemPrefixed)
 import qualified Wasp.Message as Msg
 import Wasp.Project.Common (dotWaspDirInWaspProjectDir, generatedCodeDirInDotWaspDir)
 

waspc/cli/src/Wasp/Cli/Command/TsConfigSetup.hs

@@ -8,9 +8,9 @@ import StrongPath (Abs, Dir, Path')
 import System.Exit (ExitCode (..))
 import Wasp.Cli.Command (Command, CommandError (..), require)
 import Wasp.Cli.Command.Require (InWaspProject (InWaspProject))
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.IO (readJobMessagesAndPrintThemPrefixed)
-import Wasp.Generator.Job.Process (runNodeCommandAsJob)
+import qualified Wasp.Job as J
+import Wasp.Job.IO (readJobMessagesAndPrintThemPrefixed)
+import Wasp.Job.Process (runNodeCommandAsJob)
 import Wasp.NodePackageFFI (InstallablePackage (WaspConfigPackage), getPackageInstallationPath)
 
 -- | Prepares the project for using Wasp's TypeScript SDK.

waspc/src/Wasp/AI/GenerateNewProject/WaspFile.hs

@@ -24,7 +24,7 @@ import qualified Wasp.AI.GenerateNewProject.Common.Prompts as Prompts
 import Wasp.AI.GenerateNewProject.Plan (Plan)
 import Wasp.AI.OpenAI.ChatGPT (ChatMessage (..), ChatRole (..))
 import Wasp.Analyzer.Parser.Ctx (Ctx (..))
-import Wasp.Project.Analyze (analyzeWaspFileContent)
+import Wasp.Project.WaspFile (analyzeWaspFileContent)
 import qualified Wasp.Psl.Ast.Schema as Psl.Schema
 import qualified Wasp.Util.Aeson as Utils.Aeson
 

waspc/src/Wasp/Analyzer.hs

@@ -164,6 +164,16 @@ analyze prismaSchemaAst =
     >=> (wrapAnalyzerError TypeError . typeCheck stdTypes)
     >=> (wrapAnalyzerError EvaluationError . evaluate stdTypes)
 
+-- | When writing main.wasp.ts, TypeScript should know about all the available
+-- entities.
+-- Since Wasp's AST includes entity declarations, the easiest way to get a list
+-- of all entities defined in the Prisma Schema is by:
+--   1. Creating an AST with (and only with) the declarations for the Prisma
+--   schema Entities.
+--   2. Type-checking that AST and returning the result.
+-- This gives us a list of entity declarations we can then forward to
+-- TypeScript (which then validates the user config only uses existing
+-- entities).
 getEntityDecls :: Psl.Schema.Schema -> Either [AnalyzeError] [Decl]
 getEntityDecls schema =
   wrapAnalyzerError TypeError (typeCheck stdTypes astWithEntitiesOnly)

waspc/src/Wasp/Analyzer/Evaluator/Evaluation/TypedExpr/Combinators.hs

@@ -154,7 +154,6 @@ tuple4 eval1 eval2 eval3 eval4 = evaluation $ \(typeDefs, bindings) -> withCtx $
 extImport :: TypedExprEvaluation AppSpec.ExtImport.ExtImport
 extImport = evaluation' . withCtx $ \ctx -> \case
   TypedAST.ExtImport name extImportPath ->
-    -- NOTE(martin): This parsing here could instead be done in Parser.
     -- NOTE(martin): This parsing here could instead be done in Parser.
     --   I don't have a very good reason for doing it here instead of Parser, except
     --   for being somewhat simpler to implement.

waspc/src/Wasp/AppSpec/ExtImport.hs

@@ -34,9 +34,7 @@ instance FromJSON ExtImport where
     nameStr <- o .: "name"
     pathStr <- o .: "path"
     extImportName <- parseExtImportName kindStr nameStr
-    extImportPath <- case parseExtImportPath pathStr of
-      Right path' -> pure path'
-      Left err -> fail err
+    extImportPath <- either fail pure $ parseExtImportPath pathStr
     return $ ExtImport extImportName extImportPath
     where
       parseExtImportName kindStr nameStr = case kindStr of

waspc/src/Wasp/Error.hs

@@ -7,13 +7,14 @@ import StrongPath.Types (File)
 import Wasp.Analyzer.Parser.Ctx (Ctx, getCtxRgn)
 import Wasp.Analyzer.Parser.SourcePosition (SourcePosition (..))
 import Wasp.Analyzer.Parser.SourceRegion (SourceRegion (..))
+import Wasp.Project.Common (WaspLangFile)
 import Wasp.Util (indent, insertAt, leftPad)
 import qualified Wasp.Util.Terminal as T
 
 -- | Transforms compiler error (error with parse context) into an informative, pretty String that
 -- can be printed directly into the terminal. It uses terminal features like escape codes
 -- (colors, styling, ...).
-showCompilerErrorForTerminal :: (Path' Abs (File f), String) -> (String, Ctx) -> String
+showCompilerErrorForTerminal :: (Path' Abs (File WaspLangFile), String) -> (String, Ctx) -> String
 showCompilerErrorForTerminal (waspFilePath, waspFileContent) (errMsg, errCtx) =
   let srcRegion = getCtxRgn errCtx
    in intercalate

waspc/src/Wasp/Generator/DbGenerator/Jobs.hs

@@ -19,8 +19,8 @@ import StrongPath.TH (relfile)
 import qualified System.Info
 import Wasp.Generator.Common (ProjectRootDir)
 import Wasp.Generator.DbGenerator.Common (MigrateArgs (..), dbSchemaFileInProjectRootDir)
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.Process (runNodeCommandAsJob, runNodeCommandAsJobWithExtraEnv)
+import qualified Wasp.Job as J
+import Wasp.Job.Process (runNodeCommandAsJob, runNodeCommandAsJobWithExtraEnv)
 import Wasp.Generator.ServerGenerator.Common (serverRootDirInProjectRootDir)
 import Wasp.Generator.ServerGenerator.Db.Seed (dbSeedNameEnvVarName)
 import Wasp.Project.Common (WaspProjectDir, waspProjectDirFromProjectRootDir)

waspc/src/Wasp/Generator/DbGenerator/Operations.hs

@@ -36,7 +36,7 @@ import Wasp.Generator.DbGenerator.Common
   )
 import qualified Wasp.Generator.DbGenerator.Jobs as DbJobs
 import Wasp.Generator.FileDraft.WriteableMonad (WriteableMonad (copyDirectoryRecursive, doesDirectoryExist))
-import Wasp.Generator.Job.IO
+import Wasp.Job.IO
   ( collectJobTextOutputUntilExitReceived,
     printJobMsgsUntilExitReceived,
     readJobMessagesAndPrintThemPrefixed,

waspc/src/Wasp/Generator/NpmInstall.hs

@@ -16,9 +16,9 @@ import System.Exit (ExitCode (..))
 import UnliftIO (race)
 import Wasp.AppSpec (AppSpec (waspProjectDir))
 import Wasp.Generator.Common (ProjectRootDir)
-import Wasp.Generator.Job (Job, JobMessage, JobType)
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.IO.PrefixedWriter (PrefixedWriter, printJobMessagePrefixed, runPrefixedWriter)
+import Wasp.Job (Job, JobMessage, JobType)
+import qualified Wasp.Job as J
+import Wasp.Job.IO.PrefixedWriter (PrefixedWriter, printJobMessagePrefixed, runPrefixedWriter)
 import Wasp.Generator.Monad (GeneratorError (..))
 import Wasp.Generator.NpmInstall.Common (AllNpmDeps (..), getAllNpmDeps)
 import Wasp.Generator.NpmInstall.InstalledNpmDepsLog (forgetInstalledNpmDepsLog, loadInstalledNpmDepsLog, saveInstalledNpmDepsLog)

waspc/src/Wasp/Generator/SdkGenerator.hs

@@ -37,9 +37,9 @@ import Wasp.Generator.DbGenerator (getEntitiesForPrismaSchema)
 import qualified Wasp.Generator.DbGenerator.Auth as DbAuth
 import Wasp.Generator.FileDraft (FileDraft)
 import qualified Wasp.Generator.FileDraft as FD
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.IO (readJobMessagesAndPrintThemPrefixed)
-import Wasp.Generator.Job.Process (runNodeCommandAsJob)
+import qualified Wasp.Job as J
+import Wasp.Job.IO (readJobMessagesAndPrintThemPrefixed)
+import Wasp.Job.Process (runNodeCommandAsJob)
 import Wasp.Generator.Monad (Generator)
 import qualified Wasp.Generator.NpmDependencies as N
 import Wasp.Generator.SdkGenerator.AuthG (genAuth)

waspc/src/Wasp/Generator/ServerGenerator/Setup.hs

@@ -5,8 +5,8 @@ where
 
 import StrongPath (Abs, Dir, Path', (</>))
 import Wasp.Generator.Common (ProjectRootDir)
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.Process (runNodeCommandAsJob)
+import qualified Wasp.Job as J
+import Wasp.Job.Process (runNodeCommandAsJob)
 import qualified Wasp.Generator.ServerGenerator.Common as Common
 
 installNpmDependencies :: Path' Abs (Dir ProjectRootDir) -> J.Job

waspc/src/Wasp/Generator/ServerGenerator/Start.hs

@@ -5,8 +5,8 @@ where
 
 import StrongPath (Abs, Dir, Path', (</>))
 import Wasp.Generator.Common (ProjectRootDir)
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.Process (runNodeCommandAsJob)
+import qualified Wasp.Job as J
+import Wasp.Job.Process (runNodeCommandAsJob)
 import qualified Wasp.Generator.ServerGenerator.Common as Common
 
 startServer :: Path' Abs (Dir ProjectRootDir) -> J.Job

waspc/src/Wasp/Generator/Start.hs

@@ -9,8 +9,8 @@ import Control.Concurrent.Extra (threadDelay)
 import Control.Monad (void)
 import StrongPath (Abs, Dir, Path')
 import Wasp.Generator.Common (ProjectRootDir)
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.IO (readJobMessagesAndPrintThemPrefixed)
+import qualified Wasp.Job as J
+import Wasp.Job.IO (readJobMessagesAndPrintThemPrefixed)
 import Wasp.Generator.ServerGenerator.Start (startServer)
 import Wasp.Generator.WebAppGenerator.Start (startWebApp)
 

waspc/src/Wasp/Generator/Test.hs

@@ -7,7 +7,7 @@ import Control.Concurrent (newChan)
 import Control.Concurrent.Async (concurrently)
 import StrongPath (Abs, Dir, Path')
 import System.Exit (ExitCode (..))
-import Wasp.Generator.Job.IO (readJobMessagesAndPrintThemPrefixed)
+import Wasp.Job.IO (readJobMessagesAndPrintThemPrefixed)
 import qualified Wasp.Generator.WebAppGenerator.Test as WebAppTest
 import Wasp.Project.Common (WaspProjectDir)
 

waspc/src/Wasp/Generator/WebAppGenerator/Setup.hs

@@ -5,8 +5,8 @@ where
 
 import StrongPath (Abs, Dir, Path', (</>))
 import Wasp.Generator.Common (ProjectRootDir)
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.Process (runNodeCommandAsJob)
+import qualified Wasp.Job as J
+import Wasp.Job.Process (runNodeCommandAsJob)
 import qualified Wasp.Generator.WebAppGenerator.Common as Common
 
 installNpmDependencies :: Path' Abs (Dir ProjectRootDir) -> J.Job

waspc/src/Wasp/Generator/WebAppGenerator/Start.hs

@@ -5,8 +5,8 @@ where
 
 import StrongPath (Abs, Dir, Path', (</>))
 import Wasp.Generator.Common (ProjectRootDir)
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.Process (runNodeCommandAsJob)
+import qualified Wasp.Job as J
+import Wasp.Job.Process (runNodeCommandAsJob)
 import qualified Wasp.Generator.WebAppGenerator.Common as Common
 
 startWebApp :: Path' Abs (Dir ProjectRootDir) -> J.Job

waspc/src/Wasp/Generator/WebAppGenerator/Test.hs

@@ -5,8 +5,8 @@ where
 
 import StrongPath (Abs, Dir, Path', relfile, (</>))
 import qualified StrongPath as SP
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.Process (runNodeCommandAsJob)
+import qualified Wasp.Job as J
+import Wasp.Job.Process (runNodeCommandAsJob)
 import Wasp.Generator.WebAppGenerator.Common (webAppRootDirInProjectRootDir)
 import Wasp.Project.Common (WaspProjectDir, dotWaspDirInWaspProjectDir, generatedCodeDirInDotWaspDir)
 

waspc/src/Wasp/Generator/Job.hs → waspc/src/Wasp/Job.hs

@@ -1,4 +1,4 @@
-module Wasp.Generator.Job
+module Wasp.Job
   ( Job,
     JobMessage (..),
     JobMessageData (..),

waspc/src/Wasp/Generator/Job/Common.hs → waspc/src/Wasp/Job/Common.hs

@@ -1,4 +1,4 @@
-module Wasp.Generator.Job.Common
+module Wasp.Job.Common
   ( getJobMessageOutHandle,
     getJobMessageContent,
   )
@@ -7,7 +7,7 @@ where
 import qualified Data.Text as T
 import System.Exit (ExitCode (..))
 import System.IO (Handle, stderr, stdout)
-import qualified Wasp.Generator.Job as J
+import qualified Wasp.Job as J
 
 getJobMessageOutHandle :: J.JobMessage -> Handle
 getJobMessageOutHandle jobMsg = case J._data jobMsg of

waspc/src/Wasp/Generator/Job/IO.hs → waspc/src/Wasp/Job/IO.hs

@@ -1,4 +1,4 @@
-module Wasp.Generator.Job.IO
+module Wasp.Job.IO
   ( readJobMessagesAndPrintThemPrefixed,
     printJobMessage,
     printJobMsgsUntilExitReceived,
@@ -11,9 +11,9 @@ import Control.Monad.IO.Class (liftIO)
 import Data.Text (Text)
 import qualified Data.Text.IO as T.IO
 import System.IO (hFlush)
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.Common (getJobMessageContent, getJobMessageOutHandle)
-import Wasp.Generator.Job.IO.PrefixedWriter (printJobMessagePrefixed, runPrefixedWriter)
+import qualified Wasp.Job as J
+import Wasp.Job.Common (getJobMessageContent, getJobMessageOutHandle)
+import Wasp.Job.IO.PrefixedWriter (printJobMessagePrefixed, runPrefixedWriter)
 
 printJobMsgsUntilExitReceived :: Chan J.JobMessage -> IO ()
 printJobMsgsUntilExitReceived chan = do

waspc/src/Wasp/Generator/Job/IO/PrefixedWriter.hs → waspc/src/Wasp/Job/IO/PrefixedWriter.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE TupleSections #-}
 
-module Wasp.Generator.Job.IO.PrefixedWriter
+module Wasp.Job.IO.PrefixedWriter
   ( printJobMessagePrefixed,
     runPrefixedWriter,
     PrefixedWriter,
@@ -17,9 +17,9 @@ import qualified Data.Set as S
 import qualified Data.Text as T
 import qualified Data.Text.IO as T.IO
 import System.IO (hFlush, stderr)
-import Wasp.Generator.Job (JobType)
-import qualified Wasp.Generator.Job as J
-import Wasp.Generator.Job.Common (getJobMessageContent, getJobMessageOutHandle)
+import Wasp.Job (JobType)
+import qualified Wasp.Job as J
+import Wasp.Job.Common (getJobMessageContent, getJobMessageOutHandle)
 import qualified Wasp.Util.Terminal as Term
 
 -- |

waspc/src/Wasp/Generator/Job/Process.hs → waspc/src/Wasp/Job/Process.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module Wasp.Generator.Job.Process
+module Wasp.Job.Process
   ( runProcessAsJob,
     runNodeCommandAsJob,
     runNodeCommandAsJobWithExtraEnv,
@@ -21,7 +21,7 @@ import System.Exit (ExitCode (..))
 import qualified System.Info
 import qualified System.Process as P
 import UnliftIO.Exception (bracket)
-import qualified Wasp.Generator.Job as J
+import qualified Wasp.Job as J
 import qualified Wasp.Node.Version as NodeVersion
 
 -- TODO: