eslint-plugin-react-x 1.40.4-beta.5 → 1.40.4-beta.6

package/dist/index.js

@@ -141,7 +141,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.40.4-beta.5";
+var version = "1.40.4-beta.6";
 var createRule = utils.ESLintUtils.RuleCreator(shared.getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -543,7 +543,8 @@ function getMapIndexParamName(context, node) {
     return eff._;
   }
   const { name: name5 } = callee.property;
-  if (!AST8__namespace.ITERATOR_FUNCTION_INDEX_PARAM_POSITION.has(name5)) {
+  const indexPosition = AST8__namespace.getArrayMethodIndexParamPosition(name5);
+  if (indexPosition === -1) {
     return eff._;
   }
   const callbackArg = node.arguments[isUsingReactChildren(context, node) ? 1 : 0];
@@ -554,14 +555,10 @@ function getMapIndexParamName(context, node) {
     return eff._;
   }
   const { params } = callbackArg;
-  const indexParamPosition = AST8__namespace.ITERATOR_FUNCTION_INDEX_PARAM_POSITION.get(name5);
-  if (indexParamPosition == null) {
+  if (params.length < indexPosition + 1) {
     return eff._;
   }
-  if (params.length < indexParamPosition + 1) {
-    return eff._;
-  }
-  const param = params.at(indexParamPosition);
+  const param = params.at(indexPosition);
   return param != null && "name" in param ? param.name : eff._;
 }
 function getIdentifiersFromBinaryExpression(side) {
@@ -1403,7 +1400,7 @@ function create26(context) {
           break;
         }
         default: {
-          const call = AST8__namespace.findParentNode(jsxElement, AST8__namespace.isArrayMapCallLoose);
+          const call = AST8__namespace.findParentNode(jsxElement, AST8__namespace.isArrayMapCall);
           const iter = AST8__namespace.findParentNode(jsxElement, (n) => n === call || AST8__namespace.isFunction(n));
           if (!AST8__namespace.isFunction(iter)) return;
           const arg0 = call?.arguments[0];
@@ -1940,7 +1937,7 @@ function create32(context) {
       if (state.isWithinChildrenToArray) {
         return;
       }
-      const isMapCall = AST8__namespace.isArrayMapCallLoose(node);
+      const isMapCall = AST8__namespace.isArrayMapCall(node);
       if (!isMapCall && !isArrayFromCall(node)) {
         return;
       }
@@ -3104,7 +3101,7 @@ function create49(context, [option]) {
   const { allowExpressions = true } = option;
   return {
     JSXElement(node) {
-      if (!JSX8__namespace.isJsxFragmentElement(node)) return;
+      if (!JSX8__namespace.isFragmentElement(node)) return;
       checkNode(context, node, allowExpressions);
     },
     JSXFragment(node) {
@@ -3127,15 +3124,15 @@ function trimLikeReact(text) {
 }
 function checkNode(context, node, allowExpressions) {
   const initialScope = context.sourceCode.getScope(node);
-  if (JSX8__namespace.isJsxKeyedElement(node, initialScope)) {
+  if (JSX8__namespace.isKeyedElement(node, initialScope)) {
     return;
   }
-  if (JSX8__namespace.isJsxBuiltInElement(node.parent)) {
+  if (JSX8__namespace.isHostElement(node.parent)) {
     context.report({
       messageId: "uselessFragment",
       node,
       data: {
-        reason: "placed inside a built-in component"
+        reason: "placed inside a host component"
       },
       fix: getFix2(context, node)
     });
@@ -3210,7 +3207,7 @@ function getFix2(context, node) {
 }
 function canFix(node) {
   if (node.parent.type === types.AST_NODE_TYPES.JSXElement || node.parent.type === types.AST_NODE_TYPES.JSXFragment) {
-    return !JSX8__namespace.isJsxUserDefinedElement(node.parent);
+    return JSX8__namespace.isHostElement(node.parent);
   }
   if (node.children.length === 0) {
     return false;
@@ -3473,7 +3470,7 @@ var prefer_shorthand_fragment_default = createRule({
 function create54(context) {
   return {
     JSXElement(node) {
-      if (!JSX8__namespace.isJsxFragmentElement(node)) return;
+      if (!JSX8__namespace.isFragmentElement(node)) return;
       const hasAttributes = node.openingElement.attributes.length > 0;
       if (hasAttributes) {
         return;

package/dist/index.mjs

@@ -113,7 +113,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.40.4-beta.5";
+var version = "1.40.4-beta.6";
 var createRule = ESLintUtils.RuleCreator(getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -515,7 +515,8 @@ function getMapIndexParamName(context, node) {
     return _;
   }
   const { name: name5 } = callee.property;
-  if (!AST8.ITERATOR_FUNCTION_INDEX_PARAM_POSITION.has(name5)) {
+  const indexPosition = AST8.getArrayMethodIndexParamPosition(name5);
+  if (indexPosition === -1) {
     return _;
   }
   const callbackArg = node.arguments[isUsingReactChildren(context, node) ? 1 : 0];
@@ -526,14 +527,10 @@ function getMapIndexParamName(context, node) {
     return _;
   }
   const { params } = callbackArg;
-  const indexParamPosition = AST8.ITERATOR_FUNCTION_INDEX_PARAM_POSITION.get(name5);
-  if (indexParamPosition == null) {
+  if (params.length < indexPosition + 1) {
     return _;
   }
-  if (params.length < indexParamPosition + 1) {
-    return _;
-  }
-  const param = params.at(indexParamPosition);
+  const param = params.at(indexPosition);
   return param != null && "name" in param ? param.name : _;
 }
 function getIdentifiersFromBinaryExpression(side) {
@@ -1375,7 +1372,7 @@ function create26(context) {
           break;
         }
         default: {
-          const call = AST8.findParentNode(jsxElement, AST8.isArrayMapCallLoose);
+          const call = AST8.findParentNode(jsxElement, AST8.isArrayMapCall);
           const iter = AST8.findParentNode(jsxElement, (n) => n === call || AST8.isFunction(n));
           if (!AST8.isFunction(iter)) return;
           const arg0 = call?.arguments[0];
@@ -1912,7 +1909,7 @@ function create32(context) {
       if (state.isWithinChildrenToArray) {
         return;
       }
-      const isMapCall = AST8.isArrayMapCallLoose(node);
+      const isMapCall = AST8.isArrayMapCall(node);
       if (!isMapCall && !isArrayFromCall(node)) {
         return;
       }
@@ -3076,7 +3073,7 @@ function create49(context, [option]) {
   const { allowExpressions = true } = option;
   return {
     JSXElement(node) {
-      if (!JSX8.isJsxFragmentElement(node)) return;
+      if (!JSX8.isFragmentElement(node)) return;
       checkNode(context, node, allowExpressions);
     },
     JSXFragment(node) {
@@ -3099,15 +3096,15 @@ function trimLikeReact(text) {
 }
 function checkNode(context, node, allowExpressions) {
   const initialScope = context.sourceCode.getScope(node);
-  if (JSX8.isJsxKeyedElement(node, initialScope)) {
+  if (JSX8.isKeyedElement(node, initialScope)) {
     return;
   }
-  if (JSX8.isJsxBuiltInElement(node.parent)) {
+  if (JSX8.isHostElement(node.parent)) {
     context.report({
       messageId: "uselessFragment",
       node,
       data: {
-        reason: "placed inside a built-in component"
+        reason: "placed inside a host component"
       },
       fix: getFix2(context, node)
     });
@@ -3182,7 +3179,7 @@ function getFix2(context, node) {
 }
 function canFix(node) {
   if (node.parent.type === AST_NODE_TYPES.JSXElement || node.parent.type === AST_NODE_TYPES.JSXFragment) {
-    return !JSX8.isJsxUserDefinedElement(node.parent);
+    return JSX8.isHostElement(node.parent);
   }
   if (node.children.length === 0) {
     return false;
@@ -3445,7 +3442,7 @@ var prefer_shorthand_fragment_default = createRule({
 function create54(context) {
   return {
     JSXElement(node) {
-      if (!JSX8.isJsxFragmentElement(node)) return;
+      if (!JSX8.isFragmentElement(node)) return;
       const hasAttributes = node.openingElement.attributes.length > 0;
       if (hasAttributes) {
         return;

package/package.json

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