eslint-plugin-react-x 2.7.2-beta.3 → 2.7.2-beta.4

package/dist/index.js

@@ -3,7 +3,7 @@ import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { ESLintUtils } from "@typescript-eslint/utils";
 import { P, isMatching, match } from "ts-pattern";
 import ts from "typescript";
-import { ComponentDetectionHint, ComponentFlag, DEFAULT_COMPONENT_DETECTION_HINT, JsxEmit, findEnclosingAssignmentTarget, findParentJsxAttribute, getJsxAttribute, getJsxAttributeName, getJsxConfigFromAnnotation, getJsxConfigFromContext, getJsxElementType, isAssignmentToThisState, isCaptureOwnerStackCall, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElementCall, isComponentDidCatch, isComponentDidMount, isComponentDidUpdate, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUpdate, isCreateContextCall, isCreateElementCall, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRefCall, isGetDerivedStateFromError, isGetDerivedStateFromProps, isInitializedFromReact, isInsideComponentOrHook, isInstanceIdEqual, isJsxFragmentElement, isJsxHostElement, isJsxText, isLazyCall, isReactHookCall, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isThisSetState, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseCall, isUseCallbackCall, isUseContextCall, isUseEffectLikeCall, isUseMemoCall, isUseRefCall, isUseStateCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector } from "@eslint-react/core";
+import { ComponentDetectionHint, ComponentFlag, DEFAULT_COMPONENT_DETECTION_HINT, JsxEmit, findEnclosingAssignmentTarget, findParentJsxAttribute, getJsxAttribute, getJsxAttributeName, getJsxConfigFromAnnotation, getJsxConfigFromContext, getJsxElementType, isAssignmentToThisState, isCaptureOwnerStackCall, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElementCall, isComponentDidCatch, isComponentDidMount, isComponentDidUpdate, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUpdate, isCreateContextCall, isCreateElementCall, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRefCall, isGetDerivedStateFromError, isGetDerivedStateFromProps, isInitializedFromReact, isInstanceIdEqual, isJsxFragmentElement, isJsxHostElement, isJsxText, isLazyCall, isReactHookCall, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isThisSetState, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseCall, isUseCallbackCall, isUseContextCall, isUseEffectLikeCall, isUseMemoCall, isUseRefCall, isUseStateCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector } from "@eslint-react/core";
 import * as AST from "@eslint-react/ast";
 import { findVariable, getChildScopes, getObjectType, getVariableDefinitionNode } from "@eslint-react/var";
 import { constFalse, constTrue, flow, getOrElseUpdate, identity, unit } from "@eslint-react/eff";
@@ -68,7 +68,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "2.7.2-beta.3";
+var version = "2.7.2-beta.4";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -3194,9 +3194,6 @@ function trimLikeReact(text) {
 //#endregion
 //#region src/rules/prefer-destructuring-assignment.ts
 const RULE_NAME$4 = "prefer-destructuring-assignment";
-function isMemberExpressionWithObjectName(node) {
-	return node.object.type === AST_NODE_TYPES.Identifier && "name" in node.object;
-}
 var prefer_destructuring_assignment_default = createRule({
 	meta: {
 		type: "problem",
@@ -3210,42 +3207,25 @@ var prefer_destructuring_assignment_default = createRule({
 });
 function create$4(context) {
 	const { ctx, visitors } = useComponentCollector(context);
-	const exprs = [];
-	return defineRuleListener(visitors, {
-		MemberExpression(node) {
-			if (!isInsideComponentOrHook(node)) return;
-			if (!isMemberExpressionWithObjectName(node)) return;
-			exprs.push(node);
-		},
-		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			function isFunctionComponent(block) {
-				return components.some((comp) => {
-					if (comp.node !== block) return false;
-					if (comp.name == null && comp.isExportDefaultDeclaration) return false;
-					return true;
-				});
-			}
-			for (const expr of exprs) {
-				let scope = context.sourceCode.getScope(expr);
-				let isComponent = isFunctionComponent(scope.block);
-				while (!isComponent && scope.upper != null && scope.upper !== scope) {
-					scope = scope.upper;
-					isComponent = isFunctionComponent(scope.block);
-				}
-				if (!isComponent) continue;
-				const component = scope.block;
-				if (!("params" in component)) continue;
-				const props = component.params.at(0);
-				const isMatch = (node) => node != null && node.type === AST_NODE_TYPES.Identifier && node.name === expr.object.name;
-				if (isMatch(props)) context.report({
+	return defineRuleListener(visitors, { "Program:exit"(program) {
+		for (const component of ctx.getAllComponents(program)) {
+			if (component.name == null && component.isExportDefaultDeclaration) return;
+			const [props] = component.node.params;
+			if (props == null) continue;
+			if (props.type !== AST_NODE_TYPES.Identifier) continue;
+			const propName = props.name;
+			const propReferences = context.sourceCode.getScope(component.node).variables.find((v) => v.name === propName)?.references ?? [];
+			for (const ref of propReferences) {
+				const parent = ref.identifier.parent;
+				if (parent.type !== AST_NODE_TYPES.MemberExpression) continue;
+				context.report({
 					messageId: "preferDestructuringAssignment",
-					node: expr,
+					node: parent,
 					data: { name: "props" }
 				});
 			}
 		}
-	});
+	} });
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "2.7.2-beta.3",
+  "version": "2.7.2-beta.4",
   "description": "A set of composable ESLint rules for for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -46,11 +46,11 @@
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.4.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.7.2-beta.3",
-    "@eslint-react/core": "2.7.2-beta.3",
-    "@eslint-react/eff": "2.7.2-beta.3",
-    "@eslint-react/shared": "2.7.2-beta.3",
-    "@eslint-react/var": "2.7.2-beta.3"
+    "@eslint-react/ast": "2.7.2-beta.4",
+    "@eslint-react/core": "2.7.2-beta.4",
+    "@eslint-react/eff": "2.7.2-beta.4",
+    "@eslint-react/shared": "2.7.2-beta.4",
+    "@eslint-react/var": "2.7.2-beta.4"
   },
   "devDependencies": {
     "@types/react": "^19.2.8",