ng-openapi 0.0.24-rc.0 → 0.0.25-alpha.0

package/cli.cjs

@@ -7,10 +7,6 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -27,14 +23,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/lib/cli.ts
-var cli_exports = {};
-__export(cli_exports, {
-  generateFromOptions: () => generateFromOptions
-});
-module.exports = __toCommonJS(cli_exports);
 var import_commander = require("commander");
 var path8 = __toESM(require("path"));
 var fs4 = __toESM(require("fs"));
@@ -412,10 +402,10 @@ var TokenGenerator = class {
     __name(this, "TokenGenerator");
   }
   project;
-  config;
-  constructor(project, config) {
+  clientName;
+  constructor(project, clientName = "default") {
     this.project = project;
-    this.config = config;
+    this.clientName = clientName;
   }
   generate(outputDir) {
     const tokensDir = path.join(outputDir, "tokens");
@@ -425,26 +415,27 @@ var TokenGenerator = class {
     });
     sourceFile.addImportDeclaration({
       namedImports: [
-        "InjectionToken"
+        "InjectionToken",
+        "HttpInterceptor"
       ],
       moduleSpecifier: "@angular/core"
     });
-    const clientName = this.config.clientName || "DEFAULT";
-    const upperCaseClientName = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    const basePathTokenName = this.getBasePathTokenName();
+    const interceptorsTokenName = this.getInterceptorsTokenName();
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
       declarations: [
         {
-          name: `${upperCaseClientName}_BASE_PATH`,
-          initializer: `new InjectionToken<string>('${upperCaseClientName}_BASE_PATH', {
+          name: basePathTokenName,
+          initializer: `new InjectionToken<string>('${basePathTokenName}', {
   providedIn: 'root',
-  factory: () => '/api',
+  factory: () => '/api', // Default fallback
 })`
         }
       ],
       leadingTrivia: `/**
- * Base path token for ${clientName} client
+ * Injection token for the ${this.clientName} client base API path
  */
 `
     });
@@ -453,33 +444,44 @@ var TokenGenerator = class {
       declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
       declarations: [
         {
-          name: `${upperCaseClientName}_HTTP_CLIENT`,
-          initializer: `new InjectionToken<HttpClient>('${upperCaseClientName}_HTTP_CLIENT')`
+          name: interceptorsTokenName,
+          initializer: `new InjectionToken<HttpInterceptor[]>('${interceptorsTokenName}', {
+  providedIn: 'root',
+  factory: () => [], // Default empty array
+})`
         }
       ],
       leadingTrivia: `/**
- * HTTP client token for ${clientName} client
+ * Injection token for the ${this.clientName} client HTTP interceptors
  */
 `
     });
-    if (!this.config.clientName) {
+    if (this.clientName === "default") {
       sourceFile.addVariableStatement({
         isExported: true,
         declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
         declarations: [
           {
             name: "BASE_PATH",
-            initializer: `${upperCaseClientName}_BASE_PATH`
+            initializer: basePathTokenName
           }
         ],
         leadingTrivia: `/**
- * @deprecated Use ${upperCaseClientName}_BASE_PATH instead
+ * @deprecated Use ${basePathTokenName} instead
  */
 `
       });
     }
     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}`;
+  }
 };
 
 // src/lib/generators/utility/file-download.generator.ts
@@ -1746,8 +1748,7 @@ var ServiceGenerator = class {
     });
   }
   addImports(sourceFile, usedTypes) {
-    const clientName = this.config.clientName || "DEFAULT";
-    const upperCaseClientName = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    const basePathTokenName = this.getBasePathTokenName();
     sourceFile.addImportDeclarations([
       {
         namedImports: [
@@ -1775,15 +1776,11 @@ var ServiceGenerator = class {
       },
       {
         namedImports: [
-          `${upperCaseClientName}_BASE_PATH`,
-          `${upperCaseClientName}_HTTP_CLIENT`
+          basePathTokenName
         ],
         moduleSpecifier: "../tokens"
       }
     ]);
-    if (!this.config.clientName) {
-      sourceFile.getImportDeclaration("../tokens")?.addNamedImport("BASE_PATH");
-    }
     if (usedTypes.size > 0) {
       sourceFile.addImportDeclaration({
         namedImports: Array.from(usedTypes).sort(),
@@ -1793,8 +1790,7 @@ var ServiceGenerator = class {
   }
   addServiceClass(sourceFile, controllerName, operations) {
     const className = `${controllerName}Service`;
-    const clientName = this.config.clientName || "DEFAULT";
-    const upperCaseClientName = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    const basePathTokenName = this.getBasePathTokenName();
     sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     const serviceClass = sourceFile.addClass({
       name: className,
@@ -1813,14 +1809,14 @@ var ServiceGenerator = class {
       type: "HttpClient",
       scope: import_ts_morph3.Scope.Private,
       isReadonly: true,
-      initializer: `inject(${upperCaseClientName}_HTTP_CLIENT, { optional: true }) ?? inject(HttpClient)`
+      initializer: "inject(HttpClient)"
     });
     serviceClass.addProperty({
       name: "basePath",
       type: "string",
       scope: import_ts_morph3.Scope.Private,
       isReadonly: true,
-      initializer: `inject(${upperCaseClientName}_BASE_PATH)`
+      initializer: `inject(${basePathTokenName})`
     });
     operations.forEach((operation) => {
       this.methodGenerator.addServiceMethod(serviceClass, operation);
@@ -1829,6 +1825,11 @@ var ServiceGenerator = class {
       throw new Error(`Duplicate method names found in service class ${className}. Please ensure unique method names for each operation.`);
     }
   }
+  getBasePathTokenName() {
+    const clientName = this.config.clientName || "default";
+    const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    return `BASE_PATH_${clientSuffix}`;
+  }
   hasDuplicateMethodNames(arr) {
     return new Set(arr.map((method) => method.getName())).size !== arr.length;
   }
@@ -1874,9 +1875,11 @@ var ProviderGenerator = class {
   }
   project;
   config;
+  clientName;
   constructor(project, config) {
     this.project = project;
     this.config = config;
+    this.clientName = config.clientName || "default";
   }
   generate(outputDir) {
     const filePath = path7.join(outputDir, "providers.ts");
@@ -1884,37 +1887,37 @@ var ProviderGenerator = class {
       overwrite: true
     });
     sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
-    const clientName = this.config.clientName || "Default";
-    const pascalClientName = this.pascalCase(clientName);
-    const upperCaseClientName = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    const basePathTokenName = this.getBasePathTokenName();
+    const interceptorsTokenName = this.getInterceptorsTokenName();
+    const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
     sourceFile.addImportDeclarations([
       {
         namedImports: [
           "EnvironmentProviders",
           "Provider",
-          "makeEnvironmentProviders",
-          "Type",
-          "Injector",
-          "InjectionToken"
+          "makeEnvironmentProviders"
         ],
         moduleSpecifier: "@angular/core"
       },
       {
         namedImports: [
-          "HttpClient",
-          "HttpInterceptor",
-          "HttpHandler",
-          "HttpBackend",
-          "HTTP_INTERCEPTORS"
+          "HTTP_INTERCEPTORS",
+          "HttpInterceptor"
         ],
         moduleSpecifier: "@angular/common/http"
       },
       {
         namedImports: [
-          `${upperCaseClientName}_BASE_PATH`,
-          `${upperCaseClientName}_HTTP_CLIENT`
+          basePathTokenName,
+          interceptorsTokenName
         ],
         moduleSpecifier: "./tokens"
+      },
+      {
+        namedImports: [
+          baseInterceptorClassName
+        ],
+        moduleSpecifier: "./utils/base-interceptor"
       }
     ]);
     if (this.config.options.dateType === "Date") {
@@ -1926,10 +1929,10 @@ var ProviderGenerator = class {
       });
     }
     sourceFile.addInterface({
-      name: `${pascalClientName}Config`,
+      name: `${this.capitalizeFirst(this.clientName)}Config`,
       isExported: true,
       docs: [
-        `Configuration options for ${clientName} API client`
+        `Configuration options for ${this.clientName} client`
       ],
       properties: [
         {
@@ -1940,116 +1943,76 @@ var ProviderGenerator = class {
           ]
         },
         {
-          name: "interceptors",
-          type: "Type<HttpInterceptor>[]",
+          name: "enableDateTransform",
+          type: "boolean",
           hasQuestionToken: true,
           docs: [
-            "HTTP interceptors to apply to this client's requests"
+            "Enable automatic date transformation (default: true)"
           ]
         },
         {
-          name: "enableDateTransform",
-          type: "boolean",
+          name: "interceptors",
+          type: "HttpInterceptor[]",
           hasQuestionToken: true,
           docs: [
-            "Enable automatic date transformation (default: true)"
+            "Array of HTTP interceptors to apply to this client"
           ]
         }
       ]
     });
-    sourceFile.addVariableStatement({
-      isExported: true,
-      declarationKind: "const",
-      declarations: [
-        {
-          name: `${upperCaseClientName}_INTERCEPTORS`,
-          initializer: `new InjectionToken<HttpInterceptor[]>('${upperCaseClientName}_INTERCEPTORS')`
-        }
-      ],
-      leadingTrivia: `/**
- * Interceptor token for ${clientName} client
- */
-`
-    });
-    this.addSimpleProviderFunction(sourceFile, pascalClientName, upperCaseClientName);
+    this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName);
     sourceFile.saveSync();
   }
-  addSimpleProviderFunction(sourceFile, pascalClientName, upperCaseClientName) {
+  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 functionBody = `
 const providers: Provider[] = [
-    // Base path token
+    // Base path token for this client
     {
-        provide: ${upperCaseClientName}_BASE_PATH,
+        provide: ${basePathTokenName},
         useValue: config.basePath
     },
-    
-    // Collect interceptors for this client
+    // Client-specific interceptors token
     {
-        provide: ${upperCaseClientName}_INTERCEPTORS,
-        useFactory: (injector: Injector) => {
-            const interceptorInstances: HttpInterceptor[] = [];
-            
-            // Add custom interceptors
-            if (config.interceptors?.length) {
-                config.interceptors.forEach(interceptorClass => {
-                    interceptorInstances.push(injector.get(interceptorClass));
-                });
-            }
-            
-            ${hasDateInterceptor ? `
-            // Add date interceptor if enabled (default: true)
-            if (config.enableDateTransform !== false) {
-                interceptorInstances.push(injector.get(DateInterceptor));
-            }` : ""}
-            
-            return interceptorInstances;
-        },
-        deps: [Injector]
+        provide: ${interceptorsTokenName},
+        useValue: config.interceptors || []
     },
-    
-    // Create HTTP client with interceptors
+    // Base interceptor that handles client-specific 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: [HttpBackend, ${upperCaseClientName}_INTERCEPTORS]
+        provide: HTTP_INTERCEPTORS,
+        useClass: ${baseInterceptorClassName},
+        multi: true
     }
 ];
 
+${hasDateInterceptor ? `// Add date interceptor to client-specific interceptors if enabled
+if (config.enableDateTransform !== false) {
+    const currentInterceptors = config.interceptors || [];
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: [new DateInterceptor(), ...currentInterceptors]
+    });
+}` : `// Date transformation not available (dateType: 'string' was used in generation)`}
+
 return makeEnvironmentProviders(providers);`;
     sourceFile.addFunction({
-      name: `provide${pascalClientName}`,
+      name: functionName,
       isExported: true,
       docs: [
-        `Provides configuration for ${pascalClientName} API client`,
+        `Provides configuration for ${this.clientName} client`,
         "",
         "@example",
         "```typescript",
-        `// In your app.config.ts`,
-        `import { provide${pascalClientName} } from './api/providers';`,
-        `import { AuthInterceptor } from './interceptors/auth.interceptor';`,
+        "// In your app.config.ts",
+        `import { ${functionName} } from './api/providers';`,
         "",
         "export const appConfig: ApplicationConfig = {",
         "  providers: [",
-        `    provide${pascalClientName}({`,
+        `    ${functionName}({`,
         "      basePath: 'https://api.example.com',",
-        "      interceptors: [AuthInterceptor]",
+        "      interceptors: [new LoggingInterceptor(), new AuthInterceptor()]",
         "    }),",
         "    // other providers...",
         "  ]",
@@ -2059,15 +2022,41 @@ return makeEnvironmentProviders(providers);`;
       parameters: [
         {
           name: "config",
-          type: `${pascalClientName}Config`
+          type: configTypeName
         }
       ],
       returnType: "EnvironmentProviders",
       statements: functionBody
     });
+    if (this.clientName === "default") {
+      sourceFile.addFunction({
+        name: "provideNgOpenapi",
+        isExported: true,
+        docs: [
+          "@deprecated Use provideDefaultClient instead for better clarity",
+          "Provides configuration for the default client"
+        ],
+        parameters: [
+          {
+            name: "config",
+            type: configTypeName
+          }
+        ],
+        returnType: "EnvironmentProviders",
+        statements: `return ${functionName}(config);`
+      });
+    }
   }
-  pascalCase(str) {
-    return str.replace(/(?:^|[-_])([a-z])/g, (_, char) => char.toUpperCase());
+  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}`;
+  }
+  capitalizeFirst(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
   }
 };
 
@@ -2098,7 +2087,7 @@ async function generateFromConfig(config) {
     typeGenerator.generate();
     console.log(`\u2705 TypeScript interfaces generated`);
     if (generateServices) {
-      const tokenGenerator = new TokenGenerator(project, config);
+      const tokenGenerator = new TokenGenerator(project);
       tokenGenerator.generate(outputPath);
       if (config.options.dateType === "Date") {
         const dateTransformer = new DateTransformerGenerator(project);
@@ -2131,94 +2120,6 @@ async function generateFromConfig(config) {
 }
 __name(generateFromConfig, "generateFromConfig");
 
-// package.json
-var package_default = {
-  name: "ng-openapi",
-  version: "0.0.23",
-  description: "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
-  keywords: [
-    "angular",
-    "openapi",
-    "swagger",
-    "codegen",
-    "typescript",
-    "generator",
-    "code-generator",
-    "api",
-    "rest",
-    "http",
-    "cli"
-  ],
-  author: {
-    name: "Tareq Jami",
-    email: "info@jami-it.de",
-    url: "http://tareqjami.de"
-  },
-  license: "MIT",
-  homepage: "https://ng-openapi.dev/",
-  bugs: {
-    url: "https://github.com/ng-openapi/ng-openapi/issues"
-  },
-  repository: {
-    type: "git",
-    url: "git+https://github.com/ng-openapi/ng-openapi.git",
-    directory: "packages/ng-openapi"
-  },
-  funding: {
-    type: "github",
-    url: "https://github.com/sponsors/ng-openapi"
-  },
-  main: "./index.cjs",
-  module: "./index.js",
-  types: "./index.d.ts",
-  bin: {
-    "ng-openapi": "./cli.cjs"
-  },
-  files: [
-    "index.js",
-    "index.cjs",
-    "index.d.ts",
-    "cli.cjs",
-    "lib/**/*.js",
-    "lib/**/*.cjs",
-    "lib/**/*.d.ts",
-    "README.md",
-    "LICENSE",
-    "CHANGELOG.md"
-  ],
-  scripts: {
-    prepublishOnly: "echo 'Build the package using: npm run build:ng-openapi from workspace root'",
-    build: "tsup"
-  },
-  dependencies: {
-    commander: "^14.0.0",
-    "ts-morph": "^26.0.0",
-    "ts-node": "^10.9.2",
-    typescript: "^5.8.3",
-    "@types/swagger-schema-official": "^2.0.25"
-  },
-  peerDependencies: {
-    "@angular/core": ">=15",
-    "@angular/common": ">=15"
-  },
-  peerDependenciesMeta: {
-    "@angular/core": {
-      optional: false
-    },
-    "@angular/common": {
-      optional: false
-    }
-  },
-  engines: {
-    node: ">=18.0.0",
-    npm: ">=8.0.0"
-  },
-  publishConfig: {
-    access: "public",
-    registry: "https://registry.npmjs.org/"
-  }
-};
-
 // src/lib/cli.ts
 var program = new import_commander.Command();
 async function loadConfigFile(configPath) {
@@ -2245,19 +2146,17 @@ __name(loadConfigFile, "loadConfigFile");
 async function generateFromOptions(options) {
   try {
     if (options.config) {
-      const configPaths = Array.isArray(options.config) ? options.config : [
-        options.config
-      ];
-      for (const configPath of configPaths) {
-        const config = await loadConfigFile(configPath);
-        await generateFromConfig(config);
-        console.log(`\u2728 Generated client: ${config.clientName || "default"}`);
-      }
+      const config = await loadConfigFile(options.config);
+      await generateFromConfig(config);
     } else if (options.input) {
+      const inputPath = path8.resolve(options.input);
+      if (!fs4.existsSync(inputPath)) {
+        console.error(`Error: Input file not found: ${inputPath}`);
+        process.exit(1);
+      }
       const config = {
-        input: path8.resolve(options.input),
+        input: inputPath,
         output: options.output || "./src/generated",
-        clientName: options.clientName,
         options: {
           dateType: options.dateType || "Date",
           enumStyle: "enum",
@@ -2271,14 +2170,14 @@ async function generateFromOptions(options) {
       program.help();
       process.exit(1);
     }
-    console.log("\u2728 All clients generated successfully!");
+    console.log("\u2728 Generation completed successfully!");
   } catch (error) {
     console.error("\u274C Generation failed:", error instanceof Error ? error.message : error);
     process.exit(1);
   }
 }
 __name(generateFromOptions, "generateFromOptions");
-program.name("ng-openapi").description("Generate Angular services and types from Swagger/OpenAPI spec").version(package_default.version).option("-c, --config <path>", "Path to configuration file").option("-i, --input <path>", "Path to Swagger/OpenAPI specification file").option("-o, --output <path>", "Output directory", "./src/generated").option("--types-only", "Generate only TypeScript interfaces").option("--date-type <type>", "Date type to use (string | Date)", "Date").action(async (options) => {
+program.name("ng-openapi").description("Generate Angular services and types from Swagger/OpenAPI spec").version("0.0.1").option("-c, --config <path>", "Path to configuration file").option("-i, --input <path>", "Path to Swagger/OpenAPI specification file").option("-o, --output <path>", "Output directory", "./src/generated").option("--types-only", "Generate only TypeScript interfaces").option("--date-type <type>", "Date type to use (string | Date)", "Date").action(async (options) => {
   await generateFromOptions(options);
 });
 program.command("generate").alias("gen").description("Generate code from Swagger specification").option("-c, --config <path>", "Path to configuration file").option("-i, --input <path>", "Path to Swagger/OpenAPI specification file").option("-o, --output <path>", "Output directory", "./src/generated").option("--types-only", "Generate only TypeScript interfaces").option("--date-type <type>", "Date type to use (string | Date)", "Date").action(async (options) => {
@@ -2293,8 +2192,4 @@ program.on("--help", () => {
   console.log("  $ ng-openapi generate -i ./api.yaml --types-only");
 });
 program.parse();
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  generateFromOptions
-});
 //# sourceMappingURL=cli.cjs.map

package/index.d.ts

@@ -1,5 +1,6 @@
 import { ParameterType, XML, ExternalDocs, Info, Path, BodyParameter, QueryParameter, Security, Tag } from 'swagger-schema-official';
 import { ScriptTarget, ModuleKind } from 'ts-morph';
+import { HttpInterceptor } from '@angular/common/http';
 
 interface MethodGenerationContext {
     pathParams: Array<{
@@ -47,6 +48,12 @@ interface GeneratorConfig {
         strict?: boolean;
     };
 }
+interface NgOpenapiClientConfig {
+    clientName: string;
+    basePath: string;
+    enableDateTransform?: boolean;
+    interceptors?: HttpInterceptor[];
+}
 
 interface Parameter {
     name: string;
@@ -168,4 +175,4 @@ declare class SwaggerParser {
  */
 declare function generateFromConfig(config: GeneratorConfig): Promise<void>;
 
-export { type EnumValueObject, type GeneratorConfig, type MethodGenerationContext, type Parameter, type PathInfo, type RequestBody, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, type TypeSchema, generateFromConfig };
+export { type EnumValueObject, type GeneratorConfig, type MethodGenerationContext, type NgOpenapiClientConfig, type Parameter, type PathInfo, type RequestBody, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, type TypeSchema, generateFromConfig };

package/index.js

@@ -441,11 +441,11 @@ var TypeGenerator = _TypeGenerator;
 var import_ts_morph2 = require("ts-morph");
 var path = __toESM(require("path"));
 var _TokenGenerator = class _TokenGenerator {
-  constructor(project, config) {
+  constructor(project, clientName = "default") {
     __publicField(this, "project");
-    __publicField(this, "config");
+    __publicField(this, "clientName");
     this.project = project;
-    this.config = config;
+    this.clientName = clientName;
   }
   generate(outputDir) {
     const tokensDir = path.join(outputDir, "tokens");
@@ -455,26 +455,27 @@ var _TokenGenerator = class _TokenGenerator {
     });
     sourceFile.addImportDeclaration({
       namedImports: [
-        "InjectionToken"
+        "InjectionToken",
+        "HttpInterceptor"
       ],
       moduleSpecifier: "@angular/core"
     });
-    const clientName = this.config.clientName || "DEFAULT";
-    const upperCaseClientName = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    const basePathTokenName = this.getBasePathTokenName();
+    const interceptorsTokenName = this.getInterceptorsTokenName();
     sourceFile.addVariableStatement({
       isExported: true,
       declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
       declarations: [
         {
-          name: `${upperCaseClientName}_BASE_PATH`,
-          initializer: `new InjectionToken<string>('${upperCaseClientName}_BASE_PATH', {
+          name: basePathTokenName,
+          initializer: `new InjectionToken<string>('${basePathTokenName}', {
   providedIn: 'root',
-  factory: () => '/api',
+  factory: () => '/api', // Default fallback
 })`
         }
       ],
       leadingTrivia: `/**
- * Base path token for ${clientName} client
+ * Injection token for the ${this.clientName} client base API path
  */
 `
     });
@@ -483,33 +484,44 @@ var _TokenGenerator = class _TokenGenerator {
       declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
       declarations: [
         {
-          name: `${upperCaseClientName}_HTTP_CLIENT`,
-          initializer: `new InjectionToken<HttpClient>('${upperCaseClientName}_HTTP_CLIENT')`
+          name: interceptorsTokenName,
+          initializer: `new InjectionToken<HttpInterceptor[]>('${interceptorsTokenName}', {
+  providedIn: 'root',
+  factory: () => [], // Default empty array
+})`
         }
       ],
       leadingTrivia: `/**
- * HTTP client token for ${clientName} client
+ * Injection token for the ${this.clientName} client HTTP interceptors
  */
 `
     });
-    if (!this.config.clientName) {
+    if (this.clientName === "default") {
       sourceFile.addVariableStatement({
         isExported: true,
         declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
         declarations: [
           {
             name: "BASE_PATH",
-            initializer: `${upperCaseClientName}_BASE_PATH`
+            initializer: basePathTokenName
           }
         ],
         leadingTrivia: `/**
- * @deprecated Use ${upperCaseClientName}_BASE_PATH instead
+ * @deprecated Use ${basePathTokenName} instead
  */
 `
       });
     }
     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}`;
+  }
 };
 __name(_TokenGenerator, "TokenGenerator");
 var TokenGenerator = _TokenGenerator;
@@ -1780,9 +1792,7 @@ var _ServiceGenerator = class _ServiceGenerator {
     });
   }
   addImports(sourceFile, usedTypes) {
-    var _a;
-    const clientName = this.config.clientName || "DEFAULT";
-    const upperCaseClientName = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    const basePathTokenName = this.getBasePathTokenName();
     sourceFile.addImportDeclarations([
       {
         namedImports: [
@@ -1810,15 +1820,11 @@ var _ServiceGenerator = class _ServiceGenerator {
       },
       {
         namedImports: [
-          `${upperCaseClientName}_BASE_PATH`,
-          `${upperCaseClientName}_HTTP_CLIENT`
+          basePathTokenName
         ],
         moduleSpecifier: "../tokens"
       }
     ]);
-    if (!this.config.clientName) {
-      (_a = sourceFile.getImportDeclaration("../tokens")) == null ? void 0 : _a.addNamedImport("BASE_PATH");
-    }
     if (usedTypes.size > 0) {
       sourceFile.addImportDeclaration({
         namedImports: Array.from(usedTypes).sort(),
@@ -1828,8 +1834,7 @@ var _ServiceGenerator = class _ServiceGenerator {
   }
   addServiceClass(sourceFile, controllerName, operations) {
     const className = `${controllerName}Service`;
-    const clientName = this.config.clientName || "DEFAULT";
-    const upperCaseClientName = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    const basePathTokenName = this.getBasePathTokenName();
     sourceFile.insertText(0, SERVICE_GENERATOR_HEADER_COMMENT(controllerName));
     const serviceClass = sourceFile.addClass({
       name: className,
@@ -1848,14 +1853,14 @@ var _ServiceGenerator = class _ServiceGenerator {
       type: "HttpClient",
       scope: import_ts_morph3.Scope.Private,
       isReadonly: true,
-      initializer: `inject(${upperCaseClientName}_HTTP_CLIENT, { optional: true }) ?? inject(HttpClient)`
+      initializer: "inject(HttpClient)"
     });
     serviceClass.addProperty({
       name: "basePath",
       type: "string",
       scope: import_ts_morph3.Scope.Private,
       isReadonly: true,
-      initializer: `inject(${upperCaseClientName}_BASE_PATH)`
+      initializer: `inject(${basePathTokenName})`
     });
     operations.forEach((operation) => {
       this.methodGenerator.addServiceMethod(serviceClass, operation);
@@ -1864,6 +1869,11 @@ var _ServiceGenerator = class _ServiceGenerator {
       throw new Error(`Duplicate method names found in service class ${className}. Please ensure unique method names for each operation.`);
     }
   }
+  getBasePathTokenName() {
+    const clientName = this.config.clientName || "default";
+    const clientSuffix = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    return `BASE_PATH_${clientSuffix}`;
+  }
   hasDuplicateMethodNames(arr) {
     return new Set(arr.map((method) => method.getName())).size !== arr.length;
   }
@@ -1908,8 +1918,10 @@ var _ProviderGenerator = class _ProviderGenerator {
   constructor(project, config) {
     __publicField(this, "project");
     __publicField(this, "config");
+    __publicField(this, "clientName");
     this.project = project;
     this.config = config;
+    this.clientName = config.clientName || "default";
   }
   generate(outputDir) {
     const filePath = path7.join(outputDir, "providers.ts");
@@ -1917,37 +1929,37 @@ var _ProviderGenerator = class _ProviderGenerator {
       overwrite: true
     });
     sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
-    const clientName = this.config.clientName || "Default";
-    const pascalClientName = this.pascalCase(clientName);
-    const upperCaseClientName = clientName.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+    const basePathTokenName = this.getBasePathTokenName();
+    const interceptorsTokenName = this.getInterceptorsTokenName();
+    const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
     sourceFile.addImportDeclarations([
       {
         namedImports: [
           "EnvironmentProviders",
           "Provider",
-          "makeEnvironmentProviders",
-          "Type",
-          "Injector",
-          "InjectionToken"
+          "makeEnvironmentProviders"
         ],
         moduleSpecifier: "@angular/core"
       },
       {
         namedImports: [
-          "HttpClient",
-          "HttpInterceptor",
-          "HttpHandler",
-          "HttpBackend",
-          "HTTP_INTERCEPTORS"
+          "HTTP_INTERCEPTORS",
+          "HttpInterceptor"
         ],
         moduleSpecifier: "@angular/common/http"
       },
       {
         namedImports: [
-          `${upperCaseClientName}_BASE_PATH`,
-          `${upperCaseClientName}_HTTP_CLIENT`
+          basePathTokenName,
+          interceptorsTokenName
         ],
         moduleSpecifier: "./tokens"
+      },
+      {
+        namedImports: [
+          baseInterceptorClassName
+        ],
+        moduleSpecifier: "./utils/base-interceptor"
       }
     ]);
     if (this.config.options.dateType === "Date") {
@@ -1959,10 +1971,10 @@ var _ProviderGenerator = class _ProviderGenerator {
       });
     }
     sourceFile.addInterface({
-      name: `${pascalClientName}Config`,
+      name: `${this.capitalizeFirst(this.clientName)}Config`,
       isExported: true,
       docs: [
-        `Configuration options for ${clientName} API client`
+        `Configuration options for ${this.clientName} client`
       ],
       properties: [
         {
@@ -1973,116 +1985,76 @@ var _ProviderGenerator = class _ProviderGenerator {
           ]
         },
         {
-          name: "interceptors",
-          type: "Type<HttpInterceptor>[]",
+          name: "enableDateTransform",
+          type: "boolean",
           hasQuestionToken: true,
           docs: [
-            "HTTP interceptors to apply to this client's requests"
+            "Enable automatic date transformation (default: true)"
           ]
         },
         {
-          name: "enableDateTransform",
-          type: "boolean",
+          name: "interceptors",
+          type: "HttpInterceptor[]",
           hasQuestionToken: true,
           docs: [
-            "Enable automatic date transformation (default: true)"
+            "Array of HTTP interceptors to apply to this client"
           ]
         }
       ]
     });
-    sourceFile.addVariableStatement({
-      isExported: true,
-      declarationKind: "const",
-      declarations: [
-        {
-          name: `${upperCaseClientName}_INTERCEPTORS`,
-          initializer: `new InjectionToken<HttpInterceptor[]>('${upperCaseClientName}_INTERCEPTORS')`
-        }
-      ],
-      leadingTrivia: `/**
- * Interceptor token for ${clientName} client
- */
-`
-    });
-    this.addSimpleProviderFunction(sourceFile, pascalClientName, upperCaseClientName);
+    this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName);
     sourceFile.saveSync();
   }
-  addSimpleProviderFunction(sourceFile, pascalClientName, upperCaseClientName) {
+  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 functionBody = `
 const providers: Provider[] = [
-    // Base path token
+    // Base path token for this client
     {
-        provide: ${upperCaseClientName}_BASE_PATH,
+        provide: ${basePathTokenName},
         useValue: config.basePath
     },
-    
-    // Collect interceptors for this client
+    // Client-specific interceptors token
     {
-        provide: ${upperCaseClientName}_INTERCEPTORS,
-        useFactory: (injector: Injector) => {
-            const interceptorInstances: HttpInterceptor[] = [];
-            
-            // Add custom interceptors
-            if (config.interceptors?.length) {
-                config.interceptors.forEach(interceptorClass => {
-                    interceptorInstances.push(injector.get(interceptorClass));
-                });
-            }
-            
-            ${hasDateInterceptor ? `
-            // Add date interceptor if enabled (default: true)
-            if (config.enableDateTransform !== false) {
-                interceptorInstances.push(injector.get(DateInterceptor));
-            }` : ""}
-            
-            return interceptorInstances;
-        },
-        deps: [Injector]
+        provide: ${interceptorsTokenName},
+        useValue: config.interceptors || []
     },
-    
-    // Create HTTP client with interceptors
+    // Base interceptor that handles client-specific 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: [HttpBackend, ${upperCaseClientName}_INTERCEPTORS]
+        provide: HTTP_INTERCEPTORS,
+        useClass: ${baseInterceptorClassName},
+        multi: true
     }
 ];
 
+${hasDateInterceptor ? `// Add date interceptor to client-specific interceptors if enabled
+if (config.enableDateTransform !== false) {
+    const currentInterceptors = config.interceptors || [];
+    providers.push({
+        provide: ${interceptorsTokenName},
+        useValue: [new DateInterceptor(), ...currentInterceptors]
+    });
+}` : `// Date transformation not available (dateType: 'string' was used in generation)`}
+
 return makeEnvironmentProviders(providers);`;
     sourceFile.addFunction({
-      name: `provide${pascalClientName}`,
+      name: functionName,
       isExported: true,
       docs: [
-        `Provides configuration for ${pascalClientName} API client`,
+        `Provides configuration for ${this.clientName} client`,
         "",
         "@example",
         "```typescript",
-        `// In your app.config.ts`,
-        `import { provide${pascalClientName} } from './api/providers';`,
-        `import { AuthInterceptor } from './interceptors/auth.interceptor';`,
+        "// In your app.config.ts",
+        `import { ${functionName} } from './api/providers';`,
         "",
         "export const appConfig: ApplicationConfig = {",
         "  providers: [",
-        `    provide${pascalClientName}({`,
+        `    ${functionName}({`,
         "      basePath: 'https://api.example.com',",
-        "      interceptors: [AuthInterceptor]",
+        "      interceptors: [new LoggingInterceptor(), new AuthInterceptor()]",
         "    }),",
         "    // other providers...",
         "  ]",
@@ -2092,15 +2064,41 @@ return makeEnvironmentProviders(providers);`;
       parameters: [
         {
           name: "config",
-          type: `${pascalClientName}Config`
+          type: configTypeName
         }
       ],
       returnType: "EnvironmentProviders",
       statements: functionBody
     });
+    if (this.clientName === "default") {
+      sourceFile.addFunction({
+        name: "provideNgOpenapi",
+        isExported: true,
+        docs: [
+          "@deprecated Use provideDefaultClient instead for better clarity",
+          "Provides configuration for the default client"
+        ],
+        parameters: [
+          {
+            name: "config",
+            type: configTypeName
+          }
+        ],
+        returnType: "EnvironmentProviders",
+        statements: `return ${functionName}(config);`
+      });
+    }
+  }
+  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}`;
   }
-  pascalCase(str) {
-    return str.replace(/(?:^|[-_])([a-z])/g, (_, char) => char.toUpperCase());
+  capitalizeFirst(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
   }
 };
 __name(_ProviderGenerator, "ProviderGenerator");
@@ -2134,7 +2132,7 @@ function generateFromConfig(config) {
       typeGenerator.generate();
       console.log(`\u2705 TypeScript interfaces generated`);
       if (generateServices) {
-        const tokenGenerator = new TokenGenerator(project, config);
+        const tokenGenerator = new TokenGenerator(project);
         tokenGenerator.generate(outputPath);
         if (config.options.dateType === "Date") {
           const dateTransformer = new DateTransformerGenerator(project);

package/package.json

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