ng-openapi 0.1.17 → 0.1.18-pr-28-bugfix-form-data-request-4fada97.0

package/cli.cjs

@@ -44,7 +44,7 @@ var fs4 = __toESM(require("fs"));
 var path12 = __toESM(require("path"));
 
 // package.json
-var version = "0.1.16";
+var version = "0.1.17";
 
 // src/lib/core/generator.ts
 var import_ts_morph7 = require("ts-morph");
@@ -107,7 +107,7 @@ function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, c
     case "boolean":
       return nullableType("boolean", nullable);
     case "object":
-      return nullableType(context === "type" ? "Record<string, unknown>" : "any", nullable);
+      return nullableType(context === "type" ? "Record<string, any>" : "any", nullable);
     case "null":
       return "null";
     default:
@@ -124,78 +124,6 @@ function escapeString(str) {
 }
 __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);
-    });
-    if (operation.requestBody) {
-      collectTypesFromRequestBody(operation.requestBody, usedTypes);
-    }
-    if (operation.responses) {
-      Object.values(operation.responses).forEach((response) => {
-        collectTypesFromResponse(response, usedTypes);
-      });
-    }
-  });
-  return usedTypes;
-}
-__name(collectUsedTypes, "collectUsedTypes");
-function collectTypesFromSchema(schema, usedTypes) {
-  if (!schema) return;
-  if (schema.$ref) {
-    const refName = schema.$ref.split("/").pop();
-    if (refName) {
-      usedTypes.add(pascalCase(refName));
-    }
-  }
-  if (schema.type === "array" && schema.items) {
-    collectTypesFromSchema(schema.items, usedTypes);
-  }
-  if (schema.type === "object" && schema.properties) {
-    Object.values(schema.properties).forEach((prop) => {
-      collectTypesFromSchema(prop, usedTypes);
-    });
-  }
-  if (schema.allOf) {
-    schema.allOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema.oneOf) {
-    schema.oneOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema.anyOf) {
-    schema.anyOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-}
-__name(collectTypesFromSchema, "collectTypesFromSchema");
-function collectTypesFromRequestBody(requestBody, usedTypes) {
-  const content = requestBody.content || {};
-  Object.values(content).forEach((mediaType) => {
-    if (mediaType.schema) {
-      collectTypesFromSchema(mediaType.schema, usedTypes);
-    }
-  });
-}
-__name(collectTypesFromRequestBody, "collectTypesFromRequestBody");
-function collectTypesFromResponse(response, usedTypes) {
-  const content = response.content || {};
-  Object.values(content).forEach((mediaType) => {
-    if (mediaType.schema) {
-      collectTypesFromSchema(mediaType.schema, usedTypes);
-    }
-  });
-}
-__name(collectTypesFromResponse, "collectTypesFromResponse");
-
 // ../shared/src/utils/functions/token-names.ts
 function getClientContextTokenName(clientName = "default") {
   const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
@@ -1191,18 +1119,6 @@ var FileDownloadGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "Observable"
-      ],
-      moduleSpecifier: "rxjs"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "tap"
-      ],
-      moduleSpecifier: "rxjs/operators"
-    });
     sourceFile.addFunction({
       name: "downloadFile",
       isExported: true,
@@ -1312,7 +1228,7 @@ var FileDownloadGenerator = class {
     
     return fallbackFilename;`
     });
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().formatText();
     sourceFile.saveSync();
   }
 };
@@ -1334,34 +1250,6 @@ var DateTransformerGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "HttpInterceptor",
-        "HttpRequest",
-        "HttpHandler",
-        "HttpEvent",
-        "HttpResponse"
-      ],
-      moduleSpecifier: "@angular/common/http"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "Injectable"
-      ],
-      moduleSpecifier: "@angular/core"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "Observable"
-      ],
-      moduleSpecifier: "rxjs"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "map"
-      ],
-      moduleSpecifier: "rxjs/operators"
-    });
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph3.VariableDeclarationKind.Const,
@@ -1448,7 +1336,7 @@ var DateTransformerGenerator = class {
         }
       ]
     });
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().formatText();
     sourceFile.saveSync();
   }
 };
@@ -1733,33 +1621,9 @@ var BaseInterceptorGenerator = class {
     sourceFile.addImportDeclarations([
       {
         namedImports: [
-          "HttpEvent",
-          "HttpHandler",
-          "HttpInterceptor",
-          "HttpRequest",
-          "HttpContextToken"
-        ],
-        moduleSpecifier: "@angular/common/http"
-      },
-      {
-        namedImports: [
-          "inject",
           "Injectable"
         ],
         moduleSpecifier: "@angular/core"
-      },
-      {
-        namedImports: [
-          "Observable"
-        ],
-        moduleSpecifier: "rxjs"
-      },
-      {
-        namedImports: [
-          interceptorsTokenName,
-          clientContextTokenName
-        ],
-        moduleSpecifier: "../tokens"
       }
     ]);
     sourceFile.addClass({
@@ -1825,7 +1689,7 @@ var BaseInterceptorGenerator = class {
         }
       ]
     });
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().formatText();
     sourceFile.saveSync();
   }
   getInterceptorsTokenName() {
@@ -2061,8 +1925,10 @@ var ServiceMethodBodyGenerator = class {
     __name(this, "ServiceMethodBodyGenerator");
   }
   config;
-  constructor(config) {
+  parser;
+  constructor(config, parser) {
     this.config = config;
+    this.parser = parser;
   }
   generateMethodBody(operation) {
     const context = this.createGenerationContext(operation);
@@ -2083,7 +1949,12 @@ var ServiceMethodBodyGenerator = class {
     if (!this.isMultipartFormData(operation)) {
       return [];
     }
-    const properties = operation.requestBody?.content?.["multipart/form-data"]?.schema?.properties || {};
+    const schema = operation.requestBody?.content?.["multipart/form-data"].schema;
+    let resolvedSchema = schema;
+    if (schema?.$ref) {
+      resolvedSchema = this.parser.resolveReference(schema.$ref);
+    }
+    const properties = resolvedSchema?.properties || {};
     return Object.keys(properties);
   }
   createGenerationContext(operation) {
@@ -2152,13 +2023,33 @@ if (!headers.has('Content-Type')) {
     if (!context.isMultipart || context.formDataFields.length === 0) {
       return "";
     }
+    const schema = operation.requestBody?.content?.["multipart/form-data"].schema;
+    let resolvedSchema = schema;
+    if (schema?.$ref) {
+      resolvedSchema = this.parser.resolveReference(schema.$ref);
+    }
+    const properties = resolvedSchema?.properties || {};
     const formDataAppends = context.formDataFields.map((field) => {
-      const fieldSchema = operation.requestBody?.content?.["multipart/form-data"]?.schema?.properties?.[field];
+      const fieldSchema = properties[field];
       const isFile = fieldSchema?.type === "string" && fieldSchema?.format === "binary";
-      const valueExpression = isFile ? field : `String(${field})`;
-      return `if (${field} !== undefined) {
-  formData.append('${field}', ${valueExpression});
-}`;
+      const isArray = fieldSchema?.type === "array";
+      if (isArray) {
+        const itemSchema = Array.isArray(fieldSchema.items) ? fieldSchema.items[0] : fieldSchema.items;
+        const isFileArray = itemSchema?.type === "string" && itemSchema?.format === "binary";
+        const valueExpression = isFileArray ? "item" : "String(item)";
+        return `if (${field} !== undefined && Array.isArray(${field})) {
+                  ${field}.forEach((item) => {
+                    if (item !== undefined && item !== null) {
+                      formData.append('${field}', ${valueExpression});
+                    }
+                  });
+                }`;
+      } else {
+        const valueExpression = isFile ? field : `String(${field})`;
+        return `if (${field} !== undefined) {
+                  formData.append('${field}', ${valueExpression});
+                }`;
+      }
     }).join("\n");
     return `
 const formData = new FormData();
@@ -2235,8 +2126,10 @@ var ServiceMethodParamsGenerator = class {
     __name(this, "ServiceMethodParamsGenerator");
   }
   config;
-  constructor(config) {
+  parser;
+  constructor(config, parser) {
     this.config = config;
+    this.parser = parser;
   }
   generateMethodParameters(operation) {
     const params = this.generateApiParameters(operation);
@@ -2266,11 +2159,16 @@ var ServiceMethodParamsGenerator = class {
       });
     });
     if (operation.requestBody && operation.requestBody?.content?.["multipart/form-data"]) {
-      Object.entries(operation.requestBody?.content?.["multipart/form-data"].schema?.properties ?? {}).forEach(([key, value]) => {
+      const schema = operation.requestBody.content["multipart/form-data"].schema;
+      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: !value.required
+          hasQuestionToken: !resolvedSchema?.required?.includes(key)
         });
       });
     }
