eslint-plugin-react-x 5.5.6-beta.0 → 5.6.0-beta.1

package/dist/index.js

@@ -142,7 +142,7 @@ const rules$6 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "5.5.6-beta.0";
+var version = "5.6.0-beta.1";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1830,15 +1830,18 @@ function create$45(context) {
 				});
 				return descriptors;
 			}
-			case AST_NODE_TYPES.CallExpression: switch (true) {
-				case node.callee.type === AST_NODE_TYPES.MemberExpression && node.callee.property.type === AST_NODE_TYPES.Identifier && node.callee.property.name === "toString" && isArrayIndex(node.callee.object): return [{
-					messageId: "default",
-					node: node.callee.object
-				}];
-				case node.callee.type === AST_NODE_TYPES.Identifier && node.callee.name === "String" && node.arguments[0] != null && isArrayIndex(node.arguments[0]): return [{
-					messageId: "default",
-					node: node.arguments[0]
-				}];
+			case AST_NODE_TYPES.CallExpression: {
+				const callee = Extract.unwrap(node.callee);
+				switch (true) {
+					case callee.type === AST_NODE_TYPES.MemberExpression && callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "toString" && isArrayIndex(callee.object): return [{
+						messageId: "default",
+						node: callee.object
+					}];
+					case callee.type === AST_NODE_TYPES.Identifier && callee.name === "String" && node.arguments[0] != null && isArrayIndex(node.arguments[0]): return [{
+						messageId: "default",
+						node: node.arguments[0]
+					}];
+				}
 			}
 		}
 		return [];
