ng-openapi 0.0.25-alpha.3 → 0.0.25-alpha.5

package/cli.cjs

@@ -425,12 +425,14 @@ var TokenGenerator = class {
     });
     sourceFile.addImportDeclaration({
       namedImports: [
-        "HttpInterceptor"
+        "HttpInterceptor",
+        "HttpContextToken"
       ],
       moduleSpecifier: "@angular/common/http"
     });
     const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
@@ -461,7 +463,21 @@ var TokenGenerator = class {
         }
       ],
       leadingTrivia: `/**
- * Injection token for the ${this.clientName} client HTTP interceptors
+ * Injection token for the ${this.clientName} client HTTP interceptor instances
+ */
+`
+    });
+    sourceFile.addVariableStatement({
+      isExported: true,
+      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+      declarations: [
+        {
+          name: clientContextTokenName,
+          initializer: `new HttpContextToken<string>(() => '${this.clientName}')`
+        }
+      ],
+      leadingTrivia: `/**
+ * HttpContext token to identify requests belonging to the ${this.clientName} client
  */
 `
     });
@@ -478,6 +494,20 @@ var TokenGenerator = class {
         leadingTrivia: `/**
  * @deprecated Use ${basePathTokenName} instead
  */
+`
+      });
+      sourceFile.addVariableStatement({
+        isExported: true,
+        declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+        declarations: [
+          {
+            name: "CLIENT_CONTEXT_TOKEN",
+            initializer: clientContextTokenName
+          }
+        ],
+        leadingTrivia: `/**
+ * @deprecated Use ${clientContextTokenName} instead
+ */
 `
       });
     }
