ng-openapi 0.3.1-pr-114-feat-functional-client-interceptors-52e79cb.0 → 0.3.1

package/README.md

@@ -151,13 +151,11 @@ The simplest way to integrate ng-openapi is using the provider function:
 ```typescript
 // In your app.config.ts
 import { ApplicationConfig } from "@angular/core";
-import { provideHttpClient, withInterceptors } from "@angular/common/http";
 import { provideDefaultClient } from "./api/providers";
-import { defaultClientInterceptor } from "./api/utils/base-interceptor";
 
 export const appConfig: ApplicationConfig = {
     providers: [
-        provideHttpClient(withInterceptors([defaultClientInterceptor])),
+        // One-line setup with automatic interceptor configuration
         provideDefaultClient({
             basePath: "https://api.example.com",
         }),
@@ -166,13 +164,12 @@ export const appConfig: ApplicationConfig = {
 };
 ```
 
-> The provider function is named after your `clientName` (e.g. `clientName: "PetStore"` → `providePetStoreClient`); without a `clientName` it is `provideDefaultClient`. The same goes for the functional interceptor (`petStoreClientInterceptor` / `defaultClientInterceptor`), which runs this client's scoped interceptor chain and leaves all other requests untouched.
+> The provider function is named after your `clientName` (e.g. `clientName: "PetStore"` → `providePetStoreClient`); without a `clientName` it is `provideDefaultClient`.
 
-That's it! This configures:
+That's it! This automatically configures:
 
 - ✅ BASE_PATH token
-- ✅ Client-scoped interceptor chain
-- ✅ Date transformation (if using Date type)
+- ✅ Date transformation interceptor (if using Date type)
 
 ### Advanced Provider Options
 
@@ -183,11 +180,10 @@ provideDefaultClient({
     enableDateTransform: false,
 });
 
-// Client-specific interceptors: classes (not instances) and/or functional interceptors
+// Client-specific interceptors (classes, not instances)
 provideDefaultClient({
     basePath: "https://api.example.com",
     interceptors: [AuthInterceptor, LoggingInterceptor],
-    interceptorFns: [authInterceptorFn],
 });
 ```
 

package/cli.cjs

@@ -260,14 +260,6 @@ function getServiceClassName(controllerName, naming) {
   return decorate(pascalCase(controllerName), "Service", naming);
 }
 __name(getServiceClassName, "getServiceClassName");
-function getBaseInterceptorClassName(clientName = "default") {
-  return `${clientName.charAt(0).toUpperCase()}${clientName.slice(1)}BaseInterceptor`;
-}
-__name(getBaseInterceptorClassName, "getBaseInterceptorClassName");
-function getClientInterceptorFnName(clientName = "default") {
-  return `${clientName.charAt(0).toLowerCase()}${clientName.slice(1)}ClientInterceptor`;
-}
-__name(getClientInterceptorFnName, "getClientInterceptorFnName");
 function getModelTypeName(rawName, naming) {
   return decorate(pascalCaseForEnums(rawName), "", naming);
 }
@@ -864,11 +856,11 @@ function getBasePathTokenName(clientName = "default") {
   return `BASE_PATH_${clientSuffix}`;
 }
 __name(getBasePathTokenName, "getBasePathTokenName");
-function getInterceptorFnsTokenName(clientName = "default") {
+function getInterceptorsTokenName(clientName = "default") {
   const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
-  return `HTTP_INTERCEPTOR_FNS_${clientSuffix}`;
+  return `HTTP_INTERCEPTORS_${clientSuffix}`;
 }
-__name(getInterceptorFnsTokenName, "getInterceptorFnsTokenName");
+__name(getInterceptorsTokenName, "getInterceptorsTokenName");
 
 // ../shared/src/utils/functions/duplicate-function-name.ts
 function hasDuplicateFunctionNames(arr) {
@@ -953,7 +945,7 @@ var fs3 = __toESM(require("fs"));
 var path14 = __toESM(require("path"));
 
 // package.json
-var version = "0.3.0";
+var version = "0.3.1";
 
 // src/lib/core/generator.ts
 var import_ts_morph10 = require("ts-morph");
@@ -1651,15 +1643,15 @@ var TokenGenerator = class {
       },
       {
         namedImports: [
-          "HttpInterceptorFn",
+          "HttpInterceptor",
           "HttpContextToken"
         ],
         moduleSpecifier: "@angular/common/http"
       }
     ]);
-    const basePathTokenName = getBasePathTokenName(this.clientName);
-    const interceptorFnsTokenName = getInterceptorFnsTokenName(this.clientName);
-    const clientContextTokenName = getClientContextTokenName(this.clientName);
+    const basePathTokenName = this.getBasePathTokenName();
+    const interceptorsTokenName = this.getInterceptorsTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph5.VariableDeclarationKind.Const,
@@ -1682,16 +1674,15 @@ var TokenGenerator = class {
       declarationKind: import_ts_morph5.VariableDeclarationKind.Const,
       declarations: [
         {
-          name: interceptorFnsTokenName,
-          initializer: `new InjectionToken<HttpInterceptorFn[]>('${interceptorFnsTokenName}', {
+          name: interceptorsTokenName,
+          initializer: `new InjectionToken<HttpInterceptor[]>('${interceptorsTokenName}', {
   providedIn: 'root',
   factory: () => [], // Default empty array
 })`
         }
       ],
       leadingTrivia: `/**
- * Injection token carrying the ${this.clientName} client's scoped interceptor chain,
- * normalized to functional interceptors. Populated by the client's provide function.
+ * Injection token for the ${this.clientName} client HTTP interceptor instances
  */
 `
     });
@@ -1742,6 +1733,18 @@ var TokenGenerator = class {
     sourceFile.formatText();
     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}`;
+  }
+  getClientContextTokenName() {
+    const clientSuffix = this.clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    return `CLIENT_CONTEXT_TOKEN_${clientSuffix}`;
+  }
 };
 
 // src/lib/generators/utility/file-download.generator.ts
@@ -1907,7 +1910,6 @@ var DateTransformerGenerator = class {
           "HttpEvent",
           "HttpHandler",
           "HttpInterceptor",
-          "HttpInterceptorFn",
           "HttpRequest",
           "HttpResponse"
         ],
@@ -1979,58 +1981,6 @@ var DateTransformerGenerator = class {
     }
 
     return obj;`
