From 02f748d6357f48262a066772209f52ce94a2e966 Mon Sep 17 00:00:00 2001 From: Jon Ursenbach Date: Mon, 3 Jan 2022 15:42:25 -0800 Subject: [PATCH] chore(deps): upgrading oas-related deps (#420) --- .../cmds/__snapshots__/openapi.test.js.snap | 4 +- .../cmds/__snapshots__/validate.test.js.snap | 6 +- package-lock.json | 121 +++++++++--------- package.json | 6 +- 4 files changed, 70 insertions(+), 67 deletions(-) diff --git a/__tests__/cmds/__snapshots__/openapi.test.js.snap b/__tests__/cmds/__snapshots__/openapi.test.js.snap index c8e446ddb..98997fea1 100644 --- a/__tests__/cmds/__snapshots__/openapi.test.js.snap +++ b/__tests__/cmds/__snapshots__/openapi.test.js.snap @@ -3,12 +3,12 @@ exports[`rdme openapi error handling should throw an error if an invalid OpenAPI 3.1 definition is supplied 1`] = ` [SyntaxError: OpenAPI schema validation failed. -REQUIRED must have required property 'openIdConnectUrl' +REQUIRED must have required property 'name'   24 | "components": {   25 | "securitySchemes": { > 26 | "tlsAuth": { -  | ^ ☹️ openIdConnectUrl is missing here! +  | ^ ☹️ name is missing here!   27 | "type": "mutualTLS"   28 | }   29 | }] diff --git a/__tests__/cmds/__snapshots__/validate.test.js.snap b/__tests__/cmds/__snapshots__/validate.test.js.snap index 9a25efee2..eab278312 100644 --- a/__tests__/cmds/__snapshots__/validate.test.js.snap +++ b/__tests__/cmds/__snapshots__/validate.test.js.snap @@ -3,7 +3,7 @@ exports[`rdme validate error handling should throw an error if an in valid Swagger definition is supplied 1`] = ` [Error: Swagger schema validation failed. -ADDTIONAL PROPERTY must NOT have additional properties +ADDITIONAL PROPERTY must NOT have additional properties   23 | "description": "Find out more",   24 | "url": "http://swagger.io", @@ -17,12 +17,12 @@ exports[`rdme validate error handling should throw an error if an in valid Swagg exports[`rdme validate error handling should throw an error if an invalid OpenAPI 3.1 definition is supplied 1`] = ` [Error: OpenAPI schema validation failed. -REQUIRED must have required property 'openIdConnectUrl' +REQUIRED must have required property 'name'   24 | "components": {   25 | "securitySchemes": { > 26 | "tlsAuth": { -  | ^ ☹️ openIdConnectUrl is missing here! +  | ^ ☹️ name is missing here!   27 | "type": "mutualTLS"   28 | }   29 | }] diff --git a/package-lock.json b/package-lock.json index 87e1b21fd..3756568dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,8 +21,8 @@ "gray-matter": "^4.0.1", "isemail": "^3.1.3", "node-fetch": "^2.6.1", - "oas": "^17.3.1", - "oas-normalize": "^5.0.5", + "oas": "^17.4.1", + "oas-normalize": "^5.1.0", "open": "^8.2.1", "parse-link-header": "^2.0.0", "read": "^1.0.7", @@ -34,7 +34,7 @@ }, "devDependencies": { "@readme/eslint-config": "^8.0.2", - "@readme/oas-examples": "^4.3.2", + "@readme/oas-examples": "^4.3.3", "eslint": "^8.3.0", "jest": "^27.2.0", "nock": "^13.1.1", @@ -1410,9 +1410,9 @@ } }, "node_modules/@readme/better-ajv-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@readme/better-ajv-errors/-/better-ajv-errors-1.3.0.tgz", - "integrity": "sha512-9yDff0hkbJJ/KaT+pVdHi6+2FeHsaImOz/LGqYp/auMBFSzUcP+y2kcte0pHrnePHgPp+Lt5H91RS5unwM++6Q==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@readme/better-ajv-errors/-/better-ajv-errors-1.4.1.tgz", + "integrity": "sha512-MPDca1lZBHuTvx3SntTIW4CPjJy4krgkOpF2TQLgx2pVnk1hqLTM39Kn6z5PWa0mPaLcK4HnPQ9Rdhk0qn1zIA==", "dependencies": { "@babel/code-frame": "^7.16.0", "@babel/runtime": "^7.16.0", @@ -1490,25 +1490,28 @@ } }, "node_modules/@readme/oas-examples": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@readme/oas-examples/-/oas-examples-4.3.2.tgz", - "integrity": "sha512-zEK4w0BtSc5f4To7LyFOyGdv/El2oOy/xbU3KW3kzmbH3P4ZFYAHpMrXViZYsKjUZJ5w8VGNJeVfTXVs89eZkA==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@readme/oas-examples/-/oas-examples-4.3.3.tgz", + "integrity": "sha512-7f28RJplXQQ5UpUj+mVgia6sONDOzEc8gl68V7xantz88Q4YTR34Y0AVUwMyOwx/poNL+PaEoY4SNylw7FTeJw==", "dev": true }, "node_modules/@readme/openapi-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@readme/openapi-parser/-/openapi-parser-1.2.1.tgz", - "integrity": "sha512-WNOJypM5UTiTXZmQUU416bX2z5enrA3gLd7ZJC/SszMyvQjW/ygOJjonJ3I+X9uRQhxGIDV/zgcKDtx3m0Zfng==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@readme/openapi-parser/-/openapi-parser-2.0.0.tgz", + "integrity": "sha512-QzDeBmARj2+PVnJswWQmiEkTjJljNKwP8EBCOjp0+3GmJp6BDEzy6VUEppGYdUJRaVfrLgqdYoiY1aFWlCBMVQ==", "dependencies": { "@apidevtools/openapi-schemas": "^2.1.0", "@apidevtools/swagger-methods": "^3.0.2", "@jsdevtools/ono": "^7.1.3", - "@readme/better-ajv-errors": "^1.1.0", + "@readme/better-ajv-errors": "^1.4.0", "@readme/json-schema-ref-parser": "^1.0.0", "ajv": "^8.6.3", "ajv-draft-04": "^1.0.0", "call-me-maybe": "^1.0.1" }, + "engines": { + "node": "^12 || ^14 || ^16" + }, "peerDependencies": { "openapi-types": ">=7" } @@ -7539,9 +7542,9 @@ "dev": true }, "node_modules/oas": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/oas/-/oas-17.4.0.tgz", - "integrity": "sha512-opxNNY2bZbylmguK2DVVVRwEY43xlXCKgup+gesdtrd1XLG4d14yr7AlQsyui/r9D8212m82gxkKQneAvTe8Mg==", + "version": "17.4.1", + "resolved": "https://registry.npmjs.org/oas/-/oas-17.4.1.tgz", + "integrity": "sha512-7fUoZ3CVhgHBLYEfaanNB3SY2PDxzYz2VqIGcUeQOpQ3T2j96R1FzWOlLsmP1BIIz0eTij0hzXJ6eT2A3vMdtQ==", "dependencies": { "@apidevtools/json-schema-ref-parser": "^9.0.6", "@types/json-schema": "^7.0.9", @@ -7554,8 +7557,8 @@ "jsonpointer": "^5.0.0", "memoizee": "^0.4.14", "minimist": "^1.2.0", - "oas-normalize": "^5.0.5", - "openapi-types": "^9.3.0", + "oas-normalize": "^5.1.0", + "openapi-types": "^10.0.0", "path-to-regexp": "^6.2.0", "swagger-inline": "^5.0.2" }, @@ -7588,11 +7591,11 @@ } }, "node_modules/oas-normalize": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/oas-normalize/-/oas-normalize-5.0.5.tgz", - "integrity": "sha512-Ob+yK3Xh3fJn15rg7iu9ib+hHoHMwmIR0WBfhzX17eJU+LWEYMtaiYes3080ic4QE4O36FkIwuUMIyDCNv0OuQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/oas-normalize/-/oas-normalize-5.1.0.tgz", + "integrity": "sha512-lPVcc+yUzQZOKMKm6SXjmXI69Fgx3rPoPwRo1c/iaGdaVaoOSyB3NlweaW0qqdfuIx+gRz6ssTo9rpHvjsmQmA==", "dependencies": { - "@readme/openapi-parser": "^1.2.1", + "@readme/openapi-parser": "^2.0.0", "js-yaml": "^4.1.0", "node-fetch": "^2.6.1", "swagger2openapi": "^7.0.8" @@ -7636,9 +7639,9 @@ } }, "node_modules/oas-resolver/node_modules/yargs": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.0.tgz", - "integrity": "sha512-GQl1pWyDoGptFPJx9b9L6kmR33TGusZvXIZUT+BOz9f7X2L94oeAskFYLEg/FkhV06zZPBYLvLZRWeYId29lew==", + "version": "17.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", + "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -7825,9 +7828,9 @@ } }, "node_modules/openapi-types": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.1.tgz", - "integrity": "sha512-/Yvsd2D7miYB4HLJ3hOOS0+vnowQpaT75FsHzr/y5M9P4q9bwa7RcbW2YdH6KZBn8ceLbKGnHxMZ1CHliGHUFw==" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-10.0.0.tgz", + "integrity": "sha512-Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ==" }, "node_modules/optionator": { "version": "0.8.3", @@ -8982,9 +8985,9 @@ } }, "node_modules/swagger2openapi/node_modules/yargs": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.0.tgz", - "integrity": "sha512-GQl1pWyDoGptFPJx9b9L6kmR33TGusZvXIZUT+BOz9f7X2L94oeAskFYLEg/FkhV06zZPBYLvLZRWeYId29lew==", + "version": "17.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", + "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -10727,9 +10730,9 @@ } }, "@readme/better-ajv-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@readme/better-ajv-errors/-/better-ajv-errors-1.3.0.tgz", - "integrity": "sha512-9yDff0hkbJJ/KaT+pVdHi6+2FeHsaImOz/LGqYp/auMBFSzUcP+y2kcte0pHrnePHgPp+Lt5H91RS5unwM++6Q==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@readme/better-ajv-errors/-/better-ajv-errors-1.4.1.tgz", + "integrity": "sha512-MPDca1lZBHuTvx3SntTIW4CPjJy4krgkOpF2TQLgx2pVnk1hqLTM39Kn6z5PWa0mPaLcK4HnPQ9Rdhk0qn1zIA==", "requires": { "@babel/code-frame": "^7.16.0", "@babel/runtime": "^7.16.0", @@ -10793,20 +10796,20 @@ } }, "@readme/oas-examples": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@readme/oas-examples/-/oas-examples-4.3.2.tgz", - "integrity": "sha512-zEK4w0BtSc5f4To7LyFOyGdv/El2oOy/xbU3KW3kzmbH3P4ZFYAHpMrXViZYsKjUZJ5w8VGNJeVfTXVs89eZkA==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@readme/oas-examples/-/oas-examples-4.3.3.tgz", + "integrity": "sha512-7f28RJplXQQ5UpUj+mVgia6sONDOzEc8gl68V7xantz88Q4YTR34Y0AVUwMyOwx/poNL+PaEoY4SNylw7FTeJw==", "dev": true }, "@readme/openapi-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@readme/openapi-parser/-/openapi-parser-1.2.1.tgz", - "integrity": "sha512-WNOJypM5UTiTXZmQUU416bX2z5enrA3gLd7ZJC/SszMyvQjW/ygOJjonJ3I+X9uRQhxGIDV/zgcKDtx3m0Zfng==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@readme/openapi-parser/-/openapi-parser-2.0.0.tgz", + "integrity": "sha512-QzDeBmARj2+PVnJswWQmiEkTjJljNKwP8EBCOjp0+3GmJp6BDEzy6VUEppGYdUJRaVfrLgqdYoiY1aFWlCBMVQ==", "requires": { "@apidevtools/openapi-schemas": "^2.1.0", "@apidevtools/swagger-methods": "^3.0.2", "@jsdevtools/ono": "^7.1.3", - "@readme/better-ajv-errors": "^1.1.0", + "@readme/better-ajv-errors": "^1.4.0", "@readme/json-schema-ref-parser": "^1.0.0", "ajv": "^8.6.3", "ajv-draft-04": "^1.0.0", @@ -15458,9 +15461,9 @@ "dev": true }, "oas": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/oas/-/oas-17.4.0.tgz", - "integrity": "sha512-opxNNY2bZbylmguK2DVVVRwEY43xlXCKgup+gesdtrd1XLG4d14yr7AlQsyui/r9D8212m82gxkKQneAvTe8Mg==", + "version": "17.4.1", + "resolved": "https://registry.npmjs.org/oas/-/oas-17.4.1.tgz", + "integrity": "sha512-7fUoZ3CVhgHBLYEfaanNB3SY2PDxzYz2VqIGcUeQOpQ3T2j96R1FzWOlLsmP1BIIz0eTij0hzXJ6eT2A3vMdtQ==", "requires": { "@apidevtools/json-schema-ref-parser": "^9.0.6", "@types/json-schema": "^7.0.9", @@ -15473,8 +15476,8 @@ "jsonpointer": "^5.0.0", "memoizee": "^0.4.14", "minimist": "^1.2.0", - "oas-normalize": "^5.0.5", - "openapi-types": "^9.3.0", + "oas-normalize": "^5.1.0", + "openapi-types": "^10.0.0", "path-to-regexp": "^6.2.0", "swagger-inline": "^5.0.2" } @@ -15498,11 +15501,11 @@ } }, "oas-normalize": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/oas-normalize/-/oas-normalize-5.0.5.tgz", - "integrity": "sha512-Ob+yK3Xh3fJn15rg7iu9ib+hHoHMwmIR0WBfhzX17eJU+LWEYMtaiYes3080ic4QE4O36FkIwuUMIyDCNv0OuQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/oas-normalize/-/oas-normalize-5.1.0.tgz", + "integrity": "sha512-lPVcc+yUzQZOKMKm6SXjmXI69Fgx3rPoPwRo1c/iaGdaVaoOSyB3NlweaW0qqdfuIx+gRz6ssTo9rpHvjsmQmA==", "requires": { - "@readme/openapi-parser": "^1.2.1", + "@readme/openapi-parser": "^2.0.0", "js-yaml": "^4.1.0", "node-fetch": "^2.6.1", "swagger2openapi": "^7.0.8" @@ -15536,9 +15539,9 @@ }, "dependencies": { "yargs": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.0.tgz", - "integrity": "sha512-GQl1pWyDoGptFPJx9b9L6kmR33TGusZvXIZUT+BOz9f7X2L94oeAskFYLEg/FkhV06zZPBYLvLZRWeYId29lew==", + "version": "17.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", + "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -15673,9 +15676,9 @@ } }, "openapi-types": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.1.tgz", - "integrity": "sha512-/Yvsd2D7miYB4HLJ3hOOS0+vnowQpaT75FsHzr/y5M9P4q9bwa7RcbW2YdH6KZBn8ceLbKGnHxMZ1CHliGHUFw==" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-10.0.0.tgz", + "integrity": "sha512-Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ==" }, "optionator": { "version": "0.8.3", @@ -16569,9 +16572,9 @@ }, "dependencies": { "yargs": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.0.tgz", - "integrity": "sha512-GQl1pWyDoGptFPJx9b9L6kmR33TGusZvXIZUT+BOz9f7X2L94oeAskFYLEg/FkhV06zZPBYLvLZRWeYId29lew==", + "version": "17.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", + "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", diff --git a/package.json b/package.json index 5e65fe29a..6fa7c9163 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,8 @@ "gray-matter": "^4.0.1", "isemail": "^3.1.3", "node-fetch": "^2.6.1", - "oas": "^17.3.1", - "oas-normalize": "^5.0.5", + "oas": "^17.4.1", + "oas-normalize": "^5.1.0", "open": "^8.2.1", "parse-link-header": "^2.0.0", "read": "^1.0.7", @@ -55,7 +55,7 @@ }, "devDependencies": { "@readme/eslint-config": "^8.0.2", - "@readme/oas-examples": "^4.3.2", + "@readme/oas-examples": "^4.3.3", "eslint": "^8.3.0", "jest": "^27.2.0", "nock": "^13.1.1",