eslint-plugin-react-x 5.18.2 → 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.2";
+var version = "5.18.3";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -3396,47 +3396,39 @@ 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");
 /**
-* Well-known component wrapper function names, matched by exact or `.`-suffixed fully
-* qualified name (e.g. `memo`, `React.memo`, `mobx.observer`, `connect` from react-redux,
-* or Relay's `create*Container` helpers). Only wrappers whose argument is a render function
-* are listed; wrappers taking a component identifier (`styled`, `motion`) or a loader
-* (`lazy`, `dynamic`) are irrelevant for name resolution.
-*/
-const WELL_KNOWN_COMPONENT_WRAPPERS = [
-	"connect",
-	"createFragmentContainer",
-	"createPaginationContainer",
-	"createRefetchContainer",
-	"forwardRef",
-	"graphql",
-	"memo",
-	"observer",
-	"useCallback"
-];
-/** Matches the HOC naming convention shared by recompose, react-router v5, Formik and custom HOCs (e.g. `withProps`, `withRouter`, `withFormik`, `withAuth`). */
-const RE_HOC_WRAPPER_NAME = /^with[A-Z]/;
-/**
-* Check if a call expression is a well-known component wrapper call.
-* Only calls whose callee's fully qualified name is (or ends with) a well-known wrapper
-* name (e.g. `memo`, `React.memo`, `React.useCallback`, `mobx.observer`) are treated as
-* wrappers; anything else, including member calls on data objects (e.g. `items.map`,
-* `Array.from`), is not, so array method callbacks are never mistaken for wrapped components.
-* Curried wrappers like `connect(...)(Component)` or `withFormik(...)(Component)` are
-* recognized by unwrapping nested callee call expressions.
-* @param context The rule context
-* @param node The call expression to check
-* @returns `true` if the call is a well-known component wrapper call
-*/
-function isWellKnownComponentWrapperCall(context, node) {
-	let callee = Extract.unwrap(node.callee);
-	while (callee.type === AST_NODE_TYPES.CallExpression) callee = Extract.unwrap(callee.callee);
-	const name = Extract.getFullyQualifiedName(callee, (n) => context.sourceCode.getText(n));
-	const baseName = name.slice(name.lastIndexOf(".") + 1);
-	return RE_HOC_WRAPPER_NAME.test(baseName) || WELL_KNOWN_COMPONENT_WRAPPERS.some((wrapper) => name === wrapper || name.endsWith(`.${wrapper}`));
-}
-/**
-* Check if a call expression is a component wrapper call for name resolution purposes.
+* 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
@@ -3444,14 +3436,29 @@ function isWellKnownComponentWrapperCall(context, node) {
 */
 function isComponentWrapperCall(context, call, arg) {
 	if (Extract.unwrap(call.callee) === arg) return false;
-	return isWellKnownComponentWrapperCall(context, call);
+	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;
 }
 /**
-* Resolve the name a function is bound to through a chain of wrapping call expressions,
-* e.g. `const Component = useCallback(() => <div />, [])` resolves to `Component`.
+* 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 if the call chain ends at a variable declarator with an identifier, `null` otherwise
+* @returns The bound name, or `null` if the call chain does not end at an identifier declarator
 */
 function getWrapperCallBoundName(context, node) {
 	let current = node;
@@ -3472,7 +3479,7 @@ function getWrapperCallBoundName(context, node) {
 	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
@@ -3485,17 +3492,17 @@ function isInsideCreateElementProps(context, node) {
 	return prop === call.arguments[1];
 }
 /**
-* Determine whether the node is inside JSX attribute value
+* Check if the node is inside a JSX attribute value
 * @param node The AST node to check
-* @returns `true` if the node is inside JSX attribute value
+* @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 whether a given node is declared inside a class component's render block
+* 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 being checked
+* @param node The AST node to check
 * @returns `true` if the node is inside a class component's render block
 */
 function isInsideRenderMethod(node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "5.18.2",
+  "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,21 +36,21 @@
     "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.2",
-    "@eslint-react/core": "5.18.2",
-    "@eslint-react/eslint": "5.18.2",
-    "@eslint-react/jsx": "5.18.2",
-    "@eslint-react/var": "5.18.2",
-    "@eslint-react/shared": "5.18.2"
+    "@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.18",
@@ -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": "*",