Make server and client fields optional (#2351)

wasp-lang · Oct 21, 2024 · 01af22f · 01af22f
1 parent 7ef2a34
commit 01af22f
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 29 deletions.
diff --git a/waspc/ChangeLog.md b/waspc/ChangeLog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.15.1
+
+### 🐞 Bug fixes
+
+- Server and Client setup props are no longer mandatory when using TS Config.
+
 ## 0.15.0
 
 ### 🎉 New Features and improvements

diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp
diff --git a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp
diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp
diff --git a/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp b/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp
diff --git a/waspc/packages/wasp-config/src/mappers.ts b/waspc/packages/wasp-config/src/mappers.ts
@@ -143,12 +143,18 @@ function mapOperationConfig(
 
 function mapExtImport(extImport: User.ExtImport): AppSpec.ExtImport {
   if ('import' in extImport) {
-    return { kind: 'named', name: extImport.import, path: extImport.from };
+    return { kind: 'named', name: extImport.import, path: extImport.from }
   } else if ('importDefault' in extImport) {
-    return { kind: 'default', name: extImport.importDefault, path: extImport.from };
+    return {
+      kind: 'default',
+      name: extImport.importDefault,
+      path: extImport.from,
+    }
   } else {
-    const _exhaustiveCheck: never = extImport;
-    throw new Error('Invalid ExtImport: neither `import` nor `importDefault` is defined');
+    const _exhaustiveCheck: never = extImport
+    throw new Error(
+      'Invalid ExtImport: neither `import` nor `importDefault` is defined'
+    )
   }
 }
 
@@ -326,16 +332,19 @@ function mapEmailSender(
 function mapServer(server: User.ServerConfig): AppSpec.Server {
   const { setupFn, middlewareConfigFn } = server
   return {
-    setupFn: mapExtImport(setupFn),
-    middlewareConfigFn: mapExtImport(middlewareConfigFn),
+    ...(setupFn && { setupFn: mapExtImport(setupFn) }),
+    ...(middlewareConfigFn && {
+      middlewareConfigFn: mapExtImport(middlewareConfigFn),
+    }),
   }
 }
 
 function mapClient(client: User.ClientConfig): AppSpec.Client {
-  const { setupFn, rootComponent } = client
+  const { setupFn, rootComponent, baseDir } = client
   return {
-    setupFn: mapExtImport(setupFn),
-    rootComponent: mapExtImport(rootComponent),
+    ...(setupFn && { setupFn: mapExtImport(setupFn) }),
+    ...(rootComponent && { rootComponent: mapExtImport(rootComponent) }),
+    ...(baseDir && { baseDir }),
   }
 }
 

diff --git a/waspc/packages/wasp-config/src/userApi.ts b/waspc/packages/wasp-config/src/userApi.ts
@@ -94,17 +94,19 @@ export type WaspConfig = AppSpec.Wasp
 
 export type AppConfig = Pick<AppSpec.App, 'title' | 'wasp' | 'head'>
 
-export type ExtImport = {
-  import: string
-  from: AppSpec.ExtImport['path']
-} | {
-  importDefault: string
-  from: AppSpec.ExtImport['path']
-}
+export type ExtImport =
+  | {
+      import: string
+      from: AppSpec.ExtImport['path']
+    }
+  | {
+      importDefault: string
+      from: AppSpec.ExtImport['path']
+    }
 
 export type ServerConfig = {
-  setupFn: ExtImport
-  middlewareConfigFn: ExtImport
+  setupFn?: ExtImport
+  middlewareConfigFn?: ExtImport
 }
 
 export type PageConfig = {
@@ -118,8 +120,9 @@ export type WebsocketConfig = {
 }
 
 export type ClientConfig = {
-  rootComponent: ExtImport
-  setupFn: ExtImport
+  rootComponent?: ExtImport
+  setupFn?: ExtImport
+  baseDir?: `/${string}`
 }
 
 export type DbConfig = {

diff --git a/waspc/src/Wasp/Analyzer/Evaluator/Evaluation/TypedExpr/Combinators.hs b/waspc/src/Wasp/Analyzer/Evaluator/Evaluation/TypedExpr/Combinators.hs
@@ -20,8 +20,6 @@ where
 import Control.Arrow (left)
 import qualified Data.Aeson as Aeson
 import qualified Data.ByteString.Lazy.UTF8 as ByteStringLazyUTF8
-import Data.List (stripPrefix)
-import qualified StrongPath as SP
 import Wasp.Analyzer.Evaluator.Evaluation.Internal (evaluation, evaluation', runEvaluation)
 import Wasp.Analyzer.Evaluator.Evaluation.TypedExpr (TypedExprEvaluation)
 import qualified Wasp.Analyzer.Evaluator.EvaluationError as ER

diff --git a/waspc/waspc.cabal b/waspc/waspc.cabal
@@ -6,7 +6,7 @@ cabal-version: 2.4
 --    Consider using hpack, or maybe even hpack-dhall.
 
 name:           waspc
-version:        0.15.0
+version:        0.15.1
 description:    Please see the README on GitHub at <https://github.com/wasp-lang/wasp/waspc#readme>
 homepage:       https://github.com/wasp-lang/wasp/waspc#readme
 bug-reports:    https://github.com/wasp-lang/wasp/issues