Small fixes in the generator

waspc/src/Wasp/AppSpec/Job.hs

@@ -39,8 +39,6 @@ data Perform = Perform
   }
   deriving (Show, Eq, Data)
 
-instance IsDecl Perform
-
 -- Allows jobs to run via some cron schedule.
 data Schedule = Schedule
   { cron :: String, -- 5 field cron expression, exe: "*/5 * * * *".
@@ -49,13 +47,10 @@ data Schedule = Schedule
   }
   deriving (Show, Eq, Data)
 
-instance IsDecl Schedule
-
 -- These are optional executor-specific JSON options we pass
 -- directly through to the executor when submitting jobs.
 data ExecutorOptions = ExecutorOptions
-  { pgBoss :: Maybe JSON,
-    simple :: Maybe JSON
+  { pgBoss :: Maybe JSON
   }
   deriving (Show, Eq, Data)
 

waspc/src/Wasp/Generator/Monad.hs

@@ -14,7 +14,7 @@ where
 import Control.Monad.Except (ExceptT, MonadError (throwError), runExceptT)
 import qualified Control.Monad.Except as MonadExcept
 import Control.Monad.Identity (Identity (runIdentity))
-import Control.Monad.State (MonadState, StateT (runStateT), modify)
+import Control.Monad.State (MonadState, State, modify, runStateT)
 import Data.List.NonEmpty (NonEmpty, fromList)
 
 -- | Generator is a monad transformer stack where we abstract away the underlying
@@ -25,7 +25,7 @@ import Data.List.NonEmpty (NonEmpty, fromList)
 -- The mechanism to catch errors is only there to assist in collecting more errors, not recover.
 -- There may optionally be additional errors or non-fatal warnings logged in the State.
 newtype Generator a = Generator
-  { _runGenerator :: ExceptT GeneratorError (StateT GeneratorState Identity) a
+  { _runGenerator :: ExceptT GeneratorError (State GeneratorState) a
   }
   deriving
     ( Functor,

waspc/src/Wasp/Generator/SdkGenerator.hs

@@ -61,9 +61,6 @@ import qualified Wasp.Project.Db as Db
 import qualified Wasp.SemanticVersion as SV
 import Wasp.Util ((<++>))
 
-genSdk :: AppSpec -> Generator [FileDraft]
-genSdk spec = genSdkReal spec
-
 buildSdk :: Path' Abs (Dir ProjectRootDir) -> IO (Either String ())
 buildSdk projectRootDir = do
   chan <- newChan
@@ -77,8 +74,8 @@ buildSdk projectRootDir = do
   where
     dstDir = projectRootDir </> C.sdkRootDirInProjectRootDir
 
-genSdkReal :: AppSpec -> Generator [FileDraft]
-genSdkReal spec =
+genSdk :: AppSpec -> Generator [FileDraft]
+genSdk spec =
   sequence
     [ genFileCopy [relfile|vite-env.d.ts|],
       genFileCopy [relfile|prisma-runtime-library.d.ts|],

waspc/src/Wasp/Generator/Setup.hs

@@ -22,8 +22,8 @@ runSetup spec projectRootDir sendMessage = do
         setUpDatabaseResults@(_warnings, _errors@[]) -> do
           -- todo(filip): Should we consider building SDK as part of code generation?
           -- todo(filip): Avoid building on each setup if we don't need to.
-          buildsSdkResults <- buildSdk projectRootDir sendMessage
-          return $ setUpDatabaseResults <> buildsSdkResults
+          buildSdkResults <- buildSdk projectRootDir sendMessage
+          return $ setUpDatabaseResults <> buildSdkResults
         setUpDatabaseResults -> return setUpDatabaseResults
     Left npmInstallError -> return ([], [npmInstallError])
 

waspc/test/AnalyzerTest.hs

@@ -269,8 +269,7 @@ spec_Analyzer = do
               )
               ( Just $
                   Job.ExecutorOptions
-                    { Job.pgBoss = JSON.JSON <$> Aeson.decode "{\"retryLimit\":1}",
-                      Job.simple = Nothing
+                    { Job.pgBoss = JSON.JSON <$> Aeson.decode "{\"retryLimit\":1}"
                     }
               )
       let jobSchedule =
@@ -279,8 +278,7 @@ spec_Analyzer = do
               (JSON.JSON <$> Aeson.decode "{\"job\":\"args\"}")
               ( Just $
                   Job.ExecutorOptions
-                    { Job.pgBoss = JSON.JSON <$> Aeson.decode "{\"retryLimit\":0}",
-                      Job.simple = Nothing
+                    { Job.pgBoss = JSON.JSON <$> Aeson.decode "{\"retryLimit\":0}"
                     }
               )
       let expectedJob =