@eslint-react/core 5.5.6-beta.0 → 5.6.0-beta.1

package/dist/index.js

@@ -365,7 +365,7 @@ function isRenderMethodCallback(node) {
 * @deprecated Class components are legacy. This function exists only to support legacy rules.
 */
 function isThisSetStateCall(node) {
-	const { callee } = node;
+	const callee = Extract.unwrap(node.callee);
 	return callee.type === AST_NODE_TYPES.MemberExpression && callee.object.type === AST_NODE_TYPES.ThisExpression && callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "setState";
 }
 /**
@@ -505,7 +505,7 @@ function getFunctionInitPath(node) {
 function isFunctionHasCallInInitPath(callName, initPath) {
 	return initPath.some((node) => {
 		if (node.type !== AST_NODE_TYPES.CallExpression) return false;
-		const { callee } = node;
+		const callee = Extract.unwrap(node.callee);
 		if (callee.type === AST_NODE_TYPES.Identifier) return callee.name === callName;
 		if (callee.type === AST_NODE_TYPES.MemberExpression && "name" in callee.property) return callee.property.name === callName;
 		return false;
@@ -672,12 +672,19 @@ const DEFAULT_COMPONENT_DETECTION_HINT = 0n | FunctionComponentDetectionHint.DoN
 */
 function isFunctionComponentDefinition(context, node, hint) {
 	if (!isFunctionWithLooseComponentName(context, node, true)) return false;
+	const isCreateElementArg = (() => {
+		let p = node.parent;
+		while (Check.isTypeExpression(p)) p = p.parent;
+		if (p.type !== AST_NODE_TYPES.CallExpression || !isCreateElementCall(context, p)) return false;
+		return p.arguments.slice(2).some((arg) => Extract.unwrap(arg) === node);
+	})();
 	switch (true) {
-		case node.parent.type === AST_NODE_TYPES.CallExpression && isCreateElementCall(context, node.parent) && node.parent.arguments.slice(2).some((arg) => arg === node): return false;
+		case isCreateElementArg: return false;
 		case isRenderMethodCallback(node): return false;
 	}
 	let parent = node.parent;
 	while (Check.isTypeExpression(parent)) parent = parent.parent;
+	const parentCallee = parent.type === AST_NODE_TYPES.CallExpression ? Extract.unwrap(parent.callee) : null;
 	switch (true) {
 		case isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && parent.type === AST_NODE_TYPES.Property && parent.parent.type === AST_NODE_TYPES.ObjectExpression:
 			if (hint & FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsObjectMethod) return false;
@@ -694,10 +701,10 @@ function isFunctionComponentDefinition(context, node, hint) {
 		case parent.type === AST_NODE_TYPES.ArrayExpression:
 			if (hint & FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayExpressionElement) return false;
 			break;
-		case parent.type === AST_NODE_TYPES.CallExpression && parent.callee.type === AST_NODE_TYPES.MemberExpression && parent.callee.property.type === AST_NODE_TYPES.Identifier && parent.callee.property.name === "map":
+		case parentCallee != null && parentCallee.type === AST_NODE_TYPES.MemberExpression && parentCallee.property.type === AST_NODE_TYPES.Identifier && parentCallee.property.name === "map":
 			if (hint & FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayMapCallback) return false;
 			break;
-		case parent.type === AST_NODE_TYPES.CallExpression && parent.callee.type === AST_NODE_TYPES.MemberExpression && parent.callee.property.type === AST_NODE_TYPES.Identifier && parent.callee.property.name === "flatMap":
+		case parentCallee != null && parentCallee.type === AST_NODE_TYPES.MemberExpression && parentCallee.property.type === AST_NODE_TYPES.Identifier && parentCallee.property.name === "flatMap":
 			if (hint & FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayFlatMapCallback) return false;
 			break;
 		case parent.type === AST_NODE_TYPES.CallExpression && getFunctionId(node) == null && !isFunctionComponentWrapperCall(context, parent) && !isCreateElementCall(context, parent):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "5.5.6-beta.0",
+  "version": "5.6.0-beta.1",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -33,11 +33,11 @@
     "@typescript-eslint/types": "^8.59.1",
     "@typescript-eslint/utils": "^8.59.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.5.6-beta.0",
-    "@eslint-react/eslint": "5.5.6-beta.0",
-    "@eslint-react/jsx": "5.5.6-beta.0",
-    "@eslint-react/shared": "5.5.6-beta.0",
-    "@eslint-react/var": "5.5.6-beta.0"
+    "@eslint-react/eslint": "5.6.0-beta.1",
+    "@eslint-react/jsx": "5.6.0-beta.1",
+    "@eslint-react/ast": "5.6.0-beta.1",
+    "@eslint-react/shared": "5.6.0-beta.1",
+    "@eslint-react/var": "5.6.0-beta.1"
   },
   "devDependencies": {
     "@typescript-eslint/parser": "^8.59.1",
@@ -46,8 +46,8 @@
     "tsdown": "^0.21.10",
     "typescript": "^6.0.3",
     "vitest": "^4.1.5",
-    "@local/configs": "0.0.0",
-    "@local/eff": "3.0.0-beta.72"
+    "@local/eff": "3.0.0-beta.72",
+    "@local/configs": "0.0.0"
   },
   "peerDependencies": {
     "eslint": "^10.2.1",