@@ -2336,9 +2234,9 @@ var ServiceMethodOverloadsGenerator = class {
   config;
   paramsGenerator;
   responseDataType = "any";
-  constructor(config) {
+  constructor(config, parser) {
     this.config = config;
-    this.paramsGenerator = new ServiceMethodParamsGenerator(config);
+    this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
   }
   generateMethodOverloads(operation) {
     const observeTypes = [
@@ -2452,11 +2350,11 @@ var ServiceMethodGenerator = class {
   bodyGenerator;
   overloadsGenerator;
   paramsGenerator;
-  constructor(config) {
+  constructor(config, parser) {
     this.config = config;
-    this.bodyGenerator = new ServiceMethodBodyGenerator(config);
-    this.overloadsGenerator = new ServiceMethodOverloadsGenerator(config);
-    this.paramsGenerator = new ServiceMethodParamsGenerator(config);
+    this.bodyGenerator = new ServiceMethodBodyGenerator(config, parser);
+    this.overloadsGenerator = new ServiceMethodOverloadsGenerator(config, parser);
+    this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
   }
   addServiceMethod(serviceClass, operation) {
     const methodName = this.generateMethodName(operation);
@@ -2520,7 +2418,7 @@ var ServiceGenerator = class {
       const versionInfo = this.parser.getSpecVersion();
       throw new Error(`Invalid or unsupported specification format. Expected OpenAPI 3.x or Swagger 2.x. ${versionInfo ? `Found: ${versionInfo.type} ${versionInfo.version}` : "No version info found"}`);
     }
-    this.methodGenerator = new ServiceMethodGenerator(config);
+    this.methodGenerator = new ServiceMethodGenerator(config, parser);
   }
   async generate(outputRoot) {
     const outputDir = path9.join(outputRoot, "services");
@@ -2558,62 +2456,20 @@ var ServiceGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    const usedTypes = collectUsedTypes(operations);
-    this.addImports(sourceFile, usedTypes);
+    this.addImports(sourceFile);
     this.addServiceClass(sourceFile, controllerName, operations);
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().fixUnusedIdentifiers().formatText();
     sourceFile.saveSync();
   }
-  addImports(sourceFile, usedTypes) {
-    const basePathTokenName = getBasePathTokenName(this.config.clientName);
-    const clientContextTokenName = getClientContextTokenName(this.config.clientName);
+  addImports(sourceFile) {
     sourceFile.addImportDeclarations([
       {
         namedImports: [
-          "Injectable",
-          "inject"
+          "Injectable"
         ],
         moduleSpecifier: "@angular/core"
-      },
-      {
-        namedImports: [
-          "HttpClient",
-          "HttpParams",
-          "HttpHeaders",
-          "HttpContext",
-          "HttpResponse",
-          "HttpEvent",
-          "HttpContextToken"
-        ],
-        moduleSpecifier: "@angular/common/http"
-      },
-      {
-        namedImports: [
-          "Observable",
-          "map"
-        ],
-        moduleSpecifier: "rxjs"
-      },
-      {
-        namedImports: [
-          basePathTokenName,
-          clientContextTokenName
-        ],
-        moduleSpecifier: "../tokens"
-      },
-      {
-        namedImports: [
-          "HttpParamsBuilder"
-        ],
-        moduleSpecifier: "../index"
       }
     ]);
-    if (usedTypes.size > 0) {
-      sourceFile.addImportDeclaration({
-        namedImports: Array.from(usedTypes).sort(),
-        moduleSpecifier: "../models"
-      });
-    }
   }
   addServiceClass(sourceFile, controllerName, operations) {
     const className = `${controllerName}Service`;
@@ -2765,15 +2621,15 @@ async function generateFromConfig(config) {
       fileDownloadHelper.generate(outputPath);
       const httpParamsBuilderGenerator = new HttpParamsBuilderGenerator(project);
       httpParamsBuilderGenerator.generate(outputPath);
+      const providerGenerator = new ProviderGenerator(project, config);
+      providerGenerator.generate(outputPath);
+      const baseInterceptorGenerator = new BaseInterceptorGenerator(project, config.clientName);
+      baseInterceptorGenerator.generate(outputPath);
       const serviceGenerator = new ServiceGenerator(swaggerParser, project, config);
       await serviceGenerator.generate(outputPath);
       const indexGenerator = new ServiceIndexGenerator(project);
       indexGenerator.generateIndex(outputPath);
       console.log(`\u2705 Angular services generated`);
-      const providerGenerator = new ProviderGenerator(project, config);
-      providerGenerator.generate(outputPath);
-      const baseInterceptorGenerator = new BaseInterceptorGenerator(project, config.clientName);
-      baseInterceptorGenerator.generate(outputPath);
     }
     if (config.plugins?.length) {
       for (const plugin of config.plugins) {

package/index.d.ts

@@ -237,8 +237,6 @@ declare function escapeString(str: string): string;
 
 type placeHolder = {};
 
-declare function collectUsedTypes(operations: PathInfo[]): Set<string>;
-
 declare function getClientContextTokenName(clientName?: string): string;
 declare function getBasePathTokenName(clientName?: string): string;
 
@@ -278,4 +276,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, camelCase, collectUsedTypes, 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, 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, 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

@@ -82,7 +82,6 @@ __export(index_exports, {
   SwaggerParser: () => SwaggerParser,
   TYPE_GENERATOR_HEADER_COMMENT: () => TYPE_GENERATOR_HEADER_COMMENT,
   camelCase: () => camelCase,
-  collectUsedTypes: () => collectUsedTypes,
   escapeString: () => escapeString,
   extractPaths: () => extractPaths,
   generateFromConfig: () => generateFromConfig,
@@ -174,7 +173,7 @@ function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, c
     case "boolean":
       return nullableType("boolean", nullable);
     case "object":
-      return nullableType(context === "type" ? "Record<string, unknown>" : "any", nullable);
+      return nullableType(context === "type" ? "Record<string, any>" : "any", nullable);
     case "null":
       return "null";
     default:
@@ -191,79 +190,6 @@ function escapeString(str) {
 }
 __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) => {
-      collectTypesFromSchema(param.schema || param, usedTypes);
-    });
-    if (operation.requestBody) {
-      collectTypesFromRequestBody(operation.requestBody, usedTypes);
-    }
-    if (operation.responses) {
-      Object.values(operation.responses).forEach((response) => {
-        collectTypesFromResponse(response, usedTypes);
-      });
-    }
-  });
-  return usedTypes;
-}
-__name(collectUsedTypes, "collectUsedTypes");
-function collectTypesFromSchema(schema, usedTypes) {
-  if (!schema) return;
-  if (schema.$ref) {
-    const refName = schema.$ref.split("/").pop();
-    if (refName) {
-      usedTypes.add(pascalCase(refName));
-    }
-  }
-  if (schema.type === "array" && schema.items) {
-    collectTypesFromSchema(schema.items, usedTypes);
-  }
-  if (schema.type === "object" && schema.properties) {
-    Object.values(schema.properties).forEach((prop) => {
-      collectTypesFromSchema(prop, usedTypes);
-    });
-  }
-  if (schema.allOf) {
-    schema.allOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema.oneOf) {
-    schema.oneOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema.anyOf) {
-    schema.anyOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-}
-__name(collectTypesFromSchema, "collectTypesFromSchema");
-function collectTypesFromRequestBody(requestBody, usedTypes) {
-  const content = requestBody.content || {};
-  Object.values(content).forEach((mediaType) => {
-    if (mediaType.schema) {
-      collectTypesFromSchema(mediaType.schema, usedTypes);
-    }
-  });
-}
-__name(collectTypesFromRequestBody, "collectTypesFromRequestBody");
-function collectTypesFromResponse(response, usedTypes) {
-  const content = response.content || {};
-  Object.values(content).forEach((mediaType) => {
-    if (mediaType.schema) {
-      collectTypesFromSchema(mediaType.schema, usedTypes);
-    }
-  });
-}
-__name(collectTypesFromResponse, "collectTypesFromResponse");
-
 // ../shared/src/utils/functions/token-names.ts
 function getClientContextTokenName(clientName = "default") {
   const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
@@ -1308,18 +1234,6 @@ var _FileDownloadGenerator = class _FileDownloadGenerator {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "Observable"
-      ],
-      moduleSpecifier: "rxjs"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "tap"
-      ],
-      moduleSpecifier: "rxjs/operators"
-    });
     sourceFile.addFunction({
       name: "downloadFile",
       isExported: true,
@@ -1429,7 +1343,7 @@ var _FileDownloadGenerator = class _FileDownloadGenerator {
     
     return fallbackFilename;`
     });
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().formatText();
     sourceFile.saveSync();
   }
 };
@@ -1450,34 +1364,6 @@ var _DateTransformerGenerator = class _DateTransformerGenerator {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "HttpInterceptor",
-        "HttpRequest",
-        "HttpHandler",
-        "HttpEvent",
-        "HttpResponse"
-      ],
-      moduleSpecifier: "@angular/common/http"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "Injectable"
-      ],
-      moduleSpecifier: "@angular/core"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "Observable"
-      ],
-      moduleSpecifier: "rxjs"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "map"
-      ],
-      moduleSpecifier: "rxjs/operators"
-    });
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph3.VariableDeclarationKind.Const,
@@ -1564,7 +1450,7 @@ var _DateTransformerGenerator = class _DateTransformerGenerator {
         }
       ]
     });
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().formatText();
     sourceFile.saveSync();
   }
 };
@@ -1847,33 +1733,9 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
     sourceFile.addImportDeclarations([
       {
         namedImports: [
-          "HttpEvent",
-          "HttpHandler",
-          "HttpInterceptor",
-          "HttpRequest",
-          "HttpContextToken"
-        ],
-        moduleSpecifier: "@angular/common/http"
-      },
-      {
-        namedImports: [
-          "inject",
           "Injectable"
         ],
         moduleSpecifier: "@angular/core"
-      },
-      {
-        namedImports: [
-          "Observable"
-        ],
-        moduleSpecifier: "rxjs"
-      },
-      {
-        namedImports: [
-          interceptorsTokenName,
-          clientContextTokenName
-        ],
-        moduleSpecifier: "../tokens"
       }
     ]);
     sourceFile.addClass({
@@ -1939,7 +1801,7 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
         }
       ]
     });
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().formatText();
     sourceFile.saveSync();
   }
   getInterceptorsTokenName() {
@@ -2174,9 +2036,11 @@ var path9 = __toESM(require("path"));
 
 // src/lib/generators/service/service-method/service-method-body.generator.ts
 var _ServiceMethodBodyGenerator = class _ServiceMethodBodyGenerator {
-  constructor(config) {
+  constructor(config, parser) {
     __publicField(this, "config");
+    __publicField(this, "parser");
     this.config = config;
+    this.parser = parser;
   }
   generateMethodBody(operation) {
     const context = this.createGenerationContext(operation);
@@ -2195,11 +2059,16 @@ var _ServiceMethodBodyGenerator = class _ServiceMethodBodyGenerator {
     return !!((_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b["multipart/form-data"]);
   }
   getFormDataFields(operation) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     if (!this.isMultipartFormData(operation)) {
       return [];
     }
-    const properties = ((_d = (_c = (_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b["multipart/form-data"]) == null ? void 0 : _c.schema) == null ? void 0 : _d.properties) || {};
+    const schema = (_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b["multipart/form-data"].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);
   }
   createGenerationContext(operation) {
@@ -2266,17 +2135,37 @@ if (!headers.has('Content-Type')) {
     return headerCode;
   }
   generateMultipartFormData(operation, context) {
+    var _a, _b;
     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;
+    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 formDataAppends = context.formDataFields.map((field) => {
-      var _a, _b, _c, _d, _e;
-      const fieldSchema = (_e = (_d = (_c = (_b = (_a = operation.requestBody) == null ? void 0 : _a.content) == null ? void 0 : _b["multipart/form-data"]) == null ? void 0 : _c.schema) == null ? void 0 : _d.properties) == null ? void 0 : _e[field];
+      const fieldSchema = properties[field];
       const isFile = (fieldSchema == null ? void 0 : fieldSchema.type) === "string" && (fieldSchema == null ? void 0 : fieldSchema.format) === "binary";
-      const valueExpression = isFile ? field : `String(${field})`;
-      return `if (${field} !== undefined) {
-  formData.append('${field}', ${valueExpression});
-}`;
+      const isArray = (fieldSchema == null ? void 0 : fieldSchema.type) === "array";
+      if (isArray) {
+        const itemSchema = Array.isArray(fieldSchema.items) ? fieldSchema.items[0] : fieldSchema.items;
+        const isFileArray = (itemSchema == null ? void 0 : itemSchema.type) === "string" && (itemSchema == null ? void 0 : itemSchema.format) === "binary";
+        const valueExpression = isFileArray ? "item" : "String(item)";
+        return `if (${field} !== undefined && Array.isArray(${field})) {
+                  ${field}.forEach((item) => {
+                    if (item !== undefined && item !== null) {
+                      formData.append('${field}', ${valueExpression});
+                    }
+                  });
+                }`;
+      } else {
+        const valueExpression = isFile ? field : `String(${field})`;
+        return `if (${field} !== undefined) {
+                  formData.append('${field}', ${valueExpression});
+                }`;
+      }
     }).join("\n");
     return `
 const formData = new FormData();
@@ -2353,9 +2242,11 @@ var ServiceMethodBodyGenerator = _ServiceMethodBodyGenerator;
 
 // src/lib/generators/service/service-method/service-method-params.generator.ts
 var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
-  constructor(config) {
+  constructor(config, parser) {
     __publicField(this, "config");
+    __publicField(this, "parser");
     this.config = config;
+    this.parser = parser;
   }
   generateMethodParameters(operation) {
     const params = this.generateApiParameters(operation);
@@ -2375,7 +2266,7 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
     return uniqueParams;
   }
   generateApiParameters(operation) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g;
     const params = [];
     const pathParams = ((_a = operation.parameters) == null ? void 0 : _a.filter((p) => p.in === "path")) || [];
     pathParams.forEach((param) => {
@@ -2386,15 +2277,21 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
       });
     });
     if (operation.requestBody && ((_c = (_b = operation.requestBody) == null ? void 0 : _b.content) == null ? void 0 : _c["multipart/form-data"])) {
-      Object.entries((_g = (_f = (_e = (_d = operation.requestBody) == null ? void 0 : _d.content) == null ? void 0 : _e["multipart/form-data"].schema) == null ? void 0 : _f.properties) != null ? _g : {}).forEach(([key, value]) => {
+      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);
+      }
+      Object.entries((_d = resolvedSchema == null ? void 0 : resolvedSchema.properties) != null ? _d : {}).forEach(([key, value]) => {
+        var _a2;
         params.push({
           name: key,
           type: getTypeScriptType(value, this.config, value.nullable),
-          hasQuestionToken: !value.required
+          hasQuestionToken: !((_a2 = resolvedSchema == null ? void 0 : resolvedSchema.required) == null ? void 0 : _a2.includes(key))
         });
       });
     }
-    if (operation.requestBody && ((_i = (_h = operation.requestBody) == null ? void 0 : _h.content) == null ? void 0 : _i["application/json"])) {
+    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({
@@ -2403,7 +2300,7 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
         hasQuestionToken: !operation.requestBody.required
       });
     }
-    const queryParams = ((_j = operation.parameters) == null ? void 0 : _j.filter((p) => p.in === "query")) || [];
+    const queryParams = ((_g = operation.parameters) == null ? void 0 : _g.filter((p) => p.in === "query")) || [];
     queryParams.forEach((param) => {
       params.push({
         name: param.name,
@@ -2453,12 +2350,12 @@ var ServiceMethodParamsGenerator = _ServiceMethodParamsGenerator;
 
 // src/lib/generators/service/service-method/service-method-overloads.generator.ts
 var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
-  constructor(config) {
+  constructor(config, parser) {
     __publicField(this, "config");
     __publicField(this, "paramsGenerator");
     __publicField(this, "responseDataType", "any");
     this.config = config;
-    this.paramsGenerator = new ServiceMethodParamsGenerator(config);
+    this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
   }
   generateMethodOverloads(operation) {
     const observeTypes = [
@@ -2570,15 +2467,15 @@ var ServiceMethodOverloadsGenerator = _ServiceMethodOverloadsGenerator;
 
 // src/lib/generators/service/service-method.generator.ts
 var _ServiceMethodGenerator = class _ServiceMethodGenerator {
-  constructor(config) {
+  constructor(config, parser) {
     __publicField(this, "config");
     __publicField(this, "bodyGenerator");
     __publicField(this, "overloadsGenerator");
     __publicField(this, "paramsGenerator");
     this.config = config;
-    this.bodyGenerator = new ServiceMethodBodyGenerator(config);
-    this.overloadsGenerator = new ServiceMethodOverloadsGenerator(config);
-    this.paramsGenerator = new ServiceMethodParamsGenerator(config);
+    this.bodyGenerator = new ServiceMethodBodyGenerator(config, parser);
+    this.overloadsGenerator = new ServiceMethodOverloadsGenerator(config, parser);
+    this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
   }
   addServiceMethod(serviceClass, operation) {
     const methodName = this.generateMethodName(operation);
@@ -2641,7 +2538,7 @@ var _ServiceGenerator = class _ServiceGenerator {
       const versionInfo = this.parser.getSpecVersion();
       throw new Error(`Invalid or unsupported specification format. Expected OpenAPI 3.x or Swagger 2.x. ${versionInfo ? `Found: ${versionInfo.type} ${versionInfo.version}` : "No version info found"}`);
     }
-    this.methodGenerator = new ServiceMethodGenerator(config);
+    this.methodGenerator = new ServiceMethodGenerator(config, parser);
   }
   generate(outputRoot) {
     return __async(this, null, function* () {
@@ -2682,63 +2579,21 @@ var _ServiceGenerator = class _ServiceGenerator {
       const sourceFile = this.project.createSourceFile(filePath, "", {
         overwrite: true
       });
-      const usedTypes = collectUsedTypes(operations);
-      this.addImports(sourceFile, usedTypes);
+      this.addImports(sourceFile);
       this.addServiceClass(sourceFile, controllerName, operations);
-      sourceFile.formatText();
+      sourceFile.fixMissingImports().organizeImports().fixUnusedIdentifiers().formatText();
       sourceFile.saveSync();
     });
   }
-  addImports(sourceFile, usedTypes) {
-    const basePathTokenName = getBasePathTokenName(this.config.clientName);
-    const clientContextTokenName = getClientContextTokenName(this.config.clientName);
+  addImports(sourceFile) {
     sourceFile.addImportDeclarations([
       {
         namedImports: [
-          "Injectable",
-          "inject"
+          "Injectable"
         ],
         moduleSpecifier: "@angular/core"
-      },
-      {
-        namedImports: [
-          "HttpClient",
-          "HttpParams",
-          "HttpHeaders",
-          "HttpContext",
-          "HttpResponse",
-          "HttpEvent",
-          "HttpContextToken"
-        ],
-        moduleSpecifier: "@angular/common/http"
-      },
-      {
-        namedImports: [
-          "Observable",
-          "map"
-        ],
-        moduleSpecifier: "rxjs"
-      },
-      {
-        namedImports: [
-          basePathTokenName,
-          clientContextTokenName
-        ],
-        moduleSpecifier: "../tokens"
-      },
-      {
-        namedImports: [
-          "HttpParamsBuilder"
-        ],
-        moduleSpecifier: "../index"
       }
     ]);
-    if (usedTypes.size > 0) {
-      sourceFile.addImportDeclaration({
-        namedImports: Array.from(usedTypes).sort(),
-        moduleSpecifier: "../models"
-      });
-    }
   }
   addServiceClass(sourceFile, controllerName, operations) {
     const className = `${controllerName}Service`;
@@ -2892,15 +2747,15 @@ function generateFromConfig(config) {
         fileDownloadHelper.generate(outputPath);
         const httpParamsBuilderGenerator = new HttpParamsBuilderGenerator(project);
         httpParamsBuilderGenerator.generate(outputPath);
+        const providerGenerator = new ProviderGenerator(project, config);
+        providerGenerator.generate(outputPath);
+        const baseInterceptorGenerator = new BaseInterceptorGenerator(project, config.clientName);
+        baseInterceptorGenerator.generate(outputPath);
         const serviceGenerator = new ServiceGenerator(swaggerParser, project, config);
         yield serviceGenerator.generate(outputPath);
         const indexGenerator = new ServiceIndexGenerator(project);
         indexGenerator.generateIndex(outputPath);
         console.log(`\u2705 Angular services generated`);
-        const providerGenerator = new ProviderGenerator(project, config);
-        providerGenerator.generate(outputPath);
-        const baseInterceptorGenerator = new BaseInterceptorGenerator(project, config.clientName);
-        baseInterceptorGenerator.generate(outputPath);
       }
       if ((_b = config.plugins) == null ? void 0 : _b.length) {
         for (const plugin of config.plugins) {
@@ -2944,7 +2799,6 @@ __name(generateFromConfig, "generateFromConfig");
   SwaggerParser,
   TYPE_GENERATOR_HEADER_COMMENT,
   camelCase,
-  collectUsedTypes,
   escapeString,
   extractPaths,
   generateFromConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.1.17",
+  "version": "0.1.18-pr-28-bugfix-form-data-request-4fada97.0",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "ng-openapi",