ng-openapi 0.2.2 → 0.2.3

package/cli.cjs

@@ -44,7 +44,7 @@ var fs4 = __toESM(require("fs"));
 var path12 = __toESM(require("path"));
 
 // package.json
-var version = "0.2.1";
+var version = "0.2.2";
 
 // src/lib/core/generator.ts
 var import_ts_morph7 = require("ts-morph");
@@ -111,6 +111,10 @@ function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, c
     case "null":
       return "null";
     default:
+      if (Array.isArray(schema.type)) {
+        const types = schema.type.map((t) => getTypeScriptType(t, config, void 0, void 0, context));
+        return nullableType(types.join(" | "), nullable);
+      }
       return nullableType("any", nullable);
   }
 }
@@ -292,7 +296,7 @@ function inferResponseTypeFromContentType(contentType) {
     }
     return "text";
   }
-  if (normalizedType === "application/x-www-form-urlencoded" || normalizedType === "multipart/form-data") {
+  if (normalizedType === "CONTENT_TYPES.FORM_URLENCODED" || normalizedType === "multipart/form-data") {
     return "text";
   }
   if (normalizedType === "application/javascript" || normalizedType === "application/typescript" || normalizedType === "application/css" || normalizedType === "application/yaml" || normalizedType === "application/x-yaml" || normalizedType === "application/toml") {
@@ -325,10 +329,17 @@ function getResponseType(response, config) {
 }
 __name(getResponseType, "getResponseType");
 
+// ../shared/src/utils/content-types.constants.ts
+var CONTENT_TYPES = {
+  MULTIPART: "multipart/form-data",
+  FORM_URLENCODED: "application/x-www-form-urlencoded",
+  JSON: "application/json"
+};
+
 // ../shared/src/utils/functions/get-request-body-type.ts
 function getRequestBodyType(requestBody, config) {
   const content = requestBody.content || {};
-  const jsonContent = content["application/json"];
+  const jsonContent = content[CONTENT_TYPES.JSON];
   if (jsonContent?.schema) {
     return getTypeScriptType(jsonContent.schema, config, jsonContent.schema.nullable);
   }
@@ -943,6 +954,10 @@ var TypeGenerator = class {
       case "null":
         return this.nullableType("null", isNullable);
       default:
+        if (Array.isArray(type)) {
+          const types = type.map((t) => this.mapSwaggerTypeToTypeScript(t, void 0, isNullable));
+          return this.nullableType(types.join(" | "), isNullable);
+        }
         return this.nullableType("any", isNullable);
     }
   }
@@ -1941,19 +1956,35 @@ var ServiceMethodBodyGenerator = class {
       this.generateQueryParams(context),
       this.generateHeaders(context),
       this.generateMultipartFormData(operation, context),
+      this.generateUrlEncodedFormData(operation, context),
       this.generateRequestOptions(context),
       this.generateHttpRequest(operation, context)
     ];
     return bodyParts.filter(Boolean).join("\n");
   }
   isMultipartFormData(operation) {
-    return !!operation.requestBody?.content?.["multipart/form-data"];
+    return !!operation.requestBody?.content?.[CONTENT_TYPES.MULTIPART];
+  }
+  isUrlEncodedFormData(operation) {
+    return !!operation.requestBody?.content?.[CONTENT_TYPES.FORM_URLENCODED] && !operation.requestBody?.content?.[CONTENT_TYPES.JSON];
   }
   getFormDataFields(operation) {
     if (!this.isMultipartFormData(operation)) {
       return [];
     }
-    const schema = operation.requestBody?.content?.["multipart/form-data"].schema;
+    const schema = operation.requestBody?.content?.[CONTENT_TYPES.MULTIPART].schema;
+    let resolvedSchema = schema;
+    if (schema?.$ref) {
+      resolvedSchema = this.parser.resolveReference(schema.$ref);
+    }
+    const properties = resolvedSchema?.properties || {};
+    return Object.keys(properties);
+  }
+  getUrlEncodedFields(operation) {
+    if (!this.isUrlEncodedFormData(operation)) {
+      return [];
+    }
+    const schema = operation.requestBody?.content?.[CONTENT_TYPES.FORM_URLENCODED].schema;
     let resolvedSchema = schema;
     if (schema?.$ref) {
       resolvedSchema = this.parser.resolveReference(schema.$ref);
@@ -1967,7 +1998,9 @@ var ServiceMethodBodyGenerator = class {
       queryParams: operation.parameters?.filter((p) => p.in === "query") || [],
       hasBody: !!operation.requestBody,
       isMultipart: this.isMultipartFormData(operation),
+      isUrlEncoded: this.isUrlEncodedFormData(operation),
       formDataFields: this.getFormDataFields(operation),
+      urlEncodedFields: this.getUrlEncodedFields(operation),
       responseType: this.determineResponseType(operation)
     };
   }
@@ -1993,7 +2026,7 @@ ${paramMappings}`;
   }
   generateHeaders(context) {
     const hasCustomHeaders = this.config.options.customHeaders;
-    if (!hasCustomHeaders && !context.isMultipart) {
+    if (!hasCustomHeaders && !context.isMultipart && !context.isUrlEncoded) {
       return "";
     }
     let headerCode = `
@@ -2014,7 +2047,13 @@ ${Object.entries(this.config.options.customHeaders || {}).map(([key, value]) =>
       headerCode += `
 // Remove Content-Type for multipart (browser will set it with boundary)
 headers = headers.delete('Content-Type');`;
-    } else if (!context.isMultipart) {
+    } else if (context.isUrlEncoded) {
+      headerCode += `
+// Set Content-Type for URL-encoded form data
+if (!headers.has('Content-Type')) {
+  headers = headers.set('Content-Type', 'application/x-www-form-urlencoded');
+}`;
+    } else {
       headerCode += `
 // Set Content-Type for JSON requests if not already set
 if (!headers.has('Content-Type')) {
@@ -2027,7 +2066,7 @@ if (!headers.has('Content-Type')) {
     if (!context.isMultipart || context.formDataFields.length === 0) {
       return "";
     }
-    const schema = operation.requestBody?.content?.["multipart/form-data"].schema;
+    const schema = operation.requestBody?.content?.[CONTENT_TYPES.MULTIPART].schema;
     let resolvedSchema = schema;
     if (schema?.$ref) {
       resolvedSchema = this.parser.resolveReference(schema.$ref);
@@ -2058,11 +2097,42 @@ if (!headers.has('Content-Type')) {
     return `
 const formData = new FormData();
 ${formDataAppends}`;
+  }
+  generateUrlEncodedFormData(operation, context) {
+    if (!context.isUrlEncoded || context.urlEncodedFields.length === 0) {
+      return "";
+    }
+    const schema = operation.requestBody?.content?.[CONTENT_TYPES.FORM_URLENCODED].schema;
+    let resolvedSchema = schema;
+    if (schema?.$ref) {
+      resolvedSchema = this.parser.resolveReference(schema.$ref);
+    }
+    const properties = resolvedSchema?.properties || {};
+    const formBodyAppends = context.urlEncodedFields.map((field) => {
+      const fieldSchema = properties[field];
+      const isArray = fieldSchema?.type === "array";
+      if (isArray) {
+        return `if (${field} !== undefined && Array.isArray(${field})) {
+                  ${field}.forEach((item) => {
+                    if (item !== undefined && item !== null) {
+                      formBody.append('${field}', String(item));
+                    }
+                  });
+                }`;
+      } else {
+        return `if (${field} !== undefined && ${field} !== null) {
+                  formBody.append('${field}', String(${field}));
+                }`;
+      }
+    }).join("\n");
+    return `
+const formBody = new URLSearchParams();
+${formBodyAppends}`;
   }
   generateRequestOptions(context) {
     const options = [];
     options.push("observe: observe as any");
-    const hasHeaders = this.config.options.customHeaders || context.isMultipart;
+    const hasHeaders = this.config.options.customHeaders || context.isMultipart || context.isUrlEncoded;
     if (hasHeaders) {
       options.push("headers");
     }
@@ -2087,7 +2157,9 @@ const requestOptions: any = {
     if (context.hasBody) {
       if (context.isMultipart) {
         bodyParam = "formData";
-      } else if (operation.requestBody?.content?.["application/json"]) {
+      } else if (context.isUrlEncoded) {
+        bodyParam = "formBody.toString()";
+      } else if (operation.requestBody?.content?.[CONTENT_TYPES.JSON]) {
         const bodyType = getRequestBodyType(operation.requestBody, this.config);
         const isInterface = isDataTypeInterface(bodyType);
         bodyParam = isInterface ? camelCase(bodyType) : "requestBody";
@@ -2162,28 +2234,28 @@ var ServiceMethodParamsGenerator = class {
         hasQuestionToken: !param.required
       });
     });
-    if (operation.requestBody && operation.requestBody?.content?.["multipart/form-data"]) {
-      const schema = operation.requestBody.content["multipart/form-data"].schema;
-      let resolvedSchema = schema;
-      if (schema?.$ref) {
-        resolvedSchema = this.parser.resolveReference(schema.$ref);
+    const requestBody = operation.requestBody;
+    if (requestBody) {
+      const formDataContent = requestBody.content?.[CONTENT_TYPES.MULTIPART];
+      const urlEncodedContent = requestBody.content?.[CONTENT_TYPES.FORM_URLENCODED];
+      const jsonContent = requestBody.content?.[CONTENT_TYPES.JSON];
+      if (formDataContent) {
+        const formParams = this.convertObjectToSingleParams(formDataContent.schema);
+        params.push(...formParams);
+      }
+      if (!jsonContent && urlEncodedContent) {
+        const formParams = this.convertObjectToSingleParams(urlEncodedContent.schema);
+        params.push(...formParams);
       }
-      Object.entries(resolvedSchema?.properties ?? {}).forEach(([key, value]) => {
+      if (jsonContent && !formDataContent) {
+        const bodyType = this.getRequestBodyType(requestBody);
+        const isInterface = isDataTypeInterface(bodyType);
         params.push({
-          name: key,
-          type: getTypeScriptType(value, this.config, value.nullable),
-          hasQuestionToken: !resolvedSchema?.required?.includes(key)
+          name: isInterface ? camelCase(bodyType) : "requestBody",
+          type: bodyType,
+          hasQuestionToken: !requestBody.required
         });
-      });
-    }
-    if (operation.requestBody && operation.requestBody?.content?.["application/json"]) {
-      const bodyType = this.getRequestBodyType(operation.requestBody);
-      const isInterface = isDataTypeInterface(bodyType);
-      params.push({
-        name: isInterface ? camelCase(bodyType) : "requestBody",
-        type: bodyType,
-        hasQuestionToken: !operation.requestBody.required
-      });
+      }
     }
     const queryParams = operation.parameters?.filter((p) => p.in === "query") || [];
     queryParams.forEach((param) => {
@@ -2222,12 +2294,27 @@ var ServiceMethodParamsGenerator = class {
   }
   getRequestBodyType(requestBody) {
     const content = requestBody.content || {};
-    const jsonContent = content["application/json"];
+    const jsonContent = content[CONTENT_TYPES.JSON];
     if (jsonContent?.schema) {
       return getTypeScriptType(jsonContent.schema, this.config, jsonContent.schema.nullable);
     }
     return "any";
   }
+  convertObjectToSingleParams(schema) {
+    const params = [];
+    let resolvedSchema = schema;
+    if (schema?.$ref) {
+      resolvedSchema = this.parser.resolveReference(schema.$ref);
+    }
+    Object.entries(resolvedSchema?.properties ?? {}).forEach(([key, value]) => {
+      params.push({
+        name: key,
+        type: getTypeScriptType(value, this.config, value.nullable),
+        hasQuestionToken: !resolvedSchema?.required?.includes(key)
+      });
+    });
+    return params;
+  }
 };
 
 // src/lib/generators/service/service-method/service-method-overloads.generator.ts

package/index.d.ts

@@ -13,7 +13,9 @@ interface MethodGenerationContext {
     }>;
     hasBody: boolean;
     isMultipart: boolean;
+    isUrlEncoded: boolean;
     formDataFields: string[];
+    urlEncodedFields: string[];
     responseType: "json" | "blob" | "arraybuffer" | "text";
 }
 interface TypeSchema {
@@ -259,6 +261,12 @@ declare function isDataTypeInterface(type: string): boolean;
 
 declare function generateParseRequestTypeParams(params: OptionalKind<ParameterDeclarationStructure>[]): string;
 
+declare const CONTENT_TYPES: {
+    MULTIPART: string;
+    FORM_URLENCODED: string;
+    JSON: 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 +286,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, 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, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT, camelCase, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder, screamingSnakeCase, validateInput };
+export { BASE_INTERCEPTOR_HEADER_COMMENT, CONTENT_TYPES, type EnumValueObject, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type IPluginGenerator, type IPluginGeneratorClass, 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, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT, camelCase, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder, screamingSnakeCase, validateInput };

package/index.js

@@ -74,6 +74,7 @@ var __async = (__this, __arguments, generator) => {
 var index_exports = {};
 __export(index_exports, {
   BASE_INTERCEPTOR_HEADER_COMMENT: () => BASE_INTERCEPTOR_HEADER_COMMENT,
+  CONTENT_TYPES: () => CONTENT_TYPES,
   HTTP_RESOURCE_GENERATOR_HEADER_COMMENT: () => HTTP_RESOURCE_GENERATOR_HEADER_COMMENT,
   MAIN_INDEX_GENERATOR_HEADER_COMMENT: () => MAIN_INDEX_GENERATOR_HEADER_COMMENT,
   PROVIDER_GENERATOR_HEADER_COMMENT: () => PROVIDER_GENERATOR_HEADER_COMMENT,
@@ -179,6 +180,10 @@ function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, c
     case "null":
       return "null";
     default:
+      if (Array.isArray(schema.type)) {
+        const types = schema.type.map((t) => getTypeScriptType(t, config, void 0, void 0, context));
+        return nullableType(types.join(" | "), nullable);
+      }
       return nullableType("any", nullable);
   }
 }
@@ -361,7 +366,7 @@ function inferResponseTypeFromContentType(contentType) {
     }
     return "text";
   }
-  if (normalizedType === "application/x-www-form-urlencoded" || normalizedType === "multipart/form-data") {
+  if (normalizedType === "CONTENT_TYPES.FORM_URLENCODED" || normalizedType === "multipart/form-data") {
     return "text";
   }
   if (normalizedType === "application/javascript" || normalizedType === "application/typescript" || normalizedType === "application/css" || normalizedType === "application/yaml" || normalizedType === "application/x-yaml" || normalizedType === "application/toml") {
@@ -394,10 +399,17 @@ function getResponseType(response, config) {
 }
 __name(getResponseType, "getResponseType");
 
+// ../shared/src/utils/content-types.constants.ts
+var CONTENT_TYPES = {
+  MULTIPART: "multipart/form-data",
+  FORM_URLENCODED: "application/x-www-form-urlencoded",
+  JSON: "application/json"
+};
+
 // ../shared/src/utils/functions/get-request-body-type.ts
 function getRequestBodyType(requestBody, config) {
   const content = requestBody.content || {};
-  const jsonContent = content["application/json"];
+  const jsonContent = content[CONTENT_TYPES.JSON];
   if (jsonContent == null ? void 0 : jsonContent.schema) {
     return getTypeScriptType(jsonContent.schema, config, jsonContent.schema.nullable);
   }
@@ -1066,6 +1078,10 @@ var _TypeGenerator = class _TypeGenerator {
       case "null":
         return this.nullableType("null", isNullable);
       default:
+        if (Array.isArray(type)) {
+          const types = type.map((t) => this.mapSwaggerTypeToTypeScript(t, void 0, isNullable));
+          return this.nullableType(types.join(" | "), isNullable);
+        }
         return this.nullableType("any", isNullable);
     }
   }
@@ -2059,6 +2075,7 @@ var _ServiceMethodBodyGenerator = class _ServiceMethodBodyGenerator {
       this.generateQueryParams(context),
       this.generateHeaders(context),
       this.generateMultipartFormData(operation, context),
+      this.generateUrlEncodedFormData(operation, context),
       this.generateRequestOptions(context),
       this.generateHttpRequest(operation, context)
     ];
@@ -2066,14 +2083,31 @@ var _ServiceMethodBodyGenerator = class _ServiceMethodBodyGenerator {
   }
   isMultipartFormData(operation) {
     var _a, _b;
-    return !!((_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b["multipart/form-data"]);
+    return !!((_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b[CONTENT_TYPES.MULTIPART]);
+  }
+  isUrlEncodedFormData(operation) {
+    var _a, _b, _c, _d;
+    return !!((_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b[CONTENT_TYPES.FORM_URLENCODED]) && !((_d = (_c = operation.requestBody) == null ? void 0 : _c.content) == null ? void 0 : _d[CONTENT_TYPES.JSON]);
   }
   getFormDataFields(operation) {
     var _a, _b;
     if (!this.isMultipartFormData(operation)) {
       return [];
     }
-    const schema = (_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b["multipart/form-data"].schema;
+    const schema = (_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b[CONTENT_TYPES.MULTIPART].schema;
+    let resolvedSchema = schema;
+    if (schema == null ? void 0 : schema.$ref) {
+      resolvedSchema = this.parser.resolveReference(schema.$ref);
+    }
+    const properties = (resolvedSchema == null ? void 0 : resolvedSchema.properties) || {};
+    return Object.keys(properties);
+  }
+  getUrlEncodedFields(operation) {
+    var _a, _b;
+    if (!this.isUrlEncodedFormData(operation)) {
+      return [];
+    }
+    const schema = (_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b[CONTENT_TYPES.FORM_URLENCODED].schema;
     let resolvedSchema = schema;
     if (schema == null ? void 0 : schema.$ref) {
       resolvedSchema = this.parser.resolveReference(schema.$ref);
@@ -2088,7 +2122,9 @@ var _ServiceMethodBodyGenerator = class _ServiceMethodBodyGenerator {
       queryParams: ((_b = operation.parameters) == null ? void 0 : _b.filter((p) => p.in === "query")) || [],
       hasBody: !!operation.requestBody,
       isMultipart: this.isMultipartFormData(operation),
+      isUrlEncoded: this.isUrlEncodedFormData(operation),
       formDataFields: this.getFormDataFields(operation),
+      urlEncodedFields: this.getUrlEncodedFields(operation),
       responseType: this.determineResponseType(operation)
     };
   }
@@ -2114,7 +2150,7 @@ ${paramMappings}`;
   }
   generateHeaders(context) {
     const hasCustomHeaders = this.config.options.customHeaders;
-    if (!hasCustomHeaders && !context.isMultipart) {
+    if (!hasCustomHeaders && !context.isMultipart && !context.isUrlEncoded) {
       return "";
     }
     let headerCode = `
@@ -2135,7 +2171,13 @@ ${Object.entries(this.config.options.customHeaders || {}).map(([key, value]) =>
       headerCode += `
 // Remove Content-Type for multipart (browser will set it with boundary)
 headers = headers.delete('Content-Type');`;
-    } else if (!context.isMultipart) {
+    } else if (context.isUrlEncoded) {
+      headerCode += `
+// Set Content-Type for URL-encoded form data
+if (!headers.has('Content-Type')) {
+  headers = headers.set('Content-Type', 'application/x-www-form-urlencoded');
+}`;
+    } else {
       headerCode += `
 // Set Content-Type for JSON requests if not already set
 if (!headers.has('Content-Type')) {
@@ -2149,7 +2191,7 @@ if (!headers.has('Content-Type')) {
     if (!context.isMultipart || context.formDataFields.length === 0) {
       return "";
     }
-    const schema = (_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b["multipart/form-data"].schema;
+    const schema = (_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b[CONTENT_TYPES.MULTIPART].schema;
     let resolvedSchema = schema;
     if (schema == null ? void 0 : schema.$ref) {
       resolvedSchema = this.parser.resolveReference(schema.$ref);
@@ -2180,11 +2222,43 @@ if (!headers.has('Content-Type')) {
     return `
 const formData = new FormData();
 ${formDataAppends}`;
+  }
+  generateUrlEncodedFormData(operation, context) {
+    var _a, _b;
+    if (!context.isUrlEncoded || context.urlEncodedFields.length === 0) {
+      return "";
+    }
+    const schema = (_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b[CONTENT_TYPES.FORM_URLENCODED].schema;
+    let resolvedSchema = schema;
+    if (schema == null ? void 0 : schema.$ref) {
+      resolvedSchema = this.parser.resolveReference(schema.$ref);
+    }
+    const properties = (resolvedSchema == null ? void 0 : resolvedSchema.properties) || {};
+    const formBodyAppends = context.urlEncodedFields.map((field) => {
+      const fieldSchema = properties[field];
+      const isArray = (fieldSchema == null ? void 0 : fieldSchema.type) === "array";
+      if (isArray) {
+        return `if (${field} !== undefined && Array.isArray(${field})) {
+                  ${field}.forEach((item) => {
+                    if (item !== undefined && item !== null) {
+                      formBody.append('${field}', String(item));
+                    }
+                  });
+                }`;
+      } else {
+        return `if (${field} !== undefined && ${field} !== null) {
+                  formBody.append('${field}', String(${field}));
+                }`;
+      }
+    }).join("\n");
+    return `
+const formBody = new URLSearchParams();
+${formBodyAppends}`;
   }
   generateRequestOptions(context) {
     const options = [];
     options.push("observe: observe as any");
-    const hasHeaders = this.config.options.customHeaders || context.isMultipart;
+    const hasHeaders = this.config.options.customHeaders || context.isMultipart || context.isUrlEncoded;
     if (hasHeaders) {
       options.push("headers");
     }
@@ -2210,7 +2284,9 @@ const requestOptions: any = {
     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"]) {
+      } else if (context.isUrlEncoded) {
+        bodyParam = "formBody.toString()";
+      } else if ((_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b[CONTENT_TYPES.JSON]) {
         const bodyType = getRequestBodyType(operation.requestBody, this.config);
         const isInterface = isDataTypeInterface(bodyType);
         bodyParam = isInterface ? camelCase(bodyType) : "requestBody";
@@ -2276,7 +2352,7 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
     return uniqueParams;
   }
   generateApiParameters(operation) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e;
     const params = [];
     const pathParams = ((_a = operation.parameters) == null ? void 0 : _a.filter((p) => p.in === "path")) || [];
     pathParams.forEach((param) => {
@@ -2286,31 +2362,30 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
         hasQuestionToken: !param.required
       });
     });
-    if (operation.requestBody && ((_c = (_b = operation.requestBody) == null ? void 0 : _b.content) == null ? void 0 : _c["multipart/form-data"])) {
-      const schema = operation.requestBody.content["multipart/form-data"].schema;
-      let resolvedSchema = schema;
-      if (schema == null ? void 0 : schema.$ref) {
-        resolvedSchema = this.parser.resolveReference(schema.$ref);
+    const requestBody = operation.requestBody;
+    if (requestBody) {
+      const formDataContent = (_b = requestBody.content) == null ? void 0 : _b[CONTENT_TYPES.MULTIPART];
+      const urlEncodedContent = (_c = requestBody.content) == null ? void 0 : _c[CONTENT_TYPES.FORM_URLENCODED];
+      const jsonContent = (_d = requestBody.content) == null ? void 0 : _d[CONTENT_TYPES.JSON];
+      if (formDataContent) {
+        const formParams = this.convertObjectToSingleParams(formDataContent.schema);
+        params.push(...formParams);
       }
-      Object.entries((_d = resolvedSchema == null ? void 0 : resolvedSchema.properties) != null ? _d : {}).forEach(([key, value]) => {
-        var _a2;
+      if (!jsonContent && urlEncodedContent) {
+        const formParams = this.convertObjectToSingleParams(urlEncodedContent.schema);
+        params.push(...formParams);
+      }
+      if (jsonContent && !formDataContent) {
+        const bodyType = this.getRequestBodyType(requestBody);
+        const isInterface = isDataTypeInterface(bodyType);
         params.push({
-          name: key,
-          type: getTypeScriptType(value, this.config, value.nullable),
-          hasQuestionToken: !((_a2 = resolvedSchema == null ? void 0 : resolvedSchema.required) == null ? void 0 : _a2.includes(key))
+          name: isInterface ? camelCase(bodyType) : "requestBody",
+          type: bodyType,
+          hasQuestionToken: !requestBody.required
         });
-      });
-    }
-    if (operation.requestBody && ((_f = (_e = operation.requestBody) == null ? void 0 : _e.content) == null ? void 0 : _f["application/json"])) {
-      const bodyType = this.getRequestBodyType(operation.requestBody);
-      const isInterface = isDataTypeInterface(bodyType);
-      params.push({
-        name: isInterface ? camelCase(bodyType) : "requestBody",
-        type: bodyType,
-        hasQuestionToken: !operation.requestBody.required
-      });
+      }
     }
-    const queryParams = ((_g = operation.parameters) == null ? void 0 : _g.filter((p) => p.in === "query")) || [];
+    const queryParams = ((_e = operation.parameters) == null ? void 0 : _e.filter((p) => p.in === "query")) || [];
     queryParams.forEach((param) => {
       params.push({
         name: param.name,
@@ -2348,12 +2423,29 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
   }
   getRequestBodyType(requestBody) {
     const content = requestBody.content || {};
-    const jsonContent = content["application/json"];
+    const jsonContent = content[CONTENT_TYPES.JSON];
     if (jsonContent == null ? void 0 : jsonContent.schema) {
       return getTypeScriptType(jsonContent.schema, this.config, jsonContent.schema.nullable);
     }
     return "any";
   }
+  convertObjectToSingleParams(schema) {
+    var _a;
+    const params = [];
+    let resolvedSchema = schema;
+    if (schema == null ? void 0 : schema.$ref) {
+      resolvedSchema = this.parser.resolveReference(schema.$ref);
+    }
+    Object.entries((_a = resolvedSchema == null ? void 0 : resolvedSchema.properties) != null ? _a : {}).forEach(([key, value]) => {
+      var _a2;
+      params.push({
+        name: key,
+        type: getTypeScriptType(value, this.config, value.nullable),
+        hasQuestionToken: !((_a2 = resolvedSchema == null ? void 0 : resolvedSchema.required) == null ? void 0 : _a2.includes(key))
+      });
+    });
+    return params;
+  }
 };
 __name(_ServiceMethodParamsGenerator, "ServiceMethodParamsGenerator");
 var ServiceMethodParamsGenerator = _ServiceMethodParamsGenerator;
@@ -2801,6 +2893,7 @@ __name(generateFromConfig, "generateFromConfig");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BASE_INTERCEPTOR_HEADER_COMMENT,
+  CONTENT_TYPES,
   HTTP_RESOURCE_GENERATOR_HEADER_COMMENT,
   MAIN_INDEX_GENERATOR_HEADER_COMMENT,
   PROVIDER_GENERATOR_HEADER_COMMENT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "ng-openapi",