@eslint-react/core 1.24.0-beta.0 → 1.24.0-beta.3

package/dist/index.d.mts

@@ -11,8 +11,8 @@ import { Scope } from '@typescript-eslint/scope-manager';
 import { SyntaxKind } from 'typescript';
 
 interface ERSemanticNode {
-    _: string;
     id: _ | TSESTree.Identifier | TSESTree.Identifier[];
+    key: string;
     kind: string;
     name: _ | string;
     node: TSESTree.Node;
@@ -79,7 +79,11 @@ interface ERClassComponent extends ERSemanticNode {
 }
 type ERComponent = ERClassComponent | ERFunctionComponent;
 
-declare function useComponentCollector(context: RuleContext, hint?: bigint): {
+interface ComponentCollectorOptions {
+    collectDisplayName?: boolean;
+    collectHookCalls?: boolean;
+}
+declare function useComponentCollector(context: RuleContext, hint?: bigint, options?: ComponentCollectorOptions): {
     readonly ctx: {
         readonly getAllComponents: (node: TSESTree.Program) => Map<string, ERFunctionComponent>;
         readonly getCurrentEntries: () => {
@@ -96,6 +100,11 @@ declare function useComponentCollector(context: RuleContext, hint?: bigint): {
         } | undefined;
     };
     readonly listeners: {
+        readonly "ReturnStatement[type]": (node: TSESTree.ReturnStatement) => void;
+        readonly "CallExpression[type]:exit"?: (node: TSESTree.CallExpression) => void;
+        readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']"?: (node: TSESTree.AssignmentExpression & {
+            left: TSESTree.MemberExpression;
+        }) => void;
         readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
         readonly ":function[type]:exit": () => {
             key: string;
@@ -104,11 +113,6 @@ declare function useComponentCollector(context: RuleContext, hint?: bigint): {
             isComponent: boolean;
         } | undefined;
         readonly "ArrowFunctionExpression[type][body.type!='BlockStatement']": () => void;
-        readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']": (node: TSESTree.AssignmentExpression & {
-            left: TSESTree.MemberExpression;
-        }) => void;
-        readonly "CallExpression[type]:exit": (node: TSESTree.CallExpression) => void;
-        readonly "ReturnStatement[type]": (node: TSESTree.ReturnStatement) => void;
     };
 };
 
@@ -130,7 +134,7 @@ type EREffectMethodKind = "useEffect" | "useInsertionEffect" | "useLayoutEffect"
 type ERLifecycleMethodKind = "componentDidMount" | "componentWillUnmount";
 
 declare const RE_COMPONENT_NAME: RegExp;
-declare function getComponentNameFromIdentifier(node: TSESTree.Identifier | TSESTree.Identifier[]): string;
+declare function getComponentNameFromIdentifier(node: TSESTree.Identifier | TSESTree.Identifier[] | _): string | undefined;
 declare function isComponentName(name: string): boolean;
 
 declare function isRenderMethodLike(node: TSESTree$1.Node): node is TSESTree$1.MethodDefinition | TSESTree$1.PropertyDefinition;
@@ -2575,4 +2579,4 @@ declare const isMemoCall: {
     (node: Node, context: _eslint_react_types.RuleContext): node is CallExpression;
 };
 
