eslint-plugin-react-x 1.28.1-next.4 → 1.28.1-next.6

package/dist/index.js

@@ -137,25 +137,9 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.28.1-next.4";
+var version = "1.28.1-next.6";
 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,6 +252,9 @@ 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.isTsOnlyExpression(node)) {
     return getName(node.expression);
@@ -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;
@@ -952,7 +939,7 @@ var RULE_FEATURES16 = [
   "MOD"
 ];
 function isComponentWillMount(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentWillMount";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentWillMount";
 }
 var no_component_will_mount_default = createRule({
   meta: {
@@ -1005,7 +992,7 @@ var RULE_FEATURES17 = [
   "MOD"
 ];
 function isComponentWillUpdate(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentWillReceiveProps";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentWillReceiveProps";
 }
 var no_component_will_receive_props_default = createRule({
   meta: {
@@ -1058,7 +1045,7 @@ var RULE_FEATURES18 = [
   "MOD"
 ];
 function isComponentWillUpdate2(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentWillUpdate";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentWillUpdate";
 }
 var no_component_will_update_default = createRule({
   meta: {
@@ -1265,7 +1252,7 @@ function isAssignmentToThisState(node) {
   return left.type === types.AST_NODE_TYPES.MemberExpression && AST11__namespace.isThisExpression(left.object) && getName2(left.property) === "state";
 }
 function isConstructorFunction(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.FunctionDeclaration, types.AST_NODE_TYPES.FunctionExpression])(node) && AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node.parent) && node.parent.key.type === types.AST_NODE_TYPES.Identifier && node.parent.key.name === "constructor";
+  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.FunctionDeclaration, types.AST_NODE_TYPES.FunctionExpression])(node) && AST11__namespace.isMethodOrProperty(node.parent) && node.parent.key.type === types.AST_NODE_TYPES.Identifier && node.parent.key.name === "constructor";
 }
 var no_direct_mutation_state_default = createRule({
   meta: {
@@ -1821,7 +1808,7 @@ var no_missing_context_display_name_default = createRule({
       },
       "Program:exit"() {
         for (const call of createCalls) {
-          const id = VAR__namespace.getVariableId(call);
+          const id = core.getInstanceId(call);
           if (id == null) {
             context.report({
               messageId: "noMissingContextDisplayName",
@@ -1833,10 +1820,7 @@ var no_missing_context_display_name_default = createRule({
             const left = node.left;
             if (left.type !== types.AST_NODE_TYPES.MemberExpression) return false;
             const object = left.object;
-            return VAR__namespace.isVariableIdEqual(id, object, [
-              context.sourceCode.getScope(id),
-              context.sourceCode.getScope(object)
-            ]);
+            return core.isInstanceIdEqual(context, id, object);
           });
           if (!hasDisplayNameAssignment) {
             context.report({
@@ -2166,7 +2150,7 @@ var RULE_FEATURES33 = [
   "CHK"
 ];
 function isShouldComponentUpdate(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "shouldComponentUpdate";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "shouldComponentUpdate";
 }
 var no_redundant_should_component_update_default = createRule({
   meta: {
@@ -2217,7 +2201,7 @@ var RULE_FEATURES34 = [
   "CHK"
 ];
 function isComponentDidMount(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
 }
 var no_set_state_in_component_did_mount_default = createRule({
   meta: {
@@ -2262,7 +2246,7 @@ var RULE_FEATURES35 = [
   "CHK"
 ];
 function isComponentDidUpdate(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentDidUpdate";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentDidUpdate";
 }
 var no_set_state_in_component_did_update_default = createRule({
   meta: {
@@ -2307,7 +2291,7 @@ var RULE_FEATURES36 = [
   "CHK"
 ];
 function isComponentWillUpdate3(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentWillUpdate";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentWillUpdate";
 }
 var no_set_state_in_component_will_update_default = createRule({
   meta: {
@@ -2398,7 +2382,7 @@ var RULE_FEATURES38 = [
   "CHK"
 ];
 function isUnsafeComponentWillMount(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillMount";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillMount";
 }
 var no_unsafe_component_will_mount_default = createRule({
   meta: {
@@ -2443,7 +2427,7 @@ var RULE_FEATURES39 = [
   "CHK"
 ];
 function isUnsafeComponentWillReceiveProps(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillReceiveProps";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillReceiveProps";
 }
 var no_unsafe_component_will_receive_props_default = createRule({
   meta: {
@@ -2488,7 +2472,7 @@ var RULE_FEATURES40 = [
   "CHK"
 ];
 function isUnsafeComponentWillUpdate(node) {
-  return AST11__namespace.isOneOf([types.AST_NODE_TYPES.MethodDefinition, types.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillUpdate";
+  return AST11__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillUpdate";
 }
 var no_unsafe_component_will_update_default = createRule({
   meta: {
@@ -2692,6 +2676,9 @@ 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.isTsOnlyExpression(node)) {
     return getName3(node.expression);
@@ -2771,7 +2758,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 +2779,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 +2806,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,6 +2823,9 @@ 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.isTsOnlyExpression(node)) {
     return getName4(node.expression);
@@ -2989,7 +2979,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 +3079,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

@@ -1,8 +1,8 @@
 import { createRuleForPlugin, getSettingsFromContext, unsafeDecodeSettings, DEFAULT_ESLINT_REACT_SETTINGS } from '@eslint-react/shared';
 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 { isForwardRefCall, isClassComponent, isThisSetState, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isComponentDidCatch, isGetDerivedStateFromError, isCloneElementCall, isCreateRefCall, isComponentName, useComponentCollector, DEFAULT_COMPONENT_HINT, ERComponentFlag, getInstanceId, isInstanceIdEqual, DISPLAY_NAME_ASSIGNMENT_SELECTOR, isCreateContextCall, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideRenderMethod, isCreateElementCall, isReactHookCall, isReactHookCallWithNameAlias, isGetDerivedStateFromProps, isInitializedFromReact } from '@eslint-react/core';
+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-next.4";
+var version = "1.28.1-next.6";
 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,6 +225,9 @@ 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.isTsOnlyExpression(node)) {
     return getName(node.expression);
@@ -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;
@@ -925,7 +912,7 @@ var RULE_FEATURES16 = [
   "MOD"
 ];
 function isComponentWillMount(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillMount";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillMount";
 }
 var no_component_will_mount_default = createRule({
   meta: {
@@ -978,7 +965,7 @@ var RULE_FEATURES17 = [
   "MOD"
 ];
 function isComponentWillUpdate(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillReceiveProps";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillReceiveProps";
 }
 var no_component_will_receive_props_default = createRule({
   meta: {
@@ -1031,7 +1018,7 @@ var RULE_FEATURES18 = [
   "MOD"
 ];
 function isComponentWillUpdate2(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillUpdate";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillUpdate";
 }
 var no_component_will_update_default = createRule({
   meta: {
@@ -1238,7 +1225,7 @@ function isAssignmentToThisState(node) {
   return left.type === AST_NODE_TYPES.MemberExpression && AST11.isThisExpression(left.object) && getName2(left.property) === "state";
 }
 function isConstructorFunction(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.FunctionDeclaration, AST_NODE_TYPES.FunctionExpression])(node) && AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node.parent) && node.parent.key.type === AST_NODE_TYPES.Identifier && node.parent.key.name === "constructor";
+  return AST11.isOneOf([AST_NODE_TYPES.FunctionDeclaration, AST_NODE_TYPES.FunctionExpression])(node) && AST11.isMethodOrProperty(node.parent) && node.parent.key.type === AST_NODE_TYPES.Identifier && node.parent.key.name === "constructor";
 }
 var no_direct_mutation_state_default = createRule({
   meta: {
@@ -1794,7 +1781,7 @@ var no_missing_context_display_name_default = createRule({
       },
       "Program:exit"() {
         for (const call of createCalls) {
-          const id = VAR.getVariableId(call);
+          const id = getInstanceId(call);
           if (id == null) {
             context.report({
               messageId: "noMissingContextDisplayName",
@@ -1806,10 +1793,7 @@ var no_missing_context_display_name_default = createRule({
             const left = node.left;
             if (left.type !== AST_NODE_TYPES.MemberExpression) return false;
             const object = left.object;
-            return VAR.isVariableIdEqual(id, object, [
-              context.sourceCode.getScope(id),
-              context.sourceCode.getScope(object)
-            ]);
+            return isInstanceIdEqual(context, id, object);
           });
           if (!hasDisplayNameAssignment) {
             context.report({
@@ -2139,7 +2123,7 @@ var RULE_FEATURES33 = [
   "CHK"
 ];
 function isShouldComponentUpdate(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "shouldComponentUpdate";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "shouldComponentUpdate";
 }
 var no_redundant_should_component_update_default = createRule({
   meta: {
@@ -2190,7 +2174,7 @@ var RULE_FEATURES34 = [
   "CHK"
 ];
 function isComponentDidMount(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
 }
 var no_set_state_in_component_did_mount_default = createRule({
   meta: {
@@ -2235,7 +2219,7 @@ var RULE_FEATURES35 = [
   "CHK"
 ];
 function isComponentDidUpdate(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidUpdate";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidUpdate";
 }
 var no_set_state_in_component_did_update_default = createRule({
   meta: {
@@ -2280,7 +2264,7 @@ var RULE_FEATURES36 = [
   "CHK"
 ];
 function isComponentWillUpdate3(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillUpdate";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillUpdate";
 }
 var no_set_state_in_component_will_update_default = createRule({
   meta: {
@@ -2371,7 +2355,7 @@ var RULE_FEATURES38 = [
   "CHK"
 ];
 function isUnsafeComponentWillMount(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillMount";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillMount";
 }
 var no_unsafe_component_will_mount_default = createRule({
   meta: {
@@ -2416,7 +2400,7 @@ var RULE_FEATURES39 = [
   "CHK"
 ];
 function isUnsafeComponentWillReceiveProps(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillReceiveProps";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillReceiveProps";
 }
 var no_unsafe_component_will_receive_props_default = createRule({
   meta: {
@@ -2461,7 +2445,7 @@ var RULE_FEATURES40 = [
   "CHK"
 ];
 function isUnsafeComponentWillUpdate(node) {
-  return AST11.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillUpdate";
+  return AST11.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "UNSAFE_componentWillUpdate";
 }
 var no_unsafe_component_will_update_default = createRule({
   meta: {
@@ -2665,6 +2649,9 @@ 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.isTsOnlyExpression(node)) {
     return getName3(node.expression);
@@ -2744,7 +2731,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 +2752,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 +2779,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,6 +2796,9 @@ 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.isTsOnlyExpression(node)) {
     return getName4(node.expression);
@@ -2962,7 +2952,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 +3052,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-next.4",
+  "version": "1.28.1-next.6",
   "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-next.4",
-    "@eslint-react/eff": "1.28.1-next.4",
-    "@eslint-react/jsx": "1.28.1-next.4",
-    "@eslint-react/core": "1.28.1-next.4",
-    "@eslint-react/shared": "1.28.1-next.4",
-    "@eslint-react/var": "1.28.1-next.4"
+    "@eslint-react/ast": "1.28.1-next.6",
+    "@eslint-react/core": "1.28.1-next.6",
+    "@eslint-react/eff": "1.28.1-next.6",
+    "@eslint-react/jsx": "1.28.1-next.6",
+    "@eslint-react/shared": "1.28.1-next.6",
+    "@eslint-react/var": "1.28.1-next.6"
   },
   "devDependencies": {
     "@types/react": "^19.0.10",