ng-openapi 0.2.4 → 0.2.5

package/cli.cjs

@@ -44,7 +44,7 @@ var fs4 = __toESM(require("fs"));
 var path12 = __toESM(require("path"));
 
 // package.json
-var version = "0.2.3";
+var version = "0.2.4";
 
 // src/lib/core/generator.ts
 var import_ts_morph7 = require("ts-morph");
@@ -139,6 +139,11 @@ function getBasePathTokenName(clientName = "default") {
   return `BASE_PATH_${clientSuffix}`;
 }
 __name(getBasePathTokenName, "getBasePathTokenName");
+function getInterceptorsTokenName(clientName = "default") {
+  const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+  return `HTTP_INTERCEPTORS_${clientSuffix}`;
+}
+__name(getInterceptorsTokenName, "getInterceptorsTokenName");
 
 // ../shared/src/utils/functions/duplicate-function-name.ts
 function hasDuplicateFunctionNames(arr) {
@@ -1011,19 +1016,21 @@ var TokenGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "InjectionToken"
-      ],
-      moduleSpecifier: "@angular/core"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "HttpInterceptor",
-        "HttpContextToken"
-      ],
-      moduleSpecifier: "@angular/common/http"
-    });
+    sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "InjectionToken"
+        ],
+        moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "HttpInterceptor",
+          "HttpContextToken"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      }
+    ]);
     const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
     const clientContextTokenName = this.getClientContextTokenName();
@@ -1138,6 +1145,15 @@ var FileDownloadGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
+    sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "Observable",
+          "tap"
+        ],
+        moduleSpecifier: "rxjs"
+      }
+    ]);
     sourceFile.addFunction({
       name: "downloadFile",
       isExported: true,
@@ -1247,7 +1263,7 @@ var FileDownloadGenerator = class {
     
     return fallbackFilename;`
     });
-    sourceFile.fixMissingImports().organizeImports().formatText();
+    sourceFile.formatText();
     sourceFile.saveSync();
   }
 };
@@ -1269,6 +1285,31 @@ var DateTransformerGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
+    sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "HttpEvent",
+          "HttpHandler",
+          "HttpInterceptor",
+          "HttpRequest",
+          "HttpResponse"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      },
+      {
+        namedImports: [
+          "Injectable"
+        ],
+        moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "Observable",
+          "map"
+        ],
+        moduleSpecifier: "rxjs"
+      }
+    ]);
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph3.VariableDeclarationKind.Const,
@@ -1355,7 +1396,7 @@ var DateTransformerGenerator = class {
         }
       ]
     });
-    sourceFile.fixMissingImports().organizeImports().formatText();
+    sourceFile.formatText();
     sourceFile.saveSync();
   }
 };
@@ -1428,8 +1469,8 @@ var ProviderGenerator = class {
       overwrite: true
     });
     sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
-    const basePathTokenName = this.getBasePathTokenName();
-    const interceptorsTokenName = this.getInterceptorsTokenName();
+    const basePathTokenName = getBasePathTokenName(this.clientName);
+    const interceptorsTokenName = getInterceptorsTokenName(this.clientName);
     const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
     sourceFile.addImportDeclarations([
       {
@@ -1602,14 +1643,6 @@ return makeEnvironmentProviders(providers);`;
       });
     }
   }
-  getBasePathTokenName() {
-    const clientSuffix = this.clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
-    return `BASE_PATH_${clientSuffix}`;
-  }
-  getInterceptorsTokenName() {
-    const clientSuffix = this.clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
-    return `HTTP_INTERCEPTORS_${clientSuffix}`;
-  }
   capitalizeFirst(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
   }
