ng-openapi 0.1.9-pr-18-feature-schema-validation-18c9be1.0 → 0.1.9-pr-18-feature-schema-validation-84a1386.0

package/cli.cjs

@@ -416,19 +416,6 @@ function isDataTypeInterface(type) {
 }
 __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 */
@@ -938,7 +925,7 @@ var TypeGenerator = class _TypeGenerator {
         moduleSpecifier: "@angular/common/http"
       }
     ]);
-    const { response, request } = this.config.options.validation ?? {};
+    const { response } = this.config.options.validation ?? {};
     const typeParameters = [
       "TResponseType extends 'arraybuffer' | 'blob' | 'json' | 'text'"
     ];
@@ -976,28 +963,16 @@ var TypeGenerator = class _TypeGenerator {
         hasQuestionToken: true
       });
       typeParameters.push("TReturnType");
-      const _typeParameters = [
-        ...typeParameters,
-        "TParamsObject = never"
-      ];
       this.sourceFile.addInterface({
         name: "RequestOptions",
         isExported: true,
-        typeParameters: _typeParameters,
+        typeParameters,
         properties,
         docs: [
           "Request Options for Angular HttpClient requests without request parsing"
         ]
       });
     }
-    if (request) {
-      properties.push({
-        name: "parseRequest",
-        type: "(params: TParamsObject) => void",
-        hasQuestionToken: true
-      });
-      typeParameters.push("TParamsObject");
-    }
     this.sourceFile.addInterface({
       name: "RequestOptions",
       isExported: true,
@@ -1979,11 +1954,6 @@ return this.httpClient.${httpMethod}(url, requestOptions)${parseResponse};`;
     }
     return "json";
   }
-  generateParseRequestBody(operation) {
-    if (this.config.options.validation?.request) {
-    }
-    return "";
-  }
 };
 
 // src/lib/generators/service/service-method/service-method-params.generator.ts
@@ -2065,15 +2035,11 @@ var ServiceMethodParamsGenerator = class {
     ];
   }
   getHttpRequestOptionsParameter(params) {
-    const { response, request } = this.config.options.validation ?? {};
-    const parseRequest = request ? generateParseRequestTypeParams(params) : "";
+    const { response } = this.config.options.validation ?? {};
     const additionalTypeParameters = [];
     if (response) {
       additionalTypeParameters.push("any");
     }
-    if (request && parseRequest) {
-      additionalTypeParameters.push(parseRequest);
-    }
     if (additionalTypeParameters.length === 0) {
       return `RequestOptions<'arraybuffer' | 'blob' | 'json' | 'text'>`;
     }
@@ -2157,21 +2123,6 @@ var ServiceMethodOverloadsGenerator = class {
       }
     ];
   }
-  getHttpRequestOptionsParameter(params, responseType) {
-    const { response, request } = this.config.options.validation ?? {};
-    const parseRequest = request ? generateParseRequestTypeParams(params) : "";
-    const additionalTypeParameters = [];
-    if (response) {
-      additionalTypeParameters.push(this.responseDataType);
-    }
-    if (request && parseRequest) {
-      additionalTypeParameters.push(parseRequest);
-    }
-    if (additionalTypeParameters.length === 0) {
-      return `RequestOptions<'${responseType}'>`;
-    }
-    return `RequestOptions<'${responseType}', ${additionalTypeParameters.join(", ")}>`;
-  }
   generateOverloadResponseType(operation) {
     const response = operation.responses?.["200"] || operation.responses?.["201"] || operation.responses?.["204"];
     if (!response) {
@@ -2191,6 +2142,17 @@ var ServiceMethodOverloadsGenerator = class {
         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",

package/index.d.ts

@@ -204,7 +204,6 @@ interface GeneratorConfig {
         enumStyle: "enum" | "union";
         validation?: {
             response?: boolean;
-            request?: boolean;
         };
         generateServices?: boolean;
         generateEnumBasedOnDescription?: boolean;

package/index.js

@@ -1033,7 +1033,7 @@ var _TypeGenerator = class _TypeGenerator {
         moduleSpecifier: "@angular/common/http"
       }
     ]);
-    const { response, request } = (_a = this.config.options.validation) != null ? _a : {};
+    const { response } = (_a = this.config.options.validation) != null ? _a : {};
     const typeParameters = [
       "TResponseType extends 'arraybuffer' | 'blob' | 'json' | 'text'"
     ];
@@ -1071,28 +1071,16 @@ var _TypeGenerator = class _TypeGenerator {
         hasQuestionToken: true
       });
       typeParameters.push("TReturnType");
-      const _typeParameters = [
-        ...typeParameters,
-        "TParamsObject = never"
-      ];
       this.sourceFile.addInterface({
         name: "RequestOptions",
         isExported: true,
-        typeParameters: _typeParameters,
+        typeParameters,
         properties,
         docs: [
           "Request Options for Angular HttpClient requests without request parsing"
         ]
       });
     }
-    if (request) {
-      properties.push({
-        name: "parseRequest",
-        type: "(params: TParamsObject) => void",
-        hasQuestionToken: true
-      });
-      typeParameters.push("TParamsObject");
-    }
     this.sourceFile.addInterface({
       name: "RequestOptions",
       isExported: true,
@@ -2076,12 +2064,6 @@ return this.httpClient.${httpMethod}(url, requestOptions)${parseResponse};`;
     }
     return "json";
   }
-  generateParseRequestBody(operation) {
-    var _a;
-    if ((_a = this.config.options.validation) == null ? void 0 : _a.request) {
-    }
-    return "";
-  }
 };
 __name(_ServiceMethodBodyGenerator, "ServiceMethodBodyGenerator");
 var ServiceMethodBodyGenerator = _ServiceMethodBodyGenerator;
@@ -2164,15 +2146,11 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
   }
   getHttpRequestOptionsParameter(params) {
     var _a;
-    const { response, request } = (_a = this.config.options.validation) != null ? _a : {};
-    const parseRequest = request ? generateParseRequestTypeParams(params) : "";
+    const { response } = (_a = this.config.options.validation) != null ? _a : {};
     const additionalTypeParameters = [];
     if (response) {
       additionalTypeParameters.push("any");
     }
-    if (request && parseRequest) {
-      additionalTypeParameters.push(parseRequest);
-    }
     if (additionalTypeParameters.length === 0) {
       return `RequestOptions<'arraybuffer' | 'blob' | 'json' | 'text'>`;
     }
@@ -2255,22 +2233,6 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
       }
     ];
   }
-  getHttpRequestOptionsParameter(params, responseType) {
-    var _a;
-    const { response, request } = (_a = this.config.options.validation) != null ? _a : {};
-    const parseRequest = request ? generateParseRequestTypeParams(params) : "";
-    const additionalTypeParameters = [];
-    if (response) {
-      additionalTypeParameters.push(this.responseDataType);
-    }
-    if (request && parseRequest) {
-      additionalTypeParameters.push(parseRequest);
-    }
-    if (additionalTypeParameters.length === 0) {
-      return `RequestOptions<'${responseType}'>`;
-    }
-    return `RequestOptions<'${responseType}', ${additionalTypeParameters.join(", ")}>`;
-  }
   generateOverloadResponseType(operation) {
     var _a, _b, _c;
     const response = ((_a = operation.responses) == null ? void 0 : _a["200"]) || ((_b = operation.responses) == null ? void 0 : _b["201"]) || ((_c = operation.responses) == null ? void 0 : _c["204"]);
@@ -2291,6 +2253,18 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
         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 = [

package/package.json

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