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

package/cli.cjs

@@ -419,11 +419,16 @@ var TokenGenerator = class {
     });
     sourceFile.addImportDeclaration({
       namedImports: [
-        "InjectionToken",
-        "HttpInterceptor"
+        "InjectionToken"
       ],
       moduleSpecifier: "@angular/core"
     });
+    sourceFile.addImportDeclaration({
+      namedImports: [
+        "HttpInterceptor"
+      ],
+      moduleSpecifier: "@angular/common/http"
+    });
     const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
     sourceFile.addVariableStatement({
@@ -456,7 +461,7 @@ var TokenGenerator = class {
         }
       ],
       leadingTrivia: `/**
- * Injection token for the ${this.clientName} client HTTP interceptors
+ * Injection token for the ${this.clientName} client HTTP interceptor instances
  */
 `
     });
@@ -892,10 +897,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"
           ]
         }
       ]
@@ -914,11 +919,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,
@@ -927,14 +927,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({
@@ -952,7 +970,7 @@ return makeEnvironmentProviders(providers);`;
         "  providers: [",
         `    ${functionName}({`,
         "      basePath: 'https://api.example.com',",
-        "      interceptors: [new LoggingInterceptor(), new AuthInterceptor()]",
+        "      interceptors: [AuthInterceptor, LoggingInterceptor] // Classes, not instances",
         "    }),",
         "    // other providers...",
         "  ]",

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

@@ -466,11 +466,16 @@ var _TokenGenerator = class _TokenGenerator {
     });
     sourceFile.addImportDeclaration({
       namedImports: [
-        "InjectionToken",
-        "HttpInterceptor"
+        "InjectionToken"
       ],
       moduleSpecifier: "@angular/core"
     });
+    sourceFile.addImportDeclaration({
+      namedImports: [
+        "HttpInterceptor"
+      ],
+      moduleSpecifier: "@angular/common/http"
+    });
     const basePathTokenName = this.getBasePathTokenName();
     const interceptorsTokenName = this.getInterceptorsTokenName();
     sourceFile.addVariableStatement({
@@ -503,7 +508,7 @@ var _TokenGenerator = class _TokenGenerator {
         }
       ],
       leadingTrivia: `/**
- * Injection token for the ${this.clientName} client HTTP interceptors
+ * Injection token for the ${this.clientName} client HTTP interceptor instances
  */
 `
     });
@@ -935,10 +940,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"
           ]
         }
       ]
@@ -957,11 +962,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,
@@ -970,14 +970,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({
@@ -995,7 +1013,7 @@ return makeEnvironmentProviders(providers);`;
         "  providers: [",
         `    ${functionName}({`,
         "      basePath: 'https://api.example.com',",
-        "      interceptors: [new LoggingInterceptor(), new AuthInterceptor()]",
+        "      interceptors: [AuthInterceptor, LoggingInterceptor] // Classes, not instances",
         "    }),",
         "    // other providers...",
         "  ]",

package/package.json

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