eslint-plugin-react-x 1.40.2 → 1.40.3-beta.1

package/dist/index.js

@@ -141,7 +141,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.40.2";
+var version = "1.40.3-beta.1";
 var createRule = utils.ESLintUtils.RuleCreator(shared.getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1772,7 +1772,7 @@ function create30(context) {
     {
       collectDisplayName: true,
       collectHookCalls: false,
-      hint: ER21__namespace.DEFAULT_COMPONENT_HINT
+      hint: ER21__namespace.DEFAULT_COMPONENT_DETECTION_HINT
     }
   );
   return {
@@ -2004,7 +2004,7 @@ var no_nested_component_definitions_default = createRule({
   defaultOptions: []
 });
 function create33(context) {
-  const hint = ER21__namespace.ComponentCollectorHint.SkipArrayMapArgument | ER21__namespace.ComponentCollectorHint.SkipNullLiteral | ER21__namespace.ComponentCollectorHint.SkipUndefined | ER21__namespace.ComponentCollectorHint.SkipBooleanLiteral | ER21__namespace.ComponentCollectorHint.SkipStringLiteral | ER21__namespace.ComponentCollectorHint.SkipNumberLiteral | ER21__namespace.ComponentCollectorHint.StrictLogical | ER21__namespace.ComponentCollectorHint.StrictConditional;
+  const hint = ER21__namespace.ComponentDetectionHint.SkipArrayMapArgument | ER21__namespace.ComponentDetectionHint.SkipNullLiteral | ER21__namespace.ComponentDetectionHint.SkipUndefined | ER21__namespace.ComponentDetectionHint.SkipBooleanLiteral | ER21__namespace.ComponentDetectionHint.SkipStringLiteral | ER21__namespace.ComponentDetectionHint.SkipNumberLiteral | ER21__namespace.ComponentDetectionHint.StrictLogical | ER21__namespace.ComponentDetectionHint.StrictConditional;
   const collector = ER21__namespace.useComponentCollector(context, { hint });
   const collectorLegacy = ER21__namespace.useComponentCollectorLegacy();
   return {
@@ -3122,14 +3122,20 @@ function create49(context, [option]) {
   const { allowExpressions = true } = option;
   return {
     JSXElement(node) {
-      if (!JSX8__namespace.isFragmentElement(node)) return;
-      doCheck(context, node, allowExpressions);
+      if (!JSX8__namespace.isJsxFragmentElement(node)) return;
+      checkNode(context, node, allowExpressions);
     },
     JSXFragment(node) {
-      doCheck(context, node, allowExpressions);
+      checkNode(context, node, allowExpressions);
     }
   };
 }
+function isWhiteSpace(node) {
+  return typeof node.value === "string" && node.raw.trim() === "";
+}
+function isPaddingSpaces(node) {
+  return JSX8__namespace.isJsxText(node) && isWhiteSpace(node) && node.raw.includes("\n");
+}
 function trimLikeReact(text) {
   const leadingSpaces = /^\s*/.exec(text)?.[0] ?? "";
   const trailingSpaces = /\s*$/.exec(text)?.[0] ?? "";
@@ -3137,38 +3143,19 @@ 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 fix(fixer) {
-    if (node.parent.type !== types.AST_NODE_TYPES.JSXElement && node.parent.type !== types.AST_NODE_TYPES.JSXFragment) {
-      if (node.children.length === 0) {
-        return null;
-      }
-      if (node.children.some(
-        (child) => JSX8__namespace.isLiteral(child) && !JSX8__namespace.isWhiteSpace(child) || AST11__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer)(child)
-      )) {
-        return null;
-      }
-    }
-    if (JSX8__namespace.isUserDefinedElement(node.parent)) {
-      return null;
-    }
-    const opener = node.type === types.AST_NODE_TYPES.JSXFragment ? node.openingFragment : node.openingElement;
-    const closer = node.type === types.AST_NODE_TYPES.JSXFragment ? node.closingFragment : node.closingElement;
-    const childrenText = opener.type === types.AST_NODE_TYPES.JSXOpeningElement && opener.selfClosing ? "" : context.sourceCode.getText().slice(opener.range[1], closer?.range[0]);
-    return fixer.replaceText(node, trimLikeReact(childrenText));
-  }
+function checkNode(context, node, allowExpressions) {
   const initialScope = context.sourceCode.getScope(node);
-  if (JSX8__namespace.isKeyedElement(node, initialScope)) {
+  if (JSX8__namespace.isJsxKeyedElement(node, initialScope)) {
     return;
   }
-  if (JSX8__namespace.isBuiltInElement(node.parent)) {
+  if (JSX8__namespace.isJsxBuiltInElement(node.parent)) {
     context.report({
       messageId: "uselessFragment",
       node,
       data: {
         reason: "placed inside a built-in component"
       },
-      fix
+      fix: getFix2(context, node)
     });
   }
   if (node.children.length === 0) {
@@ -3178,14 +3165,14 @@ function doCheck(context, node, allowExpressions) {
       data: {
         reason: "contains less than two children"
       },
-      fix
+      fix: getFix2(context, node)
     });
     return;
   }
   const isChildElement = AST11__namespace.isOneOf([types.AST_NODE_TYPES.JSXElement, types.AST_NODE_TYPES.JSXFragment])(node.parent);
   switch (true) {
     // <Foo content={<>ee eeee eeee ...</>} />
-    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX8__namespace.isLiteral(node.children.at(0))): {
+    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX8__namespace.isJsxText(node.children.at(0))): {
       return;
     }
     // <Foo><>hello, world</></Foo>
@@ -3196,7 +3183,7 @@ function doCheck(context, node, allowExpressions) {
         data: {
           reason: "contains less than two children"
         },
-        fix
+        fix: getFix2(context, node)
       });
       return;
     }
@@ -3207,12 +3194,12 @@ function doCheck(context, node, allowExpressions) {
         data: {
           reason: "contains less than two children"
         },
-        fix
+        fix: getFix2(context, node)
       });
       return;
     }
   }
-  const nonPaddingChildren = node.children.filter((child) => !JSX8__namespace.isPaddingSpaces(child));
+  const nonPaddingChildren = node.children.filter((child) => !isPaddingSpaces(child));
   const firstNonPaddingChild = nonPaddingChildren.at(0);
   switch (true) {
     case nonPaddingChildren.length === 0:
@@ -3223,13 +3210,34 @@ function doCheck(context, node, allowExpressions) {
         data: {
           reason: "contains less than two children"
         },
-        fix
+        fix: getFix2(context, node)
       });
       return;
     }
   }
   return;
 }