@@ -2273,7 +2276,11 @@ function create$31(context) {
 					break;
 				}
 				default: {
-					const call = Traverse.findParent(jsxElement, (n) => n.type === AST_NODE_TYPES.CallExpression && n.callee.type === AST_NODE_TYPES.MemberExpression && n.callee.property.type === AST_NODE_TYPES.Identifier && n.callee.property.name === "map");
+					const call = Traverse.findParent(jsxElement, (n) => {
+						if (n.type !== AST_NODE_TYPES.CallExpression) return false;
+						const callee = Extract.unwrap(n.callee);
+						return callee.type === AST_NODE_TYPES.MemberExpression && callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "map";
+					});
 					const iter = Traverse.findParent(jsxElement, (n) => n === call || Check.isFunction(n));
 					if (!Check.isFunction(iter)) return;
 					const arg0 = call?.arguments[0];
@@ -2348,9 +2355,10 @@ function create$30(context) {
 function canFix(context, node) {
 	const { importSource } = getSettingsFromContext(context);
 	const initialScope = context.sourceCode.getScope(node);
-	switch (node.callee.type) {
-		case AST_NODE_TYPES.Identifier: return core.isAPIFromReact(node.callee.name, initialScope, importSource);
-		case AST_NODE_TYPES.MemberExpression: return node.callee.object.type === AST_NODE_TYPES.Identifier && core.isAPIFromReact(node.callee.object.name, initialScope, importSource);
+	const callee = Extract.unwrap(node.callee);
+	switch (callee.type) {
+		case AST_NODE_TYPES.Identifier: return core.isAPIFromReact(callee.name, initialScope, importSource);
+		case AST_NODE_TYPES.MemberExpression: return callee.object.type === AST_NODE_TYPES.Identifier && core.isAPIFromReact(callee.object.name, initialScope, importSource);
 		default: return false;
 	}
 }
@@ -2805,9 +2813,10 @@ function create$23(context) {
 		CallExpression(node) {
 			inChildrenToArray ||= core.isChildrenToArrayCall(context, node);
 			if (inChildrenToArray) return;
-			if (node.callee.type !== AST_NODE_TYPES.MemberExpression) return;
-			if (node.callee.property.type !== AST_NODE_TYPES.Identifier) return;
-			const name = node.callee.property.name;
+			const callee = Extract.unwrap(node.callee);
+			if (callee.type !== AST_NODE_TYPES.MemberExpression) return;
+			if (callee.property.type !== AST_NODE_TYPES.Identifier) return;
+			const name = callee.property.name;
 			const idx = name === "from" ? 1 : name === "map" ? 0 : -1;
 			if (idx < 0) return;
 			const cb = node.arguments[idx];
@@ -3376,10 +3385,17 @@ var no_unstable_default_props_default = createRule({
 	defaultOptions: defaultOptions$1
 });
 function extractIdentifier(node) {
-	if (node.type === AST_NODE_TYPES.NewExpression && node.callee.type === AST_NODE_TYPES.Identifier) return node.callee.name;
-	if (node.type === AST_NODE_TYPES.CallExpression && node.callee.type === AST_NODE_TYPES.MemberExpression) {
-		const { object } = node.callee;
-		if (object.type === AST_NODE_TYPES.Identifier) return object.name;
+	if (node.type === AST_NODE_TYPES.NewExpression) {
+		const callee = Extract.unwrap(node.callee);
+		if (callee.type === AST_NODE_TYPES.Identifier) return callee.name;
+	}
+	if (node.type === AST_NODE_TYPES.CallExpression) {
+		const callee = Extract.unwrap(node.callee);
+		if (callee.type === AST_NODE_TYPES.Identifier) return callee.name;
+		if (callee.type === AST_NODE_TYPES.MemberExpression) {
+			const { object } = callee;
+			if (object.type === AST_NODE_TYPES.Identifier) return object.name;
+		}
 	}
 	return null;
 }
@@ -6570,9 +6586,10 @@ function isHookDecl(node) {
 	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);
+	const callee = Extract.unwrap(init.callee);
+	switch (callee.type) {
+		case AST_NODE_TYPES.Identifier: return core.isHookName(callee.name);
+		case AST_NODE_TYPES.MemberExpression: return callee.property.type === AST_NODE_TYPES.Identifier && core.isHookName(callee.property.name);
 		default: return false;
 	}
 }
@@ -6657,7 +6674,8 @@ function create$5(context) {
 		if (setupFnRef.current === node) setupFnRef.current = null;
 	};
 	function isThenCall(node) {
-		return node.callee.type === AST_NODE_TYPES.MemberExpression && node.callee.property.type === AST_NODE_TYPES.Identifier && node.callee.property.name === "then";
+		const callee = Extract.unwrap(node.callee);
+		return callee.type === AST_NODE_TYPES.MemberExpression && callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "then";
 	}
 	function isUseStateCall(node) {
 		return core.isUseStateLikeCall(node, additionalStateHooks);
@@ -6695,21 +6713,22 @@ function create$5(context) {
 		return variableNodeParent.id.elements.findIndex((e) => e?.type === AST_NODE_TYPES.Identifier && e.name === id.name) === at;
 	}
 	function isSetStateCall(node) {
-		switch (node.callee.type) {
+		const callee = Extract.unwrap(node.callee);
+		switch (callee.type) {
 			case AST_NODE_TYPES.CallExpression: {
-				const { callee } = node.callee;
-				if (callee.type !== AST_NODE_TYPES.MemberExpression) return false;
-				if (!("name" in callee.object)) return false;
-				const isAt = callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "at";
-				const [index] = node.callee.arguments;
+				const innerCallee = Extract.unwrap(callee.callee);
+				if (innerCallee.type !== AST_NODE_TYPES.MemberExpression) return false;
+				if (!("name" in innerCallee.object)) return false;
+				const isAt = innerCallee.property.type === AST_NODE_TYPES.Identifier && innerCallee.property.name === "at";
+				const [index] = callee.arguments;
 				if (!isAt || index == null) return false;
-				return getStaticValue(index, context.sourceCode.getScope(node))?.value === 1 && isIdFromUseStateCall(callee.object);
+				return getStaticValue(index, context.sourceCode.getScope(node))?.value === 1 && isIdFromUseStateCall(innerCallee.object);
 			}
-			case AST_NODE_TYPES.Identifier: return isIdFromUseStateCall(node.callee, 1);
+			case AST_NODE_TYPES.Identifier: return isIdFromUseStateCall(callee, 1);
 			case AST_NODE_TYPES.MemberExpression: {
-				if (!("name" in node.callee.object)) return false;
-				const property = node.callee.property;
-				return getStaticValue(property, context.sourceCode.getScope(node))?.value === 1 && isIdFromUseStateCall(node.callee.object, 1);
+				if (!("name" in callee.object)) return false;
+				const property = callee.property;
+				return getStaticValue(property, context.sourceCode.getScope(node))?.value === 1 && isIdFromUseStateCall(callee.object, 1);
 			}
 			default: return false;
 		}
@@ -6762,7 +6781,7 @@ function create$5(context) {
 						if (isArgumentUsingRefValue(context, args0)) return;
 						if (isRefGatedContext(context, node)) return;
 						context.report({
-							data: { name: context.sourceCode.getText(node.callee) },
+							data: { name: context.sourceCode.getText(Extract.unwrap(node.callee)) },
 							messageId: "default",
 							node
 						});
@@ -6824,8 +6843,9 @@ function create$5(context) {
 				});
 			}
 			for (const { callee } of trackedFnCalls) {
-				if (!("name" in callee)) continue;
-				const setStateCalls = getSetStateCalls(context, callee);
+				const unwrappedCallee = Extract.unwrap(callee);
+				if (unwrappedCallee.type !== AST_NODE_TYPES.Identifier) continue;
+				const setStateCalls = getSetStateCalls(context, unwrappedCallee);
 				for (const setStateCall of setStateCalls) {
 					if (isRefGatedContext(context, getSetStateCallExpression(setStateCall))) continue;
 					context.report({
@@ -6915,21 +6935,22 @@ function create$4(context) {
 		return initNodeParent.id.elements.findIndex((e) => e?.type === AST_NODE_TYPES.Identifier && e.name === topLevelId.name) === at;
 	}
 	function isSetStateCall(node) {
-		switch (node.callee.type) {
+		const callee = Extract.unwrap(node.callee);
+		switch (callee.type) {
 			case AST_NODE_TYPES.CallExpression: {
-				const { callee } = node.callee;
-				if (callee.type !== AST_NODE_TYPES.MemberExpression) return false;
-				if (!("name" in callee.object)) return false;
-				const isAt = callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "at";
-				const [index] = node.callee.arguments;
+				const innerCallee = Extract.unwrap(callee.callee);
+				if (innerCallee.type !== AST_NODE_TYPES.MemberExpression) return false;
+				if (!("name" in innerCallee.object)) return false;
+				const isAt = innerCallee.property.type === AST_NODE_TYPES.Identifier && innerCallee.property.name === "at";
+				const [index] = callee.arguments;
 				if (!isAt || index == null) return false;
-				return getStaticValue(index, context.sourceCode.getScope(node))?.value === 1 && isIdFromUseStateCall(callee.object);
+				return getStaticValue(index, context.sourceCode.getScope(node))?.value === 1 && isIdFromUseStateCall(innerCallee.object);
 			}
-			case AST_NODE_TYPES.Identifier: return isIdFromUseStateCall(node.callee, 1);
+			case AST_NODE_TYPES.Identifier: return isIdFromUseStateCall(callee, 1);
 			case AST_NODE_TYPES.MemberExpression: {
-				if (!("name" in node.callee.object)) return false;
-				const property = node.callee.property;
-				return getStaticValue(property, context.sourceCode.getScope(node))?.value === 1 && isIdFromUseStateCall(node.callee.object, 1);
+				if (!("name" in callee.object)) return false;
+				const property = callee.property;
+				return getStaticValue(property, context.sourceCode.getScope(node))?.value === 1 && isIdFromUseStateCall(callee.object, 1);
 			}
 			default: return false;
 		}
@@ -6967,7 +6988,7 @@ function create$4(context) {
 			if (isInsideConditional(node, componentFn)) return;
 			if (componentHasEarlyReturn.current) return;
 			context.report({
-				data: { name: context.sourceCode.getText(node.callee) },
+				data: { name: context.sourceCode.getText(Extract.unwrap(node.callee)) },
 				messageId: "default",
 				node
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "5.5.6-beta.0",
+  "version": "5.6.0-beta.1",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -45,12 +45,12 @@
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.5.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.5.6-beta.0",
-    "@eslint-react/core": "5.5.6-beta.0",
-    "@eslint-react/eslint": "5.5.6-beta.0",
-    "@eslint-react/shared": "5.5.6-beta.0",
-    "@eslint-react/var": "5.5.6-beta.0",
-    "@eslint-react/jsx": "5.5.6-beta.0"
+    "@eslint-react/ast": "5.6.0-beta.1",
+    "@eslint-react/core": "5.6.0-beta.1",
+    "@eslint-react/eslint": "5.6.0-beta.1",
+    "@eslint-react/jsx": "5.6.0-beta.1",
+    "@eslint-react/var": "5.6.0-beta.1",
+    "@eslint-react/shared": "5.6.0-beta.1"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",