@@ -1635,14 +1668,38 @@ var BaseInterceptorGenerator = class {
       overwrite: true
     });
     sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(this.#clientName));
-    const interceptorsTokenName = this.getInterceptorsTokenName();
-    const clientContextTokenName = this.getClientContextTokenName();
+    const interceptorsTokenName = getInterceptorsTokenName(this.#clientName);
+    const clientContextTokenName = getClientContextTokenName(this.#clientName);
     sourceFile.addImportDeclarations([
       {
         namedImports: [
+          "HttpContextToken",
+          "HttpEvent",
+          "HttpHandler",
+          "HttpInterceptor",
+          "HttpRequest"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      },
+      {
+        namedImports: [
+          "inject",
           "Injectable"
         ],
         moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "Observable"
+        ],
+        moduleSpecifier: "rxjs"
+      },
+      {
+        namedImports: [
+          clientContextTokenName,
+          interceptorsTokenName
+        ],
+        moduleSpecifier: "../tokens"
       }
     ]);
     sourceFile.addClass({
@@ -1708,17 +1765,9 @@ var BaseInterceptorGenerator = class {
         }
       ]
     });
-    sourceFile.fixMissingImports().organizeImports().formatText();
+    sourceFile.formatText();
     sourceFile.saveSync();
   }
-  getInterceptorsTokenName() {
-    const clientSuffix = this.#clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
-    return `HTTP_INTERCEPTORS_${clientSuffix}`;
-  }
-  getClientContextTokenName() {
-    const clientSuffix = this.#clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
-    return `CLIENT_CONTEXT_TOKEN_${clientSuffix}`;
-  }
   capitalizeFirst(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
   }
@@ -2547,26 +2596,55 @@ var ServiceGenerator = class {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    this.addImports(sourceFile);
     this.addServiceClass(sourceFile, controllerName, operations);
-    sourceFile.fixMissingImports().organizeImports().fixUnusedIdentifiers().formatText();
+    sourceFile.fixMissingImports().formatText();
     sourceFile.saveSync();
   }
-  addImports(sourceFile) {
+  addServiceClass(sourceFile, controllerName, operations) {
+    const className = `${controllerName}Service`;
+    const basePathTokenName = getBasePathTokenName(this.config.clientName);
+    const clientContextTokenName = getClientContextTokenName(this.config.clientName);
+    sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     sourceFile.addImportDeclarations([
       {
         namedImports: [
+          "HttpClient",
+          "HttpContext",
+          "HttpContextToken",
+          "HttpEvent",
+          "HttpHeaders",
+          "HttpParams",
+          "HttpResponse"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      },
+      {
+        namedImports: [
+          "inject",
           "Injectable"
         ],
         moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "Observable"
+        ],
+        moduleSpecifier: "rxjs"
+      },
+      {
+        namedImports: [
+          basePathTokenName,
+          clientContextTokenName
+        ],
+        moduleSpecifier: "../tokens"
+      },
+      {
+        namedImports: [
+          "HttpParamsBuilder"
+        ],
+        moduleSpecifier: "../utils/http-params-builder"
       }
     ]);
-  }
-  addServiceClass(sourceFile, controllerName, operations) {
-    const className = `${controllerName}Service`;
-    const basePathTokenName = getBasePathTokenName(this.config.clientName);
-    const clientContextTokenName = getClientContextTokenName(this.config.clientName);
-    sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     const serviceClass = sourceFile.addClass({
       name: className,
       isExported: true,

package/index.d.ts

@@ -241,6 +241,7 @@ type placeHolder = {};
 
 declare function getClientContextTokenName(clientName?: string): string;
 declare function getBasePathTokenName(clientName?: string): string;
+declare function getInterceptorsTokenName(clientName?: string): string;
 
 declare function hasDuplicateFunctionNames<T extends MethodDeclaration | FunctionDeclaration>(arr: T[]): boolean;
 
@@ -286,4 +287,4 @@ declare function validateInput(inputPath: string): void;
  */
 declare function generateFromConfig(config: GeneratorConfig): Promise<void>;
 
-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 };
+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, getInterceptorsTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder, screamingSnakeCase, validateInput };

package/index.js

@@ -91,6 +91,7 @@ __export(index_exports, {
   generateParseRequestTypeParams: () => generateParseRequestTypeParams,
   getBasePathTokenName: () => getBasePathTokenName,
   getClientContextTokenName: () => getClientContextTokenName,
+  getInterceptorsTokenName: () => getInterceptorsTokenName,
   getRequestBodyType: () => getRequestBodyType,
   getResponseType: () => getResponseType,
   getResponseTypeFromResponse: () => getResponseTypeFromResponse,
@@ -208,6 +209,11 @@ function getBasePathTokenName(clientName = "default") {
   return `BASE_PATH_${clientSuffix}`;
 }
 __name(getBasePathTokenName, "getBasePathTokenName");
+function getInterceptorsTokenName(clientName = "default") {
+  const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+  return `HTTP_INTERCEPTORS_${clientSuffix}`;
+}
+__name(getInterceptorsTokenName, "getInterceptorsTokenName");
 
 // ../shared/src/utils/functions/duplicate-function-name.ts
 function hasDuplicateFunctionNames(arr) {
@@ -1134,19 +1140,21 @@ var _TokenGenerator = class _TokenGenerator {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "InjectionToken"
-      ],
-      moduleSpecifier: "@angular/core"
-    });
-    sourceFile.addImportDeclaration({
-      namedImports: [
-        "HttpInterceptor",
-        "HttpContextToken"
-      ],
-      moduleSpecifier: "@angular/common/http"
-    });
+    sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "InjectionToken"
+        ],
+        moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "HttpInterceptor",
+          "HttpContextToken"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      }
+    ]);
     const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
     const clientContextTokenName = this.getClientContextTokenName();
