eslint-plugin-react-x 1.28.0-beta.1 → 1.28.0-beta.4

package/dist/index.js

@@ -137,7 +137,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.28.0-beta.1";
+var version = "1.28.0-beta.4";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/utils/get-associated-tokens.ts
@@ -244,7 +244,7 @@ var ensure_forward_ref_using_ref_default = createRule({
   create(context) {
     return {
       CallExpression(node) {
-        if (!core.isForwardRefCall(node, context)) {
+        if (!core.isForwardRefCall(context, node)) {
           return;
         }
         const [component] = node.arguments;
@@ -411,7 +411,7 @@ var iteratorFunctionIndexParamPosition = /* @__PURE__ */ new Map([
 function isReactChildrenMethod(name5) {
   return reactChildrenMethod.some((method) => method === name5);
 }
-function isUsingReactChildren(node, context) {
+function isUsingReactChildren(context, node) {
   const { importSource = "react" } = shared.unsafeDecodeSettings(context.settings);
   const { callee } = node;
   if (!("property" in callee) || !("object" in callee) || !("name" in callee.property)) {
@@ -429,7 +429,7 @@ function isUsingReactChildren(node, context) {
   }
   return false;
 }
-function getMapIndexParamName(node, context) {
+function getMapIndexParamName(context, node) {
   const { callee } = node;
   if (callee.type !== types.AST_NODE_TYPES.MemberExpression) {
     return eff._;
@@ -441,7 +441,7 @@ function getMapIndexParamName(node, context) {
   if (!iteratorFunctionIndexParamPosition.has(name5)) {
     return eff._;
   }
-  const callbackArg = node.arguments[isUsingReactChildren(node, context) ? 1 : 0];
+  const callbackArg = node.arguments[isUsingReactChildren(context, node) ? 1 : 0];
   if (callbackArg == null) {
     return eff._;
   }
@@ -478,7 +478,7 @@ var no_array_index_key_default = createRule({
       return node.type === types.AST_NODE_TYPES.Identifier && indexParamNames.some((name5) => name5 != null && name5 === node.name);
     }
     function isCreateOrCloneElementCall(node) {
-      return core.isCreateElementCall(node, context) || core.isCloneElementCall(node, context);
+      return core.isCreateElementCall(context, node) || core.isCloneElementCall(context, node);
     }
     function getReportDescriptors(node) {
       switch (node.type) {
@@ -496,7 +496,7 @@ var no_array_index_key_default = createRule({
         case types.AST_NODE_TYPES.TemplateLiteral:
         case types.AST_NODE_TYPES.BinaryExpression: {
           const descriptors = [];
-          const expressions = node.type === types.AST_NODE_TYPES.TemplateLiteral ? node.expressions : AST11__namespace.getIdentifiersFromBinaryExpression(node);
+          const expressions = node.type === types.AST_NODE_TYPES.TemplateLiteral ? node.expressions : getIdentifiersFromBinaryExpression(node);
           for (const expression of expressions) {
             if (isArrayIndex(expression)) {
               descriptors.push({
@@ -531,7 +531,7 @@ var no_array_index_key_default = createRule({
     }
     return {
       CallExpression(node) {
-        indexParamNames.push(getMapIndexParamName(node, context));
+        indexParamNames.push(getMapIndexParamName(context, node));
         if (node.arguments.length === 0) {
           return;
         }
@@ -577,6 +577,18 @@ var no_array_index_key_default = createRule({
   },
   defaultOptions: []
 });
+function getIdentifiersFromBinaryExpression(side) {
+  if (side.type === types.AST_NODE_TYPES.Identifier) {
+    return [side];
+  }
+  if (side.type === types.AST_NODE_TYPES.BinaryExpression) {
+    return [
+      ...getIdentifiersFromBinaryExpression(side.left),
+      ...getIdentifiersFromBinaryExpression(side.right)
+    ];
+  }
+  return [];
+}
 var RULE_NAME6 = "no-children-count";
 var RULE_FEATURES6 = [
   "CHK"
@@ -597,7 +609,7 @@ var no_children_count_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (core.isChildrenCount(node, context)) {
+        if (core.isChildrenCount(context, node)) {
           context.report({
             messageId: "noChildrenCount",
             node: node.property
@@ -628,7 +640,7 @@ var no_children_for_each_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (core.isChildrenForEach(node, context)) {
+        if (core.isChildrenForEach(context, node)) {
           context.report({
             messageId: "noChildrenForEach",
             node: node.property
@@ -659,7 +671,7 @@ var no_children_map_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (core.isChildrenMap(node, context)) {
+        if (core.isChildrenMap(context, node)) {
           context.report({
             messageId: "noChildrenMap",
             node: node.property
@@ -690,7 +702,7 @@ var no_children_only_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (core.isChildrenOnly(node, context)) {
+        if (core.isChildrenOnly(context, node)) {
           context.report({
             messageId: "noChildrenOnly",
             node: node.property
@@ -757,7 +769,7 @@ var no_children_to_array_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (core.isChildrenToArray(node, context)) {
+        if (core.isChildrenToArray(context, node)) {
           context.report({
             messageId: "noChildrenToArray",
             node: node.property
@@ -831,7 +843,7 @@ var no_clone_element_default = createRule({
   create(context) {
     return {
       CallExpression(node) {
-        if (!core.isCloneElementCall(node, context)) {
+        if (!core.isCloneElementCall(context, node)) {
           return;
         }
         context.report({
@@ -1166,7 +1178,7 @@ var no_create_ref_default = createRule({
   create(context) {
     return {
       CallExpression(node) {
-        if (core.isCreateRefCall(node, context) && AST11__namespace.findParentNode(node, core.isClassComponent) == null) {
+        if (core.isCreateRefCall(context, node) && AST11__namespace.findParentNode(node, core.isClassComponent) == null) {
           context.report({ messageId: "noCreateRef", node });
         }
       }
@@ -1448,20 +1460,20 @@ var no_forward_ref_default = createRule({
     }
     return {
       CallExpression(node) {
-        if (!core.isForwardRefCall(node, context)) {
+        if (!core.isForwardRefCall(context, node)) {
           return;
         }
         context.report({
           messageId: "noForwardRef",
           node,
-          fix: getFix(node, context)
+          fix: getFix(context, node)
         });
       }
     };
   },
   defaultOptions: []
 });
-function getFix(node, context) {
+function getFix(context, node) {
   return (fixer) => {
     const [componentNode] = node.arguments;
     if (componentNode == null || !AST11__namespace.isFunction(componentNode)) {
@@ -1801,7 +1813,7 @@ var no_missing_context_display_name_default = createRule({
     const displayNameAssignments = [];
     return {
       CallExpression(node) {
-        if (!core.isCreateContextCall(node, context)) return;
+        if (!core.isCreateContextCall(context, node)) return;
         createCalls.push(node);
       },
       [core.DISPLAY_NAME_ASSIGNMENT_SELECTOR](node) {
@@ -1932,7 +1944,7 @@ var no_missing_key_default = createRule({
         }
       },
       CallExpression(node) {
-        state.isWithinChildrenToArray ||= core.isChildrenToArrayCall(node, context);
+        state.isWithinChildrenToArray ||= core.isChildrenToArrayCall(context, node);
         if (state.isWithinChildrenToArray) {
           return;
         }
@@ -1956,7 +1968,7 @@ var no_missing_key_default = createRule({
         }
       },
       "CallExpression:exit"(node) {
-        if (!core.isChildrenToArrayCall(node, context)) {
+        if (!core.isChildrenToArrayCall(context, node)) {
           return;
         }
         state.isWithinChildrenToArray = false;
@@ -2038,7 +2050,7 @@ var no_nested_components_default = createRule({
             }
             continue;
           }
-          if (core.isInsideCreateElementProps(component, context)) {
+          if (core.isInsideCreateElementProps(context, component)) {
             context.report({
               messageId: "nestedComponentInProps",
               node: component,
@@ -3016,7 +3028,7 @@ var no_use_context_default = createRule({
         if (!core.isReactHookCall(node)) {
           return;
         }
-        if (!core.isReactHookCallWithNameAlias("useContext", context, [...useContextAlias])(node)) {
+        if (!core.isReactHookCallWithNameAlias(context, "useContext", [...useContextAlias])(node)) {
           return;
         }
         context.report({
@@ -3081,7 +3093,7 @@ function trimLikeReact(text) {
   const end = trailingSpaces.includes("\n") ? text.length - trailingSpaces.length : text.length;
   return text.slice(start, end);
 }
-function checkAndReport(node, context, allowExpressions) {
+function checkAndReport(context, node, allowExpressions) {
   function fix(fixer) {
     if (node.parent.type !== types.AST_NODE_TYPES.JSXElement && node.parent.type !== types.AST_NODE_TYPES.JSXFragment) {
       if (node.children.length === 0) {
@@ -3202,10 +3214,10 @@ var no_useless_fragment_default = createRule({
     return {
       JSXElement(node) {
         if (!JSX7__namespace.isFragmentElement(node)) return;
-        checkAndReport(node, context, allowExpressions);
+        checkAndReport(context, node, allowExpressions);
       },
       JSXFragment(node) {
-        checkAndReport(node, context, allowExpressions);
+        checkAndReport(context, node, allowExpressions);
       }
     };
   },

package/dist/index.mjs

@@ -110,7 +110,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.28.0-beta.1";
+var version = "1.28.0-beta.4";
 var createRule = createRuleForPlugin("x");
 
 // src/utils/get-associated-tokens.ts
@@ -217,7 +217,7 @@ var ensure_forward_ref_using_ref_default = createRule({
   create(context) {
     return {
       CallExpression(node) {
-        if (!isForwardRefCall(node, context)) {
+        if (!isForwardRefCall(context, node)) {
           return;
         }
         const [component] = node.arguments;
@@ -384,7 +384,7 @@ var iteratorFunctionIndexParamPosition = /* @__PURE__ */ new Map([
 function isReactChildrenMethod(name5) {
   return reactChildrenMethod.some((method) => method === name5);
 }
-function isUsingReactChildren(node, context) {
+function isUsingReactChildren(context, node) {
   const { importSource = "react" } = unsafeDecodeSettings(context.settings);
   const { callee } = node;
   if (!("property" in callee) || !("object" in callee) || !("name" in callee.property)) {
@@ -402,7 +402,7 @@ function isUsingReactChildren(node, context) {
   }
   return false;
 }
-function getMapIndexParamName(node, context) {
+function getMapIndexParamName(context, node) {
   const { callee } = node;
   if (callee.type !== AST_NODE_TYPES.MemberExpression) {
     return _;
@@ -414,7 +414,7 @@ function getMapIndexParamName(node, context) {
   if (!iteratorFunctionIndexParamPosition.has(name5)) {
     return _;
   }
-  const callbackArg = node.arguments[isUsingReactChildren(node, context) ? 1 : 0];
+  const callbackArg = node.arguments[isUsingReactChildren(context, node) ? 1 : 0];
   if (callbackArg == null) {
     return _;
   }
@@ -451,7 +451,7 @@ var no_array_index_key_default = createRule({
       return node.type === AST_NODE_TYPES.Identifier && indexParamNames.some((name5) => name5 != null && name5 === node.name);
     }
     function isCreateOrCloneElementCall(node) {
-      return isCreateElementCall(node, context) || isCloneElementCall(node, context);
+      return isCreateElementCall(context, node) || isCloneElementCall(context, node);
     }
     function getReportDescriptors(node) {
       switch (node.type) {
@@ -469,7 +469,7 @@ var no_array_index_key_default = createRule({
         case AST_NODE_TYPES.TemplateLiteral:
         case AST_NODE_TYPES.BinaryExpression: {
           const descriptors = [];
-          const expressions = node.type === AST_NODE_TYPES.TemplateLiteral ? node.expressions : AST11.getIdentifiersFromBinaryExpression(node);
+          const expressions = node.type === AST_NODE_TYPES.TemplateLiteral ? node.expressions : getIdentifiersFromBinaryExpression(node);
           for (const expression of expressions) {
             if (isArrayIndex(expression)) {
               descriptors.push({
@@ -504,7 +504,7 @@ var no_array_index_key_default = createRule({
     }
     return {
       CallExpression(node) {
-        indexParamNames.push(getMapIndexParamName(node, context));
+        indexParamNames.push(getMapIndexParamName(context, node));
         if (node.arguments.length === 0) {
           return;
         }
@@ -550,6 +550,18 @@ var no_array_index_key_default = createRule({
   },
   defaultOptions: []
 });
+function getIdentifiersFromBinaryExpression(side) {
+  if (side.type === AST_NODE_TYPES.Identifier) {
+    return [side];
+  }
+  if (side.type === AST_NODE_TYPES.BinaryExpression) {
+    return [
+      ...getIdentifiersFromBinaryExpression(side.left),
+      ...getIdentifiersFromBinaryExpression(side.right)
+    ];
+  }
+  return [];
+}
 var RULE_NAME6 = "no-children-count";
 var RULE_FEATURES6 = [
   "CHK"
@@ -570,7 +582,7 @@ var no_children_count_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (isChildrenCount(node, context)) {
+        if (isChildrenCount(context, node)) {
           context.report({
             messageId: "noChildrenCount",
             node: node.property
@@ -601,7 +613,7 @@ var no_children_for_each_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (isChildrenForEach(node, context)) {
+        if (isChildrenForEach(context, node)) {
           context.report({
             messageId: "noChildrenForEach",
             node: node.property
@@ -632,7 +644,7 @@ var no_children_map_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (isChildrenMap(node, context)) {
+        if (isChildrenMap(context, node)) {
           context.report({
             messageId: "noChildrenMap",
             node: node.property
@@ -663,7 +675,7 @@ var no_children_only_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (isChildrenOnly(node, context)) {
+        if (isChildrenOnly(context, node)) {
           context.report({
             messageId: "noChildrenOnly",
             node: node.property
@@ -730,7 +742,7 @@ var no_children_to_array_default = createRule({
   create(context) {
     return {
       MemberExpression(node) {
-        if (isChildrenToArray(node, context)) {
+        if (isChildrenToArray(context, node)) {
           context.report({
             messageId: "noChildrenToArray",
             node: node.property
@@ -804,7 +816,7 @@ var no_clone_element_default = createRule({
   create(context) {
     return {
       CallExpression(node) {
-        if (!isCloneElementCall(node, context)) {
+        if (!isCloneElementCall(context, node)) {
           return;
         }
         context.report({
@@ -1139,7 +1151,7 @@ var no_create_ref_default = createRule({
   create(context) {
     return {
       CallExpression(node) {
-        if (isCreateRefCall(node, context) && AST11.findParentNode(node, isClassComponent) == null) {
+        if (isCreateRefCall(context, node) && AST11.findParentNode(node, isClassComponent) == null) {
           context.report({ messageId: "noCreateRef", node });
         }
       }
@@ -1421,20 +1433,20 @@ var no_forward_ref_default = createRule({
     }
     return {
       CallExpression(node) {
-        if (!isForwardRefCall(node, context)) {
+        if (!isForwardRefCall(context, node)) {
           return;
         }
         context.report({
           messageId: "noForwardRef",
           node,
-          fix: getFix(node, context)
+          fix: getFix(context, node)
         });
       }
     };
   },
   defaultOptions: []
 });
-function getFix(node, context) {
+function getFix(context, node) {
   return (fixer) => {
     const [componentNode] = node.arguments;
     if (componentNode == null || !AST11.isFunction(componentNode)) {
@@ -1774,7 +1786,7 @@ var no_missing_context_display_name_default = createRule({
     const displayNameAssignments = [];
     return {
       CallExpression(node) {
-        if (!isCreateContextCall(node, context)) return;
+        if (!isCreateContextCall(context, node)) return;
         createCalls.push(node);
       },
       [DISPLAY_NAME_ASSIGNMENT_SELECTOR](node) {
@@ -1905,7 +1917,7 @@ var no_missing_key_default = createRule({
         }
       },
       CallExpression(node) {
-        state.isWithinChildrenToArray ||= isChildrenToArrayCall(node, context);
+        state.isWithinChildrenToArray ||= isChildrenToArrayCall(context, node);
         if (state.isWithinChildrenToArray) {
           return;
         }
@@ -1929,7 +1941,7 @@ var no_missing_key_default = createRule({
         }
       },
       "CallExpression:exit"(node) {
-        if (!isChildrenToArrayCall(node, context)) {
+        if (!isChildrenToArrayCall(context, node)) {
           return;
         }
         state.isWithinChildrenToArray = false;
@@ -2011,7 +2023,7 @@ var no_nested_components_default = createRule({
             }
             continue;
           }
-          if (isInsideCreateElementProps(component, context)) {
+          if (isInsideCreateElementProps(context, component)) {
             context.report({
               messageId: "nestedComponentInProps",
               node: component,
@@ -2989,7 +3001,7 @@ var no_use_context_default = createRule({
         if (!isReactHookCall(node)) {
           return;
         }
-        if (!isReactHookCallWithNameAlias("useContext", context, [...useContextAlias])(node)) {
+        if (!isReactHookCallWithNameAlias(context, "useContext", [...useContextAlias])(node)) {
           return;
         }
         context.report({
@@ -3054,7 +3066,7 @@ function trimLikeReact(text) {
   const end = trailingSpaces.includes("\n") ? text.length - trailingSpaces.length : text.length;
   return text.slice(start, end);
 }
-function checkAndReport(node, context, allowExpressions) {
+function checkAndReport(context, node, allowExpressions) {
   function fix(fixer) {
     if (node.parent.type !== AST_NODE_TYPES.JSXElement && node.parent.type !== AST_NODE_TYPES.JSXFragment) {
       if (node.children.length === 0) {
@@ -3175,10 +3187,10 @@ var no_useless_fragment_default = createRule({
     return {
       JSXElement(node) {
         if (!JSX7.isFragmentElement(node)) return;
-        checkAndReport(node, context, allowExpressions);
+        checkAndReport(context, node, allowExpressions);
       },
       JSXFragment(node) {
-        checkAndReport(node, context, allowExpressions);
+        checkAndReport(context, node, allowExpressions);
       }
     };
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.28.0-beta.1",
+  "version": "1.28.0-beta.4",
   "description": "A set of composable linting rules 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.6.2",
-    "@eslint-react/ast": "1.28.0-beta.1",
-    "@eslint-react/core": "1.28.0-beta.1",
-    "@eslint-react/jsx": "1.28.0-beta.1",
-    "@eslint-react/eff": "1.28.0-beta.1",
-    "@eslint-react/shared": "1.28.0-beta.1",
-    "@eslint-react/var": "1.28.0-beta.1"
+    "@eslint-react/ast": "1.28.0-beta.4",
+    "@eslint-react/core": "1.28.0-beta.4",
+    "@eslint-react/eff": "1.28.0-beta.4",
+    "@eslint-react/jsx": "1.28.0-beta.4",
+    "@eslint-react/shared": "1.28.0-beta.4",
+    "@eslint-react/var": "1.28.0-beta.4"
   },
   "devDependencies": {
     "@types/react": "^19.0.10",