-export { DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementNameAndRepresentName, getFunctionComponentIdentifier, getId, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCleanupFunction, isCloneElement, isCloneElementCall, isComponentDidMount, isComponentDidMountFunction, isComponentName, isComponentWillUnmount, isComponentWillUnmountFunction, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isSetupFunction, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+export { type ComponentCollectorOptions, DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementNameAndRepresentName, getFunctionComponentIdentifier, getId, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCleanupFunction, isCloneElement, isCloneElementCall, isComponentDidMount, isComponentDidMountFunction, isComponentName, isComponentWillUnmount, isComponentWillUnmountFunction, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isSetupFunction, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/dist/index.d.ts

@@ -11,8 +11,8 @@ import { Scope } from '@typescript-eslint/scope-manager';
 import { SyntaxKind } from 'typescript';
 
 interface ERSemanticNode {
-    _: string;
     id: _ | TSESTree.Identifier | TSESTree.Identifier[];
+    key: string;
     kind: string;
     name: _ | string;
     node: TSESTree.Node;
@@ -79,7 +79,11 @@ interface ERClassComponent extends ERSemanticNode {
 }
 type ERComponent = ERClassComponent | ERFunctionComponent;
 
-declare function useComponentCollector(context: RuleContext, hint?: bigint): {
+interface ComponentCollectorOptions {
+    collectDisplayName?: boolean;
+    collectHookCalls?: boolean;
+}
+declare function useComponentCollector(context: RuleContext, hint?: bigint, options?: ComponentCollectorOptions): {
     readonly ctx: {
         readonly getAllComponents: (node: TSESTree.Program) => Map<string, ERFunctionComponent>;
         readonly getCurrentEntries: () => {
@@ -96,6 +100,11 @@ declare function useComponentCollector(context: RuleContext, hint?: bigint): {
         } | undefined;
     };
     readonly listeners: {
+        readonly "ReturnStatement[type]": (node: TSESTree.ReturnStatement) => void;
+        readonly "CallExpression[type]:exit"?: (node: TSESTree.CallExpression) => void;
+        readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']"?: (node: TSESTree.AssignmentExpression & {
+            left: TSESTree.MemberExpression;
+        }) => void;
         readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
         readonly ":function[type]:exit": () => {
             key: string;
@@ -104,11 +113,6 @@ declare function useComponentCollector(context: RuleContext, hint?: bigint): {
             isComponent: boolean;
         } | undefined;
         readonly "ArrowFunctionExpression[type][body.type!='BlockStatement']": () => void;
-        readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']": (node: TSESTree.AssignmentExpression & {
-            left: TSESTree.MemberExpression;
-        }) => void;
-        readonly "CallExpression[type]:exit": (node: TSESTree.CallExpression) => void;
-        readonly "ReturnStatement[type]": (node: TSESTree.ReturnStatement) => void;
     };
 };
 
@@ -130,7 +134,7 @@ type EREffectMethodKind = "useEffect" | "useInsertionEffect" | "useLayoutEffect"
 type ERLifecycleMethodKind = "componentDidMount" | "componentWillUnmount";
 
 declare const RE_COMPONENT_NAME: RegExp;
-declare function getComponentNameFromIdentifier(node: TSESTree.Identifier | TSESTree.Identifier[]): string;
+declare function getComponentNameFromIdentifier(node: TSESTree.Identifier | TSESTree.Identifier[] | _): string | undefined;
 declare function isComponentName(name: string): boolean;
 
 declare function isRenderMethodLike(node: TSESTree$1.Node): node is TSESTree$1.MethodDefinition | TSESTree$1.PropertyDefinition;
@@ -2575,4 +2579,4 @@ declare const isMemoCall: {
     (node: Node, context: _eslint_react_types.RuleContext): node is CallExpression;
 };
 
-export { DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementNameAndRepresentName, getFunctionComponentIdentifier, getId, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCleanupFunction, isCloneElement, isCloneElementCall, isComponentDidMount, isComponentDidMountFunction, isComponentName, isComponentWillUnmount, isComponentWillUnmountFunction, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isSetupFunction, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+export { type ComponentCollectorOptions, DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementNameAndRepresentName, getFunctionComponentIdentifier, getId, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCleanupFunction, isCloneElement, isCloneElementCall, isComponentDidMount, isComponentDidMountFunction, isComponentName, isComponentWillUnmount, isComponentWillUnmountFunction, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isSetupFunction, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/dist/index.js

@@ -34,7 +34,7 @@ function getElementNameAndRepresentName(node, context, polymorphicPropName, addi
   const name = JSX4__namespace.getElementName(node);
   if (name === name.toLowerCase()) return [name, name];
   const component = additionalComponents.findLast((c) => c.name === name || c.re.test(name));
-  if (component !== eff._) return [name, component.as];
+  if (component != null) return [name, component.as];
   if (polymorphicPropName == null) return [name, name];
   const initialScope = context.sourceCode.getScope(node);
   const polymorphicProp = JSX4__namespace.findPropInAttributes(
@@ -42,7 +42,7 @@ function getElementNameAndRepresentName(node, context, polymorphicPropName, addi
     initialScope,
     node.attributes
   );
-  if (polymorphicProp === eff._) return [name, name];
+  if (polymorphicProp == null) return [name, name];
   const polymorphicName = VAR__namespace.toResolved(JSX4__namespace.getPropValue(polymorphicProp, initialScope)).value;
   if (typeof polymorphicName === "string") {
     return [name, polymorphicName];
@@ -164,15 +164,15 @@ var isMemoCall = isReactAPICallWithName("memo");
 
 // src/element/hierarchy.ts
 function isInsideCreateElementProps(node, context) {
-  const call = AST8__namespace.findParentNodeGuard(node, isCreateElementCall(context));
-  if (!call) return false;
-  const prop = AST8__namespace.findParentNodeGuard(node, AST8__namespace.is(types.AST_NODE_TYPES.ObjectExpression));
-  if (!prop) return false;
+  const call = AST8__namespace.findParentNode(node, isCreateElementCall(context));
+  if (call == null) return false;
+  const prop = AST8__namespace.findParentNode(node, AST8__namespace.is(types.AST_NODE_TYPES.ObjectExpression));
+  if (prop == null) return false;
   return prop === call.arguments[1];
 }
 function isChildrenOfCreateElement(node, context) {
   const parent = node.parent;
-  if (!parent || parent.type !== types.AST_NODE_TYPES.CallExpression) return false;
+  if (parent == null || parent.type !== types.AST_NODE_TYPES.CallExpression) return false;
   if (!isCreateElementCall(parent, context)) return false;
   return parent.arguments.slice(2).some((arg) => arg === node);
 }
@@ -185,12 +185,12 @@ function isReactHookName(name) {
 
 // src/hook/is.ts
 function isReactHook(node) {
-  if (node === eff._) return eff._;
+  if (node == null) return eff._;
   const id2 = AST8__namespace.getFunctionIdentifier(node);
-  return id2?.name !== eff._ && isReactHookName(id2.name);
+  return id2?.name != null && isReactHookName(id2.name);
 }
 function isReactHookCall(node) {
-  if (node === eff._) return false;
+  if (node == null) return false;
   if (node.type !== types.AST_NODE_TYPES.CallExpression) {
     return false;
   }
@@ -203,7 +203,7 @@ function isReactHookCall(node) {
   return false;
 }
 function isReactHookCallWithName(node, context) {
-  if (node === eff._) return eff.returnFalse;
+  if (node == null) return eff.returnFalse;
   const settings = shared.unsafeDecodeSettings(context.settings);
   return (name) => {
     const initialScope = context.sourceCode.getScope(node);
@@ -218,7 +218,7 @@ function isReactHookCallWithName(node, context) {
   };
 }
 function isReactHookCallWithNameLoose(node) {
-  if (node === eff._) return eff.returnFalse;
+  if (node == null) return eff.returnFalse;
   return (name) => {
     switch (node.callee.type) {
       case types.AST_NODE_TYPES.Identifier:
@@ -245,7 +245,7 @@ function isReactHookCallWithNameAlias(name, context, alias) {
   };
 }
 function isUseEffectCallLoose(node) {
-  if (node === eff._) return false;
+  if (node == null) return false;
   if (node.type !== types.AST_NODE_TYPES.CallExpression) {
     return false;
   }
@@ -276,7 +276,7 @@ var isUseTransitionCall = eff.flip(isReactHookCallWithName)("useTransition");
 
 // src/hook/hierarchy.ts
 function isInsideReactHook(node) {
-  return isReactHook(AST8__namespace.findParentNodeGuard(node, AST8__namespace.isFunction));
+  return isReactHook(AST8__namespace.findParentNode(node, AST8__namespace.isFunction));
 }
 function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
@@ -284,12 +284,12 @@ function useHookCollector() {
   const onFunctionEnter = (node) => {
     const id2 = AST8__namespace.getFunctionIdentifier(node);
     const name = id2?.name;
-    if (name !== eff._ && isReactHookName(name)) {
+    if (name != null && isReactHookName(name)) {
       const key = getId();
       fEntries.push({ key, node });
       hooks.set(key, {
-        _: key,
         id: id2,
+        key,
         kind: "function",
         name,
         node,
@@ -321,20 +321,14 @@ function useHookCollector() {
         return;
       }
       const fEntry = fEntries.at(-1);
-      if (fEntry?.key === eff._) {
+      if (fEntry?.key == null) {
         return;
       }
       const hook = hooks.get(fEntry.key);
-      if (hook === eff._) {
+      if (hook == null) {
         return;
       }
-      hooks.set(hook._, {
-        ...hook,
-        hookCalls: [
-          ...hook.hookCalls,
-          node
-        ]
-      });
+      hook.hookCalls.push(node);
     }
   };
   return { ctx, listeners };
@@ -383,7 +377,7 @@ function isComponentWrapperCall(node, context) {
 }
 function getFunctionComponentIdentifier(node, context) {
   const functionId = AST8__namespace.getFunctionIdentifier(node);
-  if (functionId) {
+  if (functionId != null) {
     return functionId;
   }
   const { parent } = node;
@@ -395,17 +389,16 @@ function getFunctionComponentIdentifier(node, context) {
   }
   return eff._;
 }
-
-// src/component/component-name.ts
 var RE_COMPONENT_NAME = /^_?[A-Z]/u;
 function getComponentNameFromIdentifier(node) {
+  if (node == null) return eff._;
   return Array.isArray(node) ? node.map((n) => n.name).join(".") : node.name;
 }
 function isComponentName(name) {
   return RE_COMPONENT_NAME.test(name);
 }
 function isClassComponent(node) {
-  if ("superClass" in node && node.superClass) {
+  if ("superClass" in node && node.superClass != null) {
     const re = /^(?:Pure)?Component$/u;
     switch (true) {
       case node.superClass.type === types.AST_NODE_TYPES.Identifier:
@@ -417,7 +410,7 @@ function isClassComponent(node) {
   return false;
 }
 function isPureComponent(node) {
-  if ("superClass" in node && node.superClass) {
+  if ("superClass" in node && node.superClass != null) {
     const re = /^PureComponent$/u;
     switch (true) {
       case node.superClass.type === types.AST_NODE_TYPES.Identifier:
@@ -440,13 +433,13 @@ function isFunctionOfRenderMethod(node) {
   return isClassComponent(node.parent.parent.parent);
 }
 function isInsideRenderMethod(node) {
-  return !!AST8__namespace.findParentNode(node, (node2) => isRenderMethodLike(node2) && isClassComponent(node2.parent.parent));
+  return AST8__namespace.findParentNode(node, (node2) => isRenderMethodLike(node2) && isClassComponent(node2.parent.parent)) != null;
 }
 
 // src/component/misc.ts
 function hasNoneOrValidComponentName(node, context) {
   const id2 = getFunctionComponentIdentifier(node, context);
-  if (!id2) return true;
+  if (id2 == null) return true;
   const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
   return name != null && isComponentName(name);
 }
@@ -478,19 +471,21 @@ function hasValidHierarchy(node, context, hint) {
       types.AST_NODE_TYPES.ClassBody
     ])
   );
-  return !boundaryNode || boundaryNode.type !== types.AST_NODE_TYPES.JSXExpressionContainer;
+  return boundaryNode == null || boundaryNode.type !== types.AST_NODE_TYPES.JSXExpressionContainer;
 }
 function getComponentFlag(initPath) {
   let flag = ERFunctionComponentFlag.None;
-  if (initPath && AST8__namespace.hasCallInFunctionInitPath("memo")(initPath)) {
+  if (initPath != null && AST8__namespace.hasCallInFunctionInitPath("memo", initPath)) {
     flag |= ERFunctionComponentFlag.Memo;
   }
-  if (initPath && AST8__namespace.hasCallInFunctionInitPath("forwardRef")(initPath)) {
+  if (initPath != null && AST8__namespace.hasCallInFunctionInitPath("forwardRef", initPath)) {
     flag |= ERFunctionComponentFlag.ForwardRef;
   }
   return flag;
 }
-function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
+var displayNameAssignmentSelector = "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']";
+function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options = {}) {
+  const { collectDisplayName = false, collectHookCalls = false } = options;
   const jsxCtx = { getScope: (node) => context.sourceCode.getScope(node) };
   const components = /* @__PURE__ */ new Map();
   const functionEntries = [];
@@ -501,12 +496,12 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
   };
   const onFunctionExit = () => {
     const entry = functionEntries.at(-1);
-    if (!entry) return;
+    if (entry == null) return;
     if (!entry.isComponent) {
       return functionEntries.pop();
     }
     const shouldDrop = AST8__namespace.getNestedReturnStatements(entry.node.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === entry.node && !!r.argument && !JSX4__namespace.isJSXValue(r.argument, jsxCtx, hint);
+      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX4__namespace.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) {
       components.delete(entry.key);
@@ -528,7 +523,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
     ":function[type]:exit": onFunctionExit,
     "ArrowFunctionExpression[type][body.type!='BlockStatement']"() {
       const entry = getCurrentEntry();
-      if (!entry) {
+      if (entry == null) {
         return;
       }
       const { body } = entry.node;
@@ -538,11 +533,11 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       }
       const initPath = AST8__namespace.getFunctionInitPath(entry.node);
       const id2 = getFunctionComponentIdentifier(entry.node, context);
-      const name = id2 && getComponentNameFromIdentifier(id2);
+      const name = getComponentNameFromIdentifier(id2);
       const key = getId();
       components.set(key, {
-        _: key,
         id: id2,
+        key,
         kind: "function",
         name,
         node: entry.node,
@@ -553,32 +548,32 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
         initPath
       });
     },
-    "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']"(node) {
-      const { left, right } = node;
-      const componentName = left.object.type === types.AST_NODE_TYPES.Identifier ? left.object.name : eff._;
-      const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
-      if (!component) {
-        return;
-      }
-      components.set(component._, {
-        ...component,
-        displayName: right
-      });
-    },
-    "CallExpression[type]:exit"(node) {
-      if (!isReactHookCall(node)) {
-        return;
+    ...collectDisplayName ? {
+      [displayNameAssignmentSelector](node) {
+        const { left, right } = node;
+        const componentName = left.object.type === types.AST_NODE_TYPES.Identifier ? left.object.name : eff._;
+        const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
+        if (component == null) {
+          return;
+        }
+        component.displayName = right;
       }
-      const entry = getCurrentEntry();
-      if (!entry) {
-        return;
+    } : {},
+    ...collectHookCalls ? {
+      "CallExpression[type]:exit"(node) {
+        if (!isReactHookCall(node)) {
+          return;
+        }
+        const entry = getCurrentEntry();
+        if (entry == null) {
+          return;
+        }
+        entry.hookCalls.push(node);
       }
-      functionEntries.pop();
-      functionEntries.push({ ...entry, hookCalls: [...entry.hookCalls, node] });
-    },
+    } : {},
     "ReturnStatement[type]"(node) {
       const entry = getCurrentEntry();
-      if (!entry) {
+      if (entry == null) {
         return;
       }
       const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4__namespace.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
@@ -589,10 +584,10 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       functionEntries.push({ ...entry, isComponent });
       const initPath = AST8__namespace.getFunctionInitPath(entry.node);
       const id2 = getFunctionComponentIdentifier(entry.node, context);
-      const name = id2 && getComponentNameFromIdentifier(id2);
+      const name = getComponentNameFromIdentifier(id2);
       components.set(entry.key, {
-        _: entry.key,
         id: id2,
+        key: entry.key,
         kind: "function",
         name,
         node: entry.node,
@@ -624,8 +619,8 @@ function useComponentCollectorLegacy() {
     components.set(
       key,
       {
-        _: key,
         id: id2,
+        key,
         kind: "class",
         name: id2?.name,
         node,
@@ -645,13 +640,13 @@ function useComponentCollectorLegacy() {
   return { ctx, listeners };
 }
 function isSetupFunction(node) {
-  if (node === eff._) return eff._;
+  if (node == null) return eff._;
   return node.parent?.type === types.AST_NODE_TYPES.CallExpression && node.parent.callee !== node && node.parent.callee.type === types.AST_NODE_TYPES.Identifier && node.parent.arguments.at(0) === node && isUseEffectCallLoose(node.parent);
 }
 function isCleanupFunction(node) {
-  const nearReturn = AST8__namespace.findParentNodeGuard(node, AST8__namespace.is(types.AST_NODE_TYPES.ReturnStatement));
-  const nearFunction = AST8__namespace.findParentNodeGuard(node, AST8__namespace.isFunction);
-  const nearFunctionOfReturn = AST8__namespace.findParentNodeGuard(nearReturn, AST8__namespace.isFunction);
+  const nearReturn = AST8__namespace.findParentNode(node, AST8__namespace.is(types.AST_NODE_TYPES.ReturnStatement));
+  const nearFunction = AST8__namespace.findParentNode(node, AST8__namespace.isFunction);
+  const nearFunctionOfReturn = AST8__namespace.findParentNode(nearReturn, AST8__namespace.isFunction);
   return nearFunction === nearFunctionOfReturn && isSetupFunction(nearFunction);
 }
 function isComponentDidMount(node) {
@@ -675,13 +670,13 @@ function isDirectValueOfRenderPropertyLoose(node) {
   const matching = (node2) => {
     return node2.type === types.AST_NODE_TYPES.Property && node2.key.type === types.AST_NODE_TYPES.Identifier && node2.key.name.startsWith("render");
   };
-  return matching(node) || !!node.parent && matching(node.parent);
+  return matching(node) || node.parent != null && matching(node.parent);
 }
 function isDeclaredInRenderPropLoose(node) {
   if (isDirectValueOfRenderPropertyLoose(node)) {
     return true;
   }
-  const parent = AST8__namespace.findParentNodeGuard(node, AST8__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer))?.parent;
+  const parent = AST8__namespace.findParentNode(node, AST8__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer))?.parent;
   if (parent?.type !== types.AST_NODE_TYPES.JSXAttribute) {
     return false;
   }

package/dist/index.mjs

@@ -10,7 +10,7 @@ function getElementNameAndRepresentName(node, context, polymorphicPropName, addi
   const name = JSX4.getElementName(node);
   if (name === name.toLowerCase()) return [name, name];
   const component = additionalComponents.findLast((c) => c.name === name || c.re.test(name));
-  if (component !== _) return [name, component.as];
+  if (component != null) return [name, component.as];
   if (polymorphicPropName == null) return [name, name];
   const initialScope = context.sourceCode.getScope(node);
   const polymorphicProp = JSX4.findPropInAttributes(
@@ -18,7 +18,7 @@ function getElementNameAndRepresentName(node, context, polymorphicPropName, addi
     initialScope,
     node.attributes
   );
-  if (polymorphicProp === _) return [name, name];
+  if (polymorphicProp == null) return [name, name];
   const polymorphicName = VAR.toResolved(JSX4.getPropValue(polymorphicProp, initialScope)).value;
   if (typeof polymorphicName === "string") {
     return [name, polymorphicName];
@@ -140,15 +140,15 @@ var isMemoCall = isReactAPICallWithName("memo");
 
 // src/element/hierarchy.ts
 function isInsideCreateElementProps(node, context) {
-  const call = AST8.findParentNodeGuard(node, isCreateElementCall(context));
-  if (!call) return false;
-  const prop = AST8.findParentNodeGuard(node, AST8.is(AST_NODE_TYPES.ObjectExpression));
-  if (!prop) return false;
+  const call = AST8.findParentNode(node, isCreateElementCall(context));
+  if (call == null) return false;
+  const prop = AST8.findParentNode(node, AST8.is(AST_NODE_TYPES.ObjectExpression));
+  if (prop == null) return false;
   return prop === call.arguments[1];
 }
 function isChildrenOfCreateElement(node, context) {
   const parent = node.parent;
-  if (!parent || parent.type !== AST_NODE_TYPES.CallExpression) return false;
+  if (parent == null || parent.type !== AST_NODE_TYPES.CallExpression) return false;
   if (!isCreateElementCall(parent, context)) return false;
   return parent.arguments.slice(2).some((arg) => arg === node);
 }
@@ -161,12 +161,12 @@ function isReactHookName(name) {
 
 // src/hook/is.ts
 function isReactHook(node) {
-  if (node === _) return _;
+  if (node == null) return _;
   const id2 = AST8.getFunctionIdentifier(node);
-  return id2?.name !== _ && isReactHookName(id2.name);
+  return id2?.name != null && isReactHookName(id2.name);
 }
 function isReactHookCall(node) {
-  if (node === _) return false;
+  if (node == null) return false;
   if (node.type !== AST_NODE_TYPES.CallExpression) {
     return false;
   }
@@ -179,7 +179,7 @@ function isReactHookCall(node) {
   return false;
 }
 function isReactHookCallWithName(node, context) {
-  if (node === _) return returnFalse;
+  if (node == null) return returnFalse;
   const settings = unsafeDecodeSettings(context.settings);
   return (name) => {
     const initialScope = context.sourceCode.getScope(node);
@@ -194,7 +194,7 @@ function isReactHookCallWithName(node, context) {
   };
 }
 function isReactHookCallWithNameLoose(node) {
-  if (node === _) return returnFalse;
+  if (node == null) return returnFalse;
   return (name) => {
     switch (node.callee.type) {
       case AST_NODE_TYPES.Identifier:
@@ -221,7 +221,7 @@ function isReactHookCallWithNameAlias(name, context, alias) {
   };
 }
 function isUseEffectCallLoose(node) {
-  if (node === _) return false;
+  if (node == null) return false;
   if (node.type !== AST_NODE_TYPES.CallExpression) {
     return false;
   }
@@ -252,7 +252,7 @@ var isUseTransitionCall = flip(isReactHookCallWithName)("useTransition");
 
 // src/hook/hierarchy.ts
 function isInsideReactHook(node) {
-  return isReactHook(AST8.findParentNodeGuard(node, AST8.isFunction));
+  return isReactHook(AST8.findParentNode(node, AST8.isFunction));
 }
 function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
@@ -260,12 +260,12 @@ function useHookCollector() {
   const onFunctionEnter = (node) => {
     const id2 = AST8.getFunctionIdentifier(node);
     const name = id2?.name;
-    if (name !== _ && isReactHookName(name)) {
+    if (name != null && isReactHookName(name)) {
       const key = getId();
       fEntries.push({ key, node });
       hooks.set(key, {
-        _: key,
         id: id2,
+        key,
         kind: "function",
         name,
         node,
@@ -297,20 +297,14 @@ function useHookCollector() {
         return;
       }
       const fEntry = fEntries.at(-1);
-      if (fEntry?.key === _) {
+      if (fEntry?.key == null) {
         return;
       }
       const hook = hooks.get(fEntry.key);
-      if (hook === _) {
+      if (hook == null) {
         return;
       }
-      hooks.set(hook._, {
-        ...hook,
-        hookCalls: [
-          ...hook.hookCalls,
-          node
-        ]
-      });
+      hook.hookCalls.push(node);
     }
   };
   return { ctx, listeners };
@@ -359,7 +353,7 @@ function isComponentWrapperCall(node, context) {
 }
 function getFunctionComponentIdentifier(node, context) {
   const functionId = AST8.getFunctionIdentifier(node);
-  if (functionId) {
+  if (functionId != null) {
     return functionId;
   }
   const { parent } = node;
@@ -371,17 +365,16 @@ function getFunctionComponentIdentifier(node, context) {
   }
   return _;
 }
-
-// src/component/component-name.ts
 var RE_COMPONENT_NAME = /^_?[A-Z]/u;
 function getComponentNameFromIdentifier(node) {
+  if (node == null) return _;
   return Array.isArray(node) ? node.map((n) => n.name).join(".") : node.name;
 }
 function isComponentName(name) {
   return RE_COMPONENT_NAME.test(name);
 }
 function isClassComponent(node) {
-  if ("superClass" in node && node.superClass) {
+  if ("superClass" in node && node.superClass != null) {
     const re = /^(?:Pure)?Component$/u;
     switch (true) {
       case node.superClass.type === AST_NODE_TYPES.Identifier:
@@ -393,7 +386,7 @@ function isClassComponent(node) {
   return false;
 }
 function isPureComponent(node) {
-  if ("superClass" in node && node.superClass) {
+  if ("superClass" in node && node.superClass != null) {
     const re = /^PureComponent$/u;
     switch (true) {
       case node.superClass.type === AST_NODE_TYPES.Identifier:
@@ -416,13 +409,13 @@ function isFunctionOfRenderMethod(node) {
   return isClassComponent(node.parent.parent.parent);
 }
 function isInsideRenderMethod(node) {
-  return !!AST8.findParentNode(node, (node2) => isRenderMethodLike(node2) && isClassComponent(node2.parent.parent));
+  return AST8.findParentNode(node, (node2) => isRenderMethodLike(node2) && isClassComponent(node2.parent.parent)) != null;
 }
 
 // src/component/misc.ts
 function hasNoneOrValidComponentName(node, context) {
   const id2 = getFunctionComponentIdentifier(node, context);
-  if (!id2) return true;
+  if (id2 == null) return true;
   const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
   return name != null && isComponentName(name);
 }
@@ -454,19 +447,21 @@ function hasValidHierarchy(node, context, hint) {
       AST_NODE_TYPES.ClassBody
     ])
   );
-  return !boundaryNode || boundaryNode.type !== AST_NODE_TYPES.JSXExpressionContainer;
+  return boundaryNode == null || boundaryNode.type !== AST_NODE_TYPES.JSXExpressionContainer;
 }
 function getComponentFlag(initPath) {
   let flag = ERFunctionComponentFlag.None;
-  if (initPath && AST8.hasCallInFunctionInitPath("memo")(initPath)) {
+  if (initPath != null && AST8.hasCallInFunctionInitPath("memo", initPath)) {
     flag |= ERFunctionComponentFlag.Memo;
   }
-  if (initPath && AST8.hasCallInFunctionInitPath("forwardRef")(initPath)) {
+  if (initPath != null && AST8.hasCallInFunctionInitPath("forwardRef", initPath)) {
     flag |= ERFunctionComponentFlag.ForwardRef;
   }
   return flag;
 }
-function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
+var displayNameAssignmentSelector = "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']";
+function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options = {}) {
+  const { collectDisplayName = false, collectHookCalls = false } = options;
   const jsxCtx = { getScope: (node) => context.sourceCode.getScope(node) };
   const components = /* @__PURE__ */ new Map();
   const functionEntries = [];
@@ -477,12 +472,12 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
   };
   const onFunctionExit = () => {
     const entry = functionEntries.at(-1);
-    if (!entry) return;
+    if (entry == null) return;
     if (!entry.isComponent) {
       return functionEntries.pop();
     }
     const shouldDrop = AST8.getNestedReturnStatements(entry.node.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === entry.node && !!r.argument && !JSX4.isJSXValue(r.argument, jsxCtx, hint);
+      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX4.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) {
       components.delete(entry.key);
@@ -504,7 +499,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
     ":function[type]:exit": onFunctionExit,
     "ArrowFunctionExpression[type][body.type!='BlockStatement']"() {
       const entry = getCurrentEntry();
-      if (!entry) {
+      if (entry == null) {
         return;
       }
       const { body } = entry.node;
@@ -514,11 +509,11 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       }
       const initPath = AST8.getFunctionInitPath(entry.node);
       const id2 = getFunctionComponentIdentifier(entry.node, context);
-      const name = id2 && getComponentNameFromIdentifier(id2);
+      const name = getComponentNameFromIdentifier(id2);
       const key = getId();
       components.set(key, {
-        _: key,
         id: id2,
+        key,
         kind: "function",
         name,
         node: entry.node,
@@ -529,32 +524,32 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
         initPath
       });
     },
-    "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']"(node) {
-      const { left, right } = node;
-      const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : _;
-      const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
-      if (!component) {
-        return;
-      }
-      components.set(component._, {
-        ...component,
-        displayName: right
-      });
-    },
-    "CallExpression[type]:exit"(node) {
-      if (!isReactHookCall(node)) {
-        return;
+    ...collectDisplayName ? {
+      [displayNameAssignmentSelector](node) {
+        const { left, right } = node;
+        const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : _;
+        const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
+        if (component == null) {
+          return;
+        }
+        component.displayName = right;
       }
-      const entry = getCurrentEntry();
-      if (!entry) {
-        return;
+    } : {},
+    ...collectHookCalls ? {
+      "CallExpression[type]:exit"(node) {
+        if (!isReactHookCall(node)) {
+          return;
+        }
+        const entry = getCurrentEntry();
+        if (entry == null) {
+          return;
+        }
+        entry.hookCalls.push(node);
       }
-      functionEntries.pop();
-      functionEntries.push({ ...entry, hookCalls: [...entry.hookCalls, node] });
-    },
+    } : {},
     "ReturnStatement[type]"(node) {
       const entry = getCurrentEntry();
-      if (!entry) {
+      if (entry == null) {
         return;
       }
       const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
@@ -565,10 +560,10 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       functionEntries.push({ ...entry, isComponent });
       const initPath = AST8.getFunctionInitPath(entry.node);
       const id2 = getFunctionComponentIdentifier(entry.node, context);
-      const name = id2 && getComponentNameFromIdentifier(id2);
+      const name = getComponentNameFromIdentifier(id2);
       components.set(entry.key, {
-        _: entry.key,
         id: id2,
+        key: entry.key,
         kind: "function",
         name,
         node: entry.node,
@@ -600,8 +595,8 @@ function useComponentCollectorLegacy() {
     components.set(
       key,
       {
-        _: key,
         id: id2,
+        key,
         kind: "class",
         name: id2?.name,
         node,
@@ -621,13 +616,13 @@ function useComponentCollectorLegacy() {
   return { ctx, listeners };
 }
 function isSetupFunction(node) {
-  if (node === _) return _;
+  if (node == null) return _;
   return node.parent?.type === AST_NODE_TYPES.CallExpression && node.parent.callee !== node && node.parent.callee.type === AST_NODE_TYPES.Identifier && node.parent.arguments.at(0) === node && isUseEffectCallLoose(node.parent);
 }
 function isCleanupFunction(node) {
-  const nearReturn = AST8.findParentNodeGuard(node, AST8.is(AST_NODE_TYPES.ReturnStatement));
-  const nearFunction = AST8.findParentNodeGuard(node, AST8.isFunction);
-  const nearFunctionOfReturn = AST8.findParentNodeGuard(nearReturn, AST8.isFunction);
+  const nearReturn = AST8.findParentNode(node, AST8.is(AST_NODE_TYPES.ReturnStatement));
+  const nearFunction = AST8.findParentNode(node, AST8.isFunction);
+  const nearFunctionOfReturn = AST8.findParentNode(nearReturn, AST8.isFunction);
   return nearFunction === nearFunctionOfReturn && isSetupFunction(nearFunction);
 }
 function isComponentDidMount(node) {
@@ -651,13 +646,13 @@ function isDirectValueOfRenderPropertyLoose(node) {
   const matching = (node2) => {
     return node2.type === AST_NODE_TYPES.Property && node2.key.type === AST_NODE_TYPES.Identifier && node2.key.name.startsWith("render");
   };
-  return matching(node) || !!node.parent && matching(node.parent);
+  return matching(node) || node.parent != null && matching(node.parent);
 }
 function isDeclaredInRenderPropLoose(node) {
   if (isDirectValueOfRenderPropertyLoose(node)) {
     return true;
   }
-  const parent = AST8.findParentNodeGuard(node, AST8.is(AST_NODE_TYPES.JSXExpressionContainer))?.parent;
+  const parent = AST8.findParentNode(node, AST8.is(AST_NODE_TYPES.JSXExpressionContainer))?.parent;
   if (parent?.type !== AST_NODE_TYPES.JSXAttribute) {
     return false;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.24.0-beta.0",
+  "version": "1.24.0-beta.3",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and Patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -38,12 +38,12 @@
     "@typescript-eslint/types": "^8.19.1",
     "@typescript-eslint/utils": "^8.19.1",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.24.0-beta.0",
-    "@eslint-react/eff": "1.24.0-beta.0",
-    "@eslint-react/jsx": "1.24.0-beta.0",
-    "@eslint-react/shared": "1.24.0-beta.0",
-    "@eslint-react/types": "1.24.0-beta.0",
-    "@eslint-react/var": "1.24.0-beta.0"
+    "@eslint-react/eff": "1.24.0-beta.3",
+    "@eslint-react/jsx": "1.24.0-beta.3",
+    "@eslint-react/shared": "1.24.0-beta.3",
+    "@eslint-react/types": "1.24.0-beta.3",
+    "@eslint-react/var": "1.24.0-beta.3",
+    "@eslint-react/ast": "1.24.0-beta.3"
   },
   "devDependencies": {
     "tsup": "^8.3.5",