ng-openapi 0.1.9-pr-18-feature-schema-validation-65d0501.0 → 0.1.10

package/cli.cjs

@@ -24,25 +24,38 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
+// ../shared/src/utils/functions/is-url.ts
+function isUrl(input) {
+  try {
+    const url = new URL(input);
+    return [
+      "http:",
+      "https:"
+    ].includes(url.protocol);
+  } catch {
+    return false;
+  }
+}
+__name(isUrl, "isUrl");
+
 // src/lib/cli.ts
 var import_commander = require("commander");
-var path11 = __toESM(require("path"));
 var fs4 = __toESM(require("fs"));
+var path11 = __toESM(require("path"));
 
-// src/lib/core/generator.ts
-var import_ts_morph6 = require("ts-morph");
+// package.json
+var version = "0.1.9";
 
-// src/lib/generators/type/type.generator.ts
-var import_ts_morph = require("ts-morph");
+// src/lib/core/generator.ts
+var import_ts_morph5 = require("ts-morph");
 
 // ../shared/src/utils/string.utils.ts
 function camelCase(str) {
-  const cleaned = str.replace(/[-_](\w)/g, (_, c) => c.toUpperCase());
-  return cleaned.charAt(0).toLowerCase() + cleaned.slice(1);
+  return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toLowerCase());
 }
 __name(camelCase, "camelCase");
 function pascalCase(str) {
-  return str.replace(/(?:^|[-_])([a-z])/g, (_, char) => char.toUpperCase());
+  return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toUpperCase());
 }
 __name(pascalCase, "pascalCase");
 
