wip: implement parser

Author: mnahkies

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

@@ -1,6 +1,6 @@
 import type {Input} from "../../core/input"
 import {logger} from "../../core/logger"
-import type {IROperation} from "../../core/openapi-types-normalized"
+import type { IRModel, IROperation } from "../../core/openapi-types-normalized"
 import {extractPlaceholders} from "../../core/openapi-utils"
 import type {SchemaBuilder} from "../common/schema-builders/schema-builder"
 import type {TypeBuilder} from "../common/type-builder"
@@ -33,6 +33,23 @@ export type ServerOperationResponseSchemas = {
     | undefined
 }
 
+export type PrimitiveType = {type: "string" | "number" | "boolean" | "null"}
+export type ObjectSchema = {
+  type: "object"
+  properties: Record<string, SchemaStructure>
+}
+export type ArraySchema = {type: "array"; items: SchemaStructure}
+
+export type SchemaStructure = PrimitiveType | ObjectSchema | ArraySchema
+export type Style = "deepObject" | "form" | "pipeDelimited" | "spaceDelimited"
+export interface QueryParameter {
+  name: string
+  schema: SchemaStructure
+  style?: Style
+  explode?: boolean
+  // allowEmptyValue: boolean
+}
+
 export type Parameters = {
   type: string
   path: {
@@ -44,6 +61,7 @@ export type Parameters = {
     name: string
     schema: string | undefined
     type: string
+    parameters: QueryParameter[]
   }
   header: {
     name: string
@@ -191,7 +209,54 @@ export class ServerOperationBuilder {
       type = this.types.schemaObjectToType($ref)
     }
 
-    return {name: this.operation.parameters.query.name, schema: schema, type}
+
+    return {
+      name: this.operation.parameters.query.name,
+      schema: schema,
+      type,
+      parameters: this.operation.parameters.query.list.map((it) => ({
+        name: it.name,
+        // todo: only default true when style: form
+        // todo: remove defaulting - normalization does this
+        explode: it.explode ?? true,
+        style: it.style ?? "form",
+        schema: this.queryParameterRuntimeSchema(this.input.schema(it.schema)),
+      })),
+    }
+  }
+
+  private queryParameterRuntimeSchema(schema: IRModel): SchemaStructure {
+    const type = schema.type
+    switch (type) {
+      case "string":
+      case "number":
+      case "boolean":
+        return {type}
+      case "array":
+        return {
+          type: "array",
+          items: this.queryParameterRuntimeSchema(
+            this.input.schema(schema.items),
+          ),
+        }
+      case "object": {
+        const properties: Record<string, SchemaStructure> = {}
+
+        for (const key in schema.properties) {
+          properties[key] = this.queryParameterRuntimeSchema(
+            this.input.schema(schema.properties[key] ?? {isIRModel: true, nullable: false, readOnly: false, type: "any"}),
+          )
+        }
+
+        return {
+          type: "object",
+          properties,
+        }
+      }
+      default: {
+        throw new Error(`unsupported query parameter type ${type}`)
+      }
+    }
   }
 
   private headerParameters(): Parameters["header"] {

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

@@ -52,6 +52,11 @@ export class ExpressRouterBuilder extends AbstractRouterBuilder {
         "StatusCode5xx",
       )
 
+    // todo: move to common imports
+    this.imports
+      .from("@nahkies/typescript-koa-runtime/server")
+      .add("parseQueryParameters")
+
     this.imports
       .from("@nahkies/typescript-express-runtime/errors")
       .add("ExpressRuntimeError", "RequestInputType")
@@ -138,7 +143,7 @@ router.${builder.method.toLowerCase()}(\`${builder.route}\`, async (req: Request
   try {
    const input = {
     params: ${params.path.schema ? `parseRequestInput(${params.path.name}, req.params, RequestInputType.RouteParam)` : "undefined"},
-    query: ${params.query.schema ? `parseRequestInput(${params.query.name}, req.query, RequestInputType.QueryString)` : "undefined"},
+    query: ${params.query.schema ? `parseRequestInput(${params.query.name}, parseQueryParameters(new URL(\`http://localhost\${req.originalUrl}\`).search, ${JSON.stringify(params.query.parameters)}), RequestInputType.QueryString)` : "undefined"},
     ${params.body.schema && !params.body.isSupported ? `// todo: request bodies with content-type '${params.body.contentType}' not yet supported\n` : ""}body: ${params.body.schema ? `parseRequestInput(${params.body.schema}, req.body, RequestInputType.RequestBody)${!params.body.isSupported ? " as never" : ""}` : "undefined"},
     headers: ${params.header.schema ? `parseRequestInput(${params.header.name}, req.headers, RequestInputType.RequestHeader)` : "undefined"}
    }

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

@@ -31,10 +31,14 @@ export class KoaRouterBuilder extends AbstractRouterBuilder {
   }
 
   protected buildImports(): void {
-    // todo: unsure why, but adding an export at `.` of index.ts doesn't work properly
     this.imports
       .from("@nahkies/typescript-koa-runtime/server")
-      .add("KoaRuntimeResponse", "SkipResponse", "startServer")
+      .add(
+        "KoaRuntimeResponse",
+        "SkipResponse",
+        "startServer",
+        "parseQueryParameters",
+      )
       .addType(
         "KoaRuntimeResponder",
         "Params",
@@ -142,7 +146,7 @@ const ${symbols.responseBodyValidator} = ${builder.responseValidator()}
 router.${builder.method.toLowerCase()}('${symbols.implPropName}','${builder.route}', async (ctx, next) => {
    const input = {
     params: ${params.path.schema ? `parseRequestInput(${params.path.name}, ctx.params, RequestInputType.RouteParam)` : "undefined"},
-    query: ${params.query.schema ? `parseRequestInput(${params.query.name}, ctx.query, RequestInputType.QueryString)` : "undefined"},
+    query: ${params.query.schema ? `parseRequestInput(${params.query.name}, parseQueryParameters(ctx.querystring, ${JSON.stringify(params.query.parameters)}), RequestInputType.QueryString)` : "undefined"},
     ${params.body.schema && !params.body.isSupported ? `// todo: request bodies with content-type '${params.body.contentType}' not yet supported\n` : ""}body: ${params.body.schema ? `parseRequestInput(${params.body.schema}, Reflect.get(ctx.request, "body"), RequestInputType.RequestBody)${!params.body.isSupported ? " as never" : ""}` : "undefined"},
     headers: ${params.header.schema ? `parseRequestInput(${params.header.name}, Reflect.get(ctx.request, "headers"), RequestInputType.RequestHeader)` : "undefined"}
    }

packages/typescript-koa-runtime/package.json

@@ -79,6 +79,7 @@
     }
   },
   "devDependencies": {
+    "@jest/globals": "^30.2.0",
     "@koa/cors": "^5.0.0",
     "@koa/router": "^14.0.0",
     "@types/koa": "^3.0.1",