@ng-openapi/http-resource 0.0.16 → 0.0.17-pr-28-bugfix-form-data-request-4fada97.0

package/index.cjs

@@ -96,7 +96,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:
@@ -113,78 +113,6 @@ function escapeString(str2) {
 }
 __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(schema2, usedTypes) {
-  if (!schema2) return;
-  if (schema2.$ref) {
-    const refName = schema2.$ref.split("/").pop();
-    if (refName) {
-      usedTypes.add(pascalCase(refName));
-    }
-  }
-  if (schema2.type === "array" && schema2.items) {
-    collectTypesFromSchema(schema2.items, usedTypes);
-  }
-  if (schema2.type === "object" && schema2.properties) {
-    Object.values(schema2.properties).forEach((prop) => {
-      collectTypesFromSchema(prop, usedTypes);
-    });
-  }
-  if (schema2.allOf) {
-    schema2.allOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema2.oneOf) {
-    schema2.oneOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema2.anyOf) {
-    schema2.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, "_");
@@ -3522,57 +3450,20 @@ var HttpResourceGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    const usedTypes = collectUsedTypes(operations);
-    this.addImports(sourceFile, usedTypes);
+    this.addImports(sourceFile);
     this.addServiceClass(sourceFile, resourceName, operations);
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().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",
-          "Signal"
+          "Injectable"
         ],
         moduleSpecifier: "@angular/core"
-      },
-      {
-        namedImports: [
-          "HttpResourceRef",
-          "HttpContext",
-          "httpResource",
-          "HttpResourceRequest",
-          "HttpResourceOptions",
-          "HttpParams",
-          "HttpContextToken",
-          "HttpHeaders"
-        ],
-        moduleSpecifier: "@angular/common/http"
-      },
-      {
-        namedImports: [
-          basePathTokenName,
-          clientContextTokenName
-        ],
-        moduleSpecifier: "../tokens"
-      },
-      {
-        namedImports: [
-          "HttpParamsBuilder"
-        ],
-        moduleSpecifier: "../index"
       }
     ]);
-    if (usedTypes.size > 0) {
-      sourceFile.addImportDeclaration({
-        namedImports: Array.from(usedTypes).sort(),
-        moduleSpecifier: "../models"
-      });
-    }
   }
   addServiceClass(sourceFile, resourceName, operations) {
     const className = `${resourceName}`;

package/index.js

@@ -62,7 +62,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:
@@ -79,78 +79,6 @@ function escapeString(str2) {
 }
 __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(schema2, usedTypes) {
-  if (!schema2) return;
-  if (schema2.$ref) {
-    const refName = schema2.$ref.split("/").pop();
-    if (refName) {
-      usedTypes.add(pascalCase(refName));
-    }
-  }
-  if (schema2.type === "array" && schema2.items) {
-    collectTypesFromSchema(schema2.items, usedTypes);
-  }
-  if (schema2.type === "object" && schema2.properties) {
-    Object.values(schema2.properties).forEach((prop) => {
-      collectTypesFromSchema(prop, usedTypes);
-    });
-  }
-  if (schema2.allOf) {
-    schema2.allOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema2.oneOf) {
-    schema2.oneOf.forEach((subSchema) => {
-      collectTypesFromSchema(subSchema, usedTypes);
-    });
-  }
-  if (schema2.anyOf) {
-    schema2.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, "_");
@@ -3488,57 +3416,20 @@ var HttpResourceGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    const usedTypes = collectUsedTypes(operations);
-    this.addImports(sourceFile, usedTypes);
+    this.addImports(sourceFile);
     this.addServiceClass(sourceFile, resourceName, operations);
-    sourceFile.formatText();
+    sourceFile.fixMissingImports().organizeImports().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",
-          "Signal"
+          "Injectable"
         ],
         moduleSpecifier: "@angular/core"
-      },
-      {
-        namedImports: [
-          "HttpResourceRef",
-          "HttpContext",
-          "httpResource",
-          "HttpResourceRequest",
-          "HttpResourceOptions",
-          "HttpParams",
-          "HttpContextToken",
-          "HttpHeaders"
-        ],
-        moduleSpecifier: "@angular/common/http"
-      },
-      {
-        namedImports: [
-          basePathTokenName,
-          clientContextTokenName
-        ],
-        moduleSpecifier: "../tokens"
-      },
-      {
-        namedImports: [
-          "HttpParamsBuilder"
-        ],
-        moduleSpecifier: "../index"
       }
     ]);
-    if (usedTypes.size > 0) {
-      sourceFile.addImportDeclaration({
-        namedImports: Array.from(usedTypes).sort(),
-        moduleSpecifier: "../models"
-      });
-    }
   }
   addServiceClass(sourceFile, resourceName, operations) {
     const className = `${resourceName}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-openapi/http-resource",
-  "version": "0.0.16",
+  "version": "0.0.17-pr-28-bugfix-form-data-request-4fada97.0",
   "description": "HTTP Resource plugin for ng-openapi - Angular HTTP utilities with caching and state management",
   "keywords": [
     "angular",