-    });
-    sourceFile.addFunction({
-      name: "transformDateResponse",
-      parameters: [
-        {
-          name: "event",
-          type: "HttpEvent<any>"
-        },
-        {
-          name: "dateRegex",
-          type: "RegExp"
-        }
-      ],
-      returnType: "HttpEvent<any>",
-      statements: `
-    if (event instanceof HttpResponse && event.body) {
-        return event.clone({ body: transformDates(event.body, dateRegex) });
-    }
-    return event;`
-    });
-    sourceFile.addFunction({
-      name: "dateInterceptorWithRegex",
-      isExported: true,
-      docs: [
-        "Builds a functional date interceptor for `provideHttpClient(withInterceptors([...]))`.\n@param dateRegex Optional override for the pattern used to detect ISO date strings."
-      ],
-      parameters: [
-        {
-          name: "dateRegex",
-          type: "RegExp",
-          initializer: "ISO_DATE_REGEX"
-        }
-      ],
-      returnType: "HttpInterceptorFn",
-      statements: `
-    return (req, next) => next(req).pipe(map((event) => transformDateResponse(event, dateRegex)));`
-    });
-    sourceFile.addVariableStatement({
-      isExported: true,
-      declarationKind: import_ts_morph6.VariableDeclarationKind.Const,
-      declarations: [
-        {
-          name: "dateInterceptor",
-          type: "HttpInterceptorFn",
-          initializer: "dateInterceptorWithRegex()"
-        }
-      ],
-      leadingTrivia: `/**
- * Functional date interceptor using the default ISO_DATE_REGEX.
- * Use dateInterceptorWithRegex(...) to customize the pattern.
- */
-`
     });
     sourceFile.addClass({
       name: "DateInterceptor",
@@ -2075,7 +2025,14 @@ var DateTransformerGenerator = class {
           ],
           returnType: "Observable<HttpEvent<any>>",
           statements: `
-    return next.handle(req).pipe(map((event) => transformDateResponse(event, this.dateRegex)));`
+    return next.handle(req).pipe(
+        map(event => {
+            if (event instanceof HttpResponse && event.body) {
+                return event.clone({ body: transformDates(event.body, this.dateRegex) });
+            }
+            return event;
+        })
+    );`
         }
       ]
     });
@@ -2156,14 +2113,13 @@ var ProviderGenerator = class {
     });
     sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
     const basePathTokenName = getBasePathTokenName(this.clientName);
-    const interceptorFnsTokenName = getInterceptorFnsTokenName(this.clientName);
-    const baseInterceptorClassName = getBaseInterceptorClassName(this.clientName);
+    const interceptorsTokenName = getInterceptorsTokenName(this.clientName);
+    const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
     sourceFile.addImportDeclarations([
       {
         namedImports: [
           "EnvironmentProviders",
           "Provider",
-          "inject",
           "makeEnvironmentProviders"
         ],
         moduleSpecifier: "@angular/core"
@@ -2171,15 +2127,14 @@ var ProviderGenerator = class {
       {
         namedImports: [
           "HTTP_INTERCEPTORS",
-          "HttpInterceptor",
-          "HttpInterceptorFn"
+          "HttpInterceptor"
         ],
         moduleSpecifier: "@angular/common/http"
       },
       {
         namedImports: [
           basePathTokenName,
-          interceptorFnsTokenName
+          interceptorsTokenName
         ],
         moduleSpecifier: "./tokens"
       },
@@ -2193,7 +2148,7 @@ var ProviderGenerator = class {
     if (this.config.options.dateType === "Date") {
       sourceFile.addImportDeclaration({
         namedImports: [
-          "dateInterceptorWithRegex"
+          "DateInterceptor"
         ],
         moduleSpecifier: "./utils/date-transformer"
       });
@@ -2207,50 +2162,24 @@ var ProviderGenerator = class {
         ]
       },
       {
-        name: "interceptors",
-        type: "(new (...args: any[]) => HttpInterceptor)[]",
-        hasQuestionToken: true,
-        docs: [
-          "Class-based HTTP interceptors to apply to this client.",
-          "Classes are resolved through DI when provided; classes that are not",
-          "provided anywhere are instantiated without constructor arguments, so",
-          "classes with required dependencies must be registered as providers."
-        ]
-      },
-      {
-        name: "interceptorFns",
-        type: "HttpInterceptorFn[]",
+        name: "enableDateTransform",
+        type: "boolean",
         hasQuestionToken: true,
         docs: [
-          "Functional HTTP interceptors to apply to this client. Run after class-based interceptors."
+          "Enable automatic date transformation (default: true)"
         ]
       },
       {
-        name: "registerDiInterceptor",
-        type: "boolean",
+        name: "interceptors",
+        type: "(new (...args: HttpInterceptor[]) => HttpInterceptor)[]",
         hasQuestionToken: true,
         docs: [
-          "Register the class-based interceptor on HTTP_INTERCEPTORS (default: true).",
-          "Set to false when your app needs withInterceptorsFromDi() for its own",
-          "interceptors but this client's chain is registered functionally via",
-          "withInterceptors([...]) \u2014 otherwise the chain would run twice.",
-          "",
-          "WARNING: with false you MUST register the functional interceptor yourself",
-          "(provideHttpClient(withInterceptors([...]))); if neither variant is",
-          "registered, this client's entire chain (date transform, interceptors,",
-          "interceptorFns) silently does nothing."
+          "Array of HTTP interceptor classes to apply to this client"
         ]
       }
     ];
     if (this.config.options.dateType === "Date") {
       configProperties.push({
-        name: "enableDateTransform",
-        type: "boolean",
-        hasQuestionToken: true,
-        docs: [
-          "Enable automatic date transformation (default: true)"
-        ]
-      }, {
         name: "dateTransformRegex",
         type: "RegExp",
         hasQuestionToken: true,
@@ -2268,25 +2197,14 @@ var ProviderGenerator = class {
       ],
       properties: configProperties
     });
-    this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorFnsTokenName, baseInterceptorClassName);
+    this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName);
     sourceFile.formatText();
     sourceFile.saveSync();
   }
-  addMainProviderFunction(sourceFile, basePathTokenName, interceptorFnsTokenName, baseInterceptorClassName) {
+  addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName) {
     const hasDateInterceptor = this.config.options.dateType === "Date";
     const functionName = `provide${this.capitalizeFirst(this.clientName)}Client`;
     const configTypeName = `${this.capitalizeFirst(this.clientName)}Config`;
-    const interceptorFnName = getClientInterceptorFnName(this.clientName);
-    const dateInterceptorBlock = hasDateInterceptor ? `
-            // Date interceptor first: it runs first on requests (a no-op) and, being
-            // outermost, its response transform applies last \u2014 the other client
-            // interceptors see the raw body; only the service sees Date instances
-            if (config.enableDateTransform !== false) {
-                interceptorFns.push(dateInterceptorWithRegex(config.dateTransformRegex));
-            }
-` : `
-            // Date transformation not available (dateType: 'string' was used in generation)
-`;
     const functionBody = `
 const providers: Provider[] = [
     // Base path token for this client
@@ -2294,36 +2212,38 @@ const providers: Provider[] = [
         provide: ${basePathTokenName},
         useValue: config.basePath
     },
-    // This client's interceptor chain, normalized to functional interceptors
+    // Base interceptor that handles client-specific interceptors
     {
-        provide: ${interceptorFnsTokenName},
-        useFactory: (): HttpInterceptorFn[] => {
-            const interceptorFns: HttpInterceptorFn[] = [];
-${dateInterceptorBlock}
-            // Class-based interceptors are resolved through DI when provided,
-            // otherwise instantiated directly, and adapted to functional form
-            for (const interceptorClass of config.interceptors ?? []) {
-                const instance = inject(interceptorClass, { optional: true }) ?? new interceptorClass();
-                interceptorFns.push((req, next) => instance.intercept(req, { handle: next }));
-            }
-
-            interceptorFns.push(...(config.interceptorFns ?? []));
-
-            return interceptorFns;
-        }
+        provide: HTTP_INTERCEPTORS,
+        useClass: ${baseInterceptorClassName},
+        multi: true
     }
 ];
 
-// Class-based registration of the scoped chain; only active together with
-// withInterceptorsFromDi(). Disable it (registerDiInterceptor: false) when the
-// app uses withInterceptorsFromDi() for its own interceptors but this client's
-// chain is registered via withInterceptors([${interceptorFnName}]) \u2014
-// otherwise the chain would run twice.
-if (config.registerDiInterceptor !== false) {
+// 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(config.dateTransformRegex));
+    }` : `// Date transformation not available (dateType: 'string' was used in generation)`}
+    
     providers.push({
-        provide: HTTP_INTERCEPTORS,
-        useClass: ${baseInterceptorClassName},
-        multi: true
+        provide: ${interceptorsTokenName},
+        useValue: interceptorInstances
+    });
+} ${hasDateInterceptor ? `else if (config.enableDateTransform !== false) {
+    // Only date interceptor enabled
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: [new DateInterceptor(config.dateTransformRegex)]
+    });
+}` : ``} else {
+    // No interceptors
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: []
     });
 }
 
