ng-openapi 0.1.14 → 0.1.15-pr-25-union-support-1044cca.0

package/cli.cjs

@@ -44,14 +44,11 @@ var fs4 = __toESM(require("fs"));
 var path12 = __toESM(require("path"));
 
 // package.json
-var version = "0.1.13";
+var version = "0.1.14";
 
 // src/lib/core/generator.ts
 var import_ts_morph7 = require("ts-morph");
 
-// src/lib/generators/type/type.generator.ts
-var import_ts_morph = require("ts-morph");
-
 // ../shared/src/utils/string.utils.ts
 function camelCase(str) {
   return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toLowerCase());
@@ -61,6 +58,10 @@ function pascalCase(str) {
   return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toUpperCase());
 }
 __name(pascalCase, "pascalCase");
+function screamingSnakeCase(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1_$2").replace(/[-\s]+/g, "_").toUpperCase();
+}
+__name(screamingSnakeCase, "screamingSnakeCase");
 
 // ../shared/src/utils/type.utils.ts
 function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, context = "type") {
@@ -114,8 +115,7 @@ function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, c
     case "null":
       return "null";
     default:
-      console.warn(`Unknown swagger type: ${schema.type}`);
-      return nullableType("any", nullable);
+      return nullableType("unknown", nullable);
   }
 }
 __name(getTypeScriptType, "getTypeScriptType");
@@ -614,6 +614,7 @@ var SwaggerParser = class _SwaggerParser {
 };
 
 // src/lib/generators/type/type.generator.ts
