fix: clean, refactor

Author: mnahkies

package.json

@@ -25,6 +25,7 @@
     "build": "node ./scripts/generate-ajv-validator.js && tsc -b tsconfig.json && pnpm --filter @nahkies/openapi-code-generator-documentation build",
     "build:watch": "tsc -b tsconfig.json -w",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest",
+    "integration:clean": "pnpm --filter @integration/* clean",
     "integration:generate": "node ./scripts/generate.mjs",
     "integration:validate": "pnpm -r validate",
     "e2e:generate": "pnpm --filter e2e clean && pnpm --filter e2e generate",

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

@@ -132,6 +132,7 @@ export class ClientOperationBuilder {
     const requestBody = this.requestBodyAsParameter()
 
     const result = [
+      // todo: generate prioritized accept header on supported content-type union
       hasAcceptHeader ? undefined : "'Accept': 'application/json'",
       !hasContentTypeHeader &&
       requestBody?.contentType &&
@@ -160,6 +161,7 @@ export class ClientOperationBuilder {
     const schemaBuilder = this.schemaBuilder
     const models = this.models
 
+    // todo: replace with responsesToArray / filter by supported content-types
     return Object.entries(this.operation.responses ?? {}).reduce(
       (acc, [status, response]) => {
         const content = Object.values(response.content ?? {}).pop()
@@ -229,6 +231,7 @@ export class ClientOperationBuilder {
     }
 
     return Object.entries(responses).map(([status, response]) => {
+      // todo: filter and union by supported content-type
       const responseContent = Object.values(response?.content || {}).pop()
 
       if (!responseContent) {

packages/openapi-code-generator/src/typescript/common/schema-builders/abstract-schema-builder.ts

@@ -325,8 +325,7 @@ export abstract class AbstractSchemaBuilder<
       }
 
       case "never": {
-        // todo: use z.never() ?
-        result = `z.never()`
+        result = this.never()
         break
       }
 
@@ -423,6 +422,8 @@ export abstract class AbstractSchemaBuilder<
 
   public abstract void(): string
 
+  public abstract never(): string
+
   toCompilationUnit(): CompilationUnit {
     return new CompilationUnit(
       this.filename,

packages/openapi-code-generator/src/typescript/common/schema-builders/joi-schema-builder.ts

@@ -285,6 +285,11 @@ export class JoiBuilder extends AbstractSchemaBuilder<
     return [joi, "any()"].filter(isDefined).join(".")
   }
 
+  public never(): string {
+    // todo: not sure if there's a better option here.
+    return this.any()
+  }
+
   protected override unknown(): string {
     return this.any()
   }

packages/openapi-code-generator/src/typescript/common/schema-builders/zod-schema-builder.ts

@@ -313,6 +313,10 @@ export class ZodBuilder extends AbstractSchemaBuilder<
     return [zod, "any()"].filter(isDefined).join(".")
   }
 
+  public never(): string {
+    return [zod, "never()"].filter(isDefined).join(".")
+  }
+
   protected override unknown(): string {
     return [zod, "unknown()"].filter(isDefined).join(".")
   }

packages/openapi-code-generator/src/typescript/common/typescript-common.ts

@@ -1,5 +1,6 @@
 import {logger} from "../../core/logger"
 import type {
+  IRMediaType,
   IROperation,
   IRParameter,
 } from "../../core/openapi-types-normalized"
@@ -145,12 +146,45 @@ export type RequestBodyAsParameter = {
   contentType: string
 }
 
+export function filterBySupportedMediaTypes(
+  object: Record<string, IRMediaType>,
+  supportedMediaTypes: string[],
+): {contentType: string; mediaType: IRMediaType}[] {
+  const normalized = Object.fromEntries(
+    Object.entries(object).map(([key, value]) => {
+      const contentType = key.split(/\s*[,;]\s*/)[0]
+
+      if (!contentType) {
+        throw new Error(`unspecified content type '${key}'`)
+      }
+
+      return [contentType, {fullContentType: key, mediaType: value}]
+    }),
+  )
+
+  return supportedMediaTypes
+    .map((supportedMediaType) => normalized[supportedMediaType])
+    .filter(isDefined)
+    .map((it) => ({
+      contentType: it.fullContentType,
+      mediaType: it.mediaType,
+    }))
+}
+
+export function firstByBySupportedMediaTypes(
+  object: Record<string, IRMediaType>,
+  supportedMediaTypes: string[],
+): {contentType: string; mediaType: IRMediaType} | undefined {
+  return filterBySupportedMediaTypes(object, supportedMediaTypes)[0]
+}
+
 export function requestBodyAsParameter(
   operation: IROperation,
   supportedMediaTypes = [
     "application/json",
-    "text/json",
+    "application/scim+json",
     "application/merge-patch+json",
+    "text/json",
   ],
 ): RequestBodyAsParameter | undefined {
   const {requestBody} = operation
@@ -159,52 +193,41 @@ export function requestBodyAsParameter(
     return undefined
   }
 
-  const normalized = Object.entries(requestBody.content).map(([key, value]) => {
-    const contentType = key.split(/\s*[,;]\s*/)[0]
+  // todo: support multiple media types properly. https://github.com/mnahkies/openapi-code-generator/issues/42
+  const result = firstByBySupportedMediaTypes(
+    requestBody.content,
+    supportedMediaTypes,
+  )
 
-    if (!contentType) {
-      throw new Error(`unspecified content type '${key}'`)
-    }
-
-    return {contentType, fullContentType: key, value}
-  })
-
-  // todo: https://github.com/mnahkies/openapi-code-generator/issues/42
-  for (const supportedMediaType of supportedMediaTypes) {
-    const result = normalized.find(
-      (it) => it.contentType === supportedMediaType,
-    )
-
-    if (result) {
-      return {
-        isSupported: true,
-        contentType: result.fullContentType,
-        parameter: {
-          name: "requestBody",
-          description: requestBody.description,
-          in: "body",
-          required: requestBody.required,
-          schema: result.value.schema,
-          allowEmptyValue: false,
-          deprecated: false,
-        },
-      }
+  if (result) {
+    return {
+      isSupported: true,
+      contentType: result.contentType,
+      parameter: {
+        name: "requestBody",
+        description: requestBody.description,
+        in: "body",
+        required: requestBody.required,
+        schema: result.mediaType.schema,
+        allowEmptyValue: false,
+        deprecated: false,
+      },
     }
   }
 
   logger.warn("no supported content-type on defined request body ", {
     requestBody,
   })
 
-  const first = normalized[0]
+  const contentType = Object.keys(requestBody.content).sort().join(", ")
 
-  if (!first) {
+  if (!contentType) {
     return undefined
   }
 
   return {
     isSupported: false,
-    contentType: first.fullContentType,
+    contentType,
     parameter: {
       name: "requestBody",
       description: requestBody.description,

scripts/ci-pipeline.sh

@@ -8,6 +8,7 @@ pnpm ci-test
 pnpm lint
 pnpm format
 
+pnpm integration:clean
 pnpm integration:generate
 pnpm integration:validate