eslint-plugin-react-x 5.20.2 → 5.20.4

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.20.2";
+var version = "5.20.4";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1462,13 +1462,13 @@ function isRefLikeName$1(name) {
 	return name === "ref" || name.endsWith("Ref");
 }
 function hasRefLikeNameInChain(node) {
-	if (Check.isIdentifier(node)) return isRefLikeName$1(node.name);
-	if (node.type !== AST_NODE_TYPES.MemberExpression) return false;
-	return Check.isIdentifier(node.property) ? isRefLikeName$1(node.property.name) || hasRefLikeNameInChain(node.object) : hasRefLikeNameInChain(node.object);
+	const unwrapped = Extract.unwrap(node);
+	if (!Check.isExpression(unwrapped)) return false;
+	return Extract.getMemberChain(unwrapped).some((member) => Check.isIdentifier(member) && isRefLikeName$1(member.name));
 }
 function isInitializedFromCall(context, node, isCall) {
-	const root = Check.isIdentifier(node) ? node : Extract.getIdentifierAt(node, 0);
-	if (root == null) return false;
+	const root = Extract.getMemberChain(node).at(0);
+	if (root == null || !Check.isIdentifier(root)) return false;
 	const variable = findVariable(context.sourceCode.getScope(root), root);
 	if (variable == null) return false;
 	const origin = resolveVariableOrigin(context, variable);
@@ -1509,6 +1509,11 @@ function createFactCollector$1() {
 			target
 		});
 	}
