From 1fca9577d2be157b458162309d7d50fde0feb376 Mon Sep 17 00:00:00 2001 From: Vishal Shingala Date: Mon, 22 Jul 2024 15:39:05 +0530 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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