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

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-next.3";
+var version = "1.19.0-beta.2";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1197,49 +1197,46 @@ function getFix(node, context) {
     return [
       fixer.removeRange([node.range[0], componentNode.range[0]]),
       fixer.removeRange([componentNode.range[1], node.range[1]]),
-      ...getParamsFixes(componentNode, context, node.typeArguments?.params ?? [], fixer)
+      ...getComponentPropsFixes(
+        componentNode,
+        node.typeArguments?.params ?? [],
+        fixer,
+        context
+      )
     ];
   };
 }
-function getParamsFixes(node, context, typeArguments, fixer) {
+function getComponentPropsFixes(node, typeArguments, fixer, context) {
+  const getText = (node2) => context.sourceCode.getText(node2);
   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 (!arg0) return [];
+  const fixedArg0Text = tsPattern.match(arg0).with({ type: types.AST_NODE_TYPES.Identifier }, (n) => tools.O.some(`...${n.name}`)).with({ type: types.AST_NODE_TYPES.ObjectPattern }, (n) => tools.O.some(n.properties.map(getText).join(", "))).otherwise(tools.O.none);
+  const fixedArg1Text = tsPattern.match(arg1).with(tsPattern.P.nullish, () => tools.O.some("ref")).with({ type: types.AST_NODE_TYPES.Identifier, name: "ref" }, () => tools.O.some("ref")).with({ type: types.AST_NODE_TYPES.Identifier, name: tsPattern.P.not("ref") }, (n) => tools.O.some(`ref: ${n.name}`)).otherwise(tools.O.none);
+  if (tools.O.isNone(fixedArg0Text) || tools.O.isNone(fixedArg1Text)) return [];
+  const fixedPropsText = fixedArg0Text.value;
+  const fixedRefText = fixedArg1Text.value;
   if (!typeArg0 || !typeArg1) {
     return [
       fixer.replaceText(
         arg0,
         [
           "{",
-          arg1.name === "ref" ? `ref,` : `ref: ${arg1.name},`,
-          `...${arg0.name}`,
+          fixedRefText + ",",
+          fixedPropsText,
           "}"
         ].join(" ")
       ),
-      fixer.remove(arg1),
-      fixer.removeRange([arg0.range[1], arg1.range[0]])
+      ...arg1 ? [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}`,
+        fixedRefText + ",",
+        fixedPropsText,
         "}:",
         getText(typeArg1),
         "&",
@@ -1249,8 +1246,7 @@ function getParamsFixes(node, context, typeArguments, fixer) {
         "}"
       ].join(" ")
     ),
-    fixer.remove(arg1),
-    fixer.removeRange([arg0.range[1], arg1.range[0]])
+    ...arg1 ? [fixer.remove(arg1), fixer.removeRange([arg0.range[1], arg1.range[0]])] : []
   ];
 }
 var RULE_NAME27 = "no-implicit-key";

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-next.3";
+var version = "1.19.0-beta.2";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1170,49 +1170,46 @@ function getFix(node, context) {
     return [
       fixer.removeRange([node.range[0], componentNode.range[0]]),
       fixer.removeRange([componentNode.range[1], node.range[1]]),
-      ...getParamsFixes(componentNode, context, node.typeArguments?.params ?? [], fixer)
+      ...getComponentPropsFixes(
+        componentNode,
+        node.typeArguments?.params ?? [],
+        fixer,
+        context
+      )
     ];
   };
 }
-function getParamsFixes(node, context, typeArguments, fixer) {
+function getComponentPropsFixes(node, typeArguments, fixer, context) {
+  const getText = (node2) => context.sourceCode.getText(node2);
   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 (!arg0) return [];
+  const fixedArg0Text = match(arg0).with({ type: AST_NODE_TYPES.Identifier }, (n) => O.some(`...${n.name}`)).with({ type: AST_NODE_TYPES.ObjectPattern }, (n) => O.some(n.properties.map(getText).join(", "))).otherwise(O.none);
+  const fixedArg1Text = match(arg1).with(P.nullish, () => O.some("ref")).with({ type: AST_NODE_TYPES.Identifier, name: "ref" }, () => O.some("ref")).with({ type: AST_NODE_TYPES.Identifier, name: P.not("ref") }, (n) => O.some(`ref: ${n.name}`)).otherwise(O.none);
+  if (O.isNone(fixedArg0Text) || O.isNone(fixedArg1Text)) return [];
+  const fixedPropsText = fixedArg0Text.value;
+  const fixedRefText = fixedArg1Text.value;
   if (!typeArg0 || !typeArg1) {
     return [
       fixer.replaceText(
         arg0,
         [
           "{",
-          arg1.name === "ref" ? `ref,` : `ref: ${arg1.name},`,
-          `...${arg0.name}`,
+          fixedRefText + ",",
+          fixedPropsText,
           "}"
         ].join(" ")
       ),
-      fixer.remove(arg1),
-      fixer.removeRange([arg0.range[1], arg1.range[0]])
+      ...arg1 ? [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}`,
+        fixedRefText + ",",
+        fixedPropsText,
         "}:",
         getText(typeArg1),
         "&",
@@ -1222,8 +1219,7 @@ function getParamsFixes(node, context, typeArguments, fixer) {
         "}"
       ].join(" ")
     ),
-    fixer.remove(arg1),
-    fixer.removeRange([arg0.range[1], arg1.range[0]])
+    ...arg1 ? [fixer.remove(arg1), fixer.removeRange([arg0.range[1], arg1.range[0]])] : []
   ];
 }
 var RULE_NAME27 = "no-implicit-key";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.18.1-next.3",
+  "version": "1.19.0-beta.2",
   "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-next.3",
-    "@eslint-react/jsx": "1.18.1-next.3",
-    "@eslint-react/core": "1.18.1-next.3",
-    "@eslint-react/tools": "1.18.1-next.3",
-    "@eslint-react/shared": "1.18.1-next.3",
-    "@eslint-react/types": "1.18.1-next.3",
-    "@eslint-react/var": "1.18.1-next.3"
+    "@eslint-react/ast": "1.19.0-beta.2",
+    "@eslint-react/core": "1.19.0-beta.2",
+    "@eslint-react/jsx": "1.19.0-beta.2",
+    "@eslint-react/shared": "1.19.0-beta.2",
+    "@eslint-react/types": "1.19.0-beta.2",
+    "@eslint-react/var": "1.19.0-beta.2",
+    "@eslint-react/tools": "1.19.0-beta.2"
   },
   "devDependencies": {
     "@types/react": "^19.0.1",