eslint-plugin-react-x 1.47.1-next.1 → 1.47.2-beta.0

package/dist/index.js

@@ -141,7 +141,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.47.1-next.1";
+var version = "1.47.2-beta.0";
 var createRule = utils.ESLintUtils.RuleCreator(shared.getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1453,9 +1453,10 @@ function create27(context) {
       if (!ER25__namespace.isForwardRefCall(context, node)) {
         return;
       }
+      const id = AST8__namespace.getFunctionIdentifier(node);
       context.report({
         messageId: "noForwardRef",
-        node,
+        node: id ?? node,
         fix: getFix(context, node)
       });
     }
@@ -1552,12 +1553,12 @@ function create28(context) {
   return {
     JSXOpeningElement(node) {
       const initialScope = context.sourceCode.getScope(node);
-      const keyPropFound = ER25__namespace.getAttribute(context, "key", node.attributes, initialScope);
-      const keyPropOnElement = node.attributes.some(
+      const keyProp = ER25__namespace.getAttribute(context, "key", node.attributes, initialScope);
+      const isKeyPropOnElement = node.attributes.some(
         (n) => n.type === types.AST_NODE_TYPES.JSXAttribute && n.name.type === types.AST_NODE_TYPES.JSXIdentifier && n.name.name === "key"
       );
-      if (keyPropFound != null && !keyPropOnElement) {
-        context.report({ messageId: "noImplicitKey", node: keyPropFound });
+      if (keyProp != null && !isKeyPropOnElement) {
+        context.report({ messageId: "noImplicitKey", node: keyProp });
       }
     }
   };
@@ -1761,9 +1762,10 @@ function create30(context) {
           continue;
         }
         if (displayName == null) {
+          const id = AST8__namespace.getFunctionIdentifier(node);
           context.report({
             messageId: "noMissingComponentDisplayName",
-            node
+            node: id ?? node
           });
         }
       }
@@ -1816,7 +1818,7 @@ function create31(context) {
         if (!hasDisplayNameAssignment) {
           context.report({
             messageId: "noMissingContextDisplayName",
-            node: call
+            node: id
           });
         }
       }
@@ -3067,31 +3069,17 @@ var no_use_context_default = createRule({
 function create49(context) {
   if (!context.sourceCode.text.includes("useContext")) return {};
   const settings4 = shared.getSettingsFromContext(context);
-  const useContextAlias = /* @__PURE__ */ new Set();
   if (compareVersions.compare(settings4.version, "19.0.0", "<")) {
     return {};
   }
+  const useContextNames = /* @__PURE__ */ new Set();
+  const hookCalls = /* @__PURE__ */ new Set();
   return {
     CallExpression(node) {
       if (!ER25__namespace.isReactHookCall(node)) {
         return;
       }
-      if (!ER25__namespace.isReactHookCallWithNameAlias(context, "useContext", [...useContextAlias])(node)) {
-        return;
-      }
-      context.report({
-        messageId: "noUseContext",
-        node: node.callee,
-        fix(fixer) {
-          switch (node.callee.type) {
-            case types.AST_NODE_TYPES.Identifier:
-              return fixer.replaceText(node.callee, "use");
-            case types.AST_NODE_TYPES.MemberExpression:
-              return fixer.replaceText(node.callee.property, "use");
-          }
-          return null;
-        }
-      });
+      hookCalls.add(node);
     },
     ImportDeclaration(node) {
       if (node.source.value !== settings4.importSource) {
@@ -3103,7 +3091,7 @@ function create49(context) {
         if (specifier.imported.type !== types.AST_NODE_TYPES.Identifier) continue;
         if (specifier.imported.name === "useContext") {
           if (specifier.local.name !== "useContext") {
-            useContextAlias.add(specifier.local.name);
+            useContextNames.add(specifier.local.name);
           }
           context.report({
             messageId: "noUseContext",
@@ -3114,7 +3102,7 @@ function create49(context) {
                 return [
                   fixer.remove(specifier),
                   ...tokenBefore?.value === "," ? [fixer.replaceTextRange([tokenBefore.range[1], specifier.range[0]], "")] : [],
-                  ...getAssociatedTokens(
+                  ...getCorrelativeTokens(
                     context,
                     specifier
                   ).map((token) => fixer.remove(token))
@@ -3125,22 +3113,41 @@ function create49(context) {
           });
         }
       }
+    },
+    "Program:exit"() {
+      const isUseContextCall = ER25__namespace.isReactHookCallWithNameAlias(context, "useContext", [...useContextNames]);
+      for (const node of hookCalls) {
+        if (!isUseContextCall(node)) {
+          continue;
+        }
+        context.report({
+          messageId: "noUseContext",
+          node: node.callee,
+          fix(fixer) {
+            switch (node.callee.type) {
+              case types.AST_NODE_TYPES.Identifier:
+                return fixer.replaceText(node.callee, "use");
+              case types.AST_NODE_TYPES.MemberExpression:
+                return fixer.replaceText(node.callee.property, "use");
+            }
+            return null;
+          }
+        });
+      }
     }
   };
 }
-function getAssociatedTokens(context, node) {
-  {
-    const tokenBefore = context.sourceCode.getTokenBefore(node);
-    const tokenAfter = context.sourceCode.getTokenAfter(node);
-    const tokens = [];
-    if (tokenAfter?.value !== "," && tokenBefore?.value === ",") {
-      tokens.push(tokenBefore);
-    }
-    if (tokenAfter?.value === ",") {
-      tokens.push(tokenAfter);
-    }
-    return tokens;
+function getCorrelativeTokens(context, node) {
+  const tokenBefore = context.sourceCode.getTokenBefore(node);
+  const tokenAfter = context.sourceCode.getTokenAfter(node);
+  const tokens = [];
+  if (tokenAfter?.value !== "," && tokenBefore?.value === ",") {
+    tokens.push(tokenBefore);
   }
+  if (tokenAfter?.value === ",") {
+    tokens.push(tokenAfter);
+  }
+  return tokens;
 }
 var RULE_NAME50 = "no-useless-forward-ref";
 var RULE_FEATURES50 = [];
@@ -3176,7 +3183,7 @@ function create50(context) {
       }
       context.report({
         messageId: "noUselessForwardRef",
-        node: component
+        node: node.callee
       });
     }
   };
@@ -3551,7 +3558,7 @@ function create55(context) {
       }
       context.report({
         messageId: "preferShorthandBoolean",
-        node,
+        node: node.value ?? node,
         data: {
           propName
         },

package/dist/index.mjs

@@ -114,7 +114,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.47.1-next.1";
+var version = "1.47.2-beta.0";
 var createRule = ESLintUtils.RuleCreator(getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1426,9 +1426,10 @@ function create27(context) {
       if (!ER25.isForwardRefCall(context, node)) {
         return;
       }
+      const id = AST8.getFunctionIdentifier(node);
       context.report({
         messageId: "noForwardRef",
-        node,
+        node: id ?? node,
         fix: getFix(context, node)
       });
     }
@@ -1525,12 +1526,12 @@ function create28(context) {
   return {
     JSXOpeningElement(node) {
       const initialScope = context.sourceCode.getScope(node);
-      const keyPropFound = ER25.getAttribute(context, "key", node.attributes, initialScope);
-      const keyPropOnElement = node.attributes.some(
+      const keyProp = ER25.getAttribute(context, "key", node.attributes, initialScope);
+      const isKeyPropOnElement = node.attributes.some(
         (n) => n.type === AST_NODE_TYPES.JSXAttribute && n.name.type === AST_NODE_TYPES.JSXIdentifier && n.name.name === "key"
       );
-      if (keyPropFound != null && !keyPropOnElement) {
-        context.report({ messageId: "noImplicitKey", node: keyPropFound });
+      if (keyProp != null && !isKeyPropOnElement) {
+        context.report({ messageId: "noImplicitKey", node: keyProp });
       }
     }
   };
@@ -1734,9 +1735,10 @@ function create30(context) {
           continue;
         }
         if (displayName == null) {
+          const id = AST8.getFunctionIdentifier(node);
           context.report({
             messageId: "noMissingComponentDisplayName",
-            node
+            node: id ?? node
           });
         }
       }
@@ -1789,7 +1791,7 @@ function create31(context) {
         if (!hasDisplayNameAssignment) {
           context.report({
             messageId: "noMissingContextDisplayName",
-            node: call
+            node: id
           });
         }
       }
@@ -3040,31 +3042,17 @@ var no_use_context_default = createRule({
 function create49(context) {
   if (!context.sourceCode.text.includes("useContext")) return {};
   const settings4 = getSettingsFromContext(context);
-  const useContextAlias = /* @__PURE__ */ new Set();
   if (compare(settings4.version, "19.0.0", "<")) {
     return {};
   }
+  const useContextNames = /* @__PURE__ */ new Set();
+  const hookCalls = /* @__PURE__ */ new Set();
   return {
     CallExpression(node) {
       if (!ER25.isReactHookCall(node)) {
         return;
       }
-      if (!ER25.isReactHookCallWithNameAlias(context, "useContext", [...useContextAlias])(node)) {
-        return;
-      }
-      context.report({
-        messageId: "noUseContext",
-        node: node.callee,
-        fix(fixer) {
-          switch (node.callee.type) {
-            case AST_NODE_TYPES.Identifier:
-              return fixer.replaceText(node.callee, "use");
-            case AST_NODE_TYPES.MemberExpression:
-              return fixer.replaceText(node.callee.property, "use");
-          }
-          return null;
-        }
-      });
+      hookCalls.add(node);
     },
     ImportDeclaration(node) {
       if (node.source.value !== settings4.importSource) {
@@ -3076,7 +3064,7 @@ function create49(context) {
         if (specifier.imported.type !== AST_NODE_TYPES.Identifier) continue;
         if (specifier.imported.name === "useContext") {
           if (specifier.local.name !== "useContext") {
-            useContextAlias.add(specifier.local.name);
+            useContextNames.add(specifier.local.name);
           }
           context.report({
             messageId: "noUseContext",
@@ -3087,7 +3075,7 @@ function create49(context) {
                 return [
                   fixer.remove(specifier),
                   ...tokenBefore?.value === "," ? [fixer.replaceTextRange([tokenBefore.range[1], specifier.range[0]], "")] : [],
-                  ...getAssociatedTokens(
+                  ...getCorrelativeTokens(
                     context,
                     specifier
                   ).map((token) => fixer.remove(token))
@@ -3098,22 +3086,41 @@ function create49(context) {
           });
         }
       }
+    },
+    "Program:exit"() {
+      const isUseContextCall = ER25.isReactHookCallWithNameAlias(context, "useContext", [...useContextNames]);
+      for (const node of hookCalls) {
+        if (!isUseContextCall(node)) {
+          continue;
+        }
+        context.report({
+          messageId: "noUseContext",
+          node: node.callee,
+          fix(fixer) {
+            switch (node.callee.type) {
+              case AST_NODE_TYPES.Identifier:
+                return fixer.replaceText(node.callee, "use");
+              case AST_NODE_TYPES.MemberExpression:
+                return fixer.replaceText(node.callee.property, "use");
+            }
+            return null;
+          }
+        });
+      }
     }
   };
 }
-function getAssociatedTokens(context, node) {
-  {
-    const tokenBefore = context.sourceCode.getTokenBefore(node);
-    const tokenAfter = context.sourceCode.getTokenAfter(node);
-    const tokens = [];
-    if (tokenAfter?.value !== "," && tokenBefore?.value === ",") {
-      tokens.push(tokenBefore);
-    }
-    if (tokenAfter?.value === ",") {
-      tokens.push(tokenAfter);
-    }
-    return tokens;
+function getCorrelativeTokens(context, node) {
+  const tokenBefore = context.sourceCode.getTokenBefore(node);
+  const tokenAfter = context.sourceCode.getTokenAfter(node);
+  const tokens = [];
+  if (tokenAfter?.value !== "," && tokenBefore?.value === ",") {
+    tokens.push(tokenBefore);
   }
+  if (tokenAfter?.value === ",") {
+    tokens.push(tokenAfter);
+  }
+  return tokens;
 }
 var RULE_NAME50 = "no-useless-forward-ref";
 var RULE_FEATURES50 = [];
@@ -3149,7 +3156,7 @@ function create50(context) {
       }
       context.report({
         messageId: "noUselessForwardRef",
-        node: component
+        node: node.callee
       });
     }
   };
@@ -3524,7 +3531,7 @@ function create55(context) {
       }
       context.report({
         messageId: "preferShorthandBoolean",
-        node,
+        node: node.value ?? node,
         data: {
           propName
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.47.1-next.1",
+  "version": "1.47.2-beta.0",
   "description": "A set of composable ESLint rules for for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -50,12 +50,12 @@
     "is-immutable-type": "^5.0.1",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.7.0",
-    "@eslint-react/ast": "1.47.1-next.1",
-    "@eslint-react/eff": "1.47.1-next.1",
-    "@eslint-react/core": "1.47.1-next.1",
-    "@eslint-react/kit": "1.47.1-next.1",
-    "@eslint-react/shared": "1.47.1-next.1",
-    "@eslint-react/var": "1.47.1-next.1"
+    "@eslint-react/ast": "1.47.2-beta.0",
+    "@eslint-react/core": "1.47.2-beta.0",
+    "@eslint-react/kit": "1.47.2-beta.0",
+    "@eslint-react/shared": "1.47.2-beta.0",
+    "@eslint-react/eff": "1.47.2-beta.0",
+    "@eslint-react/var": "1.47.2-beta.0"
   },
   "devDependencies": {
     "@types/react": "^19.1.1",