eslint-plugin-react-hooks-extra 1.8.0-beta.2 → 1.8.0-beta.3

package/dist/index.js

@@ -30,7 +30,7 @@ var R__namespace = /*#__PURE__*/_interopNamespace(R);
 
 // package.json
 var name = "eslint-plugin-react-hooks-extra";
-var version = "1.8.0-beta.2";
+var version = "1.8.0-beta.3";
 var createRule = shared.createRuleForPlugin("hooks-extra");
 function isFromUseStateCall(context, useStateAlias) {
   return (topLevelId) => {
@@ -271,6 +271,19 @@ function isSetStateCall(context, useStateAlias) {
 function isThenCall(node) {
   return node.callee.type === ast.NodeType.MemberExpression && node.callee.property.type === ast.NodeType.Identifier && node.callee.property.name === "then";
 }
+function isVariableDeclaratorFromHookCall(node) {
+  if (node.type !== ast.NodeType.VariableDeclarator) return false;
+  if (node.id.type !== ast.NodeType.Identifier) return false;
+  if (node.init?.type !== ast.NodeType.CallExpression) return false;
+  switch (node.init.callee.type) {
+    case ast.NodeType.Identifier:
+      return core.isReactHookName(node.init.callee.name);
+    case ast.NodeType.MemberExpression:
+      return node.init.callee.property?.type === ast.NodeType.Identifier && core.isReactHookName(node.init.callee.property.name);
+    default:
+      return false;
+  }
+}
 
 // src/rules/ensure-custom-hooks-using-other-hooks.ts
 var RULE_NAME = "ensure-custom-hooks-using-other-hooks";
@@ -467,8 +480,9 @@ var RULE_NAME4 = "no-direct-set-state-in-use-effect";
 function isEffectFunction(context, useSomeEffectAlias) {
   return (node) => node.parent?.type === ast.NodeType.CallExpression && node.parent.callee !== node && core.isReactHookCallWithNameAlias("useEffect", context, useSomeEffectAlias)(node.parent);
 }
-function getCallKind(node, context, useStateAlias, useEffectAlias) {
-  return $(node).when(isThenCall, () => "then").when(isSetStateCall(context, useStateAlias), () => "setState").when(core.isReactHookCallWithNameAlias("useState", context, useStateAlias), () => "useState").when(core.isReactHookCallWithNameAlias("useEffect", context, useEffectAlias), () => "useEffect").otherwise(() => "other");
+function getCallKind(node, context, alias) {
+  const [useStateAlias, useEffectAlias] = alias;
+  return $(node).when(core.isReactHookCallWithNameAlias("useState", context, useStateAlias), () => "useState").when(core.isReactHookCallWithNameAlias("useEffect", context, useEffectAlias), () => "useEffect").when(isSetStateCall(context, useStateAlias), () => "setState").when(isThenCall, () => "then").otherwise(() => "other");
 }
 function getFunctionKind(node, context, useEffectAlias) {
   return $(node).when(isEffectFunction(context, useEffectAlias), () => "effect").when(ast.isIIFE, () => "immediate").otherwise(() => "other");
@@ -493,6 +507,7 @@ var no_direct_set_state_in_use_effect_default = createRule({
     const effectFunctionIdentifiers = [];
     const indirectFunctionCalls = [];
     const indirectSetStateCalls = /* @__PURE__ */ new WeakMap();
+    const indirectSetStateCallsInHooks = /* @__PURE__ */ new WeakMap();
     const onEffectFunctionEnter = (node) => {
       tools.MutRef.set(effectFunctionRef, node);
     };
@@ -515,10 +530,16 @@ var no_direct_set_state_in_use_effect_default = createRule({
         const effectFn = tools.MutRef.get(effectFunctionRef);
         const [parentFn, parentFnKind] = R__namespace.last(functionStack) ?? [];
         if (parentFn?.async) return;
-        const callKind = getCallKind(node, context, useStateAlias, useEffectAlias);
-        $(callKind).with("setState", () => {
+        $(getCallKind(node, context, [useStateAlias, useEffectAlias])).with("setState", () => {
           if (!parentFn) return;
           if (parentFn !== effectFn && parentFnKind !== "immediate") {
+            const variableDeclaratorFromHookCall = ast.traverseUpGuard(node, isVariableDeclaratorFromHookCall);
+            if (tools.O.isSome(variableDeclaratorFromHookCall)) {
+              const vd = variableDeclaratorFromHookCall.value;
+              const calls2 = indirectSetStateCallsInHooks.get(vd.init) ?? [];
+              indirectSetStateCallsInHooks.set(vd.init, [...calls2, node]);
+              return;
+            }
             const calls = indirectSetStateCalls.get(parentFn) ?? [];
             indirectSetStateCalls.set(parentFn, [...calls, node]);
             return;
@@ -539,13 +560,16 @@ var no_direct_set_state_in_use_effect_default = createRule({
       },
       "Program:exit"() {
         const getSetStateCalls = (id, initialScope) => {
-          return tools.F.pipe(
-            _var.findVariable(id, initialScope),
-            tools.O.flatMap(_var.getVariableNode(0)),
-            tools.O.filter(ast.isFunction),
-            tools.O.flatMapNullable((fn) => indirectSetStateCalls.get(fn)),
-            tools.O.getOrElse(() => [])
-          );
+          const node = tools.O.flatMap(_var.findVariable(id, initialScope), _var.getVariableNode(0)).pipe(tools.O.getOrNull);
+          switch (node?.type) {
+            case ast.NodeType.FunctionDeclaration:
+            case ast.NodeType.FunctionExpression:
+            case ast.NodeType.ArrowFunctionExpression:
+              return indirectSetStateCalls.get(node) ?? [];
+            case ast.NodeType.CallExpression:
+              return indirectSetStateCallsInHooks.get(node) ?? [];
+          }
+          return [];
         };
         for (const { callee } of indirectFunctionCalls) {
           if (!("name" in callee)) continue;
@@ -575,14 +599,15 @@ var no_direct_set_state_in_use_effect_default = createRule({
   defaultOptions: []
 });
 var RULE_NAME5 = "no-direct-set-state-in-use-layout-effect";
-function isLayoutEffectFunction(context, useSomeEffectAlias) {
+function isEffectFunction2(context, useSomeEffectAlias) {
   return (node) => node.parent?.type === ast.NodeType.CallExpression && node.parent.callee !== node && core.isReactHookCallWithNameAlias("useLayoutEffect", context, useSomeEffectAlias)(node.parent);
 }
-function getCallKind2(node, context, useStateAlias, useLayoutEffectAlias) {
-  return $(node).when(isThenCall, () => "then").when(isSetStateCall(context, useStateAlias), () => "setState").when(core.isReactHookCallWithNameAlias("useState", context, useStateAlias), () => "useState").when(core.isReactHookCallWithNameAlias("useLayoutEffect", context, useLayoutEffectAlias), () => "useLayoutEffect").otherwise(() => "other");
+function getCallKind2(node, context, alias) {
+  const [useStateAlias, useLayoutEffectAlias] = alias;
+  return $(node).when(core.isReactHookCallWithNameAlias("useState", context, useStateAlias), () => "useState").when(core.isReactHookCallWithNameAlias("useLayoutEffect", context, useLayoutEffectAlias), () => "useLayoutEffect").when(isSetStateCall(context, useStateAlias), () => "setState").when(isThenCall, () => "then").otherwise(() => "other");
 }
 function getFunctionKind2(node, context, useLayoutEffectAlias) {
-  return $(node).when(isLayoutEffectFunction(context, useLayoutEffectAlias), () => "effect").when(ast.isIIFE, () => "immediate").otherwise(() => "other");
+  return $(node).when(isEffectFunction2(context, useLayoutEffectAlias), () => "effect").when(ast.isIIFE, () => "immediate").otherwise(() => "other");
 }
 var no_direct_set_state_in_use_layout_effect_default = createRule({
   meta: {
@@ -604,6 +629,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
     const effectFunctionIdentifiers = [];
     const indirectFunctionCalls = [];
     const indirectSetStateCalls = /* @__PURE__ */ new WeakMap();
+    const indirectSetStateCallsInHooks = /* @__PURE__ */ new WeakMap();
     const onEffectFunctionEnter = (node) => {
       tools.MutRef.set(effectFunctionRef, node);
     };
@@ -626,10 +652,16 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
         const effectFn = tools.MutRef.get(effectFunctionRef);
         const [parentFn, parentFnKind] = R__namespace.last(functionStack) ?? [];
         if (parentFn?.async) return;
-        const callKind = getCallKind2(node, context, useStateAlias, useLayoutEffectAlias);
-        $(callKind).with("setState", () => {
+        $(getCallKind2(node, context, [useStateAlias, useLayoutEffectAlias])).with("setState", () => {
           if (!parentFn) return;
           if (parentFn !== effectFn && parentFnKind !== "immediate") {
+            const variableDeclaratorFromHookCall = ast.traverseUpGuard(node, isVariableDeclaratorFromHookCall);
+            if (tools.O.isSome(variableDeclaratorFromHookCall)) {
+              const vd = variableDeclaratorFromHookCall.value;
+              const calls2 = indirectSetStateCallsInHooks.get(vd.init) ?? [];
+              indirectSetStateCallsInHooks.set(vd.init, [...calls2, node]);
+              return;
+            }
             const calls = indirectSetStateCalls.get(parentFn) ?? [];
             indirectSetStateCalls.set(parentFn, [...calls, node]);
             return;
@@ -650,13 +682,16 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
       },
       "Program:exit"() {
         const getSetStateCalls = (id, initialScope) => {
-          return tools.F.pipe(
-            _var.findVariable(id, initialScope),
-            tools.O.flatMap(_var.getVariableNode(0)),
-            tools.O.filter(ast.isFunction),
-            tools.O.flatMapNullable((fn) => indirectSetStateCalls.get(fn)),
-            tools.O.getOrElse(() => [])
-          );
+          const node = tools.O.flatMap(_var.findVariable(id, initialScope), _var.getVariableNode(0)).pipe(tools.O.getOrNull);
+          switch (node?.type) {
+            case ast.NodeType.FunctionDeclaration:
+            case ast.NodeType.FunctionExpression:
+            case ast.NodeType.ArrowFunctionExpression:
+              return indirectSetStateCalls.get(node) ?? [];
+            case ast.NodeType.CallExpression:
+              return indirectSetStateCallsInHooks.get(node) ?? [];
+          }
+          return [];
         };
         for (const { callee } of indirectFunctionCalls) {
           if (!("name" in callee)) continue;

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { useHookCollector, isReactHookCall, isUseCallbackCall, isReactHookCallWithNameLoose, isUseMemoCall, isUseStateCall, isReactHookCallWithNameAlias } from '@eslint-react/core';
+import { useHookCollector, isReactHookCall, isUseCallbackCall, isReactHookCallWithNameLoose, isUseMemoCall, isUseStateCall, isReactHookName, isReactHookCallWithNameAlias } from '@eslint-react/core';
 import { createRuleForPlugin, decodeSettings } from '@eslint-react/shared';
-import { isFunction, NodeType, is, getNestedIdentifiers, getNestedCallExpressions, isIIFE } from '@eslint-react/ast';
+import { isFunction, NodeType, is, traverseUpGuard, getNestedIdentifiers, getNestedCallExpressions, isIIFE } from '@eslint-react/ast';
 import { F, O, MutRef } from '@eslint-react/tools';
 import { findVariable, getVariableNode } from '@eslint-react/var';
 import { getStaticValue } from '@typescript-eslint/utils/ast-utils';
@@ -8,7 +8,7 @@ import * as R from 'remeda';
 
 // package.json
 var name = "eslint-plugin-react-hooks-extra";
-var version = "1.8.0-beta.2";
+var version = "1.8.0-beta.3";
 var createRule = createRuleForPlugin("hooks-extra");
 function isFromUseStateCall(context, useStateAlias) {
   return (topLevelId) => {
@@ -249,6 +249,19 @@ function isSetStateCall(context, useStateAlias) {
 function isThenCall(node) {
   return node.callee.type === NodeType.MemberExpression && node.callee.property.type === NodeType.Identifier && node.callee.property.name === "then";
 }
+function isVariableDeclaratorFromHookCall(node) {
+  if (node.type !== NodeType.VariableDeclarator) return false;
+  if (node.id.type !== NodeType.Identifier) return false;
+  if (node.init?.type !== NodeType.CallExpression) return false;
+  switch (node.init.callee.type) {
+    case NodeType.Identifier:
+      return isReactHookName(node.init.callee.name);
+    case NodeType.MemberExpression:
+      return node.init.callee.property?.type === NodeType.Identifier && isReactHookName(node.init.callee.property.name);
+    default:
+      return false;
+  }
+}
 
 // src/rules/ensure-custom-hooks-using-other-hooks.ts
 var RULE_NAME = "ensure-custom-hooks-using-other-hooks";
@@ -445,8 +458,9 @@ var RULE_NAME4 = "no-direct-set-state-in-use-effect";
 function isEffectFunction(context, useSomeEffectAlias) {
   return (node) => node.parent?.type === NodeType.CallExpression && node.parent.callee !== node && isReactHookCallWithNameAlias("useEffect", context, useSomeEffectAlias)(node.parent);
 }
-function getCallKind(node, context, useStateAlias, useEffectAlias) {
-  return $(node).when(isThenCall, () => "then").when(isSetStateCall(context, useStateAlias), () => "setState").when(isReactHookCallWithNameAlias("useState", context, useStateAlias), () => "useState").when(isReactHookCallWithNameAlias("useEffect", context, useEffectAlias), () => "useEffect").otherwise(() => "other");
+function getCallKind(node, context, alias) {
+  const [useStateAlias, useEffectAlias] = alias;
+  return $(node).when(isReactHookCallWithNameAlias("useState", context, useStateAlias), () => "useState").when(isReactHookCallWithNameAlias("useEffect", context, useEffectAlias), () => "useEffect").when(isSetStateCall(context, useStateAlias), () => "setState").when(isThenCall, () => "then").otherwise(() => "other");
 }
 function getFunctionKind(node, context, useEffectAlias) {
   return $(node).when(isEffectFunction(context, useEffectAlias), () => "effect").when(isIIFE, () => "immediate").otherwise(() => "other");
@@ -471,6 +485,7 @@ var no_direct_set_state_in_use_effect_default = createRule({
     const effectFunctionIdentifiers = [];
     const indirectFunctionCalls = [];
     const indirectSetStateCalls = /* @__PURE__ */ new WeakMap();
+    const indirectSetStateCallsInHooks = /* @__PURE__ */ new WeakMap();
     const onEffectFunctionEnter = (node) => {
       MutRef.set(effectFunctionRef, node);
     };
@@ -493,10 +508,16 @@ var no_direct_set_state_in_use_effect_default = createRule({
         const effectFn = MutRef.get(effectFunctionRef);
         const [parentFn, parentFnKind] = R.last(functionStack) ?? [];
         if (parentFn?.async) return;
-        const callKind = getCallKind(node, context, useStateAlias, useEffectAlias);
-        $(callKind).with("setState", () => {
+        $(getCallKind(node, context, [useStateAlias, useEffectAlias])).with("setState", () => {
           if (!parentFn) return;
           if (parentFn !== effectFn && parentFnKind !== "immediate") {
+            const variableDeclaratorFromHookCall = traverseUpGuard(node, isVariableDeclaratorFromHookCall);
+            if (O.isSome(variableDeclaratorFromHookCall)) {
+              const vd = variableDeclaratorFromHookCall.value;
+              const calls2 = indirectSetStateCallsInHooks.get(vd.init) ?? [];
+              indirectSetStateCallsInHooks.set(vd.init, [...calls2, node]);
+              return;
+            }
             const calls = indirectSetStateCalls.get(parentFn) ?? [];
             indirectSetStateCalls.set(parentFn, [...calls, node]);
             return;
@@ -517,13 +538,16 @@ var no_direct_set_state_in_use_effect_default = createRule({
       },
       "Program:exit"() {
         const getSetStateCalls = (id, initialScope) => {
-          return F.pipe(
-            findVariable(id, initialScope),
-            O.flatMap(getVariableNode(0)),
-            O.filter(isFunction),
-            O.flatMapNullable((fn) => indirectSetStateCalls.get(fn)),
-            O.getOrElse(() => [])
-          );
+          const node = O.flatMap(findVariable(id, initialScope), getVariableNode(0)).pipe(O.getOrNull);
+          switch (node?.type) {
+            case NodeType.FunctionDeclaration:
+            case NodeType.FunctionExpression:
+            case NodeType.ArrowFunctionExpression:
+              return indirectSetStateCalls.get(node) ?? [];
+            case NodeType.CallExpression:
+              return indirectSetStateCallsInHooks.get(node) ?? [];
+          }
+          return [];
         };
         for (const { callee } of indirectFunctionCalls) {
           if (!("name" in callee)) continue;
@@ -553,14 +577,15 @@ var no_direct_set_state_in_use_effect_default = createRule({
   defaultOptions: []
 });
 var RULE_NAME5 = "no-direct-set-state-in-use-layout-effect";
-function isLayoutEffectFunction(context, useSomeEffectAlias) {
+function isEffectFunction2(context, useSomeEffectAlias) {
   return (node) => node.parent?.type === NodeType.CallExpression && node.parent.callee !== node && isReactHookCallWithNameAlias("useLayoutEffect", context, useSomeEffectAlias)(node.parent);
 }
-function getCallKind2(node, context, useStateAlias, useLayoutEffectAlias) {
-  return $(node).when(isThenCall, () => "then").when(isSetStateCall(context, useStateAlias), () => "setState").when(isReactHookCallWithNameAlias("useState", context, useStateAlias), () => "useState").when(isReactHookCallWithNameAlias("useLayoutEffect", context, useLayoutEffectAlias), () => "useLayoutEffect").otherwise(() => "other");
+function getCallKind2(node, context, alias) {
+  const [useStateAlias, useLayoutEffectAlias] = alias;
+  return $(node).when(isReactHookCallWithNameAlias("useState", context, useStateAlias), () => "useState").when(isReactHookCallWithNameAlias("useLayoutEffect", context, useLayoutEffectAlias), () => "useLayoutEffect").when(isSetStateCall(context, useStateAlias), () => "setState").when(isThenCall, () => "then").otherwise(() => "other");
 }
 function getFunctionKind2(node, context, useLayoutEffectAlias) {
-  return $(node).when(isLayoutEffectFunction(context, useLayoutEffectAlias), () => "effect").when(isIIFE, () => "immediate").otherwise(() => "other");
+  return $(node).when(isEffectFunction2(context, useLayoutEffectAlias), () => "effect").when(isIIFE, () => "immediate").otherwise(() => "other");
 }
 var no_direct_set_state_in_use_layout_effect_default = createRule({
   meta: {
@@ -582,6 +607,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
     const effectFunctionIdentifiers = [];
     const indirectFunctionCalls = [];
     const indirectSetStateCalls = /* @__PURE__ */ new WeakMap();
+    const indirectSetStateCallsInHooks = /* @__PURE__ */ new WeakMap();
     const onEffectFunctionEnter = (node) => {
       MutRef.set(effectFunctionRef, node);
     };
@@ -604,10 +630,16 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
         const effectFn = MutRef.get(effectFunctionRef);
         const [parentFn, parentFnKind] = R.last(functionStack) ?? [];
         if (parentFn?.async) return;
-        const callKind = getCallKind2(node, context, useStateAlias, useLayoutEffectAlias);
-        $(callKind).with("setState", () => {
+        $(getCallKind2(node, context, [useStateAlias, useLayoutEffectAlias])).with("setState", () => {
           if (!parentFn) return;
           if (parentFn !== effectFn && parentFnKind !== "immediate") {
+            const variableDeclaratorFromHookCall = traverseUpGuard(node, isVariableDeclaratorFromHookCall);
+            if (O.isSome(variableDeclaratorFromHookCall)) {
+              const vd = variableDeclaratorFromHookCall.value;
+              const calls2 = indirectSetStateCallsInHooks.get(vd.init) ?? [];
+              indirectSetStateCallsInHooks.set(vd.init, [...calls2, node]);
+              return;
+            }
             const calls = indirectSetStateCalls.get(parentFn) ?? [];
             indirectSetStateCalls.set(parentFn, [...calls, node]);
             return;
@@ -628,13 +660,16 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
       },
       "Program:exit"() {
         const getSetStateCalls = (id, initialScope) => {
-          return F.pipe(
-            findVariable(id, initialScope),
-            O.flatMap(getVariableNode(0)),
-            O.filter(isFunction),
-            O.flatMapNullable((fn) => indirectSetStateCalls.get(fn)),
-            O.getOrElse(() => [])
-          );
+          const node = O.flatMap(findVariable(id, initialScope), getVariableNode(0)).pipe(O.getOrNull);
+          switch (node?.type) {
+            case NodeType.FunctionDeclaration:
+            case NodeType.FunctionExpression:
+            case NodeType.ArrowFunctionExpression:
+              return indirectSetStateCalls.get(node) ?? [];
+            case NodeType.CallExpression:
+              return indirectSetStateCallsInHooks.get(node) ?? [];
+          }
+          return [];
         };
         for (const { callee } of indirectFunctionCalls) {
           if (!("name" in callee)) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-hooks-extra",
-  "version": "1.8.0-beta.2",
+  "version": "1.8.0-beta.3",
   "description": "ESLint React's ESLint plugin for React Hooks related rules.",
   "keywords": [
     "eslint",
@@ -46,13 +46,13 @@
     "@typescript-eslint/types": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
     "remeda": "^2.6.0",
-    "@eslint-react/ast": "1.8.0-beta.2",
-    "@eslint-react/jsx": "1.8.0-beta.2",
-    "@eslint-react/core": "1.8.0-beta.2",
-    "@eslint-react/shared": "1.8.0-beta.2",
-    "@eslint-react/types": "1.8.0-beta.2",
-    "@eslint-react/tools": "1.8.0-beta.2",
-    "@eslint-react/var": "1.8.0-beta.2"
+    "@eslint-react/ast": "1.8.0-beta.3",
+    "@eslint-react/core": "1.8.0-beta.3",
+    "@eslint-react/jsx": "1.8.0-beta.3",
+    "@eslint-react/shared": "1.8.0-beta.3",
+    "@eslint-react/tools": "1.8.0-beta.3",
+    "@eslint-react/types": "1.8.0-beta.3",
+    "@eslint-react/var": "1.8.0-beta.3"
   },
   "devDependencies": {
     "@types/react": "^18.3.3",
@@ -80,7 +80,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsup",
+    "build": "tsup --dts-resolve",
     "lint:publish": "publint",
     "lint:type": "tsc --noEmit"
   }