fix(enums): x-enumNames specified integers and description with new lines

Signed-off-by: Vojtech Mašek <[email protected]>

Author: vmasek

src/parser.ts

@@ -309,8 +309,8 @@ function defineEnum(
       enumSchema &&
       enumSchema.map((val, index) => ({
         name: (isNumeric
-          ? descKeys
-            ? descKeys[val.toString()]
+          ? xEnumNames.length === 0 && descKeys
+            ? descKeys[val.toString()] || ''
             : xEnumNames[index] || `${val}`
           : val.toString()
         ).replace(/[\W\s]+/, '_'),

tests/custom/swagger.yaml

@@ -79,6 +79,31 @@ paths:
       responses:
         200:
           description: OK
+  #  # an example of overriding parameter from RAWG API
+  #  '/games/{id}':
+  #    get:
+  #      description: ''
+  #      operationId: games_read
+  #      parameters:
+  #        - description: An ID or a slug identifying this Game.
+  #          in: path
+  #          name: id
+  #          required: true
+  #          type: string
+  #      responses:
+  #        '200':
+  #          description: ''
+  #          schema:
+  #            $ref: '#/definitions/Pet'
+  #      summary: Get details of the game.
+  #      tags:
+  #        - games
+  #    parameters:
+  #      - description: A unique integer value identifying this Game.
+  #        in: path
+  #        name: id
+  #        required: true
+  #        type: integer
   #    patch:
   #      requestBody:
   #        content:

tests/with-all-tags/api/models/status-severity.enum.ts

@@ -1,5 +1,9 @@
 /* tslint:disable */
 
+/**
+ * Description text on multiple lines without any value.
+ * This is a test to make sure x-enumNames will be parsed properly when provided.
+ */
 export enum StatusSeverity {
   Unknown = 0,
   OK = 1,

tests/with-all-tags/swagger.json

@@ -337,7 +337,7 @@
     },
     "StatusSeverity": {
       "type": "integer",
-      "description": "",
+      "description": "Description text on multiple lines without any value.\nThis is a test to make sure x-enumNames will be parsed properly when provided.",
       "x-enumNames": ["Unknown", "OK", "Warning", "Error", "Critical"],
       "enum": [0, 1, 2, 3, 4]
     },