eslint-plugin-react-x 1.18.1-beta.2 → 1.18.1-beta.3

package/dist/index.js

@@ -41,7 +41,7 @@ var ts__default = /*#__PURE__*/_interopDefault(ts);
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.18.1-beta.2";
+var version = "1.18.1-beta.3";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1166,6 +1166,7 @@ var no_forward_ref_default = createRule({
     docs: {
       description: "disallow the use of 'forwardRef'"
     },
+    fixable: "code",
     messages: {
       noForwardRef: "In React 19, 'forwardRef' is no longer necessary. Pass 'ref' as a prop instead."
     },
@@ -1181,13 +1182,77 @@ var no_forward_ref_default = createRule({
         if (!core.isForwardRefCall(node, context)) return;
         context.report({
           messageId: "noForwardRef",
-          node
+          node,
+          fix: getFix(node, context)
         });
       }
     };
   },
   defaultOptions: []
 });
+function getFix(node, context) {
+  return (fixer) => {
+    const [componentNode] = node.arguments;
+    if (!componentNode || !AST11__namespace.isFunction(componentNode)) return [];
+    return [
+      fixer.removeRange([node.range[0], componentNode.range[0]]),
+      fixer.removeRange([componentNode.range[1], node.range[1]]),
+      ...getParamsFixes(componentNode, context, node.typeArguments?.params ?? [], fixer)
+    ];
+  };
+}
+function getParamsFixes(node, context, typeArguments, fixer) {
+  const [arg0, arg1] = node.params;
+  const [typeArg0, typeArg1] = typeArguments;
+  if (arg0?.type !== types.AST_NODE_TYPES.Identifier) return [];
+  if (!arg1) {
+    return [fixer.replaceText(
+      arg0,
+      [
+        "{",
+        "ref,",
+        `...${arg0.name}`,
+        "}"
+      ].join(" ")
+    )];
+  }
+  if (arg1.type !== types.AST_NODE_TYPES.Identifier) return [];
+  if (!typeArg0 || !typeArg1) {
+    return [
+      fixer.replaceText(
+        arg0,
+        [
+          "{",
+          arg1.name === "ref" ? `ref,` : `ref: ${arg1.name},`,
+          `...${arg0.name}`,
+          "}"
+        ].join(" ")
+      ),
+      fixer.remove(arg1),
+      fixer.removeRange([arg0.range[1], arg1.range[0]])
+    ];
+  }
+  const getText = (node2) => context.sourceCode.getText(node2);
+  return [
+    fixer.replaceText(
+      arg0,
+      [
+        "{",
+        arg1.name === "ref" ? `ref,` : `ref: ${arg1.name},`,
+        `...${arg0.name}`,
+        "}:",
+        getText(typeArg1),
+        "&",
+        "{",
+        `ref:`,
+        `React.RefObject<${getText(typeArg0)}>`,
+        "}"
+      ].join(" ")
+    ),
+    fixer.remove(arg1),
+    fixer.removeRange([arg0.range[1], arg1.range[0]])
+  ];
+}
 var RULE_NAME27 = "no-implicit-key";
 var no_implicit_key_default = createRule({
   meta: {

package/dist/index.mjs

@@ -14,7 +14,7 @@ import { getTypeImmutability, isUnknown, isImmutable, isReadonlyShallow, isReado
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.18.1-beta.2";
+var version = "1.18.1-beta.3";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1139,6 +1139,7 @@ var no_forward_ref_default = createRule({
     docs: {
       description: "disallow the use of 'forwardRef'"
     },
+    fixable: "code",
     messages: {
       noForwardRef: "In React 19, 'forwardRef' is no longer necessary. Pass 'ref' as a prop instead."
     },
@@ -1154,13 +1155,77 @@ var no_forward_ref_default = createRule({
         if (!isForwardRefCall(node, context)) return;
         context.report({
           messageId: "noForwardRef",
-          node
+          node,
+          fix: getFix(node, context)
         });
       }
     };
   },
   defaultOptions: []
 });
+function getFix(node, context) {
+  return (fixer) => {
+    const [componentNode] = node.arguments;
+    if (!componentNode || !AST11.isFunction(componentNode)) return [];
+    return [
+      fixer.removeRange([node.range[0], componentNode.range[0]]),
+      fixer.removeRange([componentNode.range[1], node.range[1]]),
+      ...getParamsFixes(componentNode, context, node.typeArguments?.params ?? [], fixer)
+    ];
+  };
+}
+function getParamsFixes(node, context, typeArguments, fixer) {
+  const [arg0, arg1] = node.params;
+  const [typeArg0, typeArg1] = typeArguments;
+  if (arg0?.type !== AST_NODE_TYPES.Identifier) return [];
+  if (!arg1) {
+    return [fixer.replaceText(
+      arg0,
+      [
+        "{",
+        "ref,",
+        `...${arg0.name}`,
+        "}"
+      ].join(" ")
+    )];
+  }
+  if (arg1.type !== AST_NODE_TYPES.Identifier) return [];
+  if (!typeArg0 || !typeArg1) {
+    return [
+      fixer.replaceText(
+        arg0,
+        [
+          "{",
+          arg1.name === "ref" ? `ref,` : `ref: ${arg1.name},`,
+          `...${arg0.name}`,
+          "}"
+        ].join(" ")
+      ),
+      fixer.remove(arg1),
+      fixer.removeRange([arg0.range[1], arg1.range[0]])
+    ];
+  }
+  const getText = (node2) => context.sourceCode.getText(node2);
+  return [
+    fixer.replaceText(
+      arg0,
+      [
+        "{",
+        arg1.name === "ref" ? `ref,` : `ref: ${arg1.name},`,
+        `...${arg0.name}`,
+        "}:",
+        getText(typeArg1),
+        "&",
+        "{",
+        `ref:`,
+        `React.RefObject<${getText(typeArg0)}>`,
+        "}"
+      ].join(" ")
+    ),
+    fixer.remove(arg1),
+    fixer.removeRange([arg0.range[1], arg1.range[0]])
+  ];
+}
 var RULE_NAME27 = "no-implicit-key";
 var no_implicit_key_default = createRule({
   meta: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.18.1-beta.2",
+  "version": "1.18.1-beta.3",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "eslint",
@@ -49,13 +49,13 @@
     "compare-versions": "^6.1.1",
     "is-immutable-type": "^5.0.0",
     "ts-pattern": "^5.5.0",
-    "@eslint-react/ast": "1.18.1-beta.2",
-    "@eslint-react/jsx": "1.18.1-beta.2",
-    "@eslint-react/core": "1.18.1-beta.2",
-    "@eslint-react/shared": "1.18.1-beta.2",
-    "@eslint-react/types": "1.18.1-beta.2",
-    "@eslint-react/var": "1.18.1-beta.2",
-    "@eslint-react/tools": "1.18.1-beta.2"
+    "@eslint-react/ast": "1.18.1-beta.3",
+    "@eslint-react/core": "1.18.1-beta.3",
+    "@eslint-react/shared": "1.18.1-beta.3",
+    "@eslint-react/var": "1.18.1-beta.3",
+    "@eslint-react/jsx": "1.18.1-beta.3",
+    "@eslint-react/types": "1.18.1-beta.3",
+    "@eslint-react/tools": "1.18.1-beta.3"
   },
   "devDependencies": {
     "@types/react": "^19.0.1",