@sdk-it/spec 0.46.0 → 0.46.2

package/dist/lib/processing-plugins/normalize-request-bodies.js

@@ -1,6 +1,100 @@
-import { resolveRef } from "@sdk-it/core/ref.js";
+import { followRef, isRef, resolveRef } from "@sdk-it/core/ref.js";
+import { isEmpty } from "@sdk-it/core/utils.js";
+import { findUniqueSchemaName } from "../find-unique-schema-name.js";
 import { iterateOperations } from "../for-each-operation.js";
-import { patchParameters, tuneRequestBody } from "../tune-request-body.js";
+import { securityToOptions } from "../security.js";
+function patchParameters(spec, schema, parameters, security) {
+  const securityOptions = securityToOptions(
+    spec,
+    security,
+    spec.components.securitySchemes
+  );
+  const required = new Set(
+    Array.isArray(schema.required) ? schema.required : []
+  );
+  schema["x-properties"] ??= {};
+  for (const param of parameters) {
+    if (param.required) {
+      required.add(param.name);
+    }
+    schema["x-properties"][param.name] = {
+      "x-in": param.in,
+      ...isRef(param.schema) ? followRef(spec, param.schema.$ref) : param.schema ?? { type: "string" }
+    };
+  }
+  for (const param of securityOptions) {
+    required.delete(param.name);
+    schema["x-properties"][param.name] = {
+      "x-in": "header",
+      ...isRef(param.schema) ? followRef(spec, param.schema.$ref) : param.schema ?? { type: "string" }
+    };
+  }
+  schema["x-required"] = [...required];
+}
+function normalizeRequestBody(spec, operationId, operation, parameters, security) {
+  const requestBodySource = isRef(operation.requestBody) ? followRef(spec, operation.requestBody.$ref) : operation.requestBody ?? {
+    content: {},
+    required: false
+  };
+  const requestBody = structuredClone(requestBodySource);
+  if (isEmpty(requestBody.content)) {
+    const inputName = findUniqueSchemaName(spec, operationId, [
+      "input",
+      "payload",
+      "request"
+    ]);
+    const schema = {
+      "x-inputname": inputName,
+      "x-requestbody": true
+    };
+    patchParameters(spec, schema, parameters, security);
+    const normalized = {
+      ...requestBody,
+      content: {
+        "application/empty": {
+          schema: { $ref: `#/components/schemas/${inputName}` }
+        }
+      }
+    };
+    spec.components.schemas[inputName] = schema;
+    return normalized;
+  }
+  for (const contentType in requestBody.content) {
+    const mediaType = requestBody.content[contentType];
+    const inputName = findUniqueSchemaName(spec, operationId, [
+      "input",
+      "payload",
+      "request"
+    ]);
+    let schema;
+    switch (true) {
+      case isRef(mediaType.schema):
+        schema = structuredClone(
+          followRef(spec, mediaType.schema.$ref)
+        );
+        break;
+      case isEmpty(mediaType.schema):
+        schema ??= {};
+        console.warn(
+          `Request body schema for content type "${contentType}" is empty.`
+        );
+        break;
+      default:
+        schema = structuredClone(mediaType.schema);
+        break;
+    }
+    patchParameters(spec, schema, parameters, security);
+    spec.components.schemas[inputName] = {
+      ...schema,
+      "x-requestbody": true,
+      "x-inputname": inputName
+    };
+    requestBody.content[contentType].schema = {
+      $ref: `#/components/schemas/${inputName}`
+    };
+  }
+  return requestBody;
+}
 function normalizeRequestBodies() {
   return {
     name: "normalize-request-bodies",
@@ -27,7 +121,7 @@ function normalizeRequestBodies() {
             continue;
           }
         }
-        tunedOperation.requestBody = tuneRequestBody(
+        tunedOperation.requestBody = normalizeRequestBody(
           spec,
           tunedOperation.operationId,
           operation,
@@ -39,6 +133,7 @@ function normalizeRequestBodies() {
   };
 }
 export {
-  normalizeRequestBodies
+  normalizeRequestBodies,
+  patchParameters
 };
 //# sourceMappingURL=normalize-request-bodies.js.map

package/dist/lib/processing-plugins/normalize-request-bodies.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/processing-plugins/normalize-request-bodies.ts"],
-  "sourcesContent": ["import type { RequestBodyObject, SchemaObject } from 'openapi3-ts/oas31';\n\nimport { resolveRef } from '@sdk-it/core/ref.js';\n\nimport { iterateOperations } from '../for-each-operation.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport { patchParameters, tuneRequestBody } from '../tune-request-body.js';\nimport type { TunedOperationObject } from '../types.js';\n\nexport function normalizeRequestBodies(): ProcessingPlugin {\n  return {\n    name: 'normalize-request-bodies',\n    process({ spec }) {\n      for (const { operation } of iterateOperations(spec)) {\n        const tunedOperation = operation as TunedOperationObject;\n        if (operation.requestBody) {\n          const requestBody = resolveRef<RequestBodyObject>(\n            spec,\n            operation.requestBody,\n          );\n          const schemas = Object.values(requestBody.content).map(\n            ({ schema }) =>\n              schema ? resolveRef<SchemaObject>(spec, schema) : undefined,\n          );\n          if (\n            schemas.length > 0 &&\n            schemas.every((schema) => schema?.['x-requestbody'])\n          ) {\n            for (const schema of new Set(schemas)) {\n              patchParameters(\n                spec,\n                schema as SchemaObject,\n                tunedOperation.parameters,\n                operation.security ?? [],\n              );\n            }\n            continue;\n          }\n        }\n        tunedOperation.requestBody = tuneRequestBody(\n          spec,\n          tunedOperation.operationId,\n          operation,\n          tunedOperation.parameters,\n          operation.security ?? [],\n        );\n      }\n    },\n  };\n}\n"],
-  "mappings": "AAEA,SAAS,kBAAkB;AAE3B,SAAS,yBAAyB;AAElC,SAAS,iBAAiB,uBAAuB;AAG1C,SAAS,yBAA2C;AACzD,SAAO;AAAA,IACL,MAAM;AAAA,IACN,QAAQ,EAAE,KAAK,GAAG;AAChB,iBAAW,EAAE,UAAU,KAAK,kBAAkB,IAAI,GAAG;AACnD,cAAM,iBAAiB;AACvB,YAAI,UAAU,aAAa;AACzB,gBAAM,cAAc;AAAA,YAClB;AAAA,YACA,UAAU;AAAA,UACZ;AACA,gBAAM,UAAU,OAAO,OAAO,YAAY,OAAO,EAAE;AAAA,YACjD,CAAC,EAAE,OAAO,MACR,SAAS,WAAyB,MAAM,MAAM,IAAI;AAAA,UACtD;AACA,cACE,QAAQ,SAAS,KACjB,QAAQ,MAAM,CAAC,WAAW,SAAS,eAAe,CAAC,GACnD;AACA,uBAAW,UAAU,IAAI,IAAI,OAAO,GAAG;AACrC;AAAA,gBACE;AAAA,gBACA;AAAA,gBACA,eAAe;AAAA,gBACf,UAAU,YAAY,CAAC;AAAA,cACzB;AAAA,YACF;AACA;AAAA,UACF;AAAA,QACF;AACA,uBAAe,cAAc;AAAA,UAC3B;AAAA,UACA,eAAe;AAAA,UACf;AAAA,UACA,eAAe;AAAA,UACf,UAAU,YAAY,CAAC;AAAA,QACzB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import type {\n  OperationObject,\n  ParameterObject,\n  RequestBodyObject,\n  SchemaObject,\n  SecurityRequirementObject,\n} from 'openapi3-ts/oas31';\n\nimport { followRef, isRef, resolveRef } from '@sdk-it/core/ref.js';\nimport { isEmpty } from '@sdk-it/core/utils.js';\n\nimport { findUniqueSchemaName } from '../find-unique-schema-name.js';\nimport { iterateOperations } from '../for-each-operation.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport { securityToOptions } from '../security.js';\nimport type {\n  IR,\n  OurRequestBodyObject,\n  TunedOperationObject,\n} from '../types.js';\n\nexport function patchParameters(\n  spec: IR,\n  schema: SchemaObject,\n  parameters: ParameterObject[],\n  security: SecurityRequirementObject[],\n) {\n  const securityOptions = securityToOptions(\n    spec,\n    security,\n    spec.components.securitySchemes,\n  );\n\n  const required = new Set(\n    Array.isArray(schema.required) ? schema.required : [],\n  );\n  schema['x-properties'] ??= {};\n  for (const param of parameters) {\n    if (param.required) {\n      required.add(param.name);\n    }\n    schema['x-properties'][param.name] = {\n      'x-in': param.in,\n      ...(isRef(param.schema)\n        ? followRef<SchemaObject>(spec, param.schema.$ref)\n        : (param.schema ?? { type: 'string' })),\n    };\n  }\n  for (const param of securityOptions) {\n    required.delete(param.name);\n    schema['x-properties'][param.name] = {\n      'x-in': 'header',\n      ...(isRef(param.schema)\n        ? followRef<SchemaObject>(spec, param.schema.$ref)\n        : (param.schema ?? { type: 'string' })),\n    };\n  }\n  schema['x-required'] = [...required];\n}\n\nfunction normalizeRequestBody(\n  spec: IR,\n  operationId: string,\n  operation: OperationObject,\n  parameters: ParameterObject[],\n  security: SecurityRequirementObject[],\n): OurRequestBodyObject {\n  const requestBodySource = isRef(operation.requestBody)\n    ? followRef<RequestBodyObject>(spec, operation.requestBody.$ref)\n    : (operation.requestBody ?? {\n        content: {},\n        required: false,\n      });\n  const requestBody = structuredClone(requestBodySource);\n  if (isEmpty(requestBody.content)) {\n    const inputName = findUniqueSchemaName(spec, operationId, [\n      'input',\n      'payload',\n      'request',\n    ]);\n    const schema: SchemaObject = {\n      'x-inputname': inputName,\n      'x-requestbody': true,\n    };\n    patchParameters(spec, schema, parameters, security);\n    const normalized: OurRequestBodyObject = {\n      ...requestBody,\n      content: {\n        'application/empty': {\n          schema: { $ref: `#/components/schemas/${inputName}` },\n        },\n      },\n    };\n\n    spec.components.schemas[inputName] = schema;\n    return normalized;\n  }\n  for (const contentType in requestBody.content) {\n    const mediaType = requestBody.content[contentType];\n    const inputName = findUniqueSchemaName(spec, operationId, [\n      'input',\n      'payload',\n      'request',\n    ]);\n    let schema: SchemaObject | undefined;\n\n    switch (true) {\n      case isRef(mediaType.schema):\n        schema = structuredClone(\n          followRef<SchemaObject>(spec, mediaType.schema.$ref),\n        );\n        break;\n      case isEmpty(mediaType.schema):\n        schema ??= {};\n        console.warn(\n          `Request body schema for content type \"${contentType}\" is empty.`,\n        );\n        break;\n      default:\n        schema = structuredClone(mediaType.schema);\n        break;\n    }\n\n    patchParameters(spec, schema, parameters, security);\n    spec.components.schemas[inputName] = {\n      ...schema,\n      'x-requestbody': true,\n      'x-inputname': inputName,\n    };\n\n    requestBody.content[contentType].schema = {\n      $ref: `#/components/schemas/${inputName}`,\n    };\n  }\n  return requestBody as OurRequestBodyObject;\n}\n\nexport function normalizeRequestBodies(): ProcessingPlugin {\n  return {\n    name: 'normalize-request-bodies',\n    process({ spec }) {\n      for (const { operation } of iterateOperations(spec)) {\n        const tunedOperation = operation as TunedOperationObject;\n        if (operation.requestBody) {\n          const requestBody = resolveRef<RequestBodyObject>(\n            spec,\n            operation.requestBody,\n          );\n          const schemas = Object.values(requestBody.content).map(\n            ({ schema }) =>\n              schema ? resolveRef<SchemaObject>(spec, schema) : undefined,\n          );\n          if (\n            schemas.length > 0 &&\n            schemas.every((schema) => schema?.['x-requestbody'])\n          ) {\n            for (const schema of new Set(schemas)) {\n              patchParameters(\n                spec,\n                schema as SchemaObject,\n                tunedOperation.parameters,\n                operation.security ?? [],\n              );\n            }\n            continue;\n          }\n        }\n        tunedOperation.requestBody = normalizeRequestBody(\n          spec,\n          tunedOperation.operationId,\n          operation,\n          tunedOperation.parameters,\n          operation.security ?? [],\n        );\n      }\n    },\n  };\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/processing-plugins/normalize-responses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-responses.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/normalize-responses.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAIzD,wBAAgB,kBAAkB,IAAI,gBAAgB,CA8BrD"}
+{"version":3,"file":"normalize-responses.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/normalize-responses.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AA8IzD,wBAAgB,kBAAkB,IAAI,gBAAgB,CA+BrD"}

package/dist/lib/processing-plugins/normalize-responses.js

@@ -1,6 +1,129 @@
+import { parse as parseContentType } from "fast-content-type-parse";
+import { isRef, parseRef, resolveRef } from "@sdk-it/core/ref.js";
+import { isEmpty, pascalcase } from "@sdk-it/core/utils.js";
+import { findUniqueSchemaName } from "../find-unique-schema-name.js";
 import { iterateOperations } from "../for-each-operation.js";
-import { isSuccessStatusCode } from "../is.js";
-import { resolveResponses } from "../tune-response.js";
+import {
+  isBinaryContentType,
+  isSseContentType,
+  isStreamingContentType,
+  isSuccessStatusCode,
+  isTextContentType,
+  parseJsonContentType
+} from "../is.js";
+function normalizeOperationResponses(spec, operationId, operation, responsesConfig) {
+  const responses = operation.responses ?? {};
+  operation.responses ??= {};
+  let foundSuccessResponse = false;
+  for (const status in responses) {
+    operation.responses[status] = structuredClone(
+      resolveRef(spec, responses[status])
+    );
+    if (status !== "default" && isSuccessStatusCode(status)) {
+      foundSuccessResponse = true;
+    }
+  }
+  if (!foundSuccessResponse) {
+    operation.responses["200"] = {
+      description: "OK",
+      content: {
+        "application/json": {
+          schema: {}
+        }
+      }
+    };
+  }
+  for (const status in operation.responses) {
+    const response = operation.responses[status];
+    const statusCode = +status;
+    if (!responsesConfig?.flattenErrorResponses && !isSuccessStatusCode(status)) {
+      continue;
+    }
+    if (isEmpty(response.content)) {
+      response.content = {
+        "application/octet-stream": {}
+      };
+    }
+    let responseName;
+    for (const [contentType, mediaType] of Object.entries(
+      response.content
+    )) {
+      if (isRef(mediaType.schema)) {
+        const { model } = parseRef(mediaType.schema.$ref);
+        Object.assign(spec.components.schemas[model], {
+          "x-responsebody": true
+        });
+        responseName ??= model;
+        continue;
+      }
+      const outputName = statusCode !== 200 ? findUniqueSchemaName(spec, `${pascalcase(operationId)}${status}`, [
+        "output",
+        "payload",
+        "result"
+      ]) : findUniqueSchemaName(spec, operationId, [
+        "output",
+        "payload",
+        "result"
+      ]);
+      responseName ??= outputName;
+      const isSse = isSseContentType(contentType);
+      const normalizedContentType = normalizeContentType(contentType);
+      const hasContentDisposition = hasHeader(
+        response.headers,
+        "Content-Disposition"
+      );
+      const isBinary = isBinaryContentType(contentType) || isStreamingContentType(normalizedContentType) && hasContentDisposition;
+      const isText = isTextContentType(contentType);
+      if (parseJsonContentType(contentType)) {
+        if (isEmpty(mediaType.schema)) {
+          spec.components.schemas[outputName] = {
+            type: "object",
+            additionalProperties: true
+          };
+        }
+      } else {
+        if (isEmpty(mediaType.schema) && (isText || isBinary)) {
+          mediaType.schema = {
+            type: "string",
+            ...isBinary ? { format: "binary" } : {}
+          };
+        }
+        spec.components.schemas[outputName] = {
+          ...spec.components.schemas[outputName],
+          "x-stream": isSse || !isText && !isBinary,
+          ...isSse ? { "x-sse": true } : {}
+        };
+      }
+      spec.components.schemas[outputName] = {
+        ...spec.components.schemas[outputName],
+        ...mediaType.schema,
+        "x-responsebody": true,
+        "x-response-group": operationId
+      };
+      operation.responses[status].content[contentType].schema = {
+        $ref: `#/components/schemas/${outputName}`
+      };
+    }
+    if (responseName) {
+      response["x-response-name"] = responseName;
+    }
+  }
+  return operation.responses;
+}
+function normalizeContentType(contentType) {
+  try {
+    return parseContentType(contentType)?.type?.toLowerCase();
+  } catch {
+    return contentType.split(";")[0]?.trim().toLowerCase();
+  }
+}
+function hasHeader(headers, name) {
+  if (!headers) {
+    return false;
+  }
+  const target = name.toLowerCase();
+  return Object.keys(headers).some((key) => key.toLowerCase() === target);
+}
 function normalizeResponses() {
   return {
     name: "normalize-responses",
@@ -14,7 +137,7 @@ function normalizeResponses() {
         const hadSuccessResponse = Object.keys(operation.responses ?? {}).some(
           isSuccessStatusCode
         );
-        operation.responses = resolveResponses(
+        operation.responses = normalizeOperationResponses(
           spec,
           operation.operationId,
           operation,

package/dist/lib/processing-plugins/normalize-responses.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/processing-plugins/normalize-responses.ts"],
-  "sourcesContent": ["import { iterateOperations } from '../for-each-operation.js';\nimport { isSuccessStatusCode } from '../is.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport { resolveResponses } from '../tune-response.js';\nimport type { TunedOperationObject } from '../types.js';\n\nexport function normalizeResponses(): ProcessingPlugin {\n  return {\n    name: 'normalize-responses',\n    process({ spec, options, report }) {\n      for (const { entry, operation } of iterateOperations(spec)) {\n        if (!operation.operationId) {\n          throw new Error(\n            `Cannot normalize responses before assigning an operation ID for ${entry.method.toUpperCase()} ${entry.path}`,\n          );\n        }\n        const hadSuccessResponse = Object.keys(operation.responses ?? {}).some(\n          isSuccessStatusCode,\n        );\n        (operation as TunedOperationObject).responses = resolveResponses(\n          spec,\n          operation.operationId,\n          operation,\n          options.responses,\n        );\n        if (!hadSuccessResponse) {\n          report({\n            severity: 'warning',\n            code: 'success-response-added',\n            message: 'Added a default 200 success response',\n            path: `${entry.method.toUpperCase()} ${entry.path}`,\n          });\n        }\n      }\n    },\n  };\n}\n"],
-  "mappings": "AAAA,SAAS,yBAAyB;AAClC,SAAS,2BAA2B;AAEpC,SAAS,wBAAwB;AAG1B,SAAS,qBAAuC;AACrD,SAAO;AAAA,IACL,MAAM;AAAA,IACN,QAAQ,EAAE,MAAM,SAAS,OAAO,GAAG;AACjC,iBAAW,EAAE,OAAO,UAAU,KAAK,kBAAkB,IAAI,GAAG;AAC1D,YAAI,CAAC,UAAU,aAAa;AAC1B,gBAAM,IAAI;AAAA,YACR,mEAAmE,MAAM,OAAO,YAAY,CAAC,IAAI,MAAM,IAAI;AAAA,UAC7G;AAAA,QACF;AACA,cAAM,qBAAqB,OAAO,KAAK,UAAU,aAAa,CAAC,CAAC,EAAE;AAAA,UAChE;AAAA,QACF;AACA,QAAC,UAAmC,YAAY;AAAA,UAC9C;AAAA,UACA,UAAU;AAAA,UACV;AAAA,UACA,QAAQ;AAAA,QACV;AACA,YAAI,CAAC,oBAAoB;AACvB,iBAAO;AAAA,YACL,UAAU;AAAA,YACV,MAAM;AAAA,YACN,SAAS;AAAA,YACT,MAAM,GAAG,MAAM,OAAO,YAAY,CAAC,IAAI,MAAM,IAAI;AAAA,UACnD,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { parse as parseContentType } from 'fast-content-type-parse';\nimport type {\n  MediaTypeObject,\n  OperationObject,\n  ResponseObject,\n} from 'openapi3-ts/oas31';\n\nimport { isRef, parseRef, resolveRef } from '@sdk-it/core/ref.js';\nimport { isEmpty, pascalcase } from '@sdk-it/core/utils.js';\n\nimport { findUniqueSchemaName } from '../find-unique-schema-name.js';\nimport { iterateOperations } from '../for-each-operation.js';\nimport {\n  isBinaryContentType,\n  isSseContentType,\n  isStreamingContentType,\n  isSuccessStatusCode,\n  isTextContentType,\n  parseJsonContentType,\n} from '../is.js';\nimport type { ResponsesConfig } from '../options.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport type { IR, TunedOperationObject } from '../types.js';\n\nfunction normalizeOperationResponses(\n  spec: IR,\n  operationId: string,\n  operation: OperationObject,\n  responsesConfig?: ResponsesConfig,\n) {\n  const responses = operation.responses ?? {};\n  operation.responses ??= {};\n  let foundSuccessResponse = false;\n  for (const status in responses) {\n    operation.responses[status] = structuredClone(\n      resolveRef<ResponseObject>(spec, responses[status]),\n    );\n\n    if (status !== 'default' && isSuccessStatusCode(status)) {\n      foundSuccessResponse = true;\n    }\n  }\n\n  if (!foundSuccessResponse) {\n    operation.responses['200'] = {\n      description: 'OK',\n      content: {\n        'application/json': {\n          schema: {},\n        },\n      },\n    };\n  }\n\n  for (const status in operation.responses) {\n    const response = operation.responses[status] as ResponseObject;\n    const statusCode = +status;\n\n    if (\n      !responsesConfig?.flattenErrorResponses &&\n      !isSuccessStatusCode(status)\n    ) {\n      continue;\n    }\n\n    if (isEmpty(response.content)) {\n      response.content = {\n        'application/octet-stream': {},\n      };\n    }\n\n    let responseName: string | undefined;\n    for (const [contentType, mediaType] of Object.entries(\n      response.content as Record<string, MediaTypeObject>,\n    )) {\n      if (isRef(mediaType.schema)) {\n        const { model } = parseRef(mediaType.schema.$ref);\n        Object.assign(spec.components.schemas[model], {\n          'x-responsebody': true,\n        });\n        responseName ??= model;\n        continue;\n      }\n      const outputName =\n        statusCode !== 200\n          ? findUniqueSchemaName(spec, `${pascalcase(operationId)}${status}`, [\n              'output',\n              'payload',\n              'result',\n            ])\n          : findUniqueSchemaName(spec, operationId, [\n              'output',\n              'payload',\n              'result',\n            ]);\n      responseName ??= outputName;\n      const isSse = isSseContentType(contentType);\n      const normalizedContentType = normalizeContentType(contentType);\n      const hasContentDisposition = hasHeader(\n        response.headers,\n        'Content-Disposition',\n      );\n      const isBinary =\n        isBinaryContentType(contentType) ||\n        (isStreamingContentType(normalizedContentType) &&\n          hasContentDisposition);\n      const isText = isTextContentType(contentType);\n\n      if (parseJsonContentType(contentType)) {\n        if (isEmpty(mediaType.schema)) {\n          spec.components.schemas[outputName] = {\n            type: 'object',\n            additionalProperties: true,\n          };\n        }\n      } else {\n        if (isEmpty(mediaType.schema) && (isText || isBinary)) {\n          mediaType.schema = {\n            type: 'string',\n            ...(isBinary ? { format: 'binary' } : {}),\n          };\n        }\n        spec.components.schemas[outputName] = {\n          ...spec.components.schemas[outputName],\n          'x-stream': isSse || (!isText && !isBinary),\n          ...(isSse ? { 'x-sse': true } : {}),\n        };\n      }\n\n      spec.components.schemas[outputName] = {\n        ...spec.components.schemas[outputName],\n        ...mediaType.schema,\n        'x-responsebody': true,\n        'x-response-group': operationId,\n      };\n      operation.responses[status].content[contentType].schema = {\n        $ref: `#/components/schemas/${outputName}`,\n      };\n    }\n    if (responseName) {\n      response['x-response-name'] = responseName;\n    }\n  }\n\n  return operation.responses;\n}\n\nfunction normalizeContentType(contentType: string) {\n  try {\n    return parseContentType(contentType)?.type?.toLowerCase();\n  } catch {\n    return contentType.split(';')[0]?.trim().toLowerCase();\n  }\n}\n\nfunction hasHeader(headers: ResponseObject['headers'], name: string) {\n  if (!headers) {\n    return false;\n  }\n  const target = name.toLowerCase();\n  return Object.keys(headers).some((key) => key.toLowerCase() === target);\n}\n\nexport function normalizeResponses(): ProcessingPlugin {\n  return {\n    name: 'normalize-responses',\n    process({ spec, options, report }) {\n      for (const { entry, operation } of iterateOperations(spec)) {\n        if (!operation.operationId) {\n          throw new Error(\n            `Cannot normalize responses before assigning an operation ID for ${entry.method.toUpperCase()} ${entry.path}`,\n          );\n        }\n        const hadSuccessResponse = Object.keys(operation.responses ?? {}).some(\n          isSuccessStatusCode,\n        );\n        (operation as TunedOperationObject).responses =\n          normalizeOperationResponses(\n            spec,\n            operation.operationId,\n            operation,\n            options.responses,\n          );\n        if (!hadSuccessResponse) {\n          report({\n            severity: 'warning',\n            code: 'success-response-added',\n            message: 'Added a default 200 success response',\n            path: `${entry.method.toUpperCase()} ${entry.path}`,\n          });\n        }\n      }\n    },\n  };\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/processing-plugins/normalize-schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-schemas.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/normalize-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,wBAAgB,gBAAgB,IAAI,gBAAgB,CAOnD"}
+{"version":3,"file":"normalize-schemas.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/normalize-schemas.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAmLzD,wBAAgB,gBAAgB,IAAI,gBAAgB,CAOnD"}

package/dist/lib/processing-plugins/normalize-schemas.js

@@ -1,9 +1,166 @@
-import { fixSpec } from "../tune.js";
+import { merge, uniq } from "lodash-es";
+import assert from "node:assert";
+import { isEmpty, isRef, notRef, resolveRef, snakecase } from "@sdk-it/core";
+import { findVarients } from "../find-polymorphic-varients.js";
+import { formatName } from "../format-name.js";
+import { isPrimitiveSchema } from "../is-primitive-schema.js";
+function normalizeSchemaObjects(spec, schemas, visited = /* @__PURE__ */ new Set()) {
+  for (const schema of schemas) {
+    if (isRef(schema)) continue;
+    if (!isEmpty(schema.properties)) {
+      schema.type = "object";
+      delete schema.oneOf;
+      delete schema.anyOf;
+      normalizeSchemaObjects(spec, Object.values(schema.properties), visited);
+      for (const [key, value] of Object.entries(schema.properties)) {
+        if (notRef(value) && isPrimitiveSchema(value)) {
+          value.default ??= schema.default?.[key];
+          delete schema.default?.[key];
+        }
+      }
+      delete schema.default;
+    }
+    if (!isEmpty(schema["x-properties"])) {
+      normalizeSchemaObjects(
+        spec,
+        Object.values(schema["x-properties"]),
+        visited
+      );
+    }
+    if (!isEmpty(schema.items)) {
+      delete schema.oneOf;
+      delete schema.anyOf;
+      schema.type = "array";
+      normalizeSchemaObjects(spec, [schema.items], visited);
+      const items = resolveRef(spec, schema.items);
+      if (Array.isArray(items.default)) {
+        schema.default ??= structuredClone(items.default);
+      }
+      delete items.default;
+    }
+    if (!isEmpty(schema.anyOf) && !isEmpty(schema.oneOf)) {
+      delete schema.anyOf;
+    }
+    if (isEmpty(schema.enum)) {
+      delete schema.enum;
+    }
+    if (!isEmpty(schema.enum)) {
+      if (schema.enum.length === 1) {
+        schema.const = schema.enum[0];
+        delete schema.enum;
+      } else {
+        const valuesSet = /* @__PURE__ */ new Set();
+        const valuesList = [];
+        for (const value of schema.enum) {
+          const formattedValue = formatName(snakecase(formatName(value)));
+          if (!valuesSet.has(formattedValue)) {
+            valuesSet.add(formattedValue);
+            valuesList.push(value);
+          }
+        }
+        schema.enum = valuesList;
+      }
+      delete schema.allOf;
+    }
+    if (schema.const !== void 0) {
+      schema.default = schema.const;
+    }
+    if (!isEmpty(schema.allOf)) {
+      const schemas2 = schema.allOf;
+      const resolved = schemas2.map(
+        (item) => resolveRef(spec, item)
+      );
+      const hasObjects = resolved.some((item) => item.type === "object");
+      const hasOtherTypes = resolved.some(
+        (item) => item.type && item.type !== "object"
+      );
+      if (hasObjects && hasOtherTypes) {
+        assert(false, `allOf must be an object`);
+      }
+      merge(
+        schema,
+        ...resolved.map((resolvedSchema, index) => {
+          const sourceSchema = schemas2[index];
+          if (isRef(sourceSchema)) {
+            if (visited.has(sourceSchema.$ref)) {
+              throw new Error(
+                `Circular allOf reference detected: ${[
+                  ...visited,
+                  sourceSchema.$ref
+                ].join(" -> ")}`
+              );
+            }
+            normalizeSchemaObjects(
+              spec,
+              [resolvedSchema],
+              new Set(visited).add(sourceSchema.$ref)
+            );
+          } else {
+            normalizeSchemaObjects(spec, [resolvedSchema], visited);
+          }
+          return resolvedSchema;
+        })
+      );
+      delete schema.allOf;
+    } else {
+      delete schema.allOf;
+    }
+    if (schema.type === "object" && isEmpty(schema.properties) && typeof schema.additionalProperties === "object" && !isEmpty(schema.additionalProperties) && notRef(schema.additionalProperties) && !isEmpty(schema.additionalProperties.properties)) {
+      normalizeSchemaObjects(
+        spec,
+        Object.values(schema.additionalProperties.properties),
+        visited
+      );
+    }
+    for (const kind of ["oneOf", "anyOf"]) {
+      if (!isEmpty(schema[kind])) {
+        delete schema.type;
+        normalizeSchemaObjects(spec, schema[kind], visited);
+        if (isEmpty(schema[kind])) {
+          continue;
+        }
+        let enumSchemaIndex = -1;
+        const enumValues = [];
+        for (let index = 0; index < schema[kind].length; index++) {
+          const item = schema[kind][index];
+          if (notRef(item) && item.type === "string") {
+            if (item.enum && item.enum.length > 1) {
+              enumValues.push(...item.enum);
+              if (enumSchemaIndex === -1) {
+                enumSchemaIndex = index;
+              }
+            }
+          }
+        }
+        if (enumSchemaIndex !== -1) {
+          const enumSchema = schema[kind][enumSchemaIndex];
+          if (notRef(enumSchema)) {
+            enumSchema.enum = uniq(enumValues);
+          }
+          schema[kind] = schema[kind].filter(
+            (item, index) => index === enumSchemaIndex || isRef(item)
+          );
+        }
+        const otherTypes = schema[kind].filter(
+          (item) => resolveRef(spec, item).type !== "null"
+        );
+        if (otherTypes.length === 1) {
+          Object.assign(schema, otherTypes[0]);
+          delete schema[kind];
+          continue;
+        }
+        schema["x-varients"] = findVarients(spec, schema[kind]);
+      } else {
+        delete schema[kind];
+      }
+    }
+  }
+}
 function normalizeSchemas() {
   return {
     name: "normalize-schemas",
     process({ spec }) {
-      fixSpec(spec, Object.values(spec.components.schemas));
+      normalizeSchemaObjects(spec, Object.values(spec.components.schemas));
     }
   };
 }

package/dist/lib/processing-plugins/normalize-schemas.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/processing-plugins/normalize-schemas.ts"],
-  "sourcesContent": ["import type { ProcessingPlugin } from '../processing.js';\nimport { fixSpec } from '../tune.js';\n\nexport function normalizeSchemas(): ProcessingPlugin {\n  return {\n    name: 'normalize-schemas',\n    process({ spec }) {\n      fixSpec(spec, Object.values(spec.components.schemas));\n    },\n  };\n}\n"],
-  "mappings": "AACA,SAAS,eAAe;AAEjB,SAAS,mBAAqC;AACnD,SAAO;AAAA,IACL,MAAM;AAAA,IACN,QAAQ,EAAE,KAAK,GAAG;AAChB,cAAQ,MAAM,OAAO,OAAO,KAAK,WAAW,OAAO,CAAC;AAAA,IACtD;AAAA,EACF;AACF;",
-  "names": []
+  "sourcesContent": ["import { merge, uniq } from 'lodash-es';\nimport assert from 'node:assert';\nimport type { ReferenceObject, SchemaObject } from 'openapi3-ts/oas31';\n\nimport { isEmpty, isRef, notRef, resolveRef, snakecase } from '@sdk-it/core';\n\nimport { findVarients } from '../find-polymorphic-varients.js';\nimport { formatName } from '../format-name.js';\nimport { isPrimitiveSchema } from '../is-primitive-schema.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport type { IR } from '../types.js';\n\nfunction normalizeSchemaObjects(\n  spec: IR,\n  schemas: (SchemaObject | ReferenceObject)[],\n  visited = new Set<string>(),\n) {\n  for (const schema of schemas) {\n    if (isRef(schema)) continue;\n\n    if (!isEmpty(schema.properties)) {\n      schema.type = 'object';\n      delete schema.oneOf;\n      delete schema.anyOf;\n      normalizeSchemaObjects(spec, Object.values(schema.properties), visited);\n      for (const [key, value] of Object.entries(schema.properties)) {\n        if (notRef(value) && isPrimitiveSchema(value)) {\n          value.default ??= schema.default?.[key];\n          delete schema.default?.[key];\n        }\n      }\n      delete schema.default;\n    }\n\n    if (!isEmpty(schema['x-properties'])) {\n      normalizeSchemaObjects(\n        spec,\n        Object.values(schema['x-properties']),\n        visited,\n      );\n    }\n\n    if (!isEmpty(schema.items)) {\n      delete schema.oneOf;\n      delete schema.anyOf;\n      schema.type = 'array';\n      normalizeSchemaObjects(spec, [schema.items], visited);\n      const items = resolveRef<SchemaObject>(spec, schema.items);\n      if (Array.isArray(items.default)) {\n        schema.default ??= structuredClone(items.default);\n      }\n      delete items.default;\n    }\n\n    if (!isEmpty(schema.anyOf) && !isEmpty(schema.oneOf)) {\n      delete schema.anyOf;\n    }\n\n    if (isEmpty(schema.enum)) {\n      delete schema.enum;\n    }\n\n    if (!isEmpty(schema.enum)) {\n      if (schema.enum.length === 1) {\n        schema.const = schema.enum[0];\n        delete schema.enum;\n      } else {\n        const valuesSet = new Set<string>();\n        const valuesList = [];\n        for (const value of schema.enum) {\n          const formattedValue = formatName(snakecase(formatName(value)));\n          if (!valuesSet.has(formattedValue)) {\n            valuesSet.add(formattedValue);\n            valuesList.push(value);\n          }\n        }\n        schema.enum = valuesList;\n      }\n      delete schema.allOf;\n    }\n\n    if (schema.const !== undefined) {\n      schema.default = schema.const;\n    }\n\n    if (!isEmpty(schema.allOf)) {\n      const schemas = schema.allOf;\n      const resolved = schemas.map((item) =>\n        resolveRef<SchemaObject>(spec, item),\n      );\n      const hasObjects = resolved.some((item) => item.type === 'object');\n      const hasOtherTypes = resolved.some(\n        (item) => item.type && item.type !== 'object',\n      );\n      if (hasObjects && hasOtherTypes) {\n        assert(false, `allOf must be an object`);\n      }\n      merge(\n        schema,\n        ...resolved.map((resolvedSchema, index) => {\n          const sourceSchema = schemas[index];\n          if (isRef(sourceSchema)) {\n            if (visited.has(sourceSchema.$ref)) {\n              throw new Error(\n                `Circular allOf reference detected: ${[\n                  ...visited,\n                  sourceSchema.$ref,\n                ].join(' -> ')}`,\n              );\n            }\n            normalizeSchemaObjects(\n              spec,\n              [resolvedSchema],\n              new Set(visited).add(sourceSchema.$ref),\n            );\n          } else {\n            normalizeSchemaObjects(spec, [resolvedSchema], visited);\n          }\n          return resolvedSchema;\n        }),\n      );\n      delete schema.allOf;\n    } else {\n      delete schema.allOf;\n    }\n\n    if (\n      schema.type === 'object' &&\n      isEmpty(schema.properties) &&\n      typeof schema.additionalProperties === 'object' &&\n      !isEmpty(schema.additionalProperties) &&\n      notRef(schema.additionalProperties) &&\n      !isEmpty(schema.additionalProperties.properties)\n    ) {\n      normalizeSchemaObjects(\n        spec,\n        Object.values(schema.additionalProperties.properties),\n        visited,\n      );\n    }\n\n    for (const kind of ['oneOf', 'anyOf'] as const) {\n      if (!isEmpty(schema[kind])) {\n        delete schema.type;\n        normalizeSchemaObjects(spec, schema[kind], visited);\n        if (isEmpty(schema[kind])) {\n          continue;\n        }\n\n        let enumSchemaIndex = -1;\n        const enumValues: string[] = [];\n        for (let index = 0; index < schema[kind].length; index++) {\n          const item = schema[kind][index];\n          if (notRef(item) && item.type === 'string') {\n            if (item.enum && item.enum.length > 1) {\n              enumValues.push(...item.enum);\n              if (enumSchemaIndex === -1) {\n                enumSchemaIndex = index;\n              }\n            }\n          }\n        }\n        if (enumSchemaIndex !== -1) {\n          const enumSchema = schema[kind][enumSchemaIndex];\n          if (notRef(enumSchema)) {\n            enumSchema.enum = uniq(enumValues);\n          }\n          schema[kind] = schema[kind].filter(\n            (item, index) => index === enumSchemaIndex || isRef(item),\n          );\n        }\n        const otherTypes = schema[kind].filter(\n          (item) => resolveRef<SchemaObject>(spec, item).type !== 'null',\n        );\n        if (otherTypes.length === 1) {\n          Object.assign(schema, otherTypes[0]);\n          delete schema[kind];\n          continue;\n        }\n\n        schema['x-varients'] = findVarients(spec, schema[kind]);\n      } else {\n        delete schema[kind];\n      }\n    }\n  }\n}\n\nexport function normalizeSchemas(): ProcessingPlugin {\n  return {\n    name: 'normalize-schemas',\n    process({ spec }) {\n      normalizeSchemaObjects(spec, Object.values(spec.components.schemas));\n    },\n  };\n}\n"],
+  "mappings": "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",
+  "names": ["schemas"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdk-it/spec",
-  "version": "0.46.0",
+  "version": "0.46.2",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -27,7 +27,7 @@
     "!**/*.test.*"
   ],
   "dependencies": {
-    "@sdk-it/core": "0.46.0",
+    "@sdk-it/core": "0.46.2",
     "openapi3-ts": "4.5.0",
     "pluralize": "^8.0.0",
     "stringcase": "^4.3.1",

package/dist/lib/tune-request-body.d.ts

@@ -1,5 +0,0 @@
-import type { OperationObject, ParameterObject, SchemaObject, SecurityRequirementObject } from 'openapi3-ts/oas31';
-import type { IR, OurRequestBodyObject } from './types.js';
-export declare function patchParameters(spec: IR, schema: SchemaObject, parameters: ParameterObject[], security: SecurityRequirementObject[]): void;
-export declare function tuneRequestBody(spec: IR, operationId: string, operation: OperationObject, parameters: ParameterObject[], security: SecurityRequirementObject[]): OurRequestBodyObject;
-//# sourceMappingURL=tune-request-body.d.ts.map

package/dist/lib/tune-request-body.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tune-request-body.d.ts","sourceRoot":"","sources":["../../src/lib/tune-request-body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EAEf,YAAY,EACZ,yBAAyB,EAC1B,MAAM,mBAAmB,CAAC;AAO3B,OAAO,KAAK,EAAE,EAAE,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAE3D,wBAAgB,eAAe,CAC7B,IAAI,EAAE,EAAE,EACR,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,eAAe,EAAE,EAC7B,QAAQ,EAAE,yBAAyB,EAAE,QAiCtC;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,eAAe,EAC1B,UAAU,EAAE,eAAe,EAAE,EAC7B,QAAQ,EAAE,yBAAyB,EAAE,GACpC,oBAAoB,CAuEtB"}