Merge pull request #158 from swisspush/develop

Release 0.9.14
swisspost · Nov 3, 2020 · 04a0b36 · 04a0b36
2 parents dde725c + e22c6c5
commit 04a0b36
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apikana",
-  "version": "0.9.13",
+  "version": "0.9.14",
   "description": "Integrated tools for REST API design - ｱﾋﾟ",
   "main": "index.js",
   "bin": {

diff --git a/src/generate-avro.js b/src/generate-avro.js
@@ -375,40 +375,32 @@ module.exports = function() {
             doc: doc || contents.description || '',
         };
 
-        if (contents.hasOwnProperty('$ref')) {
-            if (valid) {
-                enumProp.type = 'enum';
-                enumProp.symbols = contents.enum;
+        if (valid) {
+            var enumName = contents.id || `${name}${jsonSchemaAvro._enumSuffix}`;
+            if(enums[enumName] && sameArray(contents.enum, enums[enumName])) {
+                enumProp.type = enumName;
             } else {
-                enumProp.type = 'string';
-            }
-        } else {
-            if (valid) {
-                var enumName = `${name}${jsonSchemaAvro._enumSuffix}`;
-                if(enums[enumName] && sameArray(contents.enum, enums[enumName])) {
-                    enumProp.type = enumName;
-                } else {
-                    if(enums[enumName]) {
-                        var num = enumName.replace(/[^\d.]/g, '');
-                        num = num + 1;
-                        if(num > 1) {
-                            var reg = new RegExp(num);
-                            enumName = enumName.replace(reg, newVal);
-                        } else {
-                            enumName = enumName+"_1";
-                        }
-                    }
-                    enumProp.type = {
-                        type: 'enum',
-                        name: enumName,
-                        symbols: contents.enum
+                if(enums[enumName]) {
+                    var num = enumName.replace(/[^\d.]/g, '');
+                    num = num + 1;
+                    if(num > 1) {
+                        var reg = new RegExp(num);
+                        enumName = enumName.replace(reg, newVal);
+                    } else {
+                        enumName = enumName+"_1";
                     }
-                    enums[enumName] = contents.enum;
                 }
-            } else {
-                enumProp.type = "string"
+                enumProp.type = {
+                    type: 'enum',
+                    name: enumName,
+                    symbols: contents.enum
+                }
+                enums[enumName] = contents.enum;
             }
+        } else {
+            enumProp.type = "string"
         }
+
         if(enumProp.type != "string") {
             enumProp.type = [ enumProp.type, 'string' ]
         }