Minor changes to #71 to fix tests, remove esquery selectors for perf.

Author: joshwilsonvu

src/rules/prefer-for.ts

@@ -48,32 +48,36 @@ const rule: TSESLint.RuleModule<"preferFor" | "preferForOrIndex", []> = {
       });
     };
 
-    const report = (node: T.CallExpression) => {
-      if (
-        node.callee.type === "MemberExpression" &&
-        getPropertyName(node.callee) === "map" &&
-        node.arguments.length === 1 && // passing thisArg to Array.prototype.map is rare, deopt in that case
-        isFunctionNode(node.arguments[0])
-      ) {
-        const mapFnNode = node.arguments[0];
-        if (mapFnNode.params.length === 1 && mapFnNode.params[0].type !== "RestElement") {
-          // The map fn doesn't take an index param, so it can't possibly be an index-keyed list. Use <For />.
-          // The returned JSX, if it's coming from React, will have an unnecessary `key` prop to be removed in
-          // the useless-keys rule.
-          reportPreferFor(node);
-        } else {
-          // Too many possible solutions to make a suggestion or fix
-          context.report({
-            node,
-            messageId: "preferForOrIndex",
-          });
-        }
-      }
-    };
-
     return {
-      "JSXElement > JSXExpressionContainer > CallExpression": report,
-      "JSXElement > JSXExpressionContainer > ChainExpression > CallExpression": report,
+      CallExpression(node) {
+        const callOrChain = node.parent?.type === "ChainExpression" ? node.parent : node;
+        if (
+          callOrChain.parent?.type === "JSXExpressionContainer" &&
+          callOrChain.parent.parent?.type === "JSXElement"
+        ) {
+          // check for Array.prototype.map in JSX
+          if (
+            node.callee.type === "MemberExpression" &&
+            getPropertyName(node.callee) === "map" &&
+            node.arguments.length === 1 && // passing thisArg to Array.prototype.map is rare, deopt in that case
+            isFunctionNode(node.arguments[0])
+          ) {
+            const mapFnNode = node.arguments[0];
+            if (mapFnNode.params.length === 1 && mapFnNode.params[0].type !== "RestElement") {
+              // The map fn doesn't take an index param, so it can't possibly be an index-keyed list. Use <For />.
+              // The returned JSX, if it's coming from React, will have an unnecessary `key` prop to be removed in
+              // the useless-keys rule.
+              reportPreferFor(node);
+            } else {
+              // Too many possible solutions to make a suggestion or fix
+              context.report({
+                node,
+                messageId: "preferForOrIndex",
+              });
+            }
+          }
+        }
+      },
     };
   },
 };

test/rules/prefer-for.test.ts

@@ -1,4 +1,4 @@
-import { run } from "../ruleTester";
+import { run, tsOnlyTest } from "../ruleTester";
 import rule from "../../src/rules/prefer-for";
 
 export const cases = run("prefer-for", rule, {
@@ -41,8 +41,9 @@ export const cases = run("prefer-for", rule, {
       errors: [{ messageId: "preferFor" }],
       output: `
       function Component(props) {
-        return <ol>{<For each={props.data}>{(d) => <li>{d.text}</li>}</For>}</ol>;
+        return <ol>{<For each={props.data}>{d => <li>{d.text}</li>}</For>}</ol>;
       }`,
+      ...tsOnlyTest,
     },
     // deopts
     {