@@ -1260,6 +1268,15 @@ var _FileDownloadGenerator = class _FileDownloadGenerator {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
+    sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "Observable",
+          "tap"
+        ],
+        moduleSpecifier: "rxjs"
+      }
+    ]);
     sourceFile.addFunction({
       name: "downloadFile",
       isExported: true,
@@ -1369,7 +1386,7 @@ var _FileDownloadGenerator = class _FileDownloadGenerator {
     
     return fallbackFilename;`
     });
-    sourceFile.fixMissingImports().organizeImports().formatText();
+    sourceFile.formatText();
     sourceFile.saveSync();
   }
 };
@@ -1390,6 +1407,31 @@ var _DateTransformerGenerator = class _DateTransformerGenerator {
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
+    sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "HttpEvent",
+          "HttpHandler",
+          "HttpInterceptor",
+          "HttpRequest",
+          "HttpResponse"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      },
+      {
+        namedImports: [
+          "Injectable"
+        ],
+        moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "Observable",
+          "map"
+        ],
+        moduleSpecifier: "rxjs"
+      }
+    ]);
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph3.VariableDeclarationKind.Const,
@@ -1476,7 +1518,7 @@ var _DateTransformerGenerator = class _DateTransformerGenerator {
         }
       ]
     });
-    sourceFile.fixMissingImports().organizeImports().formatText();
+    sourceFile.formatText();
     sourceFile.saveSync();
   }
 };
@@ -1547,8 +1589,8 @@ var _ProviderGenerator = class _ProviderGenerator {
       overwrite: true
     });
     sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
-    const basePathTokenName = this.getBasePathTokenName();
-    const interceptorsTokenName = this.getInterceptorsTokenName();
+    const basePathTokenName = getBasePathTokenName(this.clientName);
+    const interceptorsTokenName = getInterceptorsTokenName(this.clientName);
     const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
     sourceFile.addImportDeclarations([
       {
@@ -1721,14 +1763,6 @@ return makeEnvironmentProviders(providers);`;
       });
     }
   }
-  getBasePathTokenName() {
-    const clientSuffix = this.clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
-    return `BASE_PATH_${clientSuffix}`;
-  }
-  getInterceptorsTokenName() {
-    const clientSuffix = this.clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
-    return `HTTP_INTERCEPTORS_${clientSuffix}`;
-  }
   capitalizeFirst(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
   }
@@ -1754,14 +1788,38 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
       overwrite: true
     });
     sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(__privateGet(this, _clientName)));