@@ -366,6 +379,12 @@ function inferResponseTypeFromContentType(contentType) {
 __name(inferResponseTypeFromContentType, "inferResponseTypeFromContentType");
 function getResponseType(response, config) {
   const responseType = getResponseTypeFromResponse(response);
+  const content = response.content || {};
+  for (const [contentType, mediaType] of Object.entries(content)) {
+    if (mediaType?.schema) {
+      return getTypeScriptType(mediaType.schema, config, mediaType.schema.nullable);
+    }
+  }
   switch (responseType) {
     case "blob":
       return "Blob";
@@ -373,15 +392,6 @@ function getResponseType(response, config) {
       return "ArrayBuffer";
     case "text":
       return "string";
-    case "json": {
-      const content = response.content || {};
-      for (const [contentType, mediaType] of Object.entries(content)) {
-        if (inferResponseTypeFromContentType(contentType) === "json" && mediaType?.schema) {
-          return getTypeScriptType(mediaType.schema, config, mediaType.schema.nullable);
-        }
-      }
-      return "any";
-    }
     default:
       return "any";
   }
@@ -455,22 +465,6 @@ var BASE_INTERCEPTOR_HEADER_COMMENT = /* @__PURE__ */ __name((clientName) => def
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var yaml = __toESM(require("js-yaml"));
-
-// ../shared/src/utils/functions/is-url.ts
-function isUrl(input) {
-  try {
-    const url = new URL(input);
-    return [
-      "http:",
-      "https:"
-    ].includes(url.protocol);
-  } catch {
-    return false;
-  }
-}
-__name(isUrl, "isUrl");
-
-// ../shared/src/core/swagger-parser.ts
 var SwaggerParser = class _SwaggerParser {
   static {
     __name(this, "SwaggerParser");
@@ -617,7 +611,7 @@ var SwaggerParser = class _SwaggerParser {
 };
 
 // src/lib/generators/type/type.generator.ts
-var TypeGenerator = class _TypeGenerator {
+var TypeGenerator = class {
   static {
     __name(this, "TypeGenerator");
   }
@@ -626,28 +620,16 @@ var TypeGenerator = class _TypeGenerator {
   sourceFile;
   generatedTypes = /* @__PURE__ */ new Set();
   config;
-  constructor(parser, outputRoot, config) {
+  constructor(parser, project, config, outputRoot) {
     this.config = config;
-    const outputPath = outputRoot + "/models/index.ts";
-    this.project = new import_ts_morph.Project({
-      compilerOptions: {
-        declaration: true,
-        target: import_ts_morph.ScriptTarget.ES2022,
-        module: import_ts_morph.ModuleKind.Preserve,
-        strict: true,
-        ...this.config.compilerOptions
-      }
-    });
+    this.project = project;
     this.parser = parser;
+    const outputPath = outputRoot + "/models/index.ts";
     this.sourceFile = this.project.createSourceFile(outputPath, "", {
       overwrite: true
     });
   }
-  static async create(swaggerPathOrUrl, outputRoot, config) {
-    const parser = await SwaggerParser.create(swaggerPathOrUrl, config);
-    return new _TypeGenerator(parser, outputRoot, config);
-  }
-  generate() {
+  async generate() {
     try {
       const definitions = this.parser.getDefinitions();
       if (!definitions || Object.keys(definitions).length === 0) {
@@ -655,9 +637,7 @@ var TypeGenerator = class _TypeGenerator {
         return;
       }
       this.sourceFile.insertText(0, TYPE_GENERATOR_HEADER_COMMENT);
-      Object.entries(definitions).forEach(([name, definition]) => {
-        this.generateInterface(name, definition);
-      });
+      await Promise.all(Object.entries(definitions).map(([name, definition]) => this.generateInterface(name, definition)));
       this.generateSdkTypes();
       this.sourceFile.formatText();
       this.sourceFile.saveSync();
@@ -666,7 +646,7 @@ var TypeGenerator = class _TypeGenerator {
       throw new Error(`Failed to generate types: ${error instanceof Error ? error.message : "Unknown error"}`);
     }
   }
-  generateInterface(name, definition) {
+  async generateInterface(name, definition) {
     const interfaceName = this.pascalCaseForEnums(name);
     if (this.generatedTypes.has(interfaceName)) {
       return;
@@ -775,7 +755,11 @@ var TypeGenerator = class _TypeGenerator {
       return;
     }
     if (!definition.properties) {
-      console.warn(`No properties found for interface ${interfaceDeclaration.getName()}`);
+      interfaceDeclaration.addIndexSignature({
+        keyName: "key",
+        keyType: "string",
+        returnType: "unknown"
+      });
       return;
     }
     Object.entries(definition.properties).forEach(([propertyName, property]) => {
@@ -977,7 +961,7 @@ var TypeGenerator = class _TypeGenerator {
 };
 
 // src/lib/generators/utility/token.generator.ts
-var import_ts_morph2 = require("ts-morph");
+var import_ts_morph = require("ts-morph");
 var path2 = __toESM(require("path"));
 var TokenGenerator = class {
   static {
@@ -1013,7 +997,7 @@ var TokenGenerator = class {
     const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+      declarationKind: import_ts_morph.VariableDeclarationKind.Const,
       declarations: [
         {
           name: basePathTokenName,
@@ -1030,7 +1014,7 @@ var TokenGenerator = class {
     });
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+      declarationKind: import_ts_morph.VariableDeclarationKind.Const,
       declarations: [
         {
           name: interceptorsTokenName,
@@ -1047,7 +1031,7 @@ var TokenGenerator = class {
     });
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+      declarationKind: import_ts_morph.VariableDeclarationKind.Const,
       declarations: [
         {
           name: clientContextTokenName,
@@ -1062,7 +1046,7 @@ var TokenGenerator = class {
     if (this.clientName === "default") {
       sourceFile.addVariableStatement({
         isExported: true,
-        declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+        declarationKind: import_ts_morph.VariableDeclarationKind.Const,
         declarations: [
           {
             name: "BASE_PATH",
@@ -1076,7 +1060,7 @@ var TokenGenerator = class {
       });
       sourceFile.addVariableStatement({
         isExported: true,
-        declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+        declarationKind: import_ts_morph.VariableDeclarationKind.Const,
         declarations: [
           {
             name: "CLIENT_CONTEXT_TOKEN",
@@ -1249,7 +1233,7 @@ var FileDownloadGenerator = class {
 };
 
 // src/lib/generators/utility/date-transformer.generator.ts
-var import_ts_morph3 = require("ts-morph");
+var import_ts_morph2 = require("ts-morph");
 var path4 = __toESM(require("path"));
 var DateTransformerGenerator = class {
   static {
@@ -1295,7 +1279,7 @@ var DateTransformerGenerator = class {
     });
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: import_ts_morph3.VariableDeclarationKind.Const,
+      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
       declarations: [
         {
           name: "ISO_DATE_REGEX",
@@ -1637,7 +1621,7 @@ return makeEnvironmentProviders(providers);`;
 };
 
 // src/lib/generators/utility/base-interceptor.generator.ts
-var import_ts_morph4 = require("ts-morph");
+var import_ts_morph3 = require("ts-morph");
 var path7 = __toESM(require("path"));
 var BaseInterceptorGenerator = class {
   static {
@@ -1706,14 +1690,14 @@ var BaseInterceptorGenerator = class {
         {
           name: "httpInterceptors",
           type: "HttpInterceptor[]",
-          scope: import_ts_morph4.Scope.Private,
+          scope: import_ts_morph3.Scope.Private,
           isReadonly: true,
           initializer: `inject(${interceptorsTokenName})`
         },
         {
           name: "clientContextToken",
           type: "HttpContextToken<string>",
-          scope: import_ts_morph4.Scope.Private,
+          scope: import_ts_morph3.Scope.Private,
           isReadonly: true,
           initializer: clientContextTokenName
         }
@@ -1770,7 +1754,7 @@ var BaseInterceptorGenerator = class {
 };
 
 // src/lib/generators/service/service.generator.ts
-var import_ts_morph5 = require("ts-morph");
+var import_ts_morph4 = require("ts-morph");
 var path8 = __toESM(require("path"));
 
 // src/lib/generators/service/service-method/service-method-body.generator.ts
@@ -2187,7 +2171,10 @@ var ServiceMethodGenerator = class {
       parameters,
       returnType,
       statements: methodBody,
-      overloads: methodOverLoads
+      overloads: methodOverLoads,
+      docs: operation.description ? [
+        operation.description
+      ] : void 0
     });
   }
   generateMethodName(operation) {
@@ -2207,15 +2194,17 @@ var ServiceMethodGenerator = class {
     if (operation.operationId) {
       return camelCase(operation.operationId);
     }
-    const method = operation.method.toLowerCase();
-    const pathParts = operation.path.split("/").filter((p) => p && !p.startsWith("{"));
-    const resource = pathParts[pathParts.length - 1] || "resource";
-    return `${method}${pascalCase(resource)}`;
+    const method = pascalCase(operation.method.toLowerCase());
+    const pathParts = operation.path.split("/").map((str) => {
+      return pascalCase(pascalCase(str).replace(/[^a-zA-Z0-9]/g, ""));
+    });
+    const resource = pathParts.join("") || "resource";
+    return `${camelCase(resource)}${method}`;
   }
 };
 
 // src/lib/generators/service/service.generator.ts
-var ServiceGenerator = class _ServiceGenerator {
+var ServiceGenerator = class {
   static {
     __name(this, "ServiceGenerator");
   }
@@ -2235,11 +2224,7 @@ var ServiceGenerator = class _ServiceGenerator {
     }
     this.methodGenerator = new ServiceMethodGenerator(config);
   }
-  static async create(swaggerPathOrUrl, project, config) {
-    const parser = await SwaggerParser.create(swaggerPathOrUrl, config);
-    return new _ServiceGenerator(parser, project, config);
-  }
-  generate(outputRoot) {
+  async generate(outputRoot) {
     const outputDir = path8.join(outputRoot, "services");
     const paths = extractPaths(this.spec.paths);
     if (paths.length === 0) {
@@ -2247,9 +2232,7 @@ var ServiceGenerator = class _ServiceGenerator {
       return;
     }
     const controllerGroups = this.groupPathsByController(paths);
-    Object.entries(controllerGroups).forEach(([controllerName, operations]) => {
-      this.generateServiceFile(controllerName, operations, outputDir);
-    });
+    await Promise.all(Object.entries(controllerGroups).map(([controllerName, operations]) => this.generateServiceFile(controllerName, operations, outputDir)));
   }
   groupPathsByController(paths) {
     const groups = {};
@@ -2271,7 +2254,7 @@ var ServiceGenerator = class _ServiceGenerator {
     });
     return groups;
   }
-  generateServiceFile(controllerName, operations, outputDir) {
+  async generateServiceFile(controllerName, operations, outputDir) {
     const fileName = `${camelCase(controllerName)}.service.ts`;
     const filePath = path8.join(outputDir, fileName);
     const sourceFile = this.project.createSourceFile(filePath, "", {
@@ -2348,27 +2331,27 @@ var ServiceGenerator = class _ServiceGenerator {
     serviceClass.addProperty({
       name: "httpClient",
       type: "HttpClient",
-      scope: import_ts_morph5.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       isReadonly: true,
       initializer: "inject(HttpClient)"
     });
     serviceClass.addProperty({
       name: "basePath",
       type: "string",
-      scope: import_ts_morph5.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       isReadonly: true,
       initializer: `inject(${basePathTokenName})`
     });
     serviceClass.addProperty({
       name: "clientContextToken",
       type: "HttpContextToken<string>",
-      scope: import_ts_morph5.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       isReadonly: true,
       initializer: clientContextTokenName
     });
     serviceClass.addMethod({
       name: "createContextWithClientId",
-      scope: import_ts_morph5.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       parameters: [
         {
           name: "existingContext",
@@ -2453,18 +2436,19 @@ async function generateFromConfig(config) {
     });
   }
   try {
-    const project = new import_ts_morph6.Project({
+    const project = new import_ts_morph5.Project({
       compilerOptions: {
         declaration: true,
-        target: import_ts_morph6.ScriptTarget.ES2022,
-        module: import_ts_morph6.ModuleKind.Preserve,
+        target: import_ts_morph5.ScriptTarget.ES2022,
+        module: import_ts_morph5.ModuleKind.Preserve,
         strict: true,
         ...config.compilerOptions
       }
     });
     console.log(`\u{1F4E1} Processing OpenAPI specification from ${inputType}: ${config.input}`);
-    const typeGenerator = await TypeGenerator.create(config.input, outputPath, config);
-    typeGenerator.generate();
+    const swaggerParser = await SwaggerParser.create(config.input, config);
+    const typeGenerator = new TypeGenerator(swaggerParser, project, config, outputPath);
+    await typeGenerator.generate();
     console.log(`\u2705 TypeScript interfaces generated`);
     if (generateServices) {
       const tokenGenerator = new TokenGenerator(project, config.clientName);
@@ -2475,8 +2459,8 @@ async function generateFromConfig(config) {
       }
       const fileDownloadHelper = new FileDownloadGenerator(project);
       fileDownloadHelper.generate(outputPath);
-      const serviceGenerator = await ServiceGenerator.create(config.input, project, config);
-      serviceGenerator.generate(outputPath);
+      const serviceGenerator = new ServiceGenerator(swaggerParser, project, config);
+      await serviceGenerator.generate(outputPath);
       const indexGenerator = new ServiceIndexGenerator(project);
       indexGenerator.generateIndex(outputPath);
       console.log(`\u2705 Angular services generated`);
@@ -2487,9 +2471,9 @@ async function generateFromConfig(config) {
     }
     if (config.plugins?.length) {
       for (const plugin of config.plugins) {
-        const PluginClass = plugin;
-        const pluginGenerator = await PluginClass.create(config.input, project, config);
-        pluginGenerator.generate(outputPath);
+        const generatorClass = plugin;
+        const pluginGenerator = new generatorClass(swaggerParser, project, config);
+        await pluginGenerator.generate(outputPath);
       }
       console.log(`\u2705 Plugins are generated`);
     }
@@ -2516,9 +2500,6 @@ async function generateFromConfig(config) {
 }
 __name(generateFromConfig, "generateFromConfig");
 
-// package.json
-var version = "0.1.8";
-
 // src/lib/cli.ts
 var program = new import_commander.Command();
 async function loadConfigFile(configPath) {
@@ -2550,6 +2531,7 @@ async function loadConfigFile(configPath) {
 }
 __name(loadConfigFile, "loadConfigFile");
 async function generateFromOptions(options) {
+  const timestamp = (/* @__PURE__ */ new Date()).getTime();
   try {
     if (options.config) {
       const config = await loadConfigFile(options.config);
@@ -2574,6 +2556,9 @@ async function generateFromOptions(options) {
     console.log("\u2728 Generation completed successfully!");
   } catch (error) {
     console.error("\u274C Generation failed:", error instanceof Error ? error.message : error);
+  } finally {
+    const duration = ((/* @__PURE__ */ new Date()).getTime() - timestamp) / 1e3;
+    console.log(`\u23F1\uFE0F  Duration: ${duration.toFixed(2)} seconds`);
     process.exit(1);
   }
 }

package/index.d.ts

@@ -166,33 +166,23 @@ declare class SwaggerParser {
 }
 
 /**
- * Interface for generator instances
+ * Interface for generator class (both constructor and instance)
  */
-interface IPluginGenerator {
+interface IPluginGeneratorClass {
     /**
-     * Generate code files
+     * Constructor signature
      */
-    generate(outputRoot: string): void;
+    new (parser: SwaggerParser, project: Project, config: GeneratorConfig): IPluginGenerator;
 }
 /**
- * Interface for generator constructor with static methods
+ * Interface for generator instances
  */
-interface IPluginGeneratorConstructor {
-    /**
-     * Create a generator instance
-     */
-    create(swaggerPathOrUrl: string, project: Project, config: GeneratorConfig): Promise<IPluginGenerator>;
+interface IPluginGenerator {
     /**
-     * Constructor signature
+     * Generate code files
      */
-    new (parser: SwaggerParser, project: Project, config: GeneratorConfig): IPluginGenerator;
+    generate(outputRoot: string): Promise<void>;
 }
-/**
- * Combined type that includes both static and instance methods
- */
-type IPluginGeneratorClass = IPluginGeneratorConstructor & {
-    prototype: IPluginGenerator;
-};
 
 interface GeneratorConfig {
     input: string;
@@ -287,4 +277,4 @@ declare function validateInput(inputPath: string): void;
  */
 declare function generateFromConfig(config: GeneratorConfig): Promise<void>;
 
-export { BASE_INTERCEPTOR_HEADER_COMMENT, type EnumValueObject, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type IPluginGenerator, type IPluginGeneratorClass, type IPluginGeneratorConstructor, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenerationContext, type NgOpenapiClientConfig, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, type RequestBody, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeSchema, camelCase, collectUsedTypes, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder, validateInput };
+export { BASE_INTERCEPTOR_HEADER_COMMENT, type EnumValueObject, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type IPluginGenerator, type IPluginGeneratorClass, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenerationContext, type NgOpenapiClientConfig, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, type RequestBody, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeSchema, camelCase, collectUsedTypes, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder, validateInput };

package/index.js

@@ -105,23 +105,19 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/lib/core/generator.ts
-var import_ts_morph6 = require("ts-morph");
-
-// src/lib/generators/type/type.generator.ts
-var import_ts_morph = require("ts-morph");
+var import_ts_morph5 = require("ts-morph");
 
 // ../shared/src/utils/string.utils.ts
 function camelCase(str) {
-  const cleaned = str.replace(/[-_](\w)/g, (_, c) => c.toUpperCase());
-  return cleaned.charAt(0).toLowerCase() + cleaned.slice(1);
+  return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toLowerCase());
 }
 __name(camelCase, "camelCase");
 function kebabCase(str) {
-  return str.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
+  return str.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/[-_\s]+/g, "-").toLowerCase();
 }
 __name(kebabCase, "kebabCase");
 function pascalCase(str) {
-  return str.replace(/(?:^|[-_])([a-z])/g, (_, char) => char.toUpperCase());
+  return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toUpperCase());
 }
 __name(pascalCase, "pascalCase");
 
@@ -447,6 +443,12 @@ function inferResponseTypeFromContentType(contentType) {
 __name(inferResponseTypeFromContentType, "inferResponseTypeFromContentType");
 function getResponseType(response, config) {
   const responseType = getResponseTypeFromResponse(response);
+  const content = response.content || {};
+  for (const [contentType, mediaType] of Object.entries(content)) {
+    if (mediaType == null ? void 0 : mediaType.schema) {
+      return getTypeScriptType(mediaType.schema, config, mediaType.schema.nullable);
+    }
+  }
   switch (responseType) {
     case "blob":
       return "Blob";
@@ -454,15 +456,6 @@ function getResponseType(response, config) {
       return "ArrayBuffer";
     case "text":
       return "string";
-    case "json": {
-      const content = response.content || {};
-      for (const [contentType, mediaType] of Object.entries(content)) {
-        if (inferResponseTypeFromContentType(contentType) === "json" && (mediaType == null ? void 0 : mediaType.schema)) {
-          return getTypeScriptType(mediaType.schema, config, mediaType.schema.nullable);
-        }
-      }
-      return "any";
-    }
     default:
       return "any";
   }
@@ -724,74 +717,63 @@ var SwaggerParser = _SwaggerParser;
 
 // src/lib/generators/type/type.generator.ts
 var _TypeGenerator = class _TypeGenerator {
-  constructor(parser, outputRoot, config) {
+  constructor(parser, project, config, outputRoot) {
     __publicField(this, "project");
     __publicField(this, "parser");
     __publicField(this, "sourceFile");
     __publicField(this, "generatedTypes", /* @__PURE__ */ new Set());
     __publicField(this, "config");
     this.config = config;
-    const outputPath = outputRoot + "/models/index.ts";
-    this.project = new import_ts_morph.Project({
-      compilerOptions: __spreadValues({
-        declaration: true,
-        target: import_ts_morph.ScriptTarget.ES2022,
-        module: import_ts_morph.ModuleKind.Preserve,
-        strict: true
-      }, this.config.compilerOptions)
-    });
+    this.project = project;
     this.parser = parser;
+    const outputPath = outputRoot + "/models/index.ts";
     this.sourceFile = this.project.createSourceFile(outputPath, "", {
       overwrite: true
     });
   }
-  static create(swaggerPathOrUrl, outputRoot, config) {
+  generate() {
     return __async(this, null, function* () {
-      const parser = yield SwaggerParser.create(swaggerPathOrUrl, config);
-      return new _TypeGenerator(parser, outputRoot, config);
+      try {
+        const definitions = this.parser.getDefinitions();
+        if (!definitions || Object.keys(definitions).length === 0) {
+          console.warn("No definitions found in swagger file");
+          return;
+        }
+        this.sourceFile.insertText(0, TYPE_GENERATOR_HEADER_COMMENT);
+        yield Promise.all(Object.entries(definitions).map(([name, definition]) => this.generateInterface(name, definition)));
+        this.generateSdkTypes();
+        this.sourceFile.formatText();
+        this.sourceFile.saveSync();
+      } catch (error) {
+        console.error("Error in generate():", error);
+        throw new Error(`Failed to generate types: ${error instanceof Error ? error.message : "Unknown error"}`);
+      }
     });
   }
-  generate() {
-    try {
-      const definitions = this.parser.getDefinitions();
-      if (!definitions || Object.keys(definitions).length === 0) {
-        console.warn("No definitions found in swagger file");
+  generateInterface(name, definition) {
+    return __async(this, null, function* () {
+      const interfaceName = this.pascalCaseForEnums(name);
+      if (this.generatedTypes.has(interfaceName)) {
         return;
       }
-      this.sourceFile.insertText(0, TYPE_GENERATOR_HEADER_COMMENT);
-      Object.entries(definitions).forEach(([name, definition]) => {
-        this.generateInterface(name, definition);
+      this.generatedTypes.add(interfaceName);
+      if (definition.enum) {
+        this.generateEnum(interfaceName, definition);
+        return;
+      }
+      if (definition.allOf) {
+        this.generateCompositeType(interfaceName, definition);
+        return;
+      }
+      const interfaceDeclaration = this.sourceFile.addInterface({
+        name: interfaceName,
+        isExported: true,
+        docs: definition.description ? [
+          definition.description
+        ] : void 0
       });
-      this.generateSdkTypes();
-      this.sourceFile.formatText();
-      this.sourceFile.saveSync();
-    } catch (error) {
-      console.error("Error in generate():", error);
-      throw new Error(`Failed to generate types: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
-  }
-  generateInterface(name, definition) {
-    const interfaceName = this.pascalCaseForEnums(name);
-    if (this.generatedTypes.has(interfaceName)) {
-      return;
-    }
-    this.generatedTypes.add(interfaceName);
-    if (definition.enum) {
-      this.generateEnum(interfaceName, definition);
-      return;
-    }
-    if (definition.allOf) {
-      this.generateCompositeType(interfaceName, definition);
-      return;
-    }
-    const interfaceDeclaration = this.sourceFile.addInterface({
-      name: interfaceName,
-      isExported: true,
-      docs: definition.description ? [
-        definition.description
-      ] : void 0
+      this.addInterfaceProperties(interfaceDeclaration, definition);
     });
-    this.addInterfaceProperties(interfaceDeclaration, definition);
   }
   generateEnum(name, definition) {
     var _a;
@@ -880,7 +862,11 @@ var _TypeGenerator = class _TypeGenerator {
       return;
     }
     if (!definition.properties) {
-      console.warn(`No properties found for interface ${interfaceDeclaration.getName()}`);
+      interfaceDeclaration.addIndexSignature({
+        keyName: "key",
+        keyType: "string",
+        returnType: "unknown"
+      });
       return;
     }
     Object.entries(definition.properties).forEach(([propertyName, property]) => {
@@ -1087,7 +1073,7 @@ __name(_TypeGenerator, "TypeGenerator");
 var TypeGenerator = _TypeGenerator;
 
 // src/lib/generators/utility/token.generator.ts
-var import_ts_morph2 = require("ts-morph");
+var import_ts_morph = require("ts-morph");
 var path2 = __toESM(require("path"));
 var _TokenGenerator = class _TokenGenerator {
   constructor(project, clientName = "default") {
@@ -1120,7 +1106,7 @@ var _TokenGenerator = class _TokenGenerator {
     const clientContextTokenName = this.getClientContextTokenName();
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+      declarationKind: import_ts_morph.VariableDeclarationKind.Const,
       declarations: [
         {
           name: basePathTokenName,
@@ -1137,7 +1123,7 @@ var _TokenGenerator = class _TokenGenerator {
     });
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+      declarationKind: import_ts_morph.VariableDeclarationKind.Const,
       declarations: [
         {
           name: interceptorsTokenName,
@@ -1154,7 +1140,7 @@ var _TokenGenerator = class _TokenGenerator {
     });
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+      declarationKind: import_ts_morph.VariableDeclarationKind.Const,
       declarations: [
         {
           name: clientContextTokenName,
@@ -1169,7 +1155,7 @@ var _TokenGenerator = class _TokenGenerator {
     if (this.clientName === "default") {
       sourceFile.addVariableStatement({
         isExported: true,
-        declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+        declarationKind: import_ts_morph.VariableDeclarationKind.Const,
         declarations: [
           {
             name: "BASE_PATH",
@@ -1183,7 +1169,7 @@ var _TokenGenerator = class _TokenGenerator {
       });
       sourceFile.addVariableStatement({
         isExported: true,
-        declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
+        declarationKind: import_ts_morph.VariableDeclarationKind.Const,
         declarations: [
           {
             name: "CLIENT_CONTEXT_TOKEN",
@@ -1357,7 +1343,7 @@ __name(_FileDownloadGenerator, "FileDownloadGenerator");
 var FileDownloadGenerator = _FileDownloadGenerator;
 
 // src/lib/generators/utility/date-transformer.generator.ts
-var import_ts_morph3 = require("ts-morph");
+var import_ts_morph2 = require("ts-morph");
 var path4 = __toESM(require("path"));
 var _DateTransformerGenerator = class _DateTransformerGenerator {
   constructor(project) {
@@ -1400,7 +1386,7 @@ var _DateTransformerGenerator = class _DateTransformerGenerator {
     });
     sourceFile.addVariableStatement({
       isExported: true,
-      declarationKind: import_ts_morph3.VariableDeclarationKind.Const,
+      declarationKind: import_ts_morph2.VariableDeclarationKind.Const,
       declarations: [
         {
           name: "ISO_DATE_REGEX",
@@ -1742,7 +1728,7 @@ __name(_ProviderGenerator, "ProviderGenerator");
 var ProviderGenerator = _ProviderGenerator;
 
 // src/lib/generators/utility/base-interceptor.generator.ts
-var import_ts_morph4 = require("ts-morph");
+var import_ts_morph3 = require("ts-morph");
 var path7 = __toESM(require("path"));
 var _project, _clientName;
 var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
@@ -1809,14 +1795,14 @@ var _BaseInterceptorGenerator = class _BaseInterceptorGenerator {
         {
           name: "httpInterceptors",
           type: "HttpInterceptor[]",
-          scope: import_ts_morph4.Scope.Private,
+          scope: import_ts_morph3.Scope.Private,
           isReadonly: true,
           initializer: `inject(${interceptorsTokenName})`
         },
         {
           name: "clientContextToken",
           type: "HttpContextToken<string>",
-          scope: import_ts_morph4.Scope.Private,
+          scope: import_ts_morph3.Scope.Private,
           isReadonly: true,
           initializer: clientContextTokenName
         }
@@ -1877,7 +1863,7 @@ __name(_BaseInterceptorGenerator, "BaseInterceptorGenerator");
 var BaseInterceptorGenerator = _BaseInterceptorGenerator;
 
 // src/lib/generators/service/service.generator.ts
-var import_ts_morph5 = require("ts-morph");
+var import_ts_morph4 = require("ts-morph");
 var path8 = __toESM(require("path"));
 
 // src/lib/generators/service/service-method/service-method-body.generator.ts
@@ -2299,7 +2285,10 @@ var _ServiceMethodGenerator = class _ServiceMethodGenerator {
       parameters,
       returnType,
       statements: methodBody,
-      overloads: methodOverLoads
+      overloads: methodOverLoads,
+      docs: operation.description ? [
+        operation.description
+      ] : void 0
     });
   }
   generateMethodName(operation) {
@@ -2319,10 +2308,12 @@ var _ServiceMethodGenerator = class _ServiceMethodGenerator {
     if (operation.operationId) {
       return camelCase(operation.operationId);
     }
-    const method = operation.method.toLowerCase();
-    const pathParts = operation.path.split("/").filter((p) => p && !p.startsWith("{"));
-    const resource = pathParts[pathParts.length - 1] || "resource";
-    return `${method}${pascalCase(resource)}`;
+    const method = pascalCase(operation.method.toLowerCase());
+    const pathParts = operation.path.split("/").map((str) => {
+      return pascalCase(pascalCase(str).replace(/[^a-zA-Z0-9]/g, ""));
+    });
+    const resource = pathParts.join("") || "resource";
+    return `${camelCase(resource)}${method}`;
   }
 };
 __name(_ServiceMethodGenerator, "ServiceMethodGenerator");
@@ -2346,22 +2337,16 @@ var _ServiceGenerator = class _ServiceGenerator {
     }
     this.methodGenerator = new ServiceMethodGenerator(config);
   }
-  static create(swaggerPathOrUrl, project, config) {
-    return __async(this, null, function* () {
-      const parser = yield SwaggerParser.create(swaggerPathOrUrl, config);
-      return new _ServiceGenerator(parser, project, config);
-    });
-  }
   generate(outputRoot) {
-    const outputDir = path8.join(outputRoot, "services");
-    const paths = extractPaths(this.spec.paths);
-    if (paths.length === 0) {
-      console.warn("No API paths found in the specification");
-      return;
-    }
-    const controllerGroups = this.groupPathsByController(paths);
-    Object.entries(controllerGroups).forEach(([controllerName, operations]) => {
-      this.generateServiceFile(controllerName, operations, outputDir);
+    return __async(this, null, function* () {
+      const outputDir = path8.join(outputRoot, "services");
+      const paths = extractPaths(this.spec.paths);
+      if (paths.length === 0) {
+        console.warn("No API paths found in the specification");
+        return;
+      }
+      const controllerGroups = this.groupPathsByController(paths);
+      yield Promise.all(Object.entries(controllerGroups).map(([controllerName, operations]) => this.generateServiceFile(controllerName, operations, outputDir)));
     });
   }
   groupPathsByController(paths) {
@@ -2385,16 +2370,18 @@ var _ServiceGenerator = class _ServiceGenerator {
     return groups;
   }
   generateServiceFile(controllerName, operations, outputDir) {
-    const fileName = `${camelCase(controllerName)}.service.ts`;
-    const filePath = path8.join(outputDir, fileName);
-    const sourceFile = this.project.createSourceFile(filePath, "", {
-      overwrite: true
+    return __async(this, null, function* () {
+      const fileName = `${camelCase(controllerName)}.service.ts`;
+      const filePath = path8.join(outputDir, fileName);
+      const sourceFile = this.project.createSourceFile(filePath, "", {
+        overwrite: true
+      });
+      const usedTypes = collectUsedTypes(operations);
+      this.addImports(sourceFile, usedTypes);
+      this.addServiceClass(sourceFile, controllerName, operations);
+      sourceFile.formatText();
+      sourceFile.saveSync();
     });
-    const usedTypes = collectUsedTypes(operations);
-    this.addImports(sourceFile, usedTypes);
-    this.addServiceClass(sourceFile, controllerName, operations);
-    sourceFile.formatText();
-    sourceFile.saveSync();
   }
   addImports(sourceFile, usedTypes) {
     const basePathTokenName = getBasePathTokenName(this.config.clientName);
@@ -2461,27 +2448,27 @@ var _ServiceGenerator = class _ServiceGenerator {
     serviceClass.addProperty({
       name: "httpClient",
       type: "HttpClient",
-      scope: import_ts_morph5.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       isReadonly: true,
       initializer: "inject(HttpClient)"
     });
     serviceClass.addProperty({
       name: "basePath",
       type: "string",
-      scope: import_ts_morph5.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       isReadonly: true,
       initializer: `inject(${basePathTokenName})`
     });
     serviceClass.addProperty({
       name: "clientContextToken",
       type: "HttpContextToken<string>",
-      scope: import_ts_morph5.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       isReadonly: true,
       initializer: clientContextTokenName
     });
     serviceClass.addMethod({
       name: "createContextWithClientId",
-      scope: import_ts_morph5.Scope.Private,
+      scope: import_ts_morph4.Scope.Private,
       parameters: [
         {
           name: "existingContext",
@@ -2569,17 +2556,18 @@ function generateFromConfig(config) {
       });
     }
     try {
-      const project = new import_ts_morph6.Project({
+      const project = new import_ts_morph5.Project({
         compilerOptions: __spreadValues({
           declaration: true,
-          target: import_ts_morph6.ScriptTarget.ES2022,
-          module: import_ts_morph6.ModuleKind.Preserve,
+          target: import_ts_morph5.ScriptTarget.ES2022,
+          module: import_ts_morph5.ModuleKind.Preserve,
           strict: true
         }, config.compilerOptions)
       });
       console.log(`\u{1F4E1} Processing OpenAPI specification from ${inputType}: ${config.input}`);
-      const typeGenerator = yield TypeGenerator.create(config.input, outputPath, config);
-      typeGenerator.generate();
+      const swaggerParser = yield SwaggerParser.create(config.input, config);
+      const typeGenerator = new TypeGenerator(swaggerParser, project, config, outputPath);
+      yield typeGenerator.generate();
       console.log(`\u2705 TypeScript interfaces generated`);
       if (generateServices) {
         const tokenGenerator = new TokenGenerator(project, config.clientName);
@@ -2590,8 +2578,8 @@ function generateFromConfig(config) {
         }
         const fileDownloadHelper = new FileDownloadGenerator(project);
         fileDownloadHelper.generate(outputPath);
-        const serviceGenerator = yield ServiceGenerator.create(config.input, project, config);
-        serviceGenerator.generate(outputPath);
+        const serviceGenerator = new ServiceGenerator(swaggerParser, project, config);
+        yield serviceGenerator.generate(outputPath);
         const indexGenerator = new ServiceIndexGenerator(project);
         indexGenerator.generateIndex(outputPath);
         console.log(`\u2705 Angular services generated`);
@@ -2602,9 +2590,9 @@ function generateFromConfig(config) {
       }
       if ((_b = config.plugins) == null ? void 0 : _b.length) {
         for (const plugin of config.plugins) {
-          const PluginClass = plugin;
-          const pluginGenerator = yield PluginClass.create(config.input, project, config);
-          pluginGenerator.generate(outputPath);
+          const generatorClass = plugin;
+          const pluginGenerator = new generatorClass(swaggerParser, project, config);
+          yield pluginGenerator.generate(outputPath);
         }
         console.log(`\u2705 Plugins are generated`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.1.9-pr-18-feature-schema-validation-65d0501.0",
+  "version": "0.1.10",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "ng-openapi",