ng-openapi 0.1.8 → 0.1.9-pr-18-feature-schema-validation-dbff16c.0

package/cli.cjs

@@ -115,6 +115,7 @@ __name(escapeString, "escapeString");
 // ../shared/src/utils/functions/collect-used-types.ts
 function collectUsedTypes(operations) {
   const usedTypes = /* @__PURE__ */ new Set();
+  usedTypes.add("RequestOptions");
   operations.forEach((operation) => {
     operation.parameters?.forEach((param) => {
       collectTypesFromSchema(param.schema || param, usedTypes);
@@ -387,6 +388,34 @@ function getResponseType(response, config) {
 }
 __name(getResponseType, "getResponseType");
 
+// ../shared/src/utils/functions/get-request-body-type.ts
+function getRequestBodyType(requestBody, config) {
+  const content = requestBody.content || {};
+  const jsonContent = content["application/json"];
+  if (jsonContent?.schema) {
+    return getTypeScriptType(jsonContent.schema, config, jsonContent.schema.nullable);
+  }
+  return "any";
+}
+__name(getRequestBodyType, "getRequestBodyType");
+
+// ../shared/src/utils/functions/is-data-type-interface.ts
+function isDataTypeInterface(type) {
+  const invalidTypes = [
+    "any",
+    "File",
+    "string",
+    "number",
+    "boolean",
+    "object",
+    "unknown",
+    "[]",
+    "Array"
+  ];
+  return !invalidTypes.some((invalidType) => type.includes(invalidType));
+}
+__name(isDataTypeInterface, "isDataTypeInterface");
+
 // ../shared/src/config/constants.ts
 var disableLinting = `/* @ts-nocheck */
 /* eslint-disable */
@@ -629,6 +658,7 @@ var TypeGenerator = class _TypeGenerator {
       Object.entries(definitions).forEach(([name, definition]) => {
         this.generateInterface(name, definition);
       });
+      this.generateSdkTypes();
       this.sourceFile.formatText();
       this.sourceFile.saveSync();
     } catch (error) {
@@ -885,6 +915,74 @@ var TypeGenerator = class _TypeGenerator {
   escapeString(str) {
     return str.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
   }
+  generateSdkTypes() {
+    this.sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "HttpContext",
+          "HttpHeaders"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      }
+    ]);
+    const { response } = this.config.options.validation ?? {};
+    const typeParameters = [
+      "TResponseType extends 'arraybuffer' | 'blob' | 'json' | 'text'"
+    ];
+    const properties = [
+      {
+        name: "headers",
+        type: "HttpHeaders",
+        hasQuestionToken: true
+      },
+      {
+        name: "reportProgress",
+        type: "boolean",
+        hasQuestionToken: true
+      },
+      {
+        name: "responseType",
+        type: "TResponseType",
+        hasQuestionToken: true
+      },
+      {
+        name: "withCredentials",
+        type: "boolean",
+        hasQuestionToken: true
+      },
+      {
+        name: "context",
+        type: "HttpContext",
+        hasQuestionToken: true
+      }
+    ];
+    if (response) {
+      properties.push({
+        name: "parse",
+        type: "(response: unknown) => TReturnType",
+        hasQuestionToken: true
+      });
+      typeParameters.push("TReturnType");
+      this.sourceFile.addInterface({
+        name: "RequestOptions",
+        isExported: true,
+        typeParameters,
+        properties,
+        docs: [
+          "Request Options for Angular HttpClient requests without request parsing"
+        ]
+      });
+    }
+    this.sourceFile.addInterface({
+      name: "RequestOptions",
+      isExported: true,
+      typeParameters,
+      properties,
+      docs: [
+        "Request Options for Angular HttpClient requests"
+      ]
+    });
+  }
 };
 
 // src/lib/generators/utility/token.generator.ts
@@ -1705,14 +1803,6 @@ var ServiceMethodBodyGenerator = class {
     ];
     return bodyParts.filter(Boolean).join("\n");
   }
-  getRequestBodyType(requestBody) {
-    const content = requestBody.content || {};
-    const jsonContent = content["application/json"];
-    if (jsonContent?.schema) {
-      return getTypeScriptType(jsonContent.schema, this.config, jsonContent.schema.nullable);
-    }
-    return "any";
-  }
   isMultipartFormData(operation) {
     return !!operation.requestBody?.content?.["multipart/form-data"];
   }
@@ -1830,8 +1920,8 @@ const requestOptions: any = {
       if (context.isMultipart) {
         bodyParam = "formData";
       } else if (operation.requestBody?.content?.["application/json"]) {
-        const bodyType = this.getRequestBodyType(operation.requestBody);
-        const isInterface = this.isDataTypeInterface(bodyType);
+        const bodyType = getRequestBodyType(operation.requestBody, this.config);
+        const isInterface = isDataTypeInterface(bodyType);
         bodyParam = isInterface ? camelCase(bodyType) : "requestBody";
       }
     }
@@ -1840,12 +1930,13 @@ const requestOptions: any = {
       "put",
       "patch"
     ];
+    const parseResponse = this.config.options.validation?.response ? `.pipe(map(response => options?.parse?.(response) ?? response))` : "";
     if (methodsWithBody.includes(httpMethod)) {
       return `
-return this.httpClient.${httpMethod}(url, ${bodyParam || "null"}, requestOptions);`;
+return this.httpClient.${httpMethod}(url, ${bodyParam || "null"}, requestOptions)${parseResponse};`;
     } else {
       return `
-return this.httpClient.${httpMethod}(url, requestOptions);`;
+return this.httpClient.${httpMethod}(url, requestOptions)${parseResponse};`;
     }
   }
   determineResponseType(operation) {
@@ -1863,20 +1954,6 @@ return this.httpClient.${httpMethod}(url, requestOptions);`;
     }
     return "json";
   }
-  isDataTypeInterface(type) {
-    const invalidTypes = [
-      "any",
-      "File",
-      "string",
-      "number",
-      "boolean",
-      "object",
-      "unknown",
-      "[]",
-      "Array"
-    ];
-    return !invalidTypes.some((invalidType) => type.includes(invalidType));
-  }
 };
 
 // src/lib/generators/service/service-method/service-method-params.generator.ts
@@ -1890,7 +1967,7 @@ var ServiceMethodParamsGenerator = class {
   }
   generateMethodParameters(operation) {
     const params = this.generateApiParameters(operation);
-    const optionsParam = this.addOptionsParameter();
+    const optionsParam = this.addOptionsParameter(params);
     const combined = [
       ...params,
       ...optionsParam
@@ -1926,7 +2003,7 @@ var ServiceMethodParamsGenerator = class {
     }
     if (operation.requestBody && operation.requestBody?.content?.["application/json"]) {
       const bodyType = this.getRequestBodyType(operation.requestBody);
-      const isInterface = this.isDataTypeInterface(bodyType);
+      const isInterface = isDataTypeInterface(bodyType);
       params.push({
         name: isInterface ? camelCase(bodyType) : "requestBody",
         type: bodyType,
@@ -1943,7 +2020,7 @@ var ServiceMethodParamsGenerator = class {
     });
     return params.sort((a, b) => Number(a.hasQuestionToken) - Number(b.hasQuestionToken));
   }
-  addOptionsParameter() {
+  addOptionsParameter(params) {
     return [
       {
         name: "observe",
@@ -1952,24 +2029,21 @@ var ServiceMethodParamsGenerator = class {
       },
       {
         name: "options",
-        type: `{ headers?: HttpHeaders; params?: HttpParams; reportProgress?: boolean; responseType?: 'arraybuffer' | 'blob' | 'json' | 'text'; withCredentials?: boolean; context?: HttpContext; }`,
+        type: this.getHttpRequestOptionsParameter(params),
         hasQuestionToken: true
       }
     ];
   }
-  isDataTypeInterface(type) {
-    const invalidTypes = [
-      "any",
-      "File",
-      "string",
-      "number",
-      "boolean",
-      "object",
-      "unknown",
-      "[]",
-      "Array"
-    ];
-    return !invalidTypes.some((invalidType) => type.includes(invalidType));
+  getHttpRequestOptionsParameter(params) {
+    const { response } = this.config.options.validation ?? {};
+    const additionalTypeParameters = [];
+    if (response) {
+      additionalTypeParameters.push("any");
+    }
+    if (additionalTypeParameters.length === 0) {
+      return `RequestOptions<'arraybuffer' | 'blob' | 'json' | 'text'>`;
+    }
+    return `RequestOptions<'arraybuffer' | 'blob' | 'json' | 'text', ${additionalTypeParameters.join(", ")}>`;
   }
   getRequestBodyType(requestBody) {
     const content = requestBody.content || {};
@@ -1988,6 +2062,7 @@ var ServiceMethodOverloadsGenerator = class {
   }
   config;
   paramsGenerator;
+  responseDataType = "any";
   constructor(config) {
     this.config = config;
     this.paramsGenerator = new ServiceMethodParamsGenerator(config);
@@ -2009,9 +2084,9 @@ var ServiceMethodOverloadsGenerator = class {
     return overloads;
   }
   generateMethodOverload(operation, observe, responseType) {
-    const responseDataType = this.generateOverloadResponseType(operation);
+    this.responseDataType = this.generateOverloadResponseType(operation);
     const params = this.generateOverloadParameters(operation, observe, responseType);
-    const returnType = this.generateOverloadReturnType(responseDataType, observe);
+    const returnType = this.generateOverloadReturnType(observe);
     return {
       parameters: params,
       returnType
@@ -2019,7 +2094,7 @@ var ServiceMethodOverloadsGenerator = class {
   }
   generateOverloadParameters(operation, observe, responseType) {
     const params = this.paramsGenerator.generateApiParameters(operation);
-    const optionsParam = this.addOverloadOptionsParameter(observe, responseType);
+    const optionsParam = this.addOverloadOptionsParameter(params, observe, responseType);
     const combined = [
       ...params,
       ...optionsParam
@@ -2034,7 +2109,7 @@ var ServiceMethodOverloadsGenerator = class {
     }
     return uniqueParams;
   }
-  addOverloadOptionsParameter(observe, responseType) {
+  addOverloadOptionsParameter(params, observe, responseType) {
     return [
       {
         name: "observe",
@@ -2043,7 +2118,7 @@ var ServiceMethodOverloadsGenerator = class {
       },
       {
         name: "options",
-        type: `{ headers?: HttpHeaders; reportProgress?: boolean; responseType?: '${responseType}'; withCredentials?: boolean; context?: HttpContext; }`,
+        type: this.getHttpRequestOptionsParameter(params, responseType),
         hasQuestionToken: true
       }
     ];
@@ -2055,18 +2130,29 @@ var ServiceMethodOverloadsGenerator = class {
     }
     return getResponseType(response, this.config);
   }
-  generateOverloadReturnType(responseType, observe) {
+  generateOverloadReturnType(observe) {
     switch (observe) {
       case "body":
-        return `Observable<${responseType}>`;
+        return `Observable<${this.responseDataType}>`;
       case "response":
-        return `Observable<HttpResponse<${responseType}>>`;
+        return `Observable<HttpResponse<${this.responseDataType}>>`;
       case "events":
-        return `Observable<HttpEvent<${responseType}>>`;
+        return `Observable<HttpEvent<${this.responseDataType}>>`;
       default:
         throw new Error(`Unsupported observe type: ${observe}`);
     }
   }
+  getHttpRequestOptionsParameter(params, responseType) {
+    const { response } = this.config.options.validation ?? {};
+    const additionalTypeParameters = [];
+    if (response) {
+      additionalTypeParameters.push(this.responseDataType);
+    }
+    if (additionalTypeParameters.length === 0) {
+      return `RequestOptions<'${responseType}'>`;
+    }
+    return `RequestOptions<'${responseType}', ${additionalTypeParameters.join(", ")}>`;
+  }
   determineResponseTypeForOperation(operation) {
     const successResponses = [
       "200",
@@ -2231,7 +2317,8 @@ var ServiceGenerator = class _ServiceGenerator {
       },
       {
         namedImports: [
-          "Observable"
+          "Observable",
+          "map"
         ],
         moduleSpecifier: "rxjs"
       },
@@ -2439,7 +2526,7 @@ async function generateFromConfig(config) {
 __name(generateFromConfig, "generateFromConfig");
 
 // package.json
-var version = "0.1.7";
+var version = "0.1.8";
 
 // src/lib/cli.ts
 var program = new import_commander.Command();

package/index.d.ts

@@ -1,4 +1,4 @@
-import { Project, ScriptTarget, ModuleKind, MethodDeclaration, FunctionDeclaration } from 'ts-morph';
+import { Project, ScriptTarget, ModuleKind, MethodDeclaration, FunctionDeclaration, OptionalKind, ParameterDeclarationStructure } from 'ts-morph';
 import { HttpInterceptor } from '@angular/common/http';
 import { Info, ExternalDocs, Path, ParameterType, XML, BodyParameter, QueryParameter, Security, Tag } from 'swagger-schema-official';
 
@@ -202,6 +202,9 @@ interface GeneratorConfig {
     options: {
         dateType: "string" | "Date";
         enumStyle: "enum" | "union";
+        validation?: {
+            response?: boolean;
+        };
         generateServices?: boolean;
         generateEnumBasedOnDescription?: boolean;
         customHeaders?: Record<string, string>;
@@ -261,6 +264,12 @@ declare function isPrimitiveType(schema: any): boolean;
 declare function inferResponseTypeFromContentType(contentType: string): "json" | "blob" | "arraybuffer" | "text";
 declare function getResponseType(response: SwaggerResponse, config: GeneratorConfig): string;
 
+declare function getRequestBodyType(requestBody: RequestBody, config: GeneratorConfig): string;
+
+declare function isDataTypeInterface(type: string): boolean;
+
+declare function generateParseRequestTypeParams(params: OptionalKind<ParameterDeclarationStructure>[]): string;
+
 declare const TYPE_GENERATOR_HEADER_COMMENT: string;
 declare const SERVICE_INDEX_GENERATOR_HEADER_COMMENT: string;
 declare const SERVICE_GENERATOR_HEADER_COMMENT: (controllerName: string) => string;
@@ -278,4 +287,4 @@ declare function validateInput(inputPath: string): void;
  */
 declare function generateFromConfig(config: GeneratorConfig): Promise<void>;
 
-export { BASE_INTERCEPTOR_HEADER_COMMENT, type EnumValueObject, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type IPluginGenerator, type IPluginGeneratorClass, type IPluginGeneratorConstructor, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenerationContext, type NgOpenapiClientConfig, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, type RequestBody, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeSchema, camelCase, collectUsedTypes, escapeString, extractPaths, generateFromConfig, getBasePathTokenName, getClientContextTokenName, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder, validateInput };
+export { BASE_INTERCEPTOR_HEADER_COMMENT, type EnumValueObject, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type IPluginGenerator, type IPluginGeneratorClass, type IPluginGeneratorConstructor, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenerationContext, type NgOpenapiClientConfig, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, type RequestBody, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeSchema, camelCase, collectUsedTypes, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder, validateInput };

package/index.js

@@ -86,13 +86,16 @@ __export(index_exports, {
   escapeString: () => escapeString,
   extractPaths: () => extractPaths,
   generateFromConfig: () => generateFromConfig,
+  generateParseRequestTypeParams: () => generateParseRequestTypeParams,
   getBasePathTokenName: () => getBasePathTokenName,
   getClientContextTokenName: () => getClientContextTokenName,
+  getRequestBodyType: () => getRequestBodyType,
   getResponseType: () => getResponseType,
   getResponseTypeFromResponse: () => getResponseTypeFromResponse,
   getTypeScriptType: () => getTypeScriptType,
   hasDuplicateFunctionNames: () => hasDuplicateFunctionNames,
   inferResponseTypeFromContentType: () => inferResponseTypeFromContentType,
+  isDataTypeInterface: () => isDataTypeInterface,
   isPrimitiveType: () => isPrimitiveType,
   kebabCase: () => kebabCase,
   nullableType: () => nullableType,
@@ -191,6 +194,7 @@ __name(escapeString, "escapeString");
 // ../shared/src/utils/functions/collect-used-types.ts
 function collectUsedTypes(operations) {
   const usedTypes = /* @__PURE__ */ new Set();
+  usedTypes.add("RequestOptions");
   operations.forEach((operation) => {
     var _a;
     (_a = operation.parameters) == null ? void 0 : _a.forEach((param) => {
@@ -465,6 +469,47 @@ function getResponseType(response, config) {
 }
 __name(getResponseType, "getResponseType");
 
+// ../shared/src/utils/functions/get-request-body-type.ts
+function getRequestBodyType(requestBody, config) {
+  const content = requestBody.content || {};
+  const jsonContent = content["application/json"];
+  if (jsonContent == null ? void 0 : jsonContent.schema) {
+    return getTypeScriptType(jsonContent.schema, config, jsonContent.schema.nullable);
+  }
+  return "any";
+}
+__name(getRequestBodyType, "getRequestBodyType");
+
+// ../shared/src/utils/functions/is-data-type-interface.ts
+function isDataTypeInterface(type) {
+  const invalidTypes = [
+    "any",
+    "File",
+    "string",
+    "number",
+    "boolean",
+    "object",
+    "unknown",
+    "[]",
+    "Array"
+  ];
+  return !invalidTypes.some((invalidType) => type.includes(invalidType));
+}
+__name(isDataTypeInterface, "isDataTypeInterface");
+
+// ../shared/src/utils/functions/generate-parse-request-type-params.ts
+function generateParseRequestTypeParams(params) {
+  const bodyParam = params.find((param) => {
+    return typeof param.type === "string" && isDataTypeInterface(param.type);
+  });
+  if (bodyParam) {
+    const optional = bodyParam.hasQuestionToken ? " | undefined" : "";
+    return `${bodyParam.type}${optional}`;
+  }
+  return "";
+}
+__name(generateParseRequestTypeParams, "generateParseRequestTypeParams");
+
 // ../shared/src/config/constants.ts
 var disableLinting = `/* @ts-nocheck */
 /* eslint-disable */
@@ -717,6 +762,7 @@ var _TypeGenerator = class _TypeGenerator {
       Object.entries(definitions).forEach(([name, definition]) => {
         this.generateInterface(name, definition);
       });
+      this.generateSdkTypes();
       this.sourceFile.formatText();
       this.sourceFile.saveSync();
     } catch (error) {
@@ -976,6 +1022,75 @@ var _TypeGenerator = class _TypeGenerator {
   escapeString(str) {
     return str.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
   }
+  generateSdkTypes() {
+    var _a;
+    this.sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "HttpContext",
+          "HttpHeaders"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      }
+    ]);
+    const { response } = (_a = this.config.options.validation) != null ? _a : {};
+    const typeParameters = [
+      "TResponseType extends 'arraybuffer' | 'blob' | 'json' | 'text'"
+    ];
+    const properties = [
+      {
+        name: "headers",
+        type: "HttpHeaders",
+        hasQuestionToken: true
+      },
+      {
+        name: "reportProgress",
+        type: "boolean",
+        hasQuestionToken: true
+      },
+      {
+        name: "responseType",
+        type: "TResponseType",
+        hasQuestionToken: true
+      },
+      {
+        name: "withCredentials",
+        type: "boolean",
+        hasQuestionToken: true
+      },
+      {
+        name: "context",
+        type: "HttpContext",
+        hasQuestionToken: true
+      }
+    ];
+    if (response) {
+      properties.push({
+        name: "parse",
+        type: "(response: unknown) => TReturnType",
+        hasQuestionToken: true
+      });
+      typeParameters.push("TReturnType");
+      this.sourceFile.addInterface({
+        name: "RequestOptions",
+        isExported: true,
+        typeParameters,
+        properties,
+        docs: [
+          "Request Options for Angular HttpClient requests without request parsing"
+        ]
+      });
+    }
+    this.sourceFile.addInterface({
+      name: "RequestOptions",
+      isExported: true,
+      typeParameters,
+      properties,
+      docs: [
+        "Request Options for Angular HttpClient requests"
+      ]
+    });
+  }
 };
 __name(_TypeGenerator, "TypeGenerator");
 var TypeGenerator = _TypeGenerator;
@@ -1792,14 +1907,6 @@ var _ServiceMethodBodyGenerator = class _ServiceMethodBodyGenerator {
     ];
     return bodyParts.filter(Boolean).join("\n");
   }
-  getRequestBodyType(requestBody) {
-    const content = requestBody.content || {};
-    const jsonContent = content["application/json"];
-    if (jsonContent == null ? void 0 : jsonContent.schema) {
-      return getTypeScriptType(jsonContent.schema, this.config, jsonContent.schema.nullable);
-    }
-    return "any";
-  }
   isMultipartFormData(operation) {
     var _a, _b;
     return !!((_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b["multipart/form-data"]);
@@ -1915,15 +2022,15 @@ const requestOptions: any = {
 };`;
   }
   generateHttpRequest(operation, context) {
-    var _a, _b;
+    var _a, _b, _c;
     const httpMethod = operation.method.toLowerCase();
     let bodyParam = "";
     if (context.hasBody) {
       if (context.isMultipart) {
         bodyParam = "formData";
       } else if ((_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b["application/json"]) {
-        const bodyType = this.getRequestBodyType(operation.requestBody);
-        const isInterface = this.isDataTypeInterface(bodyType);
+        const bodyType = getRequestBodyType(operation.requestBody, this.config);
+        const isInterface = isDataTypeInterface(bodyType);
         bodyParam = isInterface ? camelCase(bodyType) : "requestBody";
       }
     }
@@ -1932,12 +2039,13 @@ const requestOptions: any = {
       "put",
       "patch"
     ];
+    const parseResponse = ((_c = this.config.options.validation) == null ? void 0 : _c.response) ? `.pipe(map(response => options?.parse?.(response) ?? response))` : "";
     if (methodsWithBody.includes(httpMethod)) {
       return `
-return this.httpClient.${httpMethod}(url, ${bodyParam || "null"}, requestOptions);`;
+return this.httpClient.${httpMethod}(url, ${bodyParam || "null"}, requestOptions)${parseResponse};`;
     } else {
       return `
-return this.httpClient.${httpMethod}(url, requestOptions);`;
+return this.httpClient.${httpMethod}(url, requestOptions)${parseResponse};`;
     }
   }
   determineResponseType(operation) {
@@ -1956,20 +2064,6 @@ return this.httpClient.${httpMethod}(url, requestOptions);`;
     }
     return "json";
   }
-  isDataTypeInterface(type) {
-    const invalidTypes = [
-      "any",
-      "File",
-      "string",
-      "number",
-      "boolean",
-      "object",
-      "unknown",
-      "[]",
-      "Array"
-    ];
-    return !invalidTypes.some((invalidType) => type.includes(invalidType));
-  }
 };
 __name(_ServiceMethodBodyGenerator, "ServiceMethodBodyGenerator");
 var ServiceMethodBodyGenerator = _ServiceMethodBodyGenerator;
@@ -1982,7 +2076,7 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
   }
   generateMethodParameters(operation) {
     const params = this.generateApiParameters(operation);
-    const optionsParam = this.addOptionsParameter();
+    const optionsParam = this.addOptionsParameter(params);
     const combined = [
       ...params,
       ...optionsParam
@@ -2019,7 +2113,7 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
     }
     if (operation.requestBody && ((_i = (_h = operation.requestBody) == null ? void 0 : _h.content) == null ? void 0 : _i["application/json"])) {
       const bodyType = this.getRequestBodyType(operation.requestBody);
-      const isInterface = this.isDataTypeInterface(bodyType);
+      const isInterface = isDataTypeInterface(bodyType);
       params.push({
         name: isInterface ? camelCase(bodyType) : "requestBody",
         type: bodyType,
@@ -2036,7 +2130,7 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
     });
     return params.sort((a, b) => Number(a.hasQuestionToken) - Number(b.hasQuestionToken));
   }
-  addOptionsParameter() {
+  addOptionsParameter(params) {
     return [
       {
         name: "observe",
@@ -2045,24 +2139,22 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
       },
       {
         name: "options",
-        type: `{ headers?: HttpHeaders; params?: HttpParams; reportProgress?: boolean; responseType?: 'arraybuffer' | 'blob' | 'json' | 'text'; withCredentials?: boolean; context?: HttpContext; }`,
+        type: this.getHttpRequestOptionsParameter(params),
         hasQuestionToken: true
       }
     ];
   }
-  isDataTypeInterface(type) {
-    const invalidTypes = [
-      "any",
-      "File",
-      "string",
-      "number",
-      "boolean",
-      "object",
-      "unknown",
-      "[]",
-      "Array"
-    ];
-    return !invalidTypes.some((invalidType) => type.includes(invalidType));
+  getHttpRequestOptionsParameter(params) {
+    var _a;
+    const { response } = (_a = this.config.options.validation) != null ? _a : {};
+    const additionalTypeParameters = [];
+    if (response) {
+      additionalTypeParameters.push("any");
+    }
+    if (additionalTypeParameters.length === 0) {
+      return `RequestOptions<'arraybuffer' | 'blob' | 'json' | 'text'>`;
+    }
+    return `RequestOptions<'arraybuffer' | 'blob' | 'json' | 'text', ${additionalTypeParameters.join(", ")}>`;
   }
   getRequestBodyType(requestBody) {
     const content = requestBody.content || {};
@@ -2081,6 +2173,7 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
   constructor(config) {
     __publicField(this, "config");
     __publicField(this, "paramsGenerator");
+    __publicField(this, "responseDataType", "any");
     this.config = config;
     this.paramsGenerator = new ServiceMethodParamsGenerator(config);
   }
@@ -2101,9 +2194,9 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
     return overloads;
   }
   generateMethodOverload(operation, observe, responseType) {
-    const responseDataType = this.generateOverloadResponseType(operation);
+    this.responseDataType = this.generateOverloadResponseType(operation);
     const params = this.generateOverloadParameters(operation, observe, responseType);
-    const returnType = this.generateOverloadReturnType(responseDataType, observe);
+    const returnType = this.generateOverloadReturnType(observe);
     return {
       parameters: params,
       returnType
@@ -2111,7 +2204,7 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
   }
   generateOverloadParameters(operation, observe, responseType) {
     const params = this.paramsGenerator.generateApiParameters(operation);
-    const optionsParam = this.addOverloadOptionsParameter(observe, responseType);
+    const optionsParam = this.addOverloadOptionsParameter(params, observe, responseType);
     const combined = [
       ...params,
       ...optionsParam
@@ -2126,7 +2219,7 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
     }
     return uniqueParams;
   }
-  addOverloadOptionsParameter(observe, responseType) {
+  addOverloadOptionsParameter(params, observe, responseType) {
     return [
       {
         name: "observe",
@@ -2135,7 +2228,7 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
       },
       {
         name: "options",
-        type: `{ headers?: HttpHeaders; reportProgress?: boolean; responseType?: '${responseType}'; withCredentials?: boolean; context?: HttpContext; }`,
+        type: this.getHttpRequestOptionsParameter(params, responseType),
         hasQuestionToken: true
       }
     ];
@@ -2148,18 +2241,30 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
     }
     return getResponseType(response, this.config);
   }
-  generateOverloadReturnType(responseType, observe) {
+  generateOverloadReturnType(observe) {
     switch (observe) {
       case "body":
-        return `Observable<${responseType}>`;
+        return `Observable<${this.responseDataType}>`;
       case "response":
-        return `Observable<HttpResponse<${responseType}>>`;
+        return `Observable<HttpResponse<${this.responseDataType}>>`;
       case "events":
-        return `Observable<HttpEvent<${responseType}>>`;
+        return `Observable<HttpEvent<${this.responseDataType}>>`;
       default:
         throw new Error(`Unsupported observe type: ${observe}`);
     }
   }
+  getHttpRequestOptionsParameter(params, responseType) {
+    var _a;
+    const { response } = (_a = this.config.options.validation) != null ? _a : {};
+    const additionalTypeParameters = [];
+    if (response) {
+      additionalTypeParameters.push(this.responseDataType);
+    }
+    if (additionalTypeParameters.length === 0) {
+      return `RequestOptions<'${responseType}'>`;
+    }
+    return `RequestOptions<'${responseType}', ${additionalTypeParameters.join(", ")}>`;
+  }
   determineResponseTypeForOperation(operation) {
     var _a;
     const successResponses = [
@@ -2325,7 +2430,8 @@ var _ServiceGenerator = class _ServiceGenerator {
       },
       {
         namedImports: [
-          "Observable"
+          "Observable",
+          "map"
         ],
         moduleSpecifier: "rxjs"
       },
@@ -2549,13 +2655,16 @@ __name(generateFromConfig, "generateFromConfig");
   escapeString,
   extractPaths,
   generateFromConfig,
+  generateParseRequestTypeParams,
   getBasePathTokenName,
   getClientContextTokenName,
+  getRequestBodyType,
   getResponseType,
   getResponseTypeFromResponse,
   getTypeScriptType,
   hasDuplicateFunctionNames,
   inferResponseTypeFromContentType,
+  isDataTypeInterface,
   isPrimitiveType,
   kebabCase,
   nullableType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.1.8",
+  "version": "0.1.9-pr-18-feature-schema-validation-dbff16c.0",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "ng-openapi",