From 17a9b1e4ce764bc371b2b82136beada084f14975 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 07:24:34 +0000 Subject: [PATCH 01/13] Bump json5 from 2.2.0 to 2.2.3 Bumps [json5](https://github.com/json5/json5) from 2.2.0 to 2.2.3. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v2.2.0...v2.2.3) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0e26c5c1..90c577b57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1983,21 +1983,10 @@ "dev": true }, "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - }, - "dependencies": { - "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - } - } + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true }, "levn": { "version": "0.3.0", From 8088877d03fe86a761d11efc9a3bd806a891080c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 16:24:57 +0000 Subject: [PATCH 02/13] Bump semver from 5.7.1 to 5.7.2 Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 491d4ef82..09c3a4d8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -110,9 +110,9 @@ } }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -162,9 +162,9 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -2676,9 +2676,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -3009,9 +3009,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -4599,9 +4599,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -5667,9 +5667,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } @@ -5709,9 +5709,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "yallist": { @@ -7571,9 +7571,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } @@ -7829,9 +7829,9 @@ }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } @@ -9045,9 +9045,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true }, "set-blocking": { From da225440eede281c15922ed6ce36a5a583135f6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 11:47:13 +0000 Subject: [PATCH 03/13] Bump word-wrap from 1.2.3 to 1.2.4 Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 491d4ef82..cfcaa654c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5432,9 +5432,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -9699,9 +9699,9 @@ } }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "dev": true }, "wrap-ansi": { From c753ff091180fe9eb3be1e0a4d8a3374ac4461a1 Mon Sep 17 00:00:00 2001 From: Thim Date: Tue, 16 Jul 2024 18:50:15 +0200 Subject: [PATCH 04/13] Fix to convert "format:binary "to type:"file --- libV2/schemaUtils.js | 9 ++++- test/data/valid_openapi/form-binary-file.json | 37 +++++++++++++++++++ test/unit/convertV2.test.js | 24 +++++++++++- 3 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 test/data/valid_openapi/form-binary-file.json diff --git a/libV2/schemaUtils.js b/libV2/schemaUtils.js index bb41bbfab..37eab026b 100644 --- a/libV2/schemaUtils.js +++ b/libV2/schemaUtils.js @@ -479,11 +479,11 @@ let QUERYPARAM = 'query', * @param {Object} context - Global context * @param {Object} schema - Schema that is to be resolved * @param {Number} [stack] - Current recursion depth - * @param {String} resolveFor - For which action this resoltion is to be done + * @param {String} resolveFor - For which action this resolution is to be done * @param {Object} seenRef - Map of all the references that have been resolved * @todo: Explore using a directed graph/tree for maintaining seen ref * - * @returns {Object} Returns the object that staisfies the schema + * @returns {Object} Returns the object that satisfies the schema */ resolveSchema = (context, schema, stack = 0, resolveFor = CONVERSION, seenRef = {}) => { if (!schema) { @@ -576,6 +576,11 @@ let QUERYPARAM = 'query', return; } + // Set type to binary + if (property.format === 'binary') { + property.type = 'binary'; + } + if ( property.format === 'decimal' || property.format === 'byte' || diff --git a/test/data/valid_openapi/form-binary-file.json b/test/data/valid_openapi/form-binary-file.json new file mode 100644 index 000000000..9b674793d --- /dev/null +++ b/test/data/valid_openapi/form-binary-file.json @@ -0,0 +1,37 @@ +{ + "openapi": "3.0.3", + "info": { + "title": "Form Data - Binary - OpenAPI 3.0", + "version": "1.0.0" + }, + "paths": { + "/uploadImage": { + "post": { + "summary": "uploads an image", + "description": "", + "operationId": "uploadFile", + "requestBody": { + "required": true, + "content": { + "multipart/form-data": { + "schema": { + "properties": { + "inputfile": { + "type": "string", + "format": "binary", + "description": "The file to be uploaded." + } + } + } + } + } + }, + "responses": { + "200": { + "description": "successful operation" + } + } + } + } + } +} diff --git a/test/unit/convertV2.test.js b/test/unit/convertV2.test.js index 8666139e7..1fe5e0062 100644 --- a/test/unit/convertV2.test.js +++ b/test/unit/convertV2.test.js @@ -110,7 +110,8 @@ const expect = require('chai').expect, multiExampleResponseCodeMatching = path.join(__dirname, VALID_OPENAPI_PATH, '/multiExampleResponseCodeMatching.json'), duplicateCollectionVars = - path.join(__dirname, VALID_OPENAPI_PATH, '/duplicateCollectionVars.json'); + path.join(__dirname, VALID_OPENAPI_PATH, '/duplicateCollectionVars.json'), + issue795 = path.join(__dirname, VALID_OPENAPI_PATH, '/form-binary-file.json'); describe('The convert v2 Function', function() { @@ -2819,4 +2820,25 @@ describe('The convert v2 Function', function() { done(); }); }); + + it('[Github #795] Should properly convert format binary to form data', function (done) { + var openapi = fs.readFileSync(issue795, 'utf8'), + reqBody, formData; + Converter.convertV2({ type: 'string', data: openapi }, { + requestNameSource: 'Fallback', + indentCharacter: 'Space', + collapseFolders: true, + optimizeConversion: true, + parametersResolution: 'schema' + }, (err, conversionResult) => { + + reqBody = conversionResult.output[0].data.item[0].item[0].request.body; + formData = reqBody.formdata[0]; + + expect(err).to.be.null; + expect(conversionResult.result).to.equal(true); + expect(formData.type).to.equal('file'); + done(); + }); + }); }); From 5a8a889b4b0271e703627e38b8e75adaf94f0550 Mon Sep 17 00:00:00 2001 From: Vishal Shingala Date: Thu, 18 Jul 2024 21:14:30 +0530 Subject: [PATCH 05/13] Added support for file type filed for form-data body --- libV2/schemaUtils.js | 11 ++--------- libV2/validationUtils.js | 3 ++- test/unit/faker.test.js | 6 ++++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/libV2/schemaUtils.js b/libV2/schemaUtils.js index 37eab026b..ddc635917 100644 --- a/libV2/schemaUtils.js +++ b/libV2/schemaUtils.js @@ -45,6 +45,7 @@ const schemaFaker = require('../assets/json-schema-faker'), 'ipv4', 'ipv6', 'regex', 'uuid', + 'binary', 'json-pointer', 'int64', 'float', @@ -576,15 +577,9 @@ let QUERYPARAM = 'query', return; } - // Set type to binary - if (property.format === 'binary') { - property.type = 'binary'; - } - if ( property.format === 'decimal' || property.format === 'byte' || - property.format === 'binary' || property.format === 'password' || property.format === 'unix-time' ) { @@ -848,7 +843,6 @@ let QUERYPARAM = 'query', for (const prop in resolvedSchema.properties) { if (resolvedSchema.properties.hasOwnProperty(prop)) { if ( - resolvedSchema.properties[prop].format === 'binary' || resolvedSchema.properties[prop].format === 'byte' || resolvedSchema.properties[prop].format === 'decimal' ) { @@ -1363,7 +1357,6 @@ let QUERYPARAM = 'query', } if ( - requestBodySchema.properties[prop].format === 'binary' || requestBodySchema.properties[prop].format === 'byte' || requestBodySchema.properties[prop].format === 'decimal' ) { @@ -1523,7 +1516,7 @@ let QUERYPARAM = 'query', // TODO: Add handling for headers from encoding - if (paramSchema && paramSchema.type === 'binary') { + if (paramSchema && paramSchema.type === 'string' && paramSchema.format === 'binary') { param = { key, value: '', diff --git a/libV2/validationUtils.js b/libV2/validationUtils.js index f5f439422..65248fe65 100644 --- a/libV2/validationUtils.js +++ b/libV2/validationUtils.js @@ -85,7 +85,8 @@ schemaFaker.option({ maxItems: 20, // limit on maximum number of items faked for (type: array) useDefaultValue: true, ignoreMissingRefs: true, - avoidExampleItemsLength: true // option to avoid validating type array schema example's minItems and maxItems props. + avoidExampleItemsLength: true, // option to avoid validating type array schema example's minItems and maxItems props. + failOnInvalidFormat: false }); /** diff --git a/test/unit/faker.test.js b/test/unit/faker.test.js index 465e4ae62..4e326c21a 100644 --- a/test/unit/faker.test.js +++ b/test/unit/faker.test.js @@ -13,7 +13,8 @@ describe('JSON SCHEMA FAKER TESTS', function () { useDefaultValue: true, useExamplesValue: true, ignoreMissingRefs: true, - avoidExampleItemsLength: false + avoidExampleItemsLength: false, + failOnInvalidFormat: false }); }); @@ -27,7 +28,8 @@ describe('JSON SCHEMA FAKER TESTS', function () { maxItems: 20, useDefaultValue: true, ignoreMissingRefs: true, - avoidExampleItemsLength: true + avoidExampleItemsLength: true, + failOnInvalidFormat: false }); }); From 672fef9f57f499addefef3eae589a2807e3d82a8 Mon Sep 17 00:00:00 2001 From: Wojciech Maj Date: Tue, 16 Jul 2024 22:55:05 +0200 Subject: [PATCH 06/13] Replace traverse with neotraverse This PR replaces traverse with neotraverse, a fork and TypeScript rewrite of traverse with 0 dependencies (as opposed to 66: https://npmgraph.js.org/?q=traverse) and lots of improvements. --- lib/bundle.js | 2 +- lib/deref.js | 2 +- lib/relatedFiles.js | 2 +- lib/schemaUtils.js | 2 +- package-lock.json | 26 +++++++++++++++----------- package.json | 2 +- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/lib/bundle.js b/lib/bundle.js index e97cc190b..6a4cdf083 100644 --- a/lib/bundle.js +++ b/lib/bundle.js @@ -14,7 +14,7 @@ const _ = require('lodash'), jsonPointerDecodeAndReplace, generateObjectName } = require('./jsonPointer'), - traverseUtility = require('traverse'), + traverseUtility = require('neotraverse/legacy'), parse = require('./parse.js'), { ParseError } = require('./common/ParseError'), Utils = require('./utils'), diff --git a/lib/deref.js b/lib/deref.js index baa2e5894..98cee4354 100644 --- a/lib/deref.js +++ b/lib/deref.js @@ -35,7 +35,7 @@ const _ = require('lodash'), isAllOf: false }, DEFAULT_SCHEMA_UTILS = require('./30XUtils/schemaUtils30X'), - traverseUtility = require('traverse'), + traverseUtility = require('neotraverse/legacy'), PROPERTIES_TO_ASSIGN_ON_CASCADE = ['type', 'nullable']; /** diff --git a/lib/relatedFiles.js b/lib/relatedFiles.js index 08563731d..0d40c21b5 100644 --- a/lib/relatedFiles.js +++ b/lib/relatedFiles.js @@ -1,5 +1,5 @@ const parse = require('./parse.js'), - traverseUtility = require('traverse'), + traverseUtility = require('neotraverse/legacy'), BROWSER = 'browser', { DFS } = require('./dfs'), { isExtRef, removeLocalReferenceFromPath } = require('./jsonPointer'); diff --git a/lib/schemaUtils.js b/lib/schemaUtils.js index 78a49461f..2a6f7ad0a 100644 --- a/lib/schemaUtils.js +++ b/lib/schemaUtils.js @@ -24,7 +24,7 @@ const { formatDataPath, checkIsCorrectType, isKnownType } = require('./common/sc { Node, Trie } = require('./trie.js'), { validateSchema } = require('./ajValidation/ajvValidation'), inputValidation = require('./30XUtils/inputValidation'), - traverseUtility = require('traverse'), + traverseUtility = require('neotraverse/legacy'), { ParseError } = require('./common/ParseError.js'), SCHEMA_FORMATS = { DEFAULT: 'default', // used for non-request-body data and json diff --git a/package-lock.json b/package-lock.json index ee461f238..648622b70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,12 +18,12 @@ "js-yaml": "4.1.0", "json-schema-merge-allof": "0.8.1", "lodash": "4.17.21", + "neotraverse": "0.6.14", "oas-resolver-browser": "2.5.6", "object-hash": "3.0.0", "path-browserify": "1.0.1", "postman-collection": "^4.4.0", "swagger2openapi": "7.0.8", - "traverse": "0.6.6", "yaml": "1.10.2" }, "bin": { @@ -3261,6 +3261,15 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, + "node_modules/neotraverse": { + "version": "0.6.14", + "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.14.tgz", + "integrity": "sha512-co+mqQYo1wf3CRWRHWOT1ZgG7gsdNZSrrQkWxVnGAlD/UA/IZuPlE9UNkGZRwTLeml+dT5BytRW4ANqzPQeNLg==", + "license": "MIT", + "engines": { + "node": ">= 18" + } + }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -5224,11 +5233,6 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, - "node_modules/traverse": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==" - }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -8066,6 +8070,11 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, + "neotraverse": { + "version": "0.6.14", + "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.14.tgz", + "integrity": "sha512-co+mqQYo1wf3CRWRHWOT1ZgG7gsdNZSrrQkWxVnGAlD/UA/IZuPlE9UNkGZRwTLeml+dT5BytRW4ANqzPQeNLg==" + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -9570,11 +9579,6 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, - "traverse": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==" - }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", diff --git a/package.json b/package.json index 281565f8f..914be2c5b 100644 --- a/package.json +++ b/package.json @@ -124,13 +124,13 @@ "js-yaml": "4.1.0", "json-schema-merge-allof": "0.8.1", "lodash": "4.17.21", + "neotraverse": "0.6.14", "oas-resolver-browser": "2.5.6", "object-hash": "3.0.0", "graphlib": "2.1.8", "path-browserify": "1.0.1", "postman-collection": "^4.4.0", "swagger2openapi": "7.0.8", - "traverse": "0.6.6", "yaml": "1.10.2" }, "author": "Postman Labs ", From c8af7357d5fbe1e26979226035a40ec2e82b6d33 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 22 Jul 2024 09:39:54 +0000 Subject: [PATCH 07/13] Prepare release v4.23.0 --- CHANGELOG.md | 6 +++++- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93a7c02dd..f90e2a13f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +## [v4.23.0] - 2024-07-22 + ## [v4.22.0] - 2024-07-10 ### Chore @@ -626,7 +628,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.22.0...HEAD +[Unreleased]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.23.0...HEAD + +[v4.23.0]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.22.0...v4.23.0 [v4.22.0]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.21.0...v4.22.0 diff --git a/package-lock.json b/package-lock.json index d53bb8bb4..05a497c95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "openapi-to-postmanv2", - "version": "4.22.0", + "version": "4.23.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "openapi-to-postmanv2", - "version": "4.22.0", + "version": "4.23.0", "license": "Apache-2.0", "dependencies": { "ajv": "8.11.0", diff --git a/package.json b/package.json index 914be2c5b..06679f90b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openapi-to-postmanv2", - "version": "4.22.0", + "version": "4.23.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", From cde7eddde0057d2efb256b73d819f205c9c3b9f6 Mon Sep 17 00:00:00 2001 From: Vishal Shingala Date: Mon, 22 Jul 2024 15:15:06 +0530 Subject: [PATCH 08/13] Update CHANGELOG.md --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f90e2a13f..540c7561d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,19 @@ ## [v4.23.0] - 2024-07-22 +### Added + +- Conversion - Added option to set preferred request body content-type and use the first mentioned content-type as request body. + +### Fixed + +- Fixed issue with getOptions() API where default module version was still v1. +- Fix to convert "format:binary" to "type:file" for requests with formdata body. + +### Chore + +- Replace traverse with neotraverse to reduce related dependencies. + ## [v4.22.0] - 2024-07-10 ### Chore From 1fca9577d2be157b458162309d7d50fde0feb376 Mon Sep 17 00:00:00 2001 From: Vishal Shingala Date: Mon, 22 Jul 2024 15:39:05 +0530 Subject: [PATCH 09/13] Revert "Replace traverse with neotraverse" --- lib/bundle.js | 2 +- lib/deref.js | 2 +- lib/relatedFiles.js | 2 +- lib/schemaUtils.js | 2 +- package-lock.json | 26 +++++++++++--------------- package.json | 2 +- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/lib/bundle.js b/lib/bundle.js index 6a4cdf083..e97cc190b 100644 --- a/lib/bundle.js +++ b/lib/bundle.js @@ -14,7 +14,7 @@ const _ = require('lodash'), jsonPointerDecodeAndReplace, generateObjectName } = require('./jsonPointer'), - traverseUtility = require('neotraverse/legacy'), + traverseUtility = require('traverse'), parse = require('./parse.js'), { ParseError } = require('./common/ParseError'), Utils = require('./utils'), diff --git a/lib/deref.js b/lib/deref.js index 98cee4354..baa2e5894 100644 --- a/lib/deref.js +++ b/lib/deref.js @@ -35,7 +35,7 @@ const _ = require('lodash'), isAllOf: false }, DEFAULT_SCHEMA_UTILS = require('./30XUtils/schemaUtils30X'), - traverseUtility = require('neotraverse/legacy'), + traverseUtility = require('traverse'), PROPERTIES_TO_ASSIGN_ON_CASCADE = ['type', 'nullable']; /** diff --git a/lib/relatedFiles.js b/lib/relatedFiles.js index 0d40c21b5..08563731d 100644 --- a/lib/relatedFiles.js +++ b/lib/relatedFiles.js @@ -1,5 +1,5 @@ const parse = require('./parse.js'), - traverseUtility = require('neotraverse/legacy'), + traverseUtility = require('traverse'), BROWSER = 'browser', { DFS } = require('./dfs'), { isExtRef, removeLocalReferenceFromPath } = require('./jsonPointer'); diff --git a/lib/schemaUtils.js b/lib/schemaUtils.js index 2a6f7ad0a..78a49461f 100644 --- a/lib/schemaUtils.js +++ b/lib/schemaUtils.js @@ -24,7 +24,7 @@ const { formatDataPath, checkIsCorrectType, isKnownType } = require('./common/sc { Node, Trie } = require('./trie.js'), { validateSchema } = require('./ajValidation/ajvValidation'), inputValidation = require('./30XUtils/inputValidation'), - traverseUtility = require('neotraverse/legacy'), + traverseUtility = require('traverse'), { ParseError } = require('./common/ParseError.js'), SCHEMA_FORMATS = { DEFAULT: 'default', // used for non-request-body data and json diff --git a/package-lock.json b/package-lock.json index 05a497c95..b67db2590 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,12 +18,12 @@ "js-yaml": "4.1.0", "json-schema-merge-allof": "0.8.1", "lodash": "4.17.21", - "neotraverse": "0.6.14", "oas-resolver-browser": "2.5.6", "object-hash": "3.0.0", "path-browserify": "1.0.1", "postman-collection": "^4.4.0", "swagger2openapi": "7.0.8", + "traverse": "0.6.6", "yaml": "1.10.2" }, "bin": { @@ -3261,15 +3261,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/neotraverse": { - "version": "0.6.14", - "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.14.tgz", - "integrity": "sha512-co+mqQYo1wf3CRWRHWOT1ZgG7gsdNZSrrQkWxVnGAlD/UA/IZuPlE9UNkGZRwTLeml+dT5BytRW4ANqzPQeNLg==", - "license": "MIT", - "engines": { - "node": ">= 18" - } - }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -5233,6 +5224,11 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, + "node_modules/traverse": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", + "integrity": "sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==" + }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -8070,11 +8066,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "neotraverse": { - "version": "0.6.14", - "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.14.tgz", - "integrity": "sha512-co+mqQYo1wf3CRWRHWOT1ZgG7gsdNZSrrQkWxVnGAlD/UA/IZuPlE9UNkGZRwTLeml+dT5BytRW4ANqzPQeNLg==" - }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -9579,6 +9570,11 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, + "traverse": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", + "integrity": "sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==" + }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", diff --git a/package.json b/package.json index 06679f90b..4d452aec6 100644 --- a/package.json +++ b/package.json @@ -124,13 +124,13 @@ "js-yaml": "4.1.0", "json-schema-merge-allof": "0.8.1", "lodash": "4.17.21", - "neotraverse": "0.6.14", "oas-resolver-browser": "2.5.6", "object-hash": "3.0.0", "graphlib": "2.1.8", "path-browserify": "1.0.1", "postman-collection": "^4.4.0", "swagger2openapi": "7.0.8", + "traverse": "0.6.6", "yaml": "1.10.2" }, "author": "Postman Labs ", From 8ffd040f1d33094eda2abee4fa7d131cd40be143 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 22 Jul 2024 10:14:28 +0000 Subject: [PATCH 10/13] Prepare release v4.23.1 --- CHANGELOG.md | 6 +++++- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 540c7561d..92227c8da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +## [v4.23.1] - 2024-07-22 + ## [v4.23.0] - 2024-07-22 ### Added @@ -641,7 +643,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.23.0...HEAD +[Unreleased]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.23.1...HEAD + +[v4.23.1]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.23.0...v4.23.1 [v4.23.0]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.22.0...v4.23.0 diff --git a/package-lock.json b/package-lock.json index b67db2590..0148f4009 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "openapi-to-postmanv2", - "version": "4.23.0", + "version": "4.23.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "openapi-to-postmanv2", - "version": "4.23.0", + "version": "4.23.1", "license": "Apache-2.0", "dependencies": { "ajv": "8.11.0", diff --git a/package.json b/package.json index 4d452aec6..328143770 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openapi-to-postmanv2", - "version": "4.23.0", + "version": "4.23.1", "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", From 5267cb9235e1451262d0af20c3a90b7d5c46ae1d Mon Sep 17 00:00:00 2001 From: Vishal Shingala Date: Mon, 22 Jul 2024 15:45:36 +0530 Subject: [PATCH 11/13] Update CHANGELOG.md --- CHANGELOG.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92227c8da..32a9c02ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,6 @@ ## [v4.23.1] - 2024-07-22 -## [v4.23.0] - 2024-07-22 - ### Added - Conversion - Added option to set preferred request body content-type and use the first mentioned content-type as request body. @@ -15,10 +13,6 @@ - Fixed issue with getOptions() API where default module version was still v1. - Fix to convert "format:binary" to "type:file" for requests with formdata body. -### Chore - -- Replace traverse with neotraverse to reduce related dependencies. - ## [v4.22.0] - 2024-07-10 ### Chore @@ -645,9 +639,7 @@ Newer releases follow the [Keep a Changelog](https://keepachangelog.com/en/1.0.0 [Unreleased]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.23.1...HEAD -[v4.23.1]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.23.0...v4.23.1 - -[v4.23.0]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.22.0...v4.23.0 +[v4.23.1]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.22.0...v4.23.1 [v4.22.0]: https://github.com/postmanlabs/openapi-to-postman/compare/v4.21.0...v4.22.0 From 38ad4e9ff5d32fe5a8b838931ceba76d202fb038 Mon Sep 17 00:00:00 2001 From: Vishal Shingala Date: Mon, 22 Jul 2024 15:58:59 +0530 Subject: [PATCH 12/13] Replace traverse with neotraverse --- lib/bundle.js | 2 +- lib/deref.js | 2 +- lib/relatedFiles.js | 2 +- lib/schemaUtils.js | 2 +- package-lock.json | 25 ++++++++++++++----------- package.json | 2 +- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/lib/bundle.js b/lib/bundle.js index e97cc190b..6a4cdf083 100644 --- a/lib/bundle.js +++ b/lib/bundle.js @@ -14,7 +14,7 @@ const _ = require('lodash'), jsonPointerDecodeAndReplace, generateObjectName } = require('./jsonPointer'), - traverseUtility = require('traverse'), + traverseUtility = require('neotraverse/legacy'), parse = require('./parse.js'), { ParseError } = require('./common/ParseError'), Utils = require('./utils'), diff --git a/lib/deref.js b/lib/deref.js index baa2e5894..98cee4354 100644 --- a/lib/deref.js +++ b/lib/deref.js @@ -35,7 +35,7 @@ const _ = require('lodash'), isAllOf: false }, DEFAULT_SCHEMA_UTILS = require('./30XUtils/schemaUtils30X'), - traverseUtility = require('traverse'), + traverseUtility = require('neotraverse/legacy'), PROPERTIES_TO_ASSIGN_ON_CASCADE = ['type', 'nullable']; /** diff --git a/lib/relatedFiles.js b/lib/relatedFiles.js index 08563731d..0d40c21b5 100644 --- a/lib/relatedFiles.js +++ b/lib/relatedFiles.js @@ -1,5 +1,5 @@ const parse = require('./parse.js'), - traverseUtility = require('traverse'), + traverseUtility = require('neotraverse/legacy'), BROWSER = 'browser', { DFS } = require('./dfs'), { isExtRef, removeLocalReferenceFromPath } = require('./jsonPointer'); diff --git a/lib/schemaUtils.js b/lib/schemaUtils.js index 78a49461f..2a6f7ad0a 100644 --- a/lib/schemaUtils.js +++ b/lib/schemaUtils.js @@ -24,7 +24,7 @@ const { formatDataPath, checkIsCorrectType, isKnownType } = require('./common/sc { Node, Trie } = require('./trie.js'), { validateSchema } = require('./ajValidation/ajvValidation'), inputValidation = require('./30XUtils/inputValidation'), - traverseUtility = require('traverse'), + traverseUtility = require('neotraverse/legacy'), { ParseError } = require('./common/ParseError.js'), SCHEMA_FORMATS = { DEFAULT: 'default', // used for non-request-body data and json diff --git a/package-lock.json b/package-lock.json index 0148f4009..471c462e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,12 +18,12 @@ "js-yaml": "4.1.0", "json-schema-merge-allof": "0.8.1", "lodash": "4.17.21", + "neotraverse": "0.6.14", "oas-resolver-browser": "2.5.6", "object-hash": "3.0.0", "path-browserify": "1.0.1", "postman-collection": "^4.4.0", "swagger2openapi": "7.0.8", - "traverse": "0.6.6", "yaml": "1.10.2" }, "bin": { @@ -3261,6 +3261,14 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, + "node_modules/neotraverse": { + "version": "0.6.14", + "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.14.tgz", + "integrity": "sha512-co+mqQYo1wf3CRWRHWOT1ZgG7gsdNZSrrQkWxVnGAlD/UA/IZuPlE9UNkGZRwTLeml+dT5BytRW4ANqzPQeNLg==", + "engines": { + "node": ">= 18" + } + }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -5224,11 +5232,6 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, - "node_modules/traverse": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==" - }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -8066,6 +8069,11 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, + "neotraverse": { + "version": "0.6.14", + "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.14.tgz", + "integrity": "sha512-co+mqQYo1wf3CRWRHWOT1ZgG7gsdNZSrrQkWxVnGAlD/UA/IZuPlE9UNkGZRwTLeml+dT5BytRW4ANqzPQeNLg==" + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -9570,11 +9578,6 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, - "traverse": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==" - }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", diff --git a/package.json b/package.json index 328143770..9d454650d 100644 --- a/package.json +++ b/package.json @@ -124,13 +124,13 @@ "js-yaml": "4.1.0", "json-schema-merge-allof": "0.8.1", "lodash": "4.17.21", + "neotraverse": "0.6.14", "oas-resolver-browser": "2.5.6", "object-hash": "3.0.0", "graphlib": "2.1.8", "path-browserify": "1.0.1", "postman-collection": "^4.4.0", "swagger2openapi": "7.0.8", - "traverse": "0.6.6", "yaml": "1.10.2" }, "author": "Postman Labs ", From 3eddcaaa8b446c31428043dd5b0da107baab4ab8 Mon Sep 17 00:00:00 2001 From: Vishal Shingala Date: Mon, 22 Jul 2024 16:16:54 +0530 Subject: [PATCH 13/13] Update neotraverse to latest version --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 471c462e1..28d6fb120 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "js-yaml": "4.1.0", "json-schema-merge-allof": "0.8.1", "lodash": "4.17.21", - "neotraverse": "0.6.14", + "neotraverse": "0.6.15", "oas-resolver-browser": "2.5.6", "object-hash": "3.0.0", "path-browserify": "1.0.1", @@ -3262,11 +3262,11 @@ "dev": true }, "node_modules/neotraverse": { - "version": "0.6.14", - "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.14.tgz", - "integrity": "sha512-co+mqQYo1wf3CRWRHWOT1ZgG7gsdNZSrrQkWxVnGAlD/UA/IZuPlE9UNkGZRwTLeml+dT5BytRW4ANqzPQeNLg==", + "version": "0.6.15", + "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.15.tgz", + "integrity": "sha512-HZpdkco+JeXq0G+WWpMJ4NsX3pqb5O7eR9uGz3FfoFt+LYzU8iRWp49nJtud6hsDoywM8tIrDo3gjgmOqJA8LA==", "engines": { - "node": ">= 18" + "node": ">= 10" } }, "node_modules/nice-try": { @@ -8070,9 +8070,9 @@ "dev": true }, "neotraverse": { - "version": "0.6.14", - "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.14.tgz", - "integrity": "sha512-co+mqQYo1wf3CRWRHWOT1ZgG7gsdNZSrrQkWxVnGAlD/UA/IZuPlE9UNkGZRwTLeml+dT5BytRW4ANqzPQeNLg==" + "version": "0.6.15", + "resolved": "https://registry.npmjs.org/neotraverse/-/neotraverse-0.6.15.tgz", + "integrity": "sha512-HZpdkco+JeXq0G+WWpMJ4NsX3pqb5O7eR9uGz3FfoFt+LYzU8iRWp49nJtud6hsDoywM8tIrDo3gjgmOqJA8LA==" }, "nice-try": { "version": "1.0.5", diff --git a/package.json b/package.json index 9d454650d..4f2b9f047 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "js-yaml": "4.1.0", "json-schema-merge-allof": "0.8.1", "lodash": "4.17.21", - "neotraverse": "0.6.14", + "neotraverse": "0.6.15", "oas-resolver-browser": "2.5.6", "object-hash": "3.0.0", "graphlib": "2.1.8",