eslint-plugin-react-hooks-extra 1.6.0-next.2 → 1.6.0-next.4

package/dist/index.js

@@ -9,7 +9,7 @@ var astUtils = require('@typescript-eslint/utils/ast-utils');
 
 // package.json
 var name = "eslint-plugin-react-hooks-extra";
-var version = "1.6.0-next.2";
+var version = "1.6.0-next.4";
 var createRule = shared.createRuleForPlugin("hooks-extra");
 
 // src/rules/ensure-custom-hooks-using-other-hooks.ts
@@ -415,20 +415,19 @@ var no_direct_set_state_in_use_effect_default = createRule({
     }
     function isCleanUpFunction(_2) {
     }
-    function isFromUseStateCall(id) {
-      return tools.F.pipe(
-        $(id).with({ type: ast.NodeType.Identifier }, (n2) => tools.O.some(n2.name)).with({
-          type: ast.NodeType.MemberExpression,
-          object: { type: ast.NodeType.Identifier }
-        }, (n2) => tools.O.some(n2.object.name)).otherwise(tools.O.none),
-        tools.O.flatMap(_var.findVariable(context.sourceCode.getScope(id))),
+    function isFromUseStateCall(topLevelId) {
+      const useStateCall = tools.F.pipe(
+        _var.findVariable(topLevelId, context.sourceCode.getScope(topLevelId)),
         tools.O.flatMap(_var.getVariableNode(0)),
         tools.O.filter(ast.is(ast.NodeType.CallExpression)),
-        tools.O.exists(isUseStateCallWithAlias)
+        tools.O.filter(isUseStateCallWithAlias)
       );
+      if (tools.O.isNone(useStateCall)) return false;
+      const { parent } = useStateCall.value;
+      return !a({ id: { elements: [{ name: topLevelId.name }] } }, parent);
     }
     function isSetStateCall(node) {
-      const id = $(node.callee).with({ type: ast.NodeType.Identifier }, tools.O.some).with({ type: ast.NodeType.MemberExpression }, (n2) => {
+      const topLevelId = $(node.callee).with({ type: ast.NodeType.Identifier }, tools.O.some).with({ type: ast.NodeType.MemberExpression }, (n2) => {
         if (!("name" in n2.object)) return tools.O.none();
         const initialScope = context.sourceCode.getScope(n2);
         const property = astUtils.getStaticValue(n2.property, initialScope);
@@ -451,7 +450,7 @@ var no_direct_set_state_in_use_effect_default = createRule({
         if (value?.value === 1) return tools.O.fromNullable(n2.callee.object);
         return tools.O.none();
       }).otherwise(tools.O.none);
-      return tools.O.exists(id, isFromUseStateCall);
+      return tools.O.exists(topLevelId, isFromUseStateCall);
     }
     function isThenCall(node) {
       if (node.callee.type !== ast.NodeType.MemberExpression) return false;
@@ -579,20 +578,19 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
     }
     function isCleanUpFunction(_2) {
     }
-    function isFromUseStateCall(id) {
-      return tools.F.pipe(
-        $(id).with({ type: ast.NodeType.Identifier }, (n2) => tools.O.some(n2.name)).with({
-          type: ast.NodeType.MemberExpression,
-          object: { type: ast.NodeType.Identifier }
-        }, (n2) => tools.O.some(n2.object.name)).otherwise(tools.O.none),
-        tools.O.flatMap(_var.findVariable(context.sourceCode.getScope(id))),
+    function isFromUseStateCall(topLevelId) {
+      const useStateCall = tools.F.pipe(
+        _var.findVariable(topLevelId, context.sourceCode.getScope(topLevelId)),
         tools.O.flatMap(_var.getVariableNode(0)),
         tools.O.filter(ast.is(ast.NodeType.CallExpression)),
-        tools.O.exists(isUseStateCallWithAlias)
+        tools.O.filter(isUseStateCallWithAlias)
       );
+      if (tools.O.isNone(useStateCall)) return false;
+      const { parent } = useStateCall.value;
+      return !a({ id: { elements: [{ name: topLevelId.name }] } }, parent);
     }
     function isSetStateCall(node) {
-      const id = $(node.callee).with({ type: ast.NodeType.Identifier }, tools.O.some).with({ type: ast.NodeType.MemberExpression }, (n2) => {
+      const topLevelId = $(node.callee).with({ type: ast.NodeType.Identifier }, tools.O.some).with({ type: ast.NodeType.MemberExpression }, (n2) => {
         if (!("name" in n2.object)) return tools.O.none();
         const initialScope = context.sourceCode.getScope(n2);
         const property = astUtils.getStaticValue(n2.property, initialScope);
@@ -615,7 +613,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
         if (value?.value === 1) return tools.O.fromNullable(n2.callee.object);
         return tools.O.none();
       }).otherwise(tools.O.none);
-      return tools.O.exists(id, isFromUseStateCall);
+      return tools.O.exists(topLevelId, isFromUseStateCall);
     }
     function isThenCall(node) {
       if (node.callee.type !== ast.NodeType.MemberExpression) return false;

package/dist/index.mjs

@@ -7,7 +7,7 @@ import { getStaticValue } from '@typescript-eslint/utils/ast-utils';
 
 // package.json
 var name = "eslint-plugin-react-hooks-extra";
-var version = "1.6.0-next.2";
+var version = "1.6.0-next.4";
 var createRule = createRuleForPlugin("hooks-extra");
 
 // src/rules/ensure-custom-hooks-using-other-hooks.ts
@@ -413,20 +413,19 @@ var no_direct_set_state_in_use_effect_default = createRule({
     }
     function isCleanUpFunction(_2) {
     }
-    function isFromUseStateCall(id) {
-      return F.pipe(
-        $(id).with({ type: NodeType.Identifier }, (n2) => O.some(n2.name)).with({
-          type: NodeType.MemberExpression,
-          object: { type: NodeType.Identifier }
-        }, (n2) => O.some(n2.object.name)).otherwise(O.none),
-        O.flatMap(findVariable(context.sourceCode.getScope(id))),
+    function isFromUseStateCall(topLevelId) {
+      const useStateCall = F.pipe(
+        findVariable(topLevelId, context.sourceCode.getScope(topLevelId)),
         O.flatMap(getVariableNode(0)),
         O.filter(is(NodeType.CallExpression)),
-        O.exists(isUseStateCallWithAlias)
+        O.filter(isUseStateCallWithAlias)
       );
+      if (O.isNone(useStateCall)) return false;
+      const { parent } = useStateCall.value;
+      return !a({ id: { elements: [{ name: topLevelId.name }] } }, parent);
     }
     function isSetStateCall(node) {
-      const id = $(node.callee).with({ type: NodeType.Identifier }, O.some).with({ type: NodeType.MemberExpression }, (n2) => {
+      const topLevelId = $(node.callee).with({ type: NodeType.Identifier }, O.some).with({ type: NodeType.MemberExpression }, (n2) => {
         if (!("name" in n2.object)) return O.none();
         const initialScope = context.sourceCode.getScope(n2);
         const property = getStaticValue(n2.property, initialScope);
@@ -449,7 +448,7 @@ var no_direct_set_state_in_use_effect_default = createRule({
         if (value?.value === 1) return O.fromNullable(n2.callee.object);
         return O.none();
       }).otherwise(O.none);
-      return O.exists(id, isFromUseStateCall);
+      return O.exists(topLevelId, isFromUseStateCall);
     }
     function isThenCall(node) {
       if (node.callee.type !== NodeType.MemberExpression) return false;
@@ -577,20 +576,19 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
     }
     function isCleanUpFunction(_2) {
     }
-    function isFromUseStateCall(id) {
-      return F.pipe(
-        $(id).with({ type: NodeType.Identifier }, (n2) => O.some(n2.name)).with({
-          type: NodeType.MemberExpression,
-          object: { type: NodeType.Identifier }
-        }, (n2) => O.some(n2.object.name)).otherwise(O.none),
-        O.flatMap(findVariable(context.sourceCode.getScope(id))),
+    function isFromUseStateCall(topLevelId) {
+      const useStateCall = F.pipe(
+        findVariable(topLevelId, context.sourceCode.getScope(topLevelId)),
         O.flatMap(getVariableNode(0)),
         O.filter(is(NodeType.CallExpression)),
-        O.exists(isUseStateCallWithAlias)
+        O.filter(isUseStateCallWithAlias)
       );
+      if (O.isNone(useStateCall)) return false;
+      const { parent } = useStateCall.value;
+      return !a({ id: { elements: [{ name: topLevelId.name }] } }, parent);
     }
     function isSetStateCall(node) {
-      const id = $(node.callee).with({ type: NodeType.Identifier }, O.some).with({ type: NodeType.MemberExpression }, (n2) => {
+      const topLevelId = $(node.callee).with({ type: NodeType.Identifier }, O.some).with({ type: NodeType.MemberExpression }, (n2) => {
         if (!("name" in n2.object)) return O.none();
         const initialScope = context.sourceCode.getScope(n2);
         const property = getStaticValue(n2.property, initialScope);
@@ -613,7 +611,7 @@ var no_direct_set_state_in_use_layout_effect_default = createRule({
         if (value?.value === 1) return O.fromNullable(n2.callee.object);
         return O.none();
       }).otherwise(O.none);
-      return O.exists(id, isFromUseStateCall);
+      return O.exists(topLevelId, isFromUseStateCall);
     }
     function isThenCall(node) {
       if (node.callee.type !== NodeType.MemberExpression) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-hooks-extra",
-  "version": "1.6.0-next.2",
+  "version": "1.6.0-next.4",
   "description": "ESLint React's ESLint plugin for React Hooks related rules.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {
@@ -39,13 +39,13 @@
     "@typescript-eslint/type-utils": "^7.17.0",
     "@typescript-eslint/types": "^7.17.0",
     "@typescript-eslint/utils": "^7.17.0",
-    "@eslint-react/ast": "1.6.0-next.2",
-    "@eslint-react/core": "1.6.0-next.2",
-    "@eslint-react/jsx": "1.6.0-next.2",
-    "@eslint-react/shared": "1.6.0-next.2",
-    "@eslint-react/var": "1.6.0-next.2",
-    "@eslint-react/types": "1.6.0-next.2",
-    "@eslint-react/tools": "1.6.0-next.2"
+    "@eslint-react/ast": "1.6.0-next.4",
+    "@eslint-react/jsx": "1.6.0-next.4",
+    "@eslint-react/core": "1.6.0-next.4",
+    "@eslint-react/shared": "1.6.0-next.4",
+    "@eslint-react/tools": "1.6.0-next.4",
+    "@eslint-react/types": "1.6.0-next.4",
+    "@eslint-react/var": "1.6.0-next.4"
   },
   "devDependencies": {
     "@types/react": "^18.3.3",