-    const interceptorsTokenName = this.getInterceptorsTokenName();
-    const clientContextTokenName = this.getClientContextTokenName();
+    const interceptorsTokenName = getInterceptorsTokenName(__privateGet(this, _clientName));
+    const clientContextTokenName = getClientContextTokenName(__privateGet(this, _clientName));
     sourceFile.addImportDeclarations([
       {
         namedImports: [
+          "HttpContextToken",
+          "HttpEvent",
+          "HttpHandler",
+          "HttpInterceptor",
+          "HttpRequest"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      },
+      {
+        namedImports: [
+          "inject",
           "Injectable"
         ],
         moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "Observable"
+        ],
+        moduleSpecifier: "rxjs"
+      },
+      {
+        namedImports: [
+          clientContextTokenName,
+          interceptorsTokenName
+        ],
+        moduleSpecifier: "../tokens"
       }
     ]);
     sourceFile.addClass({
@@ -1827,17 +1885,9 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
         }
       ]
     });
-    sourceFile.fixMissingImports().organizeImports().formatText();
+    sourceFile.formatText();
     sourceFile.saveSync();
   }
-  getInterceptorsTokenName() {
-    const clientSuffix = __privateGet(this, _clientName).toUpperCase().replace(/[^A-Z0-9]/g, "_");
-    return `HTTP_INTERCEPTORS_${clientSuffix}`;
-  }
-  getClientContextTokenName() {
-    const clientSuffix = __privateGet(this, _clientName).toUpperCase().replace(/[^A-Z0-9]/g, "_");
-    return `CLIENT_CONTEXT_TOKEN_${clientSuffix}`;
-  }
   capitalizeFirst(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
   }
@@ -2681,27 +2731,56 @@ var _ServiceGenerator = class _ServiceGenerator {
       const sourceFile = this.project.createSourceFile(filePath, "", {
         overwrite: true
       });
-      this.addImports(sourceFile);
       this.addServiceClass(sourceFile, controllerName, operations);
-      sourceFile.fixMissingImports().organizeImports().fixUnusedIdentifiers().formatText();
+      sourceFile.fixMissingImports().formatText();
       sourceFile.saveSync();
     });
   }
-  addImports(sourceFile) {
+  addServiceClass(sourceFile, controllerName, operations) {
+    const className = `${controllerName}Service`;
+    const basePathTokenName = getBasePathTokenName(this.config.clientName);
+    const clientContextTokenName = getClientContextTokenName(this.config.clientName);
+    sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     sourceFile.addImportDeclarations([
       {
         namedImports: [
+          "HttpClient",
+          "HttpContext",
+          "HttpContextToken",
+          "HttpEvent",
+          "HttpHeaders",
+          "HttpParams",
+          "HttpResponse"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      },
+      {
+        namedImports: [
+          "inject",
           "Injectable"
         ],
         moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "Observable"
+        ],
+        moduleSpecifier: "rxjs"
+      },
+      {
+        namedImports: [
+          basePathTokenName,
+          clientContextTokenName
+        ],
+        moduleSpecifier: "../tokens"
+      },
+      {
+        namedImports: [
+          "HttpParamsBuilder"
+        ],
+        moduleSpecifier: "../utils/http-params-builder"
       }
     ]);
-  }
-  addServiceClass(sourceFile, controllerName, operations) {
-    const className = `${controllerName}Service`;
-    const basePathTokenName = getBasePathTokenName(this.config.clientName);
-    const clientContextTokenName = getClientContextTokenName(this.config.clientName);
-    sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     const serviceClass = sourceFile.addClass({
       name: className,
       isExported: true,
@@ -2910,6 +2989,7 @@ __name(generateFromConfig, "generateFromConfig");
   generateParseRequestTypeParams,
   getBasePathTokenName,
   getClientContextTokenName,
+  getInterceptorsTokenName,
   getRequestBodyType,
   getResponseType,
   getResponseTypeFromResponse,

package/package.json

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