ng-openapi 0.0.25-alpha.0 → 0.0.25-alpha.1

package/cli.cjs

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/lib/cli.ts
 var import_commander = require("commander");
-var path8 = __toESM(require("path"));
+var path9 = __toESM(require("path"));
 var fs4 = __toESM(require("fs"));
 
 // src/lib/core/swagger-parser.ts
@@ -58,7 +58,7 @@ var SwaggerParser = class {
 };
 
 // src/lib/core/generator.ts
-var import_ts_morph4 = require("ts-morph");
+var import_ts_morph5 = require("ts-morph");
 
 // src/lib/generators/type/type.generator.ts
 var import_ts_morph = require("ts-morph");
@@ -93,6 +93,10 @@ var PROVIDER_GENERATOR_HEADER_COMMENT = defaultHeaderComment + `* Generated prov
 * Do not edit this file manually
 */
 `;
+var BASE_INTERCEPTOR_HEADER_COMMENT = /* @__PURE__ */ __name((clientName) => defaultHeaderComment + `* Generated Base Interceptor for client ${clientName}
+* Do not edit this file manually
+*/
+`, "BASE_INTERCEPTOR_HEADER_COMMENT");
 
 // src/lib/generators/type/type.generator.ts
 var TypeGenerator = class {
@@ -803,9 +807,332 @@ var MainIndexGenerator = class {
   }
 };
 
-// src/lib/generators/service/service.generator.ts
-var import_ts_morph3 = require("ts-morph");
+// src/lib/generators/utility/provider.generator.ts
 var path5 = __toESM(require("path"));
