Correctly handle enum generation

cyclosproject · Feb 6, 2019 · bf460eb · bf460eb
1 parent a28f2d2
commit bf460eb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/lib/gen-utils.ts b/lib/gen-utils.ts
@@ -25,7 +25,7 @@ export function typeName(name: string): string {
  */
 export function enumName(value: string, options: Options): string {
   const name = toBasicChars(value, true);
-  if (options.enumModule === 'upper') {
+  if (options.enumStyle === 'upper') {
     return upperCase(name).replace(/\s+/g, '_');
   } else {
     return upperFirst(camelCase(name));

diff --git a/lib/model.ts b/lib/model.ts
@@ -18,7 +18,6 @@ export class Model extends GenType {
   // Simple properties
   simpleType: string;
   enumValues: EnumValue[];
-  enumModule: boolean;
 
   // Array properties
   elementType: string;
@@ -40,10 +39,9 @@ export class Model extends GenType {
 
     const type = schema.type || 'any';
 
-    // When enumModule is 'alias' it is handled as a simple type.
-    if (options.enumModule !== 'alias' && (schema.enum || []).length > 0 && ['string', 'number', 'integer'].includes(type)) {
+    // When enumStyle is 'alias' it is handled as a simple type.
+    if (options.enumStyle !== 'alias' && (schema.enum || []).length > 0 && ['string', 'number', 'integer'].includes(type)) {
       this.enumValues = (schema.enum || []).map(v => new EnumValue(type, v, options));
-      this.enumModule = true;
     }
 
     this.isObject = type === 'object' || (schema.allOf || []).length > 0;

diff --git a/lib/options.ts b/lib/options.ts
@@ -68,7 +68,7 @@ export interface Options {
    *
    * Defaults to 'pascal'.
    */
-  enumModule?: 'alias' | 'upper' | 'pascal';
+  enumStyle?: 'alias' | 'upper' | 'pascal';
 
   /** Custom templates directory. Any `.handlebars` files here will be used instead of the corresponding default. */
   templates?: string;

diff --git a/test/all-types.config.json b/test/all-types.config.json
@@ -1,6 +1,5 @@
 {
   "$schema": "../ng-openapi-gen-schema.json",
   "input": "all-types.json",
-  "output": "out/all-types",
-  "enumModule": "none"
+  "output": "out/all-types"
 }
diff --git a/test/cyclos.config.json b/test/cyclos.config.json
@@ -1,6 +1,6 @@
 {
   "$schema": "../ng-openapi-gen-schema.json",
-  "input": "cyclos.yaml",
+  "input": "cyclos.json",
   "output": "out/cyclos",
   "includeTags": [
     "Auth",
@@ -23,5 +23,6 @@
     "Captcha",
     "Files",
     "Images"
-  ]
+  ],
+  "enumStyle": "upper"
 }