In CI, check for TS errors in built server code (of example app) by running npx tsc

waspc/data/Generator/templates/sdk/wasp/core/serialization.ts

@@ -25,7 +25,7 @@ export interface JSONArray extends Array<JSONValue> {}
 
 // Added the `Decimal` type to the union (see below)
 // Removed `Symbol` since we don't explicitly register any symbol to be serialized
-type SerializableJSONValue =
+export type SerializableJSONValue =
   | Set<SuperJSONValue>
   | Map<SuperJSONValue, SuperJSONValue>
   | undefined
@@ -35,15 +35,15 @@ type SerializableJSONValue =
   | Decimal
 
 // Here's where we excluded `ClassInstance` (which was `any`) from the union.
-type SuperJSONValue =
+export type SuperJSONValue =
   | JSONValue
   | SerializableJSONValue
   | SuperJSONArray
   | SuperJSONObject
 
-interface SuperJSONArray extends Array<SuperJSONValue> {}
+export interface SuperJSONArray extends Array<SuperJSONValue> {}
 
-interface SuperJSONObject {
+export interface SuperJSONObject {
   [key: string]: SuperJSONValue
 }
 

waspc/data/Generator/templates/sdk/wasp/server/auth/oauth/provider.ts

@@ -1,13 +1,14 @@
 import { OAuth2Provider, OAuth2ProviderWithPKCE } from "arctic";
 
 export function defineProvider<
-  OAuthClient extends OAuth2Provider | OAuth2ProviderWithPKCE
+  OAuthClient extends OAuth2Provider | OAuth2ProviderWithPKCE,
+  const Id extends string
 >({
   id,
   displayName,
   oAuthClient,
 }: {
-  id: string;
+  id: Id;
   displayName: string;
   oAuthClient: OAuthClient;
 }) {

waspc/data/Generator/templates/sdk/wasp/server/crud/_operationTypes.ts

@@ -11,7 +11,7 @@ import type {
   _{= crud.entityUpper =},
 } from "../_types";
 import type { Prisma } from "@prisma/client";
-import type { Payload } from "wasp/core/serialization";
+import type { Payload, SuperJSONObject } from "wasp/core/serialization";
 import type {
   {= crud.entityUpper =},
 } from "wasp/entities";
@@ -37,7 +37,7 @@ type _WaspEntity = {= crud.entityUpper =}
 /**
  * PUBLIC API
  */
-export namespace {= crud.name =} {
+export declare namespace {= crud.name =} {
   {=# crud.operations.GetAll =}
   export type GetAllQuery<Input extends Payload = never, Output extends Payload = Payload> = {= queryType =}<[_WaspEntityTagged], Input, Output>
   {=/ crud.operations.GetAll =}
@@ -61,7 +61,7 @@ export namespace {= crud.name =} {
 
 /**
  * PRIVATE API
- * 
+ *
  * The types with the `Resolved` suffix are the types that are used internally by the Wasp client
  * to implement full-stack type safety.
  */
@@ -79,7 +79,7 @@ export type GetAllQueryResolved = typeof _waspGetAllQuery
 
 {=# crud.operations.Get =}
 {=^ overrides.Get.isDefined =}
-type GetInput = Prisma.{= crud.entityUpper =}WhereUniqueInput
+type GetInput = SuperJSONObject & Prisma.{= crud.entityUpper =}WhereUniqueInput
 type GetOutput = _WaspEntity | null
 export type GetQueryResolved = {= crud.name =}.GetQuery<GetInput, GetOutput>
 {=/ overrides.Get.isDefined =}
@@ -91,7 +91,7 @@ export type GetQueryResolved = typeof _waspGetQuery
 
 {=# crud.operations.Create =}
 {=^ overrides.Create.isDefined =}
-type CreateInput = Prisma.XOR<
+type CreateInput = SuperJSONObject & Prisma.XOR<
   Prisma.{= crud.entityUpper =}CreateInput,
   Prisma.{= crud.entityUpper =}UncheckedCreateInput
 >
@@ -106,7 +106,7 @@ export type CreateActionResolved = typeof _waspCreateAction
 
 {=# crud.operations.Update =}
 {=^ overrides.Update.isDefined =}
-type UpdateInput = Prisma.XOR<
+type UpdateInput = SuperJSONObject & Prisma.XOR<
     Prisma.{= crud.entityUpper =}UpdateInput,
     Prisma.{= crud.entityUpper =}UncheckedUpdateInput
   >
@@ -123,7 +123,7 @@ export type UpdateActionResolved = typeof _waspUpdateAction
 
 {=# crud.operations.Delete =}
 {=^ overrides.Delete.isDefined =}
-type DeleteInput = Prisma.{= crud.entityUpper =}WhereUniqueInput
+type DeleteInput = SuperJSONObject & Prisma.{= crud.entityUpper =}WhereUniqueInput
 type DeleteOutput = _WaspEntity
 export type DeleteActionResolved = {= crud.name =}.DeleteAction<DeleteInput, DeleteOutput>
 {=/ overrides.Delete.isDefined =}

waspc/data/Generator/templates/sdk/wasp/server/utils.ts

@@ -12,22 +12,21 @@ declare global {
   namespace Express {
     interface Request {
       {=# isAuthEnabled =}
-      user: AuthUserData | null;
-      sessionId: string | null;
+      user?: AuthUserData | null;
+      sessionId?: string | null;
       {=/ isAuthEnabled =}
     }
   }
 }
 
-
 /**
  * Simple helper to give the correct types for Express handlers.
  * We define it in the same file as our extension to Request
  * so that it is picked up by TypeScript.
  */
-export const defineHandler = (
-  middleware: RequestHandler
-) => middleware
+export const defineHandler = <T extends RequestHandler>(
+  middleware: T
+): T => middleware
 
 export const sleep = (ms: number): Promise<unknown> => new Promise((r) => setTimeout(r, ms))
 

waspc/data/Generator/templates/server/src/auth/providers/config/email.ts

@@ -1,5 +1,5 @@
 {{={= =}=}}
-import { Router, Request, Response, NextFunction } from "express";
+import { Router } from "express";
 
 import { ProviderConfig } from "wasp/auth/providers/types";
 import type { EmailFromField } from "wasp/server/email/core/types";

waspc/data/Generator/templates/server/src/auth/providers/email/login.ts

@@ -15,7 +15,7 @@ export function getLoginRoute() {
     return async function login(
         req: Request<{ email: string; password: string; }>,
         res: Response,
-    ): Promise<Response<{ sessionId: string } | undefined>> {
+    ): Promise<void> {
         const fields = req.body ?? {}
         ensureValidArgs(fields)
 
@@ -54,7 +54,7 @@ export function getLoginRoute() {
             user: auth.user,
         })
 
-        return res.json({
+        res.json({
             sessionId: session.id,
         })
     };

waspc/data/Generator/templates/server/src/auth/providers/email/requestPasswordReset.ts

@@ -27,7 +27,7 @@ export function getRequestPasswordResetRoute({
     return async function requestPasswordReset(
         req: Request<{ email: string; }>,
         res: Response,
-    ): Promise<Response<{ success: true }>> {
+    ): Promise<void> {
         const args = req.body ?? {};
         ensureValidEmail(args);
 
@@ -43,7 +43,8 @@ export function getRequestPasswordResetRoute({
 
         if (!authIdentity) {
             await doFakeWork();
-            return res.json({ success: true });
+            res.json({ success: true });
+            return
         }
 
         const providerData = getProviderDataWithPassword<'email'>(authIdentity.providerData);
@@ -68,6 +69,6 @@ export function getRequestPasswordResetRoute({
             throw new HttpError(500, "Failed to send password reset email.");
         }
 
-        return res.json({ success: true });
+        res.json({ success: true });
     };
 }

waspc/data/Generator/templates/server/src/auth/providers/email/resetPassword.ts

@@ -12,7 +12,7 @@ import { HttpError } from 'wasp/server';
 export async function resetPassword(
     req: Request<{ token: string; password: string; }>,
     res: Response,
-): Promise<Response<{ success: true }>> {
+): Promise<void> {
     const args = req.body ?? {};
     ensureValidArgs(args);
 
@@ -27,7 +27,7 @@ export async function resetPassword(
     if (!authIdentity) {
         throw new HttpError(400, "Password reset failed, invalid token");
     }
-    
+
     const providerData = getProviderDataWithPassword<'email'>(authIdentity.providerData);
 
     await updateAuthIdentityProviderData(providerId, providerData, {
@@ -38,7 +38,7 @@ export async function resetPassword(
         hashedPassword: password,
     });
 
-    return res.json({ success: true });
+    res.json({ success: true });
 };
 
 function ensureValidArgs(args: object): void {

waspc/data/Generator/templates/server/src/auth/providers/email/signup.ts

@@ -42,7 +42,7 @@ export function getSignupRoute({
   return async function signup(
     req: Request<{ email: string; password: string }>,
     res: Response,
-  ): Promise<Response<{ success: true }>> {
+  ): Promise<void> {
     const fields = req.body
     ensureValidArgs(fields)
 
@@ -83,7 +83,8 @@ export function getSignupRoute({
       // the email!
       if (providerData.isEmailVerified) {
         await doFakeWork()
-        return res.json({ success: true })
+        res.json({ success: true })
+        return
       }
 
       // TODO: we are still leaking information here since when we are faking work
@@ -134,7 +135,8 @@ export function getSignupRoute({
     // Wasp allows for auto-verification of emails in development mode to
     // make writing e2e tests easier.
     if (isEmailAutoVerified) {
-      return res.json({ success: true })
+      res.json({ success: true })
+      return
     }
 
     const verificationLink = await createEmailVerificationLink(
@@ -152,7 +154,7 @@ export function getSignupRoute({
       throw new HttpError(500, 'Failed to send email verification email.')
     }
 
-    return res.json({ success: true })
+    res.json({ success: true })
   }
 }
 

waspc/data/Generator/templates/server/src/auth/providers/email/verifyEmail.ts

@@ -14,7 +14,7 @@ import { onAfterEmailVerifiedHook } from '../../hooks.js';
 export async function verifyEmail(
     req: Request<{ token: string }>,
     res: Response,
-): Promise<Response<{ success: true }>> {
+): Promise<void> {
     const { token } = req.body;
     const { email } = await validateJWT<{ email: string }>(token)
         .catch(() => {
@@ -37,6 +37,6 @@ export async function verifyEmail(
 
     await onAfterEmailVerifiedHook({ req, email, user: auth.user });
 
-    return res.json({ success: true });
+    res.json({ success: true });
 };
 

waspc/data/Generator/templates/server/src/auth/providers/oauth/handler.ts

@@ -77,7 +77,7 @@ export function createOAuthProviderRouter<OT extends OAuthType, Tokens extends O
         url: redirectUrl,
         oauth: { uniqueRequestId: oAuthState.state }
       })
-      return redirect(res, redirectUrlAfterHook.toString())
+      redirect(res, redirectUrlAfterHook.toString())
     }),
   )
 
@@ -113,15 +113,15 @@ export function createOAuthProviderRouter<OT extends OAuthType, Tokens extends O
             },
           })
           // Redirect to the client with the one time code
-          return redirect(res, redirectUri.toString())
+          redirect(res, redirectUri.toString())
         } catch (e) {
           rethrowPossibleAuthError(e)
         }
       } catch (e) {
         console.error(e)
         const redirectUri = handleOAuthErrorAndGetRedirectUri(e)
         // Redirect to the client with the error
-        return redirect(res, redirectUri.toString())
+        redirect(res, redirectUri.toString())
       }
     }),
   )

waspc/data/Generator/templates/server/src/auth/providers/oauth/oneTimeCode.ts

@@ -31,7 +31,7 @@ export function setupOneTimeCodeRoute(router: Router) {
 
       tokenStore.markUsed(code);
 
-      return res.json({
+      res.json({
         sessionId: session.id,
       });
     })

waspc/data/Generator/templates/server/src/auth/providers/username/login.ts

@@ -53,7 +53,7 @@ export default defineHandler(async (req, res) => {
     user: auth.user,
   })
 
-  return res.json({
+  res.json({
       sessionId: session.id,
   })
 })

waspc/data/Generator/templates/server/src/auth/providers/username/signup.ts

@@ -48,7 +48,7 @@ export function getSignupRoute({
       rethrowPossibleAuthError(e)
     }
 
-    return res.json({ success: true })
+    res.json({ success: true })
   })
 }
 

waspc/data/Generator/templates/server/src/middleware/operations.ts

@@ -1,7 +1,9 @@
 {{={= =}=}}
 import { deserialize, serialize } from 'wasp/core/serialization'
 import { defineHandler } from 'wasp/server/utils'
+{=# isAuthEnabled =}
 import { makeAuthUserIfPossible } from 'wasp/auth/user'
+{=/ isAuthEnabled =}
 
 export function createOperation (handlerFn) {
     return defineHandler(async (req, res) => {

waspc/data/Generator/templates/server/src/routes/auth/logout.ts

@@ -5,7 +5,7 @@ import { invalidateSession } from 'wasp/auth/session'
 export default defineHandler(async (req, res) => {
   if (req.sessionId) {
     await invalidateSession(req.sessionId)
-    return res.json({ success: true })
+    res.json({ success: true })
   } else {
     throw createInvalidCredentialsError()
   }

waspc/data/Generator/templates/server/src/routes/auth/me.ts

@@ -3,8 +3,8 @@ import { defineHandler } from 'wasp/server/utils'
 
 export default defineHandler(async (req, res) => {
   if (req.user) {
-    return res.json(serialize(req.user))
+    res.json(serialize(req.user))
   } else {
-    return res.json(serialize(null))
+    res.json(serialize(null))
   }
 })

waspc/data/Generator/templates/server/src/webSocket/initialization.ts

@@ -17,7 +17,10 @@ import { makeAuthUserIfPossible } from 'wasp/auth/user'
 export async function init(server: http.Server): Promise<void> {
   // TODO: In the future, we can consider allowing a clustering option.
   // Ref: https://github.com/wasp-lang/wasp/issues/1228
-  const io: ServerType = new Server(server, {
+
+  // TODO: Uncomment the type annotation once we make sure that the types between different packages are aligned.
+  // Ref: https://github.com/wasp-lang/wasp/issues/2726
+  const io /* : ServerType */ = new Server(server, {
     cors: {
       origin: config.frontendUrl,
     }