Separate user code into client and server directories

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

@@ -55,7 +55,8 @@ buildIO waspProjectDir buildDir = compileIOWithOptions options waspProjectDir bu
   where
     options =
       CompileOptions
-        { externalCodeDirPath = waspProjectDir </> Common.extCodeDirInWaspProjectDir,
+        { externalClientCodeDirPath = waspProjectDir </> Common.extClientCodeDirInWaspProjectDir,
+          externalServerCodeDirPath = waspProjectDir </> Common.extServerCodeDirInWaspProjectDir,
           isBuild = True,
           sendMessage = cliSendMessage,
           -- Ignore "DB needs migration warnings" during build, as that is not a required step.

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

@@ -73,7 +73,8 @@ compileIOWithOptions options waspProjectDir outDir = do
 defaultCompileOptions :: Path' Abs (Dir WaspProjectDir) -> CompileOptions
 defaultCompileOptions waspProjectDir =
   CompileOptions
-    { externalCodeDirPath = waspProjectDir </> Common.extCodeDirInWaspProjectDir,
+    { externalServerCodeDirPath = waspProjectDir </> Common.extServerCodeDirInWaspProjectDir,
+      externalClientCodeDirPath = waspProjectDir </> Common.extClientCodeDirInWaspProjectDir,
       isBuild = False,
       sendMessage = cliSendMessage,
       generatorWarningsFilter = id

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

@@ -6,18 +6,18 @@ where
 import Control.Monad.Except (throwError)
 import Control.Monad.IO.Class (liftIO)
 import Data.List (intercalate)
-import StrongPath (Abs, Dir, File', Path', Rel, reldir, relfile, (</>))
+import StrongPath (Abs, Dir, Path, Path', System, reldir, relfile, (</>))
 import qualified StrongPath as SP
-import System.Directory (createDirectory, getCurrentDirectory)
-import qualified System.Directory
+import System.Directory (getCurrentDirectory)
 import qualified System.FilePath as FP
 import Text.Printf (printf)
 import Wasp.Analyzer.Parser (isValidWaspIdentifier)
-import Wasp.AppSpec.ExternalCode (SourceExternalCodeDir)
 import Wasp.Cli.Command (Command, CommandError (..))
 import qualified Wasp.Cli.Command.Common as Command.Common
+import Wasp.Cli.Common (WaspProjectDir)
 import qualified Wasp.Cli.Common as Common
-import qualified Wasp.Data
+import qualified Wasp.Data as Data
+import Wasp.Generator.FileDraft.WriteableMonad (WriteableMonad (copyDirectoryRecursive))
 import Wasp.Util (indent, kebabToCamelCase)
 import qualified Wasp.Util.Terminal as Term
 
@@ -26,14 +26,21 @@ data ProjectInfo = ProjectInfo
     _appName :: String
   }
 
+createNewProject :: String -> Command ()
+createNewProject projectName = do
+  projectInfo <- parseProjectInfo projectName
+  createAndPopulateWaspProjectDir projectInfo
+  liftIO $ printInfoMessages projectInfo
+
 -- Takes a project name String
 -- Returns either the ProjectInfo type that contains both the Project name
 -- and the App name (which might be the same), or an error describing why the name is invalid
-parseProjectInfo :: String -> Either String ProjectInfo
+parseProjectInfo :: String -> Command ProjectInfo
 parseProjectInfo name
-  | isValidWaspIdentifier appName = Right (ProjectInfo name appName)
+  | isValidWaspIdentifier appName = return $ ProjectInfo name appName
   | otherwise =
-      Left $
+    throwError $
+      CommandError "Project creation failed" $
         intercalate
           "\n"
           [ "The project's name is not in the valid format!",
@@ -44,81 +51,44 @@ parseProjectInfo name
   where
     appName = kebabToCamelCase name
 
-createNewProject :: String -> Command ()
-createNewProject name =
-  case parseProjectInfo name of
-    Right projectInfo -> createNewProject' projectInfo
-    Left parsedError ->
-      throwError $
-        CommandError "Project creation failed" parsedError
-
-createNewProject' :: ProjectInfo -> Command ()
-createNewProject' (ProjectInfo projectName appName) = do
+createAndPopulateWaspProjectDir :: ProjectInfo -> Command ()
+createAndPopulateWaspProjectDir projectInfo = do
+  absWaspProjectDir <- getAbsoluteWaspProjectDir projectInfo
+  liftIO $ do
+    initializeProjectFromSkeleton absWaspProjectDir
+    writeMainWaspFile absWaspProjectDir projectInfo
+
+printInfoMessages :: ProjectInfo -> IO ()
+printInfoMessages (ProjectInfo projectName _) = do
+  putStrLn $ Term.applyStyles [Term.Green] ("Created new Wasp app in ./" ++ projectName ++ " directory!")
+  putStrLn "To run it, do:"
+  putStrLn ""
+  putStrLn $ Term.applyStyles [Term.Bold] ("    cd " ++ projectName)
+  putStrLn $ Term.applyStyles [Term.Bold] "    wasp start"
+  putStrLn ""
+  putStrLn Command.Common.alphaWarningMessage
+
+getAbsoluteWaspProjectDir :: ProjectInfo -> Command (Path System Abs (Dir WaspProjectDir))
+getAbsoluteWaspProjectDir (ProjectInfo projectName _) = do
   absCwd <- liftIO getCurrentDirectory
-  waspProjectDir <- case SP.parseAbsDir $ absCwd FP.</> projectName of
+  case SP.parseAbsDir $ absCwd FP.</> projectName of
+    Right sp -> return sp
     Left err ->
       throwError $
         CommandError
           "Project creation failed"
-          ( "Failed to parse absolute path to wasp project dir: "
-              ++ show err
-          )
-    Right sp -> return sp
-  liftIO $ do
-    createDirectorySP waspProjectDir
-    writeFileSP (waspProjectDir </> mainWaspFileInWaspProjectDir) mainWaspFileContent
-    writeFileSP (waspProjectDir </> gitignoreFileInWaspProjectDir) gitignoreFileContent
-    writeFileSP
-      (waspProjectDir </> Common.dotWaspRootFileInWaspProjectDir)
-      "File marking the root of Wasp project."
-
-  let extCodeDir = waspProjectDir </> Common.extCodeDirInWaspProjectDir
-  liftIO $ do
-    createDirectorySP extCodeDir
-    dataDir <- Wasp.Data.getAbsDataDirPath
-
-    let copyTemplateFile' = copyTemplateFile dataDir extCodeDir
+          ("Failed to parse absolute path to wasp project dir: " ++ show err)
 
-    writeFileSP (extCodeDir </> waspignoreFileInExtCodeDir) waspignoreFileContent
+initializeProjectFromSkeleton :: Path' Abs (Dir Common.WaspProjectDir) -> IO ()
+initializeProjectFromSkeleton absWaspProjectDir = do
+  dataDir <- Data.getAbsDataDirPath
+  let absSkeletonDir = dataDir </> [reldir|Cli/templates/new|]
+  copyDirectoryRecursive absSkeletonDir absWaspProjectDir
 
-    copyTemplateFile'
-      [relfile|new/ext/MainPage.js|]
-      mainPageJsFileInExtCodeDir
-
-    copyTemplateFile'
-      [relfile|new/ext/Main.css|]
-      mainCssFileInExtCodeDir
-
-    copyTemplateFile'
-      [relfile|new/ext/waspLogo.png|]
-      waspLogoFileInExtCodeDir
-
-  liftIO $ do
-    putStrLn $ Term.applyStyles [Term.Green] ("Created new Wasp app in ./" ++ projectName ++ " directory!")
-    putStrLn "To run it, do:"
-    putStrLn ""
-    putStrLn $ Term.applyStyles [Term.Bold] ("    cd " ++ projectName)
-    putStrLn $ Term.applyStyles [Term.Bold] "    wasp start"
-    putStrLn ""
-    putStrLn Command.Common.alphaWarningMessage
+writeMainWaspFile :: Path System Abs (Dir WaspProjectDir) -> ProjectInfo -> IO ()
+writeMainWaspFile waspProjectDir (ProjectInfo projectName appName) = writeFile mainWaspFileAbsPath mainWaspFileContent
   where
-    copyTemplateFile ::
-      Path' Abs (Dir Wasp.Data.DataDir) ->
-      Path' Abs (Dir SourceExternalCodeDir) ->
-      Path' (Rel Common.CliTemplatesDir) File' ->
-      Path' (Rel SourceExternalCodeDir) File' ->
-      IO ()
-    copyTemplateFile dataDir extCodeDir srcTmplFile dstExtDirFile =
-      System.Directory.copyFile
-        (SP.fromAbsFile (dataDir </> cliTemplatesDirInDataDir </> srcTmplFile))
-        (SP.fromAbsFile (extCodeDir </> dstExtDirFile))
-
-    cliTemplatesDirInDataDir :: Path' (Rel Wasp.Data.DataDir) (Dir Common.CliTemplatesDir)
-    cliTemplatesDirInDataDir = [reldir|Cli/templates|]
-
-    mainWaspFileInWaspProjectDir :: Path' (Rel Common.WaspProjectDir) File'
-    mainWaspFileInWaspProjectDir = [relfile|main.wasp|]
-
+    mainWaspFileAbsPath = SP.fromAbsFile $ waspProjectDir </> [relfile|main.wasp|]
     mainWaspFileContent =
       unlines
         [ "app %s {" `printf` appName,
@@ -130,35 +100,3 @@ createNewProject' (ProjectInfo projectName appName) = do
           "  component: import Main from \"@ext/MainPage.js\"",
           "}"
         ]
-
-    gitignoreFileInWaspProjectDir :: Path' (Rel Common.WaspProjectDir) File'
-    gitignoreFileInWaspProjectDir = [relfile|.gitignore|]
-
-    gitignoreFileContent =
-      unlines
-        [ "/.wasp/",
-          "/.env.server",
-          "/.env.client"
-        ]
-
-    waspignoreFileInExtCodeDir :: Path' (Rel SourceExternalCodeDir) File'
-    waspignoreFileInExtCodeDir = [relfile|.waspignore|]
-
-    waspignoreFileContent =
-      unlines
-        [ "# Ignore editor tmp files",
-          "**/*~",
-          "**/#*#"
-        ]
-
-    mainPageJsFileInExtCodeDir :: Path' (Rel SourceExternalCodeDir) File'
-    mainPageJsFileInExtCodeDir = [relfile|MainPage.js|]
-
-    mainCssFileInExtCodeDir :: Path' (Rel SourceExternalCodeDir) File'
-    mainCssFileInExtCodeDir = [relfile|Main.css|]
-
-    waspLogoFileInExtCodeDir :: Path' (Rel SourceExternalCodeDir) File'
-    waspLogoFileInExtCodeDir = [relfile|waspLogo.png|]
-
-    writeFileSP = writeFile . SP.fromAbsFile
-    createDirectorySP = createDirectory . SP.fromAbsDir

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

@@ -21,7 +21,7 @@ import qualified Wasp.Util.Terminal as Term
 deps :: Command ()
 deps = do
   waspProjectDir <- findWaspProjectRootDirFromCwd
-  (_, appSpecOrAnalyzerErrors) <- liftIO $ analyzeWaspProject waspProjectDir (defaultCompileOptions waspProjectDir)
+  appSpecOrAnalyzerErrors <- liftIO $ analyzeWaspProject waspProjectDir (defaultCompileOptions waspProjectDir)
   appSpec <-
     either
       (throwError . CommandError "Determining dependencies failed due to a compilation error in your Wasp project" . unwords . toList)

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

@@ -39,7 +39,8 @@ watch waspProjectDir outDir = FSN.withManager $ \mgr -> do
   currentTime <- getCurrentTime
   chan <- newChan
   _ <- FSN.watchDirChan mgr (SP.fromAbsDir waspProjectDir) eventFilter chan
-  _ <- FSN.watchTreeChan mgr (SP.fromAbsDir $ waspProjectDir </> Common.extCodeDirInWaspProjectDir) eventFilter chan
+  _ <- FSN.watchTreeChan mgr (SP.fromAbsDir $ waspProjectDir </> Common.extClientCodeDirInWaspProjectDir) eventFilter chan
+  _ <- FSN.watchTreeChan mgr (SP.fromAbsDir $ waspProjectDir </> Common.extServerCodeDirInWaspProjectDir) eventFilter chan
   listenForEvents chan currentTime
   where
     listenForEvents :: Chan FSN.Event -> UTCTime -> IO ()

waspc/cli/src/Wasp/Cli/Common.hs

@@ -5,7 +5,8 @@ module Wasp.Cli.Common
     dotWaspDirInWaspProjectDir,
     dotWaspRootFileInWaspProjectDir,
     dotWaspInfoFileInGeneratedCodeDir,
-    extCodeDirInWaspProjectDir,
+    extClientCodeDirInWaspProjectDir,
+    extServerCodeDirInWaspProjectDir,
     generatedCodeDirInDotWaspDir,
     buildDirInDotWaspDir,
     waspSays,
@@ -41,8 +42,11 @@ dotWaspRootFileInWaspProjectDir = [relfile|.wasproot|]
 dotWaspInfoFileInGeneratedCodeDir :: Path' (Rel Wasp.Generator.Common.ProjectRootDir) File'
 dotWaspInfoFileInGeneratedCodeDir = [relfile|.waspinfo|]
 
-extCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
-extCodeDirInWaspProjectDir = [reldir|ext|]
+extServerCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
+extServerCodeDirInWaspProjectDir = [reldir|server|]
+
+extClientCodeDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir SourceExternalCodeDir)
+extClientCodeDirInWaspProjectDir = [reldir|client|]
 
 waspSays :: String -> IO ()
 waspSays what = putStrLn $ Term.applyStyles [Term.Yellow] what

waspc/data/Cli/templates/new/.gitignore

@@ -0,0 +1,3 @@
+/.wasp/
+/.env.server
+/.env.client

waspc/data/Cli/templates/new/.wasproot

@@ -0,0 +1 @@
+File marking the root of Wasp project.

waspc/data/Cli/templates/new/client/.waspignore

@@ -0,0 +1,3 @@
+# Ignore editor tmp files
+**/*~
+**/#*#

waspc/data/Cli/templates/new/server/.waspignore

@@ -0,0 +1,3 @@
+# Ignore editor tmp files
+**/*~
+**/#*#

waspc/src/Wasp/AppSpec.hs

@@ -37,10 +37,10 @@ data AppSpec = AppSpec
   { -- | List of declarations like App, Page, Route, ... that describe the web app.
     decls :: [Decl],
     -- | List of external code files (they are referenced/used by the declarations).
-    externalCodeFiles :: [ExternalCode.File],
+    externalServerFiles :: [ExternalCode.File],
+    -- | List of external code files (they are referenced/used by the declarations).
+    externalClientFiles :: [ExternalCode.File],
     -- | Absolute path to the directory in wasp project source that contains external code files.
-    externalCodeDirPath :: !(Path' Abs (Dir ExternalCode.SourceExternalCodeDir)),
-    -- | Absolute path to the directory in wasp project source that contains database migrations.
     migrationsDir :: Maybe (Path' Abs (Dir DbMigrationsDir)),
     -- | Absolute path to the .env.server file in wasp project source. It contains env variables to be
     -- provided to the server only during the development.

waspc/src/Wasp/CompileOptions.hs

@@ -12,7 +12,8 @@ import Wasp.Message (SendMessage)
 --   It would be easier to pass around if it is part of Wasp data. But is it semantically correct?
 --   Maybe it is, even more than this!
 data CompileOptions = CompileOptions
-  { externalCodeDirPath :: !(Path' Abs (Dir SourceExternalCodeDir)),
+  { externalServerCodeDirPath :: !(Path' Abs (Dir SourceExternalCodeDir)),
+    externalClientCodeDirPath :: !(Path' Abs (Dir SourceExternalCodeDir)),
     isBuild :: !Bool,
     -- We give the compiler the ability to send messages. The code that
     -- invokes the compiler (such as the CLI) can then implement a way

waspc/src/Wasp/Generator/ServerGenerator.hs

@@ -62,7 +62,7 @@ genServer spec =
       genGitignore
     ]
     <++> genSrcDir spec
-    <++> genExternalCodeDir ServerExternalCodeGenerator.generatorStrategy (AS.externalCodeFiles spec)
+    <++> genExternalCodeDir ServerExternalCodeGenerator.generatorStrategy (AS.externalServerFiles spec)
     <++> genDotEnv spec
     <++> genJobs spec
     <++> genJobExecutors

waspc/src/Wasp/Generator/WebAppGenerator.hs

@@ -50,7 +50,7 @@ genWebApp spec = do
     ]
     <++> genPublicDir spec
     <++> genSrcDir spec
-    <++> genExternalCodeDir WebAppExternalCodeGenerator.generatorStrategy (AS.externalCodeFiles spec)
+    <++> genExternalCodeDir WebAppExternalCodeGenerator.generatorStrategy (AS.externalClientFiles spec)
     <++> genDotEnv spec
 
 genDotEnv :: AppSpec -> Generator [FileDraft]