fix: close #216, an error when there exist an empty folder at the end…

… of the collection
joolfe · Sep 17, 2022 · 4d7424c · 4d7424c
1 parent 490d2cc
commit 4d7424c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 19 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -26,7 +26,7 @@ async function postmanToOpenApi (input, output, {
   const securitySchemes = {}
 
   for (let [i, element] of items.entries()) {
-    while (element.item != null) { // is a folder
+    while (element != null && element.item != null) { // is a folder
       const { item, description: tagDesc } = element
       const tag = calculateFolderTag(element, folders)
       const tagged = item.map(e => ({ ...e, tag }))
@@ -35,24 +35,27 @@ async function postmanToOpenApi (input, output, {
       // Empty folders will have tagged empty
       element = (tagged.length > 0) ? tagged.shift() : items[i]
     }
-    const {
-      request: { url, method, body, description: rawDesc, header, auth },
-      name: summary, tag = defaultTag, event: events, response
-    } = element
-    const { path, query, protocol, host, port, valid, pathVars } = scrapeURL(url)
-    if (valid) {
-      domains.add(calculateDomains(protocol, host, port))
-      const joinedPath = calculatePath(path, pathDepth)
-      if (!paths[joinedPath]) paths[joinedPath] = {}
-      const { description, paramsMeta } = descriptionParse(rawDesc)
-      paths[joinedPath][method.toLowerCase()] = {
-        tags: [tag],
-        summary,
-        ...(description ? { description } : {}),
-        ...parseBody(body, method),
-        ...parseOperationAuth(auth, securitySchemes, optsAuth),
-        ...parseParameters(query, header, joinedPath, paramsMeta, pathVars),
-        ...parseResponse(response, events, responseHeaders)
+    // If there are an empty folder at the end of the colection elements could be `undefined`
+    if (element != null) {
+      const {
+        request: { url, method, body, description: rawDesc, header, auth },
+        name: summary, tag = defaultTag, event: events, response
+      } = element
+      const { path, query, protocol, host, port, valid, pathVars } = scrapeURL(url)
+      if (valid) {
+        domains.add(calculateDomains(protocol, host, port))
+        const joinedPath = calculatePath(path, pathDepth)
+        if (!paths[joinedPath]) paths[joinedPath] = {}
+        const { description, paramsMeta } = descriptionParse(rawDesc)
+        paths[joinedPath][method.toLowerCase()] = {
+          tags: [tag],
+          summary,
+          ...(description ? { description } : {}),
+          ...parseBody(body, method),
+          ...parseOperationAuth(auth, securitySchemes, optsAuth),
+          ...parseParameters(query, header, joinedPath, paramsMeta, pathVars),
+          ...parseResponse(response, events, responseHeaders)
+        }
       }
     }
   }

diff --git a/test/resources/input/v2/FolderCollection.json b/test/resources/input/v2/FolderCollection.json
@@ -471,6 +471,11 @@
 				"url": "https://api.io/info"
 			},
 			"response": []
+		},
+		{
+			"name": "Empty Folder 2",
+			"item": [],
+			"protocolProfileBehavior": {}
 		}
 	],
 	"variable": [

diff --git a/test/resources/input/v21/FolderCollection.json b/test/resources/input/v21/FolderCollection.json
@@ -575,6 +575,11 @@
 				}
 			},
 			"response": []
+		},
+		{
+			"name": "Empty Folder 2",
+			"item": [],
+			"protocolProfileBehavior": {}
 		}
 	],
 	"variable": [

diff --git a/test/resources/output/Folders.yml b/test/resources/output/Folders.yml
@@ -25,6 +25,7 @@ tags:
   - name: Folder 1 > Folder 2 > Folder 3 > Folder 4 > Folder 5
     description: Folder 5 description
   - name: Empty Folder
+  - name: Empty Folder 2
 paths:
   /users/admin/roles:
     get:

diff --git a/test/resources/output/FoldersNoConcat.yml b/test/resources/output/FoldersNoConcat.yml
@@ -23,6 +23,7 @@ tags:
   - name: Folder 5
     description: Folder 5 description
   - name: Empty Folder
+  - name: Empty Folder 2
 paths:
   /users/admin/roles:
     get:

diff --git a/test/resources/output/FoldersSeparator.yml b/test/resources/output/FoldersSeparator.yml
@@ -25,6 +25,7 @@ tags:
   - name: Folder 1-Folder 2-Folder 3-Folder 4-Folder 5
     description: Folder 5 description
   - name: Empty Folder
+  - name: Empty Folder 2
 paths:
   /users/admin/roles:
     get: