eslint-plugin-react-x 3.0.0-beta.14 → 3.0.0-beta.15

package/dist/index.js

@@ -68,7 +68,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "3.0.0-beta.14";
+var version = "3.0.0-beta.15";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -4208,6 +4208,17 @@ function create$2(context) {
 			default: return false;
 		}
 	}
+	function isHookDecl(node) {
+		if (node.type !== AST_NODE_TYPES.VariableDeclarator) return false;
+		if (node.id.type !== AST_NODE_TYPES.Identifier) return false;
+		const init = node.init;
+		if (init == null || init.type !== AST_NODE_TYPES.CallExpression) return false;
+		switch (init.callee.type) {
+			case AST_NODE_TYPES.Identifier: return core.isHookName(init.callee.name);
+			case AST_NODE_TYPES.MemberExpression: return init.callee.property.type === AST_NODE_TYPES.Identifier && core.isHookName(init.callee.property.name);
+			default: return false;
+		}
+	}
 	return defineRuleListener({
 		":function"(node) {
 			const kind = getFunctionKind(node);
@@ -4234,7 +4245,19 @@ function create$2(context) {
 					case entry.kind === "immediate" && ast.findParentNode(entry.node, ast.isFunction) === setupFunction: {
 						const args0 = node.arguments.at(0);
 						if (args0 == null) return;
-						if (isSetterUsingRefValue(context, args0)) return;
+						function isArgumentUsingRefValue(context, node) {
+							const isUsingRefValue = (n) => {
+								switch (n.type) {
+									case AST_NODE_TYPES.Identifier: return core.isInitializedFromRef(n.name, context.sourceCode.getScope(n));
+									case AST_NODE_TYPES.MemberExpression: return isUsingRefValue(n.object);
+									case AST_NODE_TYPES.CallExpression: return isUsingRefValue(n.callee) || ast.getNestedIdentifiers(n).some(isUsingRefValue);
+									default: return false;
+								}
+							};
+							if (isUsingRefValue(node)) return true;
+							return ast.isFunction(node) && context.sourceCode.getScope(node.body).references.some((r) => isUsingRefValue(r.identifier));
+						}
+						if (isArgumentUsingRefValue(context, args0)) return;
 						context.report({
 							messageId: "default",
 							node,
@@ -4243,7 +4266,7 @@ function create$2(context) {
 						return;
 					}
 					default: {
-						const init = ast.findParentNode(node, isVariableDeclaratorFromHookCall)?.init;
+						const init = ast.findParentNode(node, isHookDecl)?.init;
 						if (init == null) getOrElseUpdate(setStateCallsByFn, entry.node, () => []).push(node);
 						else getOrElseUpdate(setStateInHookCallbacks, init, () => []).push(node);
 					}
@@ -4264,14 +4287,14 @@ function create$2(context) {
 					const parent = node.parent.parent;
 					if (parent.type !== AST_NODE_TYPES.CallExpression) break;
 					if (!core.isUseMemoCall(parent)) break;
-					const init = ast.findParentNode(parent, isVariableDeclaratorFromHookCall)?.init;
+					const init = ast.findParentNode(parent, isHookDecl)?.init;
 					if (init != null) getOrElseUpdate(setStateInEffectArg, init, () => []).push(node);
 					break;
 				}
 				case AST_NODE_TYPES.CallExpression:
 					if (node !== node.parent.arguments.at(0)) break;
 					if (core.isUseCallbackCall(node.parent)) {
-						const init = ast.findParentNode(node.parent, isVariableDeclaratorFromHookCall)?.init;
+						const init = ast.findParentNode(node.parent, isHookDecl)?.init;
 						if (init != null) getOrElseUpdate(setStateInEffectArg, init, () => []).push(node);
 						break;
 					}
@@ -4315,31 +4338,6 @@ function create$2(context) {
 		}
 	});
 }
-function isSetterUsingRefValue(context, node) {
-	const isUsingRefValue = (n) => {
-		switch (n.type) {
-			case AST_NODE_TYPES.Identifier: return core.isInitializedFromRef(n.name, context.sourceCode.getScope(n));
-			case AST_NODE_TYPES.MemberExpression: return isUsingRefValue(n.object);
-			case AST_NODE_TYPES.CallExpression: return isUsingRefValue(n.callee) || ast.getNestedIdentifiers(n).some(isUsingRefValue);
-			default: return false;
-		}
-	};
-	if (isUsingRefValue(node)) return true;
-	return ast.isFunction(node) && context.sourceCode.getScope(node.body).references.some((r) => isUsingRefValue(r.identifier));
-}
-function isInitFromHookCall(init) {
-	if (init?.type !== AST_NODE_TYPES.CallExpression) return false;
-	switch (init.callee.type) {
-		case AST_NODE_TYPES.Identifier: return core.isHookName(init.callee.name);
-		case AST_NODE_TYPES.MemberExpression: return init.callee.property.type === AST_NODE_TYPES.Identifier && core.isHookName(init.callee.property.name);
-		default: return false;
-	}
-}
-function isVariableDeclaratorFromHookCall(node) {
-	if (node.type !== AST_NODE_TYPES.VariableDeclarator) return false;
-	if (node.id.type !== AST_NODE_TYPES.Identifier) return false;
-	return isInitFromHookCall(node.init);
-}
 
 //#endregion
 //#region src/rules/set-state-in-render.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.15",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -45,11 +45,11 @@
     "is-immutable-type": "^5.0.1",
     "ts-api-utils": "^2.4.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-beta.14",
-    "@eslint-react/core": "3.0.0-beta.14",
-    "@eslint-react/eff": "3.0.0-beta.14",
-    "@eslint-react/shared": "3.0.0-beta.14",
-    "@eslint-react/var": "3.0.0-beta.14"
+    "@eslint-react/ast": "3.0.0-beta.15",
+    "@eslint-react/core": "3.0.0-beta.15",
+    "@eslint-react/eff": "3.0.0-beta.15",
+    "@eslint-react/shared": "3.0.0-beta.15",
+    "@eslint-react/var": "3.0.0-beta.15"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",