eslint-plugin-react-x 1.24.0-next.0 → 1.24.0-next.11

package/dist/index.js

@@ -42,7 +42,7 @@ var ts__default = /*#__PURE__*/_interopDefault(ts);
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.24.0-next.0";
+var version = "1.24.0-next.11";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -72,7 +72,7 @@ var avoid_shorthand_boolean_default = createRule({
             messageId: "avoidShorthandBoolean",
             node,
             data: {
-              propName: JSX7__namespace.getPropName(node)
+              propName: JSX7__namespace.getAttributeName(node)
             },
             fix: (fixer) => fixer.insertTextAfter(node.name, `={true}`)
           });
@@ -221,15 +221,15 @@ var no_access_state_in_setstate_default = createRule({
         if (!AST11__namespace.isThisExpression(node.object)) {
           return;
         }
-        const [currClass, isComponent] = classEntries.at(-1) ?? [];
+        const [currClass, isComponent = false] = classEntries.at(-1) ?? [];
         if (currClass == null || !isComponent) {
           return;
         }
-        const [currMethod, isStatic] = methodEntries.at(-1) ?? [];
+        const [currMethod, isStatic = false] = methodEntries.at(-1) ?? [];
         if (currMethod == null || isStatic) {
           return;
         }
-        const [setState, hasThisState] = setStateEntries.at(-1) ?? [];
+        const [setState, hasThisState = false] = setStateEntries.at(-1) ?? [];
         if (setState == null || hasThisState) {
           return;
         }
@@ -251,15 +251,15 @@ var no_access_state_in_setstate_default = createRule({
         methodEntries.pop();
       },
       VariableDeclarator(node) {
-        const [currClass, isComponent] = classEntries.at(-1) ?? [];
+        const [currClass, isComponent = false] = classEntries.at(-1) ?? [];
         if (currClass == null || !isComponent) {
           return;
         }
-        const [currMethod, isStatic] = methodEntries.at(-1) ?? [];
+        const [currMethod, isStatic = false] = methodEntries.at(-1) ?? [];
         if (currMethod == null || isStatic) {
           return;
         }
-        const [setState, hasThisState] = setStateEntries.at(-1) ?? [];
+        const [setState, hasThisState = false] = setStateEntries.at(-1) ?? [];
         if (setState == null || hasThisState) {
           return;
         }
@@ -610,15 +610,15 @@ var no_children_prop_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const prop = JSX7__namespace.getProp(
+        const attribute = JSX7__namespace.getAttributeNode(
           "children",
           context.sourceCode.getScope(node),
           node.openingElement.attributes
         );
-        if (prop) {
+        if (attribute != null) {
           context.report({
             messageId: "noChildrenProp",
-            node: prop
+            node: attribute
           });
         }
       }
@@ -661,12 +661,6 @@ var RULE_NAME12 = "no-class-component";
 var RULE_FEATURES12 = [
   "CHK"
 ];
-function isComponentDidCatch(node) {
-  return (node.type === types.AST_NODE_TYPES.MethodDefinition || node.type === types.AST_NODE_TYPES.PropertyDefinition) && !node.static && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentDidCatch";
-}
-function isGetDerivedStateFromError(node) {
-  return (node.type === types.AST_NODE_TYPES.MethodDefinition || node.type === types.AST_NODE_TYPES.PropertyDefinition) && node.static && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "getDerivedStateFromError";
-}
 var no_class_component_default = createRule({
   meta: {
     type: "problem",
@@ -690,7 +684,7 @@ var no_class_component_default = createRule({
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node);
         for (const { name: name2 = "anonymous", node: component } of components.values()) {
-          if (component.body.body.some((m) => isComponentDidCatch(m) || isGetDerivedStateFromError(m))) {
+          if (component.body.body.some((m) => core.isComponentDidCatch(m) || core.isGetDerivedStateFromError(m))) {
             continue;
           }
           context.report({
@@ -1063,7 +1057,7 @@ var no_create_ref_default = createRule({
   create(context) {
     return {
       CallExpression(node) {
-        if (core.isCreateRefCall(node, context) && !AST11__namespace.findParentNode(node, core.isClassComponent)) {
+        if (core.isCreateRefCall(node, context) && AST11__namespace.findParentNode(node, core.isClassComponent) == null) {
           context.report({ messageId: "noCreateRef", node });
         }
       }
@@ -1109,7 +1103,7 @@ var no_default_props_default = createRule({
         }
         const variable = VAR__namespace.findVariable(object.name, context.sourceCode.getScope(node));
         const variableNode = VAR__namespace.getVariableNode(variable, 0);
-        if (variableNode === eff._) return;
+        if (variableNode == null) return;
         if (!AST11__namespace.isFunction(variableNode) && !core.isClassComponent(variableNode)) return;
         context.report({ messageId: "noDefaultProps", node: property });
       },
@@ -1171,15 +1165,15 @@ var no_direct_mutation_state_default = createRule({
         if (!isAssignmentToThisState(node)) {
           return;
         }
-        const parentClass = AST11__namespace.findParentNodeGuard(
+        const parentClass = AST11__namespace.findParentNode(
           node,
           AST11__namespace.isOneOf([
             types.AST_NODE_TYPES.ClassDeclaration,
             types.AST_NODE_TYPES.ClassExpression
           ])
         );
-        if (!parentClass) return;
-        if (core.isClassComponent(parentClass) && context.sourceCode.getScope(node).block !== AST11__namespace.findParentNodeGuard(node, isConstructorFunction)) {
+        if (parentClass == null) return;
+        if (core.isClassComponent(parentClass) && context.sourceCode.getScope(node).block !== AST11__namespace.findParentNode(node, isConstructorFunction)) {
           context.report({
             messageId: "noDirectMutationState",
             node
@@ -1280,10 +1274,11 @@ var no_duplicate_key_default = createRule({
             break;
           }
           default: {
-            const call = AST11__namespace.findParentNodeGuard(jsxElement, AST11__namespace.isMapCallLoose);
-            const iter = call && AST11__namespace.findParentNodeStop(jsxElement, call, AST11__namespace.isFunction);
+            const call = AST11__namespace.findParentNode(jsxElement, AST11__namespace.isMapCallLoose);
+            const iter = AST11__namespace.findParentNode(jsxElement, (n) => n === call || AST11__namespace.isFunction(n));
+            if (!AST11__namespace.isFunction(iter)) return;
             const arg0 = call?.arguments[0];
-            if (!call || !iter || !arg0) return;
+            if (call == null || arg0 == null) return;
             if (AST11__namespace.unwrapTypeExpression(arg0) !== iter) {
               return;
             }
@@ -1443,11 +1438,11 @@ var no_implicit_key_default = createRule({
     return {
       JSXOpeningElement(node) {
         const initialScope = context.sourceCode.getScope(node);
-        const keyPropFound = JSX7__namespace.findPropInAttributes("key", initialScope, node.attributes);
+        const keyPropFound = JSX7__namespace.getAttributeNode("key", initialScope, node.attributes);
         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"
         );
-        if (keyPropFound && !keyPropOnElement) {
+        if (keyPropFound != null && !keyPropOnElement) {
           context.report({ messageId: "noImplicitKey", node: keyPropFound });
         }
       }
@@ -1544,7 +1539,7 @@ function isInitExpression(node) {
 }
 function getVariableInitExpression(variable, at) {
   const def = variable?.defs[at];
-  if (def?.node === eff._ || !("init" in def.node)) {
+  if (def?.node == null || !("init" in def.node)) {
     return eff._;
   }
   return isInitExpression(def.node.init) ? def.node.init : eff._;
@@ -1581,7 +1576,7 @@ var no_leaked_conditional_rendering_default = createRule({
     ];
     const services = utils.ESLintUtils.getParserServices(context, false);
     function getReportDescriptor(node) {
-      if (node === eff._) return eff._;
+      if (node == null) return eff._;
       return tsPattern.match(node).when(AST11__namespace.isJSX, () => eff._).with({ type: types.AST_NODE_TYPES.LogicalExpression, operator: "&&" }, ({ left, right }) => {
         const isLeftUnaryNot = left.type === types.AST_NODE_TYPES.UnaryExpression && left.operator === "!";
         if (isLeftUnaryNot) {
@@ -1617,7 +1612,7 @@ var no_leaked_conditional_rendering_default = createRule({
     }
     const visitorFunction = (node) => {
       const descriptor = getReportDescriptor(node);
-      if (descriptor === eff._) return;
+      if (descriptor == null) return;
       context.report(descriptor);
     };
     return {
@@ -1648,20 +1643,30 @@ var no_missing_component_display_name_default = createRule({
     if (!context.sourceCode.text.includes("memo") && !context.sourceCode.text.includes("forwardRef")) {
       return {};
     }
-    const { ctx, listeners } = core.useComponentCollector(context);
+    const {
+      ctx,
+      listeners
+    } = core.useComponentCollector(
+      context,
+      core.DEFAULT_COMPONENT_HINT,
+      {
+        collectDisplayName: true,
+        collectHookCalls: false
+      }
+    );
     return {
       ...listeners,
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node);
         for (const { node: node2, displayName, flag } of components.values()) {
           const isMemoOrForwardRef = (flag & (core.ERFunctionComponentFlag.ForwardRef | core.ERFunctionComponentFlag.Memo)) > 0n;
-          if (AST11__namespace.getFunctionIdentifier(node2)) {
+          if (AST11__namespace.getFunctionIdentifier(node2) != null) {
             continue;
           }
           if (!isMemoOrForwardRef) {
             continue;
           }
-          if (!displayName) {
+          if (displayName == null) {
             context.report({
               messageId: "noMissingComponentDisplayName",
               node: node2
@@ -1697,7 +1702,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.hasProp("key", initialScope, node.openingElement.attributes)) {
+          if (!JSX7__namespace.hasAttribute("key", initialScope, node.openingElement.attributes)) {
             return {
               messageId: "noMissingKey",
               node
@@ -1758,7 +1763,7 @@ var no_missing_key_default = createRule({
         }
         const initialScope = context.sourceCode.getScope(node);
         for (const element of elements) {
-          if (!JSX7__namespace.hasProp("key", initialScope, element.openingElement.attributes)) {
+          if (!JSX7__namespace.hasAttribute("key", initialScope, element.openingElement.attributes)) {
             context.report({
               messageId: "noMissingKey",
               node: element
@@ -1860,7 +1865,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.findParentProp(node, (n) => n.value?.type === types.AST_NODE_TYPES.JSXExpressionContainer);
+          const isInsideJSXPropValue = component.parent.type === types.AST_NODE_TYPES.JSXAttribute || JSX7__namespace.findParentAttributeNode(node, (n) => n.value?.type === types.AST_NODE_TYPES.JSXExpressionContainer) != null;
           if (isInsideJSXPropValue) {
             if (!core.isDeclaredInRenderPropLoose(component)) {
               context.report({
@@ -1883,8 +1888,8 @@ var no_nested_components_default = createRule({
             });
             continue;
           }
-          const parentComponent = AST11__namespace.findParentNodeGuard(component, isFunctionComponent);
-          const isParnetComponentNotDirectValueOfRenderProperty = !!parentComponent && !core.isDirectValueOfRenderPropertyLoose(parentComponent);
+          const parentComponent = AST11__namespace.findParentNode(component, isFunctionComponent);
+          const isParnetComponentNotDirectValueOfRenderProperty = parentComponent != null && !core.isDirectValueOfRenderPropertyLoose(parentComponent);
           if (isParnetComponentNotDirectValueOfRenderProperty) {
             context.report({
               messageId: isInsideProperty ? "nestedComponentInProps" : "nestedComponent",
@@ -1906,7 +1911,7 @@ var no_nested_components_default = createRule({
           }
         }
         for (const { name: name2 = "unknown", node: component } of classComponents) {
-          if (!AST11__namespace.findParentNode(component, (n) => isClassComponent11(n) || isFunctionComponent(n))) {
+          if (AST11__namespace.findParentNode(component, (n) => isClassComponent11(n) || isFunctionComponent(n)) == null) {
             continue;
           }
           context.report({
@@ -1959,8 +1964,8 @@ var no_prop_types_default = createRule({
           return;
         }
         const variable = VAR__namespace.findVariable(object.name, context.sourceCode.getScope(node));
-        const variableNode = variable && VAR__namespace.getVariableNode(variable, 0);
-        if (variableNode && (AST11__namespace.isFunction(variableNode) || core.isClassComponent(variableNode))) {
+        const variableNode = VAR__namespace.getVariableNode(variable, 0);
+        if (variableNode != null && (AST11__namespace.isFunction(variableNode) || core.isClassComponent(variableNode))) {
           context.report({ messageId: "noPropTypes", node: property });
         }
       },
@@ -2057,11 +2062,12 @@ var no_set_state_in_component_did_mount_default = createRule({
         if (!core.isThisSetState(node)) {
           return;
         }
-        const clazz = AST11__namespace.findParentNodeGuard(node, core.isClassComponent);
-        const method = clazz && AST11__namespace.findParentNodeStop(node, clazz, isComponentDidMount);
-        const methodScope = method && context.sourceCode.getScope(method);
+        const clazz = AST11__namespace.findParentNode(node, core.isClassComponent);
+        const method = AST11__namespace.findParentNode(node, (n) => n === clazz || isComponentDidMount(n));
+        if (clazz == null || method == null || method === clazz) return;
+        const methodScope = context.sourceCode.getScope(method);
         const upperScope = context.sourceCode.getScope(node).upper;
-        if (clazz && method && method.parent === clazz.body && upperScope === methodScope) {
+        if (method.parent === clazz.body && upperScope === methodScope) {
           context.report({
             messageId: "noSetStateInComponentDidMount",
             node
@@ -2101,11 +2107,12 @@ var no_set_state_in_component_did_update_default = createRule({
         if (!core.isThisSetState(node)) {
           return;
         }
-        const clazz = AST11__namespace.findParentNodeGuard(node, core.isClassComponent);
-        const method = clazz && AST11__namespace.findParentNodeStop(node, clazz, isComponentDidUpdate);
-        const methodScope = method && context.sourceCode.getScope(method);
+        const clazz = AST11__namespace.findParentNode(node, core.isClassComponent);
+        const method = AST11__namespace.findParentNode(node, (n) => n === clazz || isComponentDidUpdate(n));
+        if (clazz == null || method == null || method === clazz) return;
+        const methodScope = context.sourceCode.getScope(method);
         const upperScope = context.sourceCode.getScope(node).upper;
-        if (clazz && method && method.parent === clazz.body && upperScope === methodScope) {
+        if (method.parent === clazz.body && upperScope === methodScope) {
           context.report({
             messageId: "noSetStateInComponentDidUpdate",
             node
@@ -2145,11 +2152,12 @@ var no_set_state_in_component_will_update_default = createRule({
         if (!core.isThisSetState(node)) {
           return;
         }
-        const clazz = AST11__namespace.findParentNodeGuard(node, core.isClassComponent);
-        const method = clazz && AST11__namespace.findParentNodeStop(node, clazz, isComponentWillUpdate3);
-        const methodScope = method && context.sourceCode.getScope(method);
+        const clazz = AST11__namespace.findParentNode(node, core.isClassComponent);
+        const method = AST11__namespace.findParentNode(node, (n) => n === clazz || isComponentWillUpdate3(n));
+        if (clazz == null || method == null || method === clazz) return;
+        const methodScope = context.sourceCode.getScope(method);
         const upperScope = context.sourceCode.getScope(node).upper;
-        if (clazz && method && method.parent === clazz.body && upperScope === methodScope) {
+        if (method.parent === clazz.body && upperScope === methodScope) {
           context.report({
             messageId: "noSetStateInComponentWillUpdate",
             node
@@ -2374,22 +2382,21 @@ var no_unstable_context_value_default = createRule({
           return;
         }
         const functionEntry = ctx.getCurrentEntry();
-        if (functionEntry === eff._) return;
+        if (functionEntry == null) return;
         const attribute = node.attributes.find(
           (attribute2) => attribute2.type === types.AST_NODE_TYPES.JSXAttribute && attribute2.name.name === "value"
         );
-        if (attribute === eff._ || !("value" in attribute)) return;
+        if (attribute == null || !("value" in attribute)) return;
         const value = attribute.value;
         if (value?.type !== types.AST_NODE_TYPES.JSXExpressionContainer) return;
         const valueExpression = value.expression;
         const initialScope = context.sourceCode.getScope(valueExpression);
         const construction = VAR__namespace.getValueConstruction(valueExpression, initialScope);
-        if (construction === eff._) return;
+        if (construction == null) return;
         if (core.isReactHookCall(construction.node)) {
           return;
         }
-        const prevs = constructions.get(functionEntry.node) ?? [];
-        constructions.set(functionEntry.node, [...prevs, construction]);
+        eff.getOrUpdate(constructions, functionEntry.node, () => []).push(construction);
       },
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node).values();
@@ -2456,7 +2463,7 @@ var no_unstable_default_props_default = createRule({
               initialScope,
               VAR__namespace.ValueConstructionHint.StrictCallExpression
             );
-            if (construction === eff._) {
+            if (construction == null) {
               continue;
             }
             if (core.isReactHookCall(construction.node)) {
@@ -2475,7 +2482,7 @@ var no_unstable_default_props_default = createRule({
       },
       "VariableDeclarator[id.type='ObjectPattern'][init.type='Identifier']"(node) {
         const functionEntry = ctx.getCurrentEntry();
-        if (!functionEntry) return;
+        if (functionEntry == null) return;
         const prevs = declarators.get(functionEntry.node) ?? [];
         declarators.set(functionEntry.node, [...prevs, node]);
       }
@@ -2667,15 +2674,6 @@ function isAssignmentToThisState2(node) {
   const { left } = node;
   return left.type === types.AST_NODE_TYPES.MemberExpression && AST11__namespace.isThisExpression(left.object) && getName4(left.property) === "state";
 }
-var isGetDerivedStateFromProps = tsPattern.isMatching({
-  key: {
-    name: "getDerivedStateFromProps"
-  },
-  static: true,
-  value: {
-    params: tsPattern.P.array()
-  }
-});
 var no_unused_state_default = createRule({
   meta: {
     type: "problem",
@@ -2703,8 +2701,8 @@ var no_unused_state_default = createRule({
         return;
       }
       const className = AST11__namespace.getClassIdentifier(currentClass)?.name;
-      const { node: defNode, isUsed } = stateDefs.get(currentClass) ?? {};
-      if (!defNode || isUsed) {
+      const { node: defNode, isUsed = false } = stateDefs.get(currentClass) ?? {};
+      if (defNode == null || isUsed) {
         return;
       }
       context.report({
@@ -2722,7 +2720,7 @@ var no_unused_state_default = createRule({
         return;
       }
       if (node.static) {
-        if (isGetDerivedStateFromProps(node) && node.value.params.length > 1) {
+        if (core.isGetDerivedStateFromProps(node) && tsPattern.isMatching({ params: [tsPattern.P.nonNullable, ...tsPattern.P.array()] })(node.value)) {
           const defNode = stateDefs.get(currentClass)?.node;
           stateDefs.set(currentClass, { node: defNode, isUsed: true });
         }
@@ -2947,7 +2945,7 @@ var prefer_destructuring_assignment_default = createRule({
             return false;
           }
           const id = AST11__namespace.getFunctionIdentifier(block);
-          return !!id && core.isComponentName(id.name) && components.some((component) => component.node === block);
+          return id != null && core.isComponentName(id.name) && components.some((component) => component.node === block);
         }
         for (const [initialScope, memberExpression] of memberExpressionWithNames) {
           let scope = initialScope;
@@ -3115,7 +3113,7 @@ var prefer_shorthand_boolean_default = createRule({
     return {
       JSXAttribute(node) {
         const { value } = node;
-        const propName = JSX7__namespace.getPropName(node);
+        const propName = JSX7__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;

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import * as JSX7 from '@eslint-react/jsx';
 import { createRuleForPlugin, getSettingsFromContext, unsafeDecodeSettings } from '@eslint-react/shared';
 import * as AST11 from '@eslint-react/ast';
-import { isForwardRefCall, isThisSetState, isClassComponent, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isCloneElementCall, isCreateRefCall, isComponentName, useComponentCollector, ERFunctionComponentFlag, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, ERClassComponentFlag, isReactHookCall, isCreateElementCall, isInitializedFromReact } from '@eslint-react/core';
-import { _ } from '@eslint-react/eff';
+import { isForwardRefCall, isThisSetState, isClassComponent, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isComponentDidCatch, isGetDerivedStateFromError, isCloneElementCall, isCreateRefCall, isComponentName, useComponentCollector, DEFAULT_COMPONENT_HINT, ERFunctionComponentFlag, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, ERClassComponentFlag, isReactHookCall, isCreateElementCall, isGetDerivedStateFromProps, isInitializedFromReact } from '@eslint-react/core';
+import { _, getOrUpdate } from '@eslint-react/eff';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { isMatching, match, P } from 'ts-pattern';
 import { compare } from 'compare-versions';
@@ -15,7 +15,7 @@ import { getTypeImmutability, isUnknown, isImmutable, isReadonlyShallow, isReado
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.24.0-next.0";
+var version = "1.24.0-next.11";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -45,7 +45,7 @@ var avoid_shorthand_boolean_default = createRule({
             messageId: "avoidShorthandBoolean",
             node,
             data: {
-              propName: JSX7.getPropName(node)
+              propName: JSX7.getAttributeName(node)
             },
             fix: (fixer) => fixer.insertTextAfter(node.name, `={true}`)
           });
@@ -194,15 +194,15 @@ var no_access_state_in_setstate_default = createRule({
         if (!AST11.isThisExpression(node.object)) {
           return;
         }
-        const [currClass, isComponent] = classEntries.at(-1) ?? [];
+        const [currClass, isComponent = false] = classEntries.at(-1) ?? [];
         if (currClass == null || !isComponent) {
           return;
         }
-        const [currMethod, isStatic] = methodEntries.at(-1) ?? [];
+        const [currMethod, isStatic = false] = methodEntries.at(-1) ?? [];
         if (currMethod == null || isStatic) {
           return;
         }
-        const [setState, hasThisState] = setStateEntries.at(-1) ?? [];
+        const [setState, hasThisState = false] = setStateEntries.at(-1) ?? [];
         if (setState == null || hasThisState) {
           return;
         }
@@ -224,15 +224,15 @@ var no_access_state_in_setstate_default = createRule({
         methodEntries.pop();
       },
       VariableDeclarator(node) {
-        const [currClass, isComponent] = classEntries.at(-1) ?? [];
+        const [currClass, isComponent = false] = classEntries.at(-1) ?? [];
         if (currClass == null || !isComponent) {
           return;
         }
-        const [currMethod, isStatic] = methodEntries.at(-1) ?? [];
+        const [currMethod, isStatic = false] = methodEntries.at(-1) ?? [];
         if (currMethod == null || isStatic) {
           return;
         }
-        const [setState, hasThisState] = setStateEntries.at(-1) ?? [];
+        const [setState, hasThisState = false] = setStateEntries.at(-1) ?? [];
         if (setState == null || hasThisState) {
           return;
         }
@@ -583,15 +583,15 @@ var no_children_prop_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const prop = JSX7.getProp(
+        const attribute = JSX7.getAttributeNode(
           "children",
           context.sourceCode.getScope(node),
           node.openingElement.attributes
         );
-        if (prop) {
+        if (attribute != null) {
           context.report({
             messageId: "noChildrenProp",
-            node: prop
+            node: attribute
           });
         }
       }
@@ -634,12 +634,6 @@ var RULE_NAME12 = "no-class-component";
 var RULE_FEATURES12 = [
   "CHK"
 ];
-function isComponentDidCatch(node) {
-  return (node.type === AST_NODE_TYPES.MethodDefinition || node.type === AST_NODE_TYPES.PropertyDefinition) && !node.static && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidCatch";
-}
-function isGetDerivedStateFromError(node) {
-  return (node.type === AST_NODE_TYPES.MethodDefinition || node.type === AST_NODE_TYPES.PropertyDefinition) && node.static && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "getDerivedStateFromError";
-}
 var no_class_component_default = createRule({
   meta: {
     type: "problem",
@@ -1036,7 +1030,7 @@ var no_create_ref_default = createRule({
   create(context) {
     return {
       CallExpression(node) {
-        if (isCreateRefCall(node, context) && !AST11.findParentNode(node, isClassComponent)) {
+        if (isCreateRefCall(node, context) && AST11.findParentNode(node, isClassComponent) == null) {
           context.report({ messageId: "noCreateRef", node });
         }
       }
@@ -1082,7 +1076,7 @@ var no_default_props_default = createRule({
         }
         const variable = VAR.findVariable(object.name, context.sourceCode.getScope(node));
         const variableNode = VAR.getVariableNode(variable, 0);
-        if (variableNode === _) return;
+        if (variableNode == null) return;
         if (!AST11.isFunction(variableNode) && !isClassComponent(variableNode)) return;
         context.report({ messageId: "noDefaultProps", node: property });
       },
@@ -1144,15 +1138,15 @@ var no_direct_mutation_state_default = createRule({
         if (!isAssignmentToThisState(node)) {
           return;
         }
-        const parentClass = AST11.findParentNodeGuard(
+        const parentClass = AST11.findParentNode(
           node,
           AST11.isOneOf([
             AST_NODE_TYPES.ClassDeclaration,
             AST_NODE_TYPES.ClassExpression
           ])
         );
-        if (!parentClass) return;
-        if (isClassComponent(parentClass) && context.sourceCode.getScope(node).block !== AST11.findParentNodeGuard(node, isConstructorFunction)) {
+        if (parentClass == null) return;
+        if (isClassComponent(parentClass) && context.sourceCode.getScope(node).block !== AST11.findParentNode(node, isConstructorFunction)) {
           context.report({
             messageId: "noDirectMutationState",
             node
@@ -1253,10 +1247,11 @@ var no_duplicate_key_default = createRule({
             break;
           }
           default: {
-            const call = AST11.findParentNodeGuard(jsxElement, AST11.isMapCallLoose);
-            const iter = call && AST11.findParentNodeStop(jsxElement, call, AST11.isFunction);
+            const call = AST11.findParentNode(jsxElement, AST11.isMapCallLoose);
+            const iter = AST11.findParentNode(jsxElement, (n) => n === call || AST11.isFunction(n));
+            if (!AST11.isFunction(iter)) return;
             const arg0 = call?.arguments[0];
-            if (!call || !iter || !arg0) return;
+            if (call == null || arg0 == null) return;
             if (AST11.unwrapTypeExpression(arg0) !== iter) {
               return;
             }
@@ -1416,11 +1411,11 @@ var no_implicit_key_default = createRule({
     return {
       JSXOpeningElement(node) {
         const initialScope = context.sourceCode.getScope(node);
-        const keyPropFound = JSX7.findPropInAttributes("key", initialScope, node.attributes);
+        const keyPropFound = JSX7.getAttributeNode("key", initialScope, node.attributes);
         const keyPropOnElement = node.attributes.some(
           (n) => n.type === AST_NODE_TYPES.JSXAttribute && n.name.type === AST_NODE_TYPES.JSXIdentifier && n.name.name === "key"
         );
-        if (keyPropFound && !keyPropOnElement) {
+        if (keyPropFound != null && !keyPropOnElement) {
           context.report({ messageId: "noImplicitKey", node: keyPropFound });
         }
       }
@@ -1517,7 +1512,7 @@ function isInitExpression(node) {
 }
 function getVariableInitExpression(variable, at) {
   const def = variable?.defs[at];
-  if (def?.node === _ || !("init" in def.node)) {
+  if (def?.node == null || !("init" in def.node)) {
     return _;
   }
   return isInitExpression(def.node.init) ? def.node.init : _;
@@ -1554,7 +1549,7 @@ var no_leaked_conditional_rendering_default = createRule({
     ];
     const services = ESLintUtils.getParserServices(context, false);
     function getReportDescriptor(node) {
-      if (node === _) return _;
+      if (node == null) return _;
       return match(node).when(AST11.isJSX, () => _).with({ type: AST_NODE_TYPES.LogicalExpression, operator: "&&" }, ({ left, right }) => {
         const isLeftUnaryNot = left.type === AST_NODE_TYPES.UnaryExpression && left.operator === "!";
         if (isLeftUnaryNot) {
@@ -1590,7 +1585,7 @@ var no_leaked_conditional_rendering_default = createRule({
     }
     const visitorFunction = (node) => {
       const descriptor = getReportDescriptor(node);
-      if (descriptor === _) return;
+      if (descriptor == null) return;
       context.report(descriptor);
     };
     return {
@@ -1621,20 +1616,30 @@ var no_missing_component_display_name_default = createRule({
     if (!context.sourceCode.text.includes("memo") && !context.sourceCode.text.includes("forwardRef")) {
       return {};
     }
-    const { ctx, listeners } = useComponentCollector(context);
+    const {
+      ctx,
+      listeners
+    } = useComponentCollector(
+      context,
+      DEFAULT_COMPONENT_HINT,
+      {
+        collectDisplayName: true,
+        collectHookCalls: false
+      }
+    );
     return {
       ...listeners,
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node);
         for (const { node: node2, displayName, flag } of components.values()) {
           const isMemoOrForwardRef = (flag & (ERFunctionComponentFlag.ForwardRef | ERFunctionComponentFlag.Memo)) > 0n;
-          if (AST11.getFunctionIdentifier(node2)) {
+          if (AST11.getFunctionIdentifier(node2) != null) {
             continue;
           }
           if (!isMemoOrForwardRef) {
             continue;
           }
-          if (!displayName) {
+          if (displayName == null) {
             context.report({
               messageId: "noMissingComponentDisplayName",
               node: node2
@@ -1670,7 +1675,7 @@ var no_missing_key_default = createRule({
       switch (node.type) {
         case AST_NODE_TYPES.JSXElement: {
           const initialScope = context.sourceCode.getScope(node);
-          if (!JSX7.hasProp("key", initialScope, node.openingElement.attributes)) {
+          if (!JSX7.hasAttribute("key", initialScope, node.openingElement.attributes)) {
             return {
               messageId: "noMissingKey",
               node
@@ -1731,7 +1736,7 @@ var no_missing_key_default = createRule({
         }
         const initialScope = context.sourceCode.getScope(node);
         for (const element of elements) {
-          if (!JSX7.hasProp("key", initialScope, element.openingElement.attributes)) {
+          if (!JSX7.hasAttribute("key", initialScope, element.openingElement.attributes)) {
             context.report({
               messageId: "noMissingKey",
               node: element
@@ -1833,7 +1838,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.findParentProp(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer);
+          const isInsideJSXPropValue = component.parent.type === AST_NODE_TYPES.JSXAttribute || JSX7.findParentAttributeNode(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer) != null;
           if (isInsideJSXPropValue) {
             if (!isDeclaredInRenderPropLoose(component)) {
               context.report({
@@ -1856,8 +1861,8 @@ var no_nested_components_default = createRule({
             });
             continue;
           }
-          const parentComponent = AST11.findParentNodeGuard(component, isFunctionComponent);
-          const isParnetComponentNotDirectValueOfRenderProperty = !!parentComponent && !isDirectValueOfRenderPropertyLoose(parentComponent);
+          const parentComponent = AST11.findParentNode(component, isFunctionComponent);
+          const isParnetComponentNotDirectValueOfRenderProperty = parentComponent != null && !isDirectValueOfRenderPropertyLoose(parentComponent);
           if (isParnetComponentNotDirectValueOfRenderProperty) {
             context.report({
               messageId: isInsideProperty ? "nestedComponentInProps" : "nestedComponent",
@@ -1879,7 +1884,7 @@ var no_nested_components_default = createRule({
           }
         }
         for (const { name: name2 = "unknown", node: component } of classComponents) {
-          if (!AST11.findParentNode(component, (n) => isClassComponent11(n) || isFunctionComponent(n))) {
+          if (AST11.findParentNode(component, (n) => isClassComponent11(n) || isFunctionComponent(n)) == null) {
             continue;
           }
           context.report({
@@ -1932,8 +1937,8 @@ var no_prop_types_default = createRule({
           return;
         }
         const variable = VAR.findVariable(object.name, context.sourceCode.getScope(node));
-        const variableNode = variable && VAR.getVariableNode(variable, 0);
-        if (variableNode && (AST11.isFunction(variableNode) || isClassComponent(variableNode))) {
+        const variableNode = VAR.getVariableNode(variable, 0);
+        if (variableNode != null && (AST11.isFunction(variableNode) || isClassComponent(variableNode))) {
           context.report({ messageId: "noPropTypes", node: property });
         }
       },
@@ -2030,11 +2035,12 @@ var no_set_state_in_component_did_mount_default = createRule({
         if (!isThisSetState(node)) {
           return;
         }
-        const clazz = AST11.findParentNodeGuard(node, isClassComponent);
-        const method = clazz && AST11.findParentNodeStop(node, clazz, isComponentDidMount);
-        const methodScope = method && context.sourceCode.getScope(method);
+        const clazz = AST11.findParentNode(node, isClassComponent);
+        const method = AST11.findParentNode(node, (n) => n === clazz || isComponentDidMount(n));
+        if (clazz == null || method == null || method === clazz) return;
+        const methodScope = context.sourceCode.getScope(method);
         const upperScope = context.sourceCode.getScope(node).upper;
-        if (clazz && method && method.parent === clazz.body && upperScope === methodScope) {
+        if (method.parent === clazz.body && upperScope === methodScope) {
           context.report({
             messageId: "noSetStateInComponentDidMount",
             node
@@ -2074,11 +2080,12 @@ var no_set_state_in_component_did_update_default = createRule({
         if (!isThisSetState(node)) {
           return;
         }
-        const clazz = AST11.findParentNodeGuard(node, isClassComponent);
-        const method = clazz && AST11.findParentNodeStop(node, clazz, isComponentDidUpdate);
-        const methodScope = method && context.sourceCode.getScope(method);
+        const clazz = AST11.findParentNode(node, isClassComponent);
+        const method = AST11.findParentNode(node, (n) => n === clazz || isComponentDidUpdate(n));
+        if (clazz == null || method == null || method === clazz) return;
+        const methodScope = context.sourceCode.getScope(method);
         const upperScope = context.sourceCode.getScope(node).upper;
-        if (clazz && method && method.parent === clazz.body && upperScope === methodScope) {
+        if (method.parent === clazz.body && upperScope === methodScope) {
           context.report({
             messageId: "noSetStateInComponentDidUpdate",
             node
@@ -2118,11 +2125,12 @@ var no_set_state_in_component_will_update_default = createRule({
         if (!isThisSetState(node)) {
           return;
         }
-        const clazz = AST11.findParentNodeGuard(node, isClassComponent);
-        const method = clazz && AST11.findParentNodeStop(node, clazz, isComponentWillUpdate3);
-        const methodScope = method && context.sourceCode.getScope(method);
+        const clazz = AST11.findParentNode(node, isClassComponent);
+        const method = AST11.findParentNode(node, (n) => n === clazz || isComponentWillUpdate3(n));
+        if (clazz == null || method == null || method === clazz) return;
+        const methodScope = context.sourceCode.getScope(method);
         const upperScope = context.sourceCode.getScope(node).upper;
-        if (clazz && method && method.parent === clazz.body && upperScope === methodScope) {
+        if (method.parent === clazz.body && upperScope === methodScope) {
           context.report({
             messageId: "noSetStateInComponentWillUpdate",
             node
@@ -2347,22 +2355,21 @@ var no_unstable_context_value_default = createRule({
           return;
         }
         const functionEntry = ctx.getCurrentEntry();
-        if (functionEntry === _) return;
+        if (functionEntry == null) return;
         const attribute = node.attributes.find(
           (attribute2) => attribute2.type === AST_NODE_TYPES.JSXAttribute && attribute2.name.name === "value"
         );
-        if (attribute === _ || !("value" in attribute)) return;
+        if (attribute == null || !("value" in attribute)) return;
         const value = attribute.value;
         if (value?.type !== AST_NODE_TYPES.JSXExpressionContainer) return;
         const valueExpression = value.expression;
         const initialScope = context.sourceCode.getScope(valueExpression);
         const construction = VAR.getValueConstruction(valueExpression, initialScope);
-        if (construction === _) return;
+        if (construction == null) return;
         if (isReactHookCall(construction.node)) {
           return;
         }
-        const prevs = constructions.get(functionEntry.node) ?? [];
-        constructions.set(functionEntry.node, [...prevs, construction]);
+        getOrUpdate(constructions, functionEntry.node, () => []).push(construction);
       },
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node).values();
@@ -2429,7 +2436,7 @@ var no_unstable_default_props_default = createRule({
               initialScope,
               VAR.ValueConstructionHint.StrictCallExpression
             );
-            if (construction === _) {
+            if (construction == null) {
               continue;
             }
             if (isReactHookCall(construction.node)) {
@@ -2448,7 +2455,7 @@ var no_unstable_default_props_default = createRule({
       },
       "VariableDeclarator[id.type='ObjectPattern'][init.type='Identifier']"(node) {
         const functionEntry = ctx.getCurrentEntry();
-        if (!functionEntry) return;
+        if (functionEntry == null) return;
         const prevs = declarators.get(functionEntry.node) ?? [];
         declarators.set(functionEntry.node, [...prevs, node]);
       }
@@ -2640,15 +2647,6 @@ function isAssignmentToThisState2(node) {
   const { left } = node;
   return left.type === AST_NODE_TYPES.MemberExpression && AST11.isThisExpression(left.object) && getName4(left.property) === "state";
 }
-var isGetDerivedStateFromProps = isMatching({
-  key: {
-    name: "getDerivedStateFromProps"
-  },
-  static: true,
-  value: {
-    params: P.array()
-  }
-});
 var no_unused_state_default = createRule({
   meta: {
     type: "problem",
@@ -2676,8 +2674,8 @@ var no_unused_state_default = createRule({
         return;
       }
       const className = AST11.getClassIdentifier(currentClass)?.name;
-      const { node: defNode, isUsed } = stateDefs.get(currentClass) ?? {};
-      if (!defNode || isUsed) {
+      const { node: defNode, isUsed = false } = stateDefs.get(currentClass) ?? {};
+      if (defNode == null || isUsed) {
         return;
       }
       context.report({
@@ -2695,7 +2693,7 @@ var no_unused_state_default = createRule({
         return;
       }
       if (node.static) {
-        if (isGetDerivedStateFromProps(node) && node.value.params.length > 1) {
+        if (isGetDerivedStateFromProps(node) && isMatching({ params: [P.nonNullable, ...P.array()] })(node.value)) {
           const defNode = stateDefs.get(currentClass)?.node;
           stateDefs.set(currentClass, { node: defNode, isUsed: true });
         }
@@ -2920,7 +2918,7 @@ var prefer_destructuring_assignment_default = createRule({
             return false;
           }
           const id = AST11.getFunctionIdentifier(block);
-          return !!id && isComponentName(id.name) && components.some((component) => component.node === block);
+          return id != null && isComponentName(id.name) && components.some((component) => component.node === block);
         }
         for (const [initialScope, memberExpression] of memberExpressionWithNames) {
           let scope = initialScope;
@@ -3088,7 +3086,7 @@ var prefer_shorthand_boolean_default = createRule({
     return {
       JSXAttribute(node) {
         const { value } = node;
-        const propName = JSX7.getPropName(node);
+        const propName = JSX7.getAttributeName(node);
         const hasValueTrue = value?.type === AST_NODE_TYPES.JSXExpressionContainer && value.expression.type === AST_NODE_TYPES.Literal && value.expression.value === true;
         if (!hasValueTrue) {
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.24.0-next.0",
+  "version": "1.24.0-next.11",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -40,25 +40,24 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.19.1",
-    "@typescript-eslint/type-utils": "^8.19.1",
-    "@typescript-eslint/types": "^8.19.1",
-    "@typescript-eslint/utils": "^8.19.1",
+    "@typescript-eslint/scope-manager": "^8.20.0",
+    "@typescript-eslint/type-utils": "^8.20.0",
+    "@typescript-eslint/types": "^8.20.0",
+    "@typescript-eslint/utils": "^8.20.0",
     "compare-versions": "^6.1.1",
     "is-immutable-type": "^5.0.1",
     "string-ts": "^2.2.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.24.0-next.0",
-    "@eslint-react/core": "1.24.0-next.0",
-    "@eslint-react/eff": "1.24.0-next.0",
-    "@eslint-react/shared": "1.24.0-next.0",
-    "@eslint-react/jsx": "1.24.0-next.0",
-    "@eslint-react/types": "1.24.0-next.0",
-    "@eslint-react/var": "1.24.0-next.0"
+    "@eslint-react/ast": "1.24.0-next.11",
+    "@eslint-react/eff": "1.24.0-next.11",
+    "@eslint-react/jsx": "1.24.0-next.11",
+    "@eslint-react/core": "1.24.0-next.11",
+    "@eslint-react/shared": "1.24.0-next.11",
+    "@eslint-react/var": "1.24.0-next.11"
   },
   "devDependencies": {
-    "@types/react": "^19.0.4",
-    "@types/react-dom": "^19.0.2",
+    "@types/react": "^19.0.7",
+    "@types/react-dom": "^19.0.3",
     "ts-api-utils": "^2.0.0",
     "tsup": "^8.3.5",
     "@workspace/configs": "0.0.0"