fix(ast-spec): use Expression in argument of ThrowStatement (typescript-eslint#9632)

dak2 · web-flow · commit 9f70ed14a733 · 2024-08-25T16:37:50.000+04:00
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -352,9 +352,7 @@ export default tseslint.config(
   // test file specific configuration
   {
     files: [
-      'packages/*/tests/**/*.spec.{ts,tsx,cts,mts}',
       'packages/*/tests/**/*.test.{ts,tsx,cts,mts}',
-      'packages/*/tests/**/spec.{ts,tsx,cts,mts}',
       'packages/*/tests/**/test.{ts,tsx,cts,mts}',
       'packages/parser/tests/**/*.{ts,tsx,cts,mts}',
       'packages/integration-tests/tools/integration-test-base.ts',
diff --git a/nx.json b/nx.json
@@ -93,7 +93,7 @@
     ],
     "production": [
       "default",
-      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/**/?(*.)+(test).[jt]s?(x)?(.snap)",
       "!{projectRoot}/tsconfig.spec.json",
       "!{projectRoot}/jest.config.[jt]s",
       "!{projectRoot}/src/test-setup.[jt]s"
diff --git a/packages/ast-spec/src/statement/ThrowStatement/spec.ts b/packages/ast-spec/src/statement/ThrowStatement/spec.ts
@@ -1,9 +1,8 @@
 import type { AST_NODE_TYPES } from '../../ast-node-types';
 import type { BaseNode } from '../../base/BaseNode';
-import type { TSAsExpression } from '../../expression/TSAsExpression/spec';
-import type { Statement } from '../../unions/Statement';
+import type { Expression } from '../../unions/Expression';
 
 export interface ThrowStatement extends BaseNode {
-  argument: Statement | TSAsExpression | null;
+  argument: Expression;
   type: AST_NODE_TYPES.ThrowStatement;
 }
diff --git a/packages/eslint-plugin/src/rules/only-throw-error.ts b/packages/eslint-plugin/src/rules/only-throw-error.ts
@@ -89,9 +89,7 @@ export default createRule<Options, MessageIds>({
 
     return {
       ThrowStatement(node): void {
-        if (node.argument) {
-          checkThrowArgument(node.argument);
-        }
+        checkThrowArgument(node.argument);
       },
     };
   },
diff --git a/packages/scope-manager/tsconfig.build.json b/packages/scope-manager/tsconfig.build.json
@@ -9,7 +9,7 @@
     "types": ["node", "jest"]
   },
   "include": ["src", "typings"],
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
+  "exclude": ["**/*.test.ts"],
   "references": [
     { "path": "../types/tsconfig.build.json" },
     { "path": "../visitor-keys/tsconfig.build.json" }
diff --git a/packages/scope-manager/tsconfig.spec.json b/packages/scope-manager/tsconfig.spec.json
@@ -9,13 +9,9 @@
     "tests",
     "tools",
     "**/*.test.ts",
-    "**/*.spec.ts",
     "**/*.test.tsx",
-    "**/*.spec.tsx",
     "**/*.test.js",
-    "**/*.spec.js",
     "**/*.test.jsx",
-    "**/*.spec.jsx",
     "**/*.d.ts"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,9 @@`
`9`	`9`	`"tests",`
`10`	`10`	`"tools",`
`11`	`11`	`"*/.test.ts",`
`12`		`- "*/.spec.ts",`
`13`	`12`	`"*/.test.tsx",`
`14`		`- "*/.spec.tsx",`
`15`	`13`	`"*/.test.js",`
`16`		`- "*/.spec.js",`
`17`	`14`	`"*/.test.jsx",`
`18`		`- "*/.spec.jsx",`
`19`	`15`	`"*/.d.ts"`
`20`	`16`	`]`
`21`	`17`	`}`