ng-openapi 0.0.23 → 0.0.24-rc.0

package/cli.cjs

@@ -1895,7 +1895,7 @@ var ProviderGenerator = class {
           "makeEnvironmentProviders",
           "Type",
           "Injector",
-          "inject"
+          "InjectionToken"
         ],
         moduleSpecifier: "@angular/core"
       },
@@ -1904,7 +1904,8 @@ var ProviderGenerator = class {
           "HttpClient",
           "HttpInterceptor",
           "HttpHandler",
-          "HttpRequest"
+          "HttpBackend",
+          "HTTP_INTERCEPTORS"
         ],
         moduleSpecifier: "@angular/common/http"
       },
@@ -1956,50 +1957,24 @@ var ProviderGenerator = class {
         }
       ]
     });
-    this.addInterceptorChainHelper(sourceFile);
-    this.addClientProviderFunction(sourceFile, pascalClientName, upperCaseClientName);
-    sourceFile.saveSync();
-  }
-  addInterceptorChainHelper(sourceFile) {
-    sourceFile.addFunction({
-      name: "createHttpClientWithInterceptors",
-      docs: [
-        "Creates an HttpClient with a custom interceptor chain"
-      ],
-      parameters: [
-        {
-          name: "baseClient",
-          type: "HttpClient"
-        },
+    sourceFile.addVariableStatement({
+      isExported: true,
+      declarationKind: "const",
+      declarations: [
         {
-          name: "interceptors",
-          type: "HttpInterceptor[]"
+          name: `${upperCaseClientName}_INTERCEPTORS`,
+          initializer: `new InjectionToken<HttpInterceptor[]>('${upperCaseClientName}_INTERCEPTORS')`
         }
       ],
-      returnType: "HttpClient",
-      statements: `
-if (!interceptors.length) {
-    return baseClient;
-}
-
-// Create a custom handler that applies interceptors in sequence
-let handler = baseClient.handler;
-
-// Apply interceptors in reverse order (last interceptor wraps the original handler)
-for (let i = interceptors.length - 1; i >= 0; i--) {
-    const currentHandler = handler;
-    const interceptor = interceptors[i];
-    
-    handler = {
-        handle: (req: HttpRequest<any>) => interceptor.intercept(req, currentHandler)
-    };
-}
-
-// Return a new HttpClient with the custom handler
-return new (baseClient.constructor as any)(handler);`
+      leadingTrivia: `/**
+ * Interceptor token for ${clientName} client
+ */
+`
     });
+    this.addSimpleProviderFunction(sourceFile, pascalClientName, upperCaseClientName);
+    sourceFile.saveSync();
   }
-  addClientProviderFunction(sourceFile, pascalClientName, upperCaseClientName) {
+  addSimpleProviderFunction(sourceFile, pascalClientName, upperCaseClientName) {
     const hasDateInterceptor = this.config.options.dateType === "Date";
     const functionBody = `
 const providers: Provider[] = [
@@ -2009,10 +1984,10 @@ const providers: Provider[] = [
         useValue: config.basePath
     },
     
-    // HTTP client with custom interceptors
+    // Collect interceptors for this client
     {
-        provide: ${upperCaseClientName}_HTTP_CLIENT,
-        useFactory: (baseClient: HttpClient, injector: Injector) => {
+        provide: ${upperCaseClientName}_INTERCEPTORS,
+        useFactory: (injector: Injector) => {
             const interceptorInstances: HttpInterceptor[] = [];
             
             // Add custom interceptors
@@ -2028,9 +2003,32 @@ const providers: Provider[] = [
                 interceptorInstances.push(injector.get(DateInterceptor));
             }` : ""}
             
-            return createHttpClientWithInterceptors(baseClient, interceptorInstances);
+            return interceptorInstances;
+        },
+        deps: [Injector]
+    },
+    
+    // Create HTTP client with interceptors
+    {
+        provide: ${upperCaseClientName}_HTTP_CLIENT,
+        useFactory: (backend: HttpBackend, interceptors: HttpInterceptor[]) => {
+            if (!interceptors.length) {
+                return new HttpClient(backend);
+            }
+            
+            // Create handler chain
+            let handler = backend;
+            for (let i = interceptors.length - 1; i >= 0; i--) {
+                const interceptor = interceptors[i];
+                const currentHandler = handler;
+                handler = {
+                    handle: req => interceptor.intercept(req, currentHandler)
+                };
+            }
+            
+            return new HttpClient(handler);
         },
-        deps: [HttpClient, Injector]
+        deps: [HttpBackend, ${upperCaseClientName}_INTERCEPTORS]
     }
 ];
 
@@ -2136,7 +2134,7 @@ __name(generateFromConfig, "generateFromConfig");
 // package.json
 var package_default = {
   name: "ng-openapi",
-  version: "0.0.22",
+  version: "0.0.23",
   description: "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   keywords: [
     "angular",

package/index.js

@@ -1928,7 +1928,7 @@ var _ProviderGenerator = class _ProviderGenerator {
           "makeEnvironmentProviders",
           "Type",
           "Injector",
-          "inject"
+          "InjectionToken"
         ],
         moduleSpecifier: "@angular/core"
       },
@@ -1937,7 +1937,8 @@ var _ProviderGenerator = class _ProviderGenerator {
           "HttpClient",
           "HttpInterceptor",
           "HttpHandler",
-          "HttpRequest"
+          "HttpBackend",
+          "HTTP_INTERCEPTORS"
         ],
         moduleSpecifier: "@angular/common/http"
       },
