Fix TypeScript errors

Author: cprecioso

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

@@ -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 =}
@@ -91,7 +91,7 @@ export type GetQueryResolved = typeof _waspGetQuery
 
 {=# crud.operations.Create =}
 {=^ overrides.Create.isDefined =}
-type CreateInput = Prisma.XOR<
+type CreateInput = Payload & 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 = Payload & 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 = Payload & 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

@@ -19,14 +19,14 @@ type RequestWithExtraFields = Request & {
  *   if given middleware returns promise, reject of that promise will be correctly handled,
  *   meaning that error will be forwarded to next().
  */
-export const handleRejection = (
+export const handleRejection = <Req extends Request = RequestWithExtraFields, Res extends Response = Response>(
   middleware: (
-    req: RequestWithExtraFields,
-    res: Response,
+    req: Req,
+    res: Res,
     next: NextFunction
   ) => any
 ) =>
-async (req: RequestWithExtraFields, res: Response, next: NextFunction) => {
+async (req: Req, res: Res, next: NextFunction) => {
   try {
     await middleware(req, res, next)
   } catch (error) {