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

package/dist/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var shared = require('@eslint-react/shared');
-var JSX7 = require('@eslint-react/jsx');
+var JSX8 = require('@eslint-react/jsx');
 var AST11 = require('@eslint-react/ast');
 var core = require('@eslint-react/core');
 var eff = require('@eslint-react/eff');
@@ -35,7 +35,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var JSX7__namespace = /*#__PURE__*/_interopNamespace(JSX7);
+var JSX8__namespace = /*#__PURE__*/_interopNamespace(JSX8);
 var AST11__namespace = /*#__PURE__*/_interopNamespace(AST11);
 var VAR__namespace = /*#__PURE__*/_interopNamespace(VAR);
 var ts__default = /*#__PURE__*/_interopDefault(ts);
@@ -137,7 +137,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.28.1-beta.5";
+var version = "1.28.1-beta.7";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -167,7 +167,7 @@ var avoid_shorthand_boolean_default = createRule({
             messageId: "avoidShorthandBoolean",
             node,
             data: {
-              propName: JSX7__namespace.getAttributeName(node)
+              propName: JSX8__namespace.getAttributeName(node)
             },
             fix: (fixer) => fixer.insertTextAfter(node.name, `={true}`)
           });
@@ -720,7 +720,7 @@ var no_children_prop_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const attribute = JSX7__namespace.getAttribute(
+        const attribute = JSX8__namespace.getAttribute(
           "children",
           node.openingElement.attributes,
           context.sourceCode.getScope(node)
@@ -939,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: {
@@ -992,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: {
@@ -1045,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: {
@@ -1119,7 +1119,7 @@ var no_context_provider_default = createRule({
     }
     return {
       JSXElement(node) {
-        const [name5, ...rest] = JSX7__namespace.getElementName(node).split(".").reverse();
+        const [name5, ...rest] = JSX8__namespace.getElementName(node).split(".").reverse();
         if (name5 !== "Provider") return;
         const contextName = rest.reverse().join(".");
         context.report({
@@ -1252,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: {
@@ -1548,7 +1548,7 @@ var no_implicit_key_default = createRule({
     return {
       JSXOpeningElement(node) {
         const initialScope = context.sourceCode.getScope(node);
-        const keyPropFound = JSX7__namespace.getAttribute("key", node.attributes, initialScope);
+        const keyPropFound = JSX8__namespace.getAttribute("key", node.attributes, initialScope);
         const keyPropOnElement = node.attributes.some(
           (n) => n.type === types.AST_NODE_TYPES.JSXAttribute && n.name.type === types.AST_NODE_TYPES.JSXIdentifier && n.name.name === "key"
         );
@@ -1808,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",
@@ -1820,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({
@@ -1861,7 +1858,7 @@ var no_missing_key_default = createRule({
       switch (node.type) {
         case types.AST_NODE_TYPES.JSXElement: {
           const initialScope = context.sourceCode.getScope(node);
-          if (!JSX7__namespace.hasAttribute("key", node.openingElement.attributes, initialScope)) {
+          if (!JSX8__namespace.hasAttribute("key", node.openingElement.attributes, initialScope)) {
             return {
               messageId: "missingKey",
               node
@@ -1922,7 +1919,7 @@ var no_missing_key_default = createRule({
         }
         const initialScope = context.sourceCode.getScope(node);
         for (const element of elements) {
-          if (!JSX7__namespace.hasAttribute("key", element.openingElement.attributes, initialScope)) {
+          if (!JSX8__namespace.hasAttribute("key", element.openingElement.attributes, initialScope)) {
             context.report({
               messageId: "missingKey",
               node: element
@@ -2024,7 +2021,7 @@ var no_nested_components_default = createRule({
             continue;
           }
           const isInsideProperty = component.parent.type === types.AST_NODE_TYPES.Property;
-          const isInsideJSXPropValue = component.parent.type === types.AST_NODE_TYPES.JSXAttribute || JSX7__namespace.findParentAttribute(node, (n) => n.value?.type === types.AST_NODE_TYPES.JSXExpressionContainer) != null;
+          const isInsideJSXPropValue = component.parent.type === types.AST_NODE_TYPES.JSXAttribute || JSX8__namespace.findParentAttribute(node, (n) => n.value?.type === types.AST_NODE_TYPES.JSXExpressionContainer) != null;
           if (isInsideJSXPropValue) {
             if (!core.isDeclaredInRenderPropLoose(component)) {
               context.report({
@@ -2153,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: {
@@ -2204,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: {
@@ -2249,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: {
@@ -2294,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: {
@@ -2385,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: {
@@ -2430,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: {
@@ -2475,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: {
@@ -2533,18 +2530,17 @@ var no_unstable_context_value_default = createRule({
   },
   name: RULE_NAME41,
   create(context) {
+    const { version: version2 } = shared.getSettingsFromContext(context);
+    const isReact18OrBelow = compareVersions.compare(version2, "19.0.0", "<");
     const { ctx, listeners } = core.useComponentCollector(context);
     const constructions = /* @__PURE__ */ new Map();
     return {
       ...listeners,
       JSXOpeningElement(node) {
-        const openingElementName = node.name;
-        if (openingElementName.type !== types.AST_NODE_TYPES.JSXMemberExpression) {
-          return;
-        }
-        if (openingElementName.property.name !== "Provider") {
-          return;
-        }
+        const fullName = JSX8__namespace.getElementName(node.parent);
+        const selfName = fullName.split(".").at(-1);
+        if (selfName == null) return;
+        if (!isContextName(selfName, isReact18OrBelow)) return;
         const functionEntry = ctx.getCurrentEntry();
         if (functionEntry == null) return;
         const attribute = node.attributes.find(
@@ -2583,6 +2579,13 @@ var no_unstable_context_value_default = createRule({
   },
   defaultOptions: []
 });
+function isContextName(name5, isReact18OrBelow) {
+  if (name5 === "Provider") return true;
+  if (!isReact18OrBelow) {
+    return name5.endsWith("Context") || name5.endsWith("CONTEXT");
+  }
+  return false;
+}
 var RULE_NAME42 = "no-unstable-default-props";
 var RULE_FEATURES42 = [
   "CHK"
@@ -3114,12 +3117,12 @@ function checkAndReport(context, node, allowExpressions) {
         return null;
       }
       if (node.children.some(
-        (child) => JSX7__namespace.isLiteral(child) && !JSX7__namespace.isWhiteSpace(child) || AST11__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer)(child)
+        (child) => JSX8__namespace.isLiteral(child) && !JSX8__namespace.isWhiteSpace(child) || AST11__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer)(child)
       )) {
         return null;
       }
     }
-    if (JSX7__namespace.isUserDefinedElement(node.parent)) {
+    if (JSX8__namespace.isUserDefinedElement(node.parent)) {
       return null;
     }
     const opener = node.type === types.AST_NODE_TYPES.JSXFragment ? node.openingFragment : node.openingElement;
@@ -3128,10 +3131,10 @@ function checkAndReport(context, node, allowExpressions) {
     return fixer.replaceText(node, trimLikeReact(childrenText));
   }
   const initialScope = context.sourceCode.getScope(node);
-  if (JSX7__namespace.isKeyedElement(node, initialScope)) {
+  if (JSX8__namespace.isKeyedElement(node, initialScope)) {
     return;
   }
-  if (JSX7__namespace.isBuiltInElement(node.parent)) {
+  if (JSX8__namespace.isBuiltInElement(node.parent)) {
     context.report({
       messageId: "uselessFragment",
       node,
@@ -3155,7 +3158,7 @@ function checkAndReport(context, node, allowExpressions) {
   const isChildElement = AST11__namespace.isOneOf([types.AST_NODE_TYPES.JSXElement, types.AST_NODE_TYPES.JSXFragment])(node.parent);
   switch (true) {
     // <Foo content={<>ee eeee eeee ...</>} />
-    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX7__namespace.isLiteral(node.children.at(0))): {
+    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX8__namespace.isLiteral(node.children.at(0))): {
       return;
     }
     // <Foo><>hello, world</></Foo>
@@ -3182,7 +3185,7 @@ function checkAndReport(context, node, allowExpressions) {
       return;
     }
   }
-  const nonPaddingChildren = node.children.filter((child) => !JSX7__namespace.isPaddingSpaces(child));
+  const nonPaddingChildren = node.children.filter((child) => !JSX8__namespace.isPaddingSpaces(child));
   const firstNonPaddingChild = nonPaddingChildren.at(0);
   switch (true) {
     case nonPaddingChildren.length === 0:
@@ -3227,7 +3230,7 @@ var no_useless_fragment_default = createRule({
     const { allowExpressions = true } = option;
     return {
       JSXElement(node) {
-        if (!JSX7__namespace.isFragmentElement(node)) return;
+        if (!JSX8__namespace.isFragmentElement(node)) return;
         checkAndReport(context, node, allowExpressions);
       },
       JSXFragment(node) {
@@ -3445,7 +3448,7 @@ var prefer_shorthand_boolean_default = createRule({
     return {
       JSXAttribute(node) {
         const { value } = node;
-        const propName = JSX7__namespace.getAttributeName(node);
+        const propName = JSX8__namespace.getAttributeName(node);
         const hasValueTrue = value?.type === types.AST_NODE_TYPES.JSXExpressionContainer && value.expression.type === types.AST_NODE_TYPES.Literal && value.expression.value === true;
         if (!hasValueTrue) {
           return;
@@ -3485,7 +3488,7 @@ var prefer_shorthand_fragment_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        if (!JSX7__namespace.isFragmentElement(node)) return;
+        if (!JSX8__namespace.isFragmentElement(node)) return;
         const hasAttributes = node.openingElement.attributes.length > 0;
         if (hasAttributes) {
           return;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { createRuleForPlugin, getSettingsFromContext, unsafeDecodeSettings, DEFAULT_ESLINT_REACT_SETTINGS } from '@eslint-react/shared';
-import * as JSX7 from '@eslint-react/jsx';
+import * as JSX8 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 { 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';
@@ -110,7 +110,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.28.1-beta.5";
+var version = "1.28.1-beta.7";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -140,7 +140,7 @@ var avoid_shorthand_boolean_default = createRule({
             messageId: "avoidShorthandBoolean",
             node,
             data: {
-              propName: JSX7.getAttributeName(node)
+              propName: JSX8.getAttributeName(node)
             },
             fix: (fixer) => fixer.insertTextAfter(node.name, `={true}`)
           });
@@ -693,7 +693,7 @@ var no_children_prop_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const attribute = JSX7.getAttribute(
+        const attribute = JSX8.getAttribute(
           "children",
           node.openingElement.attributes,
           context.sourceCode.getScope(node)
@@ -912,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: {
@@ -965,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: {
@@ -1018,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: {
@@ -1092,7 +1092,7 @@ var no_context_provider_default = createRule({
     }
     return {
       JSXElement(node) {
-        const [name5, ...rest] = JSX7.getElementName(node).split(".").reverse();
+        const [name5, ...rest] = JSX8.getElementName(node).split(".").reverse();
         if (name5 !== "Provider") return;
         const contextName = rest.reverse().join(".");
         context.report({
@@ -1225,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: {
@@ -1521,7 +1521,7 @@ var no_implicit_key_default = createRule({
     return {
       JSXOpeningElement(node) {
         const initialScope = context.sourceCode.getScope(node);
-        const keyPropFound = JSX7.getAttribute("key", node.attributes, initialScope);
+        const keyPropFound = JSX8.getAttribute("key", node.attributes, initialScope);
         const keyPropOnElement = node.attributes.some(
           (n) => n.type === AST_NODE_TYPES.JSXAttribute && n.name.type === AST_NODE_TYPES.JSXIdentifier && n.name.name === "key"
         );
@@ -1781,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",
@@ -1793,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({
@@ -1834,7 +1831,7 @@ var no_missing_key_default = createRule({
       switch (node.type) {
         case AST_NODE_TYPES.JSXElement: {
           const initialScope = context.sourceCode.getScope(node);
-          if (!JSX7.hasAttribute("key", node.openingElement.attributes, initialScope)) {
+          if (!JSX8.hasAttribute("key", node.openingElement.attributes, initialScope)) {
             return {
               messageId: "missingKey",
               node
@@ -1895,7 +1892,7 @@ var no_missing_key_default = createRule({
         }
         const initialScope = context.sourceCode.getScope(node);
         for (const element of elements) {
-          if (!JSX7.hasAttribute("key", element.openingElement.attributes, initialScope)) {
+          if (!JSX8.hasAttribute("key", element.openingElement.attributes, initialScope)) {
             context.report({
               messageId: "missingKey",
               node: element
@@ -1997,7 +1994,7 @@ var no_nested_components_default = createRule({
             continue;
           }
           const isInsideProperty = component.parent.type === AST_NODE_TYPES.Property;
-          const isInsideJSXPropValue = component.parent.type === AST_NODE_TYPES.JSXAttribute || JSX7.findParentAttribute(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer) != null;
+          const isInsideJSXPropValue = component.parent.type === AST_NODE_TYPES.JSXAttribute || JSX8.findParentAttribute(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer) != null;
           if (isInsideJSXPropValue) {
             if (!isDeclaredInRenderPropLoose(component)) {
               context.report({
@@ -2126,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: {
@@ -2177,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: {
@@ -2222,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: {
@@ -2267,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: {
@@ -2358,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: {
@@ -2403,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: {
@@ -2448,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: {
@@ -2506,18 +2503,17 @@ var no_unstable_context_value_default = createRule({
   },
   name: RULE_NAME41,
   create(context) {
+    const { version: version2 } = getSettingsFromContext(context);
+    const isReact18OrBelow = compare(version2, "19.0.0", "<");
     const { ctx, listeners } = useComponentCollector(context);
     const constructions = /* @__PURE__ */ new Map();
     return {
       ...listeners,
       JSXOpeningElement(node) {
-        const openingElementName = node.name;
-        if (openingElementName.type !== AST_NODE_TYPES.JSXMemberExpression) {
-          return;
-        }
-        if (openingElementName.property.name !== "Provider") {
-          return;
-        }
+        const fullName = JSX8.getElementName(node.parent);
+        const selfName = fullName.split(".").at(-1);
+        if (selfName == null) return;
+        if (!isContextName(selfName, isReact18OrBelow)) return;
         const functionEntry = ctx.getCurrentEntry();
         if (functionEntry == null) return;
         const attribute = node.attributes.find(
@@ -2556,6 +2552,13 @@ var no_unstable_context_value_default = createRule({
   },
   defaultOptions: []
 });
+function isContextName(name5, isReact18OrBelow) {
+  if (name5 === "Provider") return true;
+  if (!isReact18OrBelow) {
+    return name5.endsWith("Context") || name5.endsWith("CONTEXT");
+  }
+  return false;
+}
 var RULE_NAME42 = "no-unstable-default-props";
 var RULE_FEATURES42 = [
   "CHK"
@@ -3087,12 +3090,12 @@ function checkAndReport(context, node, allowExpressions) {
         return null;
       }
       if (node.children.some(
-        (child) => JSX7.isLiteral(child) && !JSX7.isWhiteSpace(child) || AST11.is(AST_NODE_TYPES.JSXExpressionContainer)(child)
+        (child) => JSX8.isLiteral(child) && !JSX8.isWhiteSpace(child) || AST11.is(AST_NODE_TYPES.JSXExpressionContainer)(child)
       )) {
         return null;
       }
     }
-    if (JSX7.isUserDefinedElement(node.parent)) {
+    if (JSX8.isUserDefinedElement(node.parent)) {
       return null;
     }
     const opener = node.type === AST_NODE_TYPES.JSXFragment ? node.openingFragment : node.openingElement;
@@ -3101,10 +3104,10 @@ function checkAndReport(context, node, allowExpressions) {
     return fixer.replaceText(node, trimLikeReact(childrenText));
   }
   const initialScope = context.sourceCode.getScope(node);
-  if (JSX7.isKeyedElement(node, initialScope)) {
+  if (JSX8.isKeyedElement(node, initialScope)) {
     return;
   }
-  if (JSX7.isBuiltInElement(node.parent)) {
+  if (JSX8.isBuiltInElement(node.parent)) {
     context.report({
       messageId: "uselessFragment",
       node,
@@ -3128,7 +3131,7 @@ function checkAndReport(context, node, allowExpressions) {
   const isChildElement = AST11.isOneOf([AST_NODE_TYPES.JSXElement, AST_NODE_TYPES.JSXFragment])(node.parent);
   switch (true) {
     // <Foo content={<>ee eeee eeee ...</>} />
-    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX7.isLiteral(node.children.at(0))): {
+    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX8.isLiteral(node.children.at(0))): {
       return;
     }
     // <Foo><>hello, world</></Foo>
@@ -3155,7 +3158,7 @@ function checkAndReport(context, node, allowExpressions) {
       return;
     }
   }
-  const nonPaddingChildren = node.children.filter((child) => !JSX7.isPaddingSpaces(child));
+  const nonPaddingChildren = node.children.filter((child) => !JSX8.isPaddingSpaces(child));
   const firstNonPaddingChild = nonPaddingChildren.at(0);
   switch (true) {
     case nonPaddingChildren.length === 0:
@@ -3200,7 +3203,7 @@ var no_useless_fragment_default = createRule({
     const { allowExpressions = true } = option;
     return {
       JSXElement(node) {
-        if (!JSX7.isFragmentElement(node)) return;
+        if (!JSX8.isFragmentElement(node)) return;
         checkAndReport(context, node, allowExpressions);
       },
       JSXFragment(node) {
@@ -3418,7 +3421,7 @@ var prefer_shorthand_boolean_default = createRule({
     return {
       JSXAttribute(node) {
         const { value } = node;
-        const propName = JSX7.getAttributeName(node);
+        const propName = JSX8.getAttributeName(node);
         const hasValueTrue = value?.type === AST_NODE_TYPES.JSXExpressionContainer && value.expression.type === AST_NODE_TYPES.Literal && value.expression.value === true;
         if (!hasValueTrue) {
           return;
@@ -3458,7 +3461,7 @@ var prefer_shorthand_fragment_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        if (!JSX7.isFragmentElement(node)) return;
+        if (!JSX8.isFragmentElement(node)) return;
         const hasAttributes = node.openingElement.attributes.length > 0;
         if (hasAttributes) {
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.28.1-beta.5",
+  "version": "1.28.1-beta.7",
   "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.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"
+    "@eslint-react/ast": "1.28.1-beta.7",
+    "@eslint-react/core": "1.28.1-beta.7",
+    "@eslint-react/eff": "1.28.1-beta.7",
+    "@eslint-react/shared": "1.28.1-beta.7",
+    "@eslint-react/jsx": "1.28.1-beta.7",
+    "@eslint-react/var": "1.28.1-beta.7"
   },
   "devDependencies": {
     "@types/react": "^19.0.10",