@@ -1989,50 +1990,24 @@ var _ProviderGenerator = class _ProviderGenerator {
         }
       ]
     });
-    this.addInterceptorChainHelper(sourceFile);
-    this.addClientProviderFunction(sourceFile, pascalClientName, upperCaseClientName);
-    sourceFile.saveSync();
-  }
-  addInterceptorChainHelper(sourceFile) {
-    sourceFile.addFunction({
-      name: "createHttpClientWithInterceptors",
-      docs: [
-        "Creates an HttpClient with a custom interceptor chain"
-      ],
-      parameters: [
-        {
-          name: "baseClient",
-          type: "HttpClient"
-        },
+    sourceFile.addVariableStatement({
+      isExported: true,
+      declarationKind: "const",
+      declarations: [
         {
-          name: "interceptors",
-          type: "HttpInterceptor[]"
+          name: `${upperCaseClientName}_INTERCEPTORS`,
+          initializer: `new InjectionToken<HttpInterceptor[]>('${upperCaseClientName}_INTERCEPTORS')`
         }
       ],
-      returnType: "HttpClient",
-      statements: `
-if (!interceptors.length) {
-    return baseClient;
-}
-
-// Create a custom handler that applies interceptors in sequence
-let handler = baseClient.handler;
-
-// Apply interceptors in reverse order (last interceptor wraps the original handler)
-for (let i = interceptors.length - 1; i >= 0; i--) {
-    const currentHandler = handler;
-    const interceptor = interceptors[i];
-    
-    handler = {
-        handle: (req: HttpRequest<any>) => interceptor.intercept(req, currentHandler)
-    };
-}
-
-// Return a new HttpClient with the custom handler
-return new (baseClient.constructor as any)(handler);`
+      leadingTrivia: `/**
+ * Interceptor token for ${clientName} client
+ */
+`
     });
+    this.addSimpleProviderFunction(sourceFile, pascalClientName, upperCaseClientName);
+    sourceFile.saveSync();
   }
-  addClientProviderFunction(sourceFile, pascalClientName, upperCaseClientName) {
+  addSimpleProviderFunction(sourceFile, pascalClientName, upperCaseClientName) {
     const hasDateInterceptor = this.config.options.dateType === "Date";
     const functionBody = `
 const providers: Provider[] = [
@@ -2042,10 +2017,10 @@ const providers: Provider[] = [
         useValue: config.basePath
     },
     
-    // HTTP client with custom interceptors
+    // Collect interceptors for this client
     {
-        provide: ${upperCaseClientName}_HTTP_CLIENT,
-        useFactory: (baseClient: HttpClient, injector: Injector) => {
+        provide: ${upperCaseClientName}_INTERCEPTORS,
+        useFactory: (injector: Injector) => {
             const interceptorInstances: HttpInterceptor[] = [];
             
             // Add custom interceptors
@@ -2061,9 +2036,32 @@ const providers: Provider[] = [
                 interceptorInstances.push(injector.get(DateInterceptor));
             }` : ""}
             
-            return createHttpClientWithInterceptors(baseClient, interceptorInstances);
+            return interceptorInstances;
+        },
+        deps: [Injector]
+    },
+    
+    // Create HTTP client with interceptors
+    {
+        provide: ${upperCaseClientName}_HTTP_CLIENT,
+        useFactory: (backend: HttpBackend, interceptors: HttpInterceptor[]) => {
+            if (!interceptors.length) {
+                return new HttpClient(backend);
+            }
+            
+            // Create handler chain
+            let handler = backend;
+            for (let i = interceptors.length - 1; i >= 0; i--) {
+                const interceptor = interceptors[i];
+                const currentHandler = handler;
+                handler = {
+                    handle: req => interceptor.intercept(req, currentHandler)
+                };
+            }
+            
+            return new HttpClient(handler);
         },
-        deps: [HttpClient, Injector]
+        deps: [HttpBackend, ${upperCaseClientName}_INTERCEPTORS]
     }
 ];
 

package/package.json

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