+var ProviderGenerator = class {
+  static {
+    __name(this, "ProviderGenerator");
+  }
+  project;
+  config;
+  clientName;
+  constructor(project, config) {
+    this.project = project;
+    this.config = config;
+    this.clientName = config.clientName || "default";
+  }
+  generate(outputDir) {
+    const filePath = path5.join(outputDir, "providers.ts");
+    const sourceFile = this.project.createSourceFile(filePath, "", {
+      overwrite: true
+    });
+    sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
+    const basePathTokenName = this.getBasePathTokenName();
+    const interceptorsTokenName = this.getInterceptorsTokenName();
+    const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
+    sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "EnvironmentProviders",
+          "Provider",
+          "makeEnvironmentProviders"
+        ],
+        moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "HTTP_INTERCEPTORS",
+          "HttpInterceptor"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      },
+      {
+        namedImports: [
+          basePathTokenName,
+          interceptorsTokenName
+        ],
+        moduleSpecifier: "./tokens"
+      },
+      {
+        namedImports: [
+          baseInterceptorClassName
+        ],
+        moduleSpecifier: "./utils/base-interceptor"
+      }
+    ]);
+    if (this.config.options.dateType === "Date") {
+      sourceFile.addImportDeclaration({
+        namedImports: [
+          "DateInterceptor"
+        ],
+        moduleSpecifier: "./utils/date-transformer"
+      });
+    }
+    sourceFile.addInterface({
+      name: `${this.capitalizeFirst(this.clientName)}Config`,
+      isExported: true,
+      docs: [
+        `Configuration options for ${this.clientName} client`
+      ],
+      properties: [
+        {
+          name: "basePath",
+          type: "string",
+          docs: [
+            "Base API URL"
+          ]
+        },
+        {
+          name: "enableDateTransform",
+          type: "boolean",
+          hasQuestionToken: true,
+          docs: [
+            "Enable automatic date transformation (default: true)"
+          ]
+        },
+        {
+          name: "interceptors",
+          type: "HttpInterceptor[]",
+          hasQuestionToken: true,
+          docs: [
+            "Array of HTTP interceptors to apply to this client"
+          ]
+        }
+      ]
+    });
+    this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName);
+    sourceFile.saveSync();
+  }
+  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 for this client
+    {
+        provide: ${basePathTokenName},
+        useValue: config.basePath
+    },
+    // Client-specific interceptors token
+    {
+        provide: ${interceptorsTokenName},
+        useValue: config.interceptors || []
+    },
+    // Base interceptor that handles client-specific 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: functionName,
+      isExported: true,
+      docs: [
+        `Provides configuration for ${this.clientName} client`,
+        "",
+        "@example",
+        "```typescript",
+        "// In your app.config.ts",
+        `import { ${functionName} } from './api/providers';`,
+        "",
+        "export const appConfig: ApplicationConfig = {",
+        "  providers: [",
+        `    ${functionName}({`,
+        "      basePath: 'https://api.example.com',",
+        "      interceptors: [new LoggingInterceptor(), new AuthInterceptor()]",
+        "    }),",
+        "    // other providers...",
+        "  ]",
+        "};",
+        "```"
+      ],
+      parameters: [
+        {
+          name: "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}`;
+  }
+  capitalizeFirst(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+  }
+};
+
+// src/lib/generators/utility/base-interceptor.generator.ts
+var import_ts_morph3 = require("ts-morph");
+var path6 = __toESM(require("path"));
+var BaseInterceptorGenerator = class {
+  static {
+    __name(this, "BaseInterceptorGenerator");
+  }
+  #project;
+  #clientName;
+  constructor(project, clientName = "default") {
+    this.#project = project;
+    this.#clientName = clientName;
+  }
+  generate(outputDir) {
+    const utilsDir = path6.join(outputDir, "utils");
+    const filePath = path6.join(utilsDir, "base-interceptor.ts");
+    const sourceFile = this.#project.createSourceFile(filePath, "", {
+      overwrite: true
+    });
+    sourceFile.insertText(0, BASE_INTERCEPTOR_HEADER_COMMENT(this.#clientName));
+    const basePathTokenName = this.getBasePathTokenName();
+    const interceptorsTokenName = this.getInterceptorsTokenName();
+    sourceFile.addImportDeclarations([
+      {
+        namedImports: [
+          "HttpEvent",
+          "HttpHandler",
+          "HttpInterceptor",
+          "HttpRequest"
+        ],
+        moduleSpecifier: "@angular/common/http"
+      },
+      {
+        namedImports: [
+          "inject",
+          "Injectable"
+        ],
+        moduleSpecifier: "@angular/core"
+      },
+      {
+        namedImports: [
+          "Observable"
+        ],
+        moduleSpecifier: "rxjs"
+      },
+      {
+        namedImports: [
+          basePathTokenName,
+          interceptorsTokenName
+        ],
+        moduleSpecifier: "../tokens"
+      }
+    ]);
+    sourceFile.addClass({
+      name: `${this.capitalizeFirst(this.#clientName)}BaseInterceptor`,
+      isExported: true,
+      decorators: [
+        {
+          name: "Injectable",
+          arguments: []
+        }
+      ],
+      implements: [
+        "HttpInterceptor"
+      ],
+      properties: [
+        {
+          name: "basePath",
+          type: "string",
+          scope: import_ts_morph3.Scope.Private,
+          isReadonly: true,
+          initializer: `inject(${basePathTokenName})`
+        },
+        {
+          name: "httpInterceptors",
+          type: "HttpInterceptor[]",
+          scope: import_ts_morph3.Scope.Private,
+          isReadonly: true,
+          initializer: `inject(${interceptorsTokenName})`
+        }
+      ],
+      methods: [
+        {
+          name: "intercept",
+          parameters: [
+            {
+              name: "req",
+              type: "HttpRequest<any>"
+            },
+            {
+              name: "next",
+              type: "HttpHandler"
+            }
+          ],
+          returnType: "Observable<HttpEvent<any>>",
+          statements: `
+    // Only intercept requests to this client's base path
+    if (!req.url.startsWith(this.#basePath)) {
+      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.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}`;
+  }
+  capitalizeFirst(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+  }
+};
+
+// src/lib/generators/service/service.generator.ts
+var import_ts_morph4 = require("ts-morph");
+var path7 = __toESM(require("path"));
 
 // src/lib/utils/string.utils.ts
 function camelCase(str) {
@@ -1597,7 +1924,7 @@ var ServiceGenerator = class {
     this.methodGenerator = new ServiceMethodGenerator(config);
   }
   generate(outputRoot) {
-    const outputDir = path5.join(outputRoot, "services");
+    const outputDir = path7.join(outputRoot, "services");
     const paths = this.extractPaths();
     const controllerGroups = this.groupPathsByController(paths);
     Object.entries(controllerGroups).forEach(([controllerName, operations]) => {
@@ -1607,7 +1934,7 @@ var ServiceGenerator = class {
   extractPaths() {
     const paths = [];
     const swaggerPaths = this.spec.paths || {};
-    Object.entries(swaggerPaths).forEach(([path9, pathItem]) => {
+    Object.entries(swaggerPaths).forEach(([path10, pathItem]) => {
       const methods = [
         "get",
         "post",
@@ -1621,7 +1948,7 @@ var ServiceGenerator = class {
         if (pathItem[method]) {
           const operation = pathItem[method];
           paths.push({
-            path: path9,
+            path: path10,
             method: method.toUpperCase(),
             operationId: operation.operationId,
             summary: operation.summary,
@@ -1653,12 +1980,12 @@ var ServiceGenerator = class {
   }
   groupPathsByController(paths) {
     const groups = {};
-    paths.forEach((path9) => {
+    paths.forEach((path10) => {
       let controllerName = "Default";
-      if (path9.tags && path9.tags.length > 0) {
-        controllerName = path9.tags[0];
+      if (path10.tags && path10.tags.length > 0) {
+        controllerName = path10.tags[0];
       } else {
-        const pathParts = path9.path.split("/").filter((p) => p && !p.startsWith("{"));
+        const pathParts = path10.path.split("/").filter((p) => p && !p.startsWith("{"));
         if (pathParts.length > 1) {
           controllerName = pascalCase(pathParts[1]);
         }
@@ -1667,13 +1994,13 @@ var ServiceGenerator = class {
       if (!groups[controllerName]) {
         groups[controllerName] = [];
       }
-      groups[controllerName].push(path9);
+      groups[controllerName].push(path10);
     });
     return groups;
   }
   generateServiceFile(controllerName, operations, outputDir) {
     const fileName = `${camelCase(controllerName)}.service.ts`;
-    const filePath = path5.join(outputDir, fileName);
+    const filePath = path7.join(outputDir, fileName);
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
@@ -1807,14 +2134,14 @@ var ServiceGenerator = class {
     serviceClass.addProperty({
       name: "httpClient",
       type: "HttpClient",
-      scope: import_ts_morph3.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       isReadonly: true,
       initializer: "inject(HttpClient)"
     });
     serviceClass.addProperty({
       name: "basePath",
       type: "string",
-      scope: import_ts_morph3.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       isReadonly: true,
       initializer: `inject(${basePathTokenName})`
     });
@@ -1837,7 +2164,7 @@ var ServiceGenerator = class {
 
 // src/lib/generators/service/service-index.generator.ts
 var fs2 = __toESM(require("fs"));
-var path6 = __toESM(require("path"));
+var path8 = __toESM(require("path"));
 var ServiceIndexGenerator = class {
   static {
     __name(this, "ServiceIndexGenerator");
@@ -1847,8 +2174,8 @@ var ServiceIndexGenerator = class {
     this.project = project;
   }
   generateIndex(outputRoot) {
-    const servicesDir = path6.join(outputRoot, "services");
-    const indexPath = path6.join(servicesDir, "index.ts");
+    const servicesDir = path8.join(outputRoot, "services");
+    const indexPath = path8.join(servicesDir, "index.ts");
     const sourceFile = this.project.createSourceFile(indexPath, "", {
       overwrite: true
     });
@@ -1867,199 +2194,6 @@ var ServiceIndexGenerator = class {
   }
 };
 
-// src/lib/generators/utility/provider.generator.ts
-var path7 = __toESM(require("path"));
-var ProviderGenerator = class {
-  static {
-    __name(this, "ProviderGenerator");
-  }
-  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");
-    const sourceFile = this.project.createSourceFile(filePath, "", {
-      overwrite: true
-    });
-    sourceFile.insertText(0, PROVIDER_GENERATOR_HEADER_COMMENT);
-    const basePathTokenName = this.getBasePathTokenName();
-    const interceptorsTokenName = this.getInterceptorsTokenName();
-    const baseInterceptorClassName = `${this.capitalizeFirst(this.clientName)}BaseInterceptor`;
-    sourceFile.addImportDeclarations([
-      {
-        namedImports: [
-          "EnvironmentProviders",
-          "Provider",
-          "makeEnvironmentProviders"
-        ],
-        moduleSpecifier: "@angular/core"
-      },
-      {
-        namedImports: [
-          "HTTP_INTERCEPTORS",
-          "HttpInterceptor"
-        ],
-        moduleSpecifier: "@angular/common/http"
-      },
-      {
-        namedImports: [
-          basePathTokenName,
-          interceptorsTokenName
-        ],
-        moduleSpecifier: "./tokens"
-      },
-      {
-        namedImports: [
-          baseInterceptorClassName
-        ],
-        moduleSpecifier: "./utils/base-interceptor"
-      }
-    ]);
-    if (this.config.options.dateType === "Date") {
-      sourceFile.addImportDeclaration({
-        namedImports: [
-          "DateInterceptor"
-        ],
-        moduleSpecifier: "./utils/date-transformer"
-      });
-    }
-    sourceFile.addInterface({
-      name: `${this.capitalizeFirst(this.clientName)}Config`,
-      isExported: true,
-      docs: [
-        `Configuration options for ${this.clientName} client`
-      ],
-      properties: [
-        {
-          name: "basePath",
-          type: "string",
-          docs: [
-            "Base API URL"
-          ]
-        },
-        {
-          name: "enableDateTransform",
-          type: "boolean",
-          hasQuestionToken: true,
-          docs: [
-            "Enable automatic date transformation (default: true)"
-          ]
-        },
-        {
-          name: "interceptors",
-          type: "HttpInterceptor[]",
-          hasQuestionToken: true,
-          docs: [
-            "Array of HTTP interceptors to apply to this client"
-          ]
-        }
-      ]
-    });
-    this.addMainProviderFunction(sourceFile, basePathTokenName, interceptorsTokenName, baseInterceptorClassName);
-    sourceFile.saveSync();
-  }
-  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 for this client
-    {
-        provide: ${basePathTokenName},
-        useValue: config.basePath
-    },
-    // Client-specific interceptors token
-    {
-        provide: ${interceptorsTokenName},
-        useValue: config.interceptors || []
-    },
-    // Base interceptor that handles client-specific 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: functionName,
-      isExported: true,
-      docs: [
-        `Provides configuration for ${this.clientName} client`,
-        "",
-        "@example",
-        "```typescript",
-        "// In your app.config.ts",
-        `import { ${functionName} } from './api/providers';`,
-        "",
-        "export const appConfig: ApplicationConfig = {",
-        "  providers: [",
-        `    ${functionName}({`,
-        "      basePath: 'https://api.example.com',",
-        "      interceptors: [new LoggingInterceptor(), new AuthInterceptor()]",
-        "    }),",
-        "    // other providers...",
-        "  ]",
-        "};",
-        "```"
-      ],
-      parameters: [
-        {
-          name: "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}`;
-  }
-  capitalizeFirst(str) {
-    return str.charAt(0).toUpperCase() + str.slice(1);
-  }
-};
-
 // src/lib/core/generator.ts
 var fs3 = __toESM(require("fs"));
 async function generateFromConfig(config) {
@@ -2074,11 +2208,11 @@ async function generateFromConfig(config) {
     });
   }
   try {
-    const project = new import_ts_morph4.Project({
+    const project = new import_ts_morph5.Project({
       compilerOptions: {
         declaration: true,
-        target: import_ts_morph4.ScriptTarget.ES2022,
-        module: import_ts_morph4.ModuleKind.Preserve,
+        target: import_ts_morph5.ScriptTarget.ES2022,
+        module: import_ts_morph5.ModuleKind.Preserve,
         strict: true,
         ...config.compilerOptions
       }
@@ -2092,11 +2226,9 @@ async function generateFromConfig(config) {
       if (config.options.dateType === "Date") {
         const dateTransformer = new DateTransformerGenerator(project);
         dateTransformer.generate(outputPath);
-        console.log(`\u2705 Date transformer generated`);
       }
       const fileDownloadHelper = new FileDownloadGenerator(project);
       fileDownloadHelper.generate(outputPath);
-      console.log(`\u2705 File download helper generated`);
       const serviceGenerator = new ServiceGenerator(config.input, project, config);
       serviceGenerator.generate(outputPath);
       const indexGenerator = new ServiceIndexGenerator(project);
@@ -2104,11 +2236,16 @@ async function generateFromConfig(config) {
       console.log(`\u2705 Angular services generated`);
       const providerGenerator = new ProviderGenerator(project, config);
       providerGenerator.generate(outputPath);
-      console.log(`\u2705 Provider functions generated`);
+      const baseInterceptorGenerator = new BaseInterceptorGenerator(project, config.clientName);
+      baseInterceptorGenerator.generate(outputPath);
     }
     const mainIndexGenerator = new MainIndexGenerator(project, config);
     mainIndexGenerator.generateMainIndex(outputPath);
-    console.log("\u{1F389} Generation completed successfully at:", outputPath);
+    if (config.clientName) {
+      console.log(`\u{1F389} ${config.clientName} Generation completed successfully at: ${outputPath}`);
+    } else {
+      console.log("\u{1F389} Generation completed successfully at:", outputPath);
+    }
   } catch (error) {
     if (error instanceof Error) {
       console.error("\u274C Error during generation:", error.message);
@@ -2123,7 +2260,7 @@ __name(generateFromConfig, "generateFromConfig");
 // src/lib/cli.ts
 var program = new import_commander.Command();
 async function loadConfigFile(configPath) {
-  const resolvedPath = path8.resolve(configPath);
+  const resolvedPath = path9.resolve(configPath);
   if (!fs4.existsSync(resolvedPath)) {
     throw new Error(`Configuration file not found: ${resolvedPath}`);
   }
@@ -2149,7 +2286,7 @@ async function generateFromOptions(options) {
       const config = await loadConfigFile(options.config);
       await generateFromConfig(config);
     } else if (options.input) {
-      const inputPath = path8.resolve(options.input);
+      const inputPath = path9.resolve(options.input);
       if (!fs4.existsSync(inputPath)) {
         console.error(`Error: Input file not found: ${inputPath}`);
         process.exit(1);