+	function pushMemberMutation(node, target) {
+		const root = Extract.getMemberChain(target).at(0);
+		if (root == null || !Check.isIdentifier(root)) return;
+		pushMutation("value", node, target, root);
+	}
 	return {
 		facts,
 		visitor: {
@@ -1518,21 +1523,16 @@ function createFactCollector$1() {
 					case AST_NODE_TYPES.Identifier:
 						pushMutation("binding", node, target, target);
 						return;
-					case AST_NODE_TYPES.MemberExpression: {
-						const root = Extract.getIdentifierAt(target, 0);
-						if (root != null) pushMutation("value", node, target, root);
+					case AST_NODE_TYPES.MemberExpression:
+						pushMemberMutation(node, target);
 						return;
-					}
 				}
 			},
 			CallExpression(node) {
 				const callee = Extract.unwrap(node.callee);
 				if (callee.type === AST_NODE_TYPES.MemberExpression) {
 					const method = Extract.getCalleeName(node);
-					if (method != null && KNOWN_MUTATING_METHODS.has(method)) {
-						const root = Extract.getIdentifierAt(callee.object, 0);
-						if (root != null) pushMutation("value", node, callee.object, root);
-					}
+					if (method != null && KNOWN_MUTATING_METHODS.has(method)) pushMemberMutation(node, callee.object);
 				}
 				if (!core.isHookCall(node)) return;
 				for (const argument of node.arguments) {
@@ -1556,8 +1556,7 @@ function createFactCollector$1() {
 				if (node.operator !== "delete") return;
 				const target = Extract.unwrap(node.argument);
 				if (target.type !== AST_NODE_TYPES.MemberExpression) return;
-				const root = Extract.getIdentifierAt(target, 0);
-				if (root != null) pushMutation("value", node, target, root);
+				pushMemberMutation(node, target);
 			},
 			UpdateExpression(node) {
 				const target = Extract.unwrap(node.argument);
@@ -1565,11 +1564,9 @@ function createFactCollector$1() {
 					case AST_NODE_TYPES.Identifier:
 						pushMutation("binding", node, target, target);
 						return;
-					case AST_NODE_TYPES.MemberExpression: {
-						const root = Extract.getIdentifierAt(target, 0);
-						if (root != null) pushMutation("value", node, target, root);
+					case AST_NODE_TYPES.MemberExpression:
+						pushMemberMutation(node, target);
 						return;
-					}
 				}
 			}
 		}
@@ -1603,8 +1600,8 @@ function classifyFrozenOrigin(context, variable, components, seen = /* @__PURE__
 	if (def.node.init == null) {
 		const loop = def.node.parent.parent;
 		if (loop.type !== AST_NODE_TYPES.ForOfStatement || loop.left !== def.node.parent) return null;
-		const root = Extract.getIdentifierAt(loop.right, 0);
-		if (root == null) return null;
+		const root = Extract.getMemberChain(loop.right).at(0);
+		if (root == null || !Check.isIdentifier(root)) return null;
 		const source = findVariable(context.sourceCode.getScope(root), root);
 		if (source == null) return null;
 		const inner = classifyFrozenOrigin(context, source, components, seen);
@@ -3679,7 +3676,7 @@ const isWithStateCall = core.isAPICall("withState");
 */
 function isComponentWrapperCall(context, call, arg) {
 	if (Extract.unwrap(call.callee) === arg) return false;
-	call = Extract.getInnermostCall(call);
+	call = getInnermostCall(call);
 	if (isConnectCall(context, call)) return true;
 	if (isCreateFragmentContainerCall(context, call)) return true;
 	if (isCreatePaginationContainerCall(context, call)) return true;
@@ -3698,6 +3695,21 @@ function isComponentWrapperCall(context, call, arg) {
 	return false;
 }
 /**
+* Unwrap curried call wrappers like `connect(...)(Component)` to get the innermost call expression.
+* Type expressions and chain expressions around each callee are unwrapped along the way.
+* @param node The outermost call expression to inspect.
+* @returns The innermost call expression, whose callee is not itself a call expression.
+*/
+function getInnermostCall(node) {
+	let call = node;
+	let callee = Extract.unwrap(call.callee);
+	while (callee.type === AST_NODE_TYPES.CallExpression) {
+		call = callee;
+		callee = Extract.unwrap(call.callee);
+	}
+	return call;
+}
+/**
 * Resolve the name a function is bound to through wrapping calls (e.g. `const C = useCallback(...)` → `C`).
 * @param context The rule context
 * @param node The function node to resolve the bound name for
@@ -4880,8 +4892,8 @@ function resolveBuiltinObjectName(context, node, seen = /* @__PURE__ */ new Set(
 		const init = Extract.unwrap(def.node.init);
 		if (Check.isIdentifier(init)) return resolveBuiltinObjectName(context, init, seen);
 		if (init.type === AST_NODE_TYPES.MemberExpression) {
-			const rootId = Extract.getIdentifierAt(init, 0);
-			if (rootId != null) return resolveBuiltinObjectName(context, rootId, seen);
+			const rootId = Extract.getMemberChain(init).at(0);
+			if (rootId != null && Check.isIdentifier(rootId)) return resolveBuiltinObjectName(context, rootId, seen);
 		}
 	}
 	return null;
@@ -4924,8 +4936,8 @@ function create$7(context) {
 					break;
 				}
 				case expr.type === AST_NODE_TYPES.MemberExpression && Check.isIdentifier(expr.property): {
-					const rootId = Extract.getIdentifierAt(expr.object, 0);
-					if (rootId == null) return;
+					const rootId = Extract.getMemberChain(expr.object).at(0);
+					if (rootId == null || !Check.isIdentifier(rootId)) return;
 					const objectName = resolveBuiltinObjectName(context, rootId);
 					if (objectName == null) return;
 					const propertyName = expr.property.name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "5.20.2",
+  "version": "5.20.4",
   "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.20.2",
-    "@eslint-react/core": "5.20.2",
-    "@eslint-react/eslint": "5.20.2",
-    "@eslint-react/jsx": "5.20.2",
-    "@eslint-react/shared": "5.20.2",
-    "@eslint-react/var": "5.20.2",
+    "@eslint-react/ast": "5.20.4",
+    "@eslint-react/core": "5.20.4",
+    "@eslint-react/eslint": "5.20.4",
+    "@eslint-react/jsx": "5.20.4",
+    "@eslint-react/shared": "5.20.4",
+    "@eslint-react/var": "5.20.4",
     "@typescript-eslint/scope-manager": "^8.70.0",
     "@typescript-eslint/type-utils": "^8.70.0",
     "@typescript-eslint/types": "^8.70.0",