From c80583a9a944f70285648a4f426e3b6365a55b48 Mon Sep 17 00:00:00 2001 From: Mark de Dios Date: Wed, 25 Jun 2025 15:24:54 -0700 Subject: [PATCH 1/6] Update only throw error documentation allowRethrowing to true per source --- packages/eslint-plugin/docs/rules/only-throw-error.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eslint-plugin/docs/rules/only-throw-error.mdx b/packages/eslint-plugin/docs/rules/only-throw-error.mdx index e30f67a0869b..fe7fbdb20e53 100644 --- a/packages/eslint-plugin/docs/rules/only-throw-error.mdx +++ b/packages/eslint-plugin/docs/rules/only-throw-error.mdx @@ -141,7 +141,7 @@ interface Options { const defaultOptions: Options = { allow: [], - allowRethrowing: false, + allowRethrowing: true, allowThrowingAny: true, allowThrowingUnknown: true, }; From db0369e3380b09f51308097c185488aee494267c Mon Sep 17 00:00:00 2001 From: Mark de Dios Date: Tue, 23 Sep 2025 21:28:30 -0700 Subject: [PATCH 2/6] Add deprecated comments to invalid test case #type, lint message #nodetype --- packages/rule-tester/src/types/InvalidTestCase.ts | 2 +- packages/utils/src/ts-eslint/Linter.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/rule-tester/src/types/InvalidTestCase.ts b/packages/rule-tester/src/types/InvalidTestCase.ts index 73e8f48a6771..f5ba876c8510 100644 --- a/packages/rule-tester/src/types/InvalidTestCase.ts +++ b/packages/rule-tester/src/types/InvalidTestCase.ts @@ -53,7 +53,7 @@ export interface TestCaseError { */ readonly suggestions?: readonly SuggestionOutput[] | null; /** - * The type of the reported AST node. + * @deprecated `type` is deprecated and will be removed in the next major version. */ readonly type?: AST_NODE_TYPES | AST_TOKEN_TYPES; diff --git a/packages/utils/src/ts-eslint/Linter.ts b/packages/utils/src/ts-eslint/Linter.ts index 499213d95f3b..8479a158a7cb 100644 --- a/packages/utils/src/ts-eslint/Linter.ts +++ b/packages/utils/src/ts-eslint/Linter.ts @@ -229,6 +229,9 @@ namespace Linter { */ message: string; messageId?: string; + /** + * @deprecated `nodeType` is deprecated and will be removed in the next major version. + */ nodeType: string; /** * The ID of the rule which makes this message. From a52df20dbb069e9d7067f52330178cc73ea59809 Mon Sep 17 00:00:00 2001 From: Mark de Dios Date: Tue, 23 Sep 2025 21:55:25 -0700 Subject: [PATCH 3/6] Remove reference to TestCaseError.type, LintMessage.nodeType in ruleteser file --- packages/rule-tester/src/RuleTester.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/rule-tester/src/RuleTester.ts b/packages/rule-tester/src/RuleTester.ts index bd0d8cede4eb..723bc6b17227 100644 --- a/packages/rule-tester/src/RuleTester.ts +++ b/packages/rule-tester/src/RuleTester.ts @@ -1102,14 +1102,6 @@ export class RuleTester extends TestFramework { ); } - if (error.type) { - assert.strictEqual( - message.nodeType, - error.type, - `Error type should be ${error.type}, found ${message.nodeType}`, - ); - } - if (hasOwnProperty(error, 'line')) { assert.strictEqual( message.line, From 63f14647348d4d3953bc3faa7d31b2ee670791b9 Mon Sep 17 00:00:00 2001 From: Mark de Dios Date: Tue, 23 Sep 2025 22:17:21 -0700 Subject: [PATCH 4/6] Remove refs to deprecated types --- .../tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts | 3 --- packages/rule-tester/tests/RuleTester.test.ts | 1 - packages/website/src/components/linter/createLinter.ts | 1 - 3 files changed, 5 deletions(-) diff --git a/packages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts b/packages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts index d05d538d2731..9a3286b865da 100644 --- a/packages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts +++ b/packages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts @@ -88,13 +88,11 @@ function assignedError( * Returns an expected error for used-but-ignored variables. * @param varName The name of the variable * @param [additional] The additional text for the message data - * @param [type] The node type (defaults to "Identifier") * @returns An expected error object */ function usedIgnoredError( varName: string, additional = '', - type = AST_NODE_TYPES.Identifier, ): TestCaseError { return { data: { @@ -102,7 +100,6 @@ function usedIgnoredError( varName, }, messageId: 'usedIgnoredVar', - type, }; } diff --git a/packages/rule-tester/tests/RuleTester.test.ts b/packages/rule-tester/tests/RuleTester.test.ts index 73a5a05d45cf..b7a276c69e4c 100644 --- a/packages/rule-tester/tests/RuleTester.test.ts +++ b/packages/rule-tester/tests/RuleTester.test.ts @@ -144,7 +144,6 @@ describe(RuleTester, () => { line: 0, message: 'error', messageId: 'error', - nodeType: AST_NODE_TYPES.Program, ruleId: 'my-rule', severity: 2, source: null, diff --git a/packages/website/src/components/linter/createLinter.ts b/packages/website/src/components/linter/createLinter.ts index eefd1b0e4287..c9c83aa2a34f 100644 --- a/packages/website/src/components/linter/createLinter.ts +++ b/packages/website/src/components/linter/createLinter.ts @@ -94,7 +94,6 @@ export function createLinter( column: 1, line: 1, message: String(e instanceof Error ? e.stack : e), - nodeType: '', ruleId: '', severity: 2, source: 'eslint', From e5f3cae8bf72a5d36be6cf5a037c3393b5b895d3 Mon Sep 17 00:00:00 2001 From: Mark de Dios Date: Tue, 23 Sep 2025 22:26:57 -0700 Subject: [PATCH 5/6] make nodeType optional in Linter.ts --- packages/utils/src/ts-eslint/Linter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/src/ts-eslint/Linter.ts b/packages/utils/src/ts-eslint/Linter.ts index 8479a158a7cb..7bbb2b316445 100644 --- a/packages/utils/src/ts-eslint/Linter.ts +++ b/packages/utils/src/ts-eslint/Linter.ts @@ -232,7 +232,7 @@ namespace Linter { /** * @deprecated `nodeType` is deprecated and will be removed in the next major version. */ - nodeType: string; + nodeType?: string; /** * The ID of the rule which makes this message. */ From 22bf021253c55872889221ce857912bd7247b0fc Mon Sep 17 00:00:00 2001 From: Mark de Dios Date: Wed, 24 Sep 2025 00:57:27 -0700 Subject: [PATCH 6/6] Remove AST_NODE_TYPES import from no unused vars eslint test --- .../tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts b/packages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts index 9a3286b865da..4573260c3271 100644 --- a/packages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts +++ b/packages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts @@ -6,7 +6,6 @@ import type { TestCaseError } from '@typescript-eslint/rule-tester'; import type { TSESTree } from '@typescript-eslint/utils'; import { RuleTester } from '@typescript-eslint/rule-tester'; -import { AST_NODE_TYPES } from '@typescript-eslint/utils'; import type { MessageIds } from '../../../src/rules/no-unused-vars';