@@ -491,6 +521,10 @@ var TokenGenerator = class {
     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}`;
+  }
 };
 
 // src/lib/generators/utility/file-download.generator.ts
@@ -897,10 +931,10 @@ var ProviderGenerator = class {
         },
         {
           name: "interceptors",
-          type: "HttpInterceptor[]",
+          type: "(new (...args: HttpInterceptor[]) => HttpInterceptor)[]",
           hasQuestionToken: true,
           docs: [
-            "Array of HTTP interceptors to apply to this client"
+            "Array of HTTP interceptor classes to apply to this client"
           ]
         }
       ]
@@ -919,11 +953,6 @@ const providers: Provider[] = [
         provide: ${basePathTokenName},
         useValue: config.basePath
     },
-    // Client-specific interceptors token
-    {
-        provide: ${interceptorsTokenName},
-        useValue: config.interceptors || []
-    },
     // Base interceptor that handles client-specific interceptors
     {
         provide: HTTP_INTERCEPTORS,
@@ -932,14 +961,32 @@ const providers: Provider[] = [
     }
 ];
 
-${hasDateInterceptor ? `// Add date interceptor to client-specific interceptors if enabled
-if (config.enableDateTransform !== false) {
-    const currentInterceptors = config.interceptors || [];
+// Add client-specific interceptor instances
+if (config.interceptors && config.interceptors.length > 0) {
+    const interceptorInstances = config.interceptors.map(InterceptorClass => new InterceptorClass());
+    
+    ${hasDateInterceptor ? `// Add date interceptor if enabled (default: true)
+    if (config.enableDateTransform !== false) {
+        interceptorInstances.unshift(new DateInterceptor());
+    }` : `// Date transformation not available (dateType: 'string' was used in generation)`}
+    
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: interceptorInstances
+    });
+} ${hasDateInterceptor ? `else if (config.enableDateTransform !== false) {
+    // Only date interceptor enabled
     providers.push({
         provide: ${interceptorsTokenName},
-        useValue: [new DateInterceptor(), ...currentInterceptors]
+        useValue: [new DateInterceptor()]
     });
-}` : `// Date transformation not available (dateType: 'string' was used in generation)`}
+}` : ``} else {
+    // No interceptors
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: []
+    });
+}
 
 return makeEnvironmentProviders(providers);`;
     sourceFile.addFunction({
@@ -957,7 +1004,7 @@ return makeEnvironmentProviders(providers);`;
         "  providers: [",
         `    ${functionName}({`,
         "      basePath: 'https://api.example.com',",
-        "      interceptors: [new LoggingInterceptor(), new AuthInterceptor()]",
+        "      interceptors: [AuthInterceptor, LoggingInterceptor] // Classes, not instances",
         "    }),",
         "    // other providers...",
         "  ]",
@@ -1027,6 +1074,7 @@ var BaseInterceptorGenerator = class {
     sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(this.#clientName));
     const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addImportDeclarations([
       {
         namedImports: [
@@ -1053,7 +1101,8 @@ var BaseInterceptorGenerator = class {
       {
         namedImports: [
           basePathTokenName,
-          interceptorsTokenName
+          interceptorsTokenName,
+          clientContextTokenName
         ],
         moduleSpecifier: "../tokens"
       }
@@ -1072,11 +1121,11 @@ var BaseInterceptorGenerator = class {
       ],
       properties: [
         {
-          name: "basePath",
+          name: "clientName",
           type: "string",
           scope: import_ts_morph3.Scope.Private,
           isReadonly: true,
-          initializer: `inject(${basePathTokenName})`
+          initializer: `'${this.#clientName}'`
         },
         {
           name: "httpInterceptors",
@@ -1084,6 +1133,13 @@ var BaseInterceptorGenerator = class {
           scope: import_ts_morph3.Scope.Private,
           isReadonly: true,
           initializer: `inject(${interceptorsTokenName})`
+        },
+        {
+          name: "clientContextToken",
+          type: "any",
+          scope: import_ts_morph3.Scope.Private,
+          isReadonly: true,
+          initializer: clientContextTokenName
         }
       ],
       methods: [
@@ -1101,8 +1157,11 @@ var BaseInterceptorGenerator = class {
           ],
           returnType: "Observable<HttpEvent<any>>",
           statements: `
-    // Only intercept requests to this client's base path
-    if (!req.url.startsWith(this.basePath)) {
+    // Check if this request belongs to this client using HttpContext
+    const requestClientName = req.context.get(this.clientContextToken);
+    
+    if (requestClientName !== this.clientName) {
+      // This request doesn't belong to this client, pass it through
       return next.handle(req);
     }
 
@@ -1130,6 +1189,10 @@ var BaseInterceptorGenerator = class {
     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);
   }
@@ -1232,6 +1295,7 @@ var ServiceMethodBodyGenerator = class {
       this.generateQueryParams(context),
       this.generateHeaders(context),
       this.generateMultipartFormData(operation, context),
+      this.generateContextHelper(),
       this.generateRequestOptions(context),
       this.generateHttpRequest(operation, context)
     ];
@@ -1426,9 +1490,7 @@ ${formDataAppends}`;
     }
     options.push("reportProgress: options?.reportProgress");
     options.push("withCredentials: options?.withCredentials");
-    if (options.length > 0) {
-      options.push("context: options?.context");
-    }
+    options.push("context: this.createContextWithClientId(options?.context)");
     const formattedOptions = options.filter((opt) => opt && !opt.includes("undefined")).join(",\n  ");
     return `
 const requestOptions: any = {
@@ -1520,6 +1582,16 @@ return this.httpClient.${httpMethod}(url, requestOptions);`;
     }
     return "blob";
   }
+  generateContextHelper() {
+    return `
+/**
+ * Creates HttpContext with client identification
+ */
+private createContextWithClientId(existingContext?: HttpContext): HttpContext {
+    const context = existingContext || new HttpContext();
+    return context.set(this.clientContextToken, '${this.config.clientName || "default"}');
+}`;
+  }
 };
 
 // src/lib/generators/service/service-method/service-method-params.generator.ts
@@ -2081,6 +2153,7 @@ var ServiceGenerator = class {
   }
   addImports(sourceFile, usedTypes) {
     const basePathTokenName = this.getBasePathTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addImportDeclarations([
       {
         namedImports: [
@@ -2108,7 +2181,8 @@ var ServiceGenerator = class {
       },
       {
         namedImports: [
-          basePathTokenName
+          basePathTokenName,
+          clientContextTokenName
         ],
         moduleSpecifier: "../tokens"
       }
@@ -2123,6 +2197,7 @@ var ServiceGenerator = class {
   addServiceClass(sourceFile, controllerName, operations) {
     const className = `${controllerName}Service`;
     const basePathTokenName = this.getBasePathTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     const serviceClass = sourceFile.addClass({
       name: className,
@@ -2150,6 +2225,13 @@ var ServiceGenerator = class {
       isReadonly: true,
       initializer: `inject(${basePathTokenName})`
     });
+    serviceClass.addProperty({
+      name: "clientContextToken",
+      type: "any",
+      scope: import_ts_morph4.Scope.Private,
+      isReadonly: true,
+      initializer: clientContextTokenName
+    });
     operations.forEach((operation) => {
       this.methodGenerator.addServiceMethod(serviceClass, operation);
     });
@@ -2157,6 +2239,11 @@ var ServiceGenerator = class {
       throw new Error(`Duplicate method names found in service class ${className}. Please ensure unique method names for each operation.`);
     }
   }
+  getClientContextTokenName() {
+    const clientName = this.config.clientName || "default";
+    const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    return `CLIENT_CONTEXT_TOKEN_${clientSuffix}`;
+  }
   getBasePathTokenName() {
     const clientName = this.config.clientName || "default";
     const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");

package/index.d.ts

@@ -52,7 +52,7 @@ interface NgOpenapiClientConfig {
     clientName: string;
     basePath: string;
     enableDateTransform?: boolean;
-    interceptors?: HttpInterceptor[];
+    interceptors?: (new (...args: HttpInterceptor[]) => HttpInterceptor)[];
 }
 
 interface Parameter {

package/index.js

@@ -472,12 +472,14 @@ var _TokenGenerator = class _TokenGenerator {
     });
     sourceFile.addImportDeclaration({
       namedImports: [
-        "HttpInterceptor"
+        "HttpInterceptor",
+        "HttpContextToken"
       ],
       moduleSpecifier: "@angular/common/http"
     });
     const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
@@ -508,7 +510,21 @@ var _TokenGenerator = class _TokenGenerator {
         }
       ],
       leadingTrivia: `/**
- * Injection token for the ${this.clientName} client HTTP interceptors
+ * Injection token for the ${this.clientName} client HTTP interceptor instances
+ */
+`
+    });
+    sourceFile.addVariableStatement({
+      isExported: true,
+      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+      declarations: [
+        {
+          name: clientContextTokenName,
+          initializer: `new HttpContextToken<string>(() => '${this.clientName}')`
+        }
+      ],
+      leadingTrivia: `/**
+ * HttpContext token to identify requests belonging to the ${this.clientName} client
  */
 `
     });
@@ -525,6 +541,20 @@ var _TokenGenerator = class _TokenGenerator {
         leadingTrivia: `/**
  * @deprecated Use ${basePathTokenName} instead
  */
+`
+      });
+      sourceFile.addVariableStatement({
+        isExported: true,
+        declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+        declarations: [
+          {
+            name: "CLIENT_CONTEXT_TOKEN",
+            initializer: clientContextTokenName
+          }
+        ],
+        leadingTrivia: `/**
+ * @deprecated Use ${clientContextTokenName} instead
+ */
 `
       });
     }
@@ -538,6 +568,10 @@ var _TokenGenerator = class _TokenGenerator {
     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}`;
+  }
 };
 __name(_TokenGenerator, "TokenGenerator");
 var TokenGenerator = _TokenGenerator;
@@ -940,10 +974,10 @@ var _ProviderGenerator = class _ProviderGenerator {
         },
         {
           name: "interceptors",
-          type: "HttpInterceptor[]",
+          type: "(new (...args: HttpInterceptor[]) => HttpInterceptor)[]",
           hasQuestionToken: true,
           docs: [
-            "Array of HTTP interceptors to apply to this client"
+            "Array of HTTP interceptor classes to apply to this client"
           ]
         }
       ]
@@ -962,11 +996,6 @@ const providers: Provider[] = [
         provide: ${basePathTokenName},
         useValue: config.basePath
     },
-    // Client-specific interceptors token
-    {
-        provide: ${interceptorsTokenName},
-        useValue: config.interceptors || []
-    },
     // Base interceptor that handles client-specific interceptors
     {
         provide: HTTP_INTERCEPTORS,
@@ -975,14 +1004,32 @@ const providers: Provider[] = [
     }
 ];
 
-${hasDateInterceptor ? `// Add date interceptor to client-specific interceptors if enabled
-if (config.enableDateTransform !== false) {
-    const currentInterceptors = config.interceptors || [];
+// Add client-specific interceptor instances
+if (config.interceptors && config.interceptors.length > 0) {
+    const interceptorInstances = config.interceptors.map(InterceptorClass => new InterceptorClass());
+    
+    ${hasDateInterceptor ? `// Add date interceptor if enabled (default: true)
+    if (config.enableDateTransform !== false) {
+        interceptorInstances.unshift(new DateInterceptor());
+    }` : `// Date transformation not available (dateType: 'string' was used in generation)`}
+    
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: interceptorInstances
+    });
+} ${hasDateInterceptor ? `else if (config.enableDateTransform !== false) {
+    // Only date interceptor enabled
     providers.push({
         provide: ${interceptorsTokenName},
-        useValue: [new DateInterceptor(), ...currentInterceptors]
+        useValue: [new DateInterceptor()]
     });
-}` : `// Date transformation not available (dateType: 'string' was used in generation)`}
+}` : ``} else {
+    // No interceptors
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: []
+    });
+}
 
 return makeEnvironmentProviders(providers);`;
     sourceFile.addFunction({
@@ -1000,7 +1047,7 @@ return makeEnvironmentProviders(providers);`;
         "  providers: [",
         `    ${functionName}({`,
         "      basePath: 'https://api.example.com',",
-        "      interceptors: [new LoggingInterceptor(), new AuthInterceptor()]",
+        "      interceptors: [AuthInterceptor, LoggingInterceptor] // Classes, not instances",
         "    }),",
         "    // other providers...",
         "  ]",
@@ -1070,6 +1117,7 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
     sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(__privateGet(this, _clientName)));
     const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addImportDeclarations([
       {
         namedImports: [
@@ -1096,7 +1144,8 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
       {
         namedImports: [
           basePathTokenName,
-          interceptorsTokenName
+          interceptorsTokenName,
+          clientContextTokenName
         ],
         moduleSpecifier: "../tokens"
       }
@@ -1115,11 +1164,11 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
       ],
       properties: [
         {
-          name: "basePath",
+          name: "clientName",
           type: "string",
           scope: import_ts_morph3.Scope.Private,
           isReadonly: true,
-          initializer: `inject(${basePathTokenName})`
+          initializer: `'${__privateGet(this, _clientName)}'`
         },
         {
           name: "httpInterceptors",
@@ -1127,6 +1176,13 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
           scope: import_ts_morph3.Scope.Private,
           isReadonly: true,
           initializer: `inject(${interceptorsTokenName})`
+        },
+        {
+          name: "clientContextToken",
+          type: "any",
+          scope: import_ts_morph3.Scope.Private,
+          isReadonly: true,
+          initializer: clientContextTokenName
         }
       ],
       methods: [
@@ -1144,8 +1200,11 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
           ],
           returnType: "Observable<HttpEvent<any>>",
           statements: `
-    // Only intercept requests to this client's base path
-    if (!req.url.startsWith(this.basePath)) {
+    // Check if this request belongs to this client using HttpContext
+    const requestClientName = req.context.get(this.clientContextToken);
+    
+    if (requestClientName !== this.clientName) {
+      // This request doesn't belong to this client, pass it through
       return next.handle(req);
     }
 
@@ -1173,6 +1232,10 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
     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);
   }
@@ -1276,6 +1339,7 @@ var _ServiceMethodBodyGenerator = class _ServiceMethodBodyGenerator {
       this.generateQueryParams(context),
       this.generateHeaders(context),
       this.generateMultipartFormData(operation, context),
+      this.generateContextHelper(),
       this.generateRequestOptions(context),
       this.generateHttpRequest(operation, context)
     ];
@@ -1475,9 +1539,7 @@ ${formDataAppends}`;
     }
     options.push("reportProgress: options?.reportProgress");
     options.push("withCredentials: options?.withCredentials");
-    if (options.length > 0) {
-      options.push("context: options?.context");
-    }
+    options.push("context: this.createContextWithClientId(options?.context)");
     const formattedOptions = options.filter((opt) => opt && !opt.includes("undefined")).join(",\n  ");
     return `
 const requestOptions: any = {
@@ -1571,6 +1633,16 @@ return this.httpClient.${httpMethod}(url, requestOptions);`;
     }
     return "blob";
   }
+  generateContextHelper() {
+    return `
+/**
+ * Creates HttpContext with client identification
+ */
+private createContextWithClientId(existingContext?: HttpContext): HttpContext {
+    const context = existingContext || new HttpContext();
+    return context.set(this.clientContextToken, '${this.config.clientName || "default"}');
+}`;
+  }
 };
 __name(_ServiceMethodBodyGenerator, "ServiceMethodBodyGenerator");
 var ServiceMethodBodyGenerator = _ServiceMethodBodyGenerator;
@@ -2133,6 +2205,7 @@ var _ServiceGenerator = class _ServiceGenerator {
   }
   addImports(sourceFile, usedTypes) {
     const basePathTokenName = this.getBasePathTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addImportDeclarations([
       {
         namedImports: [
@@ -2160,7 +2233,8 @@ var _ServiceGenerator = class _ServiceGenerator {
       },
       {
         namedImports: [
-          basePathTokenName
+          basePathTokenName,
+          clientContextTokenName
         ],
         moduleSpecifier: "../tokens"
       }
@@ -2175,6 +2249,7 @@ var _ServiceGenerator = class _ServiceGenerator {
   addServiceClass(sourceFile, controllerName, operations) {
     const className = `${controllerName}Service`;
     const basePathTokenName = this.getBasePathTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     const serviceClass = sourceFile.addClass({
       name: className,
@@ -2202,6 +2277,13 @@ var _ServiceGenerator = class _ServiceGenerator {
       isReadonly: true,
       initializer: `inject(${basePathTokenName})`
     });
+    serviceClass.addProperty({
+      name: "clientContextToken",
+      type: "any",
+      scope: import_ts_morph4.Scope.Private,
+      isReadonly: true,
+      initializer: clientContextTokenName
+    });
     operations.forEach((operation) => {
       this.methodGenerator.addServiceMethod(serviceClass, operation);
     });
@@ -2209,6 +2291,11 @@ var _ServiceGenerator = class _ServiceGenerator {
       throw new Error(`Duplicate method names found in service class ${className}. Please ensure unique method names for each operation.`);
     }
   }
+  getClientContextTokenName() {
+    const clientName = this.config.clientName || "default";
+    const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    return `CLIENT_CONTEXT_TOKEN_${clientSuffix}`;
+  }
   getBasePathTokenName() {
     const clientName = this.config.clientName || "default";
     const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");

package/package.json

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