eslint-plugin-react-x 5.23.4 → 5.23.5

package/dist/index.js

@@ -145,7 +145,7 @@ const rules$6 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "5.23.4";
+var version = "5.23.5";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -7980,15 +7980,29 @@ function isInitializedFromRef(context, name, initialScope, seen = /* @__PURE__ *
 	const { additionalRefHooks } = getSettingsFromContext(context);
 	if (seen.has(name)) return false;
 	seen.add(name);
-	for (const { node } of findVariable(initialScope, name)?.defs ?? []) {
+	for (const def of findVariable(initialScope, name)?.defs ?? []) {
+		if (def.type === DefinitionType.Parameter) {
+			if (def.name.type === AST_NODE_TYPES.Identifier && (def.name.name === "ref" || def.name.name.endsWith("Ref"))) return true;
+			continue;
+		}
+		const { node } = def;
 		if (node.type !== AST_NODE_TYPES.VariableDeclarator) continue;
 		const init = node.init == null ? null : Extract.unwrap(node.init);
 		if (init == null) continue;
 		switch (true) {
 			case init.type === AST_NODE_TYPES.MemberExpression: {
-				let object = Extract.unwrap(init.object);
-				while (object.type === AST_NODE_TYPES.MemberExpression) object = Extract.unwrap(object.object);
-				return Check.isIdentifier(object) && (object.name === "ref" || object.name.endsWith("Ref"));
+				let current = init;
+				while (current.type === AST_NODE_TYPES.MemberExpression) {
+					const property = Extract.unwrap(current.property);
+					const object = Extract.unwrap(current.object);
+					if (!current.computed && Check.isIdentifier(property, "current")) {
+						const sourceName = getRefSourceName(object);
+						if (sourceName === "ref" || sourceName?.endsWith("Ref") === true) return true;
+					}
+					current = object;
+				}
+				if (Check.isIdentifier(current) && (current.name === "ref" || current.name.endsWith("Ref"))) return true;
+				return getNestedIdentifiers(init).some((id) => isInitializedFromRef(context, id.name, context.sourceCode.getScope(id), seen));
 			}
 			case init.type === AST_NODE_TYPES.CallExpression && core.isUseRefLikeCall(init, additionalRefHooks): return true;
 			default: return getNestedIdentifiers(init).some((id) => isInitializedFromRef(context, id.name, context.sourceCode.getScope(id), seen));
@@ -7997,6 +8011,21 @@ function isInitializedFromRef(context, name, initialScope, seen = /* @__PURE__ *
 	return false;
 }
 /**
+* Get the name that identifies the source of a `.current` member access.
+* @param node The object of the member expression
+* @returns The identifier name, the last property name of a member chain, or null
+*/
+function getRefSourceName(node) {
+	switch (node.type) {
+		case AST_NODE_TYPES.Identifier: return node.name;
+		case AST_NODE_TYPES.MemberExpression: {
+			const property = Extract.unwrap(node.property);
+			return !node.computed && property.type === AST_NODE_TYPES.Identifier ? property.name : null;
+		}
+		default: return null;
+	}
+}
+/**
 * Check if a setState call is inside a conditional block whose test expression
 * is derived from a ref value (e.g. `if (prevRef.current !== value) setState(...)`).
 * @param context The ESLint rule context
@@ -8043,7 +8072,7 @@ function isRefInExpression(context, node) {
 * @returns The actual CallExpression node
 */
 function getSetStateCallExpression(node) {
-	return Check.isIdentifier(node) && node.parent.type === AST_NODE_TYPES.CallExpression ? node.parent : node;
+	return Check.isIdentifier(node) && node.parent.type === AST_NODE_TYPES.CallExpression && node.parent.callee === node ? node.parent : node;
 }
 
 //#endregion
@@ -8139,6 +8168,25 @@ function create$5(context) {
 			default: return false;
 		}
 	}
