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

package/dist/index.js

@@ -42,7 +42,7 @@ var ts__default = /*#__PURE__*/_interopDefault(ts);
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.24.2-next.1";
+var version = "1.24.2-next.3";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1408,8 +1408,8 @@ function getComponentPropsFixes(node, typeArguments, fixer, context) {
         getText(typeArg1),
         "&",
         "{",
-        `ref:`,
-        `React.RefObject<${getText(typeArg0)}>`,
+        `ref?:`,
+        `React.RefObject<${getText(typeArg0)} | null>`,
         "}"
       ].join(" ")
     ),
@@ -2815,16 +2815,42 @@ var RULE_NAME44 = "no-useless-fragment";
 var defaultOptions = [{
   allowExpressions: true
 }];
+function trimLikeReact(text) {
+  const leadingSpaces = /^\s*/.exec(text)?.[0] ?? "";
+  const trailingSpaces = /\s*$/.exec(text)?.[0] ?? "";
+  const start = leadingSpaces.includes("\n") ? leadingSpaces.length : 0;
+  const end = trailingSpaces.includes("\n") ? text.length - trailingSpaces.length : text.length;
+  return text.slice(start, end);
+}
 function checkAndReport(node, context, 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) => JSX7__namespace.isLiteral(child) && !JSX7__namespace.isWhiteSpace(child) || AST11__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer)(child)
+      )) {
+        return null;
+      }
+    }
+    if (JSX7__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));
+  }
   const initialScope = context.sourceCode.getScope(node);
   if (JSX7__namespace.isKeyedElement(node, initialScope)) {
     return;
   }
   if (JSX7__namespace.isBuiltInElement(node.parent)) {
-    context.report({ messageId: "noUselessFragmentInBuiltIn", node });
+    context.report({ messageId: "noUselessFragmentInBuiltIn", node, fix });
   }
   if (node.children.length === 0) {
-    context.report({ messageId: "noUselessFragment", node });
+    context.report({ messageId: "noUselessFragment", node, fix });
     return;
   }
   const isChildElement = AST11__namespace.isOneOf([types.AST_NODE_TYPES.JSXElement, types.AST_NODE_TYPES.JSXFragment])(node.parent);
@@ -2835,11 +2861,11 @@ function checkAndReport(node, context, allowExpressions) {
     }
     // <Foo><>hello, world</></Foo>
     case (!allowExpressions && isChildElement): {
-      context.report({ messageId: "noUselessFragment", node });
+      context.report({ messageId: "noUselessFragment", node, fix });
       return;
     }
     case (!allowExpressions && !isChildElement && node.children.length === 1): {
-      context.report({ messageId: "noUselessFragment", node });
+      context.report({ messageId: "noUselessFragment", node, fix });
       return;
     }
   }
@@ -2848,7 +2874,7 @@ function checkAndReport(node, context, allowExpressions) {
   switch (true) {
     case nonPaddingChildren.length === 0:
     case (nonPaddingChildren.length === 1 && firstNonPaddingChild?.type !== types.AST_NODE_TYPES.JSXExpressionContainer): {
-      context.report({ messageId: "noUselessFragment", node });
+      context.report({ messageId: "noUselessFragment", node, fix });
       return;
     }
   }
@@ -2861,6 +2887,7 @@ var no_useless_fragment_default = createRule({
     docs: {
       description: "disallow unnecessary fragments"
     },
+    fixable: "code",
     messages: {
       noUselessFragment: "A fragment contains less than two children is unnecessary.",
       noUselessFragmentInBuiltIn: "A fragment placed inside a built-in component is unnecessary."

package/dist/index.mjs

@@ -15,7 +15,7 @@ import { getTypeImmutability, isUnknown, isImmutable, isReadonlyShallow, isReado
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.24.2-next.1";
+var version = "1.24.2-next.3";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1381,8 +1381,8 @@ function getComponentPropsFixes(node, typeArguments, fixer, context) {
         getText(typeArg1),
         "&",
         "{",
-        `ref:`,
-        `React.RefObject<${getText(typeArg0)}>`,
+        `ref?:`,
+        `React.RefObject<${getText(typeArg0)} | null>`,
         "}"
       ].join(" ")
     ),
@@ -2788,16 +2788,42 @@ var RULE_NAME44 = "no-useless-fragment";
 var defaultOptions = [{
   allowExpressions: true
 }];
+function trimLikeReact(text) {
+  const leadingSpaces = /^\s*/.exec(text)?.[0] ?? "";
+  const trailingSpaces = /\s*$/.exec(text)?.[0] ?? "";
+  const start = leadingSpaces.includes("\n") ? leadingSpaces.length : 0;
+  const end = trailingSpaces.includes("\n") ? text.length - trailingSpaces.length : text.length;
+  return text.slice(start, end);
+}
 function checkAndReport(node, context, 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) => JSX7.isLiteral(child) && !JSX7.isWhiteSpace(child) || AST11.is(AST_NODE_TYPES.JSXExpressionContainer)(child)
+      )) {
+        return null;
+      }
+    }
+    if (JSX7.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));
+  }
   const initialScope = context.sourceCode.getScope(node);
   if (JSX7.isKeyedElement(node, initialScope)) {
     return;
   }
   if (JSX7.isBuiltInElement(node.parent)) {
-    context.report({ messageId: "noUselessFragmentInBuiltIn", node });
+    context.report({ messageId: "noUselessFragmentInBuiltIn", node, fix });
   }
   if (node.children.length === 0) {
-    context.report({ messageId: "noUselessFragment", node });
+    context.report({ messageId: "noUselessFragment", node, fix });
     return;
   }
   const isChildElement = AST11.isOneOf([AST_NODE_TYPES.JSXElement, AST_NODE_TYPES.JSXFragment])(node.parent);
@@ -2808,11 +2834,11 @@ function checkAndReport(node, context, allowExpressions) {
     }
     // <Foo><>hello, world</></Foo>
     case (!allowExpressions && isChildElement): {
-      context.report({ messageId: "noUselessFragment", node });
+      context.report({ messageId: "noUselessFragment", node, fix });
       return;
     }
     case (!allowExpressions && !isChildElement && node.children.length === 1): {
-      context.report({ messageId: "noUselessFragment", node });
+      context.report({ messageId: "noUselessFragment", node, fix });
       return;
     }
   }
@@ -2821,7 +2847,7 @@ function checkAndReport(node, context, allowExpressions) {
   switch (true) {
     case nonPaddingChildren.length === 0:
     case (nonPaddingChildren.length === 1 && firstNonPaddingChild?.type !== AST_NODE_TYPES.JSXExpressionContainer): {
-      context.report({ messageId: "noUselessFragment", node });
+      context.report({ messageId: "noUselessFragment", node, fix });
       return;
     }
   }
@@ -2834,6 +2860,7 @@ var no_useless_fragment_default = createRule({
     docs: {
       description: "disallow unnecessary fragments"
     },
+    fixable: "code",
     messages: {
       noUselessFragment: "A fragment contains less than two children is unnecessary.",
       noUselessFragmentInBuiltIn: "A fragment placed inside a built-in component is unnecessary."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.24.2-next.1",
+  "version": "1.24.2-next.3",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -48,12 +48,12 @@
     "is-immutable-type": "^5.0.1",
     "string-ts": "^2.2.0",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/ast": "1.24.2-next.1",
-    "@eslint-react/core": "1.24.2-next.1",
-    "@eslint-react/shared": "1.24.2-next.1",
-    "@eslint-react/jsx": "1.24.2-next.1",
-    "@eslint-react/var": "1.24.2-next.1",
-    "@eslint-react/eff": "1.24.2-next.1"
+    "@eslint-react/core": "1.24.2-next.3",
+    "@eslint-react/eff": "1.24.2-next.3",
+    "@eslint-react/jsx": "1.24.2-next.3",
+    "@eslint-react/var": "1.24.2-next.3",
+    "@eslint-react/ast": "1.24.2-next.3",
+    "@eslint-react/shared": "1.24.2-next.3"
   },
   "devDependencies": {
     "@types/react": "^19.0.8",