From 11b5305b7feb63ba6dde0db27593abb922a4aec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Wed, 1 Nov 2023 12:06:07 +0100 Subject: [PATCH] feat(deps): update ApiDOM to v0.82.0 (#3217) ApiDOM@0.82.0 comes with parsing support of OpenAPI 2.0. The goal of this commit is to integrate the ApiDOM line that supports OpenAPI 2.0 ASAP. Refs https://github.com/swagger-api/apidom/issues/389 --- README.md | 2 - docs/usage/installation.md | 25 ++++--- package-lock.json | 138 ++++++++++++++++++++++--------------- package.json | 13 ++-- 4 files changed, 103 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 00f1dcee9..6f8b369aa 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,6 @@ on Node.js version. and uses [native fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) implementation provided by each supported browser. - - ## Security contact Please disclose any security-related issues or vulnerabilities by emailing [security@swagger.io](mailto:security@swagger.io), instead of using the public issue tracker. diff --git a/docs/usage/installation.md b/docs/usage/installation.md index cb4d0ac15..672175d13 100644 --- a/docs/usage/installation.md +++ b/docs/usage/installation.md @@ -22,17 +22,20 @@ to speed up the installation: ```json "overrides": { "@swagger-api/apidom-reference": { - "@swagger-api/apidom-ns-asyncapi-2": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-api-design-systems-json": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-json": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "npm:-@0.0.1", - "@swagger-api/apidom-parser-adapter-yaml-1-2": "npm:-@0.0.1" + "@swagger-api/apidom-ns-asyncapi-2": "npm:-@0.0.1", + "@swagger-api/apidom-ns-openapi-2": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-api-design-systems-json": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-json": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-json-2": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-2": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "npm:-@0.0.1" } } ``` diff --git a/package-lock.json b/package-lock.json index d4b00c413..36b3a5090 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime-corejs3": "^7.22.15", - "@swagger-api/apidom-core": ">=0.78.0 <1.0.0", - "@swagger-api/apidom-json-pointer": ">=0.78.0 <1.0.0", - "@swagger-api/apidom-ns-openapi-3-1": ">=0.78.0 <1.0.0", - "@swagger-api/apidom-reference": ">=0.78.0 <1.0.0", + "@swagger-api/apidom-core": ">=0.82.0 <1.0.0", + "@swagger-api/apidom-json-pointer": ">=0.82.0 <1.0.0", + "@swagger-api/apidom-ns-openapi-3-1": ">=0.82.0 <1.0.0", + "@swagger-api/apidom-reference": ">=0.82.0 <1.0.0", "cookie": "~0.5.0", "deepmerge": "~4.3.0", "fast-json-patch": "^3.0.0-1", @@ -3662,12 +3662,12 @@ } }, "node_modules/@swagger-api/apidom-ast": { - "version": "0.81.0", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ast/-/apidom-ast-0.81.0.tgz", - "integrity": "sha512-klp9i25LcBIMc/JASec7hejNMsKhgCXLZmQ4qjaq97nC3T7uAYY0znvzQJxS0gtpK52r2EgcW6puSAyCDd8sWw==", + "version": "0.82.0", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ast/-/apidom-ast-0.82.0.tgz", + "integrity": "sha512-WsoO9ekGeSt4GY58dsfFKrgzQOxvY5WoKtRyq/rY2IeEPxgLDkqzYexou1oYtiwcXmmFlEoFXOQu0Q4izF/64A==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-error": "^0.81.0", + "@swagger-api/apidom-error": "^0.82.0", "@types/ramda": "~0.29.6", "ramda": "~0.29.0", "ramda-adjunct": "^4.1.1", @@ -3676,13 +3676,13 @@ } }, "node_modules/@swagger-api/apidom-core": { - "version": "0.81.0", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-core/-/apidom-core-0.81.0.tgz", - "integrity": "sha512-JWqUhZssF6OiT2poMcYtxhp7rQJoNjff/xBYOmZ0BILkCcc8ox+7IRmOUtF6jMw5EKuOMkvXm3gH4+M0FPpmNw==", + "version": "0.82.0", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-core/-/apidom-core-0.82.0.tgz", + "integrity": "sha512-HVjqp5oiuzd75TgtCDdhZNTdfy6ctLqmdUiOdYs/58dgnqxP4Ku3Wj1fyOjV4D/ZtN+Q4GjDjZmGRv4c9pJjOw==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-ast": "^0.81.0", - "@swagger-api/apidom-error": "^0.81.0", + "@swagger-api/apidom-ast": "^0.82.0", + "@swagger-api/apidom-error": "^0.82.0", "@types/ramda": "~0.29.6", "minim": "~0.23.8", "ramda": "~0.29.0", @@ -3692,9 +3692,9 @@ } }, "node_modules/@swagger-api/apidom-error": { - "version": "0.81.0", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-error/-/apidom-error-0.81.0.tgz", - "integrity": "sha512-bgIlp+86+2RCq83TSbBl56z0R6QNh1NQHatqXPONhnlAIfGVLtgvMGp1KxNIfoH2Ma3ziTdI+nwmwx+nXmoPpA==", + "version": "0.82.0", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-error/-/apidom-error-0.82.0.tgz", + "integrity": "sha512-4gzEP9J2Xgredn+Bi+xSxL0ZnBFC/6CSv+fkU7JyFh2Liqz4cfH6yh3Wrmve031pmvPvP9xzAc13VraV4ZCzFQ==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", "@types/ramda": "~0.29.6", @@ -3703,13 +3703,13 @@ } }, "node_modules/@swagger-api/apidom-json-pointer": { - "version": "0.81.0", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-0.81.0.tgz", - "integrity": "sha512-XHccZotK1/YxVLPc/BeCGPOH/ErwfNT8QoDpPGTfsoyloFMyobeaN6RQJ2UhuqiFKut5FbLNLzBWBV+AcGieUA==", + "version": "0.82.0", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-0.82.0.tgz", + "integrity": "sha512-JrE+K7rf2ITv+kmk50ansJq8qUjlZLUaMPBYEy2xLyGELERRHVgsL4fYMAHMRGrnHVg0CM8TgbU4sN50fnWZLg==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^0.81.0", - "@swagger-api/apidom-error": "^0.81.0", + "@swagger-api/apidom-core": "^0.82.0", + "@swagger-api/apidom-error": "^0.82.0", "@types/ramda": "~0.29.6", "ramda": "~0.29.0", "ramda-adjunct": "^4.0.0" @@ -3723,28 +3723,35 @@ "optional": true }, "node_modules/@swagger-api/apidom-ns-json-schema-draft-4": { - "version": "0.81.0", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-0.81.0.tgz", - "integrity": "sha512-9FGmyumk8FPGfOOa2587dYlxQz8AbTDXDidZ7CARjVTbd/u5nvdU2Gtga94GTUgx5RZVorESASgRWBwi0R/Tpw==", + "version": "0.82.0", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-0.82.0.tgz", + "integrity": "sha512-bZt15vKFbl5hw3KELDiBiyHkJdoeP5tahN7q86VV7hTJHJPmKXy5LHk5StvIOadcExcQFWcXX4D2xd9IuiYH/w==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-ast": "^0.81.0", - "@swagger-api/apidom-core": "^0.81.0", + "@swagger-api/apidom-ast": "^0.82.0", + "@swagger-api/apidom-core": "^0.82.0", "@types/ramda": "~0.29.6", "ramda": "~0.29.0", "ramda-adjunct": "^4.1.1", "stampit": "^4.3.2" } }, + "node_modules/@swagger-api/apidom-ns-openapi-2": { + "name": "-", + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/-/-/--0.0.1.tgz", + "integrity": "sha512-3HfneK3DGAm05fpyj20sT3apkNcvPpCuccOThOPdzz8sY7GgQGe0l93XH9bt+YzibcTIgUAIMoyVJI740RtgyQ==", + "optional": true + }, "node_modules/@swagger-api/apidom-ns-openapi-3-0": { - "version": "0.81.0", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-0.81.0.tgz", - "integrity": "sha512-IC/KM/uuUkdihe8+J+Fl0zvYgh1dnP/Ofde4935Azee28Zu2SEso9r4V8OzzbNcO5I+DoQWgwxoodrb6PU954g==", + "version": "0.82.0", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-0.82.0.tgz", + "integrity": "sha512-E53qEeM8E4kycXEAM27Vcw8Qu0JHNMwzUclYK4f0yNHfUX8WJm3Ge0gL4vc2QleDtlLjMsK986mo1Y5LBXb//w==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^0.81.0", - "@swagger-api/apidom-error": "^0.81.0", - "@swagger-api/apidom-ns-json-schema-draft-4": "^0.81.0", + "@swagger-api/apidom-core": "^0.82.0", + "@swagger-api/apidom-error": "^0.82.0", + "@swagger-api/apidom-ns-json-schema-draft-4": "^0.82.0", "@types/ramda": "~0.29.6", "ramda": "~0.29.0", "ramda-adjunct": "^4.1.1", @@ -3752,14 +3759,14 @@ } }, "node_modules/@swagger-api/apidom-ns-openapi-3-1": { - "version": "0.81.0", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-0.81.0.tgz", - "integrity": "sha512-k0lHS3Px5uy2+ubTYkCLniZsrqzx0O9BdmaCVoOKBF7jmpd5ewSNgaMuEYFpP8qabIZ9UEZBgVIy5m5UFZ2c0A==", + "version": "0.82.0", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-0.82.0.tgz", + "integrity": "sha512-jR341a8yceEoX5K9KKAod5AzpU3uSul2ok6bj7DdtM9Ze+tIDgqvNmz7V+yUu1mgiCJtdYMirIs27E42o6F+Gg==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-ast": "^0.81.0", - "@swagger-api/apidom-core": "^0.81.0", - "@swagger-api/apidom-ns-openapi-3-0": "^0.81.0", + "@swagger-api/apidom-ast": "^0.82.0", + "@swagger-api/apidom-core": "^0.82.0", + "@swagger-api/apidom-ns-openapi-3-0": "^0.82.0", "@types/ramda": "~0.29.6", "ramda": "~0.29.0", "ramda-adjunct": "^4.1.1", @@ -3801,6 +3808,13 @@ "integrity": "sha512-3HfneK3DGAm05fpyj20sT3apkNcvPpCuccOThOPdzz8sY7GgQGe0l93XH9bt+YzibcTIgUAIMoyVJI740RtgyQ==", "optional": true }, + "node_modules/@swagger-api/apidom-parser-adapter-openapi-json-2": { + "name": "-", + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/-/-/--0.0.1.tgz", + "integrity": "sha512-3HfneK3DGAm05fpyj20sT3apkNcvPpCuccOThOPdzz8sY7GgQGe0l93XH9bt+YzibcTIgUAIMoyVJI740RtgyQ==", + "optional": true + }, "node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-0": { "name": "-", "version": "0.0.1", @@ -3815,6 +3829,13 @@ "integrity": "sha512-3HfneK3DGAm05fpyj20sT3apkNcvPpCuccOThOPdzz8sY7GgQGe0l93XH9bt+YzibcTIgUAIMoyVJI740RtgyQ==", "optional": true }, + "node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-2": { + "name": "-", + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/-/-/--0.0.1.tgz", + "integrity": "sha512-3HfneK3DGAm05fpyj20sT3apkNcvPpCuccOThOPdzz8sY7GgQGe0l93XH9bt+YzibcTIgUAIMoyVJI740RtgyQ==", + "optional": true + }, "node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": { "name": "-", "version": "0.0.1", @@ -3837,12 +3858,12 @@ "optional": true }, "node_modules/@swagger-api/apidom-reference": { - "version": "0.81.0", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-reference/-/apidom-reference-0.81.0.tgz", - "integrity": "sha512-MhAkoQ7Z2mjN5YhkBUdVIHQl80VK4RARF7vYqcgVtpRr3fu6Fh1MQPreIaGUeTxsZqAt2RJzMU0xNLEWGYAxow==", + "version": "0.82.0", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-reference/-/apidom-reference-0.82.0.tgz", + "integrity": "sha512-yWfn3vVP4U2dv+GT+UyL3bVA42HvebiSY+15Ln/202qcEbIHsQ1U/TGLmjdgE7tPeuGDEnltL0HgvyJ3ALgmVg==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^0.81.0", + "@swagger-api/apidom-core": "^0.82.0", "@types/ramda": "~0.29.6", "axios": "^1.4.0", "minimatch": "^7.4.3", @@ -3852,21 +3873,24 @@ "stampit": "^4.3.2" }, "optionalDependencies": { - "@swagger-api/apidom-error": "^0.81.0", - "@swagger-api/apidom-json-pointer": "^0.81.0", - "@swagger-api/apidom-ns-asyncapi-2": "^0.81.0", - "@swagger-api/apidom-ns-openapi-3-0": "^0.81.0", - "@swagger-api/apidom-ns-openapi-3-1": "^0.81.0", - "@swagger-api/apidom-parser-adapter-api-design-systems-json": "^0.81.0", - "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^0.81.0", - "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^0.81.0", - "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^0.81.0", - "@swagger-api/apidom-parser-adapter-json": "^0.81.0", - "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^0.81.0", - "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^0.81.0", - "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^0.81.0", - "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^0.81.0", - "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.81.0" + "@swagger-api/apidom-error": "^0.82.0", + "@swagger-api/apidom-json-pointer": "^0.82.0", + "@swagger-api/apidom-ns-asyncapi-2": "^0.82.0", + "@swagger-api/apidom-ns-openapi-2": "^0.82.0", + "@swagger-api/apidom-ns-openapi-3-0": "^0.82.0", + "@swagger-api/apidom-ns-openapi-3-1": "^0.82.0", + "@swagger-api/apidom-parser-adapter-api-design-systems-json": "^0.82.0", + "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^0.82.0", + "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^0.82.0", + "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^0.82.0", + "@swagger-api/apidom-parser-adapter-json": "^0.82.0", + "@swagger-api/apidom-parser-adapter-openapi-json-2": "^0.82.0", + "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^0.82.0", + "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^0.82.0", + "@swagger-api/apidom-parser-adapter-openapi-yaml-2": "^0.82.0", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^0.82.0", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^0.82.0", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.82.0" } }, "node_modules/@tootallnate/once": { diff --git a/package.json b/package.json index 1d9069c74..355c1ce51 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "build:es": "cross-env BABEL_ENV=es babel src --out-dir es", "lint": "eslint src/ test/", "lint:fix": "npm run lint -- --fix", - "link:apidom": "npm link @swagger-api/apidom-core @swagger-api/apidom-error @swagger-api/apidom-reference @swagger-api/apidom-ns-openapi-3-1 @swagger-api/apidom-ns-openapi-3-0 @swagger-api/apidom-ns-json-schema-draft-4 @swagger-api/apidom-json-pointer", + "link:apidom": "npm link @swagger-api/apidom-core @swagger-api/apidom-error @swagger-api/apidom-reference @swagger-api/apidom-ns-openapi-2 @swagger-api/apidom-ns-openapi-3-0 @swagger-api/apidom-ns-openapi-3-1 @swagger-api/apidom-ns-json-schema-draft-4 @swagger-api/apidom-json-pointer", "test": "run-s test:unit:coverage test:artifact", "test:unit": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.config.js", "test:unit:coverage": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.coverage.config.js", @@ -109,10 +109,10 @@ }, "dependencies": { "@babel/runtime-corejs3": "^7.22.15", - "@swagger-api/apidom-core": ">=0.78.0 <1.0.0", - "@swagger-api/apidom-json-pointer": ">=0.78.0 <1.0.0", - "@swagger-api/apidom-ns-openapi-3-1": ">=0.78.0 <1.0.0", - "@swagger-api/apidom-reference": ">=0.78.0 <1.0.0", + "@swagger-api/apidom-core": ">=0.82.0 <1.0.0", + "@swagger-api/apidom-json-pointer": ">=0.82.0 <1.0.0", + "@swagger-api/apidom-ns-openapi-3-1": ">=0.82.0 <1.0.0", + "@swagger-api/apidom-reference": ">=0.82.0 <1.0.0", "cookie": "~0.5.0", "deepmerge": "~4.3.0", "fast-json-patch": "^3.0.0-1", @@ -127,11 +127,14 @@ "overrides": { "@swagger-api/apidom-reference": { "@swagger-api/apidom-ns-asyncapi-2": "npm:-@0.0.1", + "@swagger-api/apidom-ns-openapi-2": "npm:-@0.0.1", "@swagger-api/apidom-parser-adapter-api-design-systems-json": "npm:-@0.0.1", "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "npm:-@0.0.1", "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "npm:-@0.0.1", "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "npm:-@0.0.1", "@swagger-api/apidom-parser-adapter-json": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-json-2": "npm:-@0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-2": "npm:-@0.0.1", "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "npm:-@0.0.1", "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "npm:-@0.0.1", "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "npm:-@0.0.1",