@@ -2337,17 +2257,13 @@ return makeEnvironmentProviders(providers);`;
         "@example",
         "```typescript",
         "// In your app.config.ts",
-        "import { provideHttpClient, withInterceptors } from '@angular/common/http';",
         `import { ${functionName} } from './api/providers';`,
-        `import { ${interceptorFnName} } from './api/utils/base-interceptor';`,
         "",
         "export const appConfig: ApplicationConfig = {",
         "  providers: [",
-        `    provideHttpClient(withInterceptors([${interceptorFnName}])),`,
         `    ${functionName}({`,
         "      basePath: 'https://api.example.com',",
-        "      interceptors: [AuthInterceptor], // Classes, not instances",
-        "      interceptorFns: [loggingInterceptor] // Functional interceptors",
+        "      interceptors: [AuthInterceptor, LoggingInterceptor] // Classes, not instances",
         "    }),",
         "    // other providers...",
         "  ]",
@@ -2407,28 +2323,23 @@ var BaseInterceptorGenerator = class {
       overwrite: true
     });
     sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(this.#clientName));
-    const interceptorFnsTokenName = getInterceptorFnsTokenName(this.#clientName);
+    const interceptorsTokenName = getInterceptorsTokenName(this.#clientName);
     const clientContextTokenName = getClientContextTokenName(this.#clientName);
-    const interceptorFnName = getClientInterceptorFnName(this.#clientName);
     sourceFile.addImportDeclarations([
       {
         namedImports: [
           "HttpContextToken",
           "HttpEvent",
           "HttpHandler",
-          "HttpHandlerFn",
           "HttpInterceptor",
-          "HttpInterceptorFn",
           "HttpRequest"
         ],
         moduleSpecifier: "@angular/common/http"
       },
       {
         namedImports: [
-          "EnvironmentInjector",
           "inject",
-          "Injectable",
-          "runInInjectionContext"
+          "Injectable"
         ],
         moduleSpecifier: "@angular/core"
       },
@@ -2441,80 +2352,14 @@ var BaseInterceptorGenerator = class {
       {
         namedImports: [
           clientContextTokenName,
-          interceptorFnsTokenName
+          interceptorsTokenName
         ],
         moduleSpecifier: "../tokens"
       }
     ]);
-    sourceFile.addFunction({
-      name: "interceptClientRequest",
-      parameters: [
-        {
-          name: "req",
-          type: "HttpRequest<any>"
-        },
-        {
-          name: "next",
-          type: "HttpHandlerFn"
-        },
-        {
-          name: "interceptorFns",
-          type: "HttpInterceptorFn[]"
-        },
-        {
-          name: "clientContextToken",
-          type: "HttpContextToken<string>"
-        },
-        {
-          name: "injector",
-          type: "EnvironmentInjector"
-        }
-      ],
-      returnType: "Observable<HttpEvent<any>>",
-      statements: `
-    // Check if this request belongs to this client using HttpContext
-    if (!req.context.has(clientContextToken)) {
-      // This request doesn't belong to this client, pass it through
-      return next(req);
-    }
-
-    // Compose right-to-left so the interceptors run in array order. Each fn is
-    // invoked inside an injection context, mirroring Angular's own interceptor
-    // chain, so client interceptors can use inject().
-    const chain = interceptorFns.reduceRight<HttpHandlerFn>(
-      (nextFn, interceptorFn) => (request) => runInInjectionContext(injector, () => interceptorFn(request, nextFn)),
-      next
-    );
-
-    return chain(req);`
-    });
-    sourceFile.addVariableStatement({
-      isExported: true,
-      declarationKind: import_ts_morph7.VariableDeclarationKind.Const,
-      declarations: [
-        {
-          name: interceptorFnName,
-          type: "HttpInterceptorFn",
-          initializer: `(req, next) =>
-  interceptClientRequest(req, next, inject(${interceptorFnsTokenName}), ${clientContextTokenName}, inject(EnvironmentInjector))`
-        }
-      ],
-      leadingTrivia: `/**
- * Functional interceptor running the ${this.#clientName} client's scoped interceptor chain.
- * Register it once with \`provideHttpClient(withInterceptors([${interceptorFnName}]))\`.
- * If your app also uses \`withInterceptorsFromDi()\`, pass \`registerDiInterceptor: false\`
- * to the client's provide function \u2014 otherwise the class-based registration it adds
- * would run the same chain twice.
- */
-`
-    });
     sourceFile.addClass({
-      name: getBaseInterceptorClassName(this.#clientName),
+      name: `${this.capitalizeFirst(this.#clientName)}BaseInterceptor`,
       isExported: true,
-      docs: [
-        `Class-based equivalent of \`${interceptorFnName}\` for DI registration via
-\`withInterceptorsFromDi()\`. Register exactly one of the two variants.`
-      ],
       decorators: [
         {
           name: "Injectable",
@@ -2526,11 +2371,11 @@ var BaseInterceptorGenerator = class {
       ],
       properties: [
         {
-          name: "interceptorFns",
-          type: "HttpInterceptorFn[]",
+          name: "httpInterceptors",
+          type: "HttpInterceptor[]",
           scope: import_ts_morph7.Scope.Private,
           isReadonly: true,
-          initializer: `inject(${interceptorFnsTokenName})`
+          initializer: `inject(${interceptorsTokenName})`
         },
         {
           name: "clientContextToken",
@@ -2538,13 +2383,6 @@ var BaseInterceptorGenerator = class {
           scope: import_ts_morph7.Scope.Private,
           isReadonly: true,
           initializer: clientContextTokenName
-        },
-        {
-          name: "injector",
-          type: "EnvironmentInjector",
-          scope: import_ts_morph7.Scope.Private,
-          isReadonly: true,
-          initializer: "inject(EnvironmentInjector)"
         }
       ],
       methods: [
@@ -2562,13 +2400,32 @@ var BaseInterceptorGenerator = class {
           ],
           returnType: "Observable<HttpEvent<any>>",
           statements: `
-    return interceptClientRequest(req, (request) => next.handle(request), this.interceptorFns, this.clientContextToken, this.injector);`
+    // Check if this request belongs to this client using HttpContext
+    if (!req.context.has(this.clientContextToken)) {
+      // This request doesn't belong to this client, pass it through
+      return next.handle(req);
+    }
+
+    // Apply client-specific interceptors in reverse order
+    let handler = next;
+
+    handler = this.httpInterceptors.reduceRight(
+      (next, interceptor) => ({
+        handle: (request: HttpRequest<any>) => interceptor.intercept(request, next)
+      }),
+      handler
+    );
+
+    return handler.handle(req);`
         }
       ]
     });
     sourceFile.formatText();
     sourceFile.saveSync();
   }
+  capitalizeFirst(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+  }
 };
 
 // src/lib/generators/utility/http-params-builder.generator.ts

package/index.d.ts

@@ -685,21 +685,13 @@ declare function listGeneratedFileNames(project: Project, directoryPath: string,
 declare function getClientContextTokenName(clientName?: string): string;
 /** Token providing the API base path for the client. */
 declare function getBasePathTokenName(clientName?: string): string;
-/** Token carrying the client's interceptor chain, normalized to `HttpInterceptorFn[]`. */
-declare function getInterceptorFnsTokenName(clientName?: string): string;
+/** Token carrying the client's interceptor chain. */
+declare function getInterceptorsTokenName(clientName?: string): string;
 
 /** Class name of a generated service ("Role" → "RoleService", or decorated). */
 declare function getServiceClassName(controllerName: string, naming?: NameDecoration): string;
 /** Class name of a generated httpResource class ("Role" → "RoleResource", or decorated). */
 declare function getResourceClassName(controllerName: string, naming?: NameDecoration): string;
-/**
- * Class name of the generated scoped interceptor ("users" → "UsersBaseInterceptor").
- * Deliberately capitalizes only the first character (not pascalCase) to keep
- * parity with the client-name handling of the token helpers.
- */
-declare function getBaseInterceptorClassName(clientName?: string): string;
-/** Identifier of the generated functional scoped interceptor ("users" → "usersClientInterceptor"). */
-declare function getClientInterceptorFnName(clientName?: string): string;
 /**
  * TypeScript identifier of a schema-derived model type. Used both where
  * models are declared (models/index.ts) and where they are referenced
@@ -880,4 +872,4 @@ declare class ConfigValidationError extends Error {
 }
 declare function validateGeneratorConfig(config: unknown): asserts config is GeneratorConfig;
 
-export { BASE_INTERCEPTOR_HEADER_COMMENT, CONTENT_TYPES, ConfigValidationError, type EnumValueObject, type GenerationPhase, type GenerationResult, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type HeadersEmitOptions, type IPluginGenerator, type IPluginGeneratorClass, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenOptions, type MethodGenerationContext, type NameDecoration, type NamingOptions, NgOpenApiError, type NgOpenapiClientConfig, type NormalizedOperation, type NormalizedSpec, type OpenApiSecurityScheme, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, type PluginGeneratorContext, REQUEST_PARAMS_GENERATOR_HEADER_COMMENT, type Reporter, type RequestBody, type ResponseKind, type ResponseTypeInfo, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type ServiceDecoratorEmit, type ServiceDecoratorEmitOptions, SpecLoadError, SpecParseError, type SpecVersion, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeGenOptions, type TypeMappingConfig, type TypeSchema, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT, camelCase, defineConfig, emitDefaultHeadersMerge, emitHeaders, emitQueryParams, emitResponseTypeOption, emitServiceDecorator, emitSignalAwareQueryParams, emitUrlConstruction, emitUrlExpression, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBaseInterceptorClassName, getBasePathTokenName, getClientContextTokenName, getClientInterceptorFnName, getInterceptorFnsTokenName, getModelTypeName, getRequestBodyType, getResourceClassName, getResponseInfoFromResponse, getResponseType, getResponseTypeFromResponse, getServiceClassName, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, isUrl, joinRequestOptionEntries, kebabCase, listGeneratedFileNames, normalizeSchema, normalizeSpec, nullableType, pascalCase, pascalCaseForEnums, plainParamValue, screamingSnakeCase, signalAwareParamValue, validateGeneratorConfig, validateInput };
+export { BASE_INTERCEPTOR_HEADER_COMMENT, CONTENT_TYPES, ConfigValidationError, type EnumValueObject, type GenerationPhase, type GenerationResult, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type HeadersEmitOptions, type IPluginGenerator, type IPluginGeneratorClass, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenOptions, type MethodGenerationContext, type NameDecoration, type NamingOptions, NgOpenApiError, type NgOpenapiClientConfig, type NormalizedOperation, type NormalizedSpec, type OpenApiSecurityScheme, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, type PluginGeneratorContext, REQUEST_PARAMS_GENERATOR_HEADER_COMMENT, type Reporter, type RequestBody, type ResponseKind, type ResponseTypeInfo, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type ServiceDecoratorEmit, type ServiceDecoratorEmitOptions, SpecLoadError, SpecParseError, type SpecVersion, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeGenOptions, type TypeMappingConfig, type TypeSchema, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT, camelCase, defineConfig, emitDefaultHeadersMerge, emitHeaders, emitQueryParams, emitResponseTypeOption, emitServiceDecorator, emitSignalAwareQueryParams, emitUrlConstruction, emitUrlExpression, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getInterceptorsTokenName, getModelTypeName, getRequestBodyType, getResourceClassName, getResponseInfoFromResponse, getResponseType, getResponseTypeFromResponse, getServiceClassName, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, isUrl, joinRequestOptionEntries, kebabCase, listGeneratedFileNames, normalizeSchema, normalizeSpec, nullableType, pascalCase, pascalCaseForEnums, plainParamValue, screamingSnakeCase, signalAwareParamValue, validateGeneratorConfig, validateInput };

package/index.js

@@ -106,11 +106,9 @@ __export(index_exports, {
   extractPaths: () => extractPaths,
   generateFromConfig: () => generateFromConfig,
   generateParseRequestTypeParams: () => generateParseRequestTypeParams,
-  getBaseInterceptorClassName: () => getBaseInterceptorClassName,
   getBasePathTokenName: () => getBasePathTokenName,
   getClientContextTokenName: () => getClientContextTokenName,
-  getClientInterceptorFnName: () => getClientInterceptorFnName,
-  getInterceptorFnsTokenName: () => getInterceptorFnsTokenName,
+  getInterceptorsTokenName: () => getInterceptorsTokenName,
   getModelTypeName: () => getModelTypeName,
   getRequestBodyType: () => getRequestBodyType,
   getResourceClassName: () => getResourceClassName,
@@ -389,14 +387,6 @@ function getResourceClassName(controllerName, naming) {
   return decorate(pascalCase(controllerName), "Resource", naming);
 }
 __name(getResourceClassName, "getResourceClassName");
-function getBaseInterceptorClassName(clientName = "default") {
-  return `${clientName.charAt(0).toUpperCase()}${clientName.slice(1)}BaseInterceptor`;
-}
-__name(getBaseInterceptorClassName, "getBaseInterceptorClassName");
-function getClientInterceptorFnName(clientName = "default") {
-  return `${clientName.charAt(0).toLowerCase()}${clientName.slice(1)}ClientInterceptor`;
-}
-__name(getClientInterceptorFnName, "getClientInterceptorFnName");
 function getModelTypeName(rawName, naming) {
   return decorate(pascalCaseForEnums(rawName), "", naming);
 }
@@ -1025,11 +1015,11 @@ function getBasePathTokenName(clientName = "default") {
   return `BASE_PATH_${clientSuffix}`;
 }
 __name(getBasePathTokenName, "getBasePathTokenName");
-function getInterceptorFnsTokenName(clientName = "default") {
+function getInterceptorsTokenName(clientName = "default") {
   const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
-  return `HTTP_INTERCEPTOR_FNS_${clientSuffix}`;
+  return `HTTP_INTERCEPTORS_${clientSuffix}`;
 }
-__name(getInterceptorFnsTokenName, "getInterceptorFnsTokenName");
+__name(getInterceptorsTokenName, "getInterceptorsTokenName");
 
 // ../shared/src/utils/functions/duplicate-function-name.ts
 function hasDuplicateFunctionNames(arr) {
@@ -1836,15 +1826,15 @@ var _TokenGenerator = class _TokenGenerator {
       },
       {
         namedImports: [
-          "HttpInterceptorFn",
+          "HttpInterceptor",
           "HttpContextToken"
         ],
         moduleSpecifier: "@angular/common/http"
       }
     ]);
-    const basePathTokenName = getBasePathTokenName(this.clientName);
-    const interceptorFnsTokenName = getInterceptorFnsTokenName(this.clientName);
-    const clientContextTokenName = getClientContextTokenName(this.clientName);
+    const basePathTokenName = this.getBasePathTokenName();
+    const interceptorsTokenName = this.getInterceptorsTokenName();
+    const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph5.VariableDeclarationKind.Const,
@@ -1867,16 +1857,15 @@ var _TokenGenerator = class _TokenGenerator {
       declarationKind: import_ts_morph5.VariableDeclarationKind.Const,
       declarations: [
         {
-          name: interceptorFnsTokenName,
-          initializer: `new InjectionToken<HttpInterceptorFn[]>('${interceptorFnsTokenName}', {
+          name: interceptorsTokenName,
+          initializer: `new InjectionToken<HttpInterceptor[]>('${interceptorsTokenName}', {
   providedIn: 'root',
   factory: () => [], // Default empty array
 })`
         }
       ],
       leadingTrivia: `/**
- * Injection token carrying the ${this.clientName} client's scoped interceptor chain,
- * normalized to functional interceptors. Populated by the client's provide function.
+ * Injection token for the ${this.clientName} client HTTP interceptor instances
  */
 `
     });
@@ -1927,6 +1916,18 @@ var _TokenGenerator = class _TokenGenerator {
     sourceFile.formatText();
     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}`;
+  }
+  getClientContextTokenName() {
+    const clientSuffix = this.clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    return `CLIENT_CONTEXT_TOKEN_${clientSuffix}`;
+  }
 };
 __name(_TokenGenerator, "TokenGenerator");
 var TokenGenerator = _TokenGenerator;
@@ -2090,7 +2091,6 @@ var _DateTransformerGenerator = class _DateTransformerGenerator {
           "HttpEvent",
           "HttpHandler",
           "HttpInterceptor",
-          "HttpInterceptorFn",
           "HttpRequest",
           "HttpResponse"
         ],
@@ -2162,58 +2162,6 @@ var _DateTransformerGenerator = class _DateTransformerGenerator {
     }
 
     return obj;`
-    });
-    sourceFile.addFunction({
-      name: "transformDateResponse",
-      parameters: [
-        {
-          name: "event",
-          type: "HttpEvent<any>"
-        },
-        {
-          name: "dateRegex",
-          type: "RegExp"
-        }
-      ],
-      returnType: "HttpEvent<any>",
-      statements: `
-    if (event instanceof HttpResponse && event.body) {
-        return event.clone({ body: transformDates(event.body, dateRegex) });
-    }
-    return event;`
-    });
-    sourceFile.addFunction({
-      name: "dateInterceptorWithRegex",
-      isExported: true,
-      docs: [
-        "Builds a functional date interceptor for `provideHttpClient(withInterceptors([...]))`.\n@param dateRegex Optional override for the pattern used to detect ISO date strings."
-      ],
-      parameters: [
-        {
-          name: "dateRegex",
-          type: "RegExp",
-          initializer: "ISO_DATE_REGEX"
-        }
-      ],
-      returnType: "HttpInterceptorFn",
-      statements: `
-    return (req, next) => next(req).pipe(map((event) => transformDateResponse(event, dateRegex)));`
-    });
-    sourceFile.addVariableStatement({
-      isExported: true,
-      declarationKind: import_ts_morph6.VariableDeclarationKind.Const,
-      declarations: [
-        {
-          name: "dateInterceptor",
-          type: "HttpInterceptorFn",
-          initializer: "dateInterceptorWithRegex()"
-        }
-      ],
-      leadingTrivia: `/**
- * Functional date interceptor using the default ISO_DATE_REGEX.
- * Use dateInterceptorWithRegex(...) to customize the pattern.
- */
-`
     });
     sourceFile.addClass({
       name: "DateInterceptor",
@@ -2258,7 +2206,14 @@ var _DateTransformerGenerator = class _DateTransformerGenerator {
           ],
           returnType: "Observable<HttpEvent<any>>",
           statements: `
-    return next.handle(req).pipe(map((event) => transformDateResponse(event, this.dateRegex)));`
+    return next.handle(req).pipe(
+        map(event => {
+            if (event instanceof HttpResponse && event.body) {
+                return event.clone({ body: transformDates(event.body, this.dateRegex) });
+            }
+            return event;
+        })
+    );`
         }
       ]
     });
@@ -2337,14 +2292,13 @@ var _ProviderGenerator = class _ProviderGenerator {
     });
     sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
     const basePathTokenName = getBasePathTokenName(this.clientName);
-    const interceptorFnsTokenName = getInterceptorFnsTokenName(this.clientName);
-    const baseInterceptorClassName = getBaseInterceptorClassName(this.clientName);
+    const interceptorsTokenName = getInterceptorsTokenName(this.clientName);
+    const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
     sourceFile.addImportDeclarations([
       {
         namedImports: [
           "EnvironmentProviders",
           "Provider",
-          "inject",
           "makeEnvironmentProviders"
         ],
         moduleSpecifier: "@angular/core"
@@ -2352,15 +2306,14 @@ var _ProviderGenerator = class _ProviderGenerator {
       {
         namedImports: [
           "HTTP_INTERCEPTORS",
-          "HttpInterceptor",
-          "HttpInterceptorFn"
+          "HttpInterceptor"
         ],
         moduleSpecifier: "@angular/common/http"
       },
       {
         namedImports: [
           basePathTokenName,
-          interceptorFnsTokenName
+          interceptorsTokenName
         ],
         moduleSpecifier: "./tokens"
       },
@@ -2374,7 +2327,7 @@ var _ProviderGenerator = class _ProviderGenerator {
     if (this.config.options.dateType === "Date") {
       sourceFile.addImportDeclaration({
         namedImports: [
-          "dateInterceptorWithRegex"
+          "DateInterceptor"
         ],
         moduleSpecifier: "./utils/date-transformer"
       });
@@ -2388,50 +2341,24 @@ var _ProviderGenerator = class _ProviderGenerator {
         ]
       },
       {
-        name: "interceptors",
-        type: "(new (...args: any[]) => HttpInterceptor)[]",
-        hasQuestionToken: true,
-        docs: [
-          "Class-based HTTP interceptors to apply to this client.",
-          "Classes are resolved through DI when provided; classes that are not",
-          "provided anywhere are instantiated without constructor arguments, so",
-          "classes with required dependencies must be registered as providers."
-        ]
-      },
-      {
-        name: "interceptorFns",
-        type: "HttpInterceptorFn[]",
+        name: "enableDateTransform",
+        type: "boolean",
         hasQuestionToken: true,
         docs: [
-          "Functional HTTP interceptors to apply to this client. Run after class-based interceptors."
+          "Enable automatic date transformation (default: true)"
         ]
       },
       {
-        name: "registerDiInterceptor",
-        type: "boolean",
+        name: "interceptors",
+        type: "(new (...args: HttpInterceptor[]) => HttpInterceptor)[]",
         hasQuestionToken: true,
         docs: [
-          "Register the class-based interceptor on HTTP_INTERCEPTORS (default: true).",
-          "Set to false when your app needs withInterceptorsFromDi() for its own",
-          "interceptors but this client's chain is registered functionally via",
-          "withInterceptors([...]) \u2014 otherwise the chain would run twice.",
-          "",
-          "WARNING: with false you MUST register the functional interceptor yourself",
-          "(provideHttpClient(withInterceptors([...]))); if neither variant is",
-          "registered, this client's entire chain (date transform, interceptors,",
-          "interceptorFns) silently does nothing."
+          "Array of HTTP interceptor classes to apply to this client"
         ]
       }
     ];
     if (this.config.options.dateType === "Date") {
       configProperties.push({
-        name: "enableDateTransform",
-        type: "boolean",
-        hasQuestionToken: true,
-        docs: [
-          "Enable automatic date transformation (default: true)"
-        ]
-      }, {
         name: "dateTransformRegex",
         type: "RegExp",
         hasQuestionToken: true,
@@ -2449,25 +2376,14 @@ var _ProviderGenerator = class _ProviderGenerator {
       ],
       properties: configProperties
     });
-    this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorFnsTokenName, baseInterceptorClassName);
+    this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName);
     sourceFile.formatText();
     sourceFile.saveSync();
   }
-  addMainProviderFunction(sourceFile, basePathTokenName, interceptorFnsTokenName, baseInterceptorClassName) {
+  addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName) {
     const hasDateInterceptor = this.config.options.dateType === "Date";
     const functionName = `provide${this.capitalizeFirst(this.clientName)}Client`;
     const configTypeName = `${this.capitalizeFirst(this.clientName)}Config`;
-    const interceptorFnName = getClientInterceptorFnName(this.clientName);
-    const dateInterceptorBlock = hasDateInterceptor ? `
-            // Date interceptor first: it runs first on requests (a no-op) and, being
-            // outermost, its response transform applies last \u2014 the other client
-            // interceptors see the raw body; only the service sees Date instances
-            if (config.enableDateTransform !== false) {
-                interceptorFns.push(dateInterceptorWithRegex(config.dateTransformRegex));
-            }
-` : `
-            // Date transformation not available (dateType: 'string' was used in generation)
-`;
     const functionBody = `
 const providers: Provider[] = [
     // Base path token for this client
@@ -2475,36 +2391,38 @@ const providers: Provider[] = [
         provide: ${basePathTokenName},
         useValue: config.basePath
     },
-    // This client's interceptor chain, normalized to functional interceptors
+    // Base interceptor that handles client-specific interceptors
     {
-        provide: ${interceptorFnsTokenName},
-        useFactory: (): HttpInterceptorFn[] => {
-            const interceptorFns: HttpInterceptorFn[] = [];
-${dateInterceptorBlock}
-            // Class-based interceptors are resolved through DI when provided,
-            // otherwise instantiated directly, and adapted to functional form
-            for (const interceptorClass of config.interceptors ?? []) {
-                const instance = inject(interceptorClass, { optional: true }) ?? new interceptorClass();
-                interceptorFns.push((req, next) => instance.intercept(req, { handle: next }));
-            }
-
-            interceptorFns.push(...(config.interceptorFns ?? []));
-
-            return interceptorFns;
-        }
+        provide: HTTP_INTERCEPTORS,
+        useClass: ${baseInterceptorClassName},
+        multi: true
     }
 ];
 
-// Class-based registration of the scoped chain; only active together with
-// withInterceptorsFromDi(). Disable it (registerDiInterceptor: false) when the
-// app uses withInterceptorsFromDi() for its own interceptors but this client's
-// chain is registered via withInterceptors([${interceptorFnName}]) \u2014
-// otherwise the chain would run twice.
-if (config.registerDiInterceptor !== false) {
+// 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(config.dateTransformRegex));
+    }` : `// Date transformation not available (dateType: 'string' was used in generation)`}
+    
     providers.push({
-        provide: HTTP_INTERCEPTORS,
-        useClass: ${baseInterceptorClassName},
-        multi: true
+        provide: ${interceptorsTokenName},
+        useValue: interceptorInstances
+    });
+} ${hasDateInterceptor ? `else if (config.enableDateTransform !== false) {
+    // Only date interceptor enabled
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: [new DateInterceptor(config.dateTransformRegex)]
+    });
+}` : ``} else {
+    // No interceptors
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: []
     });
 }
 
@@ -2518,17 +2436,13 @@ return makeEnvironmentProviders(providers);`;
         "@example",
         "```typescript",
         "// In your app.config.ts",
-        "import { provideHttpClient, withInterceptors } from '@angular/common/http';",
         `import { ${functionName} } from './api/providers';`,
-        `import { ${interceptorFnName} } from './api/utils/base-interceptor';`,
         "",
         "export const appConfig: ApplicationConfig = {",
         "  providers: [",
-        `    provideHttpClient(withInterceptors([${interceptorFnName}])),`,
         `    ${functionName}({`,
         "      basePath: 'https://api.example.com',",
-        "      interceptors: [AuthInterceptor], // Classes, not instances",
-        "      interceptorFns: [loggingInterceptor] // Functional interceptors",
+        "      interceptors: [AuthInterceptor, LoggingInterceptor] // Classes, not instances",
         "    }),",
         "    // other providers...",
         "  ]",
@@ -2588,28 +2502,23 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
       overwrite: true
     });
     sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(__privateGet(this, _clientName)));
-    const interceptorFnsTokenName = getInterceptorFnsTokenName(__privateGet(this, _clientName));
+    const interceptorsTokenName = getInterceptorsTokenName(__privateGet(this, _clientName));
     const clientContextTokenName = getClientContextTokenName(__privateGet(this, _clientName));
-    const interceptorFnName = getClientInterceptorFnName(__privateGet(this, _clientName));
     sourceFile.addImportDeclarations([
       {
         namedImports: [
           "HttpContextToken",
           "HttpEvent",
           "HttpHandler",
-          "HttpHandlerFn",
           "HttpInterceptor",
-          "HttpInterceptorFn",
           "HttpRequest"
         ],
         moduleSpecifier: "@angular/common/http"
       },
       {
         namedImports: [
-          "EnvironmentInjector",
           "inject",
-          "Injectable",
-          "runInInjectionContext"
+          "Injectable"
         ],
         moduleSpecifier: "@angular/core"
       },
@@ -2622,80 +2531,14 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
       {
         namedImports: [
           clientContextTokenName,
-          interceptorFnsTokenName
+          interceptorsTokenName
         ],
         moduleSpecifier: "../tokens"
       }
     ]);
-    sourceFile.addFunction({
-      name: "interceptClientRequest",
-      parameters: [
-        {
-          name: "req",
-          type: "HttpRequest<any>"
-        },
-        {
-          name: "next",
-          type: "HttpHandlerFn"
-        },
-        {
-          name: "interceptorFns",
-          type: "HttpInterceptorFn[]"
-        },
-        {
-          name: "clientContextToken",
-          type: "HttpContextToken<string>"
-        },
-        {
-          name: "injector",
-          type: "EnvironmentInjector"
-        }
-      ],
-      returnType: "Observable<HttpEvent<any>>",
-      statements: `
-    // Check if this request belongs to this client using HttpContext
-    if (!req.context.has(clientContextToken)) {
-      // This request doesn't belong to this client, pass it through
-      return next(req);
-    }
-
-    // Compose right-to-left so the interceptors run in array order. Each fn is
-    // invoked inside an injection context, mirroring Angular's own interceptor
-    // chain, so client interceptors can use inject().
-    const chain = interceptorFns.reduceRight<HttpHandlerFn>(
-      (nextFn, interceptorFn) => (request) => runInInjectionContext(injector, () => interceptorFn(request, nextFn)),
-      next
-    );
-
-    return chain(req);`
-    });
-    sourceFile.addVariableStatement({
-      isExported: true,
-      declarationKind: import_ts_morph7.VariableDeclarationKind.Const,
-      declarations: [
-        {
-          name: interceptorFnName,
-          type: "HttpInterceptorFn",
-          initializer: `(req, next) =>
-  interceptClientRequest(req, next, inject(${interceptorFnsTokenName}), ${clientContextTokenName}, inject(EnvironmentInjector))`
-        }
-      ],
-      leadingTrivia: `/**
- * Functional interceptor running the ${__privateGet(this, _clientName)} client's scoped interceptor chain.
- * Register it once with \`provideHttpClient(withInterceptors([${interceptorFnName}]))\`.
- * If your app also uses \`withInterceptorsFromDi()\`, pass \`registerDiInterceptor: false\`
- * to the client's provide function \u2014 otherwise the class-based registration it adds
- * would run the same chain twice.
- */
-`
-    });
     sourceFile.addClass({
-      name: getBaseInterceptorClassName(__privateGet(this, _clientName)),
+      name: `${this.capitalizeFirst(__privateGet(this, _clientName))}BaseInterceptor`,
       isExported: true,
-      docs: [
-        `Class-based equivalent of \`${interceptorFnName}\` for DI registration via
-\`withInterceptorsFromDi()\`. Register exactly one of the two variants.`
-      ],
       decorators: [
         {
           name: "Injectable",
@@ -2707,11 +2550,11 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
       ],
       properties: [
         {
-          name: "interceptorFns",
-          type: "HttpInterceptorFn[]",
+          name: "httpInterceptors",
+          type: "HttpInterceptor[]",
           scope: import_ts_morph7.Scope.Private,
           isReadonly: true,
-          initializer: `inject(${interceptorFnsTokenName})`
+          initializer: `inject(${interceptorsTokenName})`
         },
         {
           name: "clientContextToken",
@@ -2719,13 +2562,6 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
           scope: import_ts_morph7.Scope.Private,
           isReadonly: true,
           initializer: clientContextTokenName
-        },
-        {
-          name: "injector",
-          type: "EnvironmentInjector",
-          scope: import_ts_morph7.Scope.Private,
-          isReadonly: true,
-          initializer: "inject(EnvironmentInjector)"
         }
       ],
       methods: [
@@ -2743,13 +2579,32 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
           ],
           returnType: "Observable<HttpEvent<any>>",
           statements: `
-    return interceptClientRequest(req, (request) => next.handle(request), this.interceptorFns, this.clientContextToken, this.injector);`
+    // Check if this request belongs to this client using HttpContext
+    if (!req.context.has(this.clientContextToken)) {
+      // This request doesn't belong to this client, pass it through
+      return next.handle(req);
+    }
+
+    // Apply client-specific interceptors in reverse order
+    let handler = next;
+
+    handler = this.httpInterceptors.reduceRight(
+      (next, interceptor) => ({
+        handle: (request: HttpRequest<any>) => interceptor.intercept(request, next)
+      }),
+      handler
+    );
+
+    return handler.handle(req);`
         }
       ]
     });
     sourceFile.formatText();
     sourceFile.saveSync();
   }
+  capitalizeFirst(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+  }
 };
 _project = new WeakMap();
 _clientName = new WeakMap();
@@ -4037,11 +3892,9 @@ __name(generateFromConfig, "generateFromConfig");
   extractPaths,
   generateFromConfig,
   generateParseRequestTypeParams,
-  getBaseInterceptorClassName,
   getBasePathTokenName,
   getClientContextTokenName,
-  getClientInterceptorFnName,
-  getInterceptorFnsTokenName,
+  getInterceptorsTokenName,
   getModelTypeName,
   getRequestBodyType,
   getResourceClassName,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ng-openapi",
-    "version": "0.3.1-pr-114-feat-functional-client-interceptors-52e79cb.0",
+    "version": "0.3.1",
     "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
     "keywords": [
         "ng-openapi",