eslint-plugin-react-x 1.37.1-beta.3 → 1.37.1-next.0

package/dist/index.js

@@ -136,7 +136,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.37.1-beta.3";
+var version = "1.37.1-next.0";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -414,7 +414,6 @@ var no_array_index_key_default = createRule({
   defaultOptions: []
 });
 function create4(context) {
-  const report = shared.createReport(context);
   const indexParamNames = [];
   function isArrayIndex(node) {
     return node.type === types.AST_NODE_TYPES.Identifier && indexParamNames.some((name5) => name5 != null && name5 === node.name);
@@ -491,7 +490,7 @@ function create4(context) {
         if (!("value" in prop)) {
           continue;
         }
-        getReportDescriptors(prop.value).forEach(report);
+        getReportDescriptors(prop.value).map(shared.report(context));
       }
     },
     "CallExpression:exit"() {
@@ -507,7 +506,7 @@ function create4(context) {
       if (node.value?.type !== types.AST_NODE_TYPES.JSXExpressionContainer) {
         return;
       }
-      getReportDescriptors(node.value.expression).forEach(report);
+      getReportDescriptors(node.value.expression).map(shared.report(context));
     }
   };
 }
@@ -1577,7 +1576,7 @@ function create24(context) {
         };
       }
       const leftType = typeUtils.getConstrainedTypeAtLocation(services, left);
-      const leftTypeVariants = inspectVariantTypes(tsApiUtils.unionConstituents(leftType));
+      const leftTypeVariants = inspectVariantTypes(tsApiUtils.unionTypeParts(leftType));
       const isLeftValid = Array.from(leftTypeVariants.values()).every((type) => allowedVariants.some((allowed) => allowed === type));
       if (isLeftValid) {
         return getReportDescriptor(right);
@@ -1595,7 +1594,7 @@ function create24(context) {
       return getReportDescriptor(initExpression);
     }).otherwise(() => eff._);
   }
-  const visitorFunction = eff.flow(getReportDescriptor, shared.createReport(context));
+  const visitorFunction = eff.flow(getReportDescriptor, shared.report(context));
   return {
     "JSXExpressionContainer > ConditionalExpression": visitorFunction,
     "JSXExpressionContainer > LogicalExpression": visitorFunction
@@ -1730,7 +1729,6 @@ var no_missing_key_default = createRule({
   defaultOptions: []
 });
 function create27(context) {
-  const report = shared.createReport(context);
   const state = { isWithinChildrenToArray: false };
   function checkIteratorElement(node) {
     switch (node.type) {
@@ -1794,7 +1792,7 @@ function create27(context) {
       const initialScope = context.sourceCode.getScope(node);
       for (const element of elements) {
         if (!JSX8__namespace.hasAttribute("key", element.openingElement.attributes, initialScope)) {
-          report({
+          shared.report(context)({
             messageId: "missingKey",
             node: element
           });
@@ -1815,10 +1813,12 @@ function create27(context) {
         return;
       }
       if (fn.body.type === types.AST_NODE_TYPES.BlockStatement) {
-        checkBlockStatement(fn.body).forEach(report);
+        for (const descriptor of checkBlockStatement(fn.body)) {
+          shared.report(context)(descriptor);
+        }
         return;
       }
-      report(checkExpression(fn.body));
+      shared.report(context)(checkExpression(fn.body));
     },
     "CallExpression:exit"(node) {
       if (!core.isChildrenToArrayCall(context, node)) {
@@ -1831,7 +1831,7 @@ function create27(context) {
         return;
       }
       if (node.parent.type === types.AST_NODE_TYPES.ArrayExpression) {
-        report({
+        shared.report(context)({
           messageId: "unexpectedFragmentSyntax",
           node
         });
@@ -2952,7 +2952,7 @@ function trimLikeReact(text) {
   const end = trailingSpaces.includes("\n") ? text.length - trailingSpaces.length : text.length;
   return text.slice(start, end);
 }
-function doCheck(context, node, 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) {
@@ -3076,10 +3076,10 @@ function create44(context, [option]) {
   return {
     JSXElement(node) {
       if (!JSX8__namespace.isFragmentElement(node)) return;
-      doCheck(context, node, allowExpressions);
+      checkAndReport(context, node, allowExpressions);
     },
     JSXFragment(node) {
-      doCheck(context, node, allowExpressions);
+      checkAndReport(context, node, allowExpressions);
     }
   };
 }

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { createRuleForPlugin, createReport, 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';
@@ -9,7 +9,7 @@ import { compare } from 'compare-versions';
 import * as VAR from '@eslint-react/var';
 import { getConstrainedTypeAtLocation, isTypeReadonly } from '@typescript-eslint/type-utils';
 import { ESLintUtils } from '@typescript-eslint/utils';
-import { unionConstituents, isTypeFlagSet, isTrueLiteralType, isFalseLiteralType } from 'ts-api-utils';
+import { unionTypeParts, isTypeFlagSet, isTrueLiteralType, isFalseLiteralType } from 'ts-api-utils';
 import ts from 'typescript';
 
 var __defProp = Object.defineProperty;
@@ -109,7 +109,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.37.1-beta.3";
+var version = "1.37.1-next.0";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -387,7 +387,6 @@ var no_array_index_key_default = createRule({
   defaultOptions: []
 });
 function create4(context) {
-  const report = createReport(context);
   const indexParamNames = [];
   function isArrayIndex(node) {
     return node.type === AST_NODE_TYPES.Identifier && indexParamNames.some((name5) => name5 != null && name5 === node.name);
@@ -464,7 +463,7 @@ function create4(context) {
         if (!("value" in prop)) {
           continue;
         }
-        getReportDescriptors(prop.value).forEach(report);
+        getReportDescriptors(prop.value).map(report(context));
       }
     },
     "CallExpression:exit"() {
@@ -480,7 +479,7 @@ function create4(context) {
       if (node.value?.type !== AST_NODE_TYPES.JSXExpressionContainer) {
         return;
       }
-      getReportDescriptors(node.value.expression).forEach(report);
+      getReportDescriptors(node.value.expression).map(report(context));
     }
   };
 }
@@ -1550,7 +1549,7 @@ function create24(context) {
         };
       }
       const leftType = getConstrainedTypeAtLocation(services, left);
-      const leftTypeVariants = inspectVariantTypes(unionConstituents(leftType));
+      const leftTypeVariants = inspectVariantTypes(unionTypeParts(leftType));
       const isLeftValid = Array.from(leftTypeVariants.values()).every((type) => allowedVariants.some((allowed) => allowed === type));
       if (isLeftValid) {
         return getReportDescriptor(right);
@@ -1568,7 +1567,7 @@ function create24(context) {
       return getReportDescriptor(initExpression);
     }).otherwise(() => _);
   }
-  const visitorFunction = flow(getReportDescriptor, createReport(context));
+  const visitorFunction = flow(getReportDescriptor, report(context));
   return {
     "JSXExpressionContainer > ConditionalExpression": visitorFunction,
     "JSXExpressionContainer > LogicalExpression": visitorFunction
@@ -1703,7 +1702,6 @@ var no_missing_key_default = createRule({
   defaultOptions: []
 });
 function create27(context) {
-  const report = createReport(context);
   const state = { isWithinChildrenToArray: false };
   function checkIteratorElement(node) {
     switch (node.type) {
@@ -1767,7 +1765,7 @@ function create27(context) {
       const initialScope = context.sourceCode.getScope(node);
       for (const element of elements) {
         if (!JSX8.hasAttribute("key", element.openingElement.attributes, initialScope)) {
-          report({
+          report(context)({
             messageId: "missingKey",
             node: element
           });
@@ -1788,10 +1786,12 @@ function create27(context) {
         return;
       }
       if (fn.body.type === AST_NODE_TYPES.BlockStatement) {
-        checkBlockStatement(fn.body).forEach(report);
+        for (const descriptor of checkBlockStatement(fn.body)) {
+          report(context)(descriptor);
+        }
         return;
       }
-      report(checkExpression(fn.body));
+      report(context)(checkExpression(fn.body));
     },
     "CallExpression:exit"(node) {
       if (!isChildrenToArrayCall(context, node)) {
@@ -1804,7 +1804,7 @@ function create27(context) {
         return;
       }
       if (node.parent.type === AST_NODE_TYPES.ArrayExpression) {
-        report({
+        report(context)({
           messageId: "unexpectedFragmentSyntax",
           node
         });
@@ -2925,7 +2925,7 @@ function trimLikeReact(text) {
   const end = trailingSpaces.includes("\n") ? text.length - trailingSpaces.length : text.length;
   return text.slice(start, end);
 }
-function doCheck(context, node, 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) {
@@ -3049,10 +3049,10 @@ function create44(context, [option]) {
   return {
     JSXElement(node) {
       if (!JSX8.isFragmentElement(node)) return;
-      doCheck(context, node, allowExpressions);
+      checkAndReport(context, node, allowExpressions);
     },
     JSXFragment(node) {
-      doCheck(context, node, allowExpressions);
+      checkAndReport(context, node, allowExpressions);
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.37.1-beta.3",
+  "version": "1.37.1-next.0",
   "description": "A set of composable linting rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -49,17 +49,17 @@
     "compare-versions": "^6.1.1",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/ast": "1.37.1-beta.3",
-    "@eslint-react/core": "1.37.1-beta.3",
-    "@eslint-react/shared": "1.37.1-beta.3",
-    "@eslint-react/var": "1.37.1-beta.3",
-    "@eslint-react/eff": "1.37.1-beta.3",
-    "@eslint-react/jsx": "1.37.1-beta.3"
+    "@eslint-react/ast": "1.37.1-next.0",
+    "@eslint-react/core": "1.37.1-next.0",
+    "@eslint-react/eff": "1.37.1-next.0",
+    "@eslint-react/jsx": "1.37.1-next.0",
+    "@eslint-react/shared": "1.37.1-next.0",
+    "@eslint-react/var": "1.37.1-next.0"
   },
   "devDependencies": {
     "@types/react": "^19.0.12",
     "@types/react-dom": "^19.0.4",
-    "ts-api-utils": "^2.1.0",
+    "ts-api-utils": "^2.0.1",
     "tsup": "^8.4.0",
     "@local/configs": "0.0.0"
   },