+	function isArgumentUsingRefValue(context, node) {
+		const isUsingRefValue = (n) => {
+			switch (n.type) {
+				case AST_NODE_TYPES.Identifier: return isInitializedFromRef(context, n.name, context.sourceCode.getScope(n));
+				case AST_NODE_TYPES.MemberExpression: return isUsingRefValue(n.object);
+				case AST_NODE_TYPES.CallExpression: return isUsingRefValue(n.callee) || getNestedIdentifiers(n).some(isUsingRefValue);
+				case AST_NODE_TYPES.BinaryExpression:
+				case AST_NODE_TYPES.LogicalExpression: return isUsingRefValue(n.left) || isUsingRefValue(n.right);
+				case AST_NODE_TYPES.UnaryExpression:
+				case AST_NODE_TYPES.UpdateExpression: return isUsingRefValue(n.argument);
+				case AST_NODE_TYPES.ConditionalExpression: return isUsingRefValue(n.consequent) || isUsingRefValue(n.alternate);
+				case AST_NODE_TYPES.SequenceExpression: return n.expressions.some(isUsingRefValue);
+				case AST_NODE_TYPES.AssignmentExpression: return isUsingRefValue(n.right);
+				default: return false;
+			}
+		};
+		if (isUsingRefValue(node)) return true;
+		return Check.isFunction(node) && context.sourceCode.getScope(node.body).references.some((r) => isUsingRefValue(r.identifier));
+	}
 	return {
 		":function"(node) {
 			const kind = getFunctionKind(node);
@@ -8165,25 +8213,6 @@ function create$5(context) {
 					case entry.kind === "immediate" && Traverse.findParent(entry.node, Check.isFunction) === setupFunction: {
 						const args0 = node.arguments.at(0);
 						if (args0 == null) return;
-						function isArgumentUsingRefValue(context, node) {
-							const isUsingRefValue = (n) => {
-								switch (n.type) {
-									case AST_NODE_TYPES.Identifier: return isInitializedFromRef(context, n.name, context.sourceCode.getScope(n));
-									case AST_NODE_TYPES.MemberExpression: return isUsingRefValue(n.object);
-									case AST_NODE_TYPES.CallExpression: return isUsingRefValue(n.callee) || getNestedIdentifiers(n).some(isUsingRefValue);
-									case AST_NODE_TYPES.BinaryExpression:
-									case AST_NODE_TYPES.LogicalExpression: return isUsingRefValue(n.left) || isUsingRefValue(n.right);
-									case AST_NODE_TYPES.UnaryExpression:
-									case AST_NODE_TYPES.UpdateExpression: return isUsingRefValue(n.argument);
-									case AST_NODE_TYPES.ConditionalExpression: return isUsingRefValue(n.consequent) || isUsingRefValue(n.alternate);
-									case AST_NODE_TYPES.SequenceExpression: return n.expressions.some(isUsingRefValue);
-									case AST_NODE_TYPES.AssignmentExpression: return isUsingRefValue(n.right);
-									default: return false;
-								}
-							};
-							if (isUsingRefValue(node)) return true;
-							return Check.isFunction(node) && context.sourceCode.getScope(node.body).references.some((r) => isUsingRefValue(r.identifier));
-						}
 						if (isArgumentUsingRefValue(context, args0)) return;
 						if (isRefGatedContext(context, node)) return;
 						context.report({
@@ -8230,6 +8259,13 @@ function create$5(context) {
 			}
 		},
 		"Program:exit"() {
+			const isExemptSetStateCall = (setStateCall) => {
+				const callNode = getSetStateCallExpression(setStateCall);
+				if (isRefGatedContext(context, callNode)) return true;
+				if (callNode.type !== AST_NODE_TYPES.CallExpression) return false;
+				const args0 = callNode.arguments.at(0);
+				return args0 != null && isArgumentUsingRefValue(context, args0);
+			};
 			const getSetStateCalls = (context, id) => {
 				const variable = findVariable(context.sourceCode.getScope(id), id);
 				if (variable != null && variable.defs.some((def) => def.type === DefinitionType.Parameter)) return [];
@@ -8243,7 +8279,7 @@ function create$5(context) {
 				return [];
 			};
 			for (const [, calls] of setStateInEffectSetup) for (const call of calls) {
-				if (isRefGatedContext(context, getSetStateCallExpression(call))) continue;
+				if (isExemptSetStateCall(call)) continue;
 				context.report({
 					data: { name: call.name },
 					messageId: "default",
@@ -8255,7 +8291,7 @@ function create$5(context) {
 				if (!Check.isIdentifier(unwrappedCallee)) continue;
 				const setStateCalls = getSetStateCalls(context, unwrappedCallee);
 				for (const setStateCall of setStateCalls) {
-					if (isRefGatedContext(context, getSetStateCallExpression(setStateCall))) continue;
+					if (isExemptSetStateCall(setStateCall)) continue;
 					context.report({
 						data: { name: getCallName(setStateCall) },
 						messageId: "default",
@@ -8266,7 +8302,7 @@ function create$5(context) {
 			for (const id of setupFnIds) {
 				const setStateCalls = getSetStateCalls(context, id);
 				for (const setStateCall of setStateCalls) {
-					if (isRefGatedContext(context, getSetStateCallExpression(setStateCall))) continue;
+					if (isExemptSetStateCall(setStateCall)) continue;
 					context.report({
 						data: { name: getCallName(setStateCall) },
 						messageId: "default",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "5.23.4",
+  "version": "5.23.5",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -36,12 +36,12 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.23.4",
-    "@eslint-react/core": "5.23.4",
-    "@eslint-react/eslint": "5.23.4",
-    "@eslint-react/jsx": "5.23.4",
-    "@eslint-react/shared": "5.23.4",
-    "@eslint-react/var": "5.23.4",
+    "@eslint-react/ast": "5.23.5",
+    "@eslint-react/core": "5.23.5",
+    "@eslint-react/eslint": "5.23.5",
+    "@eslint-react/jsx": "5.23.5",
+    "@eslint-react/shared": "5.23.5",
+    "@eslint-react/var": "5.23.5",
     "@typescript-eslint/scope-manager": "^8.71.0",
     "@typescript-eslint/types": "^8.71.0",
     "@typescript-eslint/typescript-estree": "^8.71.0",