fix: nullable enum with integer values

Author: js2me

CHANGELOG.md

@@ -7,6 +7,7 @@ feat: `--sort-routes` option, ability to sort routes;
 fix: critical bugs based with extract types and enums  
 fix: sort types option (sort was not correctly work with nested or extracted types)  
 fix: problems based with extracting enums;
+fix: nullable enum with integer values (#543)   
 chore: refactoring the axios imports
 fix: non-object custom spec extensions (#500)  
 fix(docs): input instead of output in readme  

src/schema-parser/base-schema-parsers/enum.js

@@ -69,10 +69,14 @@ class EnumSchemaParser extends MonoSchemaParser {
       if (value === null) {
         return this.config.Ts.NullValue(value);
       }
-      if (keyType === this.schemaUtils.getSchemaType({ type: 'number' })) {
+      if (
+        _.includes(keyType, this.schemaUtils.getSchemaType({ type: 'number' }))
+      ) {
         return this.config.Ts.NumberValue(value);
       }
-      if (keyType === this.schemaUtils.getSchemaType({ type: 'boolean' })) {
+      if (
+        _.includes(keyType, this.schemaUtils.getSchemaType({ type: 'boolean' }))
+      ) {
         return this.config.Ts.BooleanValue(value);
       }
 

tests/spec/enums-2.0/expected.ts

@@ -9,6 +9,29 @@
  * ---------------------------------------------------------------
  */
 
+export interface ObjWithEnum {
+  "prop-enum-nullable"?: 0 | 1 | 2 | 3 | 4 | 5 | null;
+  "prop-enum"?: 0 | 1 | 2 | 3 | 4 | 5;
+}
+
+export enum XNullableEnum {
+  Value0 = 0,
+  Value1 = 1,
+  Value2 = 2,
+  Value3 = 3,
+  Value4 = 4,
+  Value5 = 5,
+}
+
+export enum SimpleEnumNonNullable {
+  Value0 = 0,
+  Value1 = 1,
+  Value2 = 2,
+  Value3 = 3,
+  Value4 = 4,
+  Value5 = 5,
+}
+
 export enum OnlyEnumNames {
   Bla = "Bla",
   Blabla = "Blabla",

tests/spec/enums-2.0/schema.json

@@ -5,6 +5,29 @@
   "basePath": "/",
   "info": {},
   "definitions": {
+    "objWithEnum": {
+      "type": "object",
+      "properties": {
+        "prop-enum-nullable": {
+          "type": "integer",
+          "x-nullable": true,
+          "enum": [ 0, 1, 2, 3, 4, 5 ]
+        },
+        "prop-enum": {
+          "type": "integer",
+          "enum": [ 0, 1, 2, 3, 4, 5 ]
+        }
+      }
+    },
+    "x-nullable-enum": {
+      "type": "integer",
+      "x-nullable": true,
+      "enum": [ 0, 1, 2, 3, 4, 5 ]
+    },
+    "simple-enum-non-nullable": {
+      "type": "integer",
+      "enum": [ 0, 1, 2, 3, 4, 5 ]
+    },
     "OnlyEnumNames": {
       "x-enumNames": ["Bla", "Blabla", "Boiler"]
     },

tests/spec/enums-2.0/schema.ts

@@ -9,6 +9,29 @@
  * ---------------------------------------------------------------
  */
 
+export interface ObjWithEnum {
+  "prop-enum-nullable"?: 0 | 1 | 2 | 3 | 4 | 5 | null;
+  "prop-enum"?: 0 | 1 | 2 | 3 | 4 | 5;
+}
+
+export enum XNullableEnum {
+  Value0 = 0,
+  Value1 = 1,
+  Value2 = 2,
+  Value3 = 3,
+  Value4 = 4,
+  Value5 = 5,
+}
+
+export enum SimpleEnumNonNullable {
+  Value0 = 0,
+  Value1 = 1,
+  Value2 = 2,
+  Value3 = 3,
+  Value4 = 4,
+  Value5 = 5,
+}
+
 export enum OnlyEnumNames {
   Bla = "Bla",
   Blabla = "Blabla",