Continue implementing OpenAPI 3.2.0

Author: SamuelMarks

src/core/utils.ts

@@ -124,7 +124,6 @@ export function getTypeScriptType(schema: SwaggerDefinition | undefined | null,
         if (val === null) return 'null';
         if (typeof val === 'string') return `'${val.replace(/'/g, "\\'")}'`;
         if (typeof val === 'number' || typeof val === 'boolean') return String(val);
-        // For complex objects in const, fallback to 'any' or simple types is safer than partial object literals
         return 'any';
     }
 
@@ -156,11 +155,6 @@ export function getTypeScriptType(schema: SwaggerDefinition | undefined | null,
     // Handling for 'not' keyword: Exclude<any, Type> or Exclude<KnownType, Type>
     if (schema.not) {
         const notType = getTypeScriptType(schema.not, config, knownTypes);
-        /**
-         * Note: Generating `Exclude<any, T>` in TS effectively just stays `any` or `unknown` depending on usage,
-         * making strict `not` validation irrelevant at build time unless used within composite types.
-         * We return a utility type string for clarity.
-         */
         return `Exclude<any, ${notType}>`;
     }
 
@@ -173,7 +167,7 @@ export function getTypeScriptType(schema: SwaggerDefinition | undefined | null,
     switch (schema.type) {
         case 'string':
             type = (schema.format === 'date' || schema.format === 'date-time') && config.options.dateType === 'Date' ? 'Date' : 'string';
-            // OAS 3.1 support: contentMediaType='image/png' implies binary data -> Blob
+            // OAS 3.1 support: contentMediaType implies binary data -> Blob
             if (schema.format === 'binary' || schema.contentMediaType) {
                 type = 'Blob';
             }
@@ -258,7 +252,9 @@ type UnifiedParameter = SwaggerOfficialParameter & {
     // Additions for OAS3 and Swagger2 compatibility
     collectionFormat?: 'csv' | 'ssv' | 'tsv' | 'pipes' | 'multi' | string,
     style?: string,
-    explode?: boolean
+    explode?: boolean,
+    allowReserved?: boolean,
+    content?: Record<string, { schema?: SwaggerDefinition }>
 };
 
 // Helper type that adds OpenAPI 3.x properties to the Swagger 2.0 Operation type
@@ -309,13 +305,20 @@ export function extractPaths(swaggerPaths: { [p: string]: Path } | undefined): P
                         schema: finalSchema as SwaggerDefinition,
                     };
 
+                    if (p.content) {
+                        param.content = p.content as any;
+                    }
+
                     // Carry over OAS3 style properties if they exist, but only if they're not undefined to satisfy `exactOptionalPropertyTypes`.
                     if (p.style !== undefined) {
                         param.style = p.style;
                     }
                     if (p.explode !== undefined) {
                         param.explode = p.explode;
                     }
+                    if (p.allowReserved !== undefined) {
+                        param.allowReserved = p.allowReserved;
+                    }
 
                     // Swagger 2.0 collectionFormat translation
                     const collectionFormat = p.collectionFormat;

src/service/emit/service/service-method.generator.ts

@@ -4,7 +4,7 @@ import {
     OptionalKind,
     ParameterDeclarationStructure,
 } from 'ts-morph';
-import { GeneratorConfig, PathInfo, SwaggerDefinition } from '../../../core/types.js';
+import { GeneratorConfig, Parameter, PathInfo, SwaggerDefinition } from '../../../core/types.js';
 import { camelCase, getTypeScriptType, isDataTypeInterface } from '../../../core/utils.js';
 import { HttpContext, HttpHeaders, HttpParams } from '@angular/common/http';
 import { SwaggerParser } from "@src/core/parser.js";
@@ -88,7 +88,16 @@ export class ServiceMethodGenerator {
 
         (operation.parameters ?? []).forEach(param => {
             const paramName = camelCase(param.name);
-            const paramType = getTypeScriptType(param.schema, this.config, knownTypes);
+            // Robust schema retrieval: check `content` for schema if basic schema is missing/default
+            let effectiveSchema = param.schema;
+            if (param.content) {
+                const firstType = Object.keys(param.content)[0];
+                if (firstType && param.content[firstType].schema) {
+                    effectiveSchema = param.content[firstType].schema as SwaggerDefinition;
+                }
+            }
+
+            const paramType = getTypeScriptType(effectiveSchema, this.config, knownTypes);
 
             parameters.push({
                 name: paramName,
@@ -112,13 +121,21 @@ export class ServiceMethodGenerator {
         return parameters.sort((a, b) => (a.hasQuestionToken ? 1 : 0) - (b.hasQuestionToken ? 1 : 0));
     }
 
+    private isJsonContent(p: Parameter): boolean {
+        if (!p.content) return false;
+        const keys = Object.keys(p.content);
+        return keys.some(k => k.includes('application/json') || k.includes('*/*'));
+    }
+
     private buildMethodBody(operation: PathInfo, parameters: OptionalKind<ParameterDeclarationStructure>[]): string {
         let urlTemplate = operation.path;
         operation.parameters?.filter(p => p.in === 'path').forEach(p => {
             const jsParam = camelCase(p.name);
             const style = p.style || 'simple';
             const explode = p.explode ?? false;
-            urlTemplate = urlTemplate.replace(`{${p.name}}`, `\${HttpParamsBuilder.serializePathParam('${p.name}', ${jsParam}, '${style}', ${explode})}`);
+            const allowReserved = p.allowReserved ?? false;
+            const serializationArg = this.isJsonContent(p) ? ", 'json'" : "";
+            urlTemplate = urlTemplate.replace(`{${p.name}}`, `\${HttpParamsBuilder.serializePathParam('${p.name}', ${jsParam}, '${style}', ${explode}, ${allowReserved}${serializationArg})}`);
         });
 
         const lines: string[] = [];
@@ -153,7 +170,8 @@ console.warn('The following querystring parameters are not automatically handled
             headerParams.forEach(p => {
                 const paramName = camelCase(p.name);
                 const explode = p.explode ?? false;
-                lines.push(`if (${paramName} != null) { headers = headers.set('${p.name}', HttpParamsBuilder.serializeHeaderParam('${p.name}', ${paramName}, ${explode})); }`);
+                const serializationArg = this.isJsonContent(p) ? ", 'json'" : "";
+                lines.push(`if (${paramName} != null) { headers = headers.set('${p.name}', HttpParamsBuilder.serializeHeaderParam('${p.name}', ${paramName}, ${explode}${serializationArg})); }`);
             });
 
             if (cookieParams.length > 0) {
@@ -162,7 +180,8 @@ console.warn('The following querystring parameters are not automatically handled
                     const paramName = camelCase(p.name);
                     const style = p.style || 'form';
                     const explode = p.explode ?? true;
-                    lines.push(`if (${paramName} != null) { __cookies.push(HttpParamsBuilder.serializeCookieParam('${p.name}', ${paramName}, '${style}', ${explode})); }`);
+                    const serializationArg = this.isJsonContent(p) ? ", 'json'" : "";
+                    lines.push(`if (${paramName} != null) { __cookies.push(HttpParamsBuilder.serializeCookieParam('${p.name}', ${paramName}, '${style}', ${explode}${serializationArg})); }`);
                 });
                 lines.push(`if (__cookies.length > 0) { headers = headers.set('Cookie', __cookies.join('; ')); }`);
             }

src/service/emit/utility/auth-interceptor.generator.ts

@@ -9,7 +9,7 @@ import { SecurityScheme } from '../../../core/types.js';
  * Generates the `auth.interceptor.ts` file. This interceptor is responsible for
  * attaching API keys and/or Bearer tokens to outgoing HTTP requests based on the
  * security schemes defined in the OpenAPI specification.
- * It currently supports `apiKey` (in header or query), `http` (bearer), `oauth2`, and `openIdConnect`.
+ * It supports `apiKey`, `http` (Bearer), `oauth2`, `openIdConnect`, and recognizes `mutualTLS`.
  */
 export class AuthInterceptorGenerator {
     /**
@@ -21,7 +21,6 @@ export class AuthInterceptorGenerator {
 
     /**
      * Generates the auth interceptor file if any **supported** security schemes are defined in the spec.
-     * A scheme is supported if it's an `apiKey` in the header/query or an `http`/`oauth2`/`openIdConnect` (Bearer).
      *
      * @param outputDir The root output directory.
      * @returns An object containing the names of the tokens for supported schemes (e.g., `['apiKey', 'bearerToken']`),
@@ -32,9 +31,10 @@ export class AuthInterceptorGenerator {
 
         const hasSupportedApiKey = securitySchemes.some(s => s.type === 'apiKey' && (s.in === 'header' || s.in === 'query'));
         const hasBearer = securitySchemes.some(s => this.isBearerScheme(s));
+        const hasMutualTLS = securitySchemes.some(s => s.type === 'mutualTLS');
 
         // If no supported schemes are found, do not generate the file at all.
-        if (!hasSupportedApiKey && !hasBearer) {
+        if (!hasSupportedApiKey && !hasBearer && !hasMutualTLS) {
             return;
         }
 
@@ -45,7 +45,7 @@ export class AuthInterceptorGenerator {
         sourceFile.insertText(0, UTILITY_GENERATOR_HEADER_COMMENT);
 
         const tokenImports: string[] = [];
-        const tokenNames: string[] = []; // This will be the return value
+        const tokenNames: string[] = [];
 
         if (hasSupportedApiKey) {
             tokenImports.push('API_KEY_TOKEN');
@@ -96,7 +96,6 @@ export class AuthInterceptorGenerator {
         let statementsBody = 'let authReq = req;';
         let bearerLogicAdded = false;
 
-        // De-duplicate schemes for generation loop
         const uniqueSchemes = Array.from(new Set(securitySchemes.map(s => JSON.stringify(s)))).map(s => JSON.parse(s) as SecurityScheme);
 
         for (const scheme of uniqueSchemes) {
@@ -111,6 +110,8 @@ export class AuthInterceptorGenerator {
                     statementsBody += `\nif (this.bearerToken) { const token = typeof this.bearerToken === 'function' ? this.bearerToken() : this.bearerToken; if (token) { authReq = authReq.clone({ setHeaders: { ...authReq.headers.keys().reduce((acc, key) => ({ ...acc, [key]: authReq.headers.getAll(key) }), {}), 'Authorization': \`Bearer \${token}\` } }); } }`;
                     bearerLogicAdded = true;
                 }
+            } else if (scheme.type === 'mutualTLS') {
+                statementsBody += `\n// Security Scheme '${scheme.name || 'MutualTLS'}' (mutualTLS) is assumed to be handled by the browser/client configuration.`;
             }
         }