ng-openapi 0.2.10-pr-53-bugfix-resolve-non-object-types-c28cad9.0 → 0.2.11

package/cli.cjs

@@ -44,7 +44,7 @@ var fs4 = __toESM(require("fs"));
 var path12 = __toESM(require("path"));
 
 // package.json
-var version = "0.2.9";
+var version = "0.2.10";
 
 // src/lib/core/generator.ts
 var import_ts_morph7 = require("ts-morph");
@@ -58,6 +58,10 @@ function pascalCase(str) {
   return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toUpperCase());
 }
 __name(pascalCase, "pascalCase");
+function pascalCaseForEnums(str) {
+  return str.replace(/[^a-zA-Z0-9]/g, "_").replace(/(?:^|_)([a-z])/g, (_, char) => char.toUpperCase()).replace(/^([0-9])/, "_$1");
+}
+__name(pascalCaseForEnums, "pascalCaseForEnums");
 
 // ../shared/src/utils/type.utils.ts
 function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, context = "type") {
@@ -78,7 +82,7 @@ function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, c
   }
   if (schema.$ref) {
     const refName = schema.$ref.split("/").pop();
-    return nullableType(pascalCase(refName), nullable);
+    return nullableType(pascalCaseForEnums(refName), nullable);
   }
   if (schema.type === "array") {
     const itemType = schema.items ? getTypeScriptType(schema.items, config, void 0, void 0, context) : "unknown";
@@ -949,7 +953,7 @@ var TypeGenerator = class {
   // Cached helper methods
   getCachedPascalCase(str) {
     if (!this.pascalCaseCache.has(str)) {
-      this.pascalCaseCache.set(str, this.pascalCaseForEnums(str));
+      this.pascalCaseCache.set(str, pascalCaseForEnums(str));
     }
     return this.pascalCaseCache.get(str);
   }
@@ -994,9 +998,6 @@ var TypeGenerator = class {
   nullableType(type, isNullable) {
     return type + (isNullable ? " | null" : "");
   }
-  pascalCaseForEnums(str) {
-    return str.replace(/[^a-zA-Z0-9]/g, "_").replace(/(?:^|_)([a-z])/g, (_, char) => char.toUpperCase()).replace(/^([0-9])/, "_$1");
-  }
   sanitizePropertyName(name) {
     if (!/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name)) {
       return `"${name}"`;

package/index.d.ts

@@ -224,6 +224,7 @@ declare function camelCase(str: string): string;
 declare function kebabCase(str: string): string;
 declare function pascalCase(str: string): string;
 declare function screamingSnakeCase(str: string): string;
+declare function pascalCaseForEnums(str: string): string;
 
 /**
  * Convert OpenAPI/Swagger types to TypeScript types
@@ -287,4 +288,4 @@ declare function validateInput(inputPath: string): void;
  */
 declare function generateFromConfig(config: GeneratorConfig): Promise<void>;
 
-export { BASE_INTERCEPTOR_HEADER_COMMENT, CONTENT_TYPES, 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, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT, camelCase, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getInterceptorsTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, type placeHolder, screamingSnakeCase, validateInput };
+export { BASE_INTERCEPTOR_HEADER_COMMENT, CONTENT_TYPES, 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, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT, camelCase, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getInterceptorsTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, pascalCaseForEnums, type placeHolder, screamingSnakeCase, validateInput };

package/index.js

@@ -103,6 +103,7 @@ __export(index_exports, {
   kebabCase: () => kebabCase,
   nullableType: () => nullableType,
   pascalCase: () => pascalCase,
+  pascalCaseForEnums: () => pascalCaseForEnums,
   screamingSnakeCase: () => screamingSnakeCase,
   validateInput: () => validateInput
 });
@@ -128,6 +129,10 @@ function screamingSnakeCase(str) {
   return str.replace(/([a-z])([A-Z])/g, "$1_$2").replace(/[-\s]+/g, "_").toUpperCase();
 }
 __name(screamingSnakeCase, "screamingSnakeCase");
+function pascalCaseForEnums(str) {
+  return str.replace(/[^a-zA-Z0-9]/g, "_").replace(/(?:^|_)([a-z])/g, (_, char) => char.toUpperCase()).replace(/^([0-9])/, "_$1");
+}
+__name(pascalCaseForEnums, "pascalCaseForEnums");
 
 // ../shared/src/utils/type.utils.ts
 function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, context = "type") {
@@ -148,7 +153,7 @@ function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, c
   }
   if (schema.$ref) {
     const refName = schema.$ref.split("/").pop();
-    return nullableType(pascalCase(refName), nullable);
+    return nullableType(pascalCaseForEnums(refName), nullable);
   }
   if (schema.type === "array") {
     const itemType = schema.items ? getTypeScriptType(schema.items, config, void 0, void 0, context) : "unknown";
@@ -1074,7 +1079,7 @@ var _TypeGenerator = class _TypeGenerator {
   // Cached helper methods
   getCachedPascalCase(str) {
     if (!this.pascalCaseCache.has(str)) {
-      this.pascalCaseCache.set(str, this.pascalCaseForEnums(str));
+      this.pascalCaseCache.set(str, pascalCaseForEnums(str));
     }
     return this.pascalCaseCache.get(str);
   }
@@ -1119,9 +1124,6 @@ var _TypeGenerator = class _TypeGenerator {
   nullableType(type, isNullable) {
     return type + (isNullable ? " | null" : "");
   }
-  pascalCaseForEnums(str) {
-    return str.replace(/[^a-zA-Z0-9]/g, "_").replace(/(?:^|_)([a-z])/g, (_, char) => char.toUpperCase()).replace(/^([0-9])/, "_$1");
-  }
   sanitizePropertyName(name) {
     if (!/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name)) {
       return `"${name}"`;
@@ -3027,6 +3029,7 @@ __name(generateFromConfig, "generateFromConfig");
   kebabCase,
   nullableType,
   pascalCase,
+  pascalCaseForEnums,
   screamingSnakeCase,
   validateInput
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.2.10-pr-53-bugfix-resolve-non-object-types-c28cad9.0",
+  "version": "0.2.11",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "ng-openapi",