Merge pull request #780 from postmanlabs/release/v4.19.0

Release version v4.19.0
postmanlabs · Jan 18, 2024 · 59e0b70 · 59e0b70
2 parents a6badaa + 193d928
commit 59e0b70
Show file tree

Hide file tree

Showing 27 changed files with 287 additions and 113 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+## [v4.19.0] - 2024-01-18
+
 ## [v4.18.0] - 2023-09-28
 
 -   [#425](https://github.com/postmanlabs/openapi-to-postman/issues/425) [8413](https://github.com/postmanlabs/postman-app-support/issues/8413) Added support for multiple request and response examples.
@@ -600,7 +602,9 @@ Newer releases follow the [Keep a Changelog](https://keepachangelog.com/en/1.0.0
 
 -   Base release
 
-[Unreleased]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.18.0...HEAD
+[Unreleased]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.19.0...HEAD
+
+[v4.19.0]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.18.0...v4.19.0
 
 [v4.18.0]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.17.0...v4.18.0
 

diff --git a/assets/json-schema-faker.js b/assets/json-schema-faker.js
@@ -10919,7 +10919,7 @@ module.exports = {
  */
 parse: function yamlParse (text, reviver) {
   try {
-    return yaml.safeLoad(text);
+    return yaml.load(text);
   }
   catch (e) {
     if (e instanceof Error) {

diff --git a/examples/sampleswagger.yaml b/examples/sampleswagger.yaml
@@ -14,20 +14,20 @@ info:
     email: apiteam@wordnik.com
   license:
     name: Apache 2.0
-    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+    url: http://www.apache.org/licenses/LICENSE-2.0.html
 tags:
   - name: pet
     description: Everything about your Pets
     externalDocs:
       description: Find out more
-      url: 'http://swagger.io'
+      url: http://swagger.io
   - name: store
     description: Operations about user
   - name: user
     description: Access to Petstore orders
     externalDocs:
       description: Find out more about our store
-      url: 'http://swagger.io'
+      url: http://swagger.io
 paths:
   /pet:
     post:
@@ -542,7 +542,7 @@ paths:
           description: User not found
 externalDocs:
   description: Find out more about Swagger
-  url: 'http://swagger.io'
+  url: http://swagger.io
 components:
   requestBodies:
     UserArray:
@@ -688,4 +688,4 @@ components:
         message:
           type: string
       xml:
-        name: '##default'
+        name: '##default'
diff --git a/lib/bundle.js b/lib/bundle.js
@@ -701,12 +701,12 @@ function generateComponentsObject(documentContext, rootContent,
     circularRefsSet = new Set();
   const { COMPONENTS_KEYS } = getBundleRulesDataByVersion(version);
   notInLine.forEach(([key, value]) => {
-    let [, partial] = key.split(localPointer);
+    let [nodeRef, partial] = key.split(localPointer);
     if (documentContext.globalReferences[key].refHasContent) {
       setValueInComponents(
         value.keyInComponents,
         components,
-        getContentFromTrace(documentContext.nodeContents[key], partial),
+        getContentFromTrace(documentContext.nodeContents[nodeRef], partial),
         COMPONENTS_KEYS
       );
     }

diff --git a/lib/deref.js b/lib/deref.js
@@ -133,7 +133,12 @@ module.exports = {
       }), {
         resolvers: {
           // for keywords in OpenAPI schema that are not standard defined JSON schema keywords, use default resolver
-          defaultResolver: (compacted) => { return compacted[0]; }
+          defaultResolver: (compacted) => { return compacted[0]; },
+
+          // Default resolver seems to fail for enum, so adding custom resolver that will return all unique enum values
+          enum: (values) => {
+            return _.uniq(_.concat(...values));
+          }
         }
       });
     }

diff --git a/lib/parse.js b/lib/parse.js
@@ -33,10 +33,11 @@ module.exports = {
 
   asYaml: function (spec) {
     try {
-      let obj = yaml.safeLoad(spec, {
+      let obj = yaml.load(spec, {
         schema: yaml.JSON_SCHEMA
       });
       // yaml.safeLoad does not throw errors for most of the cases in invalid yaml
+      // yaml.safeLoad is removed in js-yaml 4. Hence Using yaml.load instead, which is now safe by default.
       // hence check if it returned an object
       if (typeof obj !== 'object') {
         throw new Error('');

diff --git a/libV2/schemaUtils.js b/libV2/schemaUtils.js
@@ -458,7 +458,10 @@ let QUERYPARAM = 'query',
       }), {
         resolvers: {
           // for keywords in OpenAPI schema that are not standard defined JSON schema keywords, use default resolver
-          defaultResolver: (compacted) => { return compacted[0]; }
+          defaultResolver: (compacted) => { return compacted[0]; },
+          enum: (values) => {
+            return _.uniq(_.concat(...values));
+          }
         }
       });
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openapi-to-postmanv2",
-  "version": "4.18.0",
+  "version": "4.19.0",
   "description": "Convert a given OpenAPI specification to Postman Collection v2.0",
   "homepage": "https://github.com/postmanlabs/openapi-to-postman",
   "bugs": "https://github.com/postmanlabs/openapi-to-postman/issues",
@@ -121,7 +121,7 @@
     "ajv-formats": "2.1.1",
     "async": "3.2.4",
     "commander": "2.20.3",
-    "js-yaml": "3.14.1",
+    "js-yaml": "4.1.0",
     "json-schema-merge-allof": "0.8.1",
     "lodash": "4.17.21",
     "oas-resolver-browser": "2.5.6",