+var import_ts_morph = require("ts-morph");
 var TypeGenerator = class {
   static {
     __name(this, "TypeGenerator");
@@ -679,30 +680,74 @@ var TypeGenerator = class {
   }
   collectEnumStructure(name, definition) {
     if (!definition.enum?.length) return;
+    const docs = !this.config.options.generateEnumBasedOnDescription && definition.description ? [
+      definition.description
+    ] : void 0;
+    if (this.config.options.enumStyle === "enum") {
+      const statement = this.buildEnumAsEnum(name, definition, docs);
+      this.statements.push(...statement);
+    } else {
+      const statement = this.buildEnumAsUnion(name, definition, docs);
+      this.statements.push(...statement);
+    }
+  }
+  buildEnumAsEnum(name, definition, docs) {
+    if (!definition.enum?.length) throw Error("Enum definition has no values");
+    const statements = [];
     const isStringEnum = definition.enum.some((value) => typeof value === "string");
     if (isStringEnum) {
-      const unionType = definition.enum.map((value) => typeof value === "string" ? `'${this.escapeString(value)}'` : String(value)).join(" | ");
-      this.statements.push({
-        kind: import_ts_morph.StructureKind.TypeAlias,
+      const members = definition.enum.map((value) => ({
+        name: this.toEnumKey(value),
+        value: `${String(value)}`
+      }));
+      statements.push({
+        kind: import_ts_morph.StructureKind.Enum,
         name,
-        type: unionType,
         isExported: true,
-        docs: definition.description ? [
-          definition.description
-        ] : void 0
+        docs,
+        members
       });
     } else {
       const members = this.buildEnumMembers(definition);
-      this.statements.push({
+      statements.push({
         kind: import_ts_morph.StructureKind.Enum,
         name,
         isExported: true,
-        docs: definition.description ? [
-          definition.description
-        ] : void 0,
+        docs,
         members
       });
     }
+    return statements;
+  }
+  buildEnumAsUnion(name, definition, docs) {
+    if (!definition.enum?.length) throw Error("Enum definition has no values");
+    const statements = [];
+    const objectProperties = [];
+    const unionType = definition.enum.map((value) => {
+      const key = this.toEnumKey(value);
+      const val = typeof value === "string" ? `'${this.escapeString(value)}'` : isNaN(value) ? `'${value}'` : `${value}`;
+      objectProperties.push(`${key}: ${val} as ${name}`);
+      return val;
+    }).join(" | ");
+    statements.push({
+      kind: import_ts_morph.StructureKind.TypeAlias,
+      name,
+      type: unionType,
+      isExported: true,
+      docs
+    });
+    statements.push({
+      kind: import_ts_morph.StructureKind.VariableStatement,
+      declarationKind: import_ts_morph.VariableDeclarationKind.Const,
+      isExported: true,
+      declarations: [
+        {
+          name,
+          initializer: `{ ${objectProperties.join(",\n")} }`
+        }
+      ]
+    });
+    return statements;
   }
   buildEnumMembers(definition) {
     if (definition.description && this.config.options.generateEnumBasedOnDescription) {
@@ -988,7 +1033,10 @@ var TypeGenerator = class {
     return name;
   }
   toEnumKey(value) {
-    return value.toString().replace(/[^a-zA-Z0-9]/g, "_").replace(/^([0-9])/, "_$1").toUpperCase();
+    const str = value.toString();
+    const hasLeadingMinus = str.startsWith("-");
+    const snakeCased = screamingSnakeCase(str);
+    return hasLeadingMinus ? snakeCased.replace("_", "_n") : snakeCased.replace(/^([0-9])/, "_$1");
   }
   getArrayItemType(items) {
     if (Array.isArray(items)) {

package/index.d.ts

@@ -221,6 +221,7 @@ interface NgOpenapiClientConfig {
 declare function camelCase(str: string): string;
 declare function kebabCase(str: string): string;
 declare function pascalCase(str: string): string;
+declare function screamingSnakeCase(str: string): string;
 
 /**
  * Convert OpenAPI/Swagger types to TypeScript types
@@ -277,4 +278,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, 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, screamingSnakeCase, validateInput };

package/index.js

@@ -100,6 +100,7 @@ __export(index_exports, {
   kebabCase: () => kebabCase,
   nullableType: () => nullableType,
   pascalCase: () => pascalCase,
+  screamingSnakeCase: () => screamingSnakeCase,
   validateInput: () => validateInput
 });
 module.exports = __toCommonJS(index_exports);
@@ -107,9 +108,6 @@ module.exports = __toCommonJS(index_exports);
 // src/lib/core/generator.ts
 var import_ts_morph7 = require("ts-morph");
 
-// src/lib/generators/type/type.generator.ts
-var import_ts_morph = require("ts-morph");
-
 // ../shared/src/utils/string.utils.ts
 function camelCase(str) {
   return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toLowerCase());
@@ -123,6 +121,10 @@ function pascalCase(str) {
   return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toUpperCase());
 }
 __name(pascalCase, "pascalCase");
+function screamingSnakeCase(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1_$2").replace(/[-\s]+/g, "_").toUpperCase();
+}
+__name(screamingSnakeCase, "screamingSnakeCase");
 
 // ../shared/src/utils/type.utils.ts
 function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, context = "type") {
@@ -176,8 +178,7 @@ function getTypeScriptType(schemaOrType, config, formatOrNullable, isNullable, c
     case "null":
       return "null";
     default:
-      console.warn(`Unknown swagger type: ${schema.type}`);
-      return nullableType("any", nullable);
+      return nullableType("unknown", nullable);
   }
 }
 __name(getTypeScriptType, "getTypeScriptType");
@@ -719,6 +720,7 @@ __name(_SwaggerParser, "SwaggerParser");
 var SwaggerParser = _SwaggerParser;
 
 // src/lib/generators/type/type.generator.ts
+var import_ts_morph = require("ts-morph");
 var _TypeGenerator = class _TypeGenerator {
   constructor(parser, project, config, outputRoot) {
     __publicField(this, "project");
@@ -785,30 +787,76 @@ var _TypeGenerator = class _TypeGenerator {
   collectEnumStructure(name, definition) {
     var _a;
     if (!((_a = definition.enum) == null ? void 0 : _a.length)) return;
+    const docs = !this.config.options.generateEnumBasedOnDescription && definition.description ? [
+      definition.description
+    ] : void 0;
+    if (this.config.options.enumStyle === "enum") {
+      const statement = this.buildEnumAsEnum(name, definition, docs);
+      this.statements.push(...statement);
+    } else {
+      const statement = this.buildEnumAsUnion(name, definition, docs);
+      this.statements.push(...statement);
+    }
+  }
+  buildEnumAsEnum(name, definition, docs) {
+    var _a;
+    if (!((_a = definition.enum) == null ? void 0 : _a.length)) throw Error("Enum definition has no values");
+    const statements = [];
     const isStringEnum = definition.enum.some((value) => typeof value === "string");
     if (isStringEnum) {
-      const unionType = definition.enum.map((value) => typeof value === "string" ? `'${this.escapeString(value)}'` : String(value)).join(" | ");
-      this.statements.push({
-        kind: import_ts_morph.StructureKind.TypeAlias,
+      const members = definition.enum.map((value) => ({
+        name: this.toEnumKey(value),
+        value: `${String(value)}`
+      }));
+      statements.push({
+        kind: import_ts_morph.StructureKind.Enum,
         name,
-        type: unionType,
         isExported: true,
-        docs: definition.description ? [
-          definition.description
-        ] : void 0
+        docs,
+        members
       });
     } else {
       const members = this.buildEnumMembers(definition);
-      this.statements.push({
+      statements.push({
         kind: import_ts_morph.StructureKind.Enum,
         name,
         isExported: true,
-        docs: definition.description ? [
-          definition.description
-        ] : void 0,
+        docs,
         members
       });
     }
+    return statements;
+  }
+  buildEnumAsUnion(name, definition, docs) {
+    var _a;
+    if (!((_a = definition.enum) == null ? void 0 : _a.length)) throw Error("Enum definition has no values");
+    const statements = [];
+    const objectProperties = [];
+    const unionType = definition.enum.map((value) => {
+      const key = this.toEnumKey(value);
+      const val = typeof value === "string" ? `'${this.escapeString(value)}'` : isNaN(value) ? `'${value}'` : `${value}`;
+      objectProperties.push(`${key}: ${val} as ${name}`);
+      return val;
+    }).join(" | ");
+    statements.push({
+      kind: import_ts_morph.StructureKind.TypeAlias,
+      name,
+      type: unionType,
+      isExported: true,
+      docs
+    });
+    statements.push({
+      kind: import_ts_morph.StructureKind.VariableStatement,
+      declarationKind: import_ts_morph.VariableDeclarationKind.Const,
+      isExported: true,
+      declarations: [
+        {
+          name,
+          initializer: `{ ${objectProperties.join(",\n")} }`
+        }
+      ]
+    });
+    return statements;
   }
   buildEnumMembers(definition) {
     var _a;
@@ -1100,7 +1148,10 @@ var _TypeGenerator = class _TypeGenerator {
     return name;
   }
   toEnumKey(value) {
-    return value.toString().replace(/[^a-zA-Z0-9]/g, "_").replace(/^([0-9])/, "_$1").toUpperCase();
+    const str = value.toString();
+    const hasLeadingMinus = str.startsWith("-");
+    const snakeCased = screamingSnakeCase(str);
+    return hasLeadingMinus ? snakeCased.replace("_", "_n") : snakeCased.replace(/^([0-9])/, "_$1");
   }
   getArrayItemType(items) {
     if (Array.isArray(items)) {
@@ -2913,6 +2964,7 @@ __name(generateFromConfig, "generateFromConfig");
   kebabCase,
   nullableType,
   pascalCase,
+  screamingSnakeCase,
   validateInput
 });
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.1.14",
+  "version": "0.1.15-pr-25-union-support-1044cca.0",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "ng-openapi",