eslint-plugin-react-hooks-extra 1.10.2-next.2 → 1.11.0-beta.10

package/dist/index.js

@@ -11,7 +11,7 @@ var tsPattern = require('ts-pattern');
 
 // package.json
 var name = "eslint-plugin-react-hooks-extra";
-var version = "1.10.2-next.2";
+var version = "1.11.0-beta.10";
 var createRule = shared.createRuleForPlugin("hooks-extra");
 function isFromHookCall(name2, context, settings, predicate = tools.F.constTrue) {
   const hookAlias = settings.additionalHooks?.[name2] ?? [];
@@ -294,13 +294,13 @@ var no_direct_set_state_in_use_effect_default = createRule({
       description: "disallow direct calls to the 'set' function of 'useState' in 'useEffect'"
     },
     messages: {
-      noDirectSetStateInUseEffect: "Do not call the 'set' function of 'useState' directly in 'useEffect'."
+      noDirectSetStateInUseEffect: "Do not call the 'set' function '{{name}}' of 'useState' directly in 'useEffect'."
     },
     schema: []
   },
   name: RULE_NAME4,
   create(context) {
-    if (!context.sourceCode.text.includes("use")) return {};
+    if (!/use\w*Effect/u.test(context.sourceCode.text)) return {};
     const settings = shared.decodeSettings(context.settings);
     const additionalHooks = settings.additionalHooks ?? {};
     const isUseEffectCall = core.isReactHookCallWithNameAlias("useEffect", context, additionalHooks.useEffect ?? []);
@@ -314,8 +314,8 @@ var no_direct_set_state_in_use_effect_default = createRule({
     const setupFunctionIdentifiers = [];
     const indirectFunctionCalls = [];
     const indirectSetStateCalls = /* @__PURE__ */ new WeakMap();
-    const indirectSetStateCallsAsEFs = /* @__PURE__ */ new Map();
     const indirectSetStateCallsAsArgs = /* @__PURE__ */ new WeakMap();
+    const indirectSetStateCallsAsSetups = /* @__PURE__ */ new Map();
     const indirectSetStateCallsInHooks = /* @__PURE__ */ new WeakMap();
     const onSetupFunctionEnter = (node) => {
       tools.MutRef.set(setupFunctionRef, node);
@@ -363,7 +363,8 @@ var no_direct_set_state_in_use_effect_default = createRule({
           }
           context.report({
             messageId: "noDirectSetStateInUseEffect",
-            node
+            node,
+            data: { name: context.sourceCode.getText(node.callee) }
           });
         }).with("useEffect", () => {
           const [firstArg] = node.arguments;
@@ -392,7 +393,7 @@ var no_direct_set_state_in_use_effect_default = createRule({
             }
             if (isUseEffectCall(node.parent)) {
               const calls = indirectSetStateCallsAsArgs.get(node.parent) ?? [];
-              indirectSetStateCallsAsEFs.set(node.parent, [...calls, node]);
+              indirectSetStateCallsAsSetups.set(node.parent, [...calls, node]);
             }
             break;
           }
@@ -421,7 +422,7 @@ var no_direct_set_state_in_use_effect_default = createRule({
           }
           return [];
         };
-        for (const [_, calls] of indirectSetStateCallsAsEFs) {
+        for (const [_, calls] of indirectSetStateCallsAsSetups) {
           for (const call of calls) {
             context.report({
               messageId: "noDirectSetStateInUseEffect",
@@ -438,7 +439,9 @@ var no_direct_set_state_in_use_effect_default = createRule({
             context.report({
               messageId: "noDirectSetStateInUseEffect",
               node: setStateCall,
-              data: { name: name2 }
+              data: {
+                name: ast.toReadableNodeName(setStateCall, (n) => context.sourceCode.getText(n))
+              }
             });
           }
         }
@@ -448,7 +451,9 @@ var no_direct_set_state_in_use_effect_default = createRule({
             context.report({
               messageId: "noDirectSetStateInUseEffect",
               node: setStateCall,
-              data: { name: id.name }
+              data: {
+                name: ast.toReadableNodeName(setStateCall, (n) => context.sourceCode.getText(n))
+              }
             });
           }
         }
@@ -465,13 +470,13 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
       description: "disallow direct calls to the 'set' function of 'useState' in 'useLayoutEffect'"
     },
     messages: {
-      noDirectSetStateInUseLayoutEffect: "Do not call the 'set' function of 'useState' directly in 'useLayoutEffect'."
+      noDirectSetStateInUseLayoutEffect: "Do not call the 'set' function '{{name}}' of 'useState' directly in 'useLayoutEffect'."
     },
     schema: []
   },
   name: RULE_NAME5,
   create(context) {
-    if (!context.sourceCode.text.includes("use")) return {};
+    if (!/use\w*Effect/u.test(context.sourceCode.text)) return {};
     const settings = shared.decodeSettings(context.settings);
     const additionalHooks = settings.additionalHooks ?? {};
     const isUseEffectCall = core.isReactHookCallWithNameAlias(
@@ -489,7 +494,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
     const setupFunctionIdentifiers = [];
     const indirectFunctionCalls = [];
     const indirectSetStateCalls = /* @__PURE__ */ new WeakMap();
-    const indirectSetStateCallsAsEFs = /* @__PURE__ */ new Map();
+    const indirectSetStateCallsAsSetups = /* @__PURE__ */ new Map();
     const indirectSetStateCallsAsArgs = /* @__PURE__ */ new WeakMap();
     const indirectSetStateCallsInHooks = /* @__PURE__ */ new WeakMap();
     const onSetupFunctionEnter = (node) => {
@@ -538,7 +543,10 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
           }
           context.report({
             messageId: "noDirectSetStateInUseLayoutEffect",
-            node
+            node,
+            data: {
+              name: context.sourceCode.getText(node.callee)
+            }
           });
         }).with("useLayoutEffect", () => {
           const [firstArg] = node.arguments;
@@ -567,7 +575,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
             }
             if (isUseEffectCall(node.parent)) {
               const calls = indirectSetStateCallsAsArgs.get(node.parent) ?? [];
-              indirectSetStateCallsAsEFs.set(node.parent, [...calls, node]);
+              indirectSetStateCallsAsSetups.set(node.parent, [...calls, node]);
             }
             break;
           }
@@ -596,7 +604,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
           }
           return [];
         };
-        for (const [_, calls] of indirectSetStateCallsAsEFs) {
+        for (const [_, calls] of indirectSetStateCallsAsSetups) {
           for (const call of calls) {
             context.report({
               messageId: "noDirectSetStateInUseLayoutEffect",
@@ -613,7 +621,9 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
             context.report({
               messageId: "noDirectSetStateInUseLayoutEffect",
               node: setStateCall,
-              data: { name: name2 }
+              data: {
+                name: ast.toReadableNodeName(setStateCall, (n) => context.sourceCode.getText(n))
+              }
             });
           }
         }
@@ -623,7 +633,9 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
             context.report({
               messageId: "noDirectSetStateInUseLayoutEffect",
               node: setStateCall,
-              data: { name: id.name }
+              data: {
+                name: ast.toReadableNodeName(setStateCall, (n) => context.sourceCode.getText(n))
+              }
             });
           }
         }

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { useHookCollector, isReactHookCall, isUseCallbackCall, isReactHookCallWithNameLoose, isUseMemoCall, isReactHookCallWithNameAlias, isUseStateCall, isReactHookName } from '@eslint-react/core';
 import { createRuleForPlugin, decodeSettings } from '@eslint-react/shared';
-import { isFunction, is, traverseUpGuard, getNestedIdentifiers, getNestedCallExpressions, isFunctionOfImmediatelyInvoked } from '@eslint-react/ast';
+import { isFunction, is, traverseUpGuard, getNestedIdentifiers, toReadableNodeName, getNestedCallExpressions, isFunctionOfImmediatelyInvoked } from '@eslint-react/ast';
 import { F, O, MutRef } from '@eslint-react/tools';
 import { findVariable, getVariableNode } from '@eslint-react/var';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
@@ -9,7 +9,7 @@ import { match, isMatching } from 'ts-pattern';
 
 // package.json
 var name = "eslint-plugin-react-hooks-extra";
-var version = "1.10.2-next.2";
+var version = "1.11.0-beta.10";
 var createRule = createRuleForPlugin("hooks-extra");
 function isFromHookCall(name2, context, settings, predicate = F.constTrue) {
   const hookAlias = settings.additionalHooks?.[name2] ?? [];
@@ -292,13 +292,13 @@ var no_direct_set_state_in_use_effect_default = createRule({
       description: "disallow direct calls to the 'set' function of 'useState' in 'useEffect'"
     },
     messages: {
-      noDirectSetStateInUseEffect: "Do not call the 'set' function of 'useState' directly in 'useEffect'."
+      noDirectSetStateInUseEffect: "Do not call the 'set' function '{{name}}' of 'useState' directly in 'useEffect'."
     },
     schema: []
   },
   name: RULE_NAME4,
   create(context) {
-    if (!context.sourceCode.text.includes("use")) return {};
+    if (!/use\w*Effect/u.test(context.sourceCode.text)) return {};
     const settings = decodeSettings(context.settings);
     const additionalHooks = settings.additionalHooks ?? {};
     const isUseEffectCall = isReactHookCallWithNameAlias("useEffect", context, additionalHooks.useEffect ?? []);
@@ -312,8 +312,8 @@ var no_direct_set_state_in_use_effect_default = createRule({
     const setupFunctionIdentifiers = [];
     const indirectFunctionCalls = [];
     const indirectSetStateCalls = /* @__PURE__ */ new WeakMap();
-    const indirectSetStateCallsAsEFs = /* @__PURE__ */ new Map();
     const indirectSetStateCallsAsArgs = /* @__PURE__ */ new WeakMap();
+    const indirectSetStateCallsAsSetups = /* @__PURE__ */ new Map();
     const indirectSetStateCallsInHooks = /* @__PURE__ */ new WeakMap();
     const onSetupFunctionEnter = (node) => {
       MutRef.set(setupFunctionRef, node);
@@ -361,7 +361,8 @@ var no_direct_set_state_in_use_effect_default = createRule({
           }
           context.report({
             messageId: "noDirectSetStateInUseEffect",
-            node
+            node,
+            data: { name: context.sourceCode.getText(node.callee) }
           });
         }).with("useEffect", () => {
           const [firstArg] = node.arguments;
@@ -390,7 +391,7 @@ var no_direct_set_state_in_use_effect_default = createRule({
             }
             if (isUseEffectCall(node.parent)) {
               const calls = indirectSetStateCallsAsArgs.get(node.parent) ?? [];
-              indirectSetStateCallsAsEFs.set(node.parent, [...calls, node]);
+              indirectSetStateCallsAsSetups.set(node.parent, [...calls, node]);
             }
             break;
           }
@@ -419,7 +420,7 @@ var no_direct_set_state_in_use_effect_default = createRule({
           }
           return [];
         };
-        for (const [_, calls] of indirectSetStateCallsAsEFs) {
+        for (const [_, calls] of indirectSetStateCallsAsSetups) {
           for (const call of calls) {
             context.report({
               messageId: "noDirectSetStateInUseEffect",
@@ -436,7 +437,9 @@ var no_direct_set_state_in_use_effect_default = createRule({
             context.report({
               messageId: "noDirectSetStateInUseEffect",
               node: setStateCall,
-              data: { name: name2 }
+              data: {
+                name: toReadableNodeName(setStateCall, (n) => context.sourceCode.getText(n))
+              }
             });
           }
         }
@@ -446,7 +449,9 @@ var no_direct_set_state_in_use_effect_default = createRule({
             context.report({
               messageId: "noDirectSetStateInUseEffect",
               node: setStateCall,
-              data: { name: id.name }
+              data: {
+                name: toReadableNodeName(setStateCall, (n) => context.sourceCode.getText(n))
+              }
             });
           }
         }
@@ -463,13 +468,13 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
       description: "disallow direct calls to the 'set' function of 'useState' in 'useLayoutEffect'"
     },
     messages: {
-      noDirectSetStateInUseLayoutEffect: "Do not call the 'set' function of 'useState' directly in 'useLayoutEffect'."
+      noDirectSetStateInUseLayoutEffect: "Do not call the 'set' function '{{name}}' of 'useState' directly in 'useLayoutEffect'."
     },
     schema: []
   },
   name: RULE_NAME5,
   create(context) {
-    if (!context.sourceCode.text.includes("use")) return {};
+    if (!/use\w*Effect/u.test(context.sourceCode.text)) return {};
     const settings = decodeSettings(context.settings);
     const additionalHooks = settings.additionalHooks ?? {};
     const isUseEffectCall = isReactHookCallWithNameAlias(
@@ -487,7 +492,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
     const setupFunctionIdentifiers = [];
     const indirectFunctionCalls = [];
     const indirectSetStateCalls = /* @__PURE__ */ new WeakMap();
-    const indirectSetStateCallsAsEFs = /* @__PURE__ */ new Map();
+    const indirectSetStateCallsAsSetups = /* @__PURE__ */ new Map();
     const indirectSetStateCallsAsArgs = /* @__PURE__ */ new WeakMap();
     const indirectSetStateCallsInHooks = /* @__PURE__ */ new WeakMap();
     const onSetupFunctionEnter = (node) => {
@@ -536,7 +541,10 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
           }
           context.report({
             messageId: "noDirectSetStateInUseLayoutEffect",
-            node
+            node,
+            data: {
+              name: context.sourceCode.getText(node.callee)
+            }
           });
         }).with("useLayoutEffect", () => {
           const [firstArg] = node.arguments;
@@ -565,7 +573,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
             }
             if (isUseEffectCall(node.parent)) {
               const calls = indirectSetStateCallsAsArgs.get(node.parent) ?? [];
-              indirectSetStateCallsAsEFs.set(node.parent, [...calls, node]);
+              indirectSetStateCallsAsSetups.set(node.parent, [...calls, node]);
             }
             break;
           }
@@ -594,7 +602,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
           }
           return [];
         };
-        for (const [_, calls] of indirectSetStateCallsAsEFs) {
+        for (const [_, calls] of indirectSetStateCallsAsSetups) {
           for (const call of calls) {
             context.report({
               messageId: "noDirectSetStateInUseLayoutEffect",
@@ -611,7 +619,9 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
             context.report({
               messageId: "noDirectSetStateInUseLayoutEffect",
               node: setStateCall,
-              data: { name: name2 }
+              data: {
+                name: toReadableNodeName(setStateCall, (n) => context.sourceCode.getText(n))
+              }
             });
           }
         }
@@ -621,7 +631,9 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
             context.report({
               messageId: "noDirectSetStateInUseLayoutEffect",
               node: setStateCall,
-              data: { name: id.name }
+              data: {
+                name: toReadableNodeName(setStateCall, (n) => context.sourceCode.getText(n))
+              }
             });
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-hooks-extra",
-  "version": "1.10.2-next.2",
+  "version": "1.11.0-beta.10",
   "description": "ESLint React's ESLint plugin for React Hooks related rules.",
   "keywords": [
     "eslint",
@@ -41,18 +41,18 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.1.0",
-    "@typescript-eslint/type-utils": "^8.1.0",
-    "@typescript-eslint/types": "^8.1.0",
-    "@typescript-eslint/utils": "^8.1.0",
+    "@typescript-eslint/scope-manager": "^8.2.0",
+    "@typescript-eslint/type-utils": "^8.2.0",
+    "@typescript-eslint/types": "^8.2.0",
+    "@typescript-eslint/utils": "^8.2.0",
     "ts-pattern": "^5.3.1",
-    "@eslint-react/ast": "1.10.2-next.2",
-    "@eslint-react/core": "1.10.2-next.2",
-    "@eslint-react/jsx": "1.10.2-next.2",
-    "@eslint-react/shared": "1.10.2-next.2",
-    "@eslint-react/tools": "1.10.2-next.2",
-    "@eslint-react/types": "1.10.2-next.2",
-    "@eslint-react/var": "1.10.2-next.2"
+    "@eslint-react/ast": "1.11.0-beta.10",
+    "@eslint-react/jsx": "1.11.0-beta.10",
+    "@eslint-react/core": "1.11.0-beta.10",
+    "@eslint-react/types": "1.11.0-beta.10",
+    "@eslint-react/shared": "1.11.0-beta.10",
+    "@eslint-react/tools": "1.11.0-beta.10",
+    "@eslint-react/var": "1.11.0-beta.10"
   },
   "devDependencies": {
     "@types/react": "^18.3.3",