+function getFix2(context, node) {
+  if (!canFix(node)) return null;
+  return (fixer) => {
+    const opener = node.type === types.AST_NODE_TYPES.JSXFragment ? node.openingFragment : node.openingElement;
+    const closer = node.type === types.AST_NODE_TYPES.JSXFragment ? node.closingFragment : node.closingElement;
+    const childrenText = opener.type === types.AST_NODE_TYPES.JSXOpeningElement && opener.selfClosing ? "" : context.sourceCode.getText().slice(opener.range[1], closer?.range[0]);
+    return fixer.replaceText(node, trimLikeReact(childrenText));
+  };
+}
+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);
+  }
+  if (node.children.length === 0) {
+    return false;
+  }
+  if (node.children.some((child) => JSX8__namespace.isJsxText(child) && !isWhiteSpace(child) || AST11__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer)(child))) {
+    return false;
+  }
+  return true;
+}
 var RULE_NAME50 = "prefer-destructuring-assignment";
 var RULE_FEATURES49 = [];
 function isMemberExpressionWithObjectName(node) {
@@ -3482,7 +3490,7 @@ var prefer_shorthand_fragment_default = createRule({
 function create54(context) {
   return {
     JSXElement(node) {
-      if (!JSX8__namespace.isFragmentElement(node)) return;
+      if (!JSX8__namespace.isJsxFragmentElement(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.2";
+var version = "1.40.3-beta.1";
 var createRule = ESLintUtils.RuleCreator(getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1744,7 +1744,7 @@ function create30(context) {
     {
       collectDisplayName: true,
       collectHookCalls: false,
-      hint: ER21.DEFAULT_COMPONENT_HINT
+      hint: ER21.DEFAULT_COMPONENT_DETECTION_HINT
     }
   );
   return {
@@ -1976,7 +1976,7 @@ var no_nested_component_definitions_default = createRule({
   defaultOptions: []
 });
 function create33(context) {
-  const hint = ER21.ComponentCollectorHint.SkipArrayMapArgument | ER21.ComponentCollectorHint.SkipNullLiteral | ER21.ComponentCollectorHint.SkipUndefined | ER21.ComponentCollectorHint.SkipBooleanLiteral | ER21.ComponentCollectorHint.SkipStringLiteral | ER21.ComponentCollectorHint.SkipNumberLiteral | ER21.ComponentCollectorHint.StrictLogical | ER21.ComponentCollectorHint.StrictConditional;
+  const hint = ER21.ComponentDetectionHint.SkipArrayMapArgument | ER21.ComponentDetectionHint.SkipNullLiteral | ER21.ComponentDetectionHint.SkipUndefined | ER21.ComponentDetectionHint.SkipBooleanLiteral | ER21.ComponentDetectionHint.SkipStringLiteral | ER21.ComponentDetectionHint.SkipNumberLiteral | ER21.ComponentDetectionHint.StrictLogical | ER21.ComponentDetectionHint.StrictConditional;
   const collector = ER21.useComponentCollector(context, { hint });
   const collectorLegacy = ER21.useComponentCollectorLegacy();
   return {
@@ -3094,14 +3094,20 @@ function create49(context, [option]) {
   const { allowExpressions = true } = option;
   return {
     JSXElement(node) {
-      if (!JSX8.isFragmentElement(node)) return;
-      doCheck(context, node, allowExpressions);
+      if (!JSX8.isJsxFragmentElement(node)) return;
+      checkNode(context, node, allowExpressions);
     },
     JSXFragment(node) {
-      doCheck(context, node, allowExpressions);
+      checkNode(context, node, allowExpressions);
     }
   };
 }
+function isWhiteSpace(node) {
+  return typeof node.value === "string" && node.raw.trim() === "";
+}
+function isPaddingSpaces(node) {
+  return JSX8.isJsxText(node) && isWhiteSpace(node) && node.raw.includes("\n");
+}
 function trimLikeReact(text) {
   const leadingSpaces = /^\s*/.exec(text)?.[0] ?? "";
   const trailingSpaces = /\s*$/.exec(text)?.[0] ?? "";
@@ -3109,38 +3115,19 @@ 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 fix(fixer) {
-    if (node.parent.type !== AST_NODE_TYPES.JSXElement && node.parent.type !== AST_NODE_TYPES.JSXFragment) {
-      if (node.children.length === 0) {
-        return null;
-      }
-      if (node.children.some(
-        (child) => JSX8.isLiteral(child) && !JSX8.isWhiteSpace(child) || AST11.is(AST_NODE_TYPES.JSXExpressionContainer)(child)
-      )) {
-        return null;
-      }
-    }
-    if (JSX8.isUserDefinedElement(node.parent)) {
-      return null;
-    }
-    const opener = node.type === AST_NODE_TYPES.JSXFragment ? node.openingFragment : node.openingElement;
-    const closer = node.type === AST_NODE_TYPES.JSXFragment ? node.closingFragment : node.closingElement;
-    const childrenText = opener.type === AST_NODE_TYPES.JSXOpeningElement && opener.selfClosing ? "" : context.sourceCode.getText().slice(opener.range[1], closer?.range[0]);
-    return fixer.replaceText(node, trimLikeReact(childrenText));
-  }
+function checkNode(context, node, allowExpressions) {
   const initialScope = context.sourceCode.getScope(node);
-  if (JSX8.isKeyedElement(node, initialScope)) {
+  if (JSX8.isJsxKeyedElement(node, initialScope)) {
     return;
   }
-  if (JSX8.isBuiltInElement(node.parent)) {
+  if (JSX8.isJsxBuiltInElement(node.parent)) {
     context.report({
       messageId: "uselessFragment",
       node,
       data: {
         reason: "placed inside a built-in component"
       },
-      fix
+      fix: getFix2(context, node)
     });
   }
   if (node.children.length === 0) {
@@ -3150,14 +3137,14 @@ function doCheck(context, node, allowExpressions) {
       data: {
         reason: "contains less than two children"
       },
-      fix
+      fix: getFix2(context, node)
     });
     return;
   }
   const isChildElement = AST11.isOneOf([AST_NODE_TYPES.JSXElement, AST_NODE_TYPES.JSXFragment])(node.parent);
   switch (true) {
     // <Foo content={<>ee eeee eeee ...</>} />
-    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX8.isLiteral(node.children.at(0))): {
+    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX8.isJsxText(node.children.at(0))): {
       return;
     }
     // <Foo><>hello, world</></Foo>
@@ -3168,7 +3155,7 @@ function doCheck(context, node, allowExpressions) {
         data: {
           reason: "contains less than two children"
         },
-        fix
+        fix: getFix2(context, node)
       });
       return;
     }
@@ -3179,12 +3166,12 @@ function doCheck(context, node, allowExpressions) {
         data: {
           reason: "contains less than two children"
         },
-        fix
+        fix: getFix2(context, node)
       });
       return;
     }
   }
-  const nonPaddingChildren = node.children.filter((child) => !JSX8.isPaddingSpaces(child));
+  const nonPaddingChildren = node.children.filter((child) => !isPaddingSpaces(child));
   const firstNonPaddingChild = nonPaddingChildren.at(0);
   switch (true) {
     case nonPaddingChildren.length === 0:
@@ -3195,13 +3182,34 @@ function doCheck(context, node, allowExpressions) {
         data: {
           reason: "contains less than two children"
         },
-        fix
+        fix: getFix2(context, node)
       });
       return;
     }
   }
   return;
 }
+function getFix2(context, node) {
+  if (!canFix(node)) return null;
+  return (fixer) => {
+    const opener = node.type === AST_NODE_TYPES.JSXFragment ? node.openingFragment : node.openingElement;
+    const closer = node.type === AST_NODE_TYPES.JSXFragment ? node.closingFragment : node.closingElement;
+    const childrenText = opener.type === AST_NODE_TYPES.JSXOpeningElement && opener.selfClosing ? "" : context.sourceCode.getText().slice(opener.range[1], closer?.range[0]);
+    return fixer.replaceText(node, trimLikeReact(childrenText));
+  };
+}
+function canFix(node) {
+  if (node.parent.type === AST_NODE_TYPES.JSXElement || node.parent.type === AST_NODE_TYPES.JSXFragment) {
+    return !JSX8.isJsxUserDefinedElement(node.parent);
+  }
+  if (node.children.length === 0) {
+    return false;
+  }
+  if (node.children.some((child) => JSX8.isJsxText(child) && !isWhiteSpace(child) || AST11.is(AST_NODE_TYPES.JSXExpressionContainer)(child))) {
+    return false;
+  }
+  return true;
+}
 var RULE_NAME50 = "prefer-destructuring-assignment";
 var RULE_FEATURES49 = [];
 function isMemberExpressionWithObjectName(node) {
@@ -3454,7 +3462,7 @@ var prefer_shorthand_fragment_default = createRule({
 function create54(context) {
   return {
     JSXElement(node) {
-      if (!JSX8.isFragmentElement(node)) return;
+      if (!JSX8.isJsxFragmentElement(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.2",
+  "version": "1.40.3-beta.1",
   "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/core": "1.40.2",
-    "@eslint-react/eff": "1.40.2",
-    "@eslint-react/ast": "1.40.2",
-    "@eslint-react/jsx": "1.40.2",
-    "@eslint-react/kit": "1.40.2",
-    "@eslint-react/var": "1.40.2",
-    "@eslint-react/shared": "1.40.2"
+    "@eslint-react/eff": "1.40.3-beta.1",
+    "@eslint-react/core": "1.40.3-beta.1",
+    "@eslint-react/ast": "1.40.3-beta.1",
+    "@eslint-react/jsx": "1.40.3-beta.1",
+    "@eslint-react/shared": "1.40.3-beta.1",
+    "@eslint-react/kit": "1.40.3-beta.1",
+    "@eslint-react/var": "1.40.3-beta.1"
   },
   "devDependencies": {
     "@types/react": "^19.1.0",