eslint-plugin-react-x 5.18.1 → 5.18.3

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.18.1";
+var version = "5.18.3";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -3396,25 +3396,90 @@ function create$23(context) {
 
 //#endregion
 //#region src/rules/no-nested-component-definitions/lib.ts
+/** Check if the node is a call expression to react-redux's `connect`. */
+const isConnectCall = core.isAPICall("connect");
+/** Check if the node is a call expression to Relay's `createFragmentContainer`. */
+const isCreateFragmentContainerCall = core.isAPICall("createFragmentContainer");
+/** Check if the node is a call expression to Relay's `createPaginationContainer`. */
+const isCreatePaginationContainerCall = core.isAPICall("createPaginationContainer");
+/** Check if the node is a call expression to Relay's `createRefetchContainer`. */
+const isCreateRefetchContainerCall = core.isAPICall("createRefetchContainer");
+/** Check if the node is a call expression to React's `forwardRef`. */
+const isForwardRefCall = core.isAPICall("forwardRef");
+/** Check if the node is a call expression to a `graphql` tag function (e.g. from Relay or Apollo). */
+const isGraphqlCall = core.isAPICall("graphql");
+/** Check if the node is a call expression to React's `memo`. */
+const isMemoCall = core.isAPICall("memo");
+/** Check if the node is a call expression to MobX's `observer`. */
+const isObserverCall = core.isAPICall("observer");
+/** Check if the node is a call expression to React's `useCallback`. */
+const isUseCallbackCall = core.isAPICall("useCallback");
+/** Check if the node is a call expression to Formik's `withFormik`. */
+const isWithFormikCall = core.isAPICall("withFormik");
+/** Check if the node is a call expression to recompose's `withHandlers`. */
+const isWithHandlersCall = core.isAPICall("withHandlers");
+/** Check if the node is a call expression to recompose's `withLifecycle`. */
+const isWithLifecycleCall = core.isAPICall("withLifecycle");
+/** Check if the node is a call expression to recompose's `withProps`. */
+const isWithPropsCall = core.isAPICall("withProps");
+/** Check if the node is a call expression to react-router v5's `withRouter`. */
+const isWithRouterCall = core.isAPICall("withRouter");
+/** Check if the node is a call expression to recompose's `withState`. */
+const isWithStateCall = core.isAPICall("withState");
 /**
-* Determine whether the node is inside JSX attribute value
-* @param node The AST node to check
-* @returns `true` if the node is inside JSX attribute value
+* Check if a call is a well-known component wrapper call (e.g. `memo`, `connect`, `withFormik`).
+* Curried forms like `connect(...)(Component)` are matched via the innermost callee call.
+* @param context The rule context
+* @param call The call expression to check
+* @param arg The function node passed to the call
+* @returns `true` if the call is a component wrapper call
 */
-function isInsideJSXAttributeValue(node) {
-	return node.parent.type === AST_NODE_TYPES.JSXAttribute || findParentAttribute(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer) != null;
+function isComponentWrapperCall(context, call, arg) {
+	if (Extract.unwrap(call.callee) === arg) return false;
+	call = Extract.getInnermostCall(call);
+	if (isConnectCall(context, call)) return true;
+	if (isCreateFragmentContainerCall(context, call)) return true;
+	if (isCreatePaginationContainerCall(context, call)) return true;
+	if (isCreateRefetchContainerCall(context, call)) return true;
+	if (isForwardRefCall(context, call)) return true;
+	if (isGraphqlCall(context, call)) return true;
+	if (isMemoCall(context, call)) return true;
+	if (isObserverCall(context, call)) return true;
+	if (isUseCallbackCall(context, call)) return true;
+	if (isWithFormikCall(context, call)) return true;
+	if (isWithHandlersCall(context, call)) return true;
+	if (isWithLifecycleCall(context, call)) return true;
+	if (isWithPropsCall(context, call)) return true;
+	if (isWithRouterCall(context, call)) return true;
+	if (isWithStateCall(context, call)) return true;
+	return false;
 }
 /**
-* Check whether a given node is declared inside a class component's render block
-* Ex: class C extends React.Component { render() { const Nested = () => <div />; } }
-* @param node The AST node being checked
-* @returns `true` if the node is inside a class component's render block
+* 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
+* @returns The bound name, or `null` if the call chain does not end at an identifier declarator
 */
-function isInsideRenderMethod(node) {
-	return Traverse.findParent(node, (n) => core.isRenderMethodLike(n) && core.isClassComponent(n.parent.parent)) != null;
+function getWrapperCallBoundName(context, node) {
+	let current = node;
+	let parent = current.parent;
+	while (Check.isTypeExpression(parent)) {
+		current = parent;
+		parent = parent.parent;
+	}
+	while (parent.type === AST_NODE_TYPES.CallExpression && isComponentWrapperCall(context, parent, current)) {
+		current = parent;
+		parent = parent.parent;
+		while (Check.isTypeExpression(parent)) {
+			current = parent;
+			parent = parent.parent;
+		}
+	}
+	if (parent.type !== AST_NODE_TYPES.VariableDeclarator || parent.id.type !== AST_NODE_TYPES.Identifier) return null;
+	return parent.id.name;
 }
 /**
-* Determine whether the node is inside `createElement`'s props argument
+* Check if the node is inside `createElement`'s props argument
 * @param context The rule context
 * @param node The AST node to check
 * @returns `true` if the node is inside `createElement`'s props
@@ -3426,6 +3491,23 @@ function isInsideCreateElementProps(context, node) {
 	if (prop == null) return false;
 	return prop === call.arguments[1];
 }
+/**
+* Check if the node is inside a JSX attribute value
+* @param node The AST node to check
+* @returns `true` if the node is inside a JSX attribute value
+*/
+function isInsideJSXAttributeValue(node) {
+	return node.parent.type === AST_NODE_TYPES.JSXAttribute || findParentAttribute(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer) != null;
+}
+/**
+* Check if the node is declared inside a class component's render block
+* Ex: class C extends React.Component { render() { const Nested = () => <div />; } }
+* @param node The AST node to check
+* @returns `true` if the node is inside a class component's render block
+*/
+function isInsideRenderMethod(node) {
+	return Traverse.findParent(node, (n) => core.isRenderMethodLike(n) && core.isClassComponent(n.parent.parent)) != null;
+}
 
 //#endregion
 //#region src/rules/no-nested-component-definitions/no-nested-component-definitions.ts
@@ -3442,21 +3524,24 @@ var no_nested_component_definitions_default = createRule({
 	defaultOptions: []
 });
 function create$22(context) {
-	const hint = core.FunctionComponentDetectionHint.DoNotIncludeJsxWithNumberValue | core.FunctionComponentDetectionHint.DoNotIncludeJsxWithBooleanValue | core.FunctionComponentDetectionHint.DoNotIncludeJsxWithNullValue | core.FunctionComponentDetectionHint.DoNotIncludeJsxWithStringValue | core.FunctionComponentDetectionHint.DoNotIncludeJsxWithUndefinedValue | core.FunctionComponentDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx | core.FunctionComponentDetectionHint.RequireBothBranchesOfConditionalExpressionToBeJsx | core.FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayPatternElement | core.FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayExpressionElement | core.FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayMapCallback;
+	const hint = core.FunctionComponentDetectionHint.DoNotIncludeJsxWithNumberValue | core.FunctionComponentDetectionHint.DoNotIncludeJsxWithBooleanValue | core.FunctionComponentDetectionHint.DoNotIncludeJsxWithNullValue | core.FunctionComponentDetectionHint.DoNotIncludeJsxWithStringValue | core.FunctionComponentDetectionHint.DoNotIncludeJsxWithUndefinedValue | core.FunctionComponentDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx | core.FunctionComponentDetectionHint.RequireBothBranchesOfConditionalExpressionToBeJsx | core.FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayPatternElement | core.FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayExpressionElement | core.FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayMapCallback | core.FunctionComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayFlatMapCallback;
 	const fc = core.getFunctionComponentCollector(context, { hint });
 	const cc = core.getClassComponentCollector(context);
 	return merge(fc.visitor, cc.visitor, { "Program:exit"(program) {
 		const fComponents = [...fc.api.getAllComponents(program)];
 		const cComponents = [...cc.api.getAllComponents(program)];
+		const fComponentNodes = new Set(fComponents.map((c) => c.node));
+		const cComponentNodes = new Set(cComponents.map((c) => c.node));
 		function findEnclosingComponent(node) {
 			return Traverse.findParent(node, (n) => {
-				if (Check.isFunction(n)) return fComponents.some((c) => c.node === n);
-				if (Check.isClass(n)) return cComponents.some((c) => c.node === n);
+				if (Check.isFunction(n)) return fComponentNodes.has(n);
+				if (Check.isClass(n)) return cComponentNodes.has(n);
 				return false;
 			});
 		}
-		for (const { name, node: component } of fComponents) {
-			if (name == null) continue;
+		for (let { name, node: component } of fComponents) {
+			name ??= getWrapperCallBoundName(context, component);
+			if (name == null || !core.isFunctionComponentNameLoose(name)) continue;
 			if (isInsideJSXAttributeValue(component)) {
 				context.report({
 					data: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "5.18.1",
+  "version": "5.18.3",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -36,25 +36,25 @@
     "dist"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.65.0",
-    "@typescript-eslint/type-utils": "^8.65.0",
-    "@typescript-eslint/types": "^8.65.0",
-    "@typescript-eslint/typescript-estree": "^8.65.0",
-    "@typescript-eslint/utils": "^8.65.0",
+    "@typescript-eslint/scope-manager": "^8.66.0",
+    "@typescript-eslint/type-utils": "^8.66.0",
+    "@typescript-eslint/types": "^8.66.0",
+    "@typescript-eslint/typescript-estree": "^8.66.0",
+    "@typescript-eslint/utils": "^8.66.0",
     "compare-versions": "^6.1.1",
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.5.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.18.1",
-    "@eslint-react/core": "5.18.1",
-    "@eslint-react/jsx": "5.18.1",
-    "@eslint-react/shared": "5.18.1",
-    "@eslint-react/eslint": "5.18.1",
-    "@eslint-react/var": "5.18.1"
+    "@eslint-react/ast": "5.18.3",
+    "@eslint-react/core": "5.18.3",
+    "@eslint-react/eslint": "5.18.3",
+    "@eslint-react/shared": "5.18.3",
+    "@eslint-react/var": "5.18.3",
+    "@eslint-react/jsx": "5.18.3"
   },
   "devDependencies": {
-    "@types/react": "^19.2.17",
-    "@types/react-dom": "^19.2.3",
+    "@types/react": "^19.2.18",
+    "@types/react-dom": "^19.2.4",
     "dedent": "^1.7.2",
     "eslint": "^10.8.0",
     "react": "^19.2.8",
@@ -63,8 +63,8 @@
     "tsl": "^1.0.30",
     "tsl-dx": "^0.13.3",
     "typescript": "6.0.3",
-    "@local/configs": "0.0.0",
-    "@local/eff": "0.0.0"
+    "@local/eff": "0.0.0",
+    "@local/configs": "0.0.0"
   },
   "peerDependencies": {
     "eslint": "*",