eslint-plugin-react-x 1.36.1-next.0 → 1.36.2-beta.0

package/dist/index.js

@@ -136,7 +136,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.36.1-next.0";
+var version = "1.36.2-beta.0";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -498,10 +498,7 @@ function create4(context) {
         if (!("value" in prop)) {
           continue;
         }
-        const descriptors = getReportDescriptors(prop.value);
-        for (const descriptor of descriptors) {
-          context.report(descriptor);
-        }
+        getReportDescriptors(prop.value).map(shared.report(context));
       }
     },
     "CallExpression:exit"() {
@@ -517,10 +514,7 @@ function create4(context) {
       if (node.value?.type !== types.AST_NODE_TYPES.JSXExpressionContainer) {
         return;
       }
-      const descriptors = getReportDescriptors(node.value.expression);
-      for (const descriptor of descriptors) {
-        context.report(descriptor);
-      }
+      getReportDescriptors(node.value.expression).map(shared.report(context));
     }
   };
 }
@@ -1646,11 +1640,7 @@ function create24(context) {
       return getReportDescriptor(initExpression);
     }).otherwise(() => eff._);
   }
-  const visitorFunction = (node) => {
-    const descriptor = getReportDescriptor(node);
-    if (descriptor == null) return;
-    context.report(descriptor);
-  };
+  const visitorFunction = eff.flow(getReportDescriptor, shared.report(context));
   return {
     "JSXExpressionContainer > ConditionalExpression": visitorFunction,
     "JSXExpressionContainer > LogicalExpression": visitorFunction
@@ -1836,13 +1826,9 @@ function create27(context) {
   function checkBlockStatement(node) {
     const descriptors = [];
     for (const statement of AST11__namespace.getNestedReturnStatements(node)) {
-      if (statement.argument == null) {
-        continue;
-      }
+      if (statement.argument == null) continue;
       const descriptor = checkIteratorElement(statement.argument);
-      if (descriptor != null) {
-        descriptors.push(descriptor);
-      }
+      if (descriptor != null) descriptors.push(descriptor);
     }
     return descriptors;
   }
@@ -1858,7 +1844,7 @@ function create27(context) {
       const initialScope = context.sourceCode.getScope(node);
       for (const element of elements) {
         if (!JSX8__namespace.hasAttribute("key", element.openingElement.attributes, initialScope)) {
-          context.report({
+          shared.report(context)({
             messageId: "missingKey",
             node: element
           });
@@ -1870,24 +1856,21 @@ function create27(context) {
       if (state.isWithinChildrenToArray) {
         return;
       }
-      const isMapCallLike = AST11__namespace.isMapCallLoose(node);
-      if (!isMapCallLike && !isArrayFromCall(node)) {
+      const isMapCall = AST11__namespace.isMapCallLoose(node);
+      if (!isMapCall && !isArrayFromCall(node)) {
         return;
       }
-      const fn = node.arguments[isMapCallLike ? 0 : 1];
-      if (fn?.type !== types.AST_NODE_TYPES.ArrowFunctionExpression && fn?.type !== types.AST_NODE_TYPES.FunctionExpression) {
+      const fn = node.arguments[isMapCall ? 0 : 1];
+      if (!AST11__namespace.isFunction(fn)) {
         return;
       }
       if (fn.body.type === types.AST_NODE_TYPES.BlockStatement) {
-        for (const descriptor2 of checkBlockStatement(fn.body)) {
-          context.report(descriptor2);
+        for (const descriptor of checkBlockStatement(fn.body)) {
+          shared.report(context)(descriptor);
         }
         return;
       }
-      const descriptor = checkExpression(fn.body);
-      if (descriptor != null) {
-        context.report(descriptor);
-      }
+      shared.report(context)(checkExpression(fn.body));
     },
     "CallExpression:exit"(node) {
       if (!core.isChildrenToArrayCall(context, node)) {
@@ -1900,7 +1883,7 @@ function create27(context) {
         return;
       }
       if (node.parent.type === types.AST_NODE_TYPES.ArrayExpression) {
-        context.report({
+        shared.report(context)({
           messageId: "unexpectedFragmentSyntax",
           node
         });

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { createRuleForPlugin, getSettingsFromContext, unsafeDecodeSettings, DEFAULT_ESLINT_REACT_SETTINGS } from '@eslint-react/shared';
+import { createRuleForPlugin, report, getSettingsFromContext, unsafeDecodeSettings, DEFAULT_ESLINT_REACT_SETTINGS } from '@eslint-react/shared';
 import * as JSX8 from '@eslint-react/jsx';
 import * as AST11 from '@eslint-react/ast';
 import { isClassComponent, isThisSetState, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isComponentDidCatch, isGetDerivedStateFromError, isCloneElementCall, isComponentNameLoose, isCreateRefCall, isAssignmentToThisState, isForwardRefCall, useComponentCollector, DEFAULT_COMPONENT_HINT, ERComponentFlag, getInstanceId, isInstanceIdEqual, DISPLAY_NAME_ASSIGNMENT_SELECTOR, isCreateContextCall, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideRenderMethod, isCreateElementCall, isReactHookCall, isReactHookCallWithNameAlias, isGetDerivedStateFromProps, isInitializedFromReact } from '@eslint-react/core';
-import { _, getOrUpdate, constTrue, constFalse, identity } from '@eslint-react/eff';
+import { _, flow, getOrUpdate, constTrue, constFalse, identity } from '@eslint-react/eff';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { isMatching, match, P } from 'ts-pattern';
 import { compare } from 'compare-versions';
@@ -109,7 +109,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.36.1-next.0";
+var version = "1.36.2-beta.0";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -471,10 +471,7 @@ function create4(context) {
         if (!("value" in prop)) {
           continue;
         }
-        const descriptors = getReportDescriptors(prop.value);
-        for (const descriptor of descriptors) {
-          context.report(descriptor);
-        }
+        getReportDescriptors(prop.value).map(report(context));
       }
     },
     "CallExpression:exit"() {
@@ -490,10 +487,7 @@ function create4(context) {
       if (node.value?.type !== AST_NODE_TYPES.JSXExpressionContainer) {
         return;
       }
-      const descriptors = getReportDescriptors(node.value.expression);
-      for (const descriptor of descriptors) {
-        context.report(descriptor);
-      }
+      getReportDescriptors(node.value.expression).map(report(context));
     }
   };
 }
@@ -1619,11 +1613,7 @@ function create24(context) {
       return getReportDescriptor(initExpression);
     }).otherwise(() => _);
   }
-  const visitorFunction = (node) => {
-    const descriptor = getReportDescriptor(node);
-    if (descriptor == null) return;
-    context.report(descriptor);
-  };
+  const visitorFunction = flow(getReportDescriptor, report(context));
   return {
     "JSXExpressionContainer > ConditionalExpression": visitorFunction,
     "JSXExpressionContainer > LogicalExpression": visitorFunction
@@ -1809,13 +1799,9 @@ function create27(context) {
   function checkBlockStatement(node) {
     const descriptors = [];
     for (const statement of AST11.getNestedReturnStatements(node)) {
-      if (statement.argument == null) {
-        continue;
-      }
+      if (statement.argument == null) continue;
       const descriptor = checkIteratorElement(statement.argument);
-      if (descriptor != null) {
-        descriptors.push(descriptor);
-      }
+      if (descriptor != null) descriptors.push(descriptor);
     }
     return descriptors;
   }
@@ -1831,7 +1817,7 @@ function create27(context) {
       const initialScope = context.sourceCode.getScope(node);
       for (const element of elements) {
         if (!JSX8.hasAttribute("key", element.openingElement.attributes, initialScope)) {
-          context.report({
+          report(context)({
             messageId: "missingKey",
             node: element
           });
@@ -1843,24 +1829,21 @@ function create27(context) {
       if (state.isWithinChildrenToArray) {
         return;
       }
-      const isMapCallLike = AST11.isMapCallLoose(node);
-      if (!isMapCallLike && !isArrayFromCall(node)) {
+      const isMapCall = AST11.isMapCallLoose(node);
+      if (!isMapCall && !isArrayFromCall(node)) {
         return;
       }
-      const fn = node.arguments[isMapCallLike ? 0 : 1];
-      if (fn?.type !== AST_NODE_TYPES.ArrowFunctionExpression && fn?.type !== AST_NODE_TYPES.FunctionExpression) {
+      const fn = node.arguments[isMapCall ? 0 : 1];
+      if (!AST11.isFunction(fn)) {
         return;
       }
       if (fn.body.type === AST_NODE_TYPES.BlockStatement) {
-        for (const descriptor2 of checkBlockStatement(fn.body)) {
-          context.report(descriptor2);
+        for (const descriptor of checkBlockStatement(fn.body)) {
+          report(context)(descriptor);
         }
         return;
       }
-      const descriptor = checkExpression(fn.body);
-      if (descriptor != null) {
-        context.report(descriptor);
-      }
+      report(context)(checkExpression(fn.body));
     },
     "CallExpression:exit"(node) {
       if (!isChildrenToArrayCall(context, node)) {
@@ -1873,7 +1856,7 @@ function create27(context) {
         return;
       }
       if (node.parent.type === AST_NODE_TYPES.ArrayExpression) {
-        context.report({
+        report(context)({
           messageId: "unexpectedFragmentSyntax",
           node
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.36.1-next.0",
+  "version": "1.36.2-beta.0",
   "description": "A set of composable linting rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -49,12 +49,12 @@
     "compare-versions": "^6.1.1",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/ast": "1.36.1-next.0",
-    "@eslint-react/core": "1.36.1-next.0",
-    "@eslint-react/eff": "1.36.1-next.0",
-    "@eslint-react/shared": "1.36.1-next.0",
-    "@eslint-react/jsx": "1.36.1-next.0",
-    "@eslint-react/var": "1.36.1-next.0"
+    "@eslint-react/ast": "1.36.2-beta.0",
+    "@eslint-react/shared": "1.36.2-beta.0",
+    "@eslint-react/var": "1.36.2-beta.0",
+    "@eslint-react/core": "1.36.2-beta.0",
+    "@eslint-react/eff": "1.36.2-beta.0",
+    "@eslint-react/jsx": "1.36.2-beta.0"
   },
   "devDependencies": {
     "@types/react": "^19.0.11",