eslint-plugin-react-x 1.42.2-next.1 → 1.42.2-next.3

package/dist/index.js

@@ -4,13 +4,13 @@ var shared = require('@eslint-react/shared');
 var JSX8 = require('@eslint-react/jsx');
 var utils = require('@typescript-eslint/utils');
 var types = require('@typescript-eslint/types');
-var eff = require('@eslint-react/eff');
 var VAR2 = require('@eslint-react/var');
 var tsPattern = require('ts-pattern');
 var kit = require('@eslint-react/kit');
 var ts = require('typescript');
 var AST8 = require('@eslint-react/ast');
 var ER21 = require('@eslint-react/core');
+var eff = require('@eslint-react/eff');
 var compareVersions = require('compare-versions');
 var typeUtils = require('@typescript-eslint/type-utils');
 var tsApiUtils = require('ts-api-utils');
@@ -141,7 +141,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.42.2-next.1";
+var version = "1.42.2-next.3";
 var createRule = utils.ESLintUtils.RuleCreator(shared.getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -167,7 +167,7 @@ var avoid_shorthand_boolean_default = createRule({
 function create(context) {
   return {
     JSXAttribute(node) {
-      if (node.value === null) {
+      if (node.value == null) {
         context.report({
           messageId: "avoidShorthandBoolean",
           node,
@@ -273,7 +273,7 @@ var jsx_no_undef_default = createRule({
 function create4(context) {
   return {
     JSXOpeningElement(node) {
-      const name5 = tsPattern.match(node.name).with({ type: types.AST_NODE_TYPES.JSXIdentifier }, (n) => n.name).with({ type: types.AST_NODE_TYPES.JSXMemberExpression, object: { type: types.AST_NODE_TYPES.JSXIdentifier } }, (n) => n.object.name).otherwise(() => eff._);
+      const name5 = tsPattern.match(node.name).with({ type: types.AST_NODE_TYPES.JSXIdentifier }, (n) => n.name).with({ type: types.AST_NODE_TYPES.JSXMemberExpression, object: { type: types.AST_NODE_TYPES.JSXIdentifier } }, (n) => n.object.name).otherwise(() => null);
       if (name5 == null) return;
       if (name5 === "this") return;
       if (/^[a-z]/u.test(name5)) return;
@@ -645,7 +645,9 @@ function create8(context) {
         if (!("value" in prop)) {
           continue;
         }
-        getReportDescriptors(prop.value).forEach(report);
+        for (const descriptor of getReportDescriptors(prop.value)) {
+          report(descriptor);
+        }
       }
     },
     "CallExpression:exit"() {
@@ -661,7 +663,9 @@ function create8(context) {
       if (node.value?.type !== types.AST_NODE_TYPES.JSXExpressionContainer) {
         return;
       }
-      getReportDescriptors(node.value.expression).forEach(report);
+      for (const descriptor of getReportDescriptors(node.value.expression)) {
+        report(descriptor);
+      }
     }
   };
 }
@@ -806,15 +810,12 @@ var no_children_prop_default = createRule({
 function create13(context) {
   return {
     JSXElement(node) {
-      const attribute = JSX8__namespace.getAttribute(
-        "children",
-        node.openingElement.attributes,
-        context.sourceCode.getScope(node)
-      );
-      if (attribute != null) {
+      const attributes = node.openingElement.attributes;
+      const childrenProp = JSX8__namespace.getAttribute("children", attributes, context.sourceCode.getScope(node));
+      if (childrenProp != null) {
         context.report({
           messageId: "noChildrenProp",
-          node: attribute
+          node: childrenProp
         });
       }
     }
@@ -911,13 +912,12 @@ var no_clone_element_default = createRule({
 function create16(context) {
   return {
     CallExpression(node) {
-      if (!ER21__namespace.isCloneElementCall(context, node)) {
-        return;
+      if (ER21__namespace.isCloneElementCall(context, node)) {
+        context.report({
+          messageId: "noCloneElement",
+          node
+        });
       }
-      context.report({
-        messageId: "noCloneElement",
-        node
-      });
     }
   };
 }
@@ -1481,8 +1481,8 @@ function getComponentPropsFixes(context, fixer, node, typeArguments) {
   if (arg0 == null) {
     return [];
   }
-  const fixedArg0Text = tsPattern.match(arg0).with({ type: types.AST_NODE_TYPES.Identifier }, (n) => `...${n.name}`).with({ type: types.AST_NODE_TYPES.ObjectPattern }, (n) => n.properties.map(getText).join(", ")).otherwise(() => eff._);
-  const fixedArg1Text = tsPattern.match(arg1).with(tsPattern.P.nullish, () => "ref").with({ type: types.AST_NODE_TYPES.Identifier, name: "ref" }, () => "ref").with({ type: types.AST_NODE_TYPES.Identifier, name: tsPattern.P.string }, (n) => `ref: ${n.name}`).otherwise(() => eff._);
+  const fixedArg0Text = tsPattern.match(arg0).with({ type: types.AST_NODE_TYPES.Identifier }, (n) => `...${n.name}`).with({ type: types.AST_NODE_TYPES.ObjectPattern }, (n) => n.properties.map(getText).join(", ")).otherwise(() => null);
+  const fixedArg1Text = tsPattern.match(arg1).with(tsPattern.P.nullish, () => "ref").with({ type: types.AST_NODE_TYPES.Identifier, name: "ref" }, () => "ref").with({ type: types.AST_NODE_TYPES.Identifier, name: tsPattern.P.string }, (n) => `ref: ${n.name}`).otherwise(() => null);
   if (fixedArg0Text == null || fixedArg1Text == null) {
     return [];
   }
@@ -1912,22 +1912,15 @@ function create32(context) {
     },
     CallExpression(node) {
       state.isWithinChildrenToArray ||= ER21__namespace.isChildrenToArrayCall(context, node);
-      if (state.isWithinChildrenToArray) {
-        return;
-      }
-      const isMapCall = AST8__namespace.isArrayMapCall(node);
-      if (!isMapCall && !AST8__namespace.isArrayFromCall(node)) {
-        return;
-      }
-      const fn = node.arguments[isMapCall ? 0 : 1];
-      if (!AST8__namespace.isFunction(fn)) {
-        return;
-      }
-      if (fn.body.type === types.AST_NODE_TYPES.BlockStatement) {
-        checkBlockStatement(fn.body).forEach(report);
+      if (state.isWithinChildrenToArray) return;
+      const callback = tsPattern.match(node).when(AST8__namespace.isArrayMapCall, (n) => n.arguments[0]).when(AST8__namespace.isArrayFromCall, (n) => n.arguments[1]).otherwise(() => null);
+      if (!AST8__namespace.isFunction(callback)) return;
+      const body = callback.body;
+      if (body.type === types.AST_NODE_TYPES.BlockStatement) {
+        checkBlockStatement(body).forEach(report);
         return;
       }
-      report(checkExpression(fn.body));
+      report(checkExpression(body));
     },
     "CallExpression:exit"(node) {
       if (!ER21__namespace.isChildrenToArrayCall(context, node)) {

package/dist/index.mjs

@@ -2,13 +2,13 @@ import { getDocsUrl, getSettingsFromContext, unsafeDecodeSettings, DEFAULT_ESLIN
 import * as JSX8 from '@eslint-react/jsx';
 import { ESLintUtils } from '@typescript-eslint/utils';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
-import { _, flow, getOrUpdate, constTrue, constFalse } from '@eslint-react/eff';
 import * as VAR2 from '@eslint-react/var';
 import { match, isMatching, P } from 'ts-pattern';
 import { JsxConfig, createReport } from '@eslint-react/kit';
 import ts, { JsxEmit } from 'typescript';
 import * as AST8 from '@eslint-react/ast';
 import * as ER21 from '@eslint-react/core';
+import { flow, getOrUpdate, constTrue, constFalse, _ } from '@eslint-react/eff';
 import { compare } from 'compare-versions';
 import { getConstrainedTypeAtLocation, isTypeReadonly } from '@typescript-eslint/type-utils';
 import { unionTypeParts, isTypeFlagSet, isTrueLiteralType, isFalseLiteralType } from 'ts-api-utils';
@@ -113,7 +113,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.42.2-next.1";
+var version = "1.42.2-next.3";
 var createRule = ESLintUtils.RuleCreator(getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -139,7 +139,7 @@ var avoid_shorthand_boolean_default = createRule({
 function create(context) {
   return {
     JSXAttribute(node) {
-      if (node.value === null) {
+      if (node.value == null) {
         context.report({
           messageId: "avoidShorthandBoolean",
           node,
@@ -245,7 +245,7 @@ var jsx_no_undef_default = createRule({
 function create4(context) {
   return {
     JSXOpeningElement(node) {
-      const name5 = match(node.name).with({ type: AST_NODE_TYPES.JSXIdentifier }, (n) => n.name).with({ type: AST_NODE_TYPES.JSXMemberExpression, object: { type: AST_NODE_TYPES.JSXIdentifier } }, (n) => n.object.name).otherwise(() => _);
+      const name5 = match(node.name).with({ type: AST_NODE_TYPES.JSXIdentifier }, (n) => n.name).with({ type: AST_NODE_TYPES.JSXMemberExpression, object: { type: AST_NODE_TYPES.JSXIdentifier } }, (n) => n.object.name).otherwise(() => null);
       if (name5 == null) return;
       if (name5 === "this") return;
       if (/^[a-z]/u.test(name5)) return;
@@ -617,7 +617,9 @@ function create8(context) {
         if (!("value" in prop)) {
           continue;
         }
-        getReportDescriptors(prop.value).forEach(report);
+        for (const descriptor of getReportDescriptors(prop.value)) {
+          report(descriptor);
+        }
       }
     },
     "CallExpression:exit"() {
@@ -633,7 +635,9 @@ function create8(context) {
       if (node.value?.type !== AST_NODE_TYPES.JSXExpressionContainer) {
         return;
       }
-      getReportDescriptors(node.value.expression).forEach(report);
+      for (const descriptor of getReportDescriptors(node.value.expression)) {
+        report(descriptor);
+      }
     }
   };
 }
@@ -778,15 +782,12 @@ var no_children_prop_default = createRule({
 function create13(context) {
   return {
     JSXElement(node) {
-      const attribute = JSX8.getAttribute(
-        "children",
-        node.openingElement.attributes,
-        context.sourceCode.getScope(node)
-      );
-      if (attribute != null) {
+      const attributes = node.openingElement.attributes;
+      const childrenProp = JSX8.getAttribute("children", attributes, context.sourceCode.getScope(node));
+      if (childrenProp != null) {
         context.report({
           messageId: "noChildrenProp",
-          node: attribute
+          node: childrenProp
         });
       }
     }
@@ -883,13 +884,12 @@ var no_clone_element_default = createRule({
 function create16(context) {
   return {
     CallExpression(node) {
-      if (!ER21.isCloneElementCall(context, node)) {
-        return;
+      if (ER21.isCloneElementCall(context, node)) {
+        context.report({
+          messageId: "noCloneElement",
+          node
+        });
       }
-      context.report({
-        messageId: "noCloneElement",
-        node
-      });
     }
   };
 }
@@ -1453,8 +1453,8 @@ function getComponentPropsFixes(context, fixer, node, typeArguments) {
   if (arg0 == null) {
     return [];
   }
-  const fixedArg0Text = match(arg0).with({ type: AST_NODE_TYPES.Identifier }, (n) => `...${n.name}`).with({ type: AST_NODE_TYPES.ObjectPattern }, (n) => n.properties.map(getText).join(", ")).otherwise(() => _);
-  const fixedArg1Text = match(arg1).with(P.nullish, () => "ref").with({ type: AST_NODE_TYPES.Identifier, name: "ref" }, () => "ref").with({ type: AST_NODE_TYPES.Identifier, name: P.string }, (n) => `ref: ${n.name}`).otherwise(() => _);
+  const fixedArg0Text = match(arg0).with({ type: AST_NODE_TYPES.Identifier }, (n) => `...${n.name}`).with({ type: AST_NODE_TYPES.ObjectPattern }, (n) => n.properties.map(getText).join(", ")).otherwise(() => null);
+  const fixedArg1Text = match(arg1).with(P.nullish, () => "ref").with({ type: AST_NODE_TYPES.Identifier, name: "ref" }, () => "ref").with({ type: AST_NODE_TYPES.Identifier, name: P.string }, (n) => `ref: ${n.name}`).otherwise(() => null);
   if (fixedArg0Text == null || fixedArg1Text == null) {
     return [];
   }
@@ -1884,22 +1884,15 @@ function create32(context) {
     },
     CallExpression(node) {
       state.isWithinChildrenToArray ||= ER21.isChildrenToArrayCall(context, node);
-      if (state.isWithinChildrenToArray) {
-        return;
-      }
-      const isMapCall = AST8.isArrayMapCall(node);
-      if (!isMapCall && !AST8.isArrayFromCall(node)) {
-        return;
-      }
-      const fn = node.arguments[isMapCall ? 0 : 1];
-      if (!AST8.isFunction(fn)) {
-        return;
-      }
-      if (fn.body.type === AST_NODE_TYPES.BlockStatement) {
-        checkBlockStatement(fn.body).forEach(report);
+      if (state.isWithinChildrenToArray) return;
+      const callback = match(node).when(AST8.isArrayMapCall, (n) => n.arguments[0]).when(AST8.isArrayFromCall, (n) => n.arguments[1]).otherwise(() => null);
+      if (!AST8.isFunction(callback)) return;
+      const body = callback.body;
+      if (body.type === AST_NODE_TYPES.BlockStatement) {
+        checkBlockStatement(body).forEach(report);
         return;
       }
-      report(checkExpression(fn.body));
+      report(checkExpression(body));
     },
     "CallExpression:exit"(node) {
       if (!ER21.isChildrenToArrayCall(context, node)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.42.2-next.1",
+  "version": "1.42.2-next.3",
   "description": "A series of composable ESLint rules for 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/core": "1.42.2-next.1",
-    "@eslint-react/ast": "1.42.2-next.1",
-    "@eslint-react/eff": "1.42.2-next.1",
-    "@eslint-react/jsx": "1.42.2-next.1",
-    "@eslint-react/kit": "1.42.2-next.1",
-    "@eslint-react/shared": "1.42.2-next.1",
-    "@eslint-react/var": "1.42.2-next.1"
+    "@eslint-react/core": "1.42.2-next.3",
+    "@eslint-react/ast": "1.42.2-next.3",
+    "@eslint-react/eff": "1.42.2-next.3",
+    "@eslint-react/kit": "1.42.2-next.3",
+    "@eslint-react/shared": "1.42.2-next.3",
+    "@eslint-react/var": "1.42.2-next.3",
+    "@eslint-react/jsx": "1.42.2-next.3"
   },
   "devDependencies": {
     "@types/react": "^19.1.0",