eslint-plugin-react-x 2.7.0 → 2.7.1-beta.0

package/dist/index.js

@@ -68,7 +68,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "2.7.0";
+var version = "2.7.1-beta.0";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1248,7 +1248,7 @@ function create$36(context) {
 					break;
 				}
 				default: {
-					const call = AST.findParentNode(jsxElement, AST.isArrayMapCall);
+					const call = AST.findParentNode(jsxElement, (n) => n.type === AST_NODE_TYPES.CallExpression && n.callee.type === AST_NODE_TYPES.MemberExpression && n.callee.property.type === AST_NODE_TYPES.Identifier && n.callee.property.name === "map");
 					const iter = AST.findParentNode(jsxElement, (n) => n === call || AST.isFunction(n));
 					if (!AST.isFunction(iter)) return;
 					const arg0 = call?.arguments[0];
@@ -1596,75 +1596,61 @@ var no_missing_key_default = createRule({
 	create: create$30,
 	defaultOptions: []
 });
-function create$30(context) {
-	const state = { isWithinChildrenToArray: false };
-	function checkIteratorElement(node) {
-		switch (node.type) {
-			case AST_NODE_TYPES.JSXElement:
-				if (getJsxAttribute(context, node)("key") == null) return {
-					messageId: "missingKey",
-					node
-				};
-				return null;
-			case AST_NODE_TYPES.JSXFragment: return {
-				messageId: "unexpectedFragmentSyntax",
-				node
-			};
-			default: return null;
-		}
+function create$30(ctx) {
+	let inChildrenToArray = false;
+	function check(node) {
+		if (node.type === AST_NODE_TYPES.JSXElement) return getJsxAttribute(ctx, node)("key") == null ? {
+			messageId: "missingKey",
+			node
+		} : null;
+		if (node.type === AST_NODE_TYPES.JSXFragment) return {
+			messageId: "unexpectedFragmentSyntax",
+			node
+		};
+		return null;
 	}
-	function checkExpression(node) {
+	function checkExpr(node) {
 		switch (node.type) {
-			case AST_NODE_TYPES.ConditionalExpression:
-				if ("consequent" in node) return checkIteratorElement(node.consequent) ?? checkIteratorElement(node.alternate);
-				return null;
+			case AST_NODE_TYPES.ConditionalExpression: return check(node.consequent) ?? check(node.alternate);
+			case AST_NODE_TYPES.LogicalExpression: return check(node.left) ?? check(node.right);
 			case AST_NODE_TYPES.JSXElement:
-			case AST_NODE_TYPES.JSXFragment: return checkIteratorElement(node);
-			case AST_NODE_TYPES.LogicalExpression:
-				if ("left" in node) return checkIteratorElement(node.left) ?? checkIteratorElement(node.right);
-				return null;
+			case AST_NODE_TYPES.JSXFragment: return check(node);
 			default: return null;
 		}
 	}
-	function checkBlockStatement(node) {
-		const descriptors = [];
-		for (const statement of AST.getNestedReturnStatements(node)) {
-			if (statement.argument == null) continue;
-			const descriptor = checkIteratorElement(statement.argument);
-			if (descriptor != null) descriptors.push(descriptor);
-		}
-		return descriptors;
+	function checkBlock(node) {
+		return AST.getNestedReturnStatements(node).filter((stmt) => stmt.argument != null).map((stmt) => check(stmt.argument)).filter((d) => d != null);
 	}
 	return {
 		ArrayExpression(node) {
-			if (state.isWithinChildrenToArray) return;
+			if (inChildrenToArray) return;
 			const elements = node.elements.filter(AST.is(AST_NODE_TYPES.JSXElement));
 			if (elements.length === 0) return;
-			const initialScope = context.sourceCode.getScope(node);
-			for (const element of elements) if (getJsxAttribute(context, element, initialScope)("key") == null) context.report({
+			const scope = ctx.sourceCode.getScope(node);
+			for (const el of elements) if (getJsxAttribute(ctx, el, scope)("key") == null) ctx.report({
 				messageId: "missingKey",
-				node: element
+				node: el
 			});
 		},
 		CallExpression(node) {
-			state.isWithinChildrenToArray ||= isChildrenToArrayCall(context, node);
-			if (state.isWithinChildrenToArray) return;
-			const callback = match(node).when(AST.isArrayMapCall, (n) => n.arguments[0]).when(AST.isArrayFromCall, (n) => n.arguments[1]).otherwise(() => null);
-			if (!AST.isFunction(callback)) return;
-			const body = callback.body;
-			if (body.type === AST_NODE_TYPES.BlockStatement) {
-				checkBlockStatement(body).forEach(report(context));
-				return;
-			}
-			report(context)(checkExpression(body));
+			inChildrenToArray ||= isChildrenToArrayCall(ctx, node);
+			if (inChildrenToArray) return;
+			if (node.callee.type !== AST_NODE_TYPES.MemberExpression) return;
+			if (node.callee.property.type !== AST_NODE_TYPES.Identifier) return;
+			const name$9 = node.callee.property.name;
+			const idx = name$9 === "from" ? 1 : name$9 === "map" ? 0 : -1;
+			if (idx < 0) return;
+			const cb = node.arguments[idx];
+			if (!AST.isFunction(cb)) return;
+			if (cb.body.type === AST_NODE_TYPES.BlockStatement) checkBlock(cb.body).forEach(report(ctx));
+			else report(ctx)(checkExpr(cb.body));
 		},
 		"CallExpression:exit"(node) {
-			if (!isChildrenToArrayCall(context, node)) return;
-			state.isWithinChildrenToArray = false;
+			if (isChildrenToArrayCall(ctx, node)) inChildrenToArray = false;
 		},
 		JSXFragment(node) {
-			if (state.isWithinChildrenToArray) return;
-			if (node.parent.type === AST_NODE_TYPES.ArrayExpression) context.report({
+			if (inChildrenToArray) return;
+			if (node.parent.type === AST_NODE_TYPES.ArrayExpression) ctx.report({
 				messageId: "unexpectedFragmentSyntax",
 				node
 			});
@@ -2168,8 +2154,13 @@ function create$20(context) {
 function isArrayMethodCallback(node) {
 	const parent = node.parent;
 	if (parent?.type !== AST_NODE_TYPES.CallExpression) return false;
-	if (!AST.isArrayMapCall(parent) && !AST.isArrayFromCall(parent)) return false;
-	return AST.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(AST.getUnderlyingExpression(node));
+	if (parent.callee.type !== AST_NODE_TYPES.MemberExpression || parent.callee.property.type !== AST_NODE_TYPES.Identifier) return false;
+	switch (parent.callee.property.name) {
+		case "map":
+		case "flatMap": return parent.arguments[0] === node;
+		case "from": return parent.arguments[1] === node;
+		default: return false;
+	}
 }
 
 //#endregion

package/package.json

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