eslint-plugin-react-x 1.28.1-beta.3 → 1.28.1-beta.5

package/dist/index.js

@@ -137,25 +137,9 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.28.1-beta.3";
+var version = "1.28.1-beta.5";
 var createRule = shared.createRuleForPlugin("x");
 
-// src/utils/get-associated-tokens.ts
-function getAssociatedTokens(context, node) {
-  {
-    const tokenBefore = context.sourceCode.getTokenBefore(node);
-    const tokenAfter = context.sourceCode.getTokenAfter(node);
-    const tokens = [];
-    if (tokenAfter?.value !== "," && tokenBefore?.value === ",") {
-      tokens.push(tokenBefore);
-    }
-    if (tokenAfter?.value === ",") {
-      tokens.push(tokenAfter);
-    }
-    return tokens;
-  }
-}
-
 // src/rules/avoid-shorthand-boolean.ts
 var RULE_NAME = "avoid-shorthand-boolean";
 var RULE_FEATURES = [
@@ -268,8 +252,11 @@ var RULE_NAME4 = "no-access-state-in-setstate";
 var RULE_FEATURES4 = [
   "CHK"
 ];
+function isKeyLiteral(node, key) {
+  return tsPattern.match(key).with({ type: types.AST_NODE_TYPES.Literal }, eff.constTrue).with({ type: types.AST_NODE_TYPES.TemplateLiteral, expressions: [] }, eff.constTrue).with({ type: types.AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(eff.constFalse);
+}
 function getName(node) {
-  if (AST11__namespace.isTypeExpression(node)) {
+  if (AST11__namespace.isTsOnlyExpression(node)) {
     return getName(node.expression);
   }
   if (node.type === types.AST_NODE_TYPES.Identifier || node.type === types.AST_NODE_TYPES.PrivateIdentifier) {
@@ -378,7 +365,7 @@ var no_access_state_in_setstate_default = createRule({
           return;
         }
         const hasState = node.id.properties.some(
-          (prop) => prop.type === types.AST_NODE_TYPES.Property && AST11__namespace.isKeyLiteralLike(prop, prop.key) && getName(prop.key) === "state"
+          (prop) => prop.type === types.AST_NODE_TYPES.Property && isKeyLiteral(prop, prop.key) && getName(prop.key) === "state"
         );
         if (!hasState) {
           return;
@@ -1246,7 +1233,7 @@ var RULE_FEATURES22 = [
   "CHK"
 ];
 function getName2(node) {
-  if (AST11__namespace.isTypeExpression(node)) {
+  if (AST11__namespace.isTsOnlyExpression(node)) {
     return getName2(node.expression);
   }
   if (node.type === types.AST_NODE_TYPES.Identifier || node.type === types.AST_NODE_TYPES.PrivateIdentifier) {
@@ -1400,7 +1387,7 @@ var no_duplicate_key_default = createRule({
             if (!AST11__namespace.isFunction(iter)) return;
             const arg0 = call?.arguments[0];
             if (call == null || arg0 == null) return;
-            if (AST11__namespace.unwrapTypeExpression(arg0) !== iter) {
+            if (AST11__namespace.getEcmaExpression(arg0) !== iter) {
               return;
             }
             keyedEntries.set(call, {
@@ -2692,8 +2679,11 @@ var LIFECYCLE_METHODS = /* @__PURE__ */ new Set([
   "UNSAFE_componentWillReceiveProps",
   "UNSAFE_componentWillUpdate"
 ]);
+function isKeyLiteral2(node, key) {
+  return tsPattern.match(key).with({ type: types.AST_NODE_TYPES.Literal }, eff.constTrue).with({ type: types.AST_NODE_TYPES.TemplateLiteral, expressions: [] }, eff.constTrue).with({ type: types.AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(eff.constFalse);
+}
 function getName3(node) {
-  if (AST11__namespace.isTypeExpression(node)) {
+  if (AST11__namespace.isTsOnlyExpression(node)) {
     return getName3(node.expression);
   }
   if (node.type === types.AST_NODE_TYPES.Identifier || node.type === types.AST_NODE_TYPES.PrivateIdentifier) {
@@ -2771,7 +2761,7 @@ var no_unused_class_component_members_default = createRule({
       if (node.static) {
         return;
       }
-      if (AST11__namespace.isKeyLiteralLike(node, node.key)) {
+      if (isKeyLiteral2(node, node.key)) {
         propertyDefs.get(currentClass)?.add(node.key);
       }
     }
@@ -2792,7 +2782,7 @@ var no_unused_class_component_members_default = createRule({
         if (!core.isClassComponent(currentClass) || currentMethod.static) {
           return;
         }
-        if (!AST11__namespace.isThisExpression(node.object) || !AST11__namespace.isKeyLiteralLike(node, node.property)) {
+        if (!AST11__namespace.isThisExpression(node.object) || !isKeyLiteral2(node, node.property)) {
           return;
         }
         if (node.parent.type === types.AST_NODE_TYPES.AssignmentExpression && node.parent.left === node) {
@@ -2819,7 +2809,7 @@ var no_unused_class_component_members_default = createRule({
         }
         if (node.init != null && AST11__namespace.isThisExpression(node.init) && node.id.type === types.AST_NODE_TYPES.ObjectPattern) {
           for (const prop of node.id.properties) {
-            if (prop.type === types.AST_NODE_TYPES.Property && AST11__namespace.isKeyLiteralLike(prop, prop.key)) {
+            if (prop.type === types.AST_NODE_TYPES.Property && isKeyLiteral2(prop, prop.key)) {
               const keyName = getName3(prop.key);
               if (keyName != null) {
                 propertyUsages.get(currentClass)?.add(keyName);
@@ -2836,8 +2826,11 @@ var RULE_NAME44 = "no-unused-state";
 var RULE_FEATURES44 = [
   "CHK"
 ];
+function isKeyLiteral3(node, key) {
+  return tsPattern.match(key).with({ type: types.AST_NODE_TYPES.Literal }, eff.constTrue).with({ type: types.AST_NODE_TYPES.TemplateLiteral, expressions: [] }, eff.constTrue).with({ type: types.AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(eff.constFalse);
+}
 function getName4(node) {
-  if (AST11__namespace.isTypeExpression(node)) {
+  if (AST11__namespace.isTsOnlyExpression(node)) {
     return getName4(node.expression);
   }
   if (node.type === types.AST_NODE_TYPES.Identifier || node.type === types.AST_NODE_TYPES.PrivateIdentifier) {
@@ -2989,7 +2982,7 @@ var no_unused_state_default = createRule({
           return;
         }
         const hasState = node.id.properties.some((prop) => {
-          if (prop.type === types.AST_NODE_TYPES.Property && AST11__namespace.isKeyLiteralLike(prop, prop.key)) {
+          if (prop.type === types.AST_NODE_TYPES.Property && isKeyLiteral3(prop, prop.key)) {
             return getName4(prop.key) === "state";
           }
           return false;
@@ -3089,6 +3082,20 @@ var no_use_context_default = createRule({
   },
   defaultOptions: []
 });
+function getAssociatedTokens(context, node) {
+  {
+    const tokenBefore = context.sourceCode.getTokenBefore(node);
+    const tokenAfter = context.sourceCode.getTokenAfter(node);
+    const tokens = [];
+    if (tokenAfter?.value !== "," && tokenBefore?.value === ",") {
+      tokens.push(tokenBefore);
+    }
+    if (tokenAfter?.value === ",") {
+      tokens.push(tokenAfter);
+    }
+    return tokens;
+  }
+}
 var RULE_NAME46 = "no-useless-fragment";
 var defaultOptions = [{
   allowExpressions: true

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { createRuleForPlugin, getSettingsFromContext, unsafeDecodeSettings, DEFA
 import * as JSX7 from '@eslint-react/jsx';
 import * as AST11 from '@eslint-react/ast';
 import { isForwardRefCall, isClassComponent, isThisSetState, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isComponentDidCatch, isGetDerivedStateFromError, isCloneElementCall, isCreateRefCall, isComponentName, useComponentCollector, DEFAULT_COMPONENT_HINT, ERComponentFlag, DISPLAY_NAME_ASSIGNMENT_SELECTOR, isCreateContextCall, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideRenderMethod, isCreateElementCall, isReactHookCall, isReactHookCallWithNameAlias, isGetDerivedStateFromProps, isInitializedFromReact } from '@eslint-react/core';
-import { _, getOrUpdate, identity } from '@eslint-react/eff';
+import { _, getOrUpdate, constTrue, constFalse, identity } from '@eslint-react/eff';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { isMatching, match, P } from 'ts-pattern';
 import { compare } from 'compare-versions';
@@ -110,25 +110,9 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.28.1-beta.3";
+var version = "1.28.1-beta.5";
 var createRule = createRuleForPlugin("x");
 
-// src/utils/get-associated-tokens.ts
-function getAssociatedTokens(context, node) {
-  {
-    const tokenBefore = context.sourceCode.getTokenBefore(node);
-    const tokenAfter = context.sourceCode.getTokenAfter(node);
-    const tokens = [];
-    if (tokenAfter?.value !== "," && tokenBefore?.value === ",") {
-      tokens.push(tokenBefore);
-    }
-    if (tokenAfter?.value === ",") {
-      tokens.push(tokenAfter);
-    }
-    return tokens;
-  }
-}
-
 // src/rules/avoid-shorthand-boolean.ts
 var RULE_NAME = "avoid-shorthand-boolean";
 var RULE_FEATURES = [
@@ -241,8 +225,11 @@ var RULE_NAME4 = "no-access-state-in-setstate";
 var RULE_FEATURES4 = [
   "CHK"
 ];
+function isKeyLiteral(node, key) {
+  return match(key).with({ type: AST_NODE_TYPES.Literal }, constTrue).with({ type: AST_NODE_TYPES.TemplateLiteral, expressions: [] }, constTrue).with({ type: AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(constFalse);
+}
 function getName(node) {
-  if (AST11.isTypeExpression(node)) {
+  if (AST11.isTsOnlyExpression(node)) {
     return getName(node.expression);
   }
   if (node.type === AST_NODE_TYPES.Identifier || node.type === AST_NODE_TYPES.PrivateIdentifier) {
@@ -351,7 +338,7 @@ var no_access_state_in_setstate_default = createRule({
           return;
         }
         const hasState = node.id.properties.some(
-          (prop) => prop.type === AST_NODE_TYPES.Property && AST11.isKeyLiteralLike(prop, prop.key) && getName(prop.key) === "state"
+          (prop) => prop.type === AST_NODE_TYPES.Property && isKeyLiteral(prop, prop.key) && getName(prop.key) === "state"
         );
         if (!hasState) {
           return;
@@ -1219,7 +1206,7 @@ var RULE_FEATURES22 = [
   "CHK"
 ];
 function getName2(node) {
-  if (AST11.isTypeExpression(node)) {
+  if (AST11.isTsOnlyExpression(node)) {
     return getName2(node.expression);
   }
   if (node.type === AST_NODE_TYPES.Identifier || node.type === AST_NODE_TYPES.PrivateIdentifier) {
@@ -1373,7 +1360,7 @@ var no_duplicate_key_default = createRule({
             if (!AST11.isFunction(iter)) return;
             const arg0 = call?.arguments[0];
             if (call == null || arg0 == null) return;
-            if (AST11.unwrapTypeExpression(arg0) !== iter) {
+            if (AST11.getEcmaExpression(arg0) !== iter) {
               return;
             }
             keyedEntries.set(call, {
@@ -2665,8 +2652,11 @@ var LIFECYCLE_METHODS = /* @__PURE__ */ new Set([
   "UNSAFE_componentWillReceiveProps",
   "UNSAFE_componentWillUpdate"
 ]);
+function isKeyLiteral2(node, key) {
+  return match(key).with({ type: AST_NODE_TYPES.Literal }, constTrue).with({ type: AST_NODE_TYPES.TemplateLiteral, expressions: [] }, constTrue).with({ type: AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(constFalse);
+}
 function getName3(node) {
-  if (AST11.isTypeExpression(node)) {
+  if (AST11.isTsOnlyExpression(node)) {
     return getName3(node.expression);
   }
   if (node.type === AST_NODE_TYPES.Identifier || node.type === AST_NODE_TYPES.PrivateIdentifier) {
@@ -2744,7 +2734,7 @@ var no_unused_class_component_members_default = createRule({
       if (node.static) {
         return;
       }
-      if (AST11.isKeyLiteralLike(node, node.key)) {
+      if (isKeyLiteral2(node, node.key)) {
         propertyDefs.get(currentClass)?.add(node.key);
       }
     }
@@ -2765,7 +2755,7 @@ var no_unused_class_component_members_default = createRule({
         if (!isClassComponent(currentClass) || currentMethod.static) {
           return;
         }
-        if (!AST11.isThisExpression(node.object) || !AST11.isKeyLiteralLike(node, node.property)) {
+        if (!AST11.isThisExpression(node.object) || !isKeyLiteral2(node, node.property)) {
           return;
         }
         if (node.parent.type === AST_NODE_TYPES.AssignmentExpression && node.parent.left === node) {
@@ -2792,7 +2782,7 @@ var no_unused_class_component_members_default = createRule({
         }
         if (node.init != null && AST11.isThisExpression(node.init) && node.id.type === AST_NODE_TYPES.ObjectPattern) {
           for (const prop of node.id.properties) {
-            if (prop.type === AST_NODE_TYPES.Property && AST11.isKeyLiteralLike(prop, prop.key)) {
+            if (prop.type === AST_NODE_TYPES.Property && isKeyLiteral2(prop, prop.key)) {
               const keyName = getName3(prop.key);
               if (keyName != null) {
                 propertyUsages.get(currentClass)?.add(keyName);
@@ -2809,8 +2799,11 @@ var RULE_NAME44 = "no-unused-state";
 var RULE_FEATURES44 = [
   "CHK"
 ];
+function isKeyLiteral3(node, key) {
+  return match(key).with({ type: AST_NODE_TYPES.Literal }, constTrue).with({ type: AST_NODE_TYPES.TemplateLiteral, expressions: [] }, constTrue).with({ type: AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(constFalse);
+}
 function getName4(node) {
-  if (AST11.isTypeExpression(node)) {
+  if (AST11.isTsOnlyExpression(node)) {
     return getName4(node.expression);
   }
   if (node.type === AST_NODE_TYPES.Identifier || node.type === AST_NODE_TYPES.PrivateIdentifier) {
@@ -2962,7 +2955,7 @@ var no_unused_state_default = createRule({
           return;
         }
         const hasState = node.id.properties.some((prop) => {
-          if (prop.type === AST_NODE_TYPES.Property && AST11.isKeyLiteralLike(prop, prop.key)) {
+          if (prop.type === AST_NODE_TYPES.Property && isKeyLiteral3(prop, prop.key)) {
             return getName4(prop.key) === "state";
           }
           return false;
@@ -3062,6 +3055,20 @@ var no_use_context_default = createRule({
   },
   defaultOptions: []
 });
+function getAssociatedTokens(context, node) {
+  {
+    const tokenBefore = context.sourceCode.getTokenBefore(node);
+    const tokenAfter = context.sourceCode.getTokenAfter(node);
+    const tokens = [];
+    if (tokenAfter?.value !== "," && tokenBefore?.value === ",") {
+      tokens.push(tokenBefore);
+    }
+    if (tokenAfter?.value === ",") {
+      tokens.push(tokenAfter);
+    }
+    return tokens;
+  }
+}
 var RULE_NAME46 = "no-useless-fragment";
 var defaultOptions = [{
   allowExpressions: true

package/package.json

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