refactor: improve variable utils

Author: Rel1cx

VERSION

@@ -1 +1 @@
-1.5.28
+1.5.29-next.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/monorepo",
-  "version": "1.5.28",
+  "version": "1.5.29-next.0",
   "private": true,
   "description": "A series of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.5.28",
+  "version": "1.5.29-next.0",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and Patterns.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {

packages/plugins/eslint-plugin-react-debug/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-debug",
-  "version": "1.5.28",
+  "version": "1.5.29-next.0",
   "description": "ESLint React's ESLint plugin for debugging related rules.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {

packages/plugins/eslint-plugin-react-dom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-dom",
-  "version": "1.5.28",
+  "version": "1.5.29-next.0",
   "description": "ESLint React's ESLint plugin for React DOM related rules.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {

packages/plugins/eslint-plugin-react-dom/src/rules/no-dangerously-set-innerhtml-with-children.ts

@@ -2,7 +2,7 @@ import { is, isOneOf, NodeType } from "@eslint-react/ast";
 import { isCreateElementCall } from "@eslint-react/core";
 import { findPropInProperties, hasProp, isLineBreak } from "@eslint-react/jsx";
 import { F, O, Pred } from "@eslint-react/tools";
-import { findVariable, getVariableInit } from "@eslint-react/var";
+import { findVariable, getVariableNode } from "@eslint-react/var";
 import type { TSESTree } from "@typescript-eslint/types";
 import type { ESLintUtils } from "@typescript-eslint/utils";
 import type { ConstantCase } from "string-ts";
@@ -49,7 +49,7 @@ export default createRule<[], MessageID>({
 
             return F.pipe(
               findVariable(n.name, initialScope),
-              O.flatMap(getVariableInit(0)),
+              O.flatMap(getVariableNode(0)),
               O.flatMap((n) => "properties" in n ? O.fromNullable(n.properties) : O.none()),
             );
           })

packages/plugins/eslint-plugin-react-dom/src/rules/no-dangerously-set-innerhtml.ts

@@ -2,7 +2,7 @@ import { is, isOneOf, NodeType } from "@eslint-react/ast";
 import { isCreateElementCall } from "@eslint-react/core";
 import { findPropInAttributes, findPropInProperties } from "@eslint-react/jsx";
 import { F, O } from "@eslint-react/tools";
-import { findVariable, getVariableInit } from "@eslint-react/var";
+import { findVariable, getVariableNode } from "@eslint-react/var";
 import type { ESLintUtils } from "@typescript-eslint/utils";
 import type { ConstantCase } from "string-ts";
 import { match } from "ts-pattern";
@@ -41,7 +41,7 @@ export default createRule<[], MessageID>({
 
             return F.pipe(
               findVariable(n.name, initialScope),
-              O.flatMap(getVariableInit(0)),
+              O.flatMap(getVariableNode(0)),
               O.flatMap((n) => "properties" in n ? O.fromNullable(n.properties) : O.none()),
             );
           })

packages/plugins/eslint-plugin-react-hooks-extra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-hooks-extra",
-  "version": "1.5.28",
+  "version": "1.5.29-next.0",
   "description": "ESLint React's ESLint plugin for React Hooks related rules.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {

packages/plugins/eslint-plugin-react-hooks-extra/src/rules/ensure-use-callback-has-non-empty-deps.ts

@@ -3,7 +3,7 @@ import { is, isFunction, NodeType } from "@eslint-react/ast";
 import { isReactHookCall, isReactHookCallWithNameLoose, isUseCallbackCall } from "@eslint-react/core";
 import { getESLintReactSettings } from "@eslint-react/shared";
 import { F, O } from "@eslint-react/tools";
-import { findVariable, getVariableInit } from "@eslint-react/var";
+import { findVariable, getVariableNode } from "@eslint-react/var";
 import type { ESLintUtils } from "@typescript-eslint/utils";
 import type { ConstantCase } from "string-ts";
 import { match } from "ts-pattern";
@@ -53,7 +53,7 @@ export default createRule<[], MessageID>({
             .with({ type: NodeType.Identifier }, n => {
               return F.pipe(
                 findVariable(n.name, initialScope),
-                O.flatMap(getVariableInit(0)),
+                O.flatMap(getVariableNode(0)),
                 O.filter(is(NodeType.ArrayExpression)),
               );
             })
@@ -80,7 +80,7 @@ export default createRule<[], MessageID>({
             .with({ type: NodeType.Identifier }, n => {
               return F.pipe(
                 findVariable(n.name, initialScope),
-                O.flatMap(getVariableInit(0)),
+                O.flatMap(getVariableNode(0)),
                 O.filter(isFunction),
               ) as O.Option<TSESTreeFunction>;
             })

packages/plugins/eslint-plugin-react-hooks-extra/src/rules/ensure-use-memo-has-non-empty-deps.ts

@@ -3,7 +3,7 @@ import { is, isFunction, NodeType } from "@eslint-react/ast";
 import { isReactHookCall, isReactHookCallWithNameLoose, isUseMemoCall } from "@eslint-react/core";
 import { getESLintReactSettings } from "@eslint-react/shared";
 import { F, O } from "@eslint-react/tools";
-import { findVariable, getVariableInit } from "@eslint-react/var";
+import { findVariable, getVariableNode } from "@eslint-react/var";
 import type { ESLintUtils } from "@typescript-eslint/utils";
 import type { ConstantCase } from "string-ts";
 import { match } from "ts-pattern";
@@ -53,7 +53,7 @@ export default createRule<[], MessageID>({
             .with({ type: NodeType.Identifier }, n => {
               return F.pipe(
                 findVariable(n.name, initialScope),
-                O.flatMap(getVariableInit(0)),
+                O.flatMap(getVariableNode(0)),
                 O.filter(is(NodeType.ArrayExpression)),
               );
             })
@@ -80,7 +80,7 @@ export default createRule<[], MessageID>({
             .with({ type: NodeType.Identifier }, n => {
               return F.pipe(
                 findVariable(n.name, initialScope),
-                O.flatMap(getVariableInit(0)),
+                O.flatMap(getVariableNode(0)),
                 O.filter(isFunction),
               ) as O.Option<TSESTreeFunction>;
             })