eslint-plugin-react-x 2.6.1 → 2.6.2-beta.0

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, isInstanceIdEqual, isJsxFragmentElement, isJsxHostElement, isJsxText, isLazyCall, isReactHookCall, isReactHookName, 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";
@@ -34,7 +34,7 @@ var __exportAll = (all, symbols) => {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "2.6.1";
+var version = "2.6.2-beta.0";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -577,7 +577,7 @@ function create$53(context) {
 			classStack.pop();
 		},
 		MemberExpression(node) {
-			if (!AST.isThisExpression(node.object)) return;
+			if (!AST.isThisExpressionLoose(node.object)) return;
 			const [currClass, isComponent = false] = classStack.at(-1) ?? [];
 			if (currClass == null || !isComponent) return;
 			const [currMethod, isStatic = false] = methodStack.at(-1) ?? [];
@@ -609,7 +609,7 @@ function create$53(context) {
 			if (currMethod == null || isStatic) return;
 			const [setState, hasThisState = false] = setStateStack.at(-1) ?? [];
 			if (setState == null || hasThisState) return;
-			if (node.init == null || !AST.isThisExpression(node.init) || node.id.type !== AST_NODE_TYPES.ObjectPattern) return;
+			if (node.init == null || !AST.isThisExpressionLoose(node.init) || node.id.type !== AST_NODE_TYPES.ObjectPattern) return;
 			if (!node.id.properties.some((prop) => prop.type === AST_NODE_TYPES.Property && isKeyLiteral$2(prop, prop.key) && AST.getPropertyName(prop.key) === "state")) return;
 			context.report({
 				messageId: "noAccessStateInSetstate",
@@ -623,6 +623,23 @@ function create$53(context) {
 //#region src/rules/no-array-index-key.ts
 const RULE_NAME$52 = "no-array-index-key";
 const REACT_CHILDREN_METHOD = ["forEach", "map"];
+const arrayIndexParamPosition = new Map([
+	["every", 1],
+	["filter", 1],
+	["find", 1],
+	["findIndex", 1],
+	["findLast", 1],
+	["findLastIndex", 1],
+	["flatMap", 1],
+	["forEach", 1],
+	["map", 1],
+	["reduce", 2],
+	["reduceRight", 2],
+	["some", 1]
+]);
+function getArrayIndexParamPosition(methodName) {
+	return arrayIndexParamPosition.get(methodName) ?? -1;
+}
 function isReactChildrenMethod(name$7) {
 	return REACT_CHILDREN_METHOD.includes(name$7);
 }
@@ -641,7 +658,7 @@ function getMapIndexParamName(context, node) {
 	if (callee.type !== AST_NODE_TYPES.MemberExpression) return unit;
 	if (callee.property.type !== AST_NODE_TYPES.Identifier) return unit;
 	const { name: name$7 } = callee.property;
-	const indexPosition = AST.getArrayMethodCallbackIndexParamPosition(name$7);
+	const indexPosition = getArrayIndexParamPosition(name$7);
 	if (indexPosition === -1) return unit;
 	const callbackArg = node.arguments[isUsingReactChildren(context, node) ? 1 : 0];
 	if (callbackArg == null) return unit;
@@ -2079,7 +2096,8 @@ function create$20(context) {
 		const jsxElement = node.parent.parent;
 		if (isJsxFragmentElement(context, jsxElement, jsxConfig)) return;
 		if (jsxElement.openingElement.attributes.some((attr) => attr.type === AST_NODE_TYPES.JSXSpreadAttribute)) return;
-		const mapCallback = AST.findParentNode(jsxElement, isMapCallback);
+		if (AST.findParentNode(jsxElement, (n) => isRenderFunctionLoose(context, n)) != null) return;
+		const mapCallback = AST.findParentNode(jsxElement, isArrayMethodCallback);
 		if (mapCallback == null || AST.findParentNode(jsxElement, AST.isFunction) !== mapCallback) {
 			if (!(AST.findParentNode(jsxElement, (n) => AST.isConditional(n) || AST.isControlFlow(n) || findEnclosingAssignmentTarget(n) != null) != null)) context.report({
 				messageId: "noUnnecessaryKey",
@@ -2101,14 +2119,9 @@ function create$20(context) {
 		});
 	} };
 }
-/**
-* Checks if a node is a callback function passed to an array's `.map()` method
-* @param node The node to check
-* @returns `true` if the node is a map callback, `false` otherwise
-*/
-function isMapCallback(node) {
-	if (node.parent == null) return false;
-	if (!AST.isArrayMapCall(node.parent)) return false;
+function isArrayMethodCallback(node) {
+	if (node.parent?.type !== AST_NODE_TYPES.CallExpression) return false;
+	if (!AST.isArrayMapCall(node.parent) && !AST.isArrayFromCall(node.parent)) return false;
 	return AST.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(AST.getUnderlyingExpression(node));
 }
 
@@ -2653,7 +2666,7 @@ function create$10(context) {
 			const currentMethod = methodStack.at(-1);
 			if (currentClass == null || currentMethod == null) return;
 			if (!isClassComponent(currentClass) || currentMethod.static) return;
-			if (!AST.isThisExpression(node.object) || !isKeyLiteral$1(node, node.property)) return;
+			if (!AST.isThisExpressionLoose(node.object) || !isKeyLiteral$1(node, node.property)) return;
 			if (node.parent.type === AST_NODE_TYPES.AssignmentExpression && node.parent.left === node) {
 				propertyDefs.get(currentClass)?.add(node.property);
 				return;
@@ -2670,7 +2683,7 @@ function create$10(context) {
 			const currentMethod = methodStack.at(-1);
 			if (currentClass == null || currentMethod == null) return;
 			if (!isClassComponent(currentClass) || currentMethod.static) return;
-			if (node.init != null && AST.isThisExpression(node.init) && node.id.type === AST_NODE_TYPES.ObjectPattern) {
+			if (node.init != null && AST.isThisExpressionLoose(node.init) && node.id.type === AST_NODE_TYPES.ObjectPattern) {
 				for (const prop of node.id.properties) if (prop.type === AST_NODE_TYPES.Property && isKeyLiteral$1(prop, prop.key)) {
 					const keyName = AST.getPropertyName(prop.key);
 					if (keyName != null) propertyUsages.get(currentClass)?.add(keyName);
@@ -2879,7 +2892,7 @@ function create$8(context) {
 		ClassExpression: classEnter,
 		"ClassExpression:exit": classExit,
 		MemberExpression(node) {
-			if (!AST.isThisExpression(node.object)) return;
+			if (!AST.isThisExpressionLoose(node.object)) return;
 			if (AST.getPropertyName(node.property) !== "state") return;
 			const currentClass = classStack.at(-1);
 			if (currentClass == null || !isClassComponent(currentClass)) return;
@@ -2906,7 +2919,7 @@ function create$8(context) {
 			if (currentMethod == null || currentMethod.static) return;
 			if (currentMethod === constructorStack.at(-1)) return;
 			if (!currentClass.body.body.includes(currentMethod)) return;
-			if (node.init == null || !AST.isThisExpression(node.init) || node.id.type !== AST_NODE_TYPES.ObjectPattern) return;
+			if (node.init == null || !AST.isThisExpressionLoose(node.init) || node.id.type !== AST_NODE_TYPES.ObjectPattern) return;
 			if (!node.id.properties.some((prop) => {
 				if (prop.type === AST_NODE_TYPES.Property && isKeyLiteral(prop, prop.key)) return AST.getPropertyName(prop.key) === "state";
 				return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "2.6.1",
+  "version": "2.6.2-beta.0",
   "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.6.1",
-    "@eslint-react/core": "2.6.1",
-    "@eslint-react/eff": "2.6.1",
-    "@eslint-react/var": "2.6.1",
-    "@eslint-react/shared": "2.6.1"
+    "@eslint-react/ast": "2.6.2-beta.0",
+    "@eslint-react/core": "2.6.2-beta.0",
+    "@eslint-react/eff": "2.6.2-beta.0",
+    "@eslint-react/shared": "2.6.2-beta.0",
+    "@eslint-react/var": "2.6.2-beta.0"
   },
   "devDependencies": {
     "@types/react": "^19.2.8",