fix: smarter params, nextjs 15 support

Author: mnahkies

integration-tests/typescript-nextjs/src/app/todo-lists.yaml/attachments/route.ts

@@ -1,13 +1,10 @@
-import {
-  _GET,
-  _POST,
-} from "../../../generated/todo-lists.yaml/attachments/route"
+import {_GET, _POST} from "../../../generated/todo-lists.yaml/attachments/route"
 
-export const GET = _GET(async ({}, respond, context) => {
+export const GET = _GET(async (respond, context) => {
   // TODO: implementation
-  return respond.withStatus(501).body({ message: "not implemented" } as any)
+  return respond.withStatus(501).body({message: "not implemented"} as any)
 })
-export const POST = _POST(async ({ body }, respond, context) => {
+export const POST = _POST(async ({body}, respond, context) => {
   // TODO: implementation
-  return respond.withStatus(501).body({ message: "not implemented" } as any)
+  return respond.withStatus(501).body({message: "not implemented"} as any)
 })

integration-tests/typescript-nextjs/src/app/todo-lists.yaml/list/[listId]/items/route.ts

@@ -3,11 +3,11 @@ import {
   _POST,
 } from "../../../../../generated/todo-lists.yaml/list/[listId]/items/route"
 
-export const GET = _GET(async ({ params }, respond, context) => {
+export const GET = _GET(async ({params}, respond, context) => {
   // TODO: implementation
-  return respond.withStatus(501).body({ message: "not implemented" } as any)
+  return respond.withStatus(501).body({message: "not implemented"} as any)
 })
-export const POST = _POST(async ({ params, body }, respond, context) => {
+export const POST = _POST(async ({params, body}, respond, context) => {
   // TODO: implementation
-  return respond.withStatus(501).body({ message: "not implemented" } as any)
+  return respond.withStatus(501).body({message: "not implemented"} as any)
 })

integration-tests/typescript-nextjs/src/app/todo-lists.yaml/list/[listId]/route.ts

@@ -1,18 +1,18 @@
 import {
+  _DELETE,
   _GET,
   _PUT,
-  _DELETE,
 } from "../../../../generated/todo-lists.yaml/list/[listId]/route"
 
-export const GET = _GET(async ({ params }, respond, context) => {
+export const GET = _GET(async ({params}, respond, context) => {
   // TODO: implementation
-  return respond.withStatus(501).body({ message: "not implemented" } as any)
+  return respond.withStatus(501).body({message: "not implemented"} as any)
 })
-export const PUT = _PUT(async ({ params, body }, respond, context) => {
+export const PUT = _PUT(async ({params, body}, respond, context) => {
   // TODO: implementation
-  return respond.withStatus(501).body({ message: "not implemented" } as any)
+  return respond.withStatus(501).body({message: "not implemented"} as any)
 })
-export const DELETE = _DELETE(async ({ params }, respond, context) => {
+export const DELETE = _DELETE(async ({params}, respond, context) => {
   // TODO: implementation
-  return respond.withStatus(501).body({ message: "not implemented" } as any)
+  return respond.withStatus(501).body({message: "not implemented"} as any)
 })

integration-tests/typescript-nextjs/src/app/todo-lists.yaml/list/route.ts

@@ -1,6 +1,6 @@
-import { _GET } from "../../../generated/todo-lists.yaml/list/route"
+import {_GET} from "../../../generated/todo-lists.yaml/list/route"
 
-export const GET = _GET(async ({ query }, respond, context) => {
+export const GET = _GET(async ({query}, respond, context) => {
   // TODO: implementation
-  return respond.withStatus(501).body({ message: "not implemented" } as any)
+  return respond.withStatus(501).body({message: "not implemented"} as any)
 })

integration-tests/typescript-nextjs/src/generated/todo-lists.yaml/attachments/route.ts

@@ -58,6 +58,7 @@ export type ServerOperationResponseSchemas = {
 }
 
 export type Parameters = {
+  hasParams: boolean
   type: string
   path: {
     schema: string | undefined
@@ -111,7 +112,16 @@ export class ServerOperationBuilder {
       ${header.type}
     >`
 
-    return {type, path, query, header, body}
+    return {
+      hasParams: Boolean(
+        path.schema || query.schema || header.schema || body.schema,
+      ),
+      type,
+      path,
+      query,
+      header,
+      body,
+    }
   }
 
   responseValidator(): string {

integration-tests/typescript-nextjs/src/generated/todo-lists.yaml/list/route.ts

@@ -4,33 +4,48 @@ import {
   SyntaxKind,
   VariableDeclarationKind,
 } from "ts-morph"
+import type {Input} from "../../../core/input"
 import type {IROperation} from "../../../core/openapi-types-normalized"
-import {type HttpMethod, isDefined, isHttpMethod} from "../../../core/utils"
+import {
+  type HttpMethod,
+  isDefined,
+  isHttpMethod,
+  titleCase,
+} from "../../../core/utils"
 import {CompilationUnit, type ICompilable} from "../../common/compilation-units"
 import type {ImportBuilder} from "../../common/import-builder"
-import {requestBodyAsParameter} from "../../common/typescript-common"
+import type {SchemaBuilder} from "../../common/schema-builders/schema-builder"
+import type {TypeBuilder} from "../../common/type-builder"
+import type {ServerSymbols} from "../abstract-router-builder"
+import {ServerOperationBuilder} from "../server-operation-builder"
 
 export class TypescriptNextjsAppRouterBuilder implements ICompilable {
   constructor(
-    public readonly filename: string,
+    private readonly filename: string,
+    private readonly name: string,
+    private readonly input: Input,
     private readonly imports: ImportBuilder,
+    private readonly types: TypeBuilder,
+    private readonly schemaBuilder: SchemaBuilder,
     private readonly companionFilename: string,
     private readonly sourceFile: SourceFile,
   ) {}
 
   private readonly httpMethodsUsed = new Set<HttpMethod>()
 
   add(operation: IROperation): void {
-    const sourceFile = this.sourceFile
-
-    const hasPathParam =
-      operation.parameters.filter((it) => it.in === "path").length > 0
-    const hasQueryParam =
-      operation.parameters.filter((it) => it.in === "query").length > 0
-    const hasBodyParam = Boolean(
-      requestBodyAsParameter(operation).requestBodyParameter,
+    const builder = new ServerOperationBuilder(
+      operation,
+      this.input,
+      this.types,
+      this.schemaBuilder,
     )
 
+    const symbols = this.operationSymbols(builder.operationId)
+    const params = builder.parameters(symbols)
+
+    const sourceFile = this.sourceFile
+
     const wrappingMethod = `_${operation.method.toUpperCase()}`
 
     this.httpMethodsUsed.add(operation.method)
@@ -69,20 +84,37 @@ export class TypescriptNextjsAppRouterBuilder implements ICompilable {
       parameter.remove()
     })
 
-    innerFunction?.addParameter({
-      name: `{${[
-        hasPathParam ? "params" : undefined,
-        hasQueryParam ? "query" : undefined,
-        hasBodyParam ? "body" : undefined,
-      ]
-        .filter(isDefined)
-        .join(",")}}`,
-    })
+    if (params.hasParams) {
+      innerFunction?.addParameter({
+        name: `{${[
+          params.path.schema ? "params" : undefined,
+          params.query.schema ? "query" : undefined,
+          params.body.schema ? "body" : undefined,
+          params.header.schema ? "headers" : undefined,
+        ]
+          .filter(isDefined)
+          .join(",")}}`,
+      })
+    }
 
     innerFunction?.addParameter({name: "respond"})
     innerFunction?.addParameter({name: "context"})
   }
 
+  // TODO: duplication - should be shared with router builder
+  protected operationSymbols(operationId: string): ServerSymbols {
+    return {
+      implPropName: operationId,
+      implTypeName: titleCase(operationId),
+      responderName: `${titleCase(operationId)}Responder`,
+      paramSchema: `${operationId}ParamSchema`,
+      querySchema: `${operationId}QuerySchema`,
+      requestBodySchema: `${operationId}BodySchema`,
+      requestHeaderSchema: `${operationId}HeaderSchema`,
+      responseBodyValidator: `${operationId}ResponseValidator`,
+    }
+  }
+
   toString(): string {
     return this.sourceFile.getFullText()
   }

packages/openapi-code-generator/src/typescript/server/server-operation-builder.ts

@@ -1,5 +1,5 @@
 import type {Input} from "../../../core/input"
-import {titleCase} from "../../../core/utils"
+import {isDefined, titleCase} from "../../../core/utils"
 import type {ImportBuilder} from "../../common/import-builder"
 import {JoiBuilder} from "../../common/schema-builders/joi-schema-builder"
 import type {SchemaBuilder} from "../../common/schema-builders/schema-builder"
@@ -67,9 +67,6 @@ export class TypescriptNextjsRouterBuilder extends AbstractRouterBuilder {
   protected buildOperation(builder: ServerOperationBuilder): string {
     const statements: string[] = []
 
-    const types = this.types
-    const schemaBuilder = this.schemaBuilder
-
     const symbols = this.operationSymbols(builder.operationId)
     const params = builder.parameters(symbols)
 
@@ -107,11 +104,13 @@ export class TypescriptNextjsRouterBuilder extends AbstractRouterBuilder {
         }),
         buildExport({
           name: symbols.implTypeName,
-          value: `(
-                    params: ${params.type},
-                    respond: ${symbols.responderName},
-                    request: NextRequest,
-                  ) => Promise<KoaRuntimeResponse<unknown>>`,
+          value: `(${[
+            params.hasParams ? `params: ${params.type}` : undefined,
+            `respond: ${symbols.responderName}`,
+            "request: NextRequest",
+          ]
+            .filter(isDefined)
+            .join(",")}) => Promise<KoaRuntimeResponse<unknown>>`,
           kind: "type",
         }),
       ],
@@ -121,7 +120,7 @@ export class TypescriptNextjsRouterBuilder extends AbstractRouterBuilder {
       buildExport({
         name: `_${builder.method.toUpperCase()}`,
         kind: "const",
-        value: `(implementation: ${symbols.implTypeName}) => async (request: NextRequest, {params}: {params: Promise<unknown>}): Promise<Response> => {
+        value: `(implementation: ${symbols.implTypeName}) => async (${["request: NextRequest", params.path.schema ? "{params}: {params: Promise<unknown>}" : undefined].filter(isDefined).join(",")}): Promise<Response> => {
   const input = {
         params: ${
           params.path.schema
@@ -151,7 +150,7 @@ export class TypescriptNextjsRouterBuilder extends AbstractRouterBuilder {
        const {
         status,
         body,
-      } = await implementation(input, responder, request)
+      } = await implementation(${[params.hasParams ? "input" : undefined, "responder", "request"].filter(isDefined).join(",")})
           .then(it => it.unpack())
           .catch(err => { throw KoaRuntimeError.HandlerError(err) })
 

packages/openapi-code-generator/src/typescript/server/typescript-nextjs/typescript-nextjs-app-router-builder.ts

@@ -105,7 +105,11 @@ export async function generateTypescriptNextJS(
 
         const nextJSAppRouterBuilder = new TypescriptNextjsAppRouterBuilder(
           nextJsAppRouterPath,
+          group.name,
+          input,
           imports,
+          rootTypeBuilder.withImports(imports),
+          rootSchemaBuilder.withImports(imports),
           filename,
           sourceFile,
         )