Moving logic from templates to libs

.github/workflows/ci-waspc-test.yaml

@@ -73,10 +73,14 @@ jobs:
           npm ci
           npm test
 
-      - name: Compile TS packages and move it into the Cabal data dir
+      - name: Compile TS packages and move them into the Cabal data dir
         if: matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-15-intel'
         run: ./tools/install_packages_to_data_dir.sh
 
+      - name: Compile Wasp libs and move them into the Cabal data dir
+        if: matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-13'
+        run: ./tools/install_libs_to_data_dir.sh
+
       - name: Build external dependencies
         run: cabal build --enable-tests --enable-benchmarks --only-dependencies
 

waspc/README.md

@@ -211,7 +211,9 @@ Check `src/Wasp/Analyzer.hs` for more details.
 AppSpec is passed to the Generator, which based on it decides how to generate a web app.
 Output of Generator is a list of FileDrafts, where each FileDraft explains how to create a file on the disk.
 Therefore, Generator doesn't generate anything itself, instead it provides instructions (FileDrafts) on how to generate the web app.
-FileDrafts are using mustache templates a lot (they can be found in `data/Generator/templates`).
+FileDrafts are using mustache templates a lot (they can be found in `data/Generator/templates`). Alongside mustache templates,
+generated apps use internal npm packages (WaspLibs) that contain core logic and are unit tested. WaspLibs are bundled with Wasp
+and installed into generated apps (see [WaspLibs](#wasplibs) for more details).
 
 Generator is split into three generators, for the three main parts of the web app: WebAppGenerator, ServerGenerator and DbGenerator.
 
@@ -236,6 +238,7 @@ On any changes you do to the source code of Wasp, Wasp project gets recompiled,
 - `cli/exe/` -> thin executable wrapper around cli library code
 - `tests/`, `e2e-tests/`, `cli/tests/`, `waspls/tests/`, `starters-e2e-tests` -> tests
 - `data/Generator/templates/` -> mustache templates for the generated client/server.
+- `libs/` -> internal npm packages (WaspLibs) that are bundled with Wasp and copied into generated apps (see [WaspLibs](#wasplibs) for more details)
 - `data/Cli/starters/` -> starter templates for new projects
 
 ### Typescript packages
@@ -245,6 +248,10 @@ On any changes you do to the source code of Wasp, Wasp project gets recompiled,
 In order for `waspc`'s Haskell code to correctly use these TS packages (and to also have them correctly bundled when generating the release tarball), they need to be correctly installed/built in the `waspc_datadir` dir.
 To do so in development, run `./run build:packages` when any changes are made to these packages. We also run it in CI when building the release.
 
+### WaspLibs
+
+WaspLibs are internal npm packages located under [`libs/`](libs/) and are bundled with Wasp and installed into generated apps. A more detailed description of WaspLibs can be found in the [`libs/README.md`](libs/README.md).
+
 ## Tests
 
 For tests in Haskell we are using [**Tasty**](https://github.com/UnkindPartition/tasty) testing framework. Tasty lets us combine different types of tests into a single test suite.

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

@@ -13,6 +13,8 @@ import Wasp.Cli.Terminal (title)
 import qualified Wasp.ExternalConfig.Npm.Dependency as Npm.Dependency
 import qualified Wasp.Generator.NpmDependencies as N
 import qualified Wasp.Generator.ServerGenerator as ServerGenerator
+import qualified Wasp.Generator.WaspLibs.AvailableLibs as WaspLibs.AvailableLibs
+import qualified Wasp.Generator.WaspLibs.WaspLib as WaspLib
 import qualified Wasp.Generator.WebAppGenerator as WebAppGenerator
 import Wasp.Project (analyzeWaspProject)
 import qualified Wasp.Util.Terminal as Term
@@ -27,24 +29,25 @@ deps = do
       (throwError . CommandError "Determining dependencies failed due to a compilation error in your Wasp project" . unwords)
       return
       appSpecOrAnalyzerErrors
+  waspLibs <- liftIO WaspLibs.AvailableLibs.makeWaspLibs
 
-  liftIO $ putStrLn $ depsMessage appSpec
+  liftIO $ putStrLn $ depsMessage appSpec waspLibs
 
-depsMessage :: AppSpec -> String
-depsMessage appSpec =
+depsMessage :: AppSpec -> [WaspLib.WaspLib] -> String
+depsMessage appSpec waspLibs =
   unlines $
     [ "",
       title "Below are listed the dependencies that Wasp uses in your project. You can import and use these directly in the code as if you specified them yourself, but you can't change their versions.",
       ""
     ]
       ++ printDeps
         "Server dependencies:"
-        ( N.dependencies $ N.fromWasp $ ServerGenerator.npmDepsFromWasp appSpec
+        ( N.dependencies $ N.fromWasp $ ServerGenerator.npmDepsFromWasp appSpec waspLibs
         )
       ++ [""]
       ++ printDeps
         "Server devDependencies:"
-        ( N.devDependencies $ N.fromWasp $ ServerGenerator.npmDepsFromWasp appSpec
+        ( N.devDependencies $ N.fromWasp $ ServerGenerator.npmDepsFromWasp appSpec waspLibs
         )
       ++ [""]
       ++ printDeps