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

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,
@@ -463,6 +465,20 @@ var TokenGenerator = class {
       leadingTrivia: `/**
  * 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
+ */
 `
     });
     if (this.clientName === "default") {
@@ -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
@@ -1040,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: [
@@ -1066,7 +1101,8 @@ var BaseInterceptorGenerator = class {
       {
         namedImports: [
           basePathTokenName,
-          interceptorsTokenName
+          interceptorsTokenName,
+          clientContextTokenName
         ],
         moduleSpecifier: "../tokens"
       }
@@ -1085,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",
@@ -1097,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: [
@@ -1114,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);
     }
 
@@ -1143,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);
   }
@@ -1439,9 +1489,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 = {
@@ -1533,6 +1581,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
@@ -2094,6 +2152,7 @@ var ServiceGenerator = class {
   }
   addImports(sourceFile, usedTypes) {
     const basePathTokenName = this.getBasePathTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addImportDeclarations([
       {
         namedImports: [
@@ -2121,7 +2180,8 @@ var ServiceGenerator = class {
       },
       {
         namedImports: [
-          basePathTokenName
+          basePathTokenName,
+          clientContextTokenName
         ],
         moduleSpecifier: "../tokens"
       }
@@ -2136,6 +2196,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,
@@ -2163,6 +2224,28 @@ var ServiceGenerator = class {
       isReadonly: true,
       initializer: `inject(${basePathTokenName})`
     });
+    serviceClass.addProperty({
+      name: "clientContextToken",
+      type: "any",
+      scope: import_ts_morph4.Scope.Private,
+      isReadonly: true,
+      initializer: clientContextTokenName
+    });
+    serviceClass.addMethod({
+      name: "createContextWithClientId",
+      scope: import_ts_morph4.Scope.Private,
+      parameters: [
+        {
+          name: "existingContext",
+          type: "HttpContext",
+          hasQuestionToken: true
+        }
+      ],
+      returnType: "HttpContext",
+      statements: `
+const context = existingContext || new HttpContext();
+return context.set(this.clientContextToken, '${this.config.clientName || "default"}');`
+    });
     operations.forEach((operation) => {
       this.methodGenerator.addServiceMethod(serviceClass, operation);
     });
@@ -2170,6 +2253,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.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,
@@ -510,6 +512,20 @@ var _TokenGenerator = class _TokenGenerator {
       leadingTrivia: `/**
  * 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
+ */
 `
     });
     if (this.clientName === "default") {
@@ -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;
@@ -1083,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: [
@@ -1109,7 +1144,8 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
       {
         namedImports: [
           basePathTokenName,
-          interceptorsTokenName
+          interceptorsTokenName,
+          clientContextTokenName
         ],
         moduleSpecifier: "../tokens"
       }
@@ -1128,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",
@@ -1140,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: [
@@ -1157,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);
     }
 
@@ -1186,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);
   }
@@ -1488,9 +1538,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 = {
@@ -1584,6 +1632,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;
@@ -2146,6 +2204,7 @@ var _ServiceGenerator = class _ServiceGenerator {
   }
   addImports(sourceFile, usedTypes) {
     const basePathTokenName = this.getBasePathTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addImportDeclarations([
       {
         namedImports: [
@@ -2173,7 +2232,8 @@ var _ServiceGenerator = class _ServiceGenerator {
       },
       {
         namedImports: [
-          basePathTokenName
+          basePathTokenName,
+          clientContextTokenName
         ],
         moduleSpecifier: "../tokens"
       }
@@ -2188,6 +2248,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,
@@ -2215,6 +2276,28 @@ 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
+    });
+    serviceClass.addMethod({
+      name: "createContextWithClientId",
+      scope: import_ts_morph4.Scope.Private,
+      parameters: [
+        {
+          name: "existingContext",
+          type: "HttpContext",
+          hasQuestionToken: true
+        }
+      ],
+      returnType: "HttpContext",
+      statements: `
+const context = existingContext || new HttpContext();
+return context.set(this.clientContextToken, '${this.config.clientName || "default"}');`
+    });
     operations.forEach((operation) => {
       this.methodGenerator.addServiceMethod(serviceClass, operation);
     });
@@ -2222,6 +2305,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.4",
+  "version": "0.0.25-alpha.6",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "angular",