From dcf89a7576cdd30b64407d9d1dcb8aa49c0df72c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 11:05:48 +0000 Subject: [PATCH 01/21] Bump the npm group with 4 updates Bumps the npm group with 4 updates: [@octokit/types](https://github.com/octokit/types.ts), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [typescript](https://github.com/Microsoft/TypeScript). Updates `@octokit/types` from 12.3.0 to 12.4.0 - [Release notes](https://github.com/octokit/types.ts/releases) - [Commits](https://github.com/octokit/types.ts/compare/v12.3.0...v12.4.0) Updates `@typescript-eslint/eslint-plugin` from 6.13.2 to 6.14.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 6.13.2 to 6.14.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/parser) Updates `typescript` from 5.3.2 to 5.3.3 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.2...v5.3.3) --- updated-dependencies: - dependency-name: "@octokit/types" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] --- package-lock.json | 112 +++++++++++++++++++++++----------------------- package.json | 8 ++-- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/package-lock.json b/package-lock.json index 518f49ceed..8d17b476fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@actions/tool-cache": "^2.0.1", "@chrisgavin/safe-which": "^1.0.2", "@octokit/plugin-retry": "^5.0.2", - "@octokit/types": "^12.3.0", + "@octokit/types": "^12.4.0", "@schemastore/package": "0.0.10", "@types/uuid": "^9.0.7", "adm-zip": "^0.5.10", @@ -45,8 +45,8 @@ "@types/node": "16.11.22", "@types/semver": "^7.5.6", "@types/sinon": "^17.0.2", - "@typescript-eslint/eslint-plugin": "^6.13.2", - "@typescript-eslint/parser": "^6.13.2", + "@typescript-eslint/eslint-plugin": "^6.14.0", + "@typescript-eslint/parser": "^6.14.0", "ava": "^5.3.1", "eslint": "^8.55.0", "eslint-import-resolver-typescript": "^3.6.1", @@ -58,7 +58,7 @@ "nock": "^13.4.0", "removeNPMAbsolutePaths": "3.0.1", "sinon": "^17.0.1", - "typescript": "^5.3.2" + "typescript": "^5.3.3" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -819,17 +819,17 @@ } }, "node_modules/@octokit/types": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.3.0.tgz", - "integrity": "sha512-nJ8X2HRr234q3w/FcovDlA+ttUU4m1eJAourvfUUtwAWeqL8AsyRqfnLvVnYn3NFbUnsmzQCzLNdFerPwdmcDQ==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.4.0.tgz", + "integrity": "sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==", "dependencies": { - "@octokit/openapi-types": "^19.0.2" + "@octokit/openapi-types": "^19.1.0" } }, "node_modules/@octokit/types/node_modules/@octokit/openapi-types": { - "version": "19.0.2", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.0.2.tgz", - "integrity": "sha512-8li32fUDUeml/ACRp/njCWTsk5t17cfTM1jp9n08pBrqs5cDFJubtjsSnuz56r5Tad6jdEPJld7LxNp9dNcyjQ==" + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz", + "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==" }, "node_modules/@opentelemetry/api": { "version": "1.4.1", @@ -1014,16 +1014,16 @@ "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz", - "integrity": "sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.14.0.tgz", + "integrity": "sha512-1ZJBykBCXaSHG94vMMKmiHoL0MhNHKSVlcHVYZNw+BKxufhqQVTOawNpwwI1P5nIFZ/4jLVop0mcY6mJJDFNaw==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/type-utils": "6.13.2", - "@typescript-eslint/utils": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/type-utils": "6.14.0", + "@typescript-eslint/utils": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -1049,15 +1049,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.2.tgz", - "integrity": "sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.14.0.tgz", + "integrity": "sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/typescript-estree": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/typescript-estree": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4" }, "engines": { @@ -1077,13 +1077,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", - "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.14.0.tgz", + "integrity": "sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2" + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1094,13 +1094,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz", - "integrity": "sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.14.0.tgz", + "integrity": "sha512-x6OC9Q7HfYKqjnuNu5a7kffIYs3No30isapRBJl1iCHLitD8O0lFbRcVGiOcuyN837fqXzPZ1NS10maQzZMKqw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.13.2", - "@typescript-eslint/utils": "6.13.2", + "@typescript-eslint/typescript-estree": "6.14.0", + "@typescript-eslint/utils": "6.14.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -1121,9 +1121,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", - "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.14.0.tgz", + "integrity": "sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1134,13 +1134,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", - "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.14.0.tgz", + "integrity": "sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1161,17 +1161,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.2.tgz", - "integrity": "sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.14.0.tgz", + "integrity": "sha512-XwRTnbvRr7Ey9a1NT6jqdKX8y/atWG+8fAIu3z73HSP8h06i3r/ClMhmaF/RGWGW1tHJEwij1uEg2GbEmPYvYg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/typescript-estree": "6.14.0", "semver": "^7.5.4" }, "engines": { @@ -1186,12 +1186,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", - "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.14.0.tgz", + "integrity": "sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/types": "6.14.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -6091,9 +6091,9 @@ } }, "node_modules/typescript": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", - "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index deed89e04f..bc5cd66d9d 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@actions/tool-cache": "^2.0.1", "@chrisgavin/safe-which": "^1.0.2", "@octokit/plugin-retry": "^5.0.2", - "@octokit/types": "^12.3.0", + "@octokit/types": "^12.4.0", "@schemastore/package": "0.0.10", "@types/uuid": "^9.0.7", "adm-zip": "^0.5.10", @@ -60,8 +60,8 @@ "@types/node": "16.11.22", "@types/semver": "^7.5.6", "@types/sinon": "^17.0.2", - "@typescript-eslint/eslint-plugin": "^6.13.2", - "@typescript-eslint/parser": "^6.13.2", + "@typescript-eslint/eslint-plugin": "^6.14.0", + "@typescript-eslint/parser": "^6.14.0", "ava": "^5.3.1", "eslint": "^8.55.0", "eslint-import-resolver-typescript": "^3.6.1", @@ -73,7 +73,7 @@ "nock": "^13.4.0", "removeNPMAbsolutePaths": "3.0.1", "sinon": "^17.0.1", - "typescript": "^5.3.2" + "typescript": "^5.3.3" }, "overrides": { "@actions/tool-cache": { From 0d8f34877549eff56ddc99f53c3dbcfe4fb2f336 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 11:12:49 +0000 Subject: [PATCH 02/21] Update checked-in dependencies --- node_modules/.package-lock.json | 104 +- .../@octokit/types/dist-types/VERSION.d.ts | 2 +- .../types/dist-types/generated/Endpoints.d.ts | 16 +- .../@octokit/openapi-types/package.json | 4 +- .../@octokit/openapi-types/types.d.ts | 1494 +++++++++-------- node_modules/@octokit/types/package.json | 6 +- .../eslint-plugin/dist/configs/all.js | 2 +- .../eslint-plugin/dist/configs/all.js.map | 2 +- .../dist/configs/disable-type-checked.js | 2 + .../dist/configs/disable-type-checked.js.map | 2 +- .../dist/rules/no-unsafe-unary-minus.js | 2 +- .../dist/rules/no-unsafe-unary-minus.js.map | 2 +- .../eslint-plugin/dist/rules/require-await.js | 20 +- .../dist/rules/require-await.js.map | 2 +- .../dist/util/explicitReturnTypeUtils.js | 5 + .../dist/util/explicitReturnTypeUtils.js.map | 2 +- .../docs/rules/no-throw-literal.md | 18 +- .../eslint-plugin/package.json | 16 +- .../@typescript-eslint/parser/package.json | 12 +- .../scope-manager/package.json | 10 +- .../type-utils/package.json | 10 +- .../@typescript-eslint/types/package.json | 4 +- .../typescript-estree/package.json | 8 +- .../@typescript-eslint/utils/package.json | 12 +- .../visitor-keys/package.json | 6 +- node_modules/typescript/lib/tsc.js | 48 +- node_modules/typescript/lib/tsserver.js | 50 +- node_modules/typescript/lib/typescript.d.ts | 9 +- node_modules/typescript/lib/typescript.js | 50 +- .../typescript/lib/typingsInstaller.js | 4 +- node_modules/typescript/package.json | 2 +- 31 files changed, 1031 insertions(+), 895 deletions(-) diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 0510f7ba12..6a36cf6eaa 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -762,17 +762,17 @@ } }, "node_modules/@octokit/types": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.3.0.tgz", - "integrity": "sha512-nJ8X2HRr234q3w/FcovDlA+ttUU4m1eJAourvfUUtwAWeqL8AsyRqfnLvVnYn3NFbUnsmzQCzLNdFerPwdmcDQ==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.4.0.tgz", + "integrity": "sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==", "dependencies": { - "@octokit/openapi-types": "^19.0.2" + "@octokit/openapi-types": "^19.1.0" } }, "node_modules/@octokit/types/node_modules/@octokit/openapi-types": { - "version": "19.0.2", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.0.2.tgz", - "integrity": "sha512-8li32fUDUeml/ACRp/njCWTsk5t17cfTM1jp9n08pBrqs5cDFJubtjsSnuz56r5Tad6jdEPJld7LxNp9dNcyjQ==" + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz", + "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==" }, "node_modules/@opentelemetry/api": { "version": "1.4.1", @@ -957,16 +957,16 @@ "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz", - "integrity": "sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.14.0.tgz", + "integrity": "sha512-1ZJBykBCXaSHG94vMMKmiHoL0MhNHKSVlcHVYZNw+BKxufhqQVTOawNpwwI1P5nIFZ/4jLVop0mcY6mJJDFNaw==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/type-utils": "6.13.2", - "@typescript-eslint/utils": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/type-utils": "6.14.0", + "@typescript-eslint/utils": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -992,15 +992,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.2.tgz", - "integrity": "sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.14.0.tgz", + "integrity": "sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/typescript-estree": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/typescript-estree": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4" }, "engines": { @@ -1020,13 +1020,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", - "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.14.0.tgz", + "integrity": "sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2" + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1037,13 +1037,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz", - "integrity": "sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.14.0.tgz", + "integrity": "sha512-x6OC9Q7HfYKqjnuNu5a7kffIYs3No30isapRBJl1iCHLitD8O0lFbRcVGiOcuyN837fqXzPZ1NS10maQzZMKqw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.13.2", - "@typescript-eslint/utils": "6.13.2", + "@typescript-eslint/typescript-estree": "6.14.0", + "@typescript-eslint/utils": "6.14.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -1064,9 +1064,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", - "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.14.0.tgz", + "integrity": "sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1077,13 +1077,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", - "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.14.0.tgz", + "integrity": "sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1104,17 +1104,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.2.tgz", - "integrity": "sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.14.0.tgz", + "integrity": "sha512-XwRTnbvRr7Ey9a1NT6jqdKX8y/atWG+8fAIu3z73HSP8h06i3r/ClMhmaF/RGWGW1tHJEwij1uEg2GbEmPYvYg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/typescript-estree": "6.14.0", "semver": "^7.5.4" }, "engines": { @@ -1129,12 +1129,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", - "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.14.0.tgz", + "integrity": "sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/types": "6.14.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -6034,9 +6034,9 @@ } }, "node_modules/typescript": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", - "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/node_modules/@octokit/types/dist-types/VERSION.d.ts b/node_modules/@octokit/types/dist-types/VERSION.d.ts index ef4de17193..033b5180dd 100644 --- a/node_modules/@octokit/types/dist-types/VERSION.d.ts +++ b/node_modules/@octokit/types/dist-types/VERSION.d.ts @@ -1 +1 @@ -export declare const VERSION = "12.3.0"; +export declare const VERSION = "12.4.0"; diff --git a/node_modules/@octokit/types/dist-types/generated/Endpoints.d.ts b/node_modules/@octokit/types/dist-types/generated/Endpoints.d.ts index 139b6116d4..6181d490a3 100644 --- a/node_modules/@octokit/types/dist-types/generated/Endpoints.d.ts +++ b/node_modules/@octokit/types/dist-types/generated/Endpoints.d.ts @@ -208,7 +208,7 @@ export interface Endpoints { */ "DELETE /orgs/{org}/packages/{package_type}/{package_name}/versions/{package_version_id}": Operation<"/orgs/{org}/packages/{package_type}/{package_name}/versions/{package_version_id}", "delete">; /** - * @see https://docs.github.com/rest/orgs/properties#remove-a-custom-property-for-an-organization + * @see https://docs.github.com/rest/orgs/custom-properties#remove-a-custom-property-for-an-organization */ "DELETE /orgs/{org}/properties/schema/{custom_property_name}": Operation<"/orgs/{org}/properties/schema/{custom_property_name}", "delete">; /** @@ -1121,15 +1121,15 @@ export interface Endpoints { */ "GET /orgs/{org}/projects": Operation<"/orgs/{org}/projects", "get">; /** - * @see https://docs.github.com/rest/orgs/properties#get-all-custom-properties-for-an-organization + * @see https://docs.github.com/rest/orgs/custom-properties#get-all-custom-properties-for-an-organization */ "GET /orgs/{org}/properties/schema": Operation<"/orgs/{org}/properties/schema", "get">; /** - * @see https://docs.github.com/rest/orgs/properties#get-a-custom-property-for-an-organization + * @see https://docs.github.com/rest/orgs/custom-properties#get-a-custom-property-for-an-organization */ "GET /orgs/{org}/properties/schema/{custom_property_name}": Operation<"/orgs/{org}/properties/schema/{custom_property_name}", "get">; /** - * @see https://docs.github.com/rest/orgs/properties#list-custom-property-values-for-organization-repositories + * @see https://docs.github.com/rest/orgs/custom-properties#list-custom-property-values-for-organization-repositories */ "GET /orgs/{org}/properties/values": Operation<"/orgs/{org}/properties/values", "get">; /** @@ -1946,7 +1946,7 @@ export interface Endpoints { */ "GET /repos/{owner}/{repo}/projects": Operation<"/repos/{owner}/{repo}/projects", "get">; /** - * @see https://docs.github.com/rest/repos/properties#get-all-custom-property-values-for-a-repository + * @see https://docs.github.com/rest/repos/custom-properties#get-all-custom-property-values-for-a-repository */ "GET /repos/{owner}/{repo}/properties/values": Operation<"/repos/{owner}/{repo}/properties/values", "get">; /** @@ -2622,11 +2622,11 @@ export interface Endpoints { */ "PATCH /orgs/{org}/hooks/{hook_id}/config": Operation<"/orgs/{org}/hooks/{hook_id}/config", "patch">; /** - * @see https://docs.github.com/rest/orgs/properties#create-or-update-custom-properties-for-an-organization + * @see https://docs.github.com/rest/orgs/custom-properties#create-or-update-custom-properties-for-an-organization */ "PATCH /orgs/{org}/properties/schema": Operation<"/orgs/{org}/properties/schema", "patch">; /** - * @see https://docs.github.com/rest/orgs/properties#create-or-update-custom-property-values-for-organization-repositories + * @see https://docs.github.com/rest/orgs/custom-properties#create-or-update-custom-property-values-for-organization-repositories */ "PATCH /orgs/{org}/properties/values": Operation<"/orgs/{org}/properties/values", "patch">; /** @@ -3490,7 +3490,7 @@ export interface Endpoints { */ "PUT /orgs/{org}/outside_collaborators/{username}": Operation<"/orgs/{org}/outside_collaborators/{username}", "put">; /** - * @see https://docs.github.com/rest/orgs/properties#create-or-update-a-custom-property-for-an-organization + * @see https://docs.github.com/rest/orgs/custom-properties#create-or-update-a-custom-property-for-an-organization */ "PUT /orgs/{org}/properties/schema/{custom_property_name}": Operation<"/orgs/{org}/properties/schema/{custom_property_name}", "put">; /** diff --git a/node_modules/@octokit/types/node_modules/@octokit/openapi-types/package.json b/node_modules/@octokit/types/node_modules/@octokit/openapi-types/package.json index dc5c0c7d3a..f8ba9436b2 100644 --- a/node_modules/@octokit/types/node_modules/@octokit/openapi-types/package.json +++ b/node_modules/@octokit/types/node_modules/@octokit/openapi-types/package.json @@ -9,12 +9,12 @@ "publishConfig": { "access": "public" }, - "version": "19.0.2", + "version": "19.1.0", "main": "", "types": "types.d.ts", "author": "Gregor Martynus (https://twitter.com/gr2m)", "license": "MIT", "octokit": { - "openapi-version": "13.2.0" + "openapi-version": "13.3.0" } } diff --git a/node_modules/@octokit/types/node_modules/@octokit/openapi-types/types.d.ts b/node_modules/@octokit/types/node_modules/@octokit/openapi-types/types.d.ts index 2e88a80f90..10ff9d6a86 100644 --- a/node_modules/@octokit/types/node_modules/@octokit/openapi-types/types.d.ts +++ b/node_modules/@octokit/types/node_modules/@octokit/openapi-types/types.d.ts @@ -11,8 +11,8 @@ type XOR = T | U extends object type OneOf = T extends [infer Only] ? Only : T extends [infer A, infer B, ...infer Rest] - ? OneOf<[XOR, ...Rest]> - : never; + ? OneOf<[XOR, ...Rest]> + : never; export interface paths { "/": { @@ -1214,7 +1214,7 @@ export interface paths { * List codespaces for the organization * @description Lists the codespaces associated to a specified organization. * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces` read permission to use this endpoint. */ get: operations["codespaces/list-in-organization"]; }; @@ -1223,7 +1223,7 @@ export interface paths { * Manage access control for organization codespaces * @deprecated * @description Sets which users can access codespaces in an organization. This is synonymous with granting or revoking codespaces access permissions for users according to the visibility. - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces settings` write permission to use this endpoint. */ put: operations["codespaces/set-codespaces-access"]; }; @@ -1236,7 +1236,7 @@ export interface paths { * To use this endpoint, the access settings for the organization must be set to `selected_members`. * For information on how to change this setting, see "[Manage access control for organization codespaces](https://docs.github.com/rest/codespaces/organizations#manage-access-control-for-organization-codespaces)." * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces settings` write permission to use this endpoint. */ post: operations["codespaces/set-codespaces-access-users"]; /** @@ -1247,7 +1247,7 @@ export interface paths { * To use this endpoint, the access settings for the organization must be set to `selected_members`. * For information on how to change this setting, see "[Manage access control for organization codespaces](https://docs.github.com/rest/codespaces/organizations#manage-access-control-for-organization-codespaces)." * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces settings` write permission to use this endpoint. */ delete: operations["codespaces/delete-codespaces-access-users"]; }; @@ -1729,7 +1729,7 @@ export interface paths { * List codespaces for a user in organization * @description Lists the codespaces that a member of an organization has for repositories in that organization. * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces` read permission to use this endpoint. */ get: operations["codespaces/get-codespaces-for-user-in-org"]; }; @@ -1738,7 +1738,10 @@ export interface paths { * Delete a codespace from the organization * @description Deletes a user's codespace. * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * To use this endpoint you must authenticate using one of the following methods: + * + * - An access token with the `admin:org` scope + * - An access token with write permissions for `Codespaces` on the specific repository and write permissions for `Organization codespaces` */ delete: operations["codespaces/delete-from-organization"]; }; @@ -1747,7 +1750,10 @@ export interface paths { * Stop a codespace for an organization user * @description Stops a user's codespace. * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * To use this endpoint you must authenticate using one of the following methods: + * + * - An access token with the `admin:org` scope + * - An access token with write permissions for `Codespaces lifecycle admin` on the specific repository and write permissions for `Organization codespaces` */ post: operations["codespaces/stop-in-organization"]; }; @@ -9187,6 +9193,11 @@ export interface components { * @enum {string} */ organization_custom_roles?: "read" | "write"; + /** + * @description The level of permission to grant the access token for custom property management. + * @enum {string} + */ + organization_custom_properties?: "read" | "write" | "admin"; /** * @description The level of permission to grant the access token to view and manage announcement banners for an organization. * @enum {string} @@ -10831,6 +10842,11 @@ export interface components { push_protection_bypassed_at?: string | null; /** @description The comment that was optionally added when this alert was closed */ resolution_comment?: string | null; + /** + * @description The token status as of the latest validity check. + * @enum {string} + */ + validity?: "active" | "inactive" | "unknown"; }; /** * Actor @@ -14127,7 +14143,7 @@ export interface components { }; /** * required_deployments - * @description Choose which environments must be successfully deployed to before refs can be merged into a branch that matches this rule. + * @description Choose which environments must be successfully deployed to before refs can be pushed into a ref that matches this rule. */ "repository-rule-required-deployments": { /** @enum {string} */ @@ -14177,7 +14193,7 @@ export interface components { }; /** * required_status_checks - * @description Choose which status checks must pass before branches can be merged into a branch that matches this rule. When enabled, commits must first be pushed to another branch, then merged or pushed directly to a ref that matches this rule after status checks have passed. + * @description Choose which status checks must pass before the ref is updated. When enabled, commits must first be pushed to another ref where the checks pass. */ "repository-rule-required-status-checks": { /** @enum {string} */ @@ -15168,10 +15184,10 @@ export interface components { }; }; /** - * Repository - * @description A repository on GitHub. + * Team Repository + * @description A team's access to a repository. */ - "nullable-repository": { + "team-repository": { /** * @description Unique identifier of the repository * @example 42 @@ -15187,7 +15203,6 @@ export interface components { /** @example octocat/Hello-World */ full_name: string; license: components["schemas"]["nullable-license-simple"]; - organization?: components["schemas"]["nullable-simple-user"]; forks: number; permissions?: { admin: boolean; @@ -15196,7 +15211,9 @@ export interface components { push: boolean; maintain?: boolean; }; - owner: components["schemas"]["simple-user"]; + /** @example admin */ + role_name?: string; + owner: components["schemas"]["nullable-simple-user"]; /** * @description Whether the repository is private or public. * @default false @@ -15354,10 +15371,7 @@ export interface components { stargazers_count: number; /** @example 80 */ watchers_count: number; - /** - * @description The size of the repository. Size is calculated hourly. When a repository is initially created, the size is 0. - * @example 108 - */ + /** @example 108 */ size: number; /** * @description The default branch of the repository. @@ -15393,18 +15407,11 @@ export interface components { has_wiki: boolean; has_pages: boolean; /** - * @deprecated * @description Whether downloads are enabled. * @default true * @example true */ has_downloads: boolean; - /** - * @description Whether discussions are enabled. - * @default false - * @example true - */ - has_discussions?: boolean; /** * @description Whether the repository is archived. * @default false @@ -15438,150 +15445,6 @@ export interface components { * @example true */ allow_rebase_merge?: boolean; - template_repository?: { - id?: number; - node_id?: string; - name?: string; - full_name?: string; - owner?: { - login?: string; - id?: number; - node_id?: string; - avatar_url?: string; - gravatar_id?: string; - url?: string; - html_url?: string; - followers_url?: string; - following_url?: string; - gists_url?: string; - starred_url?: string; - subscriptions_url?: string; - organizations_url?: string; - repos_url?: string; - events_url?: string; - received_events_url?: string; - type?: string; - site_admin?: boolean; - }; - private?: boolean; - html_url?: string; - description?: string; - fork?: boolean; - url?: string; - archive_url?: string; - assignees_url?: string; - blobs_url?: string; - branches_url?: string; - collaborators_url?: string; - comments_url?: string; - commits_url?: string; - compare_url?: string; - contents_url?: string; - contributors_url?: string; - deployments_url?: string; - downloads_url?: string; - events_url?: string; - forks_url?: string; - git_commits_url?: string; - git_refs_url?: string; - git_tags_url?: string; - git_url?: string; - issue_comment_url?: string; - issue_events_url?: string; - issues_url?: string; - keys_url?: string; - labels_url?: string; - languages_url?: string; - merges_url?: string; - milestones_url?: string; - notifications_url?: string; - pulls_url?: string; - releases_url?: string; - ssh_url?: string; - stargazers_url?: string; - statuses_url?: string; - subscribers_url?: string; - subscription_url?: string; - tags_url?: string; - teams_url?: string; - trees_url?: string; - clone_url?: string; - mirror_url?: string; - hooks_url?: string; - svn_url?: string; - homepage?: string; - language?: string; - forks_count?: number; - stargazers_count?: number; - watchers_count?: number; - size?: number; - default_branch?: string; - open_issues_count?: number; - is_template?: boolean; - topics?: string[]; - has_issues?: boolean; - has_projects?: boolean; - has_wiki?: boolean; - has_pages?: boolean; - has_downloads?: boolean; - archived?: boolean; - disabled?: boolean; - visibility?: string; - pushed_at?: string; - created_at?: string; - updated_at?: string; - permissions?: { - admin?: boolean; - maintain?: boolean; - push?: boolean; - triage?: boolean; - pull?: boolean; - }; - allow_rebase_merge?: boolean; - temp_clone_token?: string; - allow_squash_merge?: boolean; - allow_auto_merge?: boolean; - delete_branch_on_merge?: boolean; - allow_update_branch?: boolean; - use_squash_pr_title_as_default?: boolean; - /** - * @description The default value for a squash merge commit title: - * - * - `PR_TITLE` - default to the pull request's title. - * - `COMMIT_OR_PR_TITLE` - default to the commit's title (if only one commit) or the pull request's title (when more than one commit). - * @enum {string} - */ - squash_merge_commit_title?: "PR_TITLE" | "COMMIT_OR_PR_TITLE"; - /** - * @description The default value for a squash merge commit message: - * - * - `PR_BODY` - default to the pull request's body. - * - `COMMIT_MESSAGES` - default to the branch's commit messages. - * - `BLANK` - default to a blank commit message. - * @enum {string} - */ - squash_merge_commit_message?: "PR_BODY" | "COMMIT_MESSAGES" | "BLANK"; - /** - * @description The default value for a merge commit title. - * - * - `PR_TITLE` - default to the pull request's title. - * - `MERGE_MESSAGE` - default to the classic title for a merge message (e.g., Merge pull request #123 from branch-name). - * @enum {string} - */ - merge_commit_title?: "PR_TITLE" | "MERGE_MESSAGE"; - /** - * @description The default value for a merge commit message. - * - * - `PR_TITLE` - default to the pull request's title. - * - `PR_BODY` - default to the pull request's body. - * - `BLANK` - default to a blank commit message. - * @enum {string} - */ - merge_commit_message?: "PR_BODY" | "PR_TITLE" | "BLANK"; - allow_merge_commit?: boolean; - subscribers_count?: number; - network_count?: number; - } | null; temp_clone_token?: string; /** * @description Whether to allow squash merges for pull requests. @@ -15602,79 +15465,164 @@ export interface components { */ delete_branch_on_merge?: boolean; /** - * @description Whether or not a pull request head branch that is behind its base branch can always be updated even if it is not required to be up to date before merging. + * @description Whether to allow merge commits for pull requests. + * @default true + * @example true + */ + allow_merge_commit?: boolean; + /** + * @description Whether to allow forking this repo * @default false * @example false */ - allow_update_branch?: boolean; + allow_forking?: boolean; /** - * @deprecated - * @description Whether a squash merge commit can use the pull request title as default. **This property has been deprecated. Please use `squash_merge_commit_title` instead. + * @description Whether to require contributors to sign off on web-based commits * @default false + * @example false */ - use_squash_pr_title_as_default?: boolean; + web_commit_signoff_required?: boolean; + subscribers_count?: number; + network_count?: number; + open_issues: number; + watchers: number; + master_branch?: string; + }; + /** + * Project Card + * @description Project cards represent a scope of work. + */ + "project-card": { /** - * @description The default value for a squash merge commit title: - * - * - `PR_TITLE` - default to the pull request's title. - * - `COMMIT_OR_PR_TITLE` - default to the commit's title (if only one commit) or the pull request's title (when more than one commit). - * @enum {string} + * Format: uri + * @example https://api.github.com/projects/columns/cards/1478 */ - squash_merge_commit_title?: "PR_TITLE" | "COMMIT_OR_PR_TITLE"; + url: string; /** - * @description The default value for a squash merge commit message: - * - * - `PR_BODY` - default to the pull request's body. - * - `COMMIT_MESSAGES` - default to the branch's commit messages. - * - `BLANK` - default to a blank commit message. - * @enum {string} + * @description The project card's ID + * @example 42 */ - squash_merge_commit_message?: "PR_BODY" | "COMMIT_MESSAGES" | "BLANK"; + id: number; + /** @example MDExOlByb2plY3RDYXJkMTQ3OA== */ + node_id: string; + /** @example Add payload for delete Project column */ + note: string | null; + creator: components["schemas"]["nullable-simple-user"]; /** - * @description The default value for a merge commit title. - * - * - `PR_TITLE` - default to the pull request's title. - * - `MERGE_MESSAGE` - default to the classic title for a merge message (e.g., Merge pull request #123 from branch-name). - * @enum {string} + * Format: date-time + * @example 2016-09-05T14:21:06Z */ - merge_commit_title?: "PR_TITLE" | "MERGE_MESSAGE"; + created_at: string; /** - * @description The default value for a merge commit message. - * - * - `PR_TITLE` - default to the pull request's title. - * - `PR_BODY` - default to the pull request's body. - * - `BLANK` - default to a blank commit message. - * @enum {string} + * Format: date-time + * @example 2016-09-05T14:20:22Z */ - merge_commit_message?: "PR_BODY" | "PR_TITLE" | "BLANK"; + updated_at: string; /** - * @description Whether to allow merge commits for pull requests. - * @default true - * @example true + * @description Whether or not the card is archived + * @example false */ - allow_merge_commit?: boolean; - /** @description Whether to allow forking this repo */ - allow_forking?: boolean; + archived?: boolean; + column_name?: string; + project_id?: string; /** - * @description Whether to require contributors to sign off on web-based commits - * @default false + * Format: uri + * @example https://api.github.com/projects/columns/367 */ - web_commit_signoff_required?: boolean; - subscribers_count?: number; - network_count?: number; - open_issues: number; - watchers: number; - master_branch?: string; - /** @example "2020-07-09T00:17:42Z" */ - starred_at?: string; - /** @description Whether anonymous git access is enabled for this repository */ - anonymous_access_enabled?: boolean; - } | null; + column_url: string; + /** + * Format: uri + * @example https://api.github.com/repos/api-playground/projects-test/issues/3 + */ + content_url?: string; + /** + * Format: uri + * @example https://api.github.com/projects/120 + */ + project_url: string; + }; /** - * Team Repository - * @description A team's access to a repository. + * Project Column + * @description Project columns contain cards of work. */ - "team-repository": { + "project-column": { + /** + * Format: uri + * @example https://api.github.com/projects/columns/367 + */ + url: string; + /** + * Format: uri + * @example https://api.github.com/projects/120 + */ + project_url: string; + /** + * Format: uri + * @example https://api.github.com/projects/columns/367/cards + */ + cards_url: string; + /** + * @description The unique identifier of the project column + * @example 42 + */ + id: number; + /** @example MDEzOlByb2plY3RDb2x1bW4zNjc= */ + node_id: string; + /** + * @description Name of the project column + * @example Remaining tasks + */ + name: string; + /** + * Format: date-time + * @example 2016-09-05T14:18:44Z + */ + created_at: string; + /** + * Format: date-time + * @example 2016-09-05T14:22:28Z + */ + updated_at: string; + }; + /** + * Project Collaborator Permission + * @description Project Collaborator Permission + */ + "project-collaborator-permission": { + permission: string; + user: components["schemas"]["nullable-simple-user"]; + }; + /** Rate Limit */ + "rate-limit": { + limit: number; + remaining: number; + reset: number; + used: number; + }; + /** + * Rate Limit Overview + * @description Rate Limit Overview + */ + "rate-limit-overview": { + resources: { + core: components["schemas"]["rate-limit"]; + graphql?: components["schemas"]["rate-limit"]; + search: components["schemas"]["rate-limit"]; + code_search?: components["schemas"]["rate-limit"]; + source_import?: components["schemas"]["rate-limit"]; + integration_manifest?: components["schemas"]["rate-limit"]; + code_scanning_upload?: components["schemas"]["rate-limit"]; + actions_runner_registration?: components["schemas"]["rate-limit"]; + scim?: components["schemas"]["rate-limit"]; + dependency_snapshots?: components["schemas"]["rate-limit"]; + }; + rate: components["schemas"]["rate-limit"]; + }; + /** + * Repository + * @description A repository on GitHub. + */ + "nullable-repository": { /** * @description Unique identifier of the repository * @example 42 @@ -15690,6 +15638,7 @@ export interface components { /** @example octocat/Hello-World */ full_name: string; license: components["schemas"]["nullable-license-simple"]; + organization?: components["schemas"]["nullable-simple-user"]; forks: number; permissions?: { admin: boolean; @@ -15698,9 +15647,7 @@ export interface components { push: boolean; maintain?: boolean; }; - /** @example admin */ - role_name?: string; - owner: components["schemas"]["nullable-simple-user"]; + owner: components["schemas"]["simple-user"]; /** * @description Whether the repository is private or public. * @default false @@ -15858,7 +15805,10 @@ export interface components { stargazers_count: number; /** @example 80 */ watchers_count: number; - /** @example 108 */ + /** + * @description The size of the repository. Size is calculated hourly. When a repository is initially created, the size is 0. + * @example 108 + */ size: number; /** * @description The default branch of the repository. @@ -15894,11 +15844,18 @@ export interface components { has_wiki: boolean; has_pages: boolean; /** + * @deprecated * @description Whether downloads are enabled. * @default true * @example true */ has_downloads: boolean; + /** + * @description Whether discussions are enabled. + * @default false + * @example true + */ + has_discussions?: boolean; /** * @description Whether the repository is archived. * @default false @@ -15932,7 +15889,150 @@ export interface components { * @example true */ allow_rebase_merge?: boolean; - template_repository?: components["schemas"]["nullable-repository"]; + template_repository?: { + id?: number; + node_id?: string; + name?: string; + full_name?: string; + owner?: { + login?: string; + id?: number; + node_id?: string; + avatar_url?: string; + gravatar_id?: string; + url?: string; + html_url?: string; + followers_url?: string; + following_url?: string; + gists_url?: string; + starred_url?: string; + subscriptions_url?: string; + organizations_url?: string; + repos_url?: string; + events_url?: string; + received_events_url?: string; + type?: string; + site_admin?: boolean; + }; + private?: boolean; + html_url?: string; + description?: string; + fork?: boolean; + url?: string; + archive_url?: string; + assignees_url?: string; + blobs_url?: string; + branches_url?: string; + collaborators_url?: string; + comments_url?: string; + commits_url?: string; + compare_url?: string; + contents_url?: string; + contributors_url?: string; + deployments_url?: string; + downloads_url?: string; + events_url?: string; + forks_url?: string; + git_commits_url?: string; + git_refs_url?: string; + git_tags_url?: string; + git_url?: string; + issue_comment_url?: string; + issue_events_url?: string; + issues_url?: string; + keys_url?: string; + labels_url?: string; + languages_url?: string; + merges_url?: string; + milestones_url?: string; + notifications_url?: string; + pulls_url?: string; + releases_url?: string; + ssh_url?: string; + stargazers_url?: string; + statuses_url?: string; + subscribers_url?: string; + subscription_url?: string; + tags_url?: string; + teams_url?: string; + trees_url?: string; + clone_url?: string; + mirror_url?: string; + hooks_url?: string; + svn_url?: string; + homepage?: string; + language?: string; + forks_count?: number; + stargazers_count?: number; + watchers_count?: number; + size?: number; + default_branch?: string; + open_issues_count?: number; + is_template?: boolean; + topics?: string[]; + has_issues?: boolean; + has_projects?: boolean; + has_wiki?: boolean; + has_pages?: boolean; + has_downloads?: boolean; + archived?: boolean; + disabled?: boolean; + visibility?: string; + pushed_at?: string; + created_at?: string; + updated_at?: string; + permissions?: { + admin?: boolean; + maintain?: boolean; + push?: boolean; + triage?: boolean; + pull?: boolean; + }; + allow_rebase_merge?: boolean; + temp_clone_token?: string; + allow_squash_merge?: boolean; + allow_auto_merge?: boolean; + delete_branch_on_merge?: boolean; + allow_update_branch?: boolean; + use_squash_pr_title_as_default?: boolean; + /** + * @description The default value for a squash merge commit title: + * + * - `PR_TITLE` - default to the pull request's title. + * - `COMMIT_OR_PR_TITLE` - default to the commit's title (if only one commit) or the pull request's title (when more than one commit). + * @enum {string} + */ + squash_merge_commit_title?: "PR_TITLE" | "COMMIT_OR_PR_TITLE"; + /** + * @description The default value for a squash merge commit message: + * + * - `PR_BODY` - default to the pull request's body. + * - `COMMIT_MESSAGES` - default to the branch's commit messages. + * - `BLANK` - default to a blank commit message. + * @enum {string} + */ + squash_merge_commit_message?: "PR_BODY" | "COMMIT_MESSAGES" | "BLANK"; + /** + * @description The default value for a merge commit title. + * + * - `PR_TITLE` - default to the pull request's title. + * - `MERGE_MESSAGE` - default to the classic title for a merge message (e.g., Merge pull request #123 from branch-name). + * @enum {string} + */ + merge_commit_title?: "PR_TITLE" | "MERGE_MESSAGE"; + /** + * @description The default value for a merge commit message. + * + * - `PR_TITLE` - default to the pull request's title. + * - `PR_BODY` - default to the pull request's body. + * - `BLANK` - default to a blank commit message. + * @enum {string} + */ + merge_commit_message?: "PR_BODY" | "PR_TITLE" | "BLANK"; + allow_merge_commit?: boolean; + subscribers_count?: number; + network_count?: number; + } | null; temp_clone_token?: string; /** * @description Whether to allow squash merges for pull requests. @@ -15953,159 +16053,74 @@ export interface components { */ delete_branch_on_merge?: boolean; /** - * @description Whether to allow merge commits for pull requests. - * @default true - * @example true - */ - allow_merge_commit?: boolean; - /** - * @description Whether to allow forking this repo + * @description Whether or not a pull request head branch that is behind its base branch can always be updated even if it is not required to be up to date before merging. * @default false * @example false */ - allow_forking?: boolean; + allow_update_branch?: boolean; /** - * @description Whether to require contributors to sign off on web-based commits + * @deprecated + * @description Whether a squash merge commit can use the pull request title as default. **This property has been deprecated. Please use `squash_merge_commit_title` instead. * @default false - * @example false */ - web_commit_signoff_required?: boolean; - subscribers_count?: number; - network_count?: number; - open_issues: number; - watchers: number; - master_branch?: string; - }; - /** - * Project Card - * @description Project cards represent a scope of work. - */ - "project-card": { - /** - * Format: uri - * @example https://api.github.com/projects/columns/cards/1478 - */ - url: string; - /** - * @description The project card's ID - * @example 42 - */ - id: number; - /** @example MDExOlByb2plY3RDYXJkMTQ3OA== */ - node_id: string; - /** @example Add payload for delete Project column */ - note: string | null; - creator: components["schemas"]["nullable-simple-user"]; - /** - * Format: date-time - * @example 2016-09-05T14:21:06Z - */ - created_at: string; - /** - * Format: date-time - * @example 2016-09-05T14:20:22Z - */ - updated_at: string; - /** - * @description Whether or not the card is archived - * @example false - */ - archived?: boolean; - column_name?: string; - project_id?: string; - /** - * Format: uri - * @example https://api.github.com/projects/columns/367 - */ - column_url: string; - /** - * Format: uri - * @example https://api.github.com/repos/api-playground/projects-test/issues/3 - */ - content_url?: string; - /** - * Format: uri - * @example https://api.github.com/projects/120 - */ - project_url: string; - }; - /** - * Project Column - * @description Project columns contain cards of work. - */ - "project-column": { - /** - * Format: uri - * @example https://api.github.com/projects/columns/367 - */ - url: string; + use_squash_pr_title_as_default?: boolean; /** - * Format: uri - * @example https://api.github.com/projects/120 + * @description The default value for a squash merge commit title: + * + * - `PR_TITLE` - default to the pull request's title. + * - `COMMIT_OR_PR_TITLE` - default to the commit's title (if only one commit) or the pull request's title (when more than one commit). + * @enum {string} */ - project_url: string; + squash_merge_commit_title?: "PR_TITLE" | "COMMIT_OR_PR_TITLE"; /** - * Format: uri - * @example https://api.github.com/projects/columns/367/cards + * @description The default value for a squash merge commit message: + * + * - `PR_BODY` - default to the pull request's body. + * - `COMMIT_MESSAGES` - default to the branch's commit messages. + * - `BLANK` - default to a blank commit message. + * @enum {string} */ - cards_url: string; + squash_merge_commit_message?: "PR_BODY" | "COMMIT_MESSAGES" | "BLANK"; /** - * @description The unique identifier of the project column - * @example 42 + * @description The default value for a merge commit title. + * + * - `PR_TITLE` - default to the pull request's title. + * - `MERGE_MESSAGE` - default to the classic title for a merge message (e.g., Merge pull request #123 from branch-name). + * @enum {string} */ - id: number; - /** @example MDEzOlByb2plY3RDb2x1bW4zNjc= */ - node_id: string; + merge_commit_title?: "PR_TITLE" | "MERGE_MESSAGE"; /** - * @description Name of the project column - * @example Remaining tasks + * @description The default value for a merge commit message. + * + * - `PR_TITLE` - default to the pull request's title. + * - `PR_BODY` - default to the pull request's body. + * - `BLANK` - default to a blank commit message. + * @enum {string} */ - name: string; + merge_commit_message?: "PR_BODY" | "PR_TITLE" | "BLANK"; /** - * Format: date-time - * @example 2016-09-05T14:18:44Z + * @description Whether to allow merge commits for pull requests. + * @default true + * @example true */ - created_at: string; + allow_merge_commit?: boolean; + /** @description Whether to allow forking this repo */ + allow_forking?: boolean; /** - * Format: date-time - * @example 2016-09-05T14:22:28Z + * @description Whether to require contributors to sign off on web-based commits + * @default false */ - updated_at: string; - }; - /** - * Project Collaborator Permission - * @description Project Collaborator Permission - */ - "project-collaborator-permission": { - permission: string; - user: components["schemas"]["nullable-simple-user"]; - }; - /** Rate Limit */ - "rate-limit": { - limit: number; - remaining: number; - reset: number; - used: number; - }; - /** - * Rate Limit Overview - * @description Rate Limit Overview - */ - "rate-limit-overview": { - resources: { - core: components["schemas"]["rate-limit"]; - graphql?: components["schemas"]["rate-limit"]; - search: components["schemas"]["rate-limit"]; - code_search?: components["schemas"]["rate-limit"]; - source_import?: components["schemas"]["rate-limit"]; - integration_manifest?: components["schemas"]["rate-limit"]; - code_scanning_upload?: components["schemas"]["rate-limit"]; - actions_runner_registration?: components["schemas"]["rate-limit"]; - scim?: components["schemas"]["rate-limit"]; - dependency_snapshots?: components["schemas"]["rate-limit"]; - }; - rate: components["schemas"]["rate-limit"]; - }; + web_commit_signoff_required?: boolean; + subscribers_count?: number; + network_count?: number; + open_issues: number; + watchers: number; + master_branch?: string; + /** @example "2020-07-09T00:17:42Z" */ + starred_at?: string; + /** @description Whether anonymous git access is enabled for this repository */ + anonymous_access_enabled?: boolean; + } | null; /** * Code Of Conduct Simple * @description Code of Conduct Simple @@ -22479,6 +22494,11 @@ export interface components { * @description The time that push protection was bypassed in ISO 8601 format: `YYYY-MM-DDTHH:MM:SSZ`. */ push_protection_bypassed_at?: string | null; + /** + * @description The token status as of the latest validity check. + * @enum {string} + */ + validity?: "active" | "inactive" | "unknown"; }; /** @description An optional comment when closing an alert. Cannot be updated or deleted. Must be `null` when changing `state` to `open`. */ "secret-scanning-alert-resolution-comment": string | null; @@ -24153,6 +24173,10 @@ export interface components { */ is_template?: boolean; topics?: string[]; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; /** * @description Whether issues are enabled. * @default true @@ -25014,6 +25038,10 @@ export interface components { */ is_template?: boolean; topics?: string[]; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; /** * @description Whether issues are enabled. * @default true @@ -27556,6 +27584,53 @@ export interface components { repository: components["schemas"]["repository-webhooks"]; sender: components["schemas"]["simple-user-webhooks"]; }; + /** custom property created event */ + "webhook-custom-property-created": { + /** @enum {string} */ + action: "created"; + definition: components["schemas"]["org-custom-property"]; + enterprise?: components["schemas"]["enterprise-webhooks"]; + installation?: components["schemas"]["simple-installation"]; + organization: components["schemas"]["organization-simple-webhooks"]; + sender?: components["schemas"]["simple-user-webhooks"]; + }; + /** custom property deleted event */ + "webhook-custom-property-deleted": { + /** @enum {string} */ + action: "deleted"; + definition: { + /** @description The name of the property that was deleted. */ + property_name: string; + }; + enterprise?: components["schemas"]["enterprise-webhooks"]; + installation?: components["schemas"]["simple-installation"]; + organization: components["schemas"]["organization-simple-webhooks"]; + sender?: components["schemas"]["simple-user-webhooks"]; + }; + /** custom property updated event */ + "webhook-custom-property-updated": { + /** @enum {string} */ + action: "updated"; + definition: components["schemas"]["org-custom-property"]; + enterprise?: components["schemas"]["enterprise-webhooks"]; + installation?: components["schemas"]["simple-installation"]; + organization: components["schemas"]["organization-simple-webhooks"]; + sender?: components["schemas"]["simple-user-webhooks"]; + }; + /** Custom property values updated event */ + "webhook-custom-property-values-updated": { + /** @enum {string} */ + action: "updated"; + enterprise?: components["schemas"]["enterprise-webhooks"]; + installation?: components["schemas"]["simple-installation"]; + repository: components["schemas"]["repository-webhooks"]; + organization: components["schemas"]["organization-simple-webhooks"]; + sender?: components["schemas"]["simple-user-webhooks"]; + /** @description The new custom property values for the repository. */ + new_property_values: components["schemas"]["custom-property-value"][]; + /** @description The old custom property values for the repository. */ + old_property_values: components["schemas"]["custom-property-value"][]; + }; /** delete event */ "webhook-delete": { enterprise?: components["schemas"]["enterprise-webhooks"]; @@ -31224,6 +31299,10 @@ export interface components { /** Format: uri */ contributors_url: string; created_at: number | string; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; /** @description The default branch of the repository. */ default_branch: string; /** @@ -38920,6 +38999,10 @@ export interface components { /** Format: uri */ contributors_url: string; created_at: number | string; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; /** @description The default branch of the repository. */ default_branch: string; /** @@ -41127,6 +41210,10 @@ export interface components { /** Format: uri */ contributors_url: string; created_at: number | string; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; /** @description The default branch of the repository. */ default_branch: string; /** @@ -78910,6 +78997,10 @@ export interface components { /** Format: uri */ contributors_url: string; created_at: number | string; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; /** @description The default branch of the repository. */ default_branch: string; /** @@ -82690,6 +82781,10 @@ export interface components { /** Format: uri */ contributors_url: string; created_at: number | string; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; /** @description The default branch of the repository. */ default_branch: string; /** @@ -83003,6 +83098,10 @@ export interface components { /** Format: uri */ contributors_url: string; created_at: number | string; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; /** @description The default branch of the repository. */ default_branch: string; /** @@ -83316,6 +83415,10 @@ export interface components { /** Format: uri */ contributors_url: string; created_at: number | string; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; /** @description The default branch of the repository. */ default_branch: string; /** @@ -83660,319 +83763,327 @@ export interface components { /** Format: uri */ contributors_url: string; created_at: number | string; - /** @description The default branch of the repository. */ - default_branch: string; - /** - * @description Whether to delete head branches when pull requests are merged - * @default false - */ - delete_branch_on_merge?: boolean; - /** Format: uri */ - deployments_url: string; - description: string | null; - /** @description Returns whether or not this repository is disabled. */ - disabled?: boolean; - /** Format: uri */ - downloads_url: string; - /** Format: uri */ - events_url: string; - fork: boolean; - forks: number; - forks_count: number; - /** Format: uri */ - forks_url: string; - full_name: string; - /** Format: uri-template */ - git_commits_url: string; - /** Format: uri-template */ - git_refs_url: string; - /** Format: uri-template */ - git_tags_url: string; - /** Format: uri */ - git_url: string; - /** - * @description Whether downloads are enabled. - * @default true - */ - has_downloads: boolean; - /** - * @description Whether issues are enabled. - * @default true - */ - has_issues: boolean; - has_pages: boolean; - /** - * @description Whether projects are enabled. - * @default true - */ - has_projects: boolean; - /** - * @description Whether the wiki is enabled. - * @default true - */ - has_wiki: boolean; - homepage: string | null; - /** Format: uri */ - hooks_url: string; - /** Format: uri */ - html_url: string; - /** @description Unique identifier of the repository */ - id: number; - is_template?: boolean; - /** Format: uri-template */ - issue_comment_url: string; - /** Format: uri-template */ - issue_events_url: string; - /** Format: uri-template */ - issues_url: string; - /** Format: uri-template */ - keys_url: string; - /** Format: uri-template */ - labels_url: string; - language: string | null; - /** Format: uri */ - languages_url: string; - /** License */ - license: { - key: string; - name: string; - node_id: string; - spdx_id: string; - /** Format: uri */ - url: string | null; - } | null; - master_branch?: string; - /** Format: uri */ - merges_url: string; - /** Format: uri-template */ - milestones_url: string; - /** Format: uri */ - mirror_url: string | null; - /** @description The name of the repository. */ - name: string; - node_id: string; - /** Format: uri-template */ - notifications_url: string; - open_issues: number; - open_issues_count: number; - organization?: string; - /** User */ - owner: { - /** Format: uri */ - avatar_url?: string; - deleted?: boolean; - email?: string | null; - /** Format: uri-template */ - events_url?: string; - /** Format: uri */ - followers_url?: string; - /** Format: uri-template */ - following_url?: string; - /** Format: uri-template */ - gists_url?: string; - gravatar_id?: string; - /** Format: uri */ - html_url?: string; - id: number; - login: string; - name?: string; - node_id?: string; - /** Format: uri */ - organizations_url?: string; - /** Format: uri */ - received_events_url?: string; - /** Format: uri */ - repos_url?: string; - site_admin?: boolean; - /** Format: uri-template */ - starred_url?: string; - /** Format: uri */ - subscriptions_url?: string; - /** @enum {string} */ - type?: "Bot" | "User" | "Organization"; - /** Format: uri */ - url?: string; - } | null; - permissions?: { - admin: boolean; - maintain?: boolean; - pull: boolean; - push: boolean; - triage?: boolean; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; + /** @description The default branch of the repository. */ + default_branch: string; + /** + * @description Whether to delete head branches when pull requests are merged + * @default false + */ + delete_branch_on_merge?: boolean; + /** Format: uri */ + deployments_url: string; + description: string | null; + /** @description Returns whether or not this repository is disabled. */ + disabled?: boolean; + /** Format: uri */ + downloads_url: string; + /** Format: uri */ + events_url: string; + fork: boolean; + forks: number; + forks_count: number; + /** Format: uri */ + forks_url: string; + full_name: string; + /** Format: uri-template */ + git_commits_url: string; + /** Format: uri-template */ + git_refs_url: string; + /** Format: uri-template */ + git_tags_url: string; + /** Format: uri */ + git_url: string; + /** + * @description Whether downloads are enabled. + * @default true + */ + has_downloads: boolean; + /** + * @description Whether issues are enabled. + * @default true + */ + has_issues: boolean; + has_pages: boolean; + /** + * @description Whether projects are enabled. + * @default true + */ + has_projects: boolean; + /** + * @description Whether the wiki is enabled. + * @default true + */ + has_wiki: boolean; + homepage: string | null; + /** Format: uri */ + hooks_url: string; + /** Format: uri */ + html_url: string; + /** @description Unique identifier of the repository */ + id: number; + is_template?: boolean; + /** Format: uri-template */ + issue_comment_url: string; + /** Format: uri-template */ + issue_events_url: string; + /** Format: uri-template */ + issues_url: string; + /** Format: uri-template */ + keys_url: string; + /** Format: uri-template */ + labels_url: string; + language: string | null; + /** Format: uri */ + languages_url: string; + /** License */ + license: { + key: string; + name: string; + node_id: string; + spdx_id: string; + /** Format: uri */ + url: string | null; + } | null; + master_branch?: string; + /** Format: uri */ + merges_url: string; + /** Format: uri-template */ + milestones_url: string; + /** Format: uri */ + mirror_url: string | null; + /** @description The name of the repository. */ + name: string; + node_id: string; + /** Format: uri-template */ + notifications_url: string; + open_issues: number; + open_issues_count: number; + organization?: string; + /** User */ + owner: { + /** Format: uri */ + avatar_url?: string; + deleted?: boolean; + email?: string | null; + /** Format: uri-template */ + events_url?: string; + /** Format: uri */ + followers_url?: string; + /** Format: uri-template */ + following_url?: string; + /** Format: uri-template */ + gists_url?: string; + gravatar_id?: string; + /** Format: uri */ + html_url?: string; + id: number; + login: string; + name?: string; + node_id?: string; + /** Format: uri */ + organizations_url?: string; + /** Format: uri */ + received_events_url?: string; + /** Format: uri */ + repos_url?: string; + site_admin?: boolean; + /** Format: uri-template */ + starred_url?: string; + /** Format: uri */ + subscriptions_url?: string; + /** @enum {string} */ + type?: "Bot" | "User" | "Organization"; + /** Format: uri */ + url?: string; + } | null; + permissions?: { + admin: boolean; + maintain?: boolean; + pull: boolean; + push: boolean; + triage?: boolean; + }; + /** @description Whether the repository is private or public. */ + private: boolean; + public?: boolean; + /** Format: uri-template */ + pulls_url: string; + pushed_at: number | string | null; + /** Format: uri-template */ + releases_url: string; + role_name?: string | null; + size: number; + ssh_url: string; + stargazers?: number; + stargazers_count: number; + /** Format: uri */ + stargazers_url: string; + /** Format: uri-template */ + statuses_url: string; + /** Format: uri */ + subscribers_url: string; + /** Format: uri */ + subscription_url: string; + /** Format: uri */ + svn_url: string; + /** Format: uri */ + tags_url: string; + /** Format: uri */ + teams_url: string; + topics: string[]; + /** Format: uri-template */ + trees_url: string; + /** Format: date-time */ + updated_at: string; + /** Format: uri */ + url: string; + /** @enum {string} */ + visibility: "public" | "private" | "internal"; + watchers: number; + watchers_count: number; + }; + sender: components["schemas"]["simple-user-webhooks"]; + /** + * Team + * @description Groups of organization members that gives permissions on specified repositories. + */ + team: { + deleted?: boolean; + /** @description Description of the team */ + description?: string | null; + /** Format: uri */ + html_url?: string; + /** @description Unique identifier of the team */ + id: number; + /** Format: uri-template */ + members_url?: string; + /** @description Name of the team */ + name: string; + node_id?: string; + parent?: { + /** @description Description of the team */ + description: string | null; + /** Format: uri */ + html_url: string; + /** @description Unique identifier of the team */ + id: number; + /** Format: uri-template */ + members_url: string; + /** @description Name of the team */ + name: string; + node_id: string; + /** @description Permission that the team will have for its repositories */ + permission: string; + /** @enum {string} */ + privacy: "open" | "closed" | "secret"; + /** + * @description Whether team members will receive notifications when their team is @mentioned + * @enum {string} + */ + notification_setting: + | "notifications_enabled" + | "notifications_disabled"; + /** Format: uri */ + repositories_url: string; + slug: string; + /** + * Format: uri + * @description URL for the team + */ + url: string; + } | null; + /** @description Permission that the team will have for its repositories */ + permission?: string; + /** @enum {string} */ + privacy?: "open" | "closed" | "secret"; + /** + * @description Whether team members will receive notifications when their team is @mentioned + * @enum {string} + */ + notification_setting?: + | "notifications_enabled" + | "notifications_disabled"; + /** Format: uri */ + repositories_url?: string; + slug?: string; + /** + * Format: uri + * @description URL for the team + */ + url?: string; + }; + }; + /** team removed_from_repository event */ + "webhook-team-removed-from-repository": { + /** @enum {string} */ + action: "removed_from_repository"; + enterprise?: components["schemas"]["enterprise-webhooks"]; + installation?: components["schemas"]["simple-installation"]; + organization: components["schemas"]["organization-simple-webhooks"]; + /** + * Repository + * @description A git repository + */ + repository?: { + /** + * @description Whether to allow auto-merge for pull requests. + * @default false + */ + allow_auto_merge?: boolean; + /** @description Whether to allow private forks */ + allow_forking?: boolean; + /** + * @description Whether to allow merge commits for pull requests. + * @default true + */ + allow_merge_commit?: boolean; + /** + * @description Whether to allow rebase merges for pull requests. + * @default true + */ + allow_rebase_merge?: boolean; + /** + * @description Whether to allow squash merges for pull requests. + * @default true + */ + allow_squash_merge?: boolean; + allow_update_branch?: boolean; + /** Format: uri-template */ + archive_url: string; + /** + * @description Whether the repository is archived. + * @default false + */ + archived: boolean; + /** Format: uri-template */ + assignees_url: string; + /** Format: uri-template */ + blobs_url: string; + /** Format: uri-template */ + branches_url: string; + /** Format: uri */ + clone_url: string; + /** Format: uri-template */ + collaborators_url: string; + /** Format: uri-template */ + comments_url: string; + /** Format: uri-template */ + commits_url: string; + /** Format: uri-template */ + compare_url: string; + /** Format: uri-template */ + contents_url: string; + /** Format: uri */ + contributors_url: string; + created_at: number | string; + /** @description The custom properties that were defined for the repository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; }; - /** @description Whether the repository is private or public. */ - private: boolean; - public?: boolean; - /** Format: uri-template */ - pulls_url: string; - pushed_at: number | string | null; - /** Format: uri-template */ - releases_url: string; - role_name?: string | null; - size: number; - ssh_url: string; - stargazers?: number; - stargazers_count: number; - /** Format: uri */ - stargazers_url: string; - /** Format: uri-template */ - statuses_url: string; - /** Format: uri */ - subscribers_url: string; - /** Format: uri */ - subscription_url: string; - /** Format: uri */ - svn_url: string; - /** Format: uri */ - tags_url: string; - /** Format: uri */ - teams_url: string; - topics: string[]; - /** Format: uri-template */ - trees_url: string; - /** Format: date-time */ - updated_at: string; - /** Format: uri */ - url: string; - /** @enum {string} */ - visibility: "public" | "private" | "internal"; - watchers: number; - watchers_count: number; - }; - sender: components["schemas"]["simple-user-webhooks"]; - /** - * Team - * @description Groups of organization members that gives permissions on specified repositories. - */ - team: { - deleted?: boolean; - /** @description Description of the team */ - description?: string | null; - /** Format: uri */ - html_url?: string; - /** @description Unique identifier of the team */ - id: number; - /** Format: uri-template */ - members_url?: string; - /** @description Name of the team */ - name: string; - node_id?: string; - parent?: { - /** @description Description of the team */ - description: string | null; - /** Format: uri */ - html_url: string; - /** @description Unique identifier of the team */ - id: number; - /** Format: uri-template */ - members_url: string; - /** @description Name of the team */ - name: string; - node_id: string; - /** @description Permission that the team will have for its repositories */ - permission: string; - /** @enum {string} */ - privacy: "open" | "closed" | "secret"; - /** - * @description Whether team members will receive notifications when their team is @mentioned - * @enum {string} - */ - notification_setting: - | "notifications_enabled" - | "notifications_disabled"; - /** Format: uri */ - repositories_url: string; - slug: string; - /** - * Format: uri - * @description URL for the team - */ - url: string; - } | null; - /** @description Permission that the team will have for its repositories */ - permission?: string; - /** @enum {string} */ - privacy?: "open" | "closed" | "secret"; - /** - * @description Whether team members will receive notifications when their team is @mentioned - * @enum {string} - */ - notification_setting?: - | "notifications_enabled" - | "notifications_disabled"; - /** Format: uri */ - repositories_url?: string; - slug?: string; - /** - * Format: uri - * @description URL for the team - */ - url?: string; - }; - }; - /** team removed_from_repository event */ - "webhook-team-removed-from-repository": { - /** @enum {string} */ - action: "removed_from_repository"; - enterprise?: components["schemas"]["enterprise-webhooks"]; - installation?: components["schemas"]["simple-installation"]; - organization: components["schemas"]["organization-simple-webhooks"]; - /** - * Repository - * @description A git repository - */ - repository?: { - /** - * @description Whether to allow auto-merge for pull requests. - * @default false - */ - allow_auto_merge?: boolean; - /** @description Whether to allow private forks */ - allow_forking?: boolean; - /** - * @description Whether to allow merge commits for pull requests. - * @default true - */ - allow_merge_commit?: boolean; - /** - * @description Whether to allow rebase merges for pull requests. - * @default true - */ - allow_rebase_merge?: boolean; - /** - * @description Whether to allow squash merges for pull requests. - * @default true - */ - allow_squash_merge?: boolean; - allow_update_branch?: boolean; - /** Format: uri-template */ - archive_url: string; - /** - * @description Whether the repository is archived. - * @default false - */ - archived: boolean; - /** Format: uri-template */ - assignees_url: string; - /** Format: uri-template */ - blobs_url: string; - /** Format: uri-template */ - branches_url: string; - /** Format: uri */ - clone_url: string; - /** Format: uri-template */ - collaborators_url: string; - /** Format: uri-template */ - comments_url: string; - /** Format: uri-template */ - commits_url: string; - /** Format: uri-template */ - compare_url: string; - /** Format: uri-template */ - contents_url: string; - /** Format: uri */ - contributors_url: string; - created_at: number | string; /** @description The default branch of the repository. */ default_branch: string; /** @@ -86729,6 +86840,8 @@ export interface components { "secret-scanning-alert-resolution"?: string; /** @description The property to sort the results by. `created` means when the alert was created. `updated` means when the alert was updated or resolved. */ "secret-scanning-alert-sort"?: "created" | "updated"; + /** @description A comma-separated list of validities that, when present, will return alerts that match the validities in this list. Valid options are `active`, `inactive`, and `unknown`. */ + "secret-scanning-alert-validity"?: string; /** @description The unique identifier of the gist. */ "gist-id": string; /** @description The unique identifier of the comment. */ @@ -88317,6 +88430,7 @@ export interface operations { per_page?: components["parameters"]["per-page"]; before?: components["parameters"]["pagination-before"]; after?: components["parameters"]["pagination-after"]; + validity?: components["parameters"]["secret-scanning-alert-validity"]; }; path: { enterprise: components["parameters"]["enterprise"]; @@ -91241,7 +91355,7 @@ export interface operations { * List codespaces for the organization * @description Lists the codespaces associated to a specified organization. * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces` read permission to use this endpoint. */ "codespaces/list-in-organization": { parameters: { @@ -91274,7 +91388,7 @@ export interface operations { * Manage access control for organization codespaces * @deprecated * @description Sets which users can access codespaces in an organization. This is synonymous with granting or revoking codespaces access permissions for users according to the visibility. - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces settings` write permission to use this endpoint. */ "codespaces/set-codespaces-access": { parameters: { @@ -91322,7 +91436,7 @@ export interface operations { * To use this endpoint, the access settings for the organization must be set to `selected_members`. * For information on how to change this setting, see "[Manage access control for organization codespaces](https://docs.github.com/rest/codespaces/organizations#manage-access-control-for-organization-codespaces)." * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces settings` write permission to use this endpoint. */ "codespaces/set-codespaces-access-users": { parameters: { @@ -91361,7 +91475,7 @@ export interface operations { * To use this endpoint, the access settings for the organization must be set to `selected_members`. * For information on how to change this setting, see "[Manage access control for organization codespaces](https://docs.github.com/rest/codespaces/organizations#manage-access-control-for-organization-codespaces)." * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces settings` write permission to use this endpoint. */ "codespaces/delete-codespaces-access-users": { parameters: { @@ -92992,7 +93106,7 @@ export interface operations { * List codespaces for a user in organization * @description Lists the codespaces that a member of an organization has for repositories in that organization. * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * You must authenticate using an access token with the `admin:org` scope or the `Organization codespaces` read permission to use this endpoint. */ "codespaces/get-codespaces-for-user-in-org": { parameters: { @@ -93026,7 +93140,10 @@ export interface operations { * Delete a codespace from the organization * @description Deletes a user's codespace. * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * To use this endpoint you must authenticate using one of the following methods: + * + * - An access token with the `admin:org` scope + * - An access token with write permissions for `Codespaces` on the specific repository and write permissions for `Organization codespaces` */ "codespaces/delete-from-organization": { parameters: { @@ -93049,7 +93166,10 @@ export interface operations { * Stop a codespace for an organization user * @description Stops a user's codespace. * - * You must authenticate using an access token with the `admin:org` scope to use this endpoint. + * To use this endpoint you must authenticate using one of the following methods: + * + * - An access token with the `admin:org` scope + * - An access token with write permissions for `Codespaces lifecycle admin` on the specific repository and write permissions for `Organization codespaces` */ "codespaces/stop-in-organization": { parameters: { @@ -94244,6 +94364,8 @@ export interface operations { query?: { per_page?: components["parameters"]["per-page"]; page?: components["parameters"]["page"]; + /** @description Finds repositories in the organization with a query containing one or more search keywords and qualifiers. Qualifiers allow you to limit your search to specific areas of GitHub. The REST API supports the same qualifiers as the web interface for GitHub. To learn more about the format of the query, see [Constructing a search query](https://docs.github.com/rest/search/search#constructing-a-search-query). See "[Searching for repositories](https://docs.github.com/articles/searching-for-repositories/)" for a detailed list of qualifiers. */ + repository_query?: string; }; path: { org: components["parameters"]["org"]; @@ -94558,6 +94680,10 @@ export interface operations { * @enum {string} */ merge_commit_message?: "PR_BODY" | "PR_TITLE" | "BLANK"; + /** @description The custom properties for the new respository. The keys are the custom property names, and the values are the corresponding custom property values. */ + custom_properties?: { + [key: string]: unknown; + }; }; }; }; @@ -94802,6 +94928,7 @@ export interface operations { per_page?: components["parameters"]["per-page"]; before?: components["parameters"]["secret-scanning-pagination-before-org-repo"]; after?: components["parameters"]["secret-scanning-pagination-after-org-repo"]; + validity?: components["parameters"]["secret-scanning-alert-validity"]; }; path: { org: components["parameters"]["org"]; @@ -109892,6 +110019,7 @@ export interface operations { per_page?: components["parameters"]["per-page"]; before?: components["parameters"]["secret-scanning-pagination-before-org-repo"]; after?: components["parameters"]["secret-scanning-pagination-after-org-repo"]; + validity?: components["parameters"]["secret-scanning-alert-validity"]; }; path: { owner: components["parameters"]["owner"]; diff --git a/node_modules/@octokit/types/package.json b/node_modules/@octokit/types/package.json index e4409515ea..d5e0740554 100644 --- a/node_modules/@octokit/types/package.json +++ b/node_modules/@octokit/types/package.json @@ -1,12 +1,12 @@ { "name": "@octokit/types", - "version": "12.3.0", + "version": "12.4.0", "publishConfig": { "access": "public" }, "description": "Shared TypeScript definitions for Octokit projects", "dependencies": { - "@octokit/openapi-types": "^19.0.2" + "@octokit/openapi-types": "^19.1.0" }, "repository": "github:octokit/types.ts", "keywords": [ @@ -36,7 +36,7 @@ "typescript": "^5.0.0" }, "octokit": { - "openapi-version": "13.2.0" + "openapi-version": "13.3.0" }, "files": [ "dist-types/**" diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.js b/node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.js index b8e45abfbb..f5d0d12d3b 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.js @@ -143,9 +143,9 @@ module.exports = { '@typescript-eslint/padding-line-between-statements': 'error', '@typescript-eslint/parameter-properties': 'error', '@typescript-eslint/prefer-as-const': 'error', - '@typescript-eslint/prefer-enum-initializers': 'error', 'prefer-destructuring': 'off', '@typescript-eslint/prefer-destructuring': 'error', + '@typescript-eslint/prefer-enum-initializers': 'error', '@typescript-eslint/prefer-for-of': 'error', '@typescript-eslint/prefer-function-type': 'error', '@typescript-eslint/prefer-includes': 'error', diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.js.map index 97a323a833..e7ed4bc8f6 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.js.map @@ -1 +1 @@ -{"version":3,"file":"all.js","sourceRoot":"","sources":["../../src/configs/all.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"all.js","sourceRoot":"","sources":["../../src/configs/all.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/configs/disable-type-checked.js b/node_modules/@typescript-eslint/eslint-plugin/dist/configs/disable-type-checked.js index c558863386..258f6cd512 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/configs/disable-type-checked.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/configs/disable-type-checked.js @@ -34,7 +34,9 @@ module.exports = { '@typescript-eslint/no-unsafe-enum-comparison': 'off', '@typescript-eslint/no-unsafe-member-access': 'off', '@typescript-eslint/no-unsafe-return': 'off', + '@typescript-eslint/no-unsafe-unary-minus': 'off', '@typescript-eslint/non-nullable-type-assertion-style': 'off', + '@typescript-eslint/prefer-destructuring': 'off', '@typescript-eslint/prefer-includes': 'off', '@typescript-eslint/prefer-nullish-coalescing': 'off', '@typescript-eslint/prefer-optional-chain': 'off', diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/configs/disable-type-checked.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/configs/disable-type-checked.js.map index 29d8166fd0..966999981e 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/configs/disable-type-checked.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/configs/disable-type-checked.js.map @@ -1 +1 @@ -{"version":3,"file":"disable-type-checked.js","sourceRoot":"","sources":["../../src/configs/disable-type-checked.ts"],"names":[],"mappings":";AAAA,wCAAwC;AACxC,gCAAgC;AAChC,mDAAmD;AACnD,EAAE;AACF,4DAA4D;AAC5D,sDAAsD;AAEtD,iBAAS;IACP,aAAa,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;IAC/C,KAAK,EAAE;QACL,mCAAmC,EAAE,KAAK;QAC1C,4CAA4C,EAAE,KAAK;QACnD,iCAAiC,EAAE,KAAK;QACxC,sCAAsC,EAAE,KAAK;QAC7C,sCAAsC,EAAE,KAAK;QAC7C,iDAAiD,EAAE,KAAK;QACxD,mDAAmD,EAAE,KAAK;QAC1D,yCAAyC,EAAE,KAAK;QAChD,oCAAoC,EAAE,KAAK;QAC3C,oCAAoC,EAAE,KAAK;QAC3C,iDAAiD,EAAE,KAAK;QACxD,wCAAwC,EAAE,KAAK;QAC/C,mCAAmC,EAAE,KAAK;QAC1C,mDAAmD,EAAE,KAAK;QAC1D,qCAAqC,EAAE,KAAK;QAC5C,2DAA2D,EAAE,KAAK;QAClE,6CAA6C,EAAE,KAAK;QACpD,6CAA6C,EAAE,KAAK;QACpD,kDAAkD,EAAE,KAAK;QACzD,kDAAkD,EAAE,KAAK;QACzD,uCAAuC,EAAE,KAAK;QAC9C,yCAAyC,EAAE,KAAK;QAChD,mCAAmC,EAAE,KAAK;QAC1C,8CAA8C,EAAE,KAAK;QACrD,4CAA4C,EAAE,KAAK;QACnD,qCAAqC,EAAE,KAAK;QAC5C,sDAAsD,EAAE,KAAK;QAC7D,oCAAoC,EAAE,KAAK;QAC3C,8CAA8C,EAAE,KAAK;QACrD,0CAA0C,EAAE,KAAK;QACjD,oCAAoC,EAAE,KAAK;QAC3C,oDAAoD,EAAE,KAAK;QAC3D,iDAAiD,EAAE,KAAK;QACxD,uCAAuC,EAAE,KAAK;QAC9C,4CAA4C,EAAE,KAAK;QACnD,mDAAmD,EAAE,KAAK;QAC1D,2CAA2C,EAAE,KAAK;QAClD,+CAA+C,EAAE,KAAK;QACtD,kCAAkC,EAAE,KAAK;QACzC,2CAA2C,EAAE,KAAK;QAClD,kDAAkD,EAAE,KAAK;QACzD,iCAAiC,EAAE,KAAK;QACxC,+CAA+C,EAAE,KAAK;QACtD,gDAAgD,EAAE,KAAK;QACvD,mCAAmC,EAAE,KAAK;KAC3C;CACF,CAAC"} \ No newline at end of file +{"version":3,"file":"disable-type-checked.js","sourceRoot":"","sources":["../../src/configs/disable-type-checked.ts"],"names":[],"mappings":";AAAA,wCAAwC;AACxC,gCAAgC;AAChC,mDAAmD;AACnD,EAAE;AACF,4DAA4D;AAC5D,sDAAsD;AAEtD,iBAAS;IACP,aAAa,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;IAC/C,KAAK,EAAE;QACL,mCAAmC,EAAE,KAAK;QAC1C,4CAA4C,EAAE,KAAK;QACnD,iCAAiC,EAAE,KAAK;QACxC,sCAAsC,EAAE,KAAK;QAC7C,sCAAsC,EAAE,KAAK;QAC7C,iDAAiD,EAAE,KAAK;QACxD,mDAAmD,EAAE,KAAK;QAC1D,yCAAyC,EAAE,KAAK;QAChD,oCAAoC,EAAE,KAAK;QAC3C,oCAAoC,EAAE,KAAK;QAC3C,iDAAiD,EAAE,KAAK;QACxD,wCAAwC,EAAE,KAAK;QAC/C,mCAAmC,EAAE,KAAK;QAC1C,mDAAmD,EAAE,KAAK;QAC1D,qCAAqC,EAAE,KAAK;QAC5C,2DAA2D,EAAE,KAAK;QAClE,6CAA6C,EAAE,KAAK;QACpD,6CAA6C,EAAE,KAAK;QACpD,kDAAkD,EAAE,KAAK;QACzD,kDAAkD,EAAE,KAAK;QACzD,uCAAuC,EAAE,KAAK;QAC9C,yCAAyC,EAAE,KAAK;QAChD,mCAAmC,EAAE,KAAK;QAC1C,8CAA8C,EAAE,KAAK;QACrD,4CAA4C,EAAE,KAAK;QACnD,qCAAqC,EAAE,KAAK;QAC5C,0CAA0C,EAAE,KAAK;QACjD,sDAAsD,EAAE,KAAK;QAC7D,yCAAyC,EAAE,KAAK;QAChD,oCAAoC,EAAE,KAAK;QAC3C,8CAA8C,EAAE,KAAK;QACrD,0CAA0C,EAAE,KAAK;QACjD,oCAAoC,EAAE,KAAK;QAC3C,oDAAoD,EAAE,KAAK;QAC3D,iDAAiD,EAAE,KAAK;QACxD,uCAAuC,EAAE,KAAK;QAC9C,4CAA4C,EAAE,KAAK;QACnD,mDAAmD,EAAE,KAAK;QAC1D,2CAA2C,EAAE,KAAK;QAClD,+CAA+C,EAAE,KAAK;QACtD,kCAAkC,EAAE,KAAK;QACzC,2CAA2C,EAAE,KAAK;QAClD,kDAAkD,EAAE,KAAK;QACzD,iCAAiC,EAAE,KAAK;QACxC,+CAA+C,EAAE,KAAK;QACtD,gDAAgD,EAAE,KAAK;QACvD,mCAAmC,EAAE,KAAK;KAC3C;CACF,CAAC"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-unary-minus.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-unary-minus.js index 71359f5d1d..34d7f1844b 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-unary-minus.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-unary-minus.js @@ -35,7 +35,7 @@ exports.default = util.createRule({ requiresTypeChecking: true, }, messages: { - unaryMinus: 'Invalid type "{{type}}" of template literal expression.', + unaryMinus: 'Argument of unary negation should be assignable to number | bigint but is {{type}} instead.', }, schema: [], }, diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-unary-minus.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-unary-minus.js.map index 90d13a69e3..778766e346 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-unary-minus.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/no-unsafe-unary-minus.js.map @@ -1 +1 @@ -{"version":3,"file":"no-unsafe-unary-minus.js","sourceRoot":"","sources":["../../src/rules/no-unsafe-unary-minus.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAwC;AACxC,+CAAiC;AAEjC,8CAAgC;AAKhC,kBAAe,IAAI,CAAC,UAAU,CAAsB;IAClD,IAAI,EAAE,uBAAuB;IAC7B,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,yCAAyC;YACtD,oBAAoB,EAAE,IAAI;SAC3B;QACD,QAAQ,EAAE;YACR,UAAU,EAAE,yDAAyD;SACtE;QACD,MAAM,EAAE,EAAE;KACX;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,eAAe,CAAC,IAAI;gBAClB,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;oBAC1B,OAAO;gBACT,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACjD,MAAM,OAAO,GAAG,IAAI,CAAC,4BAA4B,CAC/C,QAAQ,EACR,IAAI,CAAC,QAAQ,CACd,CAAC;gBACF,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;gBAClD,IACE,OAAO;qBACJ,cAAc,CAAC,OAAO,CAAC;qBACvB,IAAI,CACH,IAAI,CAAC,EAAE,CACL,CAAC,OAAO,CAAC,aAAa,CACpB,IAAI,EACJ,EAAE,CAAC,SAAS,CAAC,GAAG;oBACd,EAAE,CAAC,SAAS,CAAC,KAAK;oBAClB,EAAE,CAAC,SAAS,CAAC,UAAU;oBACvB,EAAE,CAAC,SAAS,CAAC,UAAU,CAC1B,CACJ,EACH,CAAC;oBACD,OAAO,CAAC,MAAM,CAAC;wBACb,SAAS,EAAE,YAAY;wBACvB,IAAI;wBACJ,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;qBAC9C,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"no-unsafe-unary-minus.js","sourceRoot":"","sources":["../../src/rules/no-unsafe-unary-minus.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAwC;AACxC,+CAAiC;AAEjC,8CAAgC;AAKhC,kBAAe,IAAI,CAAC,UAAU,CAAsB;IAClD,IAAI,EAAE,uBAAuB;IAC7B,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,yCAAyC;YACtD,oBAAoB,EAAE,IAAI;SAC3B;QACD,QAAQ,EAAE;YACR,UAAU,EACR,6FAA6F;SAChG;QACD,MAAM,EAAE,EAAE;KACX;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,eAAe,CAAC,IAAI;gBAClB,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;oBAC1B,OAAO;gBACT,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACjD,MAAM,OAAO,GAAG,IAAI,CAAC,4BAA4B,CAC/C,QAAQ,EACR,IAAI,CAAC,QAAQ,CACd,CAAC;gBACF,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;gBAClD,IACE,OAAO;qBACJ,cAAc,CAAC,OAAO,CAAC;qBACvB,IAAI,CACH,IAAI,CAAC,EAAE,CACL,CAAC,OAAO,CAAC,aAAa,CACpB,IAAI,EACJ,EAAE,CAAC,SAAS,CAAC,GAAG;oBACd,EAAE,CAAC,SAAS,CAAC,KAAK;oBAClB,EAAE,CAAC,SAAS,CAAC,UAAU;oBACvB,EAAE,CAAC,SAAS,CAAC,UAAU,CAC1B,CACJ,EACH,CAAC;oBACD,OAAO,CAAC,MAAM,CAAC;wBACb,SAAS,EAAE,YAAY;wBACvB,IAAI;wBACJ,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;qBAC9C,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/require-await.js b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/require-await.js index 42e36e8934..54ac935ad3 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/require-await.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/require-await.js @@ -101,17 +101,25 @@ exports.default = (0, util_1.createRule)({ scopeInfo.hasAwait = true; } /** - * mark `scopeInfo.isAsyncYield` to `true` if its a generator - * function and the delegate is `true` + * Mark `scopeInfo.isAsyncYield` to `true` if it + * 1) delegates async generator function + * or + * 2) yields thenable type */ - function markAsHasDelegateGen(node) { + function visitYieldExpression(node) { if (!scopeInfo?.isGen || !node.argument) { return; } if (node.argument.type === utils_1.AST_NODE_TYPES.Literal) { - // making this `false` as for literals we don't need to check the definition + // ignoring this as for literals we don't need to check the definition // eg : async function* run() { yield* 1 } - scopeInfo.isAsyncYield ||= false; + return; + } + if (!node.delegate) { + if (isThenableType(services.esTreeNodeToTSNodeMap.get(node.argument))) { + scopeInfo.isAsyncYield = true; + } + return; } const type = services.getTypeAtLocation(node.argument); const typesToCheck = expandUnionOrIntersectionType(type); @@ -133,7 +141,7 @@ exports.default = (0, util_1.createRule)({ AwaitExpression: markAsHasAwait, 'VariableDeclaration[kind = "await using"]': markAsHasAwait, 'ForOfStatement[await = true]': markAsHasAwait, - 'YieldExpression[delegate = true]': markAsHasDelegateGen, + YieldExpression: visitYieldExpression, // check body-less async arrow function. // ignore `async () => await foo` because it's obviously correct 'ArrowFunctionExpression[async = true] > :not(BlockStatement, AwaitExpression)'(node) { diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/require-await.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/require-await.js.map index 2abd307cd8..6759b3ea09 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/rules/require-await.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/rules/require-await.js.map @@ -1 +1 @@ -{"version":3,"file":"require-await.js","sourceRoot":"","sources":["../../src/rules/require-await.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"require-await.js","sourceRoot":"","sources":["../../src/rules/require-await.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/util/explicitReturnTypeUtils.js b/node_modules/@typescript-eslint/eslint-plugin/dist/util/explicitReturnTypeUtils.js index 4644dc495c..d2b59ab9bf 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/util/explicitReturnTypeUtils.js +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/util/explicitReturnTypeUtils.js @@ -227,6 +227,11 @@ function ancestorHasReturnType(node) { return true; } break; + case utils_1.AST_NODE_TYPES.PropertyDefinition: + if (ancestor.typeAnnotation) { + return true; + } + break; } ancestor = ancestor.parent; } diff --git a/node_modules/@typescript-eslint/eslint-plugin/dist/util/explicitReturnTypeUtils.js.map b/node_modules/@typescript-eslint/eslint-plugin/dist/util/explicitReturnTypeUtils.js.map index 1c2125b7f1..3c400eb2d3 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/dist/util/explicitReturnTypeUtils.js.map +++ b/node_modules/@typescript-eslint/eslint-plugin/dist/util/explicitReturnTypeUtils.js.map @@ -1 +1 @@ -{"version":3,"file":"explicitReturnTypeUtils.js","sourceRoot":"","sources":["../../src/util/explicitReturnTypeUtils.ts"],"names":[],"mappings":";;;AACA,oDAAuE;AAEvE,yCAAsE;AACtE,6DAA0D;AAO1D;;;;;GAKG;AACH,SAAS,sCAAsC,CAC7C,IAAmB;IAEnB,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,kBAAkB,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAC5E,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,sCAAsC,CAC7C,IAAmB;IAEnB,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,kBAAkB,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CACzE,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CACzB,MAAqB,EACrB,MAA2B;IAE3B,OAAO,CACL,MAAM,CAAC,IAAI,KAAK,sBAAc,CAAC,cAAc;QAC7C,+BAA+B;QAC/B,MAAM,CAAC,MAAM,KAAK,MAAM,CACzB,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,UAAU,CACjB,IAAmB;IAEnB,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,sBAAsB;QACnD,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,kBAAkB,CAChD,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,MAAqB,EACrB,MAA2B;IAE3B,OAAO,CACL,IAAA,0BAAe,EAAC,MAAM,CAAC;QACvB,sCAAsC,CAAC,MAAM,CAAC;QAC9C,sCAAsC,CAAC,MAAM,CAAC;QAC9C,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC;QAClC,UAAU,CAAC,MAAM,CAAC,CACnB,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,qBAAqB,CAC5B,IAAmB;IAEnB,OAAO,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,aAAa,CAAC;AACpD,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,0BAA0B,CACjC,QAAmC;IAEnC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,sBAAc,CAAC,QAAQ,EAAE,CAAC;QAC3D,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;IACnC,IAAI,UAAU,CAAC,IAAI,KAAK,sBAAc,CAAC,gBAAgB,EAAE,CAAC;QACxD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAEjC,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,0BAA0B,CAAC,MAAM,CAAC,CAAC;AACrE,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,uCAAuC,CAAC,EAC/C,IAAI,GACS;IACb,mDAAmD;IACnD,IAAI,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1E,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,iEAAiE;QACjE,IACE,SAAS,CAAC,IAAI,KAAK,sBAAc,CAAC,eAAe;YACjD,CAAC,CAAC,SAAS,CAAC,QAAQ,EACpB,CAAC;YACD,8CAA8C;YAC9C,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,4DAA4D;IAC5D,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,uBAAuB;QACpD,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,kBAAkB,CAChD,CAAC;AACJ,CAAC;AAgMC,0FAAuC;AA9LzC;;;;;GAKG;AACH,SAAS,6BAA6B,CACpC,IAAsC;IAEtC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACtB,IAAI,IAAA,0BAAe,EAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QAChC,IAAI,cAAc,CAAC,IAAI,KAAK,sBAAc,CAAC,eAAe,EAAE,CAAC;YAC3D,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;YACpC,IACE,QAAQ,CAAC,IAAI,KAAK,sBAAc,CAAC,UAAU;gBAC3C,QAAQ,CAAC,IAAI,KAAK,OAAO,EACzB,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AASD;;GAEG;AACH,SAAS,yBAAyB,CAChC,IAAwB,EACxB,OAAgB;IAEhB,MAAM,MAAM,GAAG,mBAAW,CAAC,UAAU,CACnC,IAAI,CAAC,MAAM,EACX,mBAAW,CAAC,iBAAiB,CAAC,aAAa,CAC5C,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC;QAC3B,0BAA0B,CAAC,MAAM,CAAC;QAClC,qBAAqB,CAAC,MAAM,CAAC,CAC9B,CAAC;AACJ,CAAC;AA2IC,8DAAyB;AAzI3B;;;GAGG;AACH,SAAS,mCAAmC,CAC1C,IAAwB,EACxB,OAAgB;IAEhB,IAAI,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,mBAAW,CAAC,UAAU,CACnC,IAAI,CAAC,MAAM,EACX,mBAAW,CAAC,iBAAiB,CAAC,aAAa,CAC5C,CAAC;IACF,IACE,OAAO,CAAC,gBAAgB;QACxB,MAAM,CAAC,IAAI,KAAK,sBAAc,CAAC,kBAAkB;QACjD,MAAM,CAAC,IAAI,KAAK,sBAAc,CAAC,gBAAgB;QAC/C,MAAM,CAAC,IAAI,KAAK,sBAAc,CAAC,wBAAwB;QACvD,MAAM,CAAC,IAAI,KAAK,sBAAc,CAAC,kBAAkB,EACjD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oEAAoE;IACpE,OAAO,CACL,OAAO,CAAC,yCAAyC,KAAK,IAAI;QAC1D,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,uBAAuB;QACpD,6BAA6B,CAAC,IAAI,CAAC,CACpC,CAAC;AACJ,CAAC;AA0GC,kFAAmC;AAxGrC;;GAEG;AACH,SAAS,yBAAyB,CAChC,IAAkB,EAClB,OAAgB;IAEhB,IACE,OAAO,CAAC,yBAAyB;QACjC,uCAAuC,CAAC,IAAI,CAAC,EAC7C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,IAAI,CAAC,UAAU,IAAI,IAAI;QACvB,IAAA,wBAAa,EAAC,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAA,mBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,CACtB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAC9B,IAAkB,EAClB,OAAgB,EAChB,UAA+B,EAC/B,MAA8C;IAE9C,IAAI,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,MAAM,CAAC,IAAA,uCAAkB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;AAC/C,CAAC;AAgEC,0DAAuB;AA9DzB;;GAEG;AACH,SAAS,iCAAiC,CACxC,IAAwB,EACxB,OAAgB,EAChB,UAA+B,EAC/B,MAA8C;IAE9C,IAAI,mCAAmC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QACvD,OAAO;IACT,CAAC;IAED,uBAAuB,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;AAC7D,CAAC;AA+CC,8EAAiC;AA7CnC;;GAEG;AACH,SAAS,qBAAqB,CAAC,IAAkB;IAC/C,IAAI,QAAQ,GAA8B,IAAI,CAAC,MAAM,CAAC;IAEtD,IAAI,QAAQ,CAAC,IAAI,KAAK,sBAAc,CAAC,QAAQ,EAAE,CAAC;QAC9C,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC5B,CAAC;IAED,oGAAoG;IACpG,MAAM,iBAAiB,GAAG,QAAQ,CAAC,IAAI,KAAK,sBAAc,CAAC,eAAe,CAAC;IAC3E,MAAM,eAAe,GACnB,QAAQ,CAAC,IAAI,KAAK,sBAAc,CAAC,uBAAuB;QACxD,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,cAAc,CAAC;IACvD,IAAI,CAAC,iBAAiB,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,QAAQ,EAAE,CAAC;QAChB,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;YACtB,KAAK,sBAAc,CAAC,uBAAuB,CAAC;YAC5C,KAAK,sBAAc,CAAC,kBAAkB,CAAC;YACvC,KAAK,sBAAc,CAAC,mBAAmB;gBACrC,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,MAAM;YAER,2BAA2B;YAC3B,6DAA6D;YAC7D,KAAK,sBAAc,CAAC,kBAAkB;gBACpC,IAAI,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC;oBAC/B,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,MAAM;QACV,CAAC;QAED,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAUC,sDAAqB"} \ No newline at end of file +{"version":3,"file":"explicitReturnTypeUtils.js","sourceRoot":"","sources":["../../src/util/explicitReturnTypeUtils.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-throw-literal.md b/node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-throw-literal.md index 2e488ed4ed..91bb246ce5 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-throw-literal.md +++ b/node_modules/@typescript-eslint/eslint-plugin/docs/rules/no-throw-literal.md @@ -20,8 +20,6 @@ This rule is aimed at maintaining consistency when throwing exception by disallo ### ❌ Incorrect ```ts -/*eslint @typescript-eslint/no-throw-literal: "error"*/ - throw 'error'; throw 0; @@ -53,19 +51,17 @@ throw foo.bar; ### ✅ Correct ```ts -/*eslint @typescript-eslint/no-throw-literal: "error"*/ - throw new Error(); -throw new Error("error"); +throw new Error('error'); -const e = new Error("error"); +const e = new Error('error'); throw e; try { - throw new Error("error"); + throw new Error('error'); } catch (e) { - throw e; + throw e; } const err = new Error(); @@ -77,13 +73,13 @@ function err() { throw err(); const foo = { - bar: new Error(); -} + bar: new Error(), +}; throw foo.bar; class CustomError extends Error { // ... -}; +} throw new CustomError(); ``` diff --git a/node_modules/@typescript-eslint/eslint-plugin/package.json b/node_modules/@typescript-eslint/eslint-plugin/package.json index 101003dc6a..be3fa88688 100644 --- a/node_modules/@typescript-eslint/eslint-plugin/package.json +++ b/node_modules/@typescript-eslint/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/eslint-plugin", - "version": "6.13.2", + "version": "6.14.0", "description": "TypeScript plugin for ESLint", "files": [ "dist", @@ -57,10 +57,10 @@ }, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/type-utils": "6.13.2", - "@typescript-eslint/utils": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/type-utils": "6.14.0", + "@typescript-eslint/utils": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -73,8 +73,8 @@ "@types/debug": "*", "@types/marked": "*", "@types/natural-compare": "*", - "@typescript-eslint/rule-schema-to-typescript-types": "6.13.2", - "@typescript-eslint/rule-tester": "6.13.2", + "@typescript-eslint/rule-schema-to-typescript-types": "6.14.0", + "@typescript-eslint/rule-tester": "6.14.0", "ajv": "^6.12.6", "chalk": "^5.3.0", "cross-fetch": "*", @@ -103,5 +103,5 @@ "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "gitHead": "cc2c6d3a4a515f7ccc23f10421a8db9c88345876" + "gitHead": "c7d702f4315f66c75ae16a4b559ef5b4705bb804" } diff --git a/node_modules/@typescript-eslint/parser/package.json b/node_modules/@typescript-eslint/parser/package.json index 3adcaba118..19d3e9232c 100644 --- a/node_modules/@typescript-eslint/parser/package.json +++ b/node_modules/@typescript-eslint/parser/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/parser", - "version": "6.13.2", + "version": "6.14.0", "description": "An ESLint custom parser which leverages TypeScript ESTree", "files": [ "dist", @@ -51,10 +51,10 @@ "eslint": "^7.0.0 || ^8.0.0" }, "dependencies": { - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/typescript-estree": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/typescript-estree": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4" }, "devDependencies": { @@ -82,5 +82,5 @@ ] } }, - "gitHead": "cc2c6d3a4a515f7ccc23f10421a8db9c88345876" + "gitHead": "c7d702f4315f66c75ae16a4b559ef5b4705bb804" } diff --git a/node_modules/@typescript-eslint/scope-manager/package.json b/node_modules/@typescript-eslint/scope-manager/package.json index 028a372504..a0d5cbea63 100644 --- a/node_modules/@typescript-eslint/scope-manager/package.json +++ b/node_modules/@typescript-eslint/scope-manager/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/scope-manager", - "version": "6.13.2", + "version": "6.14.0", "description": "TypeScript scope analyser for ESLint", "files": [ "dist", @@ -44,13 +44,13 @@ "typecheck": "npx nx typecheck" }, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2" + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0" }, "devDependencies": { "@prettier/sync": "*", "@types/glob": "*", - "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/typescript-estree": "6.14.0", "glob": "*", "jest-specific-snapshot": "*", "make-dir": "*", @@ -68,5 +68,5 @@ ] } }, - "gitHead": "cc2c6d3a4a515f7ccc23f10421a8db9c88345876" + "gitHead": "c7d702f4315f66c75ae16a4b559ef5b4705bb804" } diff --git a/node_modules/@typescript-eslint/type-utils/package.json b/node_modules/@typescript-eslint/type-utils/package.json index 780f92bd90..27be82daa3 100644 --- a/node_modules/@typescript-eslint/type-utils/package.json +++ b/node_modules/@typescript-eslint/type-utils/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/type-utils", - "version": "6.13.2", + "version": "6.14.0", "description": "Type utilities for working with TypeScript + ESLint together", "files": [ "dist", @@ -45,13 +45,13 @@ "typecheck": "tsc -p tsconfig.json --noEmit" }, "dependencies": { - "@typescript-eslint/typescript-estree": "6.13.2", - "@typescript-eslint/utils": "6.13.2", + "@typescript-eslint/typescript-estree": "6.14.0", + "@typescript-eslint/utils": "6.14.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, "devDependencies": { - "@typescript-eslint/parser": "6.13.2", + "@typescript-eslint/parser": "6.14.0", "ajv": "^6.10.0", "downlevel-dts": "*", "jest": "29.7.0", @@ -78,5 +78,5 @@ ] } }, - "gitHead": "cc2c6d3a4a515f7ccc23f10421a8db9c88345876" + "gitHead": "c7d702f4315f66c75ae16a4b559ef5b4705bb804" } diff --git a/node_modules/@typescript-eslint/types/package.json b/node_modules/@typescript-eslint/types/package.json index b7ae623563..fc55215efb 100644 --- a/node_modules/@typescript-eslint/types/package.json +++ b/node_modules/@typescript-eslint/types/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/types", - "version": "6.13.2", + "version": "6.14.0", "description": "Types for the TypeScript-ESTree AST spec", "files": [ "dist", @@ -90,5 +90,5 @@ ] } }, - "gitHead": "cc2c6d3a4a515f7ccc23f10421a8db9c88345876" + "gitHead": "c7d702f4315f66c75ae16a4b559ef5b4705bb804" } diff --git a/node_modules/@typescript-eslint/typescript-estree/package.json b/node_modules/@typescript-eslint/typescript-estree/package.json index 5d7d7dea2d..947d919b46 100644 --- a/node_modules/@typescript-eslint/typescript-estree/package.json +++ b/node_modules/@typescript-eslint/typescript-estree/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/typescript-estree", - "version": "6.13.2", + "version": "6.14.0", "description": "A parser that converts TypeScript source code into an ESTree compatible form", "files": [ "dist", @@ -52,8 +52,8 @@ "typecheck": "tsc -p tsconfig.json --noEmit" }, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -88,5 +88,5 @@ ] } }, - "gitHead": "cc2c6d3a4a515f7ccc23f10421a8db9c88345876" + "gitHead": "c7d702f4315f66c75ae16a4b559ef5b4705bb804" } diff --git a/node_modules/@typescript-eslint/utils/package.json b/node_modules/@typescript-eslint/utils/package.json index d15f08a7a3..8d2cb7509b 100644 --- a/node_modules/@typescript-eslint/utils/package.json +++ b/node_modules/@typescript-eslint/utils/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/utils", - "version": "6.13.2", + "version": "6.14.0", "description": "Utilities for working with TypeScript + ESLint together", "files": [ "dist", @@ -68,16 +68,16 @@ "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/typescript-estree": "6.14.0", "semver": "^7.5.4" }, "peerDependencies": { "eslint": "^7.0.0 || ^8.0.0" }, "devDependencies": { - "@typescript-eslint/parser": "6.13.2", + "@typescript-eslint/parser": "6.14.0", "downlevel-dts": "*", "jest": "29.7.0", "prettier": "^3.0.3", @@ -95,5 +95,5 @@ ] } }, - "gitHead": "cc2c6d3a4a515f7ccc23f10421a8db9c88345876" + "gitHead": "c7d702f4315f66c75ae16a4b559ef5b4705bb804" } diff --git a/node_modules/@typescript-eslint/visitor-keys/package.json b/node_modules/@typescript-eslint/visitor-keys/package.json index 9eb2ae8d5c..7f6536e190 100644 --- a/node_modules/@typescript-eslint/visitor-keys/package.json +++ b/node_modules/@typescript-eslint/visitor-keys/package.json @@ -1,6 +1,6 @@ { "name": "@typescript-eslint/visitor-keys", - "version": "6.13.2", + "version": "6.14.0", "description": "Visitor keys used to help traverse the TypeScript-ESTree AST", "files": [ "dist", @@ -45,7 +45,7 @@ "typecheck": "tsc -p tsconfig.json --noEmit" }, "dependencies": { - "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/types": "6.14.0", "eslint-visitor-keys": "^3.4.1" }, "devDependencies": { @@ -67,5 +67,5 @@ ] } }, - "gitHead": "cc2c6d3a4a515f7ccc23f10421a8db9c88345876" + "gitHead": "c7d702f4315f66c75ae16a4b559ef5b4705bb804" } diff --git a/node_modules/typescript/lib/tsc.js b/node_modules/typescript/lib/tsc.js index 53dd3801d1..d98c47c3d7 100644 --- a/node_modules/typescript/lib/tsc.js +++ b/node_modules/typescript/lib/tsc.js @@ -18,7 +18,7 @@ and limitations under the License. // src/compiler/corePublic.ts var versionMajorMinor = "5.3"; -var version = "5.3.2"; +var version = "5.3.3"; // src/compiler/core.ts var emptyArray = []; @@ -3678,7 +3678,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => { TypeFlags2[TypeFlags2["InstantiablePrimitive"] = 406847488] = "InstantiablePrimitive"; TypeFlags2[TypeFlags2["Instantiable"] = 465829888] = "Instantiable"; TypeFlags2[TypeFlags2["StructuredOrInstantiable"] = 469499904] = "StructuredOrInstantiable"; - TypeFlags2[TypeFlags2["ObjectFlagsType"] = 138117121] = "ObjectFlagsType"; + TypeFlags2[TypeFlags2["ObjectFlagsType"] = 3899393] = "ObjectFlagsType"; TypeFlags2[TypeFlags2["Simplifiable"] = 25165824] = "Simplifiable"; TypeFlags2[TypeFlags2["Singleton"] = 67358815] = "Singleton"; TypeFlags2[TypeFlags2["Narrowable"] = 536624127] = "Narrowable"; @@ -15971,7 +15971,7 @@ function getClassLikeDeclarationOfSymbol(symbol) { return (_a = symbol.declarations) == null ? void 0 : _a.find(isClassLike); } function getObjectFlags(type) { - return type.flags & 138117121 /* ObjectFlagsType */ ? type.objectFlags : 0; + return type.flags & 3899393 /* ObjectFlagsType */ ? type.objectFlags : 0; } function isUMDExportSymbol(symbol) { return !!symbol && !!symbol.declarations && !!symbol.declarations[0] && isNamespaceExportDeclaration(symbol.declarations[0]); @@ -56944,7 +56944,7 @@ function createTypeChecker(host) { } } function removeStringLiteralsMatchedByTemplateLiterals(types) { - const templates = filter(types, (t) => !!(t.flags & 134217728 /* TemplateLiteral */) && isPatternLiteralType(t) && t.types.every((t2) => !(t2.flags & 2097152 /* Intersection */) || !areIntersectedTypesAvoidingPrimitiveReduction(t2.types))); + const templates = filter(types, (t) => !!(t.flags & 134217728 /* TemplateLiteral */) && isPatternLiteralType(t)); if (templates.length) { let i = types.length; while (i > 0) { @@ -57344,19 +57344,14 @@ function createTypeChecker(host) { function getConstituentCountOfTypes(types) { return reduceLeft(types, (n, t) => n + getConstituentCount(t), 0); } - function areIntersectedTypesAvoidingPrimitiveReduction(types, primitiveFlags = 4 /* String */ | 8 /* Number */ | 64 /* BigInt */) { - if (types.length !== 2) { - return false; - } - const [t1, t2] = types; - return !!(t1.flags & primitiveFlags) && t2 === emptyTypeLiteralType || !!(t2.flags & primitiveFlags) && t1 === emptyTypeLiteralType; - } function getTypeFromIntersectionTypeNode(node) { const links = getNodeLinks(node); if (!links.resolvedType) { const aliasSymbol = getAliasSymbolForTypeNode(node); const types = map(node.types, getTypeFromTypeNode); - const noSupertypeReduction = areIntersectedTypesAvoidingPrimitiveReduction(types); + const emptyIndex = types.length === 2 ? types.indexOf(emptyTypeLiteralType) : -1; + const t = emptyIndex >= 0 ? types[1 - emptyIndex] : unknownType; + const noSupertypeReduction = !!(t.flags & (4 /* String */ | 8 /* Number */ | 64 /* BigInt */) || t.flags & 134217728 /* TemplateLiteral */ && isPatternLiteralType(t)); links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction); } return links.resolvedType; @@ -57568,11 +57563,6 @@ function createTypeChecker(host) { } function createTemplateLiteralType(texts, types) { const type = createType(134217728 /* TemplateLiteral */); - type.objectFlags = getPropagatingFlagsOfTypes( - types, - /*excludeKinds*/ - 98304 /* Nullable */ - ); type.texts = texts; type.types = types; return type; @@ -57867,7 +57857,15 @@ function createTypeChecker(host) { } function isPatternLiteralPlaceholderType(type) { if (type.flags & 2097152 /* Intersection */) { - return !isGenericType(type) && some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 98304 /* Nullable */)) || isPatternLiteralPlaceholderType(t)); + let seenPlaceholder = false; + for (const t of type.types) { + if (t.flags & (2944 /* Literal */ | 98304 /* Nullable */) || isPatternLiteralPlaceholderType(t)) { + seenPlaceholder = true; + } else if (!(t.flags & 524288 /* Object */)) { + return false; + } + } + return seenPlaceholder; } return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || isPatternLiteralType(type); } @@ -57884,7 +57882,7 @@ function createTypeChecker(host) { return !!(getGenericObjectFlags(type) & 8388608 /* IsGenericIndexType */); } function getGenericObjectFlags(type) { - if (type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */)) { + if (type.flags & 3145728 /* UnionOrIntersection */) { if (!(type.objectFlags & 2097152 /* IsGenericTypeComputed */)) { type.objectFlags |= 2097152 /* IsGenericTypeComputed */ | reduceLeft(type.types, (flags, t) => flags | getGenericObjectFlags(t), 0); } @@ -57896,7 +57894,7 @@ function createTypeChecker(host) { } return type.objectFlags & 12582912 /* IsGenericType */; } - return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 8388608 /* IsGenericIndexType */ : 0); + return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 8388608 /* IsGenericIndexType */ : 0); } function getSimplifiedType(type, writing) { return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) : type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) : type; @@ -58922,7 +58920,7 @@ function createTypeChecker(host) { result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments); target.instantiations.set(id, result); const resultObjectFlags = getObjectFlags(result); - if (result.flags & 138117121 /* ObjectFlagsType */ && !(resultObjectFlags & 524288 /* CouldContainTypeVariablesComputed */)) { + if (result.flags & 3899393 /* ObjectFlagsType */ && !(resultObjectFlags & 524288 /* CouldContainTypeVariablesComputed */)) { const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables); if (!(getObjectFlags(result) & 524288 /* CouldContainTypeVariablesComputed */)) { if (resultObjectFlags & (32 /* Mapped */ | 16 /* Anonymous */ | 4 /* Reference */)) { @@ -63636,8 +63634,8 @@ function createTypeChecker(host) { if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) { return !!(objectFlags & 1048576 /* CouldContainTypeVariables */); } - const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */) && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables)); - if (type.flags & 138117121 /* ObjectFlagsType */) { + const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables)); + if (type.flags & 3899393 /* ObjectFlagsType */) { type.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (result ? 1048576 /* CouldContainTypeVariables */ : 0); } return result; @@ -66155,10 +66153,10 @@ function createTypeChecker(host) { if (isMatchingConstructorReference(right)) { return narrowTypeByConstructor(type, operator, left, assumeTrue); } - if (isBooleanLiteral(right)) { + if (isBooleanLiteral(right) && !isAccessExpression(left)) { return narrowTypeByBooleanComparison(type, left, right, operator, assumeTrue); } - if (isBooleanLiteral(left)) { + if (isBooleanLiteral(left) && !isAccessExpression(right)) { return narrowTypeByBooleanComparison(type, right, left, operator, assumeTrue); } break; diff --git a/node_modules/typescript/lib/tsserver.js b/node_modules/typescript/lib/tsserver.js index c2d335d8cf..dd6b532de2 100644 --- a/node_modules/typescript/lib/tsserver.js +++ b/node_modules/typescript/lib/tsserver.js @@ -2328,7 +2328,7 @@ module.exports = __toCommonJS(server_exports); // src/compiler/corePublic.ts var versionMajorMinor = "5.3"; -var version = "5.3.2"; +var version = "5.3.3"; var Comparison = /* @__PURE__ */ ((Comparison3) => { Comparison3[Comparison3["LessThan"] = -1] = "LessThan"; Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo"; @@ -6670,7 +6670,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => { TypeFlags2[TypeFlags2["InstantiablePrimitive"] = 406847488] = "InstantiablePrimitive"; TypeFlags2[TypeFlags2["Instantiable"] = 465829888] = "Instantiable"; TypeFlags2[TypeFlags2["StructuredOrInstantiable"] = 469499904] = "StructuredOrInstantiable"; - TypeFlags2[TypeFlags2["ObjectFlagsType"] = 138117121] = "ObjectFlagsType"; + TypeFlags2[TypeFlags2["ObjectFlagsType"] = 3899393] = "ObjectFlagsType"; TypeFlags2[TypeFlags2["Simplifiable"] = 25165824] = "Simplifiable"; TypeFlags2[TypeFlags2["Singleton"] = 67358815] = "Singleton"; TypeFlags2[TypeFlags2["Narrowable"] = 536624127] = "Narrowable"; @@ -20036,7 +20036,7 @@ function getClassLikeDeclarationOfSymbol(symbol) { return (_a = symbol.declarations) == null ? void 0 : _a.find(isClassLike); } function getObjectFlags(type) { - return type.flags & 138117121 /* ObjectFlagsType */ ? type.objectFlags : 0; + return type.flags & 3899393 /* ObjectFlagsType */ ? type.objectFlags : 0; } function forSomeAncestorDirectory(directory, callback) { return !!forEachAncestorDirectory(directory, (d) => callback(d) ? true : void 0); @@ -61648,7 +61648,7 @@ function createTypeChecker(host) { } } function removeStringLiteralsMatchedByTemplateLiterals(types) { - const templates = filter(types, (t) => !!(t.flags & 134217728 /* TemplateLiteral */) && isPatternLiteralType(t) && t.types.every((t2) => !(t2.flags & 2097152 /* Intersection */) || !areIntersectedTypesAvoidingPrimitiveReduction(t2.types))); + const templates = filter(types, (t) => !!(t.flags & 134217728 /* TemplateLiteral */) && isPatternLiteralType(t)); if (templates.length) { let i = types.length; while (i > 0) { @@ -62048,19 +62048,14 @@ function createTypeChecker(host) { function getConstituentCountOfTypes(types) { return reduceLeft(types, (n, t) => n + getConstituentCount(t), 0); } - function areIntersectedTypesAvoidingPrimitiveReduction(types, primitiveFlags = 4 /* String */ | 8 /* Number */ | 64 /* BigInt */) { - if (types.length !== 2) { - return false; - } - const [t1, t2] = types; - return !!(t1.flags & primitiveFlags) && t2 === emptyTypeLiteralType || !!(t2.flags & primitiveFlags) && t1 === emptyTypeLiteralType; - } function getTypeFromIntersectionTypeNode(node) { const links = getNodeLinks(node); if (!links.resolvedType) { const aliasSymbol = getAliasSymbolForTypeNode(node); const types = map(node.types, getTypeFromTypeNode); - const noSupertypeReduction = areIntersectedTypesAvoidingPrimitiveReduction(types); + const emptyIndex = types.length === 2 ? types.indexOf(emptyTypeLiteralType) : -1; + const t = emptyIndex >= 0 ? types[1 - emptyIndex] : unknownType; + const noSupertypeReduction = !!(t.flags & (4 /* String */ | 8 /* Number */ | 64 /* BigInt */) || t.flags & 134217728 /* TemplateLiteral */ && isPatternLiteralType(t)); links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction); } return links.resolvedType; @@ -62272,11 +62267,6 @@ function createTypeChecker(host) { } function createTemplateLiteralType(texts, types) { const type = createType(134217728 /* TemplateLiteral */); - type.objectFlags = getPropagatingFlagsOfTypes( - types, - /*excludeKinds*/ - 98304 /* Nullable */ - ); type.texts = texts; type.types = types; return type; @@ -62571,7 +62561,15 @@ function createTypeChecker(host) { } function isPatternLiteralPlaceholderType(type) { if (type.flags & 2097152 /* Intersection */) { - return !isGenericType(type) && some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 98304 /* Nullable */)) || isPatternLiteralPlaceholderType(t)); + let seenPlaceholder = false; + for (const t of type.types) { + if (t.flags & (2944 /* Literal */ | 98304 /* Nullable */) || isPatternLiteralPlaceholderType(t)) { + seenPlaceholder = true; + } else if (!(t.flags & 524288 /* Object */)) { + return false; + } + } + return seenPlaceholder; } return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || isPatternLiteralType(type); } @@ -62588,7 +62586,7 @@ function createTypeChecker(host) { return !!(getGenericObjectFlags(type) & 8388608 /* IsGenericIndexType */); } function getGenericObjectFlags(type) { - if (type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */)) { + if (type.flags & 3145728 /* UnionOrIntersection */) { if (!(type.objectFlags & 2097152 /* IsGenericTypeComputed */)) { type.objectFlags |= 2097152 /* IsGenericTypeComputed */ | reduceLeft(type.types, (flags, t) => flags | getGenericObjectFlags(t), 0); } @@ -62600,7 +62598,7 @@ function createTypeChecker(host) { } return type.objectFlags & 12582912 /* IsGenericType */; } - return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 8388608 /* IsGenericIndexType */ : 0); + return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 8388608 /* IsGenericIndexType */ : 0); } function getSimplifiedType(type, writing) { return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) : type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) : type; @@ -63626,7 +63624,7 @@ function createTypeChecker(host) { result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments); target.instantiations.set(id, result); const resultObjectFlags = getObjectFlags(result); - if (result.flags & 138117121 /* ObjectFlagsType */ && !(resultObjectFlags & 524288 /* CouldContainTypeVariablesComputed */)) { + if (result.flags & 3899393 /* ObjectFlagsType */ && !(resultObjectFlags & 524288 /* CouldContainTypeVariablesComputed */)) { const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables); if (!(getObjectFlags(result) & 524288 /* CouldContainTypeVariablesComputed */)) { if (resultObjectFlags & (32 /* Mapped */ | 16 /* Anonymous */ | 4 /* Reference */)) { @@ -68340,8 +68338,8 @@ function createTypeChecker(host) { if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) { return !!(objectFlags & 1048576 /* CouldContainTypeVariables */); } - const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */) && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables)); - if (type.flags & 138117121 /* ObjectFlagsType */) { + const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables)); + if (type.flags & 3899393 /* ObjectFlagsType */) { type.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (result ? 1048576 /* CouldContainTypeVariables */ : 0); } return result; @@ -70859,10 +70857,10 @@ function createTypeChecker(host) { if (isMatchingConstructorReference(right)) { return narrowTypeByConstructor(type, operator, left, assumeTrue); } - if (isBooleanLiteral(right)) { + if (isBooleanLiteral(right) && !isAccessExpression(left)) { return narrowTypeByBooleanComparison(type, left, right, operator, assumeTrue); } - if (isBooleanLiteral(left)) { + if (isBooleanLiteral(left) && !isAccessExpression(right)) { return narrowTypeByBooleanComparison(type, right, left, operator, assumeTrue); } break; @@ -137311,7 +137309,7 @@ function transpileModule(input, transpileOptions) { options ), setExternalModuleIndicator: getSetExternalModuleIndicator(options), - jsDocParsingMode: 1 /* ParseNone */ + jsDocParsingMode: transpileOptions.jsDocParsingMode ?? 0 /* ParseAll */ } ); if (transpileOptions.moduleName) { diff --git a/node_modules/typescript/lib/typescript.d.ts b/node_modules/typescript/lib/typescript.d.ts index 5ee1d5258c..754fc50cdd 100644 --- a/node_modules/typescript/lib/typescript.d.ts +++ b/node_modules/typescript/lib/typescript.d.ts @@ -6018,9 +6018,11 @@ declare namespace ts { /** @deprecated */ type AssertionKey = ImportAttributeName; /** @deprecated */ - type AssertEntry = ImportAttribute; + interface AssertEntry extends ImportAttribute { + } /** @deprecated */ - type AssertClause = ImportAttributes; + interface AssertClause extends ImportAttributes { + } type ImportAttributeName = Identifier | StringLiteral; interface ImportAttribute extends Node { readonly kind: SyntaxKind.ImportAttribute; @@ -10416,7 +10418,7 @@ declare namespace ts { installPackage?(options: InstallPackageOptions): Promise; writeFile?(fileName: string, content: string): void; getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined; - jsDocParsingMode?: JSDocParsingMode; + jsDocParsingMode?: JSDocParsingMode | undefined; } type WithMetadata = T & { metadata?: unknown; @@ -11612,6 +11614,7 @@ declare namespace ts { moduleName?: string; renamedDependencies?: MapLike; transformers?: CustomTransformers; + jsDocParsingMode?: JSDocParsingMode; } interface TranspileOutput { outputText: string; diff --git a/node_modules/typescript/lib/typescript.js b/node_modules/typescript/lib/typescript.js index 86ab90b9fb..fe732a6cb2 100644 --- a/node_modules/typescript/lib/typescript.js +++ b/node_modules/typescript/lib/typescript.js @@ -35,7 +35,7 @@ var ts = (() => { "src/compiler/corePublic.ts"() { "use strict"; versionMajorMinor = "5.3"; - version = "5.3.2"; + version = "5.3.3"; Comparison = /* @__PURE__ */ ((Comparison3) => { Comparison3[Comparison3["LessThan"] = -1] = "LessThan"; Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo"; @@ -4435,7 +4435,7 @@ ${lanes.join("\n")} TypeFlags2[TypeFlags2["InstantiablePrimitive"] = 406847488] = "InstantiablePrimitive"; TypeFlags2[TypeFlags2["Instantiable"] = 465829888] = "Instantiable"; TypeFlags2[TypeFlags2["StructuredOrInstantiable"] = 469499904] = "StructuredOrInstantiable"; - TypeFlags2[TypeFlags2["ObjectFlagsType"] = 138117121] = "ObjectFlagsType"; + TypeFlags2[TypeFlags2["ObjectFlagsType"] = 3899393] = "ObjectFlagsType"; TypeFlags2[TypeFlags2["Simplifiable"] = 25165824] = "Simplifiable"; TypeFlags2[TypeFlags2["Singleton"] = 67358815] = "Singleton"; TypeFlags2[TypeFlags2["Narrowable"] = 536624127] = "Narrowable"; @@ -17337,7 +17337,7 @@ ${lanes.join("\n")} return (_a = symbol.declarations) == null ? void 0 : _a.find(isClassLike); } function getObjectFlags(type) { - return type.flags & 138117121 /* ObjectFlagsType */ ? type.objectFlags : 0; + return type.flags & 3899393 /* ObjectFlagsType */ ? type.objectFlags : 0; } function forSomeAncestorDirectory(directory, callback) { return !!forEachAncestorDirectory(directory, (d) => callback(d) ? true : void 0); @@ -59415,7 +59415,7 @@ ${lanes.join("\n")} } } function removeStringLiteralsMatchedByTemplateLiterals(types) { - const templates = filter(types, (t) => !!(t.flags & 134217728 /* TemplateLiteral */) && isPatternLiteralType(t) && t.types.every((t2) => !(t2.flags & 2097152 /* Intersection */) || !areIntersectedTypesAvoidingPrimitiveReduction(t2.types))); + const templates = filter(types, (t) => !!(t.flags & 134217728 /* TemplateLiteral */) && isPatternLiteralType(t)); if (templates.length) { let i = types.length; while (i > 0) { @@ -59815,19 +59815,14 @@ ${lanes.join("\n")} function getConstituentCountOfTypes(types) { return reduceLeft(types, (n, t) => n + getConstituentCount(t), 0); } - function areIntersectedTypesAvoidingPrimitiveReduction(types, primitiveFlags = 4 /* String */ | 8 /* Number */ | 64 /* BigInt */) { - if (types.length !== 2) { - return false; - } - const [t1, t2] = types; - return !!(t1.flags & primitiveFlags) && t2 === emptyTypeLiteralType || !!(t2.flags & primitiveFlags) && t1 === emptyTypeLiteralType; - } function getTypeFromIntersectionTypeNode(node) { const links = getNodeLinks(node); if (!links.resolvedType) { const aliasSymbol = getAliasSymbolForTypeNode(node); const types = map(node.types, getTypeFromTypeNode); - const noSupertypeReduction = areIntersectedTypesAvoidingPrimitiveReduction(types); + const emptyIndex = types.length === 2 ? types.indexOf(emptyTypeLiteralType) : -1; + const t = emptyIndex >= 0 ? types[1 - emptyIndex] : unknownType; + const noSupertypeReduction = !!(t.flags & (4 /* String */ | 8 /* Number */ | 64 /* BigInt */) || t.flags & 134217728 /* TemplateLiteral */ && isPatternLiteralType(t)); links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction); } return links.resolvedType; @@ -60039,11 +60034,6 @@ ${lanes.join("\n")} } function createTemplateLiteralType(texts, types) { const type = createType(134217728 /* TemplateLiteral */); - type.objectFlags = getPropagatingFlagsOfTypes( - types, - /*excludeKinds*/ - 98304 /* Nullable */ - ); type.texts = texts; type.types = types; return type; @@ -60338,7 +60328,15 @@ ${lanes.join("\n")} } function isPatternLiteralPlaceholderType(type) { if (type.flags & 2097152 /* Intersection */) { - return !isGenericType(type) && some(type.types, (t) => !!(t.flags & (2944 /* Literal */ | 98304 /* Nullable */)) || isPatternLiteralPlaceholderType(t)); + let seenPlaceholder = false; + for (const t of type.types) { + if (t.flags & (2944 /* Literal */ | 98304 /* Nullable */) || isPatternLiteralPlaceholderType(t)) { + seenPlaceholder = true; + } else if (!(t.flags & 524288 /* Object */)) { + return false; + } + } + return seenPlaceholder; } return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || isPatternLiteralType(type); } @@ -60355,7 +60353,7 @@ ${lanes.join("\n")} return !!(getGenericObjectFlags(type) & 8388608 /* IsGenericIndexType */); } function getGenericObjectFlags(type) { - if (type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */)) { + if (type.flags & 3145728 /* UnionOrIntersection */) { if (!(type.objectFlags & 2097152 /* IsGenericTypeComputed */)) { type.objectFlags |= 2097152 /* IsGenericTypeComputed */ | reduceLeft(type.types, (flags, t) => flags | getGenericObjectFlags(t), 0); } @@ -60367,7 +60365,7 @@ ${lanes.join("\n")} } return type.objectFlags & 12582912 /* IsGenericType */; } - return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 8388608 /* IsGenericIndexType */ : 0); + return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 8388608 /* IsGenericIndexType */ : 0); } function getSimplifiedType(type, writing) { return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) : type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) : type; @@ -61393,7 +61391,7 @@ ${lanes.join("\n")} result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments); target.instantiations.set(id, result); const resultObjectFlags = getObjectFlags(result); - if (result.flags & 138117121 /* ObjectFlagsType */ && !(resultObjectFlags & 524288 /* CouldContainTypeVariablesComputed */)) { + if (result.flags & 3899393 /* ObjectFlagsType */ && !(resultObjectFlags & 524288 /* CouldContainTypeVariablesComputed */)) { const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables); if (!(getObjectFlags(result) & 524288 /* CouldContainTypeVariablesComputed */)) { if (resultObjectFlags & (32 /* Mapped */ | 16 /* Anonymous */ | 4 /* Reference */)) { @@ -66107,8 +66105,8 @@ ${lanes.join("\n")} if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) { return !!(objectFlags & 1048576 /* CouldContainTypeVariables */); } - const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */) && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables)); - if (type.flags & 138117121 /* ObjectFlagsType */) { + const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables)); + if (type.flags & 3899393 /* ObjectFlagsType */) { type.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (result ? 1048576 /* CouldContainTypeVariables */ : 0); } return result; @@ -68626,10 +68624,10 @@ ${lanes.join("\n")} if (isMatchingConstructorReference(right)) { return narrowTypeByConstructor(type, operator, left, assumeTrue); } - if (isBooleanLiteral(right)) { + if (isBooleanLiteral(right) && !isAccessExpression(left)) { return narrowTypeByBooleanComparison(type, left, right, operator, assumeTrue); } - if (isBooleanLiteral(left)) { + if (isBooleanLiteral(left) && !isAccessExpression(right)) { return narrowTypeByBooleanComparison(type, right, left, operator, assumeTrue); } break; @@ -135680,7 +135678,7 @@ ${lanes.join("\n")} options ), setExternalModuleIndicator: getSetExternalModuleIndicator(options), - jsDocParsingMode: 1 /* ParseNone */ + jsDocParsingMode: transpileOptions.jsDocParsingMode ?? 0 /* ParseAll */ } ); if (transpileOptions.moduleName) { diff --git a/node_modules/typescript/lib/typingsInstaller.js b/node_modules/typescript/lib/typingsInstaller.js index ba15aee669..1cfedae702 100644 --- a/node_modules/typescript/lib/typingsInstaller.js +++ b/node_modules/typescript/lib/typingsInstaller.js @@ -54,7 +54,7 @@ var path = __toESM(require("path")); // src/compiler/corePublic.ts var versionMajorMinor = "5.3"; -var version = "5.3.2"; +var version = "5.3.3"; // src/compiler/core.ts var emptyArray = []; @@ -3112,7 +3112,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => { TypeFlags2[TypeFlags2["InstantiablePrimitive"] = 406847488] = "InstantiablePrimitive"; TypeFlags2[TypeFlags2["Instantiable"] = 465829888] = "Instantiable"; TypeFlags2[TypeFlags2["StructuredOrInstantiable"] = 469499904] = "StructuredOrInstantiable"; - TypeFlags2[TypeFlags2["ObjectFlagsType"] = 138117121] = "ObjectFlagsType"; + TypeFlags2[TypeFlags2["ObjectFlagsType"] = 3899393] = "ObjectFlagsType"; TypeFlags2[TypeFlags2["Simplifiable"] = 25165824] = "Simplifiable"; TypeFlags2[TypeFlags2["Singleton"] = 67358815] = "Singleton"; TypeFlags2[TypeFlags2["Narrowable"] = 536624127] = "Narrowable"; diff --git a/node_modules/typescript/package.json b/node_modules/typescript/package.json index b28d5f62d1..2fb3809dcb 100644 --- a/node_modules/typescript/package.json +++ b/node_modules/typescript/package.json @@ -2,7 +2,7 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "https://www.typescriptlang.org/", - "version": "5.3.2", + "version": "5.3.3", "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ From 2b2fb6b1dc9a83da2dd429ce0c83af9380973083 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 15:21:13 +0000 Subject: [PATCH 03/21] Update changelog and version after v3.22.11 --- CHANGELOG.md | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 992dc98ec1..bd34fabfd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs. +## [UNRELEASED] + +No user facing changes. + ## 3.22.11 - 13 Dec 2023 - [v3+ only] The CodeQL Action now runs on Node.js v20. [#2006](https://github.com/github/codeql-action/pull/2006) diff --git a/package-lock.json b/package-lock.json index 5e8daf0c4b..56c0e0b169 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "codeql", - "version": "3.22.11", + "version": "3.22.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "codeql", - "version": "3.22.11", + "version": "3.22.12", "license": "MIT", "dependencies": { "@actions/artifact": "^1.1.2", diff --git a/package.json b/package.json index 5c59c2e70e..c455265291 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "3.22.11", + "version": "3.22.12", "private": true, "description": "CodeQL action", "scripts": { From 7813bda958fdd91160a45ff6cdb3a723b381c8c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 15:27:55 +0000 Subject: [PATCH 04/21] Update checked-in dependencies --- node_modules/.package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 932b9a077e..a3113f534b 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "3.22.11", + "version": "3.22.12", "lockfileVersion": 3, "requires": true, "packages": { From 8e4a6c7a903526fda317aa47e226cbd5a4f1d358 Mon Sep 17 00:00:00 2001 From: nickfyson Date: Fri, 15 Dec 2023 16:14:00 +0000 Subject: [PATCH 05/21] improve handling of changelog processing for backports --- .github/update-release-branch.py | 58 +++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index b17cafc7a7..948e10dfbb 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -1,5 +1,6 @@ import argparse import datetime +import re from github import Github import json import os @@ -174,6 +175,56 @@ def get_today_string(): today = datetime.datetime.today() return '{:%d %b %Y}'.format(today) +def process_changelog_for_backports(target_version): + + # changelog entries use a speficic format to indicate + # that they only apply to newer versions + regex = re.compile(r'\[v(\d+)\+ only\]') + + output = '' + + with open('CHANGELOG.md', 'r') as f: + + # until we find the first section, just duplicate all lines + while True: + line = f.readline().rstrip() + + output += line + '\n' + if line.startswith('## '): + # we have found the first section, so now handle things differently + break + + # found_content tracks whether we hit two headings in a row + found_content = False + output += '\n' + while True: + line = f.readline() + if not line: + break # EOF + line = line.rstrip() + + # filter out changenote entries that apply only to newer versions + match = regex.search(line) + if match: + if int(target_version) < int(match.group(1)): + continue + + if line.startswith('## '): + if found_content == False: + # we have found two headings in a row, so we need to add the placeholder message. + output += 'No user facing changes.\n' + found_content = False + output += '\n' +line + '\n\n' + else: + if line.strip() != '': + found_content = True + # we use the original line here, rather than the stripped version + # so that we preserve indentation + output += line + '\n' + + with open('CHANGELOG.md', 'w') as f: + f.write(output) + def update_changelog(version): if (os.path.exists('CHANGELOG.md')): content = '' @@ -326,11 +377,8 @@ def main(): print(f'Migrating changelog notes from v{source_branch_major_version} to v{target_branch_major_version}') subprocess.check_output(['sed', '-i', f's/^## {source_branch_major_version}\./## {target_branch_major_version}./g', 'CHANGELOG.md']) - # Remove changelog notes from all versions that do not apply to the vOlder branch - print(f'Removing changelog notes that do not apply to v{target_branch_major_version}') - for v in range(int(source_branch_major_version), int(target_branch_major_version), -1): - print(f'Removing changelog notes that are tagged [v{v}+ only\]') - subprocess.check_output(['sed', '-i', f'/^- \[v{v}+ only\]/d', 'CHANGELOG.md']) + # process changelog for backport to target release branch + process_changelog_for_backports(target_branch_major_version) # Amend the commit generated by `npm version` to update the CHANGELOG run_git('add', 'CHANGELOG.md') From e0c2b0a8a0cf7360f5f17b1ee83b98565e81cbaf Mon Sep 17 00:00:00 2001 From: nickfyson Date: Fri, 15 Dec 2023 17:02:32 +0000 Subject: [PATCH 06/21] change version numbers inside processing function as well --- .github/update-release-branch.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index 948e10dfbb..b518cddf8c 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -175,7 +175,7 @@ def get_today_string(): today = datetime.datetime.today() return '{:%d %b %Y}'.format(today) -def process_changelog_for_backports(target_version): +def process_changelog_for_backports(source_branch_major_version, target_branch_major_version): # changelog entries use a speficic format to indicate # that they only apply to newer versions @@ -191,6 +191,7 @@ def process_changelog_for_backports(target_version): output += line + '\n' if line.startswith('## '): + line = line.replace(f'## {source_branch_major_version}', f'## {target_branch_major_version}') # we have found the first section, so now handle things differently break @@ -206,10 +207,11 @@ def process_changelog_for_backports(target_version): # filter out changenote entries that apply only to newer versions match = regex.search(line) if match: - if int(target_version) < int(match.group(1)): + if int(target_branch_major_version) < int(match.group(1)): continue if line.startswith('## '): + line = line.replace(f'## {source_branch_major_version}', f'## {target_branch_major_version}') if found_content == False: # we have found two headings in a row, so we need to add the placeholder message. output += 'No user facing changes.\n' @@ -375,10 +377,7 @@ def main(): # Migrate the changelog notes from vLatest version numbers to vOlder version numbers print(f'Migrating changelog notes from v{source_branch_major_version} to v{target_branch_major_version}') - subprocess.check_output(['sed', '-i', f's/^## {source_branch_major_version}\./## {target_branch_major_version}./g', 'CHANGELOG.md']) - - # process changelog for backport to target release branch - process_changelog_for_backports(target_branch_major_version) + process_changelog_for_backports(source_branch_major_version, target_branch_major_version) # Amend the commit generated by `npm version` to update the CHANGELOG run_git('add', 'CHANGELOG.md') From ee5301261095bb1b9520ab787f030a4267b4a839 Mon Sep 17 00:00:00 2001 From: Nick Fyson Date: Fri, 15 Dec 2023 18:44:26 +0000 Subject: [PATCH 07/21] Apply suggestions from code review Co-authored-by: Henry Mercer --- .github/update-release-branch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index b518cddf8c..c97cb41406 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -177,7 +177,7 @@ def get_today_string(): def process_changelog_for_backports(source_branch_major_version, target_branch_major_version): - # changelog entries use a speficic format to indicate + # changelog entries can use the following format to indicate # that they only apply to newer versions regex = re.compile(r'\[v(\d+)\+ only\]') @@ -216,7 +216,7 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m # we have found two headings in a row, so we need to add the placeholder message. output += 'No user facing changes.\n' found_content = False - output += '\n' +line + '\n\n' + output += f'\n{line}\n\n' else: if line.strip() != '': found_content = True From fda1796670fb9ec77d29cb1b657308221a7ea429 Mon Sep 17 00:00:00 2001 From: nickfyson Date: Fri, 15 Dec 2023 18:45:36 +0000 Subject: [PATCH 08/21] rename regex for clarity --- .github/update-release-branch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index c97cb41406..f9587884b0 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -179,7 +179,7 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m # changelog entries can use the following format to indicate # that they only apply to newer versions - regex = re.compile(r'\[v(\d+)\+ only\]') + some_versions_only_regex = re.compile(r'\[v(\d+)\+ only\]') output = '' @@ -205,7 +205,7 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m line = line.rstrip() # filter out changenote entries that apply only to newer versions - match = regex.search(line) + match = some_versions_only_regex.search(line) if match: if int(target_branch_major_version) < int(match.group(1)): continue From 0724061f76ec91db7d4fecc5e58b09291e4405b5 Mon Sep 17 00:00:00 2001 From: nickfyson Date: Mon, 18 Dec 2023 10:05:44 +0000 Subject: [PATCH 09/21] preserve trailing whitespace when transforming CHANGELOG --- .github/update-release-branch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index f9587884b0..7274a63057 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -187,9 +187,9 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m # until we find the first section, just duplicate all lines while True: - line = f.readline().rstrip() + line = f.readline() - output += line + '\n' + output += line if line.startswith('## '): line = line.replace(f'## {source_branch_major_version}', f'## {target_branch_major_version}') # we have found the first section, so now handle things differently @@ -202,7 +202,7 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m line = f.readline() if not line: break # EOF - line = line.rstrip() + line = line.rstrip('\n') # filter out changenote entries that apply only to newer versions match = some_versions_only_regex.search(line) From 8e086df084a76c93568b2f0b0f274bd67f083195 Mon Sep 17 00:00:00 2001 From: nickfyson Date: Mon, 18 Dec 2023 10:08:49 +0000 Subject: [PATCH 10/21] raise explicit exception if EOF found when looking for changelog sections --- .github/update-release-branch.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index 7274a63057..ecde537a2c 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -188,6 +188,8 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m # until we find the first section, just duplicate all lines while True: line = f.readline() + if not line: + raise Exception('Could not find any change sections in CHANGELOG.md') # EOF output += line if line.startswith('## '): From cda785ef94b0507301882a11b7b07e52888714d9 Mon Sep 17 00:00:00 2001 From: nickfyson Date: Mon, 18 Dec 2023 13:39:34 +0000 Subject: [PATCH 11/21] add note on versioning approach to changelog --- .github/workflows/post-release-mergeback.yml | 4 ++-- CHANGELOG.md | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/post-release-mergeback.yml b/.github/workflows/post-release-mergeback.yml index c3d0b291a4..3e3e802502 100644 --- a/.github/workflows/post-release-mergeback.yml +++ b/.github/workflows/post-release-mergeback.yml @@ -133,8 +133,8 @@ jobs: # Update the version number ready for the next release npm version patch --no-git-tag-version - # Update the changelog - perl -i -pe 's/^/## \[UNRELEASED\]\n\nNo user facing changes.\n\n/ if($.==5)' CHANGELOG.md + # Update the changelog, adding a new version heading directly above the most recent existing one + awk '!f && /##/{print "'"## [UNRELEASED]\n\nNo user facing changes.\n"'"; f=1}1' CHANGELOG.md > temp && mv temp CHANGELOG.md git add . git commit -m "Update changelog and version after ${VERSION}" diff --git a/CHANGELOG.md b/CHANGELOG.md index bd34fabfd7..04c9356701 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs. +Note that for the CodeQL Action we use the major version number to mark a change in the node version used, while the minor & patch numbers indicate releases that support the same features across node versions. For example `3.22.11` is the first `v3` release and is functionally identical to `2.22.11`, which was released while we continue to support `v2`. This approach ensures an easy way to track exactly which features are included in different versions. + ## [UNRELEASED] No user facing changes. From 144b7d5b167009963923cd450cf308028969e0f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 10:52:32 -0800 Subject: [PATCH 12/21] Bump the npm group with 2 updates (#2045) * Bump the npm group with 2 updates Bumps the npm group with 2 updates: [eslint](https://github.com/eslint/eslint) and [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import). Updates `eslint` from 8.55.0 to 8.56.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.55.0...v8.56.0) Updates `eslint-plugin-import` from 2.29.0 to 2.29.1 - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.29.0...v2.29.1) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] * Update checked-in dependencies --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- node_modules/.package-lock.json | 28 ++-- node_modules/@eslint/js/package.json | 2 +- .../eslint-plugin-import/CHANGELOG.md | 16 ++- .../lib/rules/no-extraneous-dependencies.js | 3 +- .../lib/rules/no-unused-modules.js | 23 +-- .../eslint-plugin-import/package.json | 10 +- node_modules/eslint/README.md | 28 ++-- .../eslint/lib/cli-engine/cli-engine.js | 4 +- node_modules/eslint/lib/cli.js | 25 +++- .../eslint/lib/config/flat-config-schema.js | 23 ++- .../eslint/lib/eslint/eslint-helpers.js | 13 +- node_modules/eslint/lib/eslint/flat-eslint.js | 11 +- .../lib/linter/config-comment-parser.js | 36 ++++- node_modules/eslint/lib/linter/linter.js | 33 ++--- node_modules/eslint/lib/options.js | 8 ++ .../eslint/lib/rules/no-invalid-this.js | 2 +- .../lib/rules/no-promise-executor-return.js | 15 +- .../lib/rules/no-restricted-properties.js | 43 ++---- node_modules/eslint/lib/shared/severity.js | 49 +++++++ .../eslint/lib/source-code/source-code.js | 25 +--- node_modules/eslint/package.json | 12 +- node_modules/tsconfig-paths/CHANGELOG.md | 6 + .../lib/__tests__/tsconfig-loader.test.js | 94 ++++++++++++- .../lib/__tests__/tsconfig-loader.test.js.map | 2 +- .../tsconfig-paths/lib/tsconfig-loader.d.ts | 2 +- .../tsconfig-paths/lib/tsconfig-loader.js | 66 ++++++--- .../tsconfig-paths/lib/tsconfig-loader.js.map | 2 +- node_modules/tsconfig-paths/package.json | 2 +- .../src/__tests__/tsconfig-loader.test.ts | 116 ++++++++++++++- .../tsconfig-paths/src/tsconfig-loader.ts | 132 ++++++++++++------ package-lock.json | 32 ++--- package.json | 4 +- 32 files changed, 617 insertions(+), 250 deletions(-) create mode 100644 node_modules/eslint/lib/shared/severity.js diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index ae6d5e8eda..3954eaa4ef 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -448,9 +448,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", - "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2497,15 +2497,15 @@ } }, "node_modules/eslint": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", - "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.55.0", + "@eslint/js": "8.56.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -2719,9 +2719,9 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz", - "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==", + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, "dependencies": { "array-includes": "^3.1.7", @@ -2740,7 +2740,7 @@ "object.groupby": "^1.0.1", "object.values": "^1.1.7", "semver": "^6.3.1", - "tsconfig-paths": "^3.14.2" + "tsconfig-paths": "^3.15.0" }, "engines": { "node": ">=4" @@ -5915,9 +5915,9 @@ } }, "node_modules/tsconfig-paths": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", - "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, "dependencies": { "@types/json5": "^0.0.29", diff --git a/node_modules/@eslint/js/package.json b/node_modules/@eslint/js/package.json index 2c7aacae88..8dde9da4c4 100644 --- a/node_modules/@eslint/js/package.json +++ b/node_modules/@eslint/js/package.json @@ -1,6 +1,6 @@ { "name": "@eslint/js", - "version": "8.55.0", + "version": "8.56.0", "description": "ESLint JavaScript language implementation", "main": "./src/index.js", "scripts": {}, diff --git a/node_modules/eslint-plugin-import/CHANGELOG.md b/node_modules/eslint-plugin-import/CHANGELOG.md index bc3fc1918d..b81ad61a61 100644 --- a/node_modules/eslint-plugin-import/CHANGELOG.md +++ b/node_modules/eslint-plugin-import/CHANGELOG.md @@ -6,6 +6,13 @@ This change log adheres to standards from [Keep a CHANGELOG](https://keepachange ## [Unreleased] +## [2.29.1] - 2023-12-14 + +### Fixed +- [`no-extraneous-dependencies`]: ignore `export type { ... } from '...'` when `includeTypes` is `false` ([#2919], thanks [@Pandemic1617]) +- [`no-unused-modules`]: support export patterns with array destructuring ([#2930], thanks [@ljharb]) +- [Deps] update `tsconfig-paths` ([#2447], thanks [@domdomegg]) + ## [2.29.0] - 2023-10-22 ### Added @@ -1094,6 +1101,7 @@ for info on changes for earlier releases. [`memo-parser`]: ./memo-parser/README.md +[#2919]: https://github.com/import-js/eslint-plugin-import/pull/2919 [#2884]: https://github.com/import-js/eslint-plugin-import/pull/2884 [#2854]: https://github.com/import-js/eslint-plugin-import/pull/2854 [#2851]: https://github.com/import-js/eslint-plugin-import/pull/2851 @@ -1431,6 +1439,8 @@ for info on changes for earlier releases. [#211]: https://github.com/import-js/eslint-plugin-import/pull/211 [#164]: https://github.com/import-js/eslint-plugin-import/pull/164 [#157]: https://github.com/import-js/eslint-plugin-import/pull/157 + +[#2930]: https://github.com/import-js/eslint-plugin-import/issues/2930 [#2687]: https://github.com/import-js/eslint-plugin-import/issues/2687 [#2684]: https://github.com/import-js/eslint-plugin-import/issues/2684 [#2674]: https://github.com/import-js/eslint-plugin-import/issues/2674 @@ -1438,6 +1448,7 @@ for info on changes for earlier releases. [#2666]: https://github.com/import-js/eslint-plugin-import/issues/2666 [#2665]: https://github.com/import-js/eslint-plugin-import/issues/2665 [#2577]: https://github.com/import-js/eslint-plugin-import/issues/2577 +[#2447]: https://github.com/import-js/eslint-plugin-import/issues/2447 [#2444]: https://github.com/import-js/eslint-plugin-import/issues/2444 [#2412]: https://github.com/import-js/eslint-plugin-import/issues/2412 [#2392]: https://github.com/import-js/eslint-plugin-import/issues/2392 @@ -1556,7 +1567,8 @@ for info on changes for earlier releases. [#119]: https://github.com/import-js/eslint-plugin-import/issues/119 [#89]: https://github.com/import-js/eslint-plugin-import/issues/89 -[Unreleased]: https://github.com/import-js/eslint-plugin-import/compare/v2.29.0...HEAD +[Unreleased]: https://github.com/import-js/eslint-plugin-import/compare/v2.29.1...HEAD +[2.29.1]: https://github.com/import-js/eslint-plugin-import/compare/v2.29.0...v2.29.1 [2.29.0]: https://github.com/import-js/eslint-plugin-import/compare/v2.28.1...v2.29.0 [2.28.1]: https://github.com/import-js/eslint-plugin-import/compare/v2.28.0...v2.28.1 [2.28.0]: https://github.com/import-js/eslint-plugin-import/compare/v2.27.5...v2.28.0 @@ -1708,6 +1720,7 @@ for info on changes for earlier releases. [@devinrhode2]: https://github.com/devinrhode2 [@devongovett]: https://github.com/devongovett [@dmnd]: https://github.com/dmnd +[@domdomegg]: https://github.com/domdomegg [@duncanbeevers]: https://github.com/duncanbeevers [@dwardu]: https://github.com/dwardu [@echenley]: https://github.com/echenley @@ -1830,6 +1843,7 @@ for info on changes for earlier releases. [@ntdb]: https://github.com/ntdb [@nwalters512]: https://github.com/nwalters512 [@ombene]: https://github.com/ombene +[@Pandemic1617]: https://github.com/Pandemic1617 [@ota-meshi]: https://github.com/ota-meshi [@OutdatedVersion]: https://github.com/OutdatedVersion [@panrafal]: https://github.com/panrafal diff --git a/node_modules/eslint-plugin-import/lib/rules/no-extraneous-dependencies.js b/node_modules/eslint-plugin-import/lib/rules/no-extraneous-dependencies.js index 35fc8a911b..cbe024a71f 100644 --- a/node_modules/eslint-plugin-import/lib/rules/no-extraneous-dependencies.js +++ b/node_modules/eslint-plugin-import/lib/rules/no-extraneous-dependencies.js @@ -177,6 +177,7 @@ function reportIfMissing(context, deps, depsOptions, node, name) { node.importKind === 'type' || node.importKind === 'typeof' || + node.exportKind === 'type' || Array.isArray(node.specifiers) && node.specifiers.length && node.specifiers.every(function (specifier) {return specifier.importKind === 'type' || specifier.importKind === 'typeof';}))) { @@ -297,4 +298,4 @@ module.exports = { 'Program:exit': function () {function ProgramExit() { depFieldCache.clear(); }return ProgramExit;}() }; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/rules/no-extraneous-dependencies.js"],"names":["depFieldCache","Map","hasKeys","obj","Object","keys","length","arrayOrKeys","arrayOrObject","Array","isArray","readJSON","jsonPath","throwException","JSON","parse","fs","readFileSync","err","extractDepFields","pkg","dependencies","devDependencies","optionalDependencies","peerDependencies","bundledDependencies","bundleDependencies","getPackageDepFields","packageJsonPath","throwAtRead","has","depFields","set","get","getDependencies","context","packageDir","paths","packageContent","path","resolve","map","dir","forEach","join","_packageContent","depsKey","assign","cwd","getPhysicalFilename","getFilename","normalize","some","e","code","report","message","loc","line","column","name","SyntaxError","missingErrorMessage","packageName","devDepErrorMessage","optDepErrorMessage","getModuleOriginalName","split","first","second","startsWith","getModuleRealName","resolved","checkDependencyDeclaration","deps","declarationStatus","newDeclarationStatus","isInDeps","isInDevDeps","isInOptDeps","isInPeerDeps","isInBundledDeps","packageHierarchy","packageNameParts","namePart","index","ancestor","slice","push","reduce","result","ancestorName","undefined","indexOf","reportIfMissing","depsOptions","node","verifyTypeImports","importKind","specifiers","every","specifier","typeOfImport","verifyInternalDeps","importPackageName","allowDevDeps","allowPeerDeps","allowOptDeps","allowBundledDeps","realPackageName","testConfig","config","filename","c","process","module","exports","meta","type","docs","category","description","url","schema","properties","includeInternal","includeTypes","additionalProperties","create","options","source","value","commonjs","clear"],"mappings":"qoBAAA,4B;AACA,wB;AACA,kD;AACA,sC;AACA,sD;AACA,kE;AACA,gD;AACA;AACA,qC;;AAEA,IAAMA,gBAAgB,IAAIC,GAAJ,EAAtB;;AAEA,SAASC,OAAT,GAA2B,KAAVC,GAAU,uEAAJ,EAAI;AACzB,SAAOC,OAAOC,IAAP,CAAYF,GAAZ,EAAiBG,MAAjB,GAA0B,CAAjC;AACD;;AAED,SAASC,WAAT,CAAqBC,aAArB,EAAoC;AAClC,SAAOC,MAAMC,OAAN,CAAcF,aAAd,IAA+BA,aAA/B,GAA+CJ,OAAOC,IAAP,CAAYG,aAAZ,CAAtD;AACD;;AAED,SAASG,QAAT,CAAkBC,QAAlB,EAA4BC,cAA5B,EAA4C;AAC1C,MAAI;AACF,WAAOC,KAAKC,KAAL,CAAWC,gBAAGC,YAAH,CAAgBL,QAAhB,EAA0B,MAA1B,CAAX,CAAP;AACD,GAFD,CAEE,OAAOM,GAAP,EAAY;AACZ,QAAIL,cAAJ,EAAoB;AAClB,YAAMK,GAAN;AACD;AACF;AACF;;AAED,SAASC,gBAAT,CAA0BC,GAA1B,EAA+B;AAC7B,SAAO;AACLC,kBAAcD,IAAIC,YAAJ,IAAoB,EAD7B;AAELC,qBAAiBF,IAAIE,eAAJ,IAAuB,EAFnC;AAGLC,0BAAsBH,IAAIG,oBAAJ,IAA4B,EAH7C;AAILC,sBAAkBJ,IAAII,gBAAJ,IAAwB,EAJrC;AAKL;AACA;AACAC,yBAAqBlB,YAAYa,IAAIM,kBAAJ,IAA0BN,IAAIK,mBAA9B,IAAqD,EAAjE,CAPhB,EAAP;;AASD;;AAED,SAASE,mBAAT,CAA6BC,eAA7B,EAA8CC,WAA9C,EAA2D;AACzD,MAAI,CAAC7B,cAAc8B,GAAd,CAAkBF,eAAlB,CAAL,EAAyC;AACvC,QAAMG,YAAYZ,iBAAiBR,SAASiB,eAAT,EAA0BC,WAA1B,CAAjB,CAAlB;AACA7B,kBAAcgC,GAAd,CAAkBJ,eAAlB,EAAmCG,SAAnC;AACD;;AAED,SAAO/B,cAAciC,GAAd,CAAkBL,eAAlB,CAAP;AACD;;AAED,SAASM,eAAT,CAAyBC,OAAzB,EAAkCC,UAAlC,EAA8C;AAC5C,MAAIC,QAAQ,EAAZ;AACA,MAAI;AACF,QAAMC,iBAAiB;AACrBjB,oBAAc,EADO;AAErBC,uBAAiB,EAFI;AAGrBC,4BAAsB,EAHD;AAIrBC,wBAAkB,EAJG;AAKrBC,2BAAqB,EALA,EAAvB;;;AAQA,QAAIW,cAAcA,WAAW9B,MAAX,GAAoB,CAAtC,EAAyC;AACvC,UAAI,CAACG,MAAMC,OAAN,CAAc0B,UAAd,CAAL,EAAgC;AAC9BC,gBAAQ,CAACE,kBAAKC,OAAL,CAAaJ,UAAb,CAAD,CAAR;AACD,OAFD,MAEO;AACLC,gBAAQD,WAAWK,GAAX,CAAe,UAACC,GAAD,UAASH,kBAAKC,OAAL,CAAaE,GAAb,CAAT,EAAf,CAAR;AACD;AACF;;AAED,QAAIL,MAAM/B,MAAN,GAAe,CAAnB,EAAsB;AACpB;AACA+B,YAAMM,OAAN,CAAc,UAACD,GAAD,EAAS;AACrB,YAAMd,kBAAkBW,kBAAKK,IAAL,CAAUF,GAAV,EAAe,cAAf,CAAxB;AACA,YAAMG,kBAAkBlB,oBAAoBC,eAApB,EAAqC,IAArC,CAAxB;AACAxB,eAAOC,IAAP,CAAYiC,cAAZ,EAA4BK,OAA5B,CAAoC,UAACG,OAAD,EAAa;AAC/C1C,iBAAO2C,MAAP,CAAcT,eAAeQ,OAAf,CAAd,EAAuCD,gBAAgBC,OAAhB,CAAvC;AACD,SAFD;AAGD,OAND;AAOD,KATD,MASO;AACL,UAAMlB,kBAAkB,wBAAM;AAC5BoB,aAAKb,QAAQc,mBAAR,GAA8Bd,QAAQc,mBAAR,EAA9B,GAA8Dd,QAAQe,WAAR,EADvC;AAE5BC,mBAAW,KAFiB,EAAN,CAAxB;;;AAKA;AACA/C,aAAO2C,MAAP;AACET,oBADF;AAEEX,0BAAoBC,eAApB,EAAqC,KAArC,CAFF;;AAID;;AAED,QAAI,CAAC;AACHU,mBAAejB,YADZ;AAEHiB,mBAAehB,eAFZ;AAGHgB,mBAAef,oBAHZ;AAIHe,mBAAed,gBAJZ;AAKHc,mBAAeb,mBALZ;AAMH2B,QANG,CAMElD,OANF,CAAL,EAMiB;AACf,aAAO,IAAP;AACD;;AAED,WAAOoC,cAAP;AACD,GAlDD,CAkDE,OAAOe,CAAP,EAAU;AACV,QAAIhB,MAAM/B,MAAN,GAAe,CAAf,IAAoB+C,EAAEC,IAAF,KAAW,QAAnC,EAA6C;AAC3CnB,cAAQoB,MAAR,CAAe;AACbC,iBAAS,2CADI;AAEbC,aAAK,EAAEC,MAAM,CAAR,EAAWC,QAAQ,CAAnB,EAFQ,EAAf;;AAID;AACD,QAAIN,EAAEO,IAAF,KAAW,WAAX,IAA0BP,aAAaQ,WAA3C,EAAwD;AACtD1B,cAAQoB,MAAR,CAAe;AACbC,wEAAuDH,EAAEG,OAAzD,CADa;AAEbC,aAAK,EAAEC,MAAM,CAAR,EAAWC,QAAQ,CAAnB,EAFQ,EAAf;;AAID;;AAED,WAAO,IAAP;AACD;AACF;;AAED,SAASG,mBAAT,CAA6BC,WAA7B,EAA0C;AACxC,uBAAWA,WAAX,mFAAyFA,WAAzF;AACD;;AAED,SAASC,kBAAT,CAA4BD,WAA5B,EAAyC;AACvC,uBAAWA,WAAX;AACD;;AAED,SAASE,kBAAT,CAA4BF,WAA5B,EAAyC;AACvC,uBAAWA,WAAX;AACD;;AAED,SAASG,qBAAT,CAA+BN,IAA/B,EAAqC;AACXA,OAAKO,KAAL,CAAW,GAAX,CADW,+CAC5BC,KAD4B,mBACrBC,MADqB;AAEnC,SAAOD,MAAME,UAAN,CAAiB,GAAjB,WAA2BF,KAA3B,iBAAoCC,MAApC,IAA+CD,KAAtD;AACD;;AAED,SAASG,iBAAT,CAA2BC,QAA3B,EAAqC;AACnC,SAAO,qCAAmBA,QAAnB,CAAP;AACD;;AAED,SAASC,0BAAT,CAAoCC,IAApC,EAA0CX,WAA1C,EAAuDY,iBAAvD,EAA0E;AACxE,MAAMC,uBAAuBD,qBAAqB;AAChDE,cAAU,KADsC;AAEhDC,iBAAa,KAFmC;AAGhDC,iBAAa,KAHmC;AAIhDC,kBAAc,KAJkC;AAKhDC,qBAAiB,KAL+B,EAAlD;;;AAQA;AACA;AACA,MAAMC,mBAAmB,EAAzB;AACA,MAAMC,mBAAmBpB,cAAcA,YAAYI,KAAZ,CAAkB,GAAlB,CAAd,GAAuC,EAAhE;AACAgB,mBAAiBxC,OAAjB,CAAyB,UAACyC,QAAD,EAAWC,KAAX,EAAqB;AAC5C,QAAI,CAACD,SAASd,UAAT,CAAoB,GAApB,CAAL,EAA+B;AAC7B,UAAMgB,WAAWH,iBAAiBI,KAAjB,CAAuB,CAAvB,EAA0BF,QAAQ,CAAlC,EAAqCzC,IAArC,CAA0C,GAA1C,CAAjB;AACAsC,uBAAiBM,IAAjB,CAAsBF,QAAtB;AACD;AACF,GALD;;AAOA,SAAOJ,iBAAiBO,MAAjB,CAAwB,UAACC,MAAD,EAASC,YAAT,UAA2B;AACxDd,gBAAUa,OAAOb,QAAP,IAAmBH,KAAKrD,YAAL,CAAkBsE,YAAlB,MAAoCC,SADT;AAExDd,mBAAaY,OAAOZ,WAAP,IAAsBJ,KAAKpD,eAAL,CAAqBqE,YAArB,MAAuCC,SAFlB;AAGxDb,mBAAaW,OAAOX,WAAP,IAAsBL,KAAKnD,oBAAL,CAA0BoE,YAA1B,MAA4CC,SAHvB;AAIxDZ,oBAAcU,OAAOV,YAAP,IAAuBN,KAAKlD,gBAAL,CAAsBmE,YAAtB,MAAwCC,SAJrB;AAKxDX;AACIS,aAAOT,eAAP,IAA0BP,KAAKjD,mBAAL,CAAyBoE,OAAzB,CAAiCF,YAAjC,MAAmD,CAAC,CAN1B,EAA3B,EAAxB;AAOHf,sBAPG,CAAP;AAQD;;AAED,SAASkB,eAAT,CAAyB3D,OAAzB,EAAkCuC,IAAlC,EAAwCqB,WAAxC,EAAqDC,IAArD,EAA2DpC,IAA3D,EAAiE;AAC/D;AACA;AACE,GAACmC,YAAYE,iBAAb;;AAEED,OAAKE,UAAL,KAAoB,MAApB;AACGF,OAAKE,UAAL,KAAoB,QADvB;AAEGzF,QAAMC,OAAN,CAAcsF,KAAKG,UAAnB,KAAkCH,KAAKG,UAAL,CAAgB7F,MAAlD,IAA4D0F,KAAKG,UAAL,CAAgBC,KAAhB,CAAsB,UAACC,SAAD,UAAeA,UAAUH,UAAV,KAAyB,MAAzB,IAAmCG,UAAUH,UAAV,KAAyB,QAA3E,EAAtB,CAJjE,CADF;;AAOE;AACA;AACD;;AAED,MAAMI,eAAe,6BAAW1C,IAAX,EAAiBzB,OAAjB,CAArB;;AAEA;AACEmE,mBAAiB,UAAjB;AACIA,mBAAiB,UAAjB,IAA+B,CAACP,YAAYQ,kBADhD,CADF;AAGE;AACA;AACD;;AAED,MAAM/B,WAAW,0BAAQZ,IAAR,EAAczB,OAAd,CAAjB;AACA,MAAI,CAACqC,QAAL,EAAe,CAAE,OAAS;;AAE1B,MAAMgC,oBAAoBtC,sBAAsBN,IAAtB,CAA1B;AACA,MAAIe,oBAAoBF,2BAA2BC,IAA3B,EAAiC8B,iBAAjC,CAAxB;;AAEA;AACE7B,oBAAkBE,QAAlB;AACGkB,cAAYU,YAAZ,IAA4B9B,kBAAkBG,WADjD;AAEGiB,cAAYW,aAAZ,IAA6B/B,kBAAkBK,YAFlD;AAGGe,cAAYY,YAAZ,IAA4BhC,kBAAkBI,WAHjD;AAIGgB,cAAYa,gBAAZ,IAAgCjC,kBAAkBM,eALvD;AAME;AACA;AACD;;AAED;AACA;AACA,MAAM4B,kBAAkBtC,kBAAkBC,QAAlB,CAAxB;AACA,MAAIqC,mBAAmBA,oBAAoBL,iBAA3C,EAA8D;AAC5D7B,wBAAoBF,2BAA2BC,IAA3B,EAAiCmC,eAAjC,EAAkDlC,iBAAlD,CAApB;;AAEA;AACEA,sBAAkBE,QAAlB;AACGkB,gBAAYU,YAAZ,IAA4B9B,kBAAkBG,WADjD;AAEGiB,gBAAYW,aAAZ,IAA6B/B,kBAAkBK,YAFlD;AAGGe,gBAAYY,YAAZ,IAA4BhC,kBAAkBI,WAHjD;AAIGgB,gBAAYa,gBAAZ,IAAgCjC,kBAAkBM,eALvD;AAME;AACA;AACD;AACF;;AAED,MAAIN,kBAAkBG,WAAlB,IAAiC,CAACiB,YAAYU,YAAlD,EAAgE;AAC9DtE,YAAQoB,MAAR,CAAeyC,IAAf,EAAqBhC,mBAAmB6C,mBAAmBL,iBAAtC,CAArB;AACA;AACD;;AAED,MAAI7B,kBAAkBI,WAAlB,IAAiC,CAACgB,YAAYY,YAAlD,EAAgE;AAC9DxE,YAAQoB,MAAR,CAAeyC,IAAf,EAAqB/B,mBAAmB4C,mBAAmBL,iBAAtC,CAArB;AACA;AACD;;AAEDrE,UAAQoB,MAAR,CAAeyC,IAAf,EAAqBlC,oBAAoB+C,mBAAmBL,iBAAvC,CAArB;AACD;;AAED,SAASM,UAAT,CAAoBC,MAApB,EAA4BC,QAA5B,EAAsC;AACpC;AACA,MAAI,OAAOD,MAAP,KAAkB,SAAlB,IAA+B,OAAOA,MAAP,KAAkB,WAArD,EAAkE;AAChE,WAAOA,MAAP;AACD;AACD;AACA,SAAOA,OAAO3D,IAAP,CAAY,UAAC6D,CAAD,UAAO,4BAAUD,QAAV,EAAoBC,CAApB;AACrB,gCAAUD,QAAV,EAAoBzE,kBAAKK,IAAL,CAAUsE,QAAQlE,GAAR,EAAV,EAAyBiE,CAAzB,CAApB,CADc,EAAZ,CAAP;;AAGD;;AAEDE,OAAOC,OAAP,GAAiB;AACfC,QAAM;AACJC,UAAM,SADF;AAEJC,UAAM;AACJC,gBAAU,kBADN;AAEJC,mBAAa,wCAFT;AAGJC,WAAK,0BAAQ,4BAAR,CAHD,EAFF;;;AAQJC,YAAQ;AACN;AACEL,YAAM,QADR;AAEEM,kBAAY;AACVtG,yBAAiB,EAAEgG,MAAM,CAAC,SAAD,EAAY,OAAZ,CAAR,EADP;AAEV/F,8BAAsB,EAAE+F,MAAM,CAAC,SAAD,EAAY,OAAZ,CAAR,EAFZ;AAGV9F,0BAAkB,EAAE8F,MAAM,CAAC,SAAD,EAAY,OAAZ,CAAR,EAHR;AAIV7F,6BAAqB,EAAE6F,MAAM,CAAC,SAAD,EAAY,OAAZ,CAAR,EAJX;AAKVlF,oBAAY,EAAEkF,MAAM,CAAC,QAAD,EAAW,OAAX,CAAR,EALF;AAMVO,yBAAiB,EAAEP,MAAM,CAAC,SAAD,CAAR,EANP;AAOVQ,sBAAc,EAAER,MAAM,CAAC,SAAD,CAAR,EAPJ,EAFd;;AAWES,4BAAsB,KAXxB,EADM,CARJ,EADS;;;;;AA0BfC,QA1Be,+BA0BR7F,OA1BQ,EA0BC;AACd,UAAM8F,UAAU9F,QAAQ8F,OAAR,CAAgB,CAAhB,KAAsB,EAAtC;AACA,UAAMjB,WAAW7E,QAAQc,mBAAR,GAA8Bd,QAAQc,mBAAR,EAA9B,GAA8Dd,QAAQe,WAAR,EAA/E;AACA,UAAMwB,OAAOxC,gBAAgBC,OAAhB,EAAyB8F,QAAQ7F,UAAjC,KAAgDjB,iBAAiB,EAAjB,CAA7D;;AAEA,UAAM4E,cAAc;AAClBU,sBAAcK,WAAWmB,QAAQ3G,eAAnB,EAAoC0F,QAApC,MAAkD,KAD9C;AAElBL,sBAAcG,WAAWmB,QAAQ1G,oBAAnB,EAAyCyF,QAAzC,MAAuD,KAFnD;AAGlBN,uBAAeI,WAAWmB,QAAQzG,gBAAnB,EAAqCwF,QAArC,MAAmD,KAHhD;AAIlBJ,0BAAkBE,WAAWmB,QAAQxG,mBAAnB,EAAwCuF,QAAxC,MAAsD,KAJtD;AAKlBT,4BAAoB,CAAC,CAAC0B,QAAQJ,eALZ;AAMlB5B,2BAAmB,CAAC,CAACgC,QAAQH,YANX,EAApB;;;AASA,aAAO,gCAAc,UAACI,MAAD,EAASlC,IAAT,EAAkB;AACrCF,wBAAgB3D,OAAhB,EAAyBuC,IAAzB,EAA+BqB,WAA/B,EAA4CC,IAA5C,EAAkDkC,OAAOC,KAAzD;AACD,OAFM,EAEJ,EAAEC,UAAU,IAAZ,EAFI,CAAP;AAGD,KA3Cc;;AA6Cf,gBA7Ce,sCA6CE;AACfpI,oBAAcqI,KAAd;AACD,KA/Cc,wBAAjB","file":"no-extraneous-dependencies.js","sourcesContent":["import path from 'path';\nimport fs from 'fs';\nimport pkgUp from 'eslint-module-utils/pkgUp';\nimport minimatch from 'minimatch';\nimport resolve from 'eslint-module-utils/resolve';\nimport moduleVisitor from 'eslint-module-utils/moduleVisitor';\nimport importType from '../core/importType';\nimport { getFilePackageName } from '../core/packagePath';\nimport docsUrl from '../docsUrl';\n\nconst depFieldCache = new Map();\n\nfunction hasKeys(obj = {}) {\n  return Object.keys(obj).length > 0;\n}\n\nfunction arrayOrKeys(arrayOrObject) {\n  return Array.isArray(arrayOrObject) ? arrayOrObject : Object.keys(arrayOrObject);\n}\n\nfunction readJSON(jsonPath, throwException) {\n  try {\n    return JSON.parse(fs.readFileSync(jsonPath, 'utf8'));\n  } catch (err) {\n    if (throwException) {\n      throw err;\n    }\n  }\n}\n\nfunction extractDepFields(pkg) {\n  return {\n    dependencies: pkg.dependencies || {},\n    devDependencies: pkg.devDependencies || {},\n    optionalDependencies: pkg.optionalDependencies || {},\n    peerDependencies: pkg.peerDependencies || {},\n    // BundledDeps should be in the form of an array, but object notation is also supported by\n    // `npm`, so we convert it to an array if it is an object\n    bundledDependencies: arrayOrKeys(pkg.bundleDependencies || pkg.bundledDependencies || []),\n  };\n}\n\nfunction getPackageDepFields(packageJsonPath, throwAtRead) {\n  if (!depFieldCache.has(packageJsonPath)) {\n    const depFields = extractDepFields(readJSON(packageJsonPath, throwAtRead));\n    depFieldCache.set(packageJsonPath, depFields);\n  }\n\n  return depFieldCache.get(packageJsonPath);\n}\n\nfunction getDependencies(context, packageDir) {\n  let paths = [];\n  try {\n    const packageContent = {\n      dependencies: {},\n      devDependencies: {},\n      optionalDependencies: {},\n      peerDependencies: {},\n      bundledDependencies: [],\n    };\n\n    if (packageDir && packageDir.length > 0) {\n      if (!Array.isArray(packageDir)) {\n        paths = [path.resolve(packageDir)];\n      } else {\n        paths = packageDir.map((dir) => path.resolve(dir));\n      }\n    }\n\n    if (paths.length > 0) {\n      // use rule config to find package.json\n      paths.forEach((dir) => {\n        const packageJsonPath = path.join(dir, 'package.json');\n        const _packageContent = getPackageDepFields(packageJsonPath, true);\n        Object.keys(packageContent).forEach((depsKey) => {\n          Object.assign(packageContent[depsKey], _packageContent[depsKey]);\n        });\n      });\n    } else {\n      const packageJsonPath = pkgUp({\n        cwd: context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename(),\n        normalize: false,\n      });\n\n      // use closest package.json\n      Object.assign(\n        packageContent,\n        getPackageDepFields(packageJsonPath, false),\n      );\n    }\n\n    if (![\n      packageContent.dependencies,\n      packageContent.devDependencies,\n      packageContent.optionalDependencies,\n      packageContent.peerDependencies,\n      packageContent.bundledDependencies,\n    ].some(hasKeys)) {\n      return null;\n    }\n\n    return packageContent;\n  } catch (e) {\n    if (paths.length > 0 && e.code === 'ENOENT') {\n      context.report({\n        message: 'The package.json file could not be found.',\n        loc: { line: 0, column: 0 },\n      });\n    }\n    if (e.name === 'JSONError' || e instanceof SyntaxError) {\n      context.report({\n        message: `The package.json file could not be parsed: ${e.message}`,\n        loc: { line: 0, column: 0 },\n      });\n    }\n\n    return null;\n  }\n}\n\nfunction missingErrorMessage(packageName) {\n  return `'${packageName}' should be listed in the project's dependencies. Run 'npm i -S ${packageName}' to add it`;\n}\n\nfunction devDepErrorMessage(packageName) {\n  return `'${packageName}' should be listed in the project's dependencies, not devDependencies.`;\n}\n\nfunction optDepErrorMessage(packageName) {\n  return `'${packageName}' should be listed in the project's dependencies, not optionalDependencies.`;\n}\n\nfunction getModuleOriginalName(name) {\n  const [first, second] = name.split('/');\n  return first.startsWith('@') ? `${first}/${second}` : first;\n}\n\nfunction getModuleRealName(resolved) {\n  return getFilePackageName(resolved);\n}\n\nfunction checkDependencyDeclaration(deps, packageName, declarationStatus) {\n  const newDeclarationStatus = declarationStatus || {\n    isInDeps: false,\n    isInDevDeps: false,\n    isInOptDeps: false,\n    isInPeerDeps: false,\n    isInBundledDeps: false,\n  };\n\n  // in case of sub package.json inside a module\n  // check the dependencies on all hierarchy\n  const packageHierarchy = [];\n  const packageNameParts = packageName ? packageName.split('/') : [];\n  packageNameParts.forEach((namePart, index) => {\n    if (!namePart.startsWith('@')) {\n      const ancestor = packageNameParts.slice(0, index + 1).join('/');\n      packageHierarchy.push(ancestor);\n    }\n  });\n\n  return packageHierarchy.reduce((result, ancestorName) => ({\n    isInDeps: result.isInDeps || deps.dependencies[ancestorName] !== undefined,\n    isInDevDeps: result.isInDevDeps || deps.devDependencies[ancestorName] !== undefined,\n    isInOptDeps: result.isInOptDeps || deps.optionalDependencies[ancestorName] !== undefined,\n    isInPeerDeps: result.isInPeerDeps || deps.peerDependencies[ancestorName] !== undefined,\n    isInBundledDeps:\n        result.isInBundledDeps || deps.bundledDependencies.indexOf(ancestorName) !== -1,\n  }), newDeclarationStatus);\n}\n\nfunction reportIfMissing(context, deps, depsOptions, node, name) {\n  // Do not report when importing types unless option is enabled\n  if (\n    !depsOptions.verifyTypeImports\n    && (\n      node.importKind === 'type'\n      || node.importKind === 'typeof'\n      || Array.isArray(node.specifiers) && node.specifiers.length && node.specifiers.every((specifier) => specifier.importKind === 'type' || specifier.importKind === 'typeof')\n    )\n  ) {\n    return;\n  }\n\n  const typeOfImport = importType(name, context);\n\n  if (\n    typeOfImport !== 'external'\n    && (typeOfImport !== 'internal' || !depsOptions.verifyInternalDeps)\n  ) {\n    return;\n  }\n\n  const resolved = resolve(name, context);\n  if (!resolved) { return; }\n\n  const importPackageName = getModuleOriginalName(name);\n  let declarationStatus = checkDependencyDeclaration(deps, importPackageName);\n\n  if (\n    declarationStatus.isInDeps\n    || depsOptions.allowDevDeps && declarationStatus.isInDevDeps\n    || depsOptions.allowPeerDeps && declarationStatus.isInPeerDeps\n    || depsOptions.allowOptDeps && declarationStatus.isInOptDeps\n    || depsOptions.allowBundledDeps && declarationStatus.isInBundledDeps\n  ) {\n    return;\n  }\n\n  // test the real name from the resolved package.json\n  // if not aliased imports (alias/react for example), importPackageName can be misinterpreted\n  const realPackageName = getModuleRealName(resolved);\n  if (realPackageName && realPackageName !== importPackageName) {\n    declarationStatus = checkDependencyDeclaration(deps, realPackageName, declarationStatus);\n\n    if (\n      declarationStatus.isInDeps\n      || depsOptions.allowDevDeps && declarationStatus.isInDevDeps\n      || depsOptions.allowPeerDeps && declarationStatus.isInPeerDeps\n      || depsOptions.allowOptDeps && declarationStatus.isInOptDeps\n      || depsOptions.allowBundledDeps && declarationStatus.isInBundledDeps\n    ) {\n      return;\n    }\n  }\n\n  if (declarationStatus.isInDevDeps && !depsOptions.allowDevDeps) {\n    context.report(node, devDepErrorMessage(realPackageName || importPackageName));\n    return;\n  }\n\n  if (declarationStatus.isInOptDeps && !depsOptions.allowOptDeps) {\n    context.report(node, optDepErrorMessage(realPackageName || importPackageName));\n    return;\n  }\n\n  context.report(node, missingErrorMessage(realPackageName || importPackageName));\n}\n\nfunction testConfig(config, filename) {\n  // Simplest configuration first, either a boolean or nothing.\n  if (typeof config === 'boolean' || typeof config === 'undefined') {\n    return config;\n  }\n  // Array of globs.\n  return config.some((c) => minimatch(filename, c)\n    || minimatch(filename, path.join(process.cwd(), c)),\n  );\n}\n\nmodule.exports = {\n  meta: {\n    type: 'problem',\n    docs: {\n      category: 'Helpful warnings',\n      description: 'Forbid the use of extraneous packages.',\n      url: docsUrl('no-extraneous-dependencies'),\n    },\n\n    schema: [\n      {\n        type: 'object',\n        properties: {\n          devDependencies: { type: ['boolean', 'array'] },\n          optionalDependencies: { type: ['boolean', 'array'] },\n          peerDependencies: { type: ['boolean', 'array'] },\n          bundledDependencies: { type: ['boolean', 'array'] },\n          packageDir: { type: ['string', 'array'] },\n          includeInternal: { type: ['boolean'] },\n          includeTypes: { type: ['boolean'] },\n        },\n        additionalProperties: false,\n      },\n    ],\n  },\n\n  create(context) {\n    const options = context.options[0] || {};\n    const filename = context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename();\n    const deps = getDependencies(context, options.packageDir) || extractDepFields({});\n\n    const depsOptions = {\n      allowDevDeps: testConfig(options.devDependencies, filename) !== false,\n      allowOptDeps: testConfig(options.optionalDependencies, filename) !== false,\n      allowPeerDeps: testConfig(options.peerDependencies, filename) !== false,\n      allowBundledDeps: testConfig(options.bundledDependencies, filename) !== false,\n      verifyInternalDeps: !!options.includeInternal,\n      verifyTypeImports: !!options.includeTypes,\n    };\n\n    return moduleVisitor((source, node) => {\n      reportIfMissing(context, deps, depsOptions, node, source.value);\n    }, { commonjs: true });\n  },\n\n  'Program:exit'() {\n    depFieldCache.clear();\n  },\n};\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/rules/no-extraneous-dependencies.js"],"names":["depFieldCache","Map","hasKeys","obj","Object","keys","length","arrayOrKeys","arrayOrObject","Array","isArray","readJSON","jsonPath","throwException","JSON","parse","fs","readFileSync","err","extractDepFields","pkg","dependencies","devDependencies","optionalDependencies","peerDependencies","bundledDependencies","bundleDependencies","getPackageDepFields","packageJsonPath","throwAtRead","has","depFields","set","get","getDependencies","context","packageDir","paths","packageContent","path","resolve","map","dir","forEach","join","_packageContent","depsKey","assign","cwd","getPhysicalFilename","getFilename","normalize","some","e","code","report","message","loc","line","column","name","SyntaxError","missingErrorMessage","packageName","devDepErrorMessage","optDepErrorMessage","getModuleOriginalName","split","first","second","startsWith","getModuleRealName","resolved","checkDependencyDeclaration","deps","declarationStatus","newDeclarationStatus","isInDeps","isInDevDeps","isInOptDeps","isInPeerDeps","isInBundledDeps","packageHierarchy","packageNameParts","namePart","index","ancestor","slice","push","reduce","result","ancestorName","undefined","indexOf","reportIfMissing","depsOptions","node","verifyTypeImports","importKind","exportKind","specifiers","every","specifier","typeOfImport","verifyInternalDeps","importPackageName","allowDevDeps","allowPeerDeps","allowOptDeps","allowBundledDeps","realPackageName","testConfig","config","filename","c","process","module","exports","meta","type","docs","category","description","url","schema","properties","includeInternal","includeTypes","additionalProperties","create","options","source","value","commonjs","clear"],"mappings":"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","file":"no-extraneous-dependencies.js","sourcesContent":["import path from 'path';\nimport fs from 'fs';\nimport pkgUp from 'eslint-module-utils/pkgUp';\nimport minimatch from 'minimatch';\nimport resolve from 'eslint-module-utils/resolve';\nimport moduleVisitor from 'eslint-module-utils/moduleVisitor';\nimport importType from '../core/importType';\nimport { getFilePackageName } from '../core/packagePath';\nimport docsUrl from '../docsUrl';\n\nconst depFieldCache = new Map();\n\nfunction hasKeys(obj = {}) {\n  return Object.keys(obj).length > 0;\n}\n\nfunction arrayOrKeys(arrayOrObject) {\n  return Array.isArray(arrayOrObject) ? arrayOrObject : Object.keys(arrayOrObject);\n}\n\nfunction readJSON(jsonPath, throwException) {\n  try {\n    return JSON.parse(fs.readFileSync(jsonPath, 'utf8'));\n  } catch (err) {\n    if (throwException) {\n      throw err;\n    }\n  }\n}\n\nfunction extractDepFields(pkg) {\n  return {\n    dependencies: pkg.dependencies || {},\n    devDependencies: pkg.devDependencies || {},\n    optionalDependencies: pkg.optionalDependencies || {},\n    peerDependencies: pkg.peerDependencies || {},\n    // BundledDeps should be in the form of an array, but object notation is also supported by\n    // `npm`, so we convert it to an array if it is an object\n    bundledDependencies: arrayOrKeys(pkg.bundleDependencies || pkg.bundledDependencies || []),\n  };\n}\n\nfunction getPackageDepFields(packageJsonPath, throwAtRead) {\n  if (!depFieldCache.has(packageJsonPath)) {\n    const depFields = extractDepFields(readJSON(packageJsonPath, throwAtRead));\n    depFieldCache.set(packageJsonPath, depFields);\n  }\n\n  return depFieldCache.get(packageJsonPath);\n}\n\nfunction getDependencies(context, packageDir) {\n  let paths = [];\n  try {\n    const packageContent = {\n      dependencies: {},\n      devDependencies: {},\n      optionalDependencies: {},\n      peerDependencies: {},\n      bundledDependencies: [],\n    };\n\n    if (packageDir && packageDir.length > 0) {\n      if (!Array.isArray(packageDir)) {\n        paths = [path.resolve(packageDir)];\n      } else {\n        paths = packageDir.map((dir) => path.resolve(dir));\n      }\n    }\n\n    if (paths.length > 0) {\n      // use rule config to find package.json\n      paths.forEach((dir) => {\n        const packageJsonPath = path.join(dir, 'package.json');\n        const _packageContent = getPackageDepFields(packageJsonPath, true);\n        Object.keys(packageContent).forEach((depsKey) => {\n          Object.assign(packageContent[depsKey], _packageContent[depsKey]);\n        });\n      });\n    } else {\n      const packageJsonPath = pkgUp({\n        cwd: context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename(),\n        normalize: false,\n      });\n\n      // use closest package.json\n      Object.assign(\n        packageContent,\n        getPackageDepFields(packageJsonPath, false),\n      );\n    }\n\n    if (![\n      packageContent.dependencies,\n      packageContent.devDependencies,\n      packageContent.optionalDependencies,\n      packageContent.peerDependencies,\n      packageContent.bundledDependencies,\n    ].some(hasKeys)) {\n      return null;\n    }\n\n    return packageContent;\n  } catch (e) {\n    if (paths.length > 0 && e.code === 'ENOENT') {\n      context.report({\n        message: 'The package.json file could not be found.',\n        loc: { line: 0, column: 0 },\n      });\n    }\n    if (e.name === 'JSONError' || e instanceof SyntaxError) {\n      context.report({\n        message: `The package.json file could not be parsed: ${e.message}`,\n        loc: { line: 0, column: 0 },\n      });\n    }\n\n    return null;\n  }\n}\n\nfunction missingErrorMessage(packageName) {\n  return `'${packageName}' should be listed in the project's dependencies. Run 'npm i -S ${packageName}' to add it`;\n}\n\nfunction devDepErrorMessage(packageName) {\n  return `'${packageName}' should be listed in the project's dependencies, not devDependencies.`;\n}\n\nfunction optDepErrorMessage(packageName) {\n  return `'${packageName}' should be listed in the project's dependencies, not optionalDependencies.`;\n}\n\nfunction getModuleOriginalName(name) {\n  const [first, second] = name.split('/');\n  return first.startsWith('@') ? `${first}/${second}` : first;\n}\n\nfunction getModuleRealName(resolved) {\n  return getFilePackageName(resolved);\n}\n\nfunction checkDependencyDeclaration(deps, packageName, declarationStatus) {\n  const newDeclarationStatus = declarationStatus || {\n    isInDeps: false,\n    isInDevDeps: false,\n    isInOptDeps: false,\n    isInPeerDeps: false,\n    isInBundledDeps: false,\n  };\n\n  // in case of sub package.json inside a module\n  // check the dependencies on all hierarchy\n  const packageHierarchy = [];\n  const packageNameParts = packageName ? packageName.split('/') : [];\n  packageNameParts.forEach((namePart, index) => {\n    if (!namePart.startsWith('@')) {\n      const ancestor = packageNameParts.slice(0, index + 1).join('/');\n      packageHierarchy.push(ancestor);\n    }\n  });\n\n  return packageHierarchy.reduce((result, ancestorName) => ({\n    isInDeps: result.isInDeps || deps.dependencies[ancestorName] !== undefined,\n    isInDevDeps: result.isInDevDeps || deps.devDependencies[ancestorName] !== undefined,\n    isInOptDeps: result.isInOptDeps || deps.optionalDependencies[ancestorName] !== undefined,\n    isInPeerDeps: result.isInPeerDeps || deps.peerDependencies[ancestorName] !== undefined,\n    isInBundledDeps:\n        result.isInBundledDeps || deps.bundledDependencies.indexOf(ancestorName) !== -1,\n  }), newDeclarationStatus);\n}\n\nfunction reportIfMissing(context, deps, depsOptions, node, name) {\n  // Do not report when importing types unless option is enabled\n  if (\n    !depsOptions.verifyTypeImports\n    && (\n      node.importKind === 'type'\n      || node.importKind === 'typeof'\n      || node.exportKind === 'type'\n      || Array.isArray(node.specifiers) && node.specifiers.length && node.specifiers.every((specifier) => specifier.importKind === 'type' || specifier.importKind === 'typeof')\n    )\n  ) {\n    return;\n  }\n\n  const typeOfImport = importType(name, context);\n\n  if (\n    typeOfImport !== 'external'\n    && (typeOfImport !== 'internal' || !depsOptions.verifyInternalDeps)\n  ) {\n    return;\n  }\n\n  const resolved = resolve(name, context);\n  if (!resolved) { return; }\n\n  const importPackageName = getModuleOriginalName(name);\n  let declarationStatus = checkDependencyDeclaration(deps, importPackageName);\n\n  if (\n    declarationStatus.isInDeps\n    || depsOptions.allowDevDeps && declarationStatus.isInDevDeps\n    || depsOptions.allowPeerDeps && declarationStatus.isInPeerDeps\n    || depsOptions.allowOptDeps && declarationStatus.isInOptDeps\n    || depsOptions.allowBundledDeps && declarationStatus.isInBundledDeps\n  ) {\n    return;\n  }\n\n  // test the real name from the resolved package.json\n  // if not aliased imports (alias/react for example), importPackageName can be misinterpreted\n  const realPackageName = getModuleRealName(resolved);\n  if (realPackageName && realPackageName !== importPackageName) {\n    declarationStatus = checkDependencyDeclaration(deps, realPackageName, declarationStatus);\n\n    if (\n      declarationStatus.isInDeps\n      || depsOptions.allowDevDeps && declarationStatus.isInDevDeps\n      || depsOptions.allowPeerDeps && declarationStatus.isInPeerDeps\n      || depsOptions.allowOptDeps && declarationStatus.isInOptDeps\n      || depsOptions.allowBundledDeps && declarationStatus.isInBundledDeps\n    ) {\n      return;\n    }\n  }\n\n  if (declarationStatus.isInDevDeps && !depsOptions.allowDevDeps) {\n    context.report(node, devDepErrorMessage(realPackageName || importPackageName));\n    return;\n  }\n\n  if (declarationStatus.isInOptDeps && !depsOptions.allowOptDeps) {\n    context.report(node, optDepErrorMessage(realPackageName || importPackageName));\n    return;\n  }\n\n  context.report(node, missingErrorMessage(realPackageName || importPackageName));\n}\n\nfunction testConfig(config, filename) {\n  // Simplest configuration first, either a boolean or nothing.\n  if (typeof config === 'boolean' || typeof config === 'undefined') {\n    return config;\n  }\n  // Array of globs.\n  return config.some((c) => minimatch(filename, c)\n    || minimatch(filename, path.join(process.cwd(), c)),\n  );\n}\n\nmodule.exports = {\n  meta: {\n    type: 'problem',\n    docs: {\n      category: 'Helpful warnings',\n      description: 'Forbid the use of extraneous packages.',\n      url: docsUrl('no-extraneous-dependencies'),\n    },\n\n    schema: [\n      {\n        type: 'object',\n        properties: {\n          devDependencies: { type: ['boolean', 'array'] },\n          optionalDependencies: { type: ['boolean', 'array'] },\n          peerDependencies: { type: ['boolean', 'array'] },\n          bundledDependencies: { type: ['boolean', 'array'] },\n          packageDir: { type: ['string', 'array'] },\n          includeInternal: { type: ['boolean'] },\n          includeTypes: { type: ['boolean'] },\n        },\n        additionalProperties: false,\n      },\n    ],\n  },\n\n  create(context) {\n    const options = context.options[0] || {};\n    const filename = context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename();\n    const deps = getDependencies(context, options.packageDir) || extractDepFields({});\n\n    const depsOptions = {\n      allowDevDeps: testConfig(options.devDependencies, filename) !== false,\n      allowOptDeps: testConfig(options.optionalDependencies, filename) !== false,\n      allowPeerDeps: testConfig(options.peerDependencies, filename) !== false,\n      allowBundledDeps: testConfig(options.bundledDependencies, filename) !== false,\n      verifyInternalDeps: !!options.includeInternal,\n      verifyTypeImports: !!options.includeTypes,\n    };\n\n    return moduleVisitor((source, node) => {\n      reportIfMissing(context, deps, depsOptions, node, source.value);\n    }, { commonjs: true });\n  },\n\n  'Program:exit'() {\n    depFieldCache.clear();\n  },\n};\n"]} \ No newline at end of file diff --git a/node_modules/eslint-plugin-import/lib/rules/no-unused-modules.js b/node_modules/eslint-plugin-import/lib/rules/no-unused-modules.js index 098f72a534..f6f6348b16 100644 --- a/node_modules/eslint-plugin-import/lib/rules/no-unused-modules.js +++ b/node_modules/eslint-plugin-import/lib/rules/no-unused-modules.js @@ -74,6 +74,7 @@ var FUNCTION_DECLARATION = 'FunctionDeclaration'; var CLASS_DECLARATION = 'ClassDeclaration'; var IDENTIFIER = 'Identifier'; var OBJECT_PATTERN = 'ObjectPattern'; +var ARRAY_PATTERN = 'ArrayPattern'; var TS_INTERFACE_DECLARATION = 'TSInterfaceDeclaration'; var TS_TYPE_ALIAS_DECLARATION = 'TSTypeAliasDeclaration'; var TS_ENUM_DECLARATION = 'TSEnumDeclaration'; @@ -97,6 +98,10 @@ function forEachDeclarationIdentifier(declaration, cb) { cb(pattern.name); } }); + } else if (id.type === ARRAY_PATTERN) { + id.elements.forEach(function (_ref3) {var name = _ref3.name; + cb(name); + }); } else { cb(id.name); } @@ -172,12 +177,12 @@ var resolveFiles = function resolveFiles(src, ignoreExports, context) { // prepare list of ignored files var ignoredFilesList = listFilesToProcess(ignoreExports, extensions); - ignoredFilesList.forEach(function (_ref3) {var filename = _ref3.filename;return ignoredFiles.add(filename);}); + ignoredFilesList.forEach(function (_ref4) {var filename = _ref4.filename;return ignoredFiles.add(filename);}); // prepare list of source files, don't consider files from node_modules return new Set( - (0, _arrayPrototype2['default'])(srcFileList, function (_ref4) {var filename = _ref4.filename;return isNodeModule(filename) ? [] : filename;})); + (0, _arrayPrototype2['default'])(srcFileList, function (_ref5) {var filename = _ref5.filename;return isNodeModule(filename) ? [] : filename;})); }; @@ -242,7 +247,7 @@ var prepareImportsAndExports = function prepareImportsAndExports(srcFiles, conte return; } var localImport = imports.get(key) || new Set(); - value.declarations.forEach(function (_ref5) {var importedSpecifiers = _ref5.importedSpecifiers; + value.declarations.forEach(function (_ref6) {var importedSpecifiers = _ref6.importedSpecifiers; importedSpecifiers.forEach(function (specifier) { localImport.add(specifier); }); @@ -344,9 +349,9 @@ var doPreparation = function doPreparation(src, ignoreExports, context) { lastPrepareKey = prepareKey; }; -var newNamespaceImportExists = function newNamespaceImportExists(specifiers) {return specifiers.some(function (_ref6) {var type = _ref6.type;return type === IMPORT_NAMESPACE_SPECIFIER;});}; +var newNamespaceImportExists = function newNamespaceImportExists(specifiers) {return specifiers.some(function (_ref7) {var type = _ref7.type;return type === IMPORT_NAMESPACE_SPECIFIER;});}; -var newDefaultImportExists = function newDefaultImportExists(specifiers) {return specifiers.some(function (_ref7) {var type = _ref7.type;return type === IMPORT_DEFAULT_SPECIFIER;});}; +var newDefaultImportExists = function newDefaultImportExists(specifiers) {return specifiers.some(function (_ref8) {var type = _ref8.type;return type === IMPORT_DEFAULT_SPECIFIER;});}; var fileIsInPkg = function fileIsInPkg(file) {var _readPkgUp = (0, _readPkgUp3['default'])({ cwd: file }),path = _readPkgUp.path,pkg = _readPkgUp.pkg; @@ -458,13 +463,13 @@ module.exports = { - create: function () {function create(context) {var _ref8 = + create: function () {function create(context) {var _ref9 = - context.options[0] || {},src = _ref8.src,_ref8$ignoreExports = _ref8.ignoreExports,ignoreExports = _ref8$ignoreExports === undefined ? [] : _ref8$ignoreExports,missingExports = _ref8.missingExports,unusedExports = _ref8.unusedExports; + context.options[0] || {},src = _ref9.src,_ref9$ignoreExports = _ref9.ignoreExports,ignoreExports = _ref9$ignoreExports === undefined ? [] : _ref9$ignoreExports,missingExports = _ref9.missingExports,unusedExports = _ref9.unusedExports; if (unusedExports) { doPreparation(src, ignoreExports, context); @@ -583,7 +588,7 @@ module.exports = { var newExports = new Map(); var newExportIdentifiers = new Set(); - node.body.forEach(function (_ref9) {var type = _ref9.type,declaration = _ref9.declaration,specifiers = _ref9.specifiers; + node.body.forEach(function (_ref10) {var type = _ref10.type,declaration = _ref10.declaration,specifiers = _ref10.specifiers; if (type === EXPORT_DEFAULT_DECLARATION) { newExportIdentifiers.add(IMPORT_DEFAULT_SPECIFIER); } @@ -937,4 +942,4 @@ module.exports = { }return ExportNamedDeclaration;}() }; }return create;}() }; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/rules/no-unused-modules.js"],"names":["FileEnumerator","listFilesToProcess","require","e","originalListFilesToProcess","src","extensions","patterns","concat","pattern","map","extension","test","Array","from","iterateFiles","filePath","ignored","filename","EXPORT_DEFAULT_DECLARATION","EXPORT_NAMED_DECLARATION","EXPORT_ALL_DECLARATION","IMPORT_DECLARATION","IMPORT_NAMESPACE_SPECIFIER","IMPORT_DEFAULT_SPECIFIER","VARIABLE_DECLARATION","FUNCTION_DECLARATION","CLASS_DECLARATION","IDENTIFIER","OBJECT_PATTERN","TS_INTERFACE_DECLARATION","TS_TYPE_ALIAS_DECLARATION","TS_ENUM_DECLARATION","DEFAULT","forEachDeclarationIdentifier","declaration","cb","type","id","name","declarations","forEach","importList","Map","exportList","visitorKeyMap","ignoredFiles","Set","filesOutsideSrc","isNodeModule","path","resolveFiles","ignoreExports","context","settings","srcFileList","ignoredFilesList","add","prepareImportsAndExports","srcFiles","exportAll","file","exports","imports","currentExports","Exports","get","dependencies","reexports","localImportList","namespace","visitorKeys","set","currentExportAll","getDependency","dependency","value","key","whereUsed","reexport","getImport","localImport","currentValue","local","importedSpecifiers","specifier","has","val","currentExport","determineUsage","listValue","listKey","currentImport","exportStatement","getSrc","process","cwd","lastPrepareKey","doPreparation","prepareKey","JSON","stringify","sort","clear","newNamespaceImportExists","specifiers","some","newDefaultImportExists","fileIsInPkg","pkg","basePath","checkPkgFieldString","pkgField","checkPkgFieldObject","pkgFieldFiles","checkPkgField","bin","browser","main","module","meta","docs","category","description","url","schema","properties","uniqueItems","items","minLength","missingExports","unusedExports","anyOf","minItems","required","create","options","getPhysicalFilename","getFilename","checkExportPresence","node","exportCount","namespaceImports","size","report","body","checkUsage","exportedValue","exportsKey","updateExportUsage","newExports","newExportIdentifiers","length","exported","updateImportUsage","oldImportPaths","oldNamespaceImports","newNamespaceImports","oldExportAll","newExportAll","oldDefaultImports","newDefaultImports","oldImports","newImports","processDynamicImport","source","p","ImportExpression","child","CallExpression","callee","arguments","astNode","resolvedPath","raw","replace","filter","imported","ExportDefaultDeclaration","ExportNamedDeclaration"],"mappings":"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","file":"no-unused-modules.js","sourcesContent":["/**\n * @fileOverview Ensures that modules contain exports and/or all\n * modules are consumed within other modules.\n * @author René Fermann\n */\n\nimport { getFileExtensions } from 'eslint-module-utils/ignore';\nimport resolve from 'eslint-module-utils/resolve';\nimport visit from 'eslint-module-utils/visit';\nimport { dirname, join } from 'path';\nimport readPkgUp from 'eslint-module-utils/readPkgUp';\nimport values from 'object.values';\nimport includes from 'array-includes';\nimport flatMap from 'array.prototype.flatmap';\n\nimport Exports, { recursivePatternCapture } from '../ExportMap';\nimport docsUrl from '../docsUrl';\n\nlet FileEnumerator;\nlet listFilesToProcess;\n\ntry {\n  ({ FileEnumerator } = require('eslint/use-at-your-own-risk'));\n} catch (e) {\n  try {\n    // has been moved to eslint/lib/cli-engine/file-enumerator in version 6\n    ({ FileEnumerator } = require('eslint/lib/cli-engine/file-enumerator'));\n  } catch (e) {\n    try {\n      // eslint/lib/util/glob-util has been moved to eslint/lib/util/glob-utils with version 5.3\n      const { listFilesToProcess: originalListFilesToProcess } = require('eslint/lib/util/glob-utils');\n\n      // Prevent passing invalid options (extensions array) to old versions of the function.\n      // https://github.com/eslint/eslint/blob/v5.16.0/lib/util/glob-utils.js#L178-L280\n      // https://github.com/eslint/eslint/blob/v5.2.0/lib/util/glob-util.js#L174-L269\n      listFilesToProcess = function (src, extensions) {\n        return originalListFilesToProcess(src, {\n          extensions,\n        });\n      };\n    } catch (e) {\n      const { listFilesToProcess: originalListFilesToProcess } = require('eslint/lib/util/glob-util');\n\n      listFilesToProcess = function (src, extensions) {\n        const patterns = src.concat(flatMap(src, (pattern) => extensions.map((extension) => (/\\*\\*|\\*\\./).test(pattern) ? pattern : `${pattern}/**/*${extension}`)));\n\n        return originalListFilesToProcess(patterns);\n      };\n    }\n  }\n}\n\nif (FileEnumerator) {\n  listFilesToProcess = function (src, extensions) {\n    const e = new FileEnumerator({\n      extensions,\n    });\n\n    return Array.from(e.iterateFiles(src), ({ filePath, ignored }) => ({\n      ignored,\n      filename: filePath,\n    }));\n  };\n}\n\nconst EXPORT_DEFAULT_DECLARATION = 'ExportDefaultDeclaration';\nconst EXPORT_NAMED_DECLARATION = 'ExportNamedDeclaration';\nconst EXPORT_ALL_DECLARATION = 'ExportAllDeclaration';\nconst IMPORT_DECLARATION = 'ImportDeclaration';\nconst IMPORT_NAMESPACE_SPECIFIER = 'ImportNamespaceSpecifier';\nconst IMPORT_DEFAULT_SPECIFIER = 'ImportDefaultSpecifier';\nconst VARIABLE_DECLARATION = 'VariableDeclaration';\nconst FUNCTION_DECLARATION = 'FunctionDeclaration';\nconst CLASS_DECLARATION = 'ClassDeclaration';\nconst IDENTIFIER = 'Identifier';\nconst OBJECT_PATTERN = 'ObjectPattern';\nconst TS_INTERFACE_DECLARATION = 'TSInterfaceDeclaration';\nconst TS_TYPE_ALIAS_DECLARATION = 'TSTypeAliasDeclaration';\nconst TS_ENUM_DECLARATION = 'TSEnumDeclaration';\nconst DEFAULT = 'default';\n\nfunction forEachDeclarationIdentifier(declaration, cb) {\n  if (declaration) {\n    if (\n      declaration.type === FUNCTION_DECLARATION\n      || declaration.type === CLASS_DECLARATION\n      || declaration.type === TS_INTERFACE_DECLARATION\n      || declaration.type === TS_TYPE_ALIAS_DECLARATION\n      || declaration.type === TS_ENUM_DECLARATION\n    ) {\n      cb(declaration.id.name);\n    } else if (declaration.type === VARIABLE_DECLARATION) {\n      declaration.declarations.forEach(({ id }) => {\n        if (id.type === OBJECT_PATTERN) {\n          recursivePatternCapture(id, (pattern) => {\n            if (pattern.type === IDENTIFIER) {\n              cb(pattern.name);\n            }\n          });\n        } else {\n          cb(id.name);\n        }\n      });\n    }\n  }\n}\n\n/**\n * List of imports per file.\n *\n * Represented by a two-level Map to a Set of identifiers. The upper-level Map\n * keys are the paths to the modules containing the imports, while the\n * lower-level Map keys are the paths to the files which are being imported\n * from. Lastly, the Set of identifiers contains either names being imported\n * or a special AST node name listed above (e.g ImportDefaultSpecifier).\n *\n * For example, if we have a file named foo.js containing:\n *\n *   import { o2 } from './bar.js';\n *\n * Then we will have a structure that looks like:\n *\n *   Map { 'foo.js' => Map { 'bar.js' => Set { 'o2' } } }\n *\n * @type {Map<string, Map<string, Set<string>>>}\n */\nconst importList = new Map();\n\n/**\n * List of exports per file.\n *\n * Represented by a two-level Map to an object of metadata. The upper-level Map\n * keys are the paths to the modules containing the exports, while the\n * lower-level Map keys are the specific identifiers or special AST node names\n * being exported. The leaf-level metadata object at the moment only contains a\n * `whereUsed` property, which contains a Set of paths to modules that import\n * the name.\n *\n * For example, if we have a file named bar.js containing the following exports:\n *\n *   const o2 = 'bar';\n *   export { o2 };\n *\n * And a file named foo.js containing the following import:\n *\n *   import { o2 } from './bar.js';\n *\n * Then we will have a structure that looks like:\n *\n *   Map { 'bar.js' => Map { 'o2' => { whereUsed: Set { 'foo.js' } } } }\n *\n * @type {Map<string, Map<string, object>>}\n */\nconst exportList = new Map();\n\nconst visitorKeyMap = new Map();\n\nconst ignoredFiles = new Set();\nconst filesOutsideSrc = new Set();\n\nconst isNodeModule = (path) => (/\\/(node_modules)\\//).test(path);\n\n/**\n * read all files matching the patterns in src and ignoreExports\n *\n * return all files matching src pattern, which are not matching the ignoreExports pattern\n */\nconst resolveFiles = (src, ignoreExports, context) => {\n  const extensions = Array.from(getFileExtensions(context.settings));\n\n  const srcFileList = listFilesToProcess(src, extensions);\n\n  // prepare list of ignored files\n  const ignoredFilesList = listFilesToProcess(ignoreExports, extensions);\n  ignoredFilesList.forEach(({ filename }) => ignoredFiles.add(filename));\n\n  // prepare list of source files, don't consider files from node_modules\n\n  return new Set(\n    flatMap(srcFileList, ({ filename }) => isNodeModule(filename) ? [] : filename),\n  );\n};\n\n/**\n * parse all source files and build up 2 maps containing the existing imports and exports\n */\nconst prepareImportsAndExports = (srcFiles, context) => {\n  const exportAll = new Map();\n  srcFiles.forEach((file) => {\n    const exports = new Map();\n    const imports = new Map();\n    const currentExports = Exports.get(file, context);\n    if (currentExports) {\n      const {\n        dependencies,\n        reexports,\n        imports: localImportList,\n        namespace,\n        visitorKeys,\n      } = currentExports;\n\n      visitorKeyMap.set(file, visitorKeys);\n      // dependencies === export * from\n      const currentExportAll = new Set();\n      dependencies.forEach((getDependency) => {\n        const dependency = getDependency();\n        if (dependency === null) {\n          return;\n        }\n\n        currentExportAll.add(dependency.path);\n      });\n      exportAll.set(file, currentExportAll);\n\n      reexports.forEach((value, key) => {\n        if (key === DEFAULT) {\n          exports.set(IMPORT_DEFAULT_SPECIFIER, { whereUsed: new Set() });\n        } else {\n          exports.set(key, { whereUsed: new Set() });\n        }\n        const reexport =  value.getImport();\n        if (!reexport) {\n          return;\n        }\n        let localImport = imports.get(reexport.path);\n        let currentValue;\n        if (value.local === DEFAULT) {\n          currentValue = IMPORT_DEFAULT_SPECIFIER;\n        } else {\n          currentValue = value.local;\n        }\n        if (typeof localImport !== 'undefined') {\n          localImport = new Set([...localImport, currentValue]);\n        } else {\n          localImport = new Set([currentValue]);\n        }\n        imports.set(reexport.path, localImport);\n      });\n\n      localImportList.forEach((value, key) => {\n        if (isNodeModule(key)) {\n          return;\n        }\n        const localImport = imports.get(key) || new Set();\n        value.declarations.forEach(({ importedSpecifiers }) => {\n          importedSpecifiers.forEach((specifier) => {\n            localImport.add(specifier);\n          });\n        });\n        imports.set(key, localImport);\n      });\n      importList.set(file, imports);\n\n      // build up export list only, if file is not ignored\n      if (ignoredFiles.has(file)) {\n        return;\n      }\n      namespace.forEach((value, key) => {\n        if (key === DEFAULT) {\n          exports.set(IMPORT_DEFAULT_SPECIFIER, { whereUsed: new Set() });\n        } else {\n          exports.set(key, { whereUsed: new Set() });\n        }\n      });\n    }\n    exports.set(EXPORT_ALL_DECLARATION, { whereUsed: new Set() });\n    exports.set(IMPORT_NAMESPACE_SPECIFIER, { whereUsed: new Set() });\n    exportList.set(file, exports);\n  });\n  exportAll.forEach((value, key) => {\n    value.forEach((val) => {\n      const currentExports = exportList.get(val);\n      if (currentExports) {\n        const currentExport = currentExports.get(EXPORT_ALL_DECLARATION);\n        currentExport.whereUsed.add(key);\n      }\n    });\n  });\n};\n\n/**\n * traverse through all imports and add the respective path to the whereUsed-list\n * of the corresponding export\n */\nconst determineUsage = () => {\n  importList.forEach((listValue, listKey) => {\n    listValue.forEach((value, key) => {\n      const exports = exportList.get(key);\n      if (typeof exports !== 'undefined') {\n        value.forEach((currentImport) => {\n          let specifier;\n          if (currentImport === IMPORT_NAMESPACE_SPECIFIER) {\n            specifier = IMPORT_NAMESPACE_SPECIFIER;\n          } else if (currentImport === IMPORT_DEFAULT_SPECIFIER) {\n            specifier = IMPORT_DEFAULT_SPECIFIER;\n          } else {\n            specifier = currentImport;\n          }\n          if (typeof specifier !== 'undefined') {\n            const exportStatement = exports.get(specifier);\n            if (typeof exportStatement !== 'undefined') {\n              const { whereUsed } = exportStatement;\n              whereUsed.add(listKey);\n              exports.set(specifier, { whereUsed });\n            }\n          }\n        });\n      }\n    });\n  });\n};\n\nconst getSrc = (src) => {\n  if (src) {\n    return src;\n  }\n  return [process.cwd()];\n};\n\n/**\n * prepare the lists of existing imports and exports - should only be executed once at\n * the start of a new eslint run\n */\nlet srcFiles;\nlet lastPrepareKey;\nconst doPreparation = (src, ignoreExports, context) => {\n  const prepareKey = JSON.stringify({\n    src: (src || []).sort(),\n    ignoreExports: (ignoreExports || []).sort(),\n    extensions: Array.from(getFileExtensions(context.settings)).sort(),\n  });\n  if (prepareKey === lastPrepareKey) {\n    return;\n  }\n\n  importList.clear();\n  exportList.clear();\n  ignoredFiles.clear();\n  filesOutsideSrc.clear();\n\n  srcFiles = resolveFiles(getSrc(src), ignoreExports, context);\n  prepareImportsAndExports(srcFiles, context);\n  determineUsage();\n  lastPrepareKey = prepareKey;\n};\n\nconst newNamespaceImportExists = (specifiers) => specifiers.some(({ type }) => type === IMPORT_NAMESPACE_SPECIFIER);\n\nconst newDefaultImportExists = (specifiers) => specifiers.some(({ type }) => type === IMPORT_DEFAULT_SPECIFIER);\n\nconst fileIsInPkg = (file) => {\n  const { path, pkg } = readPkgUp({ cwd: file });\n  const basePath = dirname(path);\n\n  const checkPkgFieldString = (pkgField) => {\n    if (join(basePath, pkgField) === file) {\n      return true;\n    }\n  };\n\n  const checkPkgFieldObject = (pkgField) => {\n    const pkgFieldFiles = flatMap(values(pkgField), (value) => typeof value === 'boolean' ? [] : join(basePath, value));\n\n    if (includes(pkgFieldFiles, file)) {\n      return true;\n    }\n  };\n\n  const checkPkgField = (pkgField) => {\n    if (typeof pkgField === 'string') {\n      return checkPkgFieldString(pkgField);\n    }\n\n    if (typeof pkgField === 'object') {\n      return checkPkgFieldObject(pkgField);\n    }\n  };\n\n  if (pkg.private === true) {\n    return false;\n  }\n\n  if (pkg.bin) {\n    if (checkPkgField(pkg.bin)) {\n      return true;\n    }\n  }\n\n  if (pkg.browser) {\n    if (checkPkgField(pkg.browser)) {\n      return true;\n    }\n  }\n\n  if (pkg.main) {\n    if (checkPkgFieldString(pkg.main)) {\n      return true;\n    }\n  }\n\n  return false;\n};\n\nmodule.exports = {\n  meta: {\n    type: 'suggestion',\n    docs: {\n      category: 'Helpful warnings',\n      description: 'Forbid modules without exports, or exports without matching import in another module.',\n      url: docsUrl('no-unused-modules'),\n    },\n    schema: [{\n      properties: {\n        src: {\n          description: 'files/paths to be analyzed (only for unused exports)',\n          type: 'array',\n          uniqueItems: true,\n          items: {\n            type: 'string',\n            minLength: 1,\n          },\n        },\n        ignoreExports: {\n          description: 'files/paths for which unused exports will not be reported (e.g module entry points)',\n          type: 'array',\n          uniqueItems: true,\n          items: {\n            type: 'string',\n            minLength: 1,\n          },\n        },\n        missingExports: {\n          description: 'report modules without any exports',\n          type: 'boolean',\n        },\n        unusedExports: {\n          description: 'report exports without any usage',\n          type: 'boolean',\n        },\n      },\n      anyOf: [\n        {\n          properties: {\n            unusedExports: { enum: [true] },\n            src: {\n              minItems: 1,\n            },\n          },\n          required: ['unusedExports'],\n        },\n        {\n          properties: {\n            missingExports: { enum: [true] },\n          },\n          required: ['missingExports'],\n        },\n      ],\n    }],\n  },\n\n  create(context) {\n    const {\n      src,\n      ignoreExports = [],\n      missingExports,\n      unusedExports,\n    } = context.options[0] || {};\n\n    if (unusedExports) {\n      doPreparation(src, ignoreExports, context);\n    }\n\n    const file = context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename();\n\n    const checkExportPresence = (node) => {\n      if (!missingExports) {\n        return;\n      }\n\n      if (ignoredFiles.has(file)) {\n        return;\n      }\n\n      const exportCount = exportList.get(file);\n      const exportAll = exportCount.get(EXPORT_ALL_DECLARATION);\n      const namespaceImports = exportCount.get(IMPORT_NAMESPACE_SPECIFIER);\n\n      exportCount.delete(EXPORT_ALL_DECLARATION);\n      exportCount.delete(IMPORT_NAMESPACE_SPECIFIER);\n      if (exportCount.size < 1) {\n        // node.body[0] === 'undefined' only happens, if everything is commented out in the file\n        // being linted\n        context.report(node.body[0] ? node.body[0] : node, 'No exports found');\n      }\n      exportCount.set(EXPORT_ALL_DECLARATION, exportAll);\n      exportCount.set(IMPORT_NAMESPACE_SPECIFIER, namespaceImports);\n    };\n\n    const checkUsage = (node, exportedValue) => {\n      if (!unusedExports) {\n        return;\n      }\n\n      if (ignoredFiles.has(file)) {\n        return;\n      }\n\n      if (fileIsInPkg(file)) {\n        return;\n      }\n\n      if (filesOutsideSrc.has(file)) {\n        return;\n      }\n\n      // make sure file to be linted is included in source files\n      if (!srcFiles.has(file)) {\n        srcFiles = resolveFiles(getSrc(src), ignoreExports, context);\n        if (!srcFiles.has(file)) {\n          filesOutsideSrc.add(file);\n          return;\n        }\n      }\n\n      exports = exportList.get(file);\n\n      // special case: export * from\n      const exportAll = exports.get(EXPORT_ALL_DECLARATION);\n      if (typeof exportAll !== 'undefined' && exportedValue !== IMPORT_DEFAULT_SPECIFIER) {\n        if (exportAll.whereUsed.size > 0) {\n          return;\n        }\n      }\n\n      // special case: namespace import\n      const namespaceImports = exports.get(IMPORT_NAMESPACE_SPECIFIER);\n      if (typeof namespaceImports !== 'undefined') {\n        if (namespaceImports.whereUsed.size > 0) {\n          return;\n        }\n      }\n\n      // exportsList will always map any imported value of 'default' to 'ImportDefaultSpecifier'\n      const exportsKey = exportedValue === DEFAULT ? IMPORT_DEFAULT_SPECIFIER : exportedValue;\n\n      const exportStatement = exports.get(exportsKey);\n\n      const value = exportsKey === IMPORT_DEFAULT_SPECIFIER ? DEFAULT : exportsKey;\n\n      if (typeof exportStatement !== 'undefined') {\n        if (exportStatement.whereUsed.size < 1) {\n          context.report(\n            node,\n            `exported declaration '${value}' not used within other modules`,\n          );\n        }\n      } else {\n        context.report(\n          node,\n          `exported declaration '${value}' not used within other modules`,\n        );\n      }\n    };\n\n    /**\n     * only useful for tools like vscode-eslint\n     *\n     * update lists of existing exports during runtime\n     */\n    const updateExportUsage = (node) => {\n      if (ignoredFiles.has(file)) {\n        return;\n      }\n\n      let exports = exportList.get(file);\n\n      // new module has been created during runtime\n      // include it in further processing\n      if (typeof exports === 'undefined') {\n        exports = new Map();\n      }\n\n      const newExports = new Map();\n      const newExportIdentifiers = new Set();\n\n      node.body.forEach(({ type, declaration, specifiers }) => {\n        if (type === EXPORT_DEFAULT_DECLARATION) {\n          newExportIdentifiers.add(IMPORT_DEFAULT_SPECIFIER);\n        }\n        if (type === EXPORT_NAMED_DECLARATION) {\n          if (specifiers.length > 0) {\n            specifiers.forEach((specifier) => {\n              if (specifier.exported) {\n                newExportIdentifiers.add(specifier.exported.name || specifier.exported.value);\n              }\n            });\n          }\n          forEachDeclarationIdentifier(declaration, (name) => {\n            newExportIdentifiers.add(name);\n          });\n        }\n      });\n\n      // old exports exist within list of new exports identifiers: add to map of new exports\n      exports.forEach((value, key) => {\n        if (newExportIdentifiers.has(key)) {\n          newExports.set(key, value);\n        }\n      });\n\n      // new export identifiers added: add to map of new exports\n      newExportIdentifiers.forEach((key) => {\n        if (!exports.has(key)) {\n          newExports.set(key, { whereUsed: new Set() });\n        }\n      });\n\n      // preserve information about namespace imports\n      const exportAll = exports.get(EXPORT_ALL_DECLARATION);\n      let namespaceImports = exports.get(IMPORT_NAMESPACE_SPECIFIER);\n\n      if (typeof namespaceImports === 'undefined') {\n        namespaceImports = { whereUsed: new Set() };\n      }\n\n      newExports.set(EXPORT_ALL_DECLARATION, exportAll);\n      newExports.set(IMPORT_NAMESPACE_SPECIFIER, namespaceImports);\n      exportList.set(file, newExports);\n    };\n\n    /**\n     * only useful for tools like vscode-eslint\n     *\n     * update lists of existing imports during runtime\n     */\n    const updateImportUsage = (node) => {\n      if (!unusedExports) {\n        return;\n      }\n\n      let oldImportPaths = importList.get(file);\n      if (typeof oldImportPaths === 'undefined') {\n        oldImportPaths = new Map();\n      }\n\n      const oldNamespaceImports = new Set();\n      const newNamespaceImports = new Set();\n\n      const oldExportAll = new Set();\n      const newExportAll = new Set();\n\n      const oldDefaultImports = new Set();\n      const newDefaultImports = new Set();\n\n      const oldImports = new Map();\n      const newImports = new Map();\n      oldImportPaths.forEach((value, key) => {\n        if (value.has(EXPORT_ALL_DECLARATION)) {\n          oldExportAll.add(key);\n        }\n        if (value.has(IMPORT_NAMESPACE_SPECIFIER)) {\n          oldNamespaceImports.add(key);\n        }\n        if (value.has(IMPORT_DEFAULT_SPECIFIER)) {\n          oldDefaultImports.add(key);\n        }\n        value.forEach((val) => {\n          if (\n            val !== IMPORT_NAMESPACE_SPECIFIER\n            && val !== IMPORT_DEFAULT_SPECIFIER\n          ) {\n            oldImports.set(val, key);\n          }\n        });\n      });\n\n      function processDynamicImport(source) {\n        if (source.type !== 'Literal') {\n          return null;\n        }\n        const p = resolve(source.value, context);\n        if (p == null) {\n          return null;\n        }\n        newNamespaceImports.add(p);\n      }\n\n      visit(node, visitorKeyMap.get(file), {\n        ImportExpression(child) {\n          processDynamicImport(child.source);\n        },\n        CallExpression(child) {\n          if (child.callee.type === 'Import') {\n            processDynamicImport(child.arguments[0]);\n          }\n        },\n      });\n\n      node.body.forEach((astNode) => {\n        let resolvedPath;\n\n        // support for export { value } from 'module'\n        if (astNode.type === EXPORT_NAMED_DECLARATION) {\n          if (astNode.source) {\n            resolvedPath = resolve(astNode.source.raw.replace(/('|\")/g, ''), context);\n            astNode.specifiers.forEach((specifier) => {\n              const name = specifier.local.name || specifier.local.value;\n              if (name === DEFAULT) {\n                newDefaultImports.add(resolvedPath);\n              } else {\n                newImports.set(name, resolvedPath);\n              }\n            });\n          }\n        }\n\n        if (astNode.type === EXPORT_ALL_DECLARATION) {\n          resolvedPath = resolve(astNode.source.raw.replace(/('|\")/g, ''), context);\n          newExportAll.add(resolvedPath);\n        }\n\n        if (astNode.type === IMPORT_DECLARATION) {\n          resolvedPath = resolve(astNode.source.raw.replace(/('|\")/g, ''), context);\n          if (!resolvedPath) {\n            return;\n          }\n\n          if (isNodeModule(resolvedPath)) {\n            return;\n          }\n\n          if (newNamespaceImportExists(astNode.specifiers)) {\n            newNamespaceImports.add(resolvedPath);\n          }\n\n          if (newDefaultImportExists(astNode.specifiers)) {\n            newDefaultImports.add(resolvedPath);\n          }\n\n          astNode.specifiers\n            .filter((specifier) => specifier.type !== IMPORT_DEFAULT_SPECIFIER && specifier.type !== IMPORT_NAMESPACE_SPECIFIER)\n            .forEach((specifier) => {\n              newImports.set(specifier.imported.name || specifier.imported.value, resolvedPath);\n            });\n        }\n      });\n\n      newExportAll.forEach((value) => {\n        if (!oldExportAll.has(value)) {\n          let imports = oldImportPaths.get(value);\n          if (typeof imports === 'undefined') {\n            imports = new Set();\n          }\n          imports.add(EXPORT_ALL_DECLARATION);\n          oldImportPaths.set(value, imports);\n\n          let exports = exportList.get(value);\n          let currentExport;\n          if (typeof exports !== 'undefined') {\n            currentExport = exports.get(EXPORT_ALL_DECLARATION);\n          } else {\n            exports = new Map();\n            exportList.set(value, exports);\n          }\n\n          if (typeof currentExport !== 'undefined') {\n            currentExport.whereUsed.add(file);\n          } else {\n            const whereUsed = new Set();\n            whereUsed.add(file);\n            exports.set(EXPORT_ALL_DECLARATION, { whereUsed });\n          }\n        }\n      });\n\n      oldExportAll.forEach((value) => {\n        if (!newExportAll.has(value)) {\n          const imports = oldImportPaths.get(value);\n          imports.delete(EXPORT_ALL_DECLARATION);\n\n          const exports = exportList.get(value);\n          if (typeof exports !== 'undefined') {\n            const currentExport = exports.get(EXPORT_ALL_DECLARATION);\n            if (typeof currentExport !== 'undefined') {\n              currentExport.whereUsed.delete(file);\n            }\n          }\n        }\n      });\n\n      newDefaultImports.forEach((value) => {\n        if (!oldDefaultImports.has(value)) {\n          let imports = oldImportPaths.get(value);\n          if (typeof imports === 'undefined') {\n            imports = new Set();\n          }\n          imports.add(IMPORT_DEFAULT_SPECIFIER);\n          oldImportPaths.set(value, imports);\n\n          let exports = exportList.get(value);\n          let currentExport;\n          if (typeof exports !== 'undefined') {\n            currentExport = exports.get(IMPORT_DEFAULT_SPECIFIER);\n          } else {\n            exports = new Map();\n            exportList.set(value, exports);\n          }\n\n          if (typeof currentExport !== 'undefined') {\n            currentExport.whereUsed.add(file);\n          } else {\n            const whereUsed = new Set();\n            whereUsed.add(file);\n            exports.set(IMPORT_DEFAULT_SPECIFIER, { whereUsed });\n          }\n        }\n      });\n\n      oldDefaultImports.forEach((value) => {\n        if (!newDefaultImports.has(value)) {\n          const imports = oldImportPaths.get(value);\n          imports.delete(IMPORT_DEFAULT_SPECIFIER);\n\n          const exports = exportList.get(value);\n          if (typeof exports !== 'undefined') {\n            const currentExport = exports.get(IMPORT_DEFAULT_SPECIFIER);\n            if (typeof currentExport !== 'undefined') {\n              currentExport.whereUsed.delete(file);\n            }\n          }\n        }\n      });\n\n      newNamespaceImports.forEach((value) => {\n        if (!oldNamespaceImports.has(value)) {\n          let imports = oldImportPaths.get(value);\n          if (typeof imports === 'undefined') {\n            imports = new Set();\n          }\n          imports.add(IMPORT_NAMESPACE_SPECIFIER);\n          oldImportPaths.set(value, imports);\n\n          let exports = exportList.get(value);\n          let currentExport;\n          if (typeof exports !== 'undefined') {\n            currentExport = exports.get(IMPORT_NAMESPACE_SPECIFIER);\n          } else {\n            exports = new Map();\n            exportList.set(value, exports);\n          }\n\n          if (typeof currentExport !== 'undefined') {\n            currentExport.whereUsed.add(file);\n          } else {\n            const whereUsed = new Set();\n            whereUsed.add(file);\n            exports.set(IMPORT_NAMESPACE_SPECIFIER, { whereUsed });\n          }\n        }\n      });\n\n      oldNamespaceImports.forEach((value) => {\n        if (!newNamespaceImports.has(value)) {\n          const imports = oldImportPaths.get(value);\n          imports.delete(IMPORT_NAMESPACE_SPECIFIER);\n\n          const exports = exportList.get(value);\n          if (typeof exports !== 'undefined') {\n            const currentExport = exports.get(IMPORT_NAMESPACE_SPECIFIER);\n            if (typeof currentExport !== 'undefined') {\n              currentExport.whereUsed.delete(file);\n            }\n          }\n        }\n      });\n\n      newImports.forEach((value, key) => {\n        if (!oldImports.has(key)) {\n          let imports = oldImportPaths.get(value);\n          if (typeof imports === 'undefined') {\n            imports = new Set();\n          }\n          imports.add(key);\n          oldImportPaths.set(value, imports);\n\n          let exports = exportList.get(value);\n          let currentExport;\n          if (typeof exports !== 'undefined') {\n            currentExport = exports.get(key);\n          } else {\n            exports = new Map();\n            exportList.set(value, exports);\n          }\n\n          if (typeof currentExport !== 'undefined') {\n            currentExport.whereUsed.add(file);\n          } else {\n            const whereUsed = new Set();\n            whereUsed.add(file);\n            exports.set(key, { whereUsed });\n          }\n        }\n      });\n\n      oldImports.forEach((value, key) => {\n        if (!newImports.has(key)) {\n          const imports = oldImportPaths.get(value);\n          imports.delete(key);\n\n          const exports = exportList.get(value);\n          if (typeof exports !== 'undefined') {\n            const currentExport = exports.get(key);\n            if (typeof currentExport !== 'undefined') {\n              currentExport.whereUsed.delete(file);\n            }\n          }\n        }\n      });\n    };\n\n    return {\n      'Program:exit'(node) {\n        updateExportUsage(node);\n        updateImportUsage(node);\n        checkExportPresence(node);\n      },\n      ExportDefaultDeclaration(node) {\n        checkUsage(node, IMPORT_DEFAULT_SPECIFIER);\n      },\n      ExportNamedDeclaration(node) {\n        node.specifiers.forEach((specifier) => {\n          checkUsage(specifier, specifier.exported.name || specifier.exported.value);\n        });\n        forEachDeclarationIdentifier(node.declaration, (name) => {\n          checkUsage(node, name);\n        });\n      },\n    };\n  },\n};\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/rules/no-unused-modules.js"],"names":["FileEnumerator","listFilesToProcess","require","e","originalListFilesToProcess","src","extensions","patterns","concat","pattern","map","extension","test","Array","from","iterateFiles","filePath","ignored","filename","EXPORT_DEFAULT_DECLARATION","EXPORT_NAMED_DECLARATION","EXPORT_ALL_DECLARATION","IMPORT_DECLARATION","IMPORT_NAMESPACE_SPECIFIER","IMPORT_DEFAULT_SPECIFIER","VARIABLE_DECLARATION","FUNCTION_DECLARATION","CLASS_DECLARATION","IDENTIFIER","OBJECT_PATTERN","ARRAY_PATTERN","TS_INTERFACE_DECLARATION","TS_TYPE_ALIAS_DECLARATION","TS_ENUM_DECLARATION","DEFAULT","forEachDeclarationIdentifier","declaration","cb","type","id","name","declarations","forEach","elements","importList","Map","exportList","visitorKeyMap","ignoredFiles","Set","filesOutsideSrc","isNodeModule","path","resolveFiles","ignoreExports","context","settings","srcFileList","ignoredFilesList","add","prepareImportsAndExports","srcFiles","exportAll","file","exports","imports","currentExports","Exports","get","dependencies","reexports","localImportList","namespace","visitorKeys","set","currentExportAll","getDependency","dependency","value","key","whereUsed","reexport","getImport","localImport","currentValue","local","importedSpecifiers","specifier","has","val","currentExport","determineUsage","listValue","listKey","currentImport","exportStatement","getSrc","process","cwd","lastPrepareKey","doPreparation","prepareKey","JSON","stringify","sort","clear","newNamespaceImportExists","specifiers","some","newDefaultImportExists","fileIsInPkg","pkg","basePath","checkPkgFieldString","pkgField","checkPkgFieldObject","pkgFieldFiles","checkPkgField","bin","browser","main","module","meta","docs","category","description","url","schema","properties","uniqueItems","items","minLength","missingExports","unusedExports","anyOf","minItems","required","create","options","getPhysicalFilename","getFilename","checkExportPresence","node","exportCount","namespaceImports","size","report","body","checkUsage","exportedValue","exportsKey","updateExportUsage","newExports","newExportIdentifiers","length","exported","updateImportUsage","oldImportPaths","oldNamespaceImports","newNamespaceImports","oldExportAll","newExportAll","oldDefaultImports","newDefaultImports","oldImports","newImports","processDynamicImport","source","p","ImportExpression","child","CallExpression","callee","arguments","astNode","resolvedPath","raw","replace","filter","imported","ExportDefaultDeclaration","ExportNamedDeclaration"],"mappings":"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","file":"no-unused-modules.js","sourcesContent":["/**\n * @fileOverview Ensures that modules contain exports and/or all\n * modules are consumed within other modules.\n * @author René Fermann\n */\n\nimport { getFileExtensions } from 'eslint-module-utils/ignore';\nimport resolve from 'eslint-module-utils/resolve';\nimport visit from 'eslint-module-utils/visit';\nimport { dirname, join } from 'path';\nimport readPkgUp from 'eslint-module-utils/readPkgUp';\nimport values from 'object.values';\nimport includes from 'array-includes';\nimport flatMap from 'array.prototype.flatmap';\n\nimport Exports, { recursivePatternCapture } from '../ExportMap';\nimport docsUrl from '../docsUrl';\n\nlet FileEnumerator;\nlet listFilesToProcess;\n\ntry {\n  ({ FileEnumerator } = require('eslint/use-at-your-own-risk'));\n} catch (e) {\n  try {\n    // has been moved to eslint/lib/cli-engine/file-enumerator in version 6\n    ({ FileEnumerator } = require('eslint/lib/cli-engine/file-enumerator'));\n  } catch (e) {\n    try {\n      // eslint/lib/util/glob-util has been moved to eslint/lib/util/glob-utils with version 5.3\n      const { listFilesToProcess: originalListFilesToProcess } = require('eslint/lib/util/glob-utils');\n\n      // Prevent passing invalid options (extensions array) to old versions of the function.\n      // https://github.com/eslint/eslint/blob/v5.16.0/lib/util/glob-utils.js#L178-L280\n      // https://github.com/eslint/eslint/blob/v5.2.0/lib/util/glob-util.js#L174-L269\n      listFilesToProcess = function (src, extensions) {\n        return originalListFilesToProcess(src, {\n          extensions,\n        });\n      };\n    } catch (e) {\n      const { listFilesToProcess: originalListFilesToProcess } = require('eslint/lib/util/glob-util');\n\n      listFilesToProcess = function (src, extensions) {\n        const patterns = src.concat(flatMap(src, (pattern) => extensions.map((extension) => (/\\*\\*|\\*\\./).test(pattern) ? pattern : `${pattern}/**/*${extension}`)));\n\n        return originalListFilesToProcess(patterns);\n      };\n    }\n  }\n}\n\nif (FileEnumerator) {\n  listFilesToProcess = function (src, extensions) {\n    const e = new FileEnumerator({\n      extensions,\n    });\n\n    return Array.from(e.iterateFiles(src), ({ filePath, ignored }) => ({\n      ignored,\n      filename: filePath,\n    }));\n  };\n}\n\nconst EXPORT_DEFAULT_DECLARATION = 'ExportDefaultDeclaration';\nconst EXPORT_NAMED_DECLARATION = 'ExportNamedDeclaration';\nconst EXPORT_ALL_DECLARATION = 'ExportAllDeclaration';\nconst IMPORT_DECLARATION = 'ImportDeclaration';\nconst IMPORT_NAMESPACE_SPECIFIER = 'ImportNamespaceSpecifier';\nconst IMPORT_DEFAULT_SPECIFIER = 'ImportDefaultSpecifier';\nconst VARIABLE_DECLARATION = 'VariableDeclaration';\nconst FUNCTION_DECLARATION = 'FunctionDeclaration';\nconst CLASS_DECLARATION = 'ClassDeclaration';\nconst IDENTIFIER = 'Identifier';\nconst OBJECT_PATTERN = 'ObjectPattern';\nconst ARRAY_PATTERN = 'ArrayPattern';\nconst TS_INTERFACE_DECLARATION = 'TSInterfaceDeclaration';\nconst TS_TYPE_ALIAS_DECLARATION = 'TSTypeAliasDeclaration';\nconst TS_ENUM_DECLARATION = 'TSEnumDeclaration';\nconst DEFAULT = 'default';\n\nfunction forEachDeclarationIdentifier(declaration, cb) {\n  if (declaration) {\n    if (\n      declaration.type === FUNCTION_DECLARATION\n      || declaration.type === CLASS_DECLARATION\n      || declaration.type === TS_INTERFACE_DECLARATION\n      || declaration.type === TS_TYPE_ALIAS_DECLARATION\n      || declaration.type === TS_ENUM_DECLARATION\n    ) {\n      cb(declaration.id.name);\n    } else if (declaration.type === VARIABLE_DECLARATION) {\n      declaration.declarations.forEach(({ id }) => {\n        if (id.type === OBJECT_PATTERN) {\n          recursivePatternCapture(id, (pattern) => {\n            if (pattern.type === IDENTIFIER) {\n              cb(pattern.name);\n            }\n          });\n        } else if (id.type === ARRAY_PATTERN) {\n          id.elements.forEach(({ name }) => {\n            cb(name);\n          });\n        } else {\n          cb(id.name);\n        }\n      });\n    }\n  }\n}\n\n/**\n * List of imports per file.\n *\n * Represented by a two-level Map to a Set of identifiers. The upper-level Map\n * keys are the paths to the modules containing the imports, while the\n * lower-level Map keys are the paths to the files which are being imported\n * from. Lastly, the Set of identifiers contains either names being imported\n * or a special AST node name listed above (e.g ImportDefaultSpecifier).\n *\n * For example, if we have a file named foo.js containing:\n *\n *   import { o2 } from './bar.js';\n *\n * Then we will have a structure that looks like:\n *\n *   Map { 'foo.js' => Map { 'bar.js' => Set { 'o2' } } }\n *\n * @type {Map<string, Map<string, Set<string>>>}\n */\nconst importList = new Map();\n\n/**\n * List of exports per file.\n *\n * Represented by a two-level Map to an object of metadata. The upper-level Map\n * keys are the paths to the modules containing the exports, while the\n * lower-level Map keys are the specific identifiers or special AST node names\n * being exported. The leaf-level metadata object at the moment only contains a\n * `whereUsed` property, which contains a Set of paths to modules that import\n * the name.\n *\n * For example, if we have a file named bar.js containing the following exports:\n *\n *   const o2 = 'bar';\n *   export { o2 };\n *\n * And a file named foo.js containing the following import:\n *\n *   import { o2 } from './bar.js';\n *\n * Then we will have a structure that looks like:\n *\n *   Map { 'bar.js' => Map { 'o2' => { whereUsed: Set { 'foo.js' } } } }\n *\n * @type {Map<string, Map<string, object>>}\n */\nconst exportList = new Map();\n\nconst visitorKeyMap = new Map();\n\nconst ignoredFiles = new Set();\nconst filesOutsideSrc = new Set();\n\nconst isNodeModule = (path) => (/\\/(node_modules)\\//).test(path);\n\n/**\n * read all files matching the patterns in src and ignoreExports\n *\n * return all files matching src pattern, which are not matching the ignoreExports pattern\n */\nconst resolveFiles = (src, ignoreExports, context) => {\n  const extensions = Array.from(getFileExtensions(context.settings));\n\n  const srcFileList = listFilesToProcess(src, extensions);\n\n  // prepare list of ignored files\n  const ignoredFilesList = listFilesToProcess(ignoreExports, extensions);\n  ignoredFilesList.forEach(({ filename }) => ignoredFiles.add(filename));\n\n  // prepare list of source files, don't consider files from node_modules\n\n  return new Set(\n    flatMap(srcFileList, ({ filename }) => isNodeModule(filename) ? [] : filename),\n  );\n};\n\n/**\n * parse all source files and build up 2 maps containing the existing imports and exports\n */\nconst prepareImportsAndExports = (srcFiles, context) => {\n  const exportAll = new Map();\n  srcFiles.forEach((file) => {\n    const exports = new Map();\n    const imports = new Map();\n    const currentExports = Exports.get(file, context);\n    if (currentExports) {\n      const {\n        dependencies,\n        reexports,\n        imports: localImportList,\n        namespace,\n        visitorKeys,\n      } = currentExports;\n\n      visitorKeyMap.set(file, visitorKeys);\n      // dependencies === export * from\n      const currentExportAll = new Set();\n      dependencies.forEach((getDependency) => {\n        const dependency = getDependency();\n        if (dependency === null) {\n          return;\n        }\n\n        currentExportAll.add(dependency.path);\n      });\n      exportAll.set(file, currentExportAll);\n\n      reexports.forEach((value, key) => {\n        if (key === DEFAULT) {\n          exports.set(IMPORT_DEFAULT_SPECIFIER, { whereUsed: new Set() });\n        } else {\n          exports.set(key, { whereUsed: new Set() });\n        }\n        const reexport =  value.getImport();\n        if (!reexport) {\n          return;\n        }\n        let localImport = imports.get(reexport.path);\n        let currentValue;\n        if (value.local === DEFAULT) {\n          currentValue = IMPORT_DEFAULT_SPECIFIER;\n        } else {\n          currentValue = value.local;\n        }\n        if (typeof localImport !== 'undefined') {\n          localImport = new Set([...localImport, currentValue]);\n        } else {\n          localImport = new Set([currentValue]);\n        }\n        imports.set(reexport.path, localImport);\n      });\n\n      localImportList.forEach((value, key) => {\n        if (isNodeModule(key)) {\n          return;\n        }\n        const localImport = imports.get(key) || new Set();\n        value.declarations.forEach(({ importedSpecifiers }) => {\n          importedSpecifiers.forEach((specifier) => {\n            localImport.add(specifier);\n          });\n        });\n        imports.set(key, localImport);\n      });\n      importList.set(file, imports);\n\n      // build up export list only, if file is not ignored\n      if (ignoredFiles.has(file)) {\n        return;\n      }\n      namespace.forEach((value, key) => {\n        if (key === DEFAULT) {\n          exports.set(IMPORT_DEFAULT_SPECIFIER, { whereUsed: new Set() });\n        } else {\n          exports.set(key, { whereUsed: new Set() });\n        }\n      });\n    }\n    exports.set(EXPORT_ALL_DECLARATION, { whereUsed: new Set() });\n    exports.set(IMPORT_NAMESPACE_SPECIFIER, { whereUsed: new Set() });\n    exportList.set(file, exports);\n  });\n  exportAll.forEach((value, key) => {\n    value.forEach((val) => {\n      const currentExports = exportList.get(val);\n      if (currentExports) {\n        const currentExport = currentExports.get(EXPORT_ALL_DECLARATION);\n        currentExport.whereUsed.add(key);\n      }\n    });\n  });\n};\n\n/**\n * traverse through all imports and add the respective path to the whereUsed-list\n * of the corresponding export\n */\nconst determineUsage = () => {\n  importList.forEach((listValue, listKey) => {\n    listValue.forEach((value, key) => {\n      const exports = exportList.get(key);\n      if (typeof exports !== 'undefined') {\n        value.forEach((currentImport) => {\n          let specifier;\n          if (currentImport === IMPORT_NAMESPACE_SPECIFIER) {\n            specifier = IMPORT_NAMESPACE_SPECIFIER;\n          } else if (currentImport === IMPORT_DEFAULT_SPECIFIER) {\n            specifier = IMPORT_DEFAULT_SPECIFIER;\n          } else {\n            specifier = currentImport;\n          }\n          if (typeof specifier !== 'undefined') {\n            const exportStatement = exports.get(specifier);\n            if (typeof exportStatement !== 'undefined') {\n              const { whereUsed } = exportStatement;\n              whereUsed.add(listKey);\n              exports.set(specifier, { whereUsed });\n            }\n          }\n        });\n      }\n    });\n  });\n};\n\nconst getSrc = (src) => {\n  if (src) {\n    return src;\n  }\n  return [process.cwd()];\n};\n\n/**\n * prepare the lists of existing imports and exports - should only be executed once at\n * the start of a new eslint run\n */\nlet srcFiles;\nlet lastPrepareKey;\nconst doPreparation = (src, ignoreExports, context) => {\n  const prepareKey = JSON.stringify({\n    src: (src || []).sort(),\n    ignoreExports: (ignoreExports || []).sort(),\n    extensions: Array.from(getFileExtensions(context.settings)).sort(),\n  });\n  if (prepareKey === lastPrepareKey) {\n    return;\n  }\n\n  importList.clear();\n  exportList.clear();\n  ignoredFiles.clear();\n  filesOutsideSrc.clear();\n\n  srcFiles = resolveFiles(getSrc(src), ignoreExports, context);\n  prepareImportsAndExports(srcFiles, context);\n  determineUsage();\n  lastPrepareKey = prepareKey;\n};\n\nconst newNamespaceImportExists = (specifiers) => specifiers.some(({ type }) => type === IMPORT_NAMESPACE_SPECIFIER);\n\nconst newDefaultImportExists = (specifiers) => specifiers.some(({ type }) => type === IMPORT_DEFAULT_SPECIFIER);\n\nconst fileIsInPkg = (file) => {\n  const { path, pkg } = readPkgUp({ cwd: file });\n  const basePath = dirname(path);\n\n  const checkPkgFieldString = (pkgField) => {\n    if (join(basePath, pkgField) === file) {\n      return true;\n    }\n  };\n\n  const checkPkgFieldObject = (pkgField) => {\n    const pkgFieldFiles = flatMap(values(pkgField), (value) => typeof value === 'boolean' ? [] : join(basePath, value));\n\n    if (includes(pkgFieldFiles, file)) {\n      return true;\n    }\n  };\n\n  const checkPkgField = (pkgField) => {\n    if (typeof pkgField === 'string') {\n      return checkPkgFieldString(pkgField);\n    }\n\n    if (typeof pkgField === 'object') {\n      return checkPkgFieldObject(pkgField);\n    }\n  };\n\n  if (pkg.private === true) {\n    return false;\n  }\n\n  if (pkg.bin) {\n    if (checkPkgField(pkg.bin)) {\n      return true;\n    }\n  }\n\n  if (pkg.browser) {\n    if (checkPkgField(pkg.browser)) {\n      return true;\n    }\n  }\n\n  if (pkg.main) {\n    if (checkPkgFieldString(pkg.main)) {\n      return true;\n    }\n  }\n\n  return false;\n};\n\nmodule.exports = {\n  meta: {\n    type: 'suggestion',\n    docs: {\n      category: 'Helpful warnings',\n      description: 'Forbid modules without exports, or exports without matching import in another module.',\n      url: docsUrl('no-unused-modules'),\n    },\n    schema: [{\n      properties: {\n        src: {\n          description: 'files/paths to be analyzed (only for unused exports)',\n          type: 'array',\n          uniqueItems: true,\n          items: {\n            type: 'string',\n            minLength: 1,\n          },\n        },\n        ignoreExports: {\n          description: 'files/paths for which unused exports will not be reported (e.g module entry points)',\n          type: 'array',\n          uniqueItems: true,\n          items: {\n            type: 'string',\n            minLength: 1,\n          },\n        },\n        missingExports: {\n          description: 'report modules without any exports',\n          type: 'boolean',\n        },\n        unusedExports: {\n          description: 'report exports without any usage',\n          type: 'boolean',\n        },\n      },\n      anyOf: [\n        {\n          properties: {\n            unusedExports: { enum: [true] },\n            src: {\n              minItems: 1,\n            },\n          },\n          required: ['unusedExports'],\n        },\n        {\n          properties: {\n            missingExports: { enum: [true] },\n          },\n          required: ['missingExports'],\n        },\n      ],\n    }],\n  },\n\n  create(context) {\n    const {\n      src,\n      ignoreExports = [],\n      missingExports,\n      unusedExports,\n    } = context.options[0] || {};\n\n    if (unusedExports) {\n      doPreparation(src, ignoreExports, context);\n    }\n\n    const file = context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename();\n\n    const checkExportPresence = (node) => {\n      if (!missingExports) {\n        return;\n      }\n\n      if (ignoredFiles.has(file)) {\n        return;\n      }\n\n      const exportCount = exportList.get(file);\n      const exportAll = exportCount.get(EXPORT_ALL_DECLARATION);\n      const namespaceImports = exportCount.get(IMPORT_NAMESPACE_SPECIFIER);\n\n      exportCount.delete(EXPORT_ALL_DECLARATION);\n      exportCount.delete(IMPORT_NAMESPACE_SPECIFIER);\n      if (exportCount.size < 1) {\n        // node.body[0] === 'undefined' only happens, if everything is commented out in the file\n        // being linted\n        context.report(node.body[0] ? node.body[0] : node, 'No exports found');\n      }\n      exportCount.set(EXPORT_ALL_DECLARATION, exportAll);\n      exportCount.set(IMPORT_NAMESPACE_SPECIFIER, namespaceImports);\n    };\n\n    const checkUsage = (node, exportedValue) => {\n      if (!unusedExports) {\n        return;\n      }\n\n      if (ignoredFiles.has(file)) {\n        return;\n      }\n\n      if (fileIsInPkg(file)) {\n        return;\n      }\n\n      if (filesOutsideSrc.has(file)) {\n        return;\n      }\n\n      // make sure file to be linted is included in source files\n      if (!srcFiles.has(file)) {\n        srcFiles = resolveFiles(getSrc(src), ignoreExports, context);\n        if (!srcFiles.has(file)) {\n          filesOutsideSrc.add(file);\n          return;\n        }\n      }\n\n      exports = exportList.get(file);\n\n      // special case: export * from\n      const exportAll = exports.get(EXPORT_ALL_DECLARATION);\n      if (typeof exportAll !== 'undefined' && exportedValue !== IMPORT_DEFAULT_SPECIFIER) {\n        if (exportAll.whereUsed.size > 0) {\n          return;\n        }\n      }\n\n      // special case: namespace import\n      const namespaceImports = exports.get(IMPORT_NAMESPACE_SPECIFIER);\n      if (typeof namespaceImports !== 'undefined') {\n        if (namespaceImports.whereUsed.size > 0) {\n          return;\n        }\n      }\n\n      // exportsList will always map any imported value of 'default' to 'ImportDefaultSpecifier'\n      const exportsKey = exportedValue === DEFAULT ? IMPORT_DEFAULT_SPECIFIER : exportedValue;\n\n      const exportStatement = exports.get(exportsKey);\n\n      const value = exportsKey === IMPORT_DEFAULT_SPECIFIER ? DEFAULT : exportsKey;\n\n      if (typeof exportStatement !== 'undefined') {\n        if (exportStatement.whereUsed.size < 1) {\n          context.report(\n            node,\n            `exported declaration '${value}' not used within other modules`,\n          );\n        }\n      } else {\n        context.report(\n          node,\n          `exported declaration '${value}' not used within other modules`,\n        );\n      }\n    };\n\n    /**\n     * only useful for tools like vscode-eslint\n     *\n     * update lists of existing exports during runtime\n     */\n    const updateExportUsage = (node) => {\n      if (ignoredFiles.has(file)) {\n        return;\n      }\n\n      let exports = exportList.get(file);\n\n      // new module has been created during runtime\n      // include it in further processing\n      if (typeof exports === 'undefined') {\n        exports = new Map();\n      }\n\n      const newExports = new Map();\n      const newExportIdentifiers = new Set();\n\n      node.body.forEach(({ type, declaration, specifiers }) => {\n        if (type === EXPORT_DEFAULT_DECLARATION) {\n          newExportIdentifiers.add(IMPORT_DEFAULT_SPECIFIER);\n        }\n        if (type === EXPORT_NAMED_DECLARATION) {\n          if (specifiers.length > 0) {\n            specifiers.forEach((specifier) => {\n              if (specifier.exported) {\n                newExportIdentifiers.add(specifier.exported.name || specifier.exported.value);\n              }\n            });\n          }\n          forEachDeclarationIdentifier(declaration, (name) => {\n            newExportIdentifiers.add(name);\n          });\n        }\n      });\n\n      // old exports exist within list of new exports identifiers: add to map of new exports\n      exports.forEach((value, key) => {\n        if (newExportIdentifiers.has(key)) {\n          newExports.set(key, value);\n        }\n      });\n\n      // new export identifiers added: add to map of new exports\n      newExportIdentifiers.forEach((key) => {\n        if (!exports.has(key)) {\n          newExports.set(key, { whereUsed: new Set() });\n        }\n      });\n\n      // preserve information about namespace imports\n      const exportAll = exports.get(EXPORT_ALL_DECLARATION);\n      let namespaceImports = exports.get(IMPORT_NAMESPACE_SPECIFIER);\n\n      if (typeof namespaceImports === 'undefined') {\n        namespaceImports = { whereUsed: new Set() };\n      }\n\n      newExports.set(EXPORT_ALL_DECLARATION, exportAll);\n      newExports.set(IMPORT_NAMESPACE_SPECIFIER, namespaceImports);\n      exportList.set(file, newExports);\n    };\n\n    /**\n     * only useful for tools like vscode-eslint\n     *\n     * update lists of existing imports during runtime\n     */\n    const updateImportUsage = (node) => {\n      if (!unusedExports) {\n        return;\n      }\n\n      let oldImportPaths = importList.get(file);\n      if (typeof oldImportPaths === 'undefined') {\n        oldImportPaths = new Map();\n      }\n\n      const oldNamespaceImports = new Set();\n      const newNamespaceImports = new Set();\n\n      const oldExportAll = new Set();\n      const newExportAll = new Set();\n\n      const oldDefaultImports = new Set();\n      const newDefaultImports = new Set();\n\n      const oldImports = new Map();\n      const newImports = new Map();\n      oldImportPaths.forEach((value, key) => {\n        if (value.has(EXPORT_ALL_DECLARATION)) {\n          oldExportAll.add(key);\n        }\n        if (value.has(IMPORT_NAMESPACE_SPECIFIER)) {\n          oldNamespaceImports.add(key);\n        }\n        if (value.has(IMPORT_DEFAULT_SPECIFIER)) {\n          oldDefaultImports.add(key);\n        }\n        value.forEach((val) => {\n          if (\n            val !== IMPORT_NAMESPACE_SPECIFIER\n            && val !== IMPORT_DEFAULT_SPECIFIER\n          ) {\n            oldImports.set(val, key);\n          }\n        });\n      });\n\n      function processDynamicImport(source) {\n        if (source.type !== 'Literal') {\n          return null;\n        }\n        const p = resolve(source.value, context);\n        if (p == null) {\n          return null;\n        }\n        newNamespaceImports.add(p);\n      }\n\n      visit(node, visitorKeyMap.get(file), {\n        ImportExpression(child) {\n          processDynamicImport(child.source);\n        },\n        CallExpression(child) {\n          if (child.callee.type === 'Import') {\n            processDynamicImport(child.arguments[0]);\n          }\n        },\n      });\n\n      node.body.forEach((astNode) => {\n        let resolvedPath;\n\n        // support for export { value } from 'module'\n        if (astNode.type === EXPORT_NAMED_DECLARATION) {\n          if (astNode.source) {\n            resolvedPath = resolve(astNode.source.raw.replace(/('|\")/g, ''), context);\n            astNode.specifiers.forEach((specifier) => {\n              const name = specifier.local.name || specifier.local.value;\n              if (name === DEFAULT) {\n                newDefaultImports.add(resolvedPath);\n              } else {\n                newImports.set(name, resolvedPath);\n              }\n            });\n          }\n        }\n\n        if (astNode.type === EXPORT_ALL_DECLARATION) {\n          resolvedPath = resolve(astNode.source.raw.replace(/('|\")/g, ''), context);\n          newExportAll.add(resolvedPath);\n        }\n\n        if (astNode.type === IMPORT_DECLARATION) {\n          resolvedPath = resolve(astNode.source.raw.replace(/('|\")/g, ''), context);\n          if (!resolvedPath) {\n            return;\n          }\n\n          if (isNodeModule(resolvedPath)) {\n            return;\n          }\n\n          if (newNamespaceImportExists(astNode.specifiers)) {\n            newNamespaceImports.add(resolvedPath);\n          }\n\n          if (newDefaultImportExists(astNode.specifiers)) {\n            newDefaultImports.add(resolvedPath);\n          }\n\n          astNode.specifiers\n            .filter((specifier) => specifier.type !== IMPORT_DEFAULT_SPECIFIER && specifier.type !== IMPORT_NAMESPACE_SPECIFIER)\n            .forEach((specifier) => {\n              newImports.set(specifier.imported.name || specifier.imported.value, resolvedPath);\n            });\n        }\n      });\n\n      newExportAll.forEach((value) => {\n        if (!oldExportAll.has(value)) {\n          let imports = oldImportPaths.get(value);\n          if (typeof imports === 'undefined') {\n            imports = new Set();\n          }\n          imports.add(EXPORT_ALL_DECLARATION);\n          oldImportPaths.set(value, imports);\n\n          let exports = exportList.get(value);\n          let currentExport;\n          if (typeof exports !== 'undefined') {\n            currentExport = exports.get(EXPORT_ALL_DECLARATION);\n          } else {\n            exports = new Map();\n            exportList.set(value, exports);\n          }\n\n          if (typeof currentExport !== 'undefined') {\n            currentExport.whereUsed.add(file);\n          } else {\n            const whereUsed = new Set();\n            whereUsed.add(file);\n            exports.set(EXPORT_ALL_DECLARATION, { whereUsed });\n          }\n        }\n      });\n\n      oldExportAll.forEach((value) => {\n        if (!newExportAll.has(value)) {\n          const imports = oldImportPaths.get(value);\n          imports.delete(EXPORT_ALL_DECLARATION);\n\n          const exports = exportList.get(value);\n          if (typeof exports !== 'undefined') {\n            const currentExport = exports.get(EXPORT_ALL_DECLARATION);\n            if (typeof currentExport !== 'undefined') {\n              currentExport.whereUsed.delete(file);\n            }\n          }\n        }\n      });\n\n      newDefaultImports.forEach((value) => {\n        if (!oldDefaultImports.has(value)) {\n          let imports = oldImportPaths.get(value);\n          if (typeof imports === 'undefined') {\n            imports = new Set();\n          }\n          imports.add(IMPORT_DEFAULT_SPECIFIER);\n          oldImportPaths.set(value, imports);\n\n          let exports = exportList.get(value);\n          let currentExport;\n          if (typeof exports !== 'undefined') {\n            currentExport = exports.get(IMPORT_DEFAULT_SPECIFIER);\n          } else {\n            exports = new Map();\n            exportList.set(value, exports);\n          }\n\n          if (typeof currentExport !== 'undefined') {\n            currentExport.whereUsed.add(file);\n          } else {\n            const whereUsed = new Set();\n            whereUsed.add(file);\n            exports.set(IMPORT_DEFAULT_SPECIFIER, { whereUsed });\n          }\n        }\n      });\n\n      oldDefaultImports.forEach((value) => {\n        if (!newDefaultImports.has(value)) {\n          const imports = oldImportPaths.get(value);\n          imports.delete(IMPORT_DEFAULT_SPECIFIER);\n\n          const exports = exportList.get(value);\n          if (typeof exports !== 'undefined') {\n            const currentExport = exports.get(IMPORT_DEFAULT_SPECIFIER);\n            if (typeof currentExport !== 'undefined') {\n              currentExport.whereUsed.delete(file);\n            }\n          }\n        }\n      });\n\n      newNamespaceImports.forEach((value) => {\n        if (!oldNamespaceImports.has(value)) {\n          let imports = oldImportPaths.get(value);\n          if (typeof imports === 'undefined') {\n            imports = new Set();\n          }\n          imports.add(IMPORT_NAMESPACE_SPECIFIER);\n          oldImportPaths.set(value, imports);\n\n          let exports = exportList.get(value);\n          let currentExport;\n          if (typeof exports !== 'undefined') {\n            currentExport = exports.get(IMPORT_NAMESPACE_SPECIFIER);\n          } else {\n            exports = new Map();\n            exportList.set(value, exports);\n          }\n\n          if (typeof currentExport !== 'undefined') {\n            currentExport.whereUsed.add(file);\n          } else {\n            const whereUsed = new Set();\n            whereUsed.add(file);\n            exports.set(IMPORT_NAMESPACE_SPECIFIER, { whereUsed });\n          }\n        }\n      });\n\n      oldNamespaceImports.forEach((value) => {\n        if (!newNamespaceImports.has(value)) {\n          const imports = oldImportPaths.get(value);\n          imports.delete(IMPORT_NAMESPACE_SPECIFIER);\n\n          const exports = exportList.get(value);\n          if (typeof exports !== 'undefined') {\n            const currentExport = exports.get(IMPORT_NAMESPACE_SPECIFIER);\n            if (typeof currentExport !== 'undefined') {\n              currentExport.whereUsed.delete(file);\n            }\n          }\n        }\n      });\n\n      newImports.forEach((value, key) => {\n        if (!oldImports.has(key)) {\n          let imports = oldImportPaths.get(value);\n          if (typeof imports === 'undefined') {\n            imports = new Set();\n          }\n          imports.add(key);\n          oldImportPaths.set(value, imports);\n\n          let exports = exportList.get(value);\n          let currentExport;\n          if (typeof exports !== 'undefined') {\n            currentExport = exports.get(key);\n          } else {\n            exports = new Map();\n            exportList.set(value, exports);\n          }\n\n          if (typeof currentExport !== 'undefined') {\n            currentExport.whereUsed.add(file);\n          } else {\n            const whereUsed = new Set();\n            whereUsed.add(file);\n            exports.set(key, { whereUsed });\n          }\n        }\n      });\n\n      oldImports.forEach((value, key) => {\n        if (!newImports.has(key)) {\n          const imports = oldImportPaths.get(value);\n          imports.delete(key);\n\n          const exports = exportList.get(value);\n          if (typeof exports !== 'undefined') {\n            const currentExport = exports.get(key);\n            if (typeof currentExport !== 'undefined') {\n              currentExport.whereUsed.delete(file);\n            }\n          }\n        }\n      });\n    };\n\n    return {\n      'Program:exit'(node) {\n        updateExportUsage(node);\n        updateImportUsage(node);\n        checkExportPresence(node);\n      },\n      ExportDefaultDeclaration(node) {\n        checkUsage(node, IMPORT_DEFAULT_SPECIFIER);\n      },\n      ExportNamedDeclaration(node) {\n        node.specifiers.forEach((specifier) => {\n          checkUsage(specifier, specifier.exported.name || specifier.exported.value);\n        });\n        forEachDeclarationIdentifier(node.declaration, (name) => {\n          checkUsage(node, name);\n        });\n      },\n    };\n  },\n};\n"]} \ No newline at end of file diff --git a/node_modules/eslint-plugin-import/package.json b/node_modules/eslint-plugin-import/package.json index bd92f4f692..5c0af48543 100644 --- a/node_modules/eslint-plugin-import/package.json +++ b/node_modules/eslint-plugin-import/package.json @@ -1,6 +1,6 @@ { "name": "eslint-plugin-import", - "version": "2.29.0", + "version": "2.29.1", "description": "Import with sanity.", "engines": { "node": ">=4" @@ -69,11 +69,11 @@ "babel-preset-flow": "^6.23.0", "babel-register": "^6.26.0", "babylon": "^6.18.0", - "chai": "^4.3.7", + "chai": "^4.3.10", "cross-env": "^4.0.0", "escope": "^3.6.0", "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", - "eslint-doc-generator": "^1.4.3", + "eslint-doc-generator": "^1.6.1", "eslint-import-resolver-node": "file:./resolvers/node", "eslint-import-resolver-typescript": "^1.0.2 || ^1.1.1", "eslint-import-resolver-webpack": "file:./resolvers/webpack", @@ -88,7 +88,7 @@ "jackspeak": "=2.1.1", "linklocal": "^2.8.2", "lodash.isarray": "^4.0.0", - "markdownlint-cli": "^0.35.0", + "markdownlint-cli": "^0.38.0", "mocha": "^3.5.3", "npm-which": "^3.0.1", "nyc": "^11.9.0", @@ -119,6 +119,6 @@ "object.groupby": "^1.0.1", "object.values": "^1.1.7", "semver": "^6.3.1", - "tsconfig-paths": "^3.14.2" + "tsconfig-paths": "^3.15.0" } } diff --git a/node_modules/eslint/README.md b/node_modules/eslint/README.md index 5379c31949..227d40c7cc 100644 --- a/node_modules/eslint/README.md +++ b/node_modules/eslint/README.md @@ -103,7 +103,7 @@ We are now at or near 100% compatibility with JSCS. If you try ESLint and believ ### Does Prettier replace ESLint? -No, ESLint does both traditional linting (looking for problematic patterns) and style checking (enforcement of conventions). You can use ESLint for everything, or you can combine both using Prettier to format your code and ESLint to catch possible errors. +No, ESLint and Prettier have diffent jobs: ESLint is a linter (looking for problematic patterns) and Prettier is a code formatter. Using both tools is common, refer to [Prettier's documentation](https://prettier.io/docs/en/install#eslint-and-other-linters) to learn how to configure them to work well with each other. ### Why can't ESLint find my plugins? @@ -209,12 +209,12 @@ The people who manage releases, review feature requests, and meet regularly to e
-
+Nicholas C. Zakas's Avatar
Nicholas C. Zakas 		-
+Milos Djermanovic's Avatar
Milos Djermanovic
@@ -225,12 +225,12 @@ The people who review and implement new features.
-
+唯然's Avatar
唯然 		-
+Nitin Kumar's Avatar
Nitin Kumar
@@ -241,22 +241,22 @@ The people who review and fix bugs and help triage issues.
-
+Bryan Mishkin's Avatar
Bryan Mishkin 		-
+Francesco Trotta's Avatar
Francesco Trotta 		-
+Yosuke Ota's Avatar
Yosuke Ota 		-
+Tanuj Kanti's Avatar
Tanuj Kanti
@@ -267,17 +267,17 @@ Team members who focus specifically on eslint.org
-
+Amaresh S M's Avatar
Amaresh S M 		-
+Strek's Avatar
Strek 		-
+Percy Ma's Avatar
Percy Ma
@@ -293,8 +293,8 @@ The following companies, organizations, and individuals support ESLint's ongoing

Platinum Sponsors

Chrome Frameworks Fund Automattic

Gold Sponsors

Salesforce Airbnb

Silver Sponsors

-

Liftoff American Express

Bronze Sponsors

-

ThemeIsle Anagram Solver Icons8 Discord Transloadit Ignition HeroCoders

+

Liftoff American Express Workleap

Bronze Sponsors

+

ThemeIsle Anagram Solver Icons8 Discord Transloadit Ignition Nx HeroCoders

## Technology Sponsors diff --git a/node_modules/eslint/lib/cli-engine/cli-engine.js b/node_modules/eslint/lib/cli-engine/cli-engine.js index 311dc61e81..49c8902c16 100644 --- a/node_modules/eslint/lib/cli-engine/cli-engine.js +++ b/node_modules/eslint/lib/cli-engine/cli-engine.js @@ -83,7 +83,7 @@ const validFixTypes = new Set(["directive", "problem", "suggestion", "layout"]); * @property {string[]} [plugins] An array of plugins to load. * @property {Record} [rules] An object of rules to use. * @property {string[]} [rulePaths] An array of directories to load custom rules from. - * @property {boolean} [reportUnusedDisableDirectives] `true` adds reports for unused eslint-disable directives + * @property {boolean|string} [reportUnusedDisableDirectives] `true`, `"error"` or '"warn"' adds reports for unused eslint-disable directives * @property {boolean} [globInputPaths] Set to false to skip glob resolution of input file paths to lint (default: true). If false, each input file paths is assumed to be a non-glob path to an existing file. * @property {string} [resolvePluginsRelativeTo] The folder where plugins should be resolved from, defaulting to the CWD */ @@ -224,7 +224,7 @@ function calculateStatsPerRun(results) { * @param {ConfigArray} config.config The config. * @param {boolean} config.fix If `true` then it does fix. * @param {boolean} config.allowInlineConfig If `true` then it uses directive comments. - * @param {boolean} config.reportUnusedDisableDirectives If `true` then it reports unused `eslint-disable` comments. + * @param {boolean|string} config.reportUnusedDisableDirectives If `true`, `"error"` or '"warn"', then it reports unused `eslint-disable` comments. * @param {FileEnumerator} config.fileEnumerator The file enumerator to check if a path is a target or not. * @param {Linter} config.linter The linter instance to verify. * @returns {LintResult} The result of linting. diff --git a/node_modules/eslint/lib/cli.js b/node_modules/eslint/lib/cli.js index f472659c20..1d909ec1cf 100644 --- a/node_modules/eslint/lib/cli.js +++ b/node_modules/eslint/lib/cli.js @@ -22,7 +22,8 @@ const fs = require("fs"), { FlatESLint, shouldUseFlatConfig } = require("./eslint/flat-eslint"), createCLIOptions = require("./options"), log = require("./shared/logging"), - RuntimeInfo = require("./shared/runtime-info"); + RuntimeInfo = require("./shared/runtime-info"), + { normalizeSeverityToString } = require("./shared/severity"); const { Legacy: { naming } } = require("@eslint/eslintrc"); const { ModuleImporter } = require("@humanwhocodes/module-importer"); @@ -89,6 +90,7 @@ async function translateOptions({ plugin, quiet, reportUnusedDisableDirectives, + reportUnusedDisableDirectivesSeverity, resolvePluginsRelativeTo, rule, rulesdir, @@ -125,6 +127,14 @@ async function translateOptions({ rules: rule ? rule : {} }]; + if (reportUnusedDisableDirectives || reportUnusedDisableDirectivesSeverity !== void 0) { + overrideConfig[0].linterOptions = { + reportUnusedDisableDirectives: reportUnusedDisableDirectives + ? "error" + : normalizeSeverityToString(reportUnusedDisableDirectivesSeverity) + }; + } + if (parser) { overrideConfig[0].languageOptions.parser = await importer.import(parser); } @@ -177,8 +187,7 @@ async function translateOptions({ fixTypes: fixType, ignore, overrideConfig, - overrideConfigFile, - reportUnusedDisableDirectives: reportUnusedDisableDirectives ? "error" : void 0 + overrideConfigFile }; if (configType === "flat") { @@ -190,6 +199,11 @@ async function translateOptions({ options.useEslintrc = eslintrc; options.extensions = ext; options.ignorePath = ignorePath; + if (reportUnusedDisableDirectives || reportUnusedDisableDirectivesSeverity !== void 0) { + options.reportUnusedDisableDirectives = reportUnusedDisableDirectives + ? "error" + : normalizeSeverityToString(reportUnusedDisableDirectivesSeverity); + } } return options; @@ -386,6 +400,11 @@ const cli = { return 2; } + if (options.reportUnusedDisableDirectives && options.reportUnusedDisableDirectivesSeverity !== void 0) { + log.error("The --report-unused-disable-directives option and the --report-unused-disable-directives-severity option cannot be used together."); + return 2; + } + const ActiveESLint = usingFlatConfig ? FlatESLint : ESLint; const engine = new ActiveESLint(await translateOptions(options, usingFlatConfig ? "flat" : "eslintrc")); diff --git a/node_modules/eslint/lib/config/flat-config-schema.js b/node_modules/eslint/lib/config/flat-config-schema.js index 911d159d93..3b6612b498 100644 --- a/node_modules/eslint/lib/config/flat-config-schema.js +++ b/node_modules/eslint/lib/config/flat-config-schema.js @@ -14,6 +14,7 @@ * starting in Node.js v17. */ const structuredClone = require("@ungap/structured-clone").default; +const { normalizeSeverityToNumber } = require("../shared/severity"); //----------------------------------------------------------------------------- // Type Definitions @@ -262,6 +263,26 @@ const booleanSchema = { validate: "boolean" }; +const ALLOWED_SEVERITIES = new Set(["error", "warn", "off", 2, 1, 0]); + +/** @type {ObjectPropertySchema} */ +const disableDirectiveSeveritySchema = { + merge(first, second) { + const value = second === void 0 ? first : second; + + if (typeof value === "boolean") { + return value ? "warn" : "off"; + } + + return normalizeSeverityToNumber(value); + }, + validate(value) { + if (!(ALLOWED_SEVERITIES.has(value) || typeof value === "boolean")) { + throw new TypeError("Expected one of: \"error\", \"warn\", \"off\", 0, 1, 2, or a boolean."); + } + } +}; + /** @type {ObjectPropertySchema} */ const deepObjectAssignSchema = { merge(first = {}, second = {}) { @@ -534,7 +555,7 @@ const flatConfigSchema = { linterOptions: { schema: { noInlineConfig: booleanSchema, - reportUnusedDisableDirectives: booleanSchema + reportUnusedDisableDirectives: disableDirectiveSeveritySchema } }, languageOptions: { diff --git a/node_modules/eslint/lib/eslint/eslint-helpers.js b/node_modules/eslint/lib/eslint/eslint-helpers.js index 72828363c3..685826ac69 100644 --- a/node_modules/eslint/lib/eslint/eslint-helpers.js +++ b/node_modules/eslint/lib/eslint/eslint-helpers.js @@ -675,7 +675,6 @@ function processOptions({ overrideConfig = null, overrideConfigFile = null, plugins = {}, - reportUnusedDisableDirectives = null, // ← should be null by default because if it's a string then it overrides the 'reportUnusedDisableDirectives' setting in config files. And we cannot use `overrideConfig.reportUnusedDisableDirectives` instead because we cannot configure the `error` severity with that. warnIgnored = true, ...unknownOptions }) { @@ -720,6 +719,9 @@ function processOptions({ if (unknownOptionKeys.includes("rulePaths")) { errors.push("'rulePaths' has been removed. Please define your rules using plugins."); } + if (unknownOptionKeys.includes("reportUnusedDisableDirectives")) { + errors.push("'reportUnusedDisableDirectives' has been removed. Please use the 'overrideConfig.linterOptions.reportUnusedDisableDirectives' option instead."); + } } if (typeof allowInlineConfig !== "boolean") { errors.push("'allowInlineConfig' must be a boolean."); @@ -774,14 +776,6 @@ function processOptions({ if (Array.isArray(plugins)) { errors.push("'plugins' doesn't add plugins to configuration to load. Please use the 'overrideConfig.plugins' option instead."); } - if ( - reportUnusedDisableDirectives !== "error" && - reportUnusedDisableDirectives !== "warn" && - reportUnusedDisableDirectives !== "off" && - reportUnusedDisableDirectives !== null - ) { - errors.push("'reportUnusedDisableDirectives' must be any of \"error\", \"warn\", \"off\", and null."); - } if (typeof warnIgnored !== "boolean") { errors.push("'warnIgnored' must be a boolean."); } @@ -806,7 +800,6 @@ function processOptions({ globInputPaths, ignore, ignorePatterns, - reportUnusedDisableDirectives, warnIgnored }; } diff --git a/node_modules/eslint/lib/eslint/flat-eslint.js b/node_modules/eslint/lib/eslint/flat-eslint.js index 306c80de1d..785f41edf8 100644 --- a/node_modules/eslint/lib/eslint/flat-eslint.js +++ b/node_modules/eslint/lib/eslint/flat-eslint.js @@ -11,6 +11,7 @@ // Note: Node.js 12 does not support fs/promises. const fs = require("fs").promises; +const { existsSync } = require("fs"); const path = require("path"); const findUp = require("find-up"); const { version } = require("../../package.json"); @@ -83,7 +84,6 @@ const LintResultCache = require("../cli-engine/lint-result-cache"); * doesn't do any config file lookup when `true`; considered to be a config filename * when a string. * @property {Record} [plugins] An array of plugin implementations. - * @property {"error" | "warn" | "off"} [reportUnusedDisableDirectives] the severity to report unused eslint-disable directives. * @property {boolean} warnIgnored Show warnings when the file list includes ignored files */ @@ -448,7 +448,6 @@ async function calculateConfigArray(eslint, { * @param {FlatConfigArray} config.configs The config. * @param {boolean} config.fix If `true` then it does fix. * @param {boolean} config.allowInlineConfig If `true` then it uses directive comments. - * @param {boolean} config.reportUnusedDisableDirectives If `true` then it reports unused `eslint-disable` comments. * @param {Linter} config.linter The linter instance to verify. * @returns {LintResult} The result of linting. * @private @@ -460,7 +459,6 @@ function verifyText({ configs, fix, allowInlineConfig, - reportUnusedDisableDirectives, linter }) { const filePath = providedFilePath || ""; @@ -480,7 +478,6 @@ function verifyText({ allowInlineConfig, filename: filePathToVerify, fix, - reportUnusedDisableDirectives, /** * Check if the linter should adopt a given code block or not. @@ -748,7 +745,6 @@ class FlatESLint { cwd, fix, fixTypes, - reportUnusedDisableDirectives, globInputPaths, errorOnUnmatchedPattern, warnIgnored @@ -766,7 +762,7 @@ class FlatESLint { const errorCode = error && error.code; // Ignore errors when no such file exists or file system is read only (and cache file does not exist) - if (errorCode !== "ENOENT" && !(errorCode === "EROFS" && !(await fs.exists(cacheFilePath)))) { + if (errorCode !== "ENOENT" && !(errorCode === "EROFS" && !existsSync(cacheFilePath))) { throw error; } } @@ -858,7 +854,6 @@ class FlatESLint { cwd, fix: fixer, allowInlineConfig, - reportUnusedDisableDirectives, linter }); @@ -943,7 +938,6 @@ class FlatESLint { allowInlineConfig, cwd, fix, - reportUnusedDisableDirectives, warnIgnored: constructorWarnIgnored } = eslintOptions; const results = []; @@ -967,7 +961,6 @@ class FlatESLint { cwd, fix, allowInlineConfig, - reportUnusedDisableDirectives, linter })); } diff --git a/node_modules/eslint/lib/linter/config-comment-parser.js b/node_modules/eslint/lib/linter/config-comment-parser.js index cde261204f..9d33c55273 100644 --- a/node_modules/eslint/lib/linter/config-comment-parser.js +++ b/node_modules/eslint/lib/linter/config-comment-parser.js @@ -15,7 +15,10 @@ const levn = require("levn"), Legacy: { ConfigOps } - } = require("@eslint/eslintrc/universal"); + } = require("@eslint/eslintrc/universal"), + { + directivesPattern + } = require("../shared/directives"); const debug = require("debug")("eslint:config-comment-parser"); @@ -148,4 +151,35 @@ module.exports = class ConfigCommentParser { return items; } + /** + * Extract the directive and the justification from a given directive comment and trim them. + * @param {string} value The comment text to extract. + * @returns {{directivePart: string, justificationPart: string}} The extracted directive and justification. + */ + extractDirectiveComment(value) { + const match = /\s-{2,}\s/u.exec(value); + + if (!match) { + return { directivePart: value.trim(), justificationPart: "" }; + } + + const directive = value.slice(0, match.index).trim(); + const justification = value.slice(match.index + match[0].length).trim(); + + return { directivePart: directive, justificationPart: justification }; + } + + /** + * Parses a directive comment into directive text and value. + * @param {Comment} comment The comment node with the directive to be parsed. + * @returns {{directiveText: string, directiveValue: string}} The directive text and value. + */ + parseDirective(comment) { + const { directivePart } = this.extractDirectiveComment(comment.value); + const match = directivesPattern.exec(directivePart); + const directiveText = match[1]; + const directiveValue = directivePart.slice(match.index + directiveText.length); + + return { directiveText, directiveValue }; + } }; diff --git a/node_modules/eslint/lib/linter/linter.js b/node_modules/eslint/lib/linter/linter.js index 9f29933cee..f74d0ecd13 100644 --- a/node_modules/eslint/lib/linter/linter.js +++ b/node_modules/eslint/lib/linter/linter.js @@ -44,6 +44,7 @@ const { getRuleFromConfig } = require("../config/flat-config-helpers"); const { FlatConfigArray } = require("../config/flat-config-array"); const { RuleValidator } = require("../config/rule-validator"); const { assertIsRuleOptions, assertIsRuleSeverity } = require("../config/flat-config-schema"); +const { normalizeSeverityToString } = require("../shared/severity"); const debug = require("debug")("eslint:linter"); const MAX_AUTOFIX_PASSES = 10; const DEFAULT_PARSER_NAME = "espree"; @@ -316,24 +317,6 @@ function createDisableDirectives(options) { return result; } -/** - * Extract the directive and the justification from a given directive comment and trim them. - * @param {string} value The comment text to extract. - * @returns {{directivePart: string, justificationPart: string}} The extracted directive and justification. - */ -function extractDirectiveComment(value) { - const match = /\s-{2,}\s/u.exec(value); - - if (!match) { - return { directivePart: value.trim(), justificationPart: "" }; - } - - const directive = value.slice(0, match.index).trim(); - const justification = value.slice(match.index + match[0].length).trim(); - - return { directivePart: directive, justificationPart: justification }; -} - /** * Parses comments in file to extract file-specific config of rules, globals * and environments and merges them with global config; also code blocks @@ -355,7 +338,7 @@ function getDirectiveComments(sourceCode, ruleMapper, warnInlineConfig) { }); sourceCode.getInlineConfigNodes().filter(token => token.type !== "Shebang").forEach(comment => { - const { directivePart, justificationPart } = extractDirectiveComment(comment.value); + const { directivePart, justificationPart } = commentParser.extractDirectiveComment(comment.value); const match = directivesPattern.exec(directivePart); @@ -500,7 +483,7 @@ function getDirectiveCommentsForFlatConfig(sourceCode, ruleMapper) { const disableDirectives = []; sourceCode.getInlineConfigNodes().filter(token => token.type !== "Shebang").forEach(comment => { - const { directivePart, justificationPart } = extractDirectiveComment(comment.value); + const { directivePart, justificationPart } = commentParser.extractDirectiveComment(comment.value); const match = directivesPattern.exec(directivePart); @@ -620,7 +603,7 @@ function findEslintEnv(text) { if (match[0].endsWith("*/")) { retv = Object.assign( retv || {}, - commentParser.parseListConfig(extractDirectiveComment(match[1]).directivePart) + commentParser.parseListConfig(commentParser.extractDirectiveComment(match[1]).directivePart) ); } } @@ -671,9 +654,11 @@ function normalizeVerifyOptions(providedOptions, config) { reportUnusedDisableDirectives = reportUnusedDisableDirectives ? "error" : "off"; } if (typeof reportUnusedDisableDirectives !== "string") { - reportUnusedDisableDirectives = - linterOptions.reportUnusedDisableDirectives - ? "warn" : "off"; + if (typeof linterOptions.reportUnusedDisableDirectives === "boolean") { + reportUnusedDisableDirectives = linterOptions.reportUnusedDisableDirectives ? "warn" : "off"; + } else { + reportUnusedDisableDirectives = linterOptions.reportUnusedDisableDirectives === void 0 ? "off" : normalizeSeverityToString(linterOptions.reportUnusedDisableDirectives); + } } return { diff --git a/node_modules/eslint/lib/options.js b/node_modules/eslint/lib/options.js index 81c0fa60ab..dd67c399e6 100644 --- a/node_modules/eslint/lib/options.js +++ b/node_modules/eslint/lib/options.js @@ -48,6 +48,7 @@ const optionator = require("optionator"); * @property {string[]} [plugin] Specify plugins * @property {string} [printConfig] Print the configuration for the given file * @property {boolean | undefined} reportUnusedDisableDirectives Adds reported errors for unused eslint-disable and eslint-enable directives + * @property {string | undefined} reportUnusedDisableDirectivesSeverity A severity string indicating if and how unused disable and enable directives should be tracked and reported. * @property {string} [resolvePluginsRelativeTo] A folder where plugins should be resolved from, CWD by default * @property {Object} [rule] Specify rules * @property {string[]} [rulesdir] Load additional rules from this directory. Deprecated: Use rules from plugins @@ -306,6 +307,13 @@ module.exports = function(usingFlatConfig) { default: void 0, description: "Adds reported errors for unused eslint-disable and eslint-enable directives" }, + { + option: "report-unused-disable-directives-severity", + type: "String", + default: void 0, + description: "Chooses severity level for reporting unused eslint-disable and eslint-enable directives", + enum: ["off", "warn", "error", "0", "1", "2"] + }, { heading: "Caching" }, diff --git a/node_modules/eslint/lib/rules/no-invalid-this.js b/node_modules/eslint/lib/rules/no-invalid-this.js index 49ecbe514c..9e214035c3 100644 --- a/node_modules/eslint/lib/rules/no-invalid-this.js +++ b/node_modules/eslint/lib/rules/no-invalid-this.js @@ -96,7 +96,7 @@ module.exports = { if (codePath.origin === "program") { const scope = sourceCode.getScope(node); - const features = context.parserOptions.ecmaFeatures || {}; + const features = context.languageOptions.parserOptions.ecmaFeatures || {}; // `this` at the top level of scripts always refers to the global object stack.push({ diff --git a/node_modules/eslint/lib/rules/no-promise-executor-return.js b/node_modules/eslint/lib/rules/no-promise-executor-return.js index e6ed7a22ef..b27e440729 100644 --- a/node_modules/eslint/lib/rules/no-promise-executor-return.js +++ b/node_modules/eslint/lib/rules/no-promise-executor-return.js @@ -209,12 +209,15 @@ module.exports = { }); } - suggest.push({ - messageId: "wrapBraces", - fix(fixer) { - return curlyWrapFixer(sourceCode, node, fixer); - } - }); + // Do not suggest wrapping an unnamed FunctionExpression in braces as that would be invalid syntax. + if (!(node.body.type === "FunctionExpression" && !node.body.id)) { + suggest.push({ + messageId: "wrapBraces", + fix(fixer) { + return curlyWrapFixer(sourceCode, node, fixer); + } + }); + } context.report({ node: node.body, diff --git a/node_modules/eslint/lib/rules/no-restricted-properties.js b/node_modules/eslint/lib/rules/no-restricted-properties.js index b076632609..acd178ae53 100644 --- a/node_modules/eslint/lib/rules/no-restricted-properties.js +++ b/node_modules/eslint/lib/rules/no-restricted-properties.js @@ -142,40 +142,27 @@ module.exports = { } } - /** - * Checks property accesses in a destructuring assignment expression, e.g. `var foo; ({foo} = bar);` - * @param {ASTNode} node An AssignmentExpression or AssignmentPattern node - * @returns {undefined} - */ - function checkDestructuringAssignment(node) { - if (node.right.type === "Identifier") { - const objectName = node.right.name; - - if (node.left.type === "ObjectPattern") { - node.left.properties.forEach(property => { - checkPropertyAccess(node.left, objectName, astUtils.getStaticPropertyName(property)); - }); - } - } - } - return { MemberExpression(node) { checkPropertyAccess(node, node.object && node.object.name, astUtils.getStaticPropertyName(node)); }, - VariableDeclarator(node) { - if (node.init && node.init.type === "Identifier") { - const objectName = node.init.name; - - if (node.id.type === "ObjectPattern") { - node.id.properties.forEach(property => { - checkPropertyAccess(node.id, objectName, astUtils.getStaticPropertyName(property)); - }); + ObjectPattern(node) { + let objectName = null; + + if (node.parent.type === "VariableDeclarator") { + if (node.parent.init && node.parent.init.type === "Identifier") { + objectName = node.parent.init.name; + } + } else if (node.parent.type === "AssignmentExpression" || node.parent.type === "AssignmentPattern") { + if (node.parent.right.type === "Identifier") { + objectName = node.parent.right.name; } } - }, - AssignmentExpression: checkDestructuringAssignment, - AssignmentPattern: checkDestructuringAssignment + + node.properties.forEach(property => { + checkPropertyAccess(node, objectName, astUtils.getStaticPropertyName(property)); + }); + } }; } }; diff --git a/node_modules/eslint/lib/shared/severity.js b/node_modules/eslint/lib/shared/severity.js new file mode 100644 index 0000000000..6b21469a9a --- /dev/null +++ b/node_modules/eslint/lib/shared/severity.js @@ -0,0 +1,49 @@ +/** + * @fileoverview Helpers for severity values (e.g. normalizing different types). + * @author Bryan Mishkin + */ + +"use strict"; + +/** + * Convert severity value of different types to a string. + * @param {string|number} severity severity value + * @throws error if severity is invalid + * @returns {string} severity string + */ +function normalizeSeverityToString(severity) { + if ([2, "2", "error"].includes(severity)) { + return "error"; + } + if ([1, "1", "warn"].includes(severity)) { + return "warn"; + } + if ([0, "0", "off"].includes(severity)) { + return "off"; + } + throw new Error(`Invalid severity value: ${severity}`); +} + +/** + * Convert severity value of different types to a number. + * @param {string|number} severity severity value + * @throws error if severity is invalid + * @returns {number} severity number + */ +function normalizeSeverityToNumber(severity) { + if ([2, "2", "error"].includes(severity)) { + return 2; + } + if ([1, "1", "warn"].includes(severity)) { + return 1; + } + if ([0, "0", "off"].includes(severity)) { + return 0; + } + throw new Error(`Invalid severity value: ${severity}`); +} + +module.exports = { + normalizeSeverityToString, + normalizeSeverityToNumber +}; diff --git a/node_modules/eslint/lib/source-code/source-code.js b/node_modules/eslint/lib/source-code/source-code.js index 4bbd5ae3a5..236f6b5c6c 100644 --- a/node_modules/eslint/lib/source-code/source-code.js +++ b/node_modules/eslint/lib/source-code/source-code.js @@ -212,24 +212,6 @@ function isSpaceBetween(sourceCode, first, second, checkInsideOfJSXText) { // Directive Comments //----------------------------------------------------------------------------- -/** - * Extract the directive and the justification from a given directive comment and trim them. - * @param {string} value The comment text to extract. - * @returns {{directivePart: string, justificationPart: string}} The extracted directive and justification. - */ -function extractDirectiveComment(value) { - const match = /\s-{2,}\s/u.exec(value); - - if (!match) { - return { directivePart: value.trim(), justificationPart: "" }; - } - - const directive = value.slice(0, match.index).trim(); - const justification = value.slice(match.index + match[0].length).trim(); - - return { directivePart: directive, justificationPart: justification }; -} - /** * Ensures that variables representing built-in properties of the Global Object, * and any globals declared by special block comments, are present in the global @@ -921,7 +903,7 @@ class SourceCode extends TokenStore { return false; } - const { directivePart } = extractDirectiveComment(comment.value); + const { directivePart } = commentParser.extractDirectiveComment(comment.value); const directiveMatch = directivesPattern.exec(directivePart); @@ -977,10 +959,7 @@ class SourceCode extends TokenStore { this.getInlineConfigNodes().forEach(comment => { - const { directivePart } = extractDirectiveComment(comment.value); - const match = directivesPattern.exec(directivePart); - const directiveText = match[1]; - const directiveValue = directivePart.slice(match.index + directiveText.length); + const { directiveText, directiveValue } = commentParser.parseDirective(comment); switch (directiveText) { case "exported": diff --git a/node_modules/eslint/package.json b/node_modules/eslint/package.json index 90158fad2b..aa5335dbd8 100644 --- a/node_modules/eslint/package.json +++ b/node_modules/eslint/package.json @@ -1,6 +1,6 @@ { "name": "eslint", - "version": "8.55.0", + "version": "8.56.0", "author": "Nicholas C. Zakas ", "description": "An AST-based pattern checker for JavaScript.", "bin": { @@ -65,7 +65,7 @@ "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.55.0", + "@eslint/js": "8.56.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -119,11 +119,11 @@ "eslint": "file:.", "eslint-config-eslint": "file:packages/eslint-config-eslint", "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-eslint-plugin": "^5.1.0", + "eslint-plugin-eslint-plugin": "^5.2.1", "eslint-plugin-internal-rules": "file:tools/internal-rules", "eslint-plugin-jsdoc": "^46.2.5", - "eslint-plugin-n": "^16.0.0", - "eslint-plugin-unicorn": "^42.0.0", + "eslint-plugin-n": "^16.4.0", + "eslint-plugin-unicorn": "^49.0.0", "eslint-release": "^3.2.0", "eslump": "^3.0.0", "esprima": "^4.0.1", @@ -136,7 +136,7 @@ "load-perf": "^0.2.0", "markdown-it": "^12.2.0", "markdown-it-container": "^3.0.0", - "markdownlint": "^0.31.1", + "markdownlint": "^0.32.0", "markdownlint-cli": "^0.37.0", "marked": "^4.0.8", "memfs": "^3.0.1", diff --git a/node_modules/tsconfig-paths/CHANGELOG.md b/node_modules/tsconfig-paths/CHANGELOG.md index 6fd484cdea..a9fc02444e 100644 --- a/node_modules/tsconfig-paths/CHANGELOG.md +++ b/node_modules/tsconfig-paths/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +## [3.15.0] - 2023-12-14 + +### Added + +- Add support for extends as array of strings to v3 (backport of #245). See PR #260. Thanks to [@domdomegg](https://github.com/domdomegg) for this PR! + ## [3.14.1] - 2022-03-22 ### Fixed diff --git a/node_modules/tsconfig-paths/lib/__tests__/tsconfig-loader.test.js b/node_modules/tsconfig-paths/lib/__tests__/tsconfig-loader.test.js index 0e352824b3..5310ccb803 100644 --- a/node_modules/tsconfig-paths/lib/__tests__/tsconfig-loader.test.js +++ b/node_modules/tsconfig-paths/lib/__tests__/tsconfig-loader.test.js @@ -112,25 +112,30 @@ describe("walkForTsConfig", function () { }); }); describe("loadConfig", function () { - it("It should load a config", function () { + it("should load a config", function () { var config = { compilerOptions: { baseUrl: "hej" } }; var res = (0, tsconfig_loader_1.loadTsconfig)("/root/dir1/tsconfig.json", function (path) { return path === "/root/dir1/tsconfig.json"; }, function (_) { return JSON.stringify(config); }); // assert.deepEqual(res, config); expect(res).toStrictEqual(config); }); - it("It should load a config with comments", function () { + it("should load a config with comments", function () { var config = { compilerOptions: { baseUrl: "hej" } }; var res = (0, tsconfig_loader_1.loadTsconfig)("/root/dir1/tsconfig.json", function (path) { return path === "/root/dir1/tsconfig.json"; }, function (_) { return "{\n // my comment\n \"compilerOptions\": { \n \"baseUrl\": \"hej\"\n }\n }"; }); // assert.deepEqual(res, config); expect(res).toStrictEqual(config); }); - it("It should load a config with trailing commas", function () { + it("should load a config with trailing commas", function () { var config = { compilerOptions: { baseUrl: "hej" } }; var res = (0, tsconfig_loader_1.loadTsconfig)("/root/dir1/tsconfig.json", function (path) { return path === "/root/dir1/tsconfig.json"; }, function (_) { return "{\n \"compilerOptions\": { \n \"baseUrl\": \"hej\",\n },\n }"; }); // assert.deepEqual(res, config); expect(res).toStrictEqual(config); }); - it("It should load a config with extends and overwrite all options", function () { + it("should throw an error including the file path when encountering invalid JSON5", function () { + expect(function () { + return (0, tsconfig_loader_1.loadTsconfig)("/root/dir1/tsconfig.json", function (path) { return path === "/root/dir1/tsconfig.json"; }, function (_) { return "{\n \"compilerOptions\": {\n }"; }); + }).toThrowError("/root/dir1/tsconfig.json is malformed JSON5: invalid end of input at 3:12"); + }); + it("should load a config with string extends and overwrite all options", function () { var firstConfig = { extends: "../base-config.json", compilerOptions: { baseUrl: "kalle", paths: { foo: ["bar2"] } }, @@ -170,7 +175,7 @@ describe("loadConfig", function () { }, }); }); - it("It should load a config with extends from node_modules and overwrite all options", function () { + it("should load a config with string extends from node_modules and overwrite all options", function () { var firstConfig = { extends: "my-package/base-config.json", compilerOptions: { baseUrl: "kalle", paths: { foo: ["bar2"] } }, @@ -210,7 +215,7 @@ describe("loadConfig", function () { }, }); }); - it("Should use baseUrl relative to location of extended tsconfig", function () { + it("should use baseUrl relative to location of extended tsconfig", function () { var firstConfig = { compilerOptions: { baseUrl: "." } }; var firstConfigPath = (0, path_1.join)("/root", "first-config.json"); var secondConfig = { extends: "../first-config.json" }; @@ -242,5 +247,82 @@ describe("loadConfig", function () { compilerOptions: { baseUrl: (0, path_1.join)("..", "..") }, }); }); + it("should load a config with array extends and overwrite all options", function () { + var baseConfig1 = { + compilerOptions: { baseUrl: ".", paths: { foo: ["bar"] } }, + }; + var baseConfig1Path = (0, path_1.join)("/root", "base-config-1.json"); + var baseConfig2 = { compilerOptions: { baseUrl: "." } }; + var baseConfig2Path = (0, path_1.join)("/root", "dir1", "base-config-2.json"); + var baseConfig3 = { + compilerOptions: { baseUrl: ".", paths: { foo: ["bar2"] } }, + }; + var baseConfig3Path = (0, path_1.join)("/root", "dir1", "dir2", "base-config-3.json"); + var actualConfig = { + extends: [ + "./base-config-1.json", + "./dir1/base-config-2.json", + "./dir1/dir2/base-config-3.json", + ], + }; + var actualConfigPath = (0, path_1.join)("/root", "tsconfig.json"); + var res = (0, tsconfig_loader_1.loadTsconfig)((0, path_1.join)("/root", "tsconfig.json"), function (path) { + return [ + baseConfig1Path, + baseConfig2Path, + baseConfig3Path, + actualConfigPath, + ].indexOf(path) >= 0; + }, function (path) { + if (path === baseConfig1Path) { + return JSON.stringify(baseConfig1); + } + if (path === baseConfig2Path) { + return JSON.stringify(baseConfig2); + } + if (path === baseConfig3Path) { + return JSON.stringify(baseConfig3); + } + if (path === actualConfigPath) { + return JSON.stringify(actualConfig); + } + return ""; + }); + expect(res).toEqual({ + extends: [ + "./base-config-1.json", + "./dir1/base-config-2.json", + "./dir1/dir2/base-config-3.json", + ], + compilerOptions: { + baseUrl: (0, path_1.join)("dir1", "dir2"), + paths: { foo: ["bar2"] }, + }, + }); + }); + it("should load a config with array extends without .json extension", function () { + var baseConfig = { + compilerOptions: { baseUrl: ".", paths: { foo: ["bar"] } }, + }; + var baseConfigPath = (0, path_1.join)("/root", "base-config-1.json"); + var actualConfig = { extends: ["./base-config-1"] }; + var actualConfigPath = (0, path_1.join)("/root", "tsconfig.json"); + var res = (0, tsconfig_loader_1.loadTsconfig)((0, path_1.join)("/root", "tsconfig.json"), function (path) { return [baseConfigPath, actualConfigPath].indexOf(path) >= 0; }, function (path) { + if (path === baseConfigPath) { + return JSON.stringify(baseConfig); + } + if (path === actualConfigPath) { + return JSON.stringify(actualConfig); + } + return ""; + }); + expect(res).toEqual({ + extends: ["./base-config-1"], + compilerOptions: { + baseUrl: ".", + paths: { foo: ["bar"] }, + }, + }); + }); }); //# sourceMappingURL=tsconfig-loader.test.js.map \ No newline at end of file diff --git a/node_modules/tsconfig-paths/lib/__tests__/tsconfig-loader.test.js.map b/node_modules/tsconfig-paths/lib/__tests__/tsconfig-loader.test.js.map index 7ffcd8cd04..05dcdb0283 100644 --- a/node_modules/tsconfig-paths/lib/__tests__/tsconfig-loader.test.js.map +++ b/node_modules/tsconfig-paths/lib/__tests__/tsconfig-loader.test.js.map @@ -1 +1 @@ -{"version":3,"file":"tsconfig-loader.test.js","sourceRoot":"","sources":["../../src/__tests__/tsconfig-loader.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tsconfig-loader.test.js","sourceRoot":"","sources":["../../src/__tests__/tsconfig-loader.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/tsconfig-paths/lib/tsconfig-loader.d.ts b/node_modules/tsconfig-paths/lib/tsconfig-loader.d.ts index 649a8042c4..67bd97c7be 100644 --- a/node_modules/tsconfig-paths/lib/tsconfig-loader.d.ts +++ b/node_modules/tsconfig-paths/lib/tsconfig-loader.d.ts @@ -2,7 +2,7 @@ * Typing for the parts of tsconfig that we care about */ export interface Tsconfig { - extends?: string; + extends?: string | string[]; compilerOptions?: { baseUrl?: string; paths?: { diff --git a/node_modules/tsconfig-paths/lib/tsconfig-loader.js b/node_modules/tsconfig-paths/lib/tsconfig-loader.js index fd93153244..35a71fa9d3 100644 --- a/node_modules/tsconfig-paths/lib/tsconfig-loader.js +++ b/node_modules/tsconfig-paths/lib/tsconfig-loader.js @@ -82,30 +82,60 @@ function loadTsconfig(configFilePath, existsSync, readFileSync) { } var configString = readFileSync(configFilePath); var cleanedJson = StripBom(configString); - var config = JSON5.parse(cleanedJson); + var config; + try { + config = JSON5.parse(cleanedJson); + } + catch (e) { + throw new Error("".concat(configFilePath, " is malformed ").concat(e.message)); + } var extendedConfig = config.extends; if (extendedConfig) { - if (typeof extendedConfig === "string" && - extendedConfig.indexOf(".json") === -1) { - extendedConfig += ".json"; - } - var currentDir = path.dirname(configFilePath); - var extendedConfigPath = path.join(currentDir, extendedConfig); - if (extendedConfig.indexOf("/") !== -1 && - extendedConfig.indexOf(".") !== -1 && - !existsSync(extendedConfigPath)) { - extendedConfigPath = path.join(currentDir, "node_modules", extendedConfig); + var base = void 0; + if (Array.isArray(extendedConfig)) { + base = extendedConfig.reduce(function (currBase, extendedConfigElement) { + return mergeTsconfigs(currBase, loadTsconfigFromExtends(configFilePath, extendedConfigElement, existsSync, readFileSync)); + }, {}); } - var base = loadTsconfig(extendedConfigPath, existsSync, readFileSync) || {}; - // baseUrl should be interpreted as relative to the base tsconfig, - // but we need to update it so it is relative to the original tsconfig being loaded - if (base.compilerOptions && base.compilerOptions.baseUrl) { - var extendsDir = path.dirname(extendedConfig); - base.compilerOptions.baseUrl = path.join(extendsDir, base.compilerOptions.baseUrl); + else { + base = loadTsconfigFromExtends(configFilePath, extendedConfig, existsSync, readFileSync); } - return __assign(__assign(__assign({}, base), config), { compilerOptions: __assign(__assign({}, base.compilerOptions), config.compilerOptions) }); + return mergeTsconfigs(base, config); } return config; } exports.loadTsconfig = loadTsconfig; +/** + * Intended to be called only from loadTsconfig. + * Parameters don't have defaults because they should use the same as loadTsconfig. + */ +function loadTsconfigFromExtends(configFilePath, extendedConfigValue, +// eslint-disable-next-line no-shadow +existsSync, readFileSync) { + var _a; + if (typeof extendedConfigValue === "string" && + extendedConfigValue.indexOf(".json") === -1) { + extendedConfigValue += ".json"; + } + var currentDir = path.dirname(configFilePath); + var extendedConfigPath = path.join(currentDir, extendedConfigValue); + if (extendedConfigValue.indexOf("/") !== -1 && + extendedConfigValue.indexOf(".") !== -1 && + !existsSync(extendedConfigPath)) { + extendedConfigPath = path.join(currentDir, "node_modules", extendedConfigValue); + } + var config = loadTsconfig(extendedConfigPath, existsSync, readFileSync) || {}; + // baseUrl should be interpreted as relative to extendedConfigPath, + // but we need to update it so it is relative to the original tsconfig being loaded + if ((_a = config.compilerOptions) === null || _a === void 0 ? void 0 : _a.baseUrl) { + var extendsDir = path.dirname(extendedConfigValue); + config.compilerOptions.baseUrl = path.join(extendsDir, config.compilerOptions.baseUrl); + } + return config; +} +function mergeTsconfigs(base, config) { + base = base || {}; + config = config || {}; + return __assign(__assign(__assign({}, base), config), { compilerOptions: __assign(__assign({}, base.compilerOptions), config.compilerOptions) }); +} //# sourceMappingURL=tsconfig-loader.js.map \ No newline at end of file diff --git a/node_modules/tsconfig-paths/lib/tsconfig-loader.js.map b/node_modules/tsconfig-paths/lib/tsconfig-loader.js.map index 3bb4b71ccd..8b76295118 100644 --- a/node_modules/tsconfig-paths/lib/tsconfig-loader.js.map +++ b/node_modules/tsconfig-paths/lib/tsconfig-loader.js.map @@ -1 +1 @@ -{"version":3,"file":"tsconfig-loader.js","sourceRoot":"","sources":["../src/tsconfig-loader.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tsconfig-loader.js","sourceRoot":"","sources":["../src/tsconfig-loader.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/node_modules/tsconfig-paths/package.json b/node_modules/tsconfig-paths/package.json index a98bd2e3f9..017db0f0c8 100644 --- a/node_modules/tsconfig-paths/package.json +++ b/node_modules/tsconfig-paths/package.json @@ -1,6 +1,6 @@ { "name": "tsconfig-paths", - "version": "3.14.2", + "version": "3.15.0", "description": "Load node modules according to tsconfig paths, in run-time or via API.", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/node_modules/tsconfig-paths/src/__tests__/tsconfig-loader.test.ts b/node_modules/tsconfig-paths/src/__tests__/tsconfig-loader.test.ts index 7394482cf3..29a8792edc 100644 --- a/node_modules/tsconfig-paths/src/__tests__/tsconfig-loader.test.ts +++ b/node_modules/tsconfig-paths/src/__tests__/tsconfig-loader.test.ts @@ -133,7 +133,7 @@ describe("walkForTsConfig", () => { }); describe("loadConfig", () => { - it("It should load a config", () => { + it("should load a config", () => { const config = { compilerOptions: { baseUrl: "hej" } }; const res = loadTsconfig( "/root/dir1/tsconfig.json", @@ -144,7 +144,7 @@ describe("loadConfig", () => { expect(res).toStrictEqual(config); }); - it("It should load a config with comments", () => { + it("should load a config with comments", () => { const config = { compilerOptions: { baseUrl: "hej" } }; const res = loadTsconfig( "/root/dir1/tsconfig.json", @@ -160,7 +160,7 @@ describe("loadConfig", () => { expect(res).toStrictEqual(config); }); - it("It should load a config with trailing commas", () => { + it("should load a config with trailing commas", () => { const config = { compilerOptions: { baseUrl: "hej" } }; const res = loadTsconfig( "/root/dir1/tsconfig.json", @@ -175,7 +175,21 @@ describe("loadConfig", () => { expect(res).toStrictEqual(config); }); - it("It should load a config with extends and overwrite all options", () => { + it("should throw an error including the file path when encountering invalid JSON5", () => { + expect(() => + loadTsconfig( + "/root/dir1/tsconfig.json", + (path) => path === "/root/dir1/tsconfig.json", + (_) => `{ + "compilerOptions": { + }` + ) + ).toThrowError( + "/root/dir1/tsconfig.json is malformed JSON5: invalid end of input at 3:12" + ); + }); + + it("should load a config with string extends and overwrite all options", () => { const firstConfig = { extends: "../base-config.json", compilerOptions: { baseUrl: "kalle", paths: { foo: ["bar2"] } }, @@ -221,7 +235,7 @@ describe("loadConfig", () => { }); }); - it("It should load a config with extends from node_modules and overwrite all options", () => { + it("should load a config with string extends from node_modules and overwrite all options", () => { const firstConfig = { extends: "my-package/base-config.json", compilerOptions: { baseUrl: "kalle", paths: { foo: ["bar2"] } }, @@ -273,7 +287,7 @@ describe("loadConfig", () => { }); }); - it("Should use baseUrl relative to location of extended tsconfig", () => { + it("should use baseUrl relative to location of extended tsconfig", () => { const firstConfig = { compilerOptions: { baseUrl: "." } }; const firstConfigPath = join("/root", "first-config.json"); const secondConfig = { extends: "../first-config.json" }; @@ -309,4 +323,94 @@ describe("loadConfig", () => { compilerOptions: { baseUrl: join("..", "..") }, }); }); + + it("should load a config with array extends and overwrite all options", () => { + const baseConfig1 = { + compilerOptions: { baseUrl: ".", paths: { foo: ["bar"] } }, + }; + const baseConfig1Path = join("/root", "base-config-1.json"); + const baseConfig2 = { compilerOptions: { baseUrl: "." } }; + const baseConfig2Path = join("/root", "dir1", "base-config-2.json"); + const baseConfig3 = { + compilerOptions: { baseUrl: ".", paths: { foo: ["bar2"] } }, + }; + const baseConfig3Path = join("/root", "dir1", "dir2", "base-config-3.json"); + const actualConfig = { + extends: [ + "./base-config-1.json", + "./dir1/base-config-2.json", + "./dir1/dir2/base-config-3.json", + ], + }; + const actualConfigPath = join("/root", "tsconfig.json"); + + const res = loadTsconfig( + join("/root", "tsconfig.json"), + (path) => + [ + baseConfig1Path, + baseConfig2Path, + baseConfig3Path, + actualConfigPath, + ].indexOf(path) >= 0, + (path) => { + if (path === baseConfig1Path) { + return JSON.stringify(baseConfig1); + } + if (path === baseConfig2Path) { + return JSON.stringify(baseConfig2); + } + if (path === baseConfig3Path) { + return JSON.stringify(baseConfig3); + } + if (path === actualConfigPath) { + return JSON.stringify(actualConfig); + } + return ""; + } + ); + + expect(res).toEqual({ + extends: [ + "./base-config-1.json", + "./dir1/base-config-2.json", + "./dir1/dir2/base-config-3.json", + ], + compilerOptions: { + baseUrl: join("dir1", "dir2"), + paths: { foo: ["bar2"] }, + }, + }); + }); + + it("should load a config with array extends without .json extension", () => { + const baseConfig = { + compilerOptions: { baseUrl: ".", paths: { foo: ["bar"] } }, + }; + const baseConfigPath = join("/root", "base-config-1.json"); + const actualConfig = { extends: ["./base-config-1"] }; + const actualConfigPath = join("/root", "tsconfig.json"); + + const res = loadTsconfig( + join("/root", "tsconfig.json"), + (path) => [baseConfigPath, actualConfigPath].indexOf(path) >= 0, + (path) => { + if (path === baseConfigPath) { + return JSON.stringify(baseConfig); + } + if (path === actualConfigPath) { + return JSON.stringify(actualConfig); + } + return ""; + } + ); + + expect(res).toEqual({ + extends: ["./base-config-1"], + compilerOptions: { + baseUrl: ".", + paths: { foo: ["bar"] }, + }, + }); + }); }); diff --git a/node_modules/tsconfig-paths/src/tsconfig-loader.ts b/node_modules/tsconfig-paths/src/tsconfig-loader.ts index c2dfb04a59..9ece441cad 100644 --- a/node_modules/tsconfig-paths/src/tsconfig-loader.ts +++ b/node_modules/tsconfig-paths/src/tsconfig-loader.ts @@ -9,7 +9,7 @@ import StripBom = require("strip-bom"); * Typing for the parts of tsconfig that we care about */ export interface Tsconfig { - extends?: string; + extends?: string | string[]; compilerOptions?: { baseUrl?: string; paths?: { [key: string]: Array }; @@ -122,51 +122,105 @@ export function loadTsconfig( const configString = readFileSync(configFilePath); const cleanedJson = StripBom(configString); - const config: Tsconfig = JSON5.parse(cleanedJson); - let extendedConfig = config.extends; + let config: Tsconfig; + try { + config = JSON5.parse(cleanedJson); + } catch (e) { + throw new Error(`${configFilePath} is malformed ${e.message}`); + } + let extendedConfig = config.extends; if (extendedConfig) { - if ( - typeof extendedConfig === "string" && - extendedConfig.indexOf(".json") === -1 - ) { - extendedConfig += ".json"; - } - const currentDir = path.dirname(configFilePath); - let extendedConfigPath = path.join(currentDir, extendedConfig); - if ( - extendedConfig.indexOf("/") !== -1 && - extendedConfig.indexOf(".") !== -1 && - !existsSync(extendedConfigPath) - ) { - extendedConfigPath = path.join( - currentDir, - "node_modules", - extendedConfig + let base: Tsconfig; + + if (Array.isArray(extendedConfig)) { + base = extendedConfig.reduce( + (currBase, extendedConfigElement) => + mergeTsconfigs( + currBase, + loadTsconfigFromExtends( + configFilePath, + extendedConfigElement, + existsSync, + readFileSync + ) + ), + {} + ); + } else { + base = loadTsconfigFromExtends( + configFilePath, + extendedConfig, + existsSync, + readFileSync ); } - const base = - loadTsconfig(extendedConfigPath, existsSync, readFileSync) || {}; + return mergeTsconfigs(base, config); + } + return config; +} - // baseUrl should be interpreted as relative to the base tsconfig, - // but we need to update it so it is relative to the original tsconfig being loaded - if (base.compilerOptions && base.compilerOptions.baseUrl) { - const extendsDir = path.dirname(extendedConfig); - base.compilerOptions.baseUrl = path.join( - extendsDir, - base.compilerOptions.baseUrl - ); - } +/** + * Intended to be called only from loadTsconfig. + * Parameters don't have defaults because they should use the same as loadTsconfig. + */ +function loadTsconfigFromExtends( + configFilePath: string, + extendedConfigValue: string, + // eslint-disable-next-line no-shadow + existsSync: (path: string) => boolean, + readFileSync: (filename: string) => string +): Tsconfig { + if ( + typeof extendedConfigValue === "string" && + extendedConfigValue.indexOf(".json") === -1 + ) { + extendedConfigValue += ".json"; + } + const currentDir = path.dirname(configFilePath); + let extendedConfigPath = path.join(currentDir, extendedConfigValue); + if ( + extendedConfigValue.indexOf("/") !== -1 && + extendedConfigValue.indexOf(".") !== -1 && + !existsSync(extendedConfigPath) + ) { + extendedConfigPath = path.join( + currentDir, + "node_modules", + extendedConfigValue + ); + } - return { - ...base, - ...config, - compilerOptions: { - ...base.compilerOptions, - ...config.compilerOptions, - }, - }; + const config = + loadTsconfig(extendedConfigPath, existsSync, readFileSync) || {}; + + // baseUrl should be interpreted as relative to extendedConfigPath, + // but we need to update it so it is relative to the original tsconfig being loaded + if (config.compilerOptions?.baseUrl) { + const extendsDir = path.dirname(extendedConfigValue); + config.compilerOptions.baseUrl = path.join( + extendsDir, + config.compilerOptions.baseUrl + ); } + return config; } + +function mergeTsconfigs( + base: Tsconfig | undefined, + config: Tsconfig | undefined +): Tsconfig { + base = base || {}; + config = config || {}; + + return { + ...base, + ...config, + compilerOptions: { + ...base.compilerOptions, + ...config.compilerOptions, + }, + }; +} diff --git a/package-lock.json b/package-lock.json index 8ef31d6f18..c5d769b2fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,11 +48,11 @@ "@typescript-eslint/eslint-plugin": "^6.14.0", "@typescript-eslint/parser": "^6.14.0", "ava": "^5.3.1", - "eslint": "^8.55.0", + "eslint": "^8.56.0", "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-filenames": "^1.3.2", "eslint-plugin-github": "^4.10.1", - "eslint-plugin-import": "^2.29.0", + "eslint-plugin-import": "^2.29.1", "eslint-plugin-no-async-foreach": "^0.1.1", "micromatch": "4.0.5", "nock": "^13.4.0", @@ -505,9 +505,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", - "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2554,15 +2554,15 @@ } }, "node_modules/eslint": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", - "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.55.0", + "@eslint/js": "8.56.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -2776,9 +2776,9 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz", - "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==", + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, "dependencies": { "array-includes": "^3.1.7", @@ -2797,7 +2797,7 @@ "object.groupby": "^1.0.1", "object.values": "^1.1.7", "semver": "^6.3.1", - "tsconfig-paths": "^3.14.2" + "tsconfig-paths": "^3.15.0" }, "engines": { "node": ">=4" @@ -5972,9 +5972,9 @@ } }, "node_modules/tsconfig-paths": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", - "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, "dependencies": { "@types/json5": "^0.0.29", diff --git a/package.json b/package.json index 91dca9680a..c9787b09da 100644 --- a/package.json +++ b/package.json @@ -63,11 +63,11 @@ "@typescript-eslint/eslint-plugin": "^6.14.0", "@typescript-eslint/parser": "^6.14.0", "ava": "^5.3.1", - "eslint": "^8.55.0", + "eslint": "^8.56.0", "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-filenames": "^1.3.2", "eslint-plugin-github": "^4.10.1", - "eslint-plugin-import": "^2.29.0", + "eslint-plugin-import": "^2.29.1", "eslint-plugin-no-async-foreach": "^0.1.1", "micromatch": "4.0.5", "nock": "^13.4.0", From 8478e2a840874695b0051fb2bc86c9dbd3053d25 Mon Sep 17 00:00:00 2001 From: nickfyson Date: Mon, 18 Dec 2023 19:59:26 +0000 Subject: [PATCH 13/21] clarify comment on versions in the changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04c9356701..c5b84a0e35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs. -Note that for the CodeQL Action we use the major version number to mark a change in the node version used, while the minor & patch numbers indicate releases that support the same features across node versions. For example `3.22.11` is the first `v3` release and is functionally identical to `2.22.11`, which was released while we continue to support `v2`. This approach ensures an easy way to track exactly which features are included in different versions. +Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers. ## [UNRELEASED] From 26036736ba028c7dc17faa5fde126041c5dfb64a Mon Sep 17 00:00:00 2001 From: nickfyson Date: Mon, 18 Dec 2023 20:19:04 +0000 Subject: [PATCH 14/21] clarify comment on versions in the changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5b84a0e35..b3d0ac2c52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs. -Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers. +Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers. ## [UNRELEASED] From fe1e55feb0ad9b8944e70e91869a847eb8e31f0a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 15:27:01 +0000 Subject: [PATCH 15/21] Update default bundle to codeql-bundle-v2.15.5 --- lib/defaults.json | 8 ++++---- src/defaults.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/defaults.json b/lib/defaults.json index 8061083657..7178962c82 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.15.4", - "cliVersion": "2.15.4", - "priorBundleVersion": "codeql-bundle-v2.15.3", - "priorCliVersion": "2.15.3" + "bundleVersion": "codeql-bundle-v2.15.5", + "cliVersion": "2.15.5", + "priorBundleVersion": "codeql-bundle-v2.15.4", + "priorCliVersion": "2.15.4" } diff --git a/src/defaults.json b/src/defaults.json index 28d3d80334..5294fbaf25 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,6 +1,6 @@ { - "bundleVersion": "codeql-bundle-v2.15.4", - "cliVersion": "2.15.4", - "priorBundleVersion": "codeql-bundle-v2.15.3", - "priorCliVersion": "2.15.3" + "bundleVersion": "codeql-bundle-v2.15.5", + "cliVersion": "2.15.5", + "priorBundleVersion": "codeql-bundle-v2.15.4", + "priorCliVersion": "2.15.4" } From a99bd84dff3648800150caf86c49faf8e99b52b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 15:27:07 +0000 Subject: [PATCH 16/21] Add changelog note --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3d0ac2c52..094ced112b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the ## [UNRELEASED] -No user facing changes. +- Update default CodeQL bundle version to 2.15.5. [#2047](https://github.com/github/codeql-action/pull/2047) ## 3.22.11 - 13 Dec 2023 From a42c9a26343df70afaf9edbfb4c650d08e642f00 Mon Sep 17 00:00:00 2001 From: nickfyson Date: Wed, 20 Dec 2023 17:19:16 +0000 Subject: [PATCH 17/21] update required checks script to handle release branches --- .../release-branches/release-branches.py | 11 ++++++++-- .github/releases.ini | 1 + .../script/update-required-checks.sh | 22 ++++++++++++++++++- CONTRIBUTING.md | 4 ++-- 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 .github/releases.ini diff --git a/.github/actions/release-branches/release-branches.py b/.github/actions/release-branches/release-branches.py index 8e8bf37db5..664d016ed7 100644 --- a/.github/actions/release-branches/release-branches.py +++ b/.github/actions/release-branches/release-branches.py @@ -1,12 +1,19 @@ import argparse import json import os -import subprocess +import configparser # Name of the remote ORIGIN = 'origin' -OLDEST_SUPPORTED_MAJOR_VERSION = 2 +script_dir = os.path.dirname(os.path.realpath(__file__)) +grandparent_dir = os.path.dirname(os.path.dirname(script_dir)) + +config = configparser.ConfigParser() +with open(os.path.join(grandparent_dir, 'releases.ini')) as stream: + config.read_string('[default]\n' + stream.read()) + +OLDEST_SUPPORTED_MAJOR_VERSION = config['default']['OLDEST_SUPPORTED_MAJOR_VERSION'] def main(): diff --git a/.github/releases.ini b/.github/releases.ini new file mode 100644 index 0000000000..83aee4b155 --- /dev/null +++ b/.github/releases.ini @@ -0,0 +1 @@ +OLDEST_SUPPORTED_MAJOR_VERSION=2 diff --git a/.github/workflows/script/update-required-checks.sh b/.github/workflows/script/update-required-checks.sh index a06e90a380..f55ee8256b 100755 --- a/.github/workflows/script/update-required-checks.sh +++ b/.github/workflows/script/update-required-checks.sh @@ -2,6 +2,11 @@ # Update the required checks based on the current branch. # Typically, this will be main. +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +REPO_DIR="$(dirname "$SCRIPT_DIR")" +GRANDPARENT_DIR="$(dirname "$REPO_DIR")" +source "$GRANDPARENT_DIR/releases.ini" + if ! gh auth status 2>/dev/null; then gh auth status echo "Failed: Not authorized. This script requires admin access to github/codeql-action through the gh CLI." @@ -29,7 +34,22 @@ echo "$CHECKS" | jq echo "{\"contexts\": ${CHECKS}}" > checks.json -for BRANCH in main releases/v2; do +echo "Updating main" +gh api --silent -X "PATCH" "repos/github/codeql-action/branches/main/protection/required_status_checks" --input checks.json + +# list all branchs on origin remote matching releases/v* +BRANCHES="$(git ls-remote --heads origin 'releases/v*' | sed 's?.*refs/heads/??' | sort -V)" + +for BRANCH in $BRANCHES; do + + # strip exact 'releases/v' prefix from $BRANCH using count of characters + VERSION="${BRANCH:10}" + + if [ "$VERSION" -lt "$OLDEST_SUPPORTED_MAJOR_VERSION" ]; then + echo "Skipping $BRANCH" + continue + fi + echo "Updating $BRANCH" gh api --silent -X "PATCH" "repos/github/codeql-action/branches/$BRANCH/protection/required_status_checks" --input checks.json done diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 67d435103c..3d2703dee1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -111,8 +111,8 @@ To deprecate an older version of the Action: - Add a changelog note announcing the deprecation. - Implement an Actions warning for customers using the deprecated version. 1. Wait for the deprecation period to pass. -1. Upgrade the Actions warning for customers using the deprecated version to a non-fatal error, and mention that this version of the Action is no longer supported. -1. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [release-branches.py](.github/actions/release-branches/release-branches.py). Once this PR is merged, the release process will no longer backport changes to the deprecated release version. +1. Upgrade the Actions warning for customers using the deprecated version to a non-fatal error, and mention that this version of the Action is no longer supported. +1. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [releases.ini](.github/releases.ini). Once this PR is merged, the release process will no longer backport changes to the deprecated release version. ## Resources From 9ed5fc7131494b125e49f3dae119ef679e0caca4 Mon Sep 17 00:00:00 2001 From: nickfyson Date: Wed, 20 Dec 2023 20:00:52 +0000 Subject: [PATCH 18/21] add note about backporting check changes to v2 branch --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3d2703dee1..ea4ac72adb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,7 +76,9 @@ Since the `codeql-action` runs most of its testing through individual Actions wo 1. By default, this script retrieves the checks from the latest SHA on `main`, so make sure that your `main` branch is up to date. 2. Run the script. If there's a reason to, you can pass in a different SHA as a CLI argument. -3. After running, go to the [branch protection rules settings page](https://github.com/github/codeql-action/settings/branches) and validate that the rules for `main`, `v1`, and `v2` have been updated. +3. After running, go to the [branch protection rules settings page](https://github.com/github/codeql-action/settings/branches) and validate that the rules for `main`, `v2`, and `v3` have been updated. + +Note that any updates to checks need to be backported to the `releases/v2` branch, in order to maintain the same set of names for required checks. ## Deprecating a CodeQL version (write access required) From 658e3c66196dcc6a0e97919ab2ef382453a94454 Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Thu, 21 Dec 2023 13:38:16 -0800 Subject: [PATCH 19/21] Fix type error --- .github/actions/release-branches/release-branches.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/release-branches/release-branches.py b/.github/actions/release-branches/release-branches.py index 664d016ed7..3aecc4e969 100644 --- a/.github/actions/release-branches/release-branches.py +++ b/.github/actions/release-branches/release-branches.py @@ -46,7 +46,7 @@ def main(): if consider_backports: for i in range(int(major_version.strip("v"))-1, 0, -1): branch_name = f"releases/v{i}" - if i >= OLDEST_SUPPORTED_MAJOR_VERSION: + if i >= int(OLDEST_SUPPORTED_MAJOR_VERSION): backport_target_branches.append(branch_name) f.write("backport_target_branches="+json.dumps(backport_target_branches)+"\n") From 0be92905083e1fbcf7491e075cd8ad0da02d01b6 Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Thu, 21 Dec 2023 13:43:00 -0800 Subject: [PATCH 20/21] Typecast `OLDEST_SUPPORTED_MAJOR_VERSION` when defined --- .github/actions/release-branches/release-branches.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/release-branches/release-branches.py b/.github/actions/release-branches/release-branches.py index 3aecc4e969..ad941bb0c3 100644 --- a/.github/actions/release-branches/release-branches.py +++ b/.github/actions/release-branches/release-branches.py @@ -13,7 +13,7 @@ with open(os.path.join(grandparent_dir, 'releases.ini')) as stream: config.read_string('[default]\n' + stream.read()) -OLDEST_SUPPORTED_MAJOR_VERSION = config['default']['OLDEST_SUPPORTED_MAJOR_VERSION'] +OLDEST_SUPPORTED_MAJOR_VERSION = int(config['default']['OLDEST_SUPPORTED_MAJOR_VERSION']) def main(): @@ -46,7 +46,7 @@ def main(): if consider_backports: for i in range(int(major_version.strip("v"))-1, 0, -1): branch_name = f"releases/v{i}" - if i >= int(OLDEST_SUPPORTED_MAJOR_VERSION): + if i >= OLDEST_SUPPORTED_MAJOR_VERSION: backport_target_branches.append(branch_name) f.write("backport_target_branches="+json.dumps(backport_target_branches)+"\n") From c1cf794881a27f68e730726dd21de4fa01022485 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 00:19:06 +0000 Subject: [PATCH 21/21] Update changelog for v3.22.12 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 094ced112b..0426385527 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers. -## [UNRELEASED] +## 3.22.12 - 22 Dec 2023 - Update default CodeQL bundle version to 2.15.5. [#2047](https://github.com/github/codeql-action/pull/2047)