refactor: replace toStaticValue with getStaticValue

Rel1cx · Rel1cx · commit 6f895ebeceb0 · 2025-09-07T04:34:39.000+08:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.0-next.169
+2.0.0-beta.69
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/monorepo",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "private": true,
   "description": "Monorepo for eslint-plugin-react-[x, dom, web-api, hooks-extra, naming-convention].",
   "keywords": [
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
diff --git a/packages/plugins/eslint-plugin-react-debug/package.json b/packages/plugins/eslint-plugin-react-debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-debug",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's ESLint plugin for debugging related rules.",
   "keywords": [
     "react",
diff --git a/packages/plugins/eslint-plugin-react-dom/package.json b/packages/plugins/eslint-plugin-react-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-dom",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's ESLint plugin for React DOM related rules.",
   "keywords": [
     "react",
diff --git a/packages/plugins/eslint-plugin-react-hooks-extra/package.json b/packages/plugins/eslint-plugin-react-hooks-extra/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-hooks-extra",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's ESLint plugin for React Hooks related rules.",
   "keywords": [
     "react",
diff --git a/packages/plugins/eslint-plugin-react-hooks-extra/src/rules-hooks/use-no-direct-set-state-in-use-effect.ts b/packages/plugins/eslint-plugin-react-hooks-extra/src/rules-hooks/use-no-direct-set-state-in-use-effect.ts
@@ -6,6 +6,7 @@ import { getSettingsFromContext } from "@eslint-react/shared";
 import * as VAR from "@eslint-react/var";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 import type { ESLintUtils, TSESTree } from "@typescript-eslint/utils";
+import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import type { Scope } from "@typescript-eslint/utils/ts-eslint";
 
 import { match } from "ts-pattern";
@@ -142,11 +143,7 @@ export function useNoDirectSetStateInUseEffect<Ctx extends RuleContext>(
           return false;
         }
         const indexScope = context.sourceCode.getScope(node);
-        const indexValue = VAR.toStaticValue({
-          kind: "lazy",
-          node: index,
-          initialScope: indexScope,
-        }).value;
+        const indexValue = getStaticValue(index, indexScope)?.value;
         return indexValue === 1 && isIdFromUseStateCall(callee.object);
       }
       // const [data, setData] = useState();
@@ -162,11 +159,7 @@ export function useNoDirectSetStateInUseEffect<Ctx extends RuleContext>(
         }
         const property = node.callee.property;
         const propertyScope = context.sourceCode.getScope(node);
-        const propertyValue = VAR.toStaticValue({
-          kind: "lazy",
-          node: property,
-          initialScope: propertyScope,
-        }).value;
+        const propertyValue = getStaticValue(property, propertyScope)?.value;
         return propertyValue === 1 && isIdFromUseStateCall(node.callee.object, 1);
       }
       default: {
diff --git a/packages/plugins/eslint-plugin-react-naming-convention/package.json b/packages/plugins/eslint-plugin-react-naming-convention/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-naming-convention",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's ESLint plugin for naming convention related rules.",
   "keywords": [
     "react",
diff --git a/packages/plugins/eslint-plugin-react-web-api/package.json b/packages/plugins/eslint-plugin-react-web-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",
diff --git a/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-event-listener.ts b/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-event-listener.ts
@@ -9,6 +9,7 @@ import { AST_NODE_TYPES as T } from "@typescript-eslint/utils";
 import type { RuleListener } from "@typescript-eslint/utils/ts-eslint";
 import type { EventListenerEntry } from "../types";
 
+import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import { isMatching, match, P } from "ts-pattern";
 import { createRule, getPhaseKindOfFunction } from "../utils";
 
@@ -102,7 +103,7 @@ function getOptions(node: TSESTree.CallExpressionArgument, initialScope: Scope):
         break;
       }
       default: {
-        v = VAR.toStaticValue({ kind: "lazy", node: value, initialScope }).value;
+        v = getStaticValue(value, initialScope)?.value;
         break;
       }
     }
diff --git a/packages/plugins/eslint-plugin-react-x/package.json b/packages/plugins/eslint-plugin-react-x/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "A set of composable ESLint rules for for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-leaked-conditional-rendering.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-leaked-conditional-rendering.ts
@@ -14,6 +14,7 @@ import type { CamelCase } from "string-ts";
 import { unionConstituents } from "ts-api-utils";
 import { match, P } from "ts-pattern";
 
+import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import { createRule } from "../utils";
 
 export const RULE_NAME = "no-leaked-conditional-rendering";
@@ -82,9 +83,7 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
         }
         const initialScope = context.sourceCode.getScope(left);
         const isLeftNan = (left.type === T.Identifier && left.name === "NaN")
-          || VAR
-              .toStaticValue({ kind: "lazy", node: left, initialScope })
-              .value === "NaN";
+          || getStaticValue(left, initialScope)?.value === "NaN";
         if (isLeftNan) {
           return {
             messageId: "noLeakedConditionalRendering",
diff --git a/packages/plugins/eslint-plugin/package.json b/packages/plugins/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/eslint-plugin",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "A unified plugin that combines all individual plugins from the eslint-react monorepo into one.",
   "keywords": [
     "react",
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/shared",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's Shared constants and functions.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
diff --git a/packages/utilities/ast/package.json b/packages/utilities/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/ast",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's TSESTree AST utility module.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
diff --git a/packages/utilities/eff/package.json b/packages/utilities/eff/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/eff",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "JavaScript and TypeScript utilities (previously some re-exports of the effect library).",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
diff --git a/packages/utilities/kit/package.json b/packages/utilities/kit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/kit",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's plugin kit for building plugins and rules.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
diff --git a/packages/utilities/var/package.json b/packages/utilities/var/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "2.0.0-next.169",
+  "version": "2.0.0-beta.69",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
diff --git a/packages/utilities/var/src/index.ts b/packages/utilities/var/src/index.ts
@@ -1,7 +1,6 @@
 export * from "./misc";
 export * from "./value-construction";
 export * from "./value-equal";
-export * from "./value-helper";
 export * from "./variable-assignment";
 export type * from "./variable-declaration";
 export * from "./variable-extractor";
diff --git a/packages/utilities/var/src/value-equal.ts b/packages/utilities/var/src/value-equal.ts
@@ -3,7 +3,7 @@ import { unit } from "@eslint-react/eff";
 import { DefinitionType, type Scope, type Variable } from "@typescript-eslint/scope-manager";
 import type { TSESTree } from "@typescript-eslint/types";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
-import { toStaticValue } from "./value-helper";
+import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import { findVariable } from "./variable-extractor";
 import { getVariableDefinitionNode } from "./variable-resolver";
 
@@ -99,9 +99,9 @@ export function isNodeValueEqual(
       return aFunction === bFunction;
     }
     default: {
-      const aStatic = toStaticValue({ kind: "lazy", node: a, initialScope: aScope });
-      const bStatic = toStaticValue({ kind: "lazy", node: b, initialScope: bScope });
-      return aStatic.kind !== "none" && bStatic.kind !== "none" && aStatic.value === bStatic.value;
+      const aStatic = getStaticValue(a, aScope);
+      const bStatic = getStaticValue(b, bScope);
+      return aStatic != null && bStatic != null && aStatic.value === bStatic.value;
     }
   }
 }
diff --git a/packages/utilities/var/src/value-helper.ts b/packages/utilities/var/src/value-helper.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@eslint-react/monorepo",`
`3`		`- "version": "2.0.0-next.169",`
	`3`	`+ "version": "2.0.0-beta.69",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "Monorepo for eslint-plugin-react-[x, dom, web-api, hooks-extra, naming-convention].",`
`6`	`6`	`"keywords": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@eslint-react/core",`
`3`		`- "version": "2.0.0-next.169",`
	`3`	`+ "version": "2.0.0-beta.69",`
`4`	`4`	`"description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",`
`5`	`5`	`"homepage": "https://github.com/Rel1cx/eslint-react",`
`6`	`6`	`"bugs": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eslint-plugin-react-debug",`
`3`		`- "version": "2.0.0-next.169",`
	`3`	`+ "version": "2.0.0-beta.69",`
`4`	`4`	`"description": "ESLint React's ESLint plugin for debugging related rules.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"react",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eslint-plugin-react-dom",`
`3`		`- "version": "2.0.0-next.169",`
	`3`	`+ "version": "2.0.0-beta.69",`
`4`	`4`	`"description": "ESLint React's ESLint plugin for React DOM related rules.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"react",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eslint-plugin-react-hooks-extra",`
`3`		`- "version": "2.0.0-next.169",`
	`3`	`+ "version": "2.0.0-beta.69",`
`4`	`4`	`"description": "ESLint React's ESLint plugin for React Hooks related rules.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"react",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eslint-plugin-react-naming-convention",`
`3`		`- "version": "2.0.0-next.169",`
	`3`	`+ "version": "2.0.0-beta.69",`
`4`	`4`	`"description": "ESLint React's ESLint plugin for naming convention related rules.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"react",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eslint-plugin-react-web-api",`
`3`		`- "version": "2.0.0-next.169",`
	`3`	`+ "version": "2.0.0-beta.69",`
`4`	`4`	`"description": "ESLint React's ESLint plugin for interacting with Web APIs",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"react",`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import { AST_NODE_TYPES as T } from "@typescript-eslint/utils";`
`9`	`9`	`import type { RuleListener } from "@typescript-eslint/utils/ts-eslint";`
`10`	`10`	`import type { EventListenerEntry } from "../types";`
`11`	`11`
	`12`	`+import { getStaticValue } from "@typescript-eslint/utils/ast-utils";`
`12`	`13`	`import { isMatching, match, P } from "ts-pattern";`
`13`	`14`	`import { createRule, getPhaseKindOfFunction } from "../utils";`
`14`	`15`
`@@ -102,7 +103,7 @@ function getOptions(node: TSESTree.CallExpressionArgument, initialScope: Scope):`
`102`	`103`	`break;`
`103`	`104`	`}`
`104`	`105`	`default: {`
`105`		`- v = VAR.toStaticValue({ kind: "lazy", node: value, initialScope }).value;`
	`106`	`+ v = getStaticValue(value, initialScope)?.value;`
`106`	`107`	`break;`
`107`	`108`	`}`
`108`	`109`	`}`