ng-openapi 0.0.25-alpha.6 → 0.0.25-alpha.8

package/cli.cjs

@@ -58,7 +58,7 @@ var SwaggerParser = class {
 };
 
 // src/lib/core/generator.ts
-var import_ts_morph5 = require("ts-morph");
+var import_ts_morph6 = require("ts-morph");
 
 // src/lib/generators/type/type.generator.ts
 var import_ts_morph = require("ts-morph");
@@ -669,6 +669,7 @@ var FileDownloadGenerator = class {
 };
 
 // src/lib/generators/utility/date-transformer.generator.ts
+var import_ts_morph3 = require("ts-morph");
 var path3 = __toESM(require("path"));
 var DateTransformerGenerator = class {
   static {
@@ -714,7 +715,7 @@ var DateTransformerGenerator = class {
     });
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: "const",
+      declarationKind: import_ts_morph3.VariableDeclarationKind.Const,
       declarations: [
         {
           name: "ISO_DATE_REGEX",
@@ -1053,7 +1054,7 @@ return makeEnvironmentProviders(providers);`;
 };
 
 // src/lib/generators/utility/base-interceptor.generator.ts
-var import_ts_morph3 = require("ts-morph");
+var import_ts_morph4 = require("ts-morph");
 var path6 = __toESM(require("path"));
 var BaseInterceptorGenerator = class {
   static {
@@ -1072,7 +1073,6 @@ var BaseInterceptorGenerator = class {
       overwrite: true
     });
     sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(this.#clientName));
-    const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
     const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addImportDeclarations([
@@ -1081,7 +1081,8 @@ var BaseInterceptorGenerator = class {
           "HttpEvent",
           "HttpHandler",
           "HttpInterceptor",
-          "HttpRequest"
+          "HttpRequest",
+          "HttpContextToken"
         ],
         moduleSpecifier: "@angular/common/http"
       },
@@ -1100,7 +1101,6 @@ var BaseInterceptorGenerator = class {
       },
       {
         namedImports: [
-          basePathTokenName,
           interceptorsTokenName,
           clientContextTokenName
         ],
@@ -1123,21 +1123,21 @@ var BaseInterceptorGenerator = class {
         {
           name: "clientName",
           type: "string",
-          scope: import_ts_morph3.Scope.Private,
+          scope: import_ts_morph4.Scope.Private,
           isReadonly: true,
           initializer: `'${this.#clientName}'`
         },
         {
           name: "httpInterceptors",
           type: "HttpInterceptor[]",
-          scope: import_ts_morph3.Scope.Private,
+          scope: import_ts_morph4.Scope.Private,
           isReadonly: true,
           initializer: `inject(${interceptorsTokenName})`
         },
         {
           name: "clientContextToken",
-          type: "any",
-          scope: import_ts_morph3.Scope.Private,
+          type: "HttpContextToken<string>",
+          scope: import_ts_morph4.Scope.Private,
           isReadonly: true,
           initializer: clientContextTokenName
         }
@@ -1160,7 +1160,7 @@ var BaseInterceptorGenerator = class {
     // Check if this request belongs to this client using HttpContext
     const requestClientName = req.context.get(this.clientContextToken);
     
-    if (requestClientName !== this.clientName) {
+    if (requestClientName.localeCompare(this.clientName) === 0) {
       // This request doesn't belong to this client, pass it through
       return next.handle(req);
     }
@@ -1181,10 +1181,6 @@ var BaseInterceptorGenerator = class {
     });
     sourceFile.saveSync();
   }
-  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}`;
@@ -1199,7 +1195,7 @@ var BaseInterceptorGenerator = class {
 };
 
 // src/lib/generators/service/service.generator.ts
-var import_ts_morph4 = require("ts-morph");
+var import_ts_morph5 = require("ts-morph");
 var path7 = __toESM(require("path"));
 
 // src/lib/utils/string.utils.ts
@@ -2213,27 +2209,27 @@ var ServiceGenerator = class {
     serviceClass.addProperty({
       name: "httpClient",
       type: "HttpClient",
-      scope: import_ts_morph4.Scope.Private,
+      scope: import_ts_morph5.Scope.Private,
       isReadonly: true,
       initializer: "inject(HttpClient)"
     });
     serviceClass.addProperty({
       name: "basePath",
       type: "string",
-      scope: import_ts_morph4.Scope.Private,
+      scope: import_ts_morph5.Scope.Private,
       isReadonly: true,
       initializer: `inject(${basePathTokenName})`
     });
     serviceClass.addProperty({
       name: "clientContextToken",
       type: "any",
-      scope: import_ts_morph4.Scope.Private,
+      scope: import_ts_morph5.Scope.Private,
       isReadonly: true,
       initializer: clientContextTokenName
     });
     serviceClass.addMethod({
       name: "createContextWithClientId",
-      scope: import_ts_morph4.Scope.Private,
+      scope: import_ts_morph5.Scope.Private,
       parameters: [
         {
           name: "existingContext",
@@ -2314,11 +2310,11 @@ async function generateFromConfig(config) {
     });
   }
   try {
-    const project = new import_ts_morph5.Project({
+    const project = new import_ts_morph6.Project({
       compilerOptions: {
         declaration: true,
-        target: import_ts_morph5.ScriptTarget.ES2022,
-        module: import_ts_morph5.ModuleKind.Preserve,
+        target: import_ts_morph6.ScriptTarget.ES2022,
+        module: import_ts_morph6.ModuleKind.Preserve,
         strict: true,
         ...config.compilerOptions
       }
@@ -2327,7 +2323,7 @@ async function generateFromConfig(config) {
     typeGenerator.generate();
     console.log(`\u2705 TypeScript interfaces generated`);
     if (generateServices) {
-      const tokenGenerator = new TokenGenerator(project);
+      const tokenGenerator = new TokenGenerator(project, config.clientName);
       tokenGenerator.generate(outputPath);
       if (config.options.dateType === "Date") {
         const dateTransformer = new DateTransformerGenerator(project);

package/index.js

@@ -107,7 +107,7 @@ __name(_SwaggerParser, "SwaggerParser");
 var SwaggerParser = _SwaggerParser;
 
 // src/lib/core/generator.ts
-var import_ts_morph5 = require("ts-morph");
+var import_ts_morph6 = require("ts-morph");
 
 // src/lib/generators/type/type.generator.ts
 var import_ts_morph = require("ts-morph");
@@ -717,6 +717,7 @@ __name(_FileDownloadGenerator, "FileDownloadGenerator");
 var FileDownloadGenerator = _FileDownloadGenerator;
 
 // src/lib/generators/utility/date-transformer.generator.ts
+var import_ts_morph3 = require("ts-morph");
 var path3 = __toESM(require("path"));
 var _DateTransformerGenerator = class _DateTransformerGenerator {
   constructor(project) {
@@ -759,7 +760,7 @@ var _DateTransformerGenerator = class _DateTransformerGenerator {
     });
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: "const",
+      declarationKind: import_ts_morph3.VariableDeclarationKind.Const,
       declarations: [
         {
           name: "ISO_DATE_REGEX",
@@ -1098,7 +1099,7 @@ __name(_ProviderGenerator, "ProviderGenerator");
 var ProviderGenerator = _ProviderGenerator;
 
 // src/lib/generators/utility/base-interceptor.generator.ts
-var import_ts_morph3 = require("ts-morph");
+var import_ts_morph4 = require("ts-morph");
 var path6 = __toESM(require("path"));
 var _project, _clientName;
 var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
@@ -1115,7 +1116,6 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
       overwrite: true
     });
     sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(__privateGet(this, _clientName)));
-    const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
     const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addImportDeclarations([
@@ -1124,7 +1124,8 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
           "HttpEvent",
           "HttpHandler",
           "HttpInterceptor",
-          "HttpRequest"
+          "HttpRequest",
+          "HttpContextToken"
         ],
         moduleSpecifier: "@angular/common/http"
       },
@@ -1143,7 +1144,6 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
       },
       {
         namedImports: [
-          basePathTokenName,
           interceptorsTokenName,
           clientContextTokenName
         ],
@@ -1166,21 +1166,21 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
         {
           name: "clientName",
           type: "string",
-          scope: import_ts_morph3.Scope.Private,
+          scope: import_ts_morph4.Scope.Private,
           isReadonly: true,
           initializer: `'${__privateGet(this, _clientName)}'`
         },
         {
           name: "httpInterceptors",
           type: "HttpInterceptor[]",
-          scope: import_ts_morph3.Scope.Private,
+          scope: import_ts_morph4.Scope.Private,
           isReadonly: true,
           initializer: `inject(${interceptorsTokenName})`
         },
         {
           name: "clientContextToken",
-          type: "any",
-          scope: import_ts_morph3.Scope.Private,
+          type: "HttpContextToken<string>",
+          scope: import_ts_morph4.Scope.Private,
           isReadonly: true,
           initializer: clientContextTokenName
         }
@@ -1203,7 +1203,7 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
     // Check if this request belongs to this client using HttpContext
     const requestClientName = req.context.get(this.clientContextToken);
     
-    if (requestClientName !== this.clientName) {
+    if (requestClientName.localeCompare(this.clientName) === 0) {
       // This request doesn't belong to this client, pass it through
       return next.handle(req);
     }
@@ -1224,10 +1224,6 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
     });
     sourceFile.saveSync();
   }
-  getBasePathTokenName() {
-    const clientSuffix = __privateGet(this, _clientName).toUpperCase().replace(/[^A-Z0-9]/g, "_");
-    return `BASE_PATH_${clientSuffix}`;
-  }
   getInterceptorsTokenName() {
     const clientSuffix = __privateGet(this, _clientName).toUpperCase().replace(/[^A-Z0-9]/g, "_");
     return `HTTP_INTERCEPTORS_${clientSuffix}`;
@@ -1246,7 +1242,7 @@ __name(_BaseInterceptorGenerator, "BaseInterceptorGenerator");
 var BaseInterceptorGenerator = _BaseInterceptorGenerator;
 
 // src/lib/generators/service/service.generator.ts
-var import_ts_morph4 = require("ts-morph");
+var import_ts_morph5 = require("ts-morph");
 var path7 = __toESM(require("path"));
 
 // src/lib/utils/string.utils.ts
@@ -2265,27 +2261,27 @@ var _ServiceGenerator = class _ServiceGenerator {
     serviceClass.addProperty({
       name: "httpClient",
       type: "HttpClient",
-      scope: import_ts_morph4.Scope.Private,
+      scope: import_ts_morph5.Scope.Private,
       isReadonly: true,
       initializer: "inject(HttpClient)"
     });
     serviceClass.addProperty({
       name: "basePath",
       type: "string",
-      scope: import_ts_morph4.Scope.Private,
+      scope: import_ts_morph5.Scope.Private,
       isReadonly: true,
       initializer: `inject(${basePathTokenName})`
     });
     serviceClass.addProperty({
       name: "clientContextToken",
       type: "any",
-      scope: import_ts_morph4.Scope.Private,
+      scope: import_ts_morph5.Scope.Private,
       isReadonly: true,
       initializer: clientContextTokenName
     });
     serviceClass.addMethod({
       name: "createContextWithClientId",
-      scope: import_ts_morph4.Scope.Private,
+      scope: import_ts_morph5.Scope.Private,
       parameters: [
         {
           name: "existingContext",
@@ -2369,11 +2365,11 @@ function generateFromConfig(config) {
       });
     }
     try {
-      const project = new import_ts_morph5.Project({
+      const project = new import_ts_morph6.Project({
         compilerOptions: __spreadValues({
           declaration: true,
-          target: import_ts_morph5.ScriptTarget.ES2022,
-          module: import_ts_morph5.ModuleKind.Preserve,
+          target: import_ts_morph6.ScriptTarget.ES2022,
+          module: import_ts_morph6.ModuleKind.Preserve,
           strict: true
         }, config.compilerOptions)
       });
@@ -2381,7 +2377,7 @@ function generateFromConfig(config) {
       typeGenerator.generate();
       console.log(`\u2705 TypeScript interfaces generated`);
       if (generateServices) {
-        const tokenGenerator = new TokenGenerator(project);
+        const tokenGenerator = new TokenGenerator(project, config.clientName);
         tokenGenerator.generate(outputPath);
         if (config.options.dateType === "Date") {
           const dateTransformer = new DateTransformerGenerator(project);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.0.25-alpha.6",
+  "version": "0.0.25-alpha.8",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "angular",