@eslint-react/core 1.23.1 → 1.23.2-beta.6

package/dist/index.d.mts

@@ -5,7 +5,6 @@ import * as _eslint_react_types from '@eslint-react/types';
 import { RuleContext } from '@eslint-react/types';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
-import { ESLintReactSettings } from '@eslint-react/shared';
 import { Scope } from '@typescript-eslint/scope-manager';
 import { SyntaxKind } from 'typescript';
 
@@ -80,14 +79,31 @@ type ERComponent = ERClassComponent | ERFunctionComponent;
 declare function useComponentCollector(context: RuleContext, hint?: bigint): {
     readonly ctx: {
         readonly getAllComponents: (_: TSESTree.Program) => Map<string, ERFunctionComponent>;
-        readonly getCurrentFunction: () => O.Option<[key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]]>;
-        readonly getCurrentFunctionStack: () => [key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]][];
+        readonly getCurrentFunction: () => O.Option<{
+            key: string;
+            node: AST.TSESTreeFunction;
+            hookCalls: TSESTree.CallExpression[];
+            isComponent: boolean;
+        }>;
+        readonly getCurrentFunctionStack: () => {
+            key: string;
+            node: AST.TSESTreeFunction;
+            hookCalls: TSESTree.CallExpression[];
+            isComponent: boolean;
+        }[];
     };
     readonly listeners: {
         readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
-        readonly ":function[type]:exit": () => [key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]] | undefined;
+        readonly ":function[type]:exit": () => {
+            key: string;
+            node: AST.TSESTreeFunction;
+            hookCalls: TSESTree.CallExpression[];
+            isComponent: boolean;
+        } | undefined;
         readonly "ArrowFunctionExpression[type][body.type!='BlockStatement']": () => void;
-        readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']": (node: TSESTree.Node) => 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;
     };
@@ -299,6 +315,8 @@ declare function isThisSetState(node: TSESTree.CallExpression): boolean;
 
 type ERStateKind = "actionState" | "state";
 
+declare const getId: () => string;
+
 /**
  * Checks if the given node is a call expression to the given function or method of the pragma
  * @param name The name of the function or method to check
@@ -327,14 +345,7 @@ type IsCallFromReactMember = {
 };
 declare function isCallFromReactMember(pragmaMemberName: string, name: string): IsCallFromReactMember;
 
-/**
- * Check if an identifier is initialized from React
- * @param name The top-level identifier's name
- * @param initialScope Initial scope to search for the identifier
- * @param settings ESLint React settings
- * @returns Whether the identifier is initialized from React
- */
-declare function isInitializedFromReact(name: string, initialScope: Scope, settings: ESLintReactSettings): boolean;
+declare function isInitializedFromReact(name: string, initialScope: Scope, importSource?: string): boolean;
 
 /**********************************************
  *      DO NOT MODIFY THIS FILE MANUALLY      *
@@ -2558,11 +2569,4 @@ declare const isMemoCall: {
     (node: Node, context: _eslint_react_types.RuleContext): node is CallExpression;
 };
 
-declare function next(): bigint;
-
-declare const uid_next: typeof next;
-declare namespace uid {
-  export { uid_next as next };
-}
-
-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, getElementRepresentName, getFunctionComponentIdentifier, 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, isRenderPropLoose, isSetupFunction, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, uid, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+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, getElementRepresentName, 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, 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

@@ -5,7 +5,6 @@ import * as _eslint_react_types from '@eslint-react/types';
 import { RuleContext } from '@eslint-react/types';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
-import { ESLintReactSettings } from '@eslint-react/shared';
 import { Scope } from '@typescript-eslint/scope-manager';
 import { SyntaxKind } from 'typescript';
 
@@ -80,14 +79,31 @@ type ERComponent = ERClassComponent | ERFunctionComponent;
 declare function useComponentCollector(context: RuleContext, hint?: bigint): {
     readonly ctx: {
         readonly getAllComponents: (_: TSESTree.Program) => Map<string, ERFunctionComponent>;
-        readonly getCurrentFunction: () => O.Option<[key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]]>;
-        readonly getCurrentFunctionStack: () => [key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]][];
+        readonly getCurrentFunction: () => O.Option<{
+            key: string;
+            node: AST.TSESTreeFunction;
+            hookCalls: TSESTree.CallExpression[];
+            isComponent: boolean;
+        }>;
+        readonly getCurrentFunctionStack: () => {
+            key: string;
+            node: AST.TSESTreeFunction;
+            hookCalls: TSESTree.CallExpression[];
+            isComponent: boolean;
+        }[];
     };
     readonly listeners: {
         readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
-        readonly ":function[type]:exit": () => [key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]] | undefined;
+        readonly ":function[type]:exit": () => {
+            key: string;
+            node: AST.TSESTreeFunction;
+            hookCalls: TSESTree.CallExpression[];
+            isComponent: boolean;
+        } | undefined;
         readonly "ArrowFunctionExpression[type][body.type!='BlockStatement']": () => void;
-        readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']": (node: TSESTree.Node) => 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;
     };
@@ -299,6 +315,8 @@ declare function isThisSetState(node: TSESTree.CallExpression): boolean;
 
 type ERStateKind = "actionState" | "state";
 
+declare const getId: () => string;
+
 /**
  * Checks if the given node is a call expression to the given function or method of the pragma
  * @param name The name of the function or method to check
@@ -327,14 +345,7 @@ type IsCallFromReactMember = {
 };
 declare function isCallFromReactMember(pragmaMemberName: string, name: string): IsCallFromReactMember;
 
-/**
- * Check if an identifier is initialized from React
- * @param name The top-level identifier's name
- * @param initialScope Initial scope to search for the identifier
- * @param settings ESLint React settings
- * @returns Whether the identifier is initialized from React
- */
-declare function isInitializedFromReact(name: string, initialScope: Scope, settings: ESLintReactSettings): boolean;
+declare function isInitializedFromReact(name: string, initialScope: Scope, importSource?: string): boolean;
 
 /**********************************************
  *      DO NOT MODIFY THIS FILE MANUALLY      *
@@ -2558,11 +2569,4 @@ declare const isMemoCall: {
     (node: Node, context: _eslint_react_types.RuleContext): node is CallExpression;
 };
 
-declare function next(): bigint;
-
-declare const uid_next: typeof next;
-declare namespace uid {
-  export { uid_next as next };
-}
-
-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, getElementRepresentName, getFunctionComponentIdentifier, 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, isRenderPropLoose, isSetupFunction, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, uid, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+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, getElementRepresentName, 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, 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

@@ -31,15 +31,11 @@ var AST9__namespace = /*#__PURE__*/_interopNamespace(AST9);
 var JSX4__namespace = /*#__PURE__*/_interopNamespace(JSX4);
 var VAR__namespace = /*#__PURE__*/_interopNamespace(VAR);
 
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
+// src/component/component-collector.ts
 function getElementRepresentName(node, context) {
   const rawElementName = JSX4__namespace.getElementName(node);
   if (rawElementName === rawElementName.toLowerCase()) return rawElementName;
-  const { components, polymorphicPropName } = shared.normalizeSettings(shared.decodeSettings(context.settings));
+  const { components, polymorphicPropName } = shared.getSettingsFromContext(context);
   const asElementName = components.get(rawElementName);
   if (eff.isString(asElementName)) return asElementName;
   return eff.F.pipe(
@@ -50,34 +46,55 @@ function getElementRepresentName(node, context) {
     eff.O.getOrElse(() => rawElementName)
   );
 }
-function isInitializedFromReact(name, initialScope, settings) {
-  if (!settings.strictImportCheck) return true;
-  if (name.toLowerCase() === "react") return true;
-  const { importSource = "react" } = settings;
-  return VAR__namespace.isInitializedFromSource(name, importSource, initialScope);
+
+// src/utils/get-id.ts
+var id = 0n;
+var getId = () => (id++).toString();
+function isInitializedFromReact(name, initialScope, importSource = "react") {
+  return name.toLowerCase() === "react" || VAR__namespace.isInitializedFromSource(
+    name,
+    importSource,
+    initialScope
+  );
 }
 
 // src/utils/is-from-react.ts
 function isFromReact(name) {
   return (node, context) => {
-    const settings = shared.unsafeReadSettings(context.settings);
+    const settings = shared.unsafeDecodeSettings(context.settings);
+    if (!settings.strictImportCheck) {
+      if (node.type === types.AST_NODE_TYPES.MemberExpression) {
+        return node.object.type === types.AST_NODE_TYPES.Identifier && node.property.type === types.AST_NODE_TYPES.Identifier && node.property.name === name;
+      }
+      return node.name === name;
+    }
     const initialScope = context.sourceCode.getScope(node);
     if (node.type === types.AST_NODE_TYPES.MemberExpression) {
-      return node.object.type === types.AST_NODE_TYPES.Identifier && node.property.type === types.AST_NODE_TYPES.Identifier && node.property.name === name && isInitializedFromReact(node.object.name, initialScope, settings);
+      return node.object.type === types.AST_NODE_TYPES.Identifier && node.property.type === types.AST_NODE_TYPES.Identifier && node.property.name === name && isInitializedFromReact(node.object.name, initialScope, settings.importSource);
+    }
+    if (node.name === name) {
+      return isInitializedFromReact(name, initialScope, settings.importSource);
     }
-    if (node.name === name) return isInitializedFromReact(name, initialScope, settings);
     return false;
   };
 }
 function isFromReactMember(memberName, name) {
   return (node, context) => {
-    const settings = shared.unsafeReadSettings(context.settings);
+    const settings = shared.unsafeDecodeSettings(context.settings);
+    if (!settings.strictImportCheck) {
+      if (node.property.type !== types.AST_NODE_TYPES.Identifier || node.property.name !== name) return false;
+      if (node.object.type === types.AST_NODE_TYPES.Identifier && node.object.name === memberName) return true;
+      if (node.object.type === types.AST_NODE_TYPES.MemberExpression && node.object.object.type === types.AST_NODE_TYPES.Identifier && node.object.property.type === types.AST_NODE_TYPES.Identifier) {
+        return node.object.property.name === memberName;
+      }
+      return false;
+    }
     const initialScope = context.sourceCode.getScope(node);
     if (node.property.type !== types.AST_NODE_TYPES.Identifier || node.property.name !== name) return false;
     if (node.object.type === types.AST_NODE_TYPES.Identifier && node.object.name === memberName) {
-      return isInitializedFromReact(node.object.name, initialScope, settings);
+      return isInitializedFromReact(node.object.name, initialScope, settings.importSource);
     }
-    if (node.object.type === types.AST_NODE_TYPES.MemberExpression && node.object.object.type === types.AST_NODE_TYPES.Identifier && isInitializedFromReact(node.object.object.name, initialScope, settings) && node.object.property.type === types.AST_NODE_TYPES.Identifier) {
+    if (node.object.type === types.AST_NODE_TYPES.MemberExpression && node.object.object.type === types.AST_NODE_TYPES.Identifier && isInitializedFromReact(node.object.object.name, initialScope, settings.importSource) && node.object.property.type === types.AST_NODE_TYPES.Identifier) {
       return node.object.property.name === memberName;
     }
     return false;
@@ -128,22 +145,12 @@ var isCreateRefCall = isReactAPICallWithName("createRef");
 var isForwardRefCall = isReactAPICallWithName("forwardRef");
 var isMemoCall = isReactAPICallWithName("memo");
 
-// src/utils/uid.ts
-var uid_exports = {};
-__export(uid_exports, {
-  next: () => next
-});
-var id = 0n;
-function next() {
-  return id++;
-}
-
 // src/element/hierarchy.ts
 function isInsideCreateElementProps(node, context) {
   return eff.F.pipe(
     eff.O.Do,
-    eff.O.bind("call", () => AST9__namespace.traverseUpGuard(node, isCreateElementCall(context))),
-    eff.O.bind("prop", () => AST9__namespace.traverseUpGuard(node, AST9__namespace.is(types.AST_NODE_TYPES.ObjectExpression))),
+    eff.O.bind("call", () => AST9__namespace.findParentNodeGuard(node, isCreateElementCall(context))),
+    eff.O.bind("prop", () => AST9__namespace.findParentNodeGuard(node, AST9__namespace.is(types.AST_NODE_TYPES.ObjectExpression))),
     eff.O.bind("arg1", ({ call }) => eff.O.fromNullable(call.arguments[1])),
     eff.O.exists(({ arg1, prop }) => prop === arg1)
   );
@@ -182,14 +189,14 @@ function isReactHookCall(node) {
   return false;
 }
 function isReactHookCallWithName(node, context) {
-  const settings = shared.unsafeReadSettings(context.settings);
+  const settings = shared.unsafeDecodeSettings(context.settings);
   return (name) => {
     const initialScope = context.sourceCode.getScope(node);
     switch (true) {
       case (node.callee.type === types.AST_NODE_TYPES.Identifier && node.callee.name === name):
-        return isInitializedFromReact(name, initialScope, settings);
+        return !settings.strictImportCheck || isInitializedFromReact(name, initialScope, settings.importSource);
       case (node.callee.type === types.AST_NODE_TYPES.MemberExpression && node.callee.property.type === types.AST_NODE_TYPES.Identifier && node.callee.property.name === name && "name" in node.callee.object):
-        return isInitializedFromReact(node.callee.object.name, initialScope, settings);
+        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, initialScope, settings.importSource);
       default:
         return false;
     }
@@ -208,14 +215,14 @@ function isReactHookCallWithNameLoose(node) {
   };
 }
 function isReactHookCallWithNameAlias(name, context, alias) {
-  const settings = shared.unsafeReadSettings(context.settings);
+  const settings = shared.unsafeDecodeSettings(context);
   return (node) => {
     const initialScope = context.sourceCode.getScope(node);
     switch (true) {
       case (node.callee.type === types.AST_NODE_TYPES.Identifier && node.callee.name === name):
-        return isInitializedFromReact(name, initialScope, settings);
+        return !settings.strictImportCheck || isInitializedFromReact(name, initialScope, settings.importSource);
       case (node.callee.type === types.AST_NODE_TYPES.MemberExpression && node.callee.property.type === types.AST_NODE_TYPES.Identifier && node.callee.property.name === name && "name" in node.callee.object):
-        return isInitializedFromReact(node.callee.object.name, initialScope, settings);
+        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, initialScope, settings.importSource);
       default:
         return alias.some(isReactHookCallWithNameLoose(node));
     }
@@ -250,7 +257,7 @@ var isUseTransitionCall = eff.F.flip(isReactHookCallWithName)("useTransition");
 
 // src/hook/hierarchy.ts
 function isInsideReactHook(node) {
-  return eff.O.exists(AST9__namespace.traverseUpGuard(node, AST9__namespace.isFunction), isReactHook);
+  return eff.O.exists(AST9__namespace.findParentNodeGuard(node, AST9__namespace.isFunction), isReactHook);
 }
 function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
@@ -259,7 +266,7 @@ function useHookCollector() {
     const id2 = AST9__namespace.getFunctionIdentifier(node);
     const name = eff.O.flatMapNullable(id2, (id3) => id3.name);
     if (eff.O.isSome(id2) && eff.O.isSome(name) && isReactHookName(name.value)) {
-      const key = uid_exports.next().toString();
+      const key = getId();
       fStack.push([node, eff.O.some(key)]);
       hooks.set(key, {
         _: key,
@@ -417,7 +424,7 @@ function useComponentCollectorLegacy() {
   const collect = (node) => {
     if (!isClassComponent(node)) return;
     const id2 = AST9__namespace.getClassIdentifier(node);
-    const key = uid_exports.next().toString();
+    const key = getId();
     const flag = isPureComponent(node) ? ERClassComponentFlag.PureComponent : ERClassComponentFlag.None;
     components.set(
       key,
@@ -462,21 +469,18 @@ function isFunctionOfRenderMethod(node) {
   return isClassComponent(node.parent.parent.parent);
 }
 function isInsideRenderMethod(node) {
-  return eff.O.isSome(AST9__namespace.traverseUp(node, (node2) => {
+  return eff.O.isSome(AST9__namespace.findParentNode(node, (node2) => {
     return isRenderMethodLike(node2) && isClassComponent(node2.parent.parent);
   }));
 }
 function hasNoneOrValidComponentName(node, context) {
-  return eff.O.match(
-    getFunctionComponentIdentifier(node, context),
-    {
-      onNone: eff.F.constTrue,
-      onSome: (id2) => {
-        const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
-        return !!name && isComponentName(name);
-      }
-    }
-  );
+  const mbIdentifier = getFunctionComponentIdentifier(node, context);
+  if (eff.O.isNone(mbIdentifier)) {
+    return true;
+  }
+  const id2 = mbIdentifier.value;
+  const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
+  return !!name && isComponentName(name);
 }
 
 // src/component/component-collector.ts
@@ -497,7 +501,7 @@ function hasValidHierarchy(node, context, hint) {
     return false;
   }
   return !eff.O.exists(
-    AST9__namespace.traverseUp(
+    AST9__namespace.findParentNode(
       node,
       AST9__namespace.isOneOf([
         types.AST_NODE_TYPES.JSXExpressionContainer,
@@ -523,20 +527,20 @@ function getComponentFlag(initPath) {
 function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
   const jsxCtx = { getScope: (node) => context.sourceCode.getScope(node) };
   const components = /* @__PURE__ */ new Map();
-  const functionStack = [];
-  const getCurrentFunction = () => eff.O.fromNullable(functionStack.at(-1));
+  const functionEntries = [];
+  const getCurrentFunction = () => eff.O.fromNullable(functionEntries.at(-1));
   const onFunctionEnter = (node) => {
-    const key = uid_exports.next().toString();
-    functionStack.push([key, node, false, []]);
+    const key = getId();
+    functionEntries.push({ key, node, hookCalls: [], isComponent: false });
   };
   const onFunctionExit = () => {
-    const [key, fn, isComponent] = functionStack.at(-1) ?? [];
-    if (!key || !fn || !isComponent) return functionStack.pop();
-    const shouldDrop = AST9__namespace.getNestedReturnStatements(fn.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === fn && r.argument !== null && !JSX4__namespace.isJSXValue(r.argument, jsxCtx, hint);
+    const { key, node, isComponent } = functionEntries.at(-1) ?? {};
+    if (!key || !node || !isComponent) return functionEntries.pop();
+    const shouldDrop = AST9__namespace.getNestedReturnStatements(node.body).slice().reverse().some((r) => {
+      return context.sourceCode.getScope(r).block === node && r.argument !== null && !JSX4__namespace.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) components.delete(key);
-    return functionStack.pop();
+    return functionEntries.pop();
   };
   const ctx = {
     getAllComponents(_) {
@@ -544,43 +548,42 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
     },
     getCurrentFunction,
     getCurrentFunctionStack() {
-      return [...functionStack];
+      return [...functionEntries];
     }
   };
   const listeners = {
     ":function[type]": onFunctionEnter,
     ":function[type]:exit": onFunctionExit,
     "ArrowFunctionExpression[type][body.type!='BlockStatement']"() {
-      const maybeCurrentFn = getCurrentFunction();
-      if (eff.O.isNone(maybeCurrentFn)) return;
-      const [_key, currentFn, _isComponent, hookCalls] = maybeCurrentFn.value;
-      const { body } = currentFn;
-      const isComponent = hasNoneOrValidComponentName(currentFn, context) && JSX4__namespace.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(currentFn, context, hint);
+      const mbEntry = getCurrentFunction();
+      if (eff.O.isNone(mbEntry)) return;
+      const entry = mbEntry.value;
+      const { body } = entry.node;
+      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4__namespace.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
       if (!isComponent) return;
-      const initPath = AST9__namespace.getFunctionInitPath(currentFn);
-      const id2 = getFunctionComponentIdentifier(currentFn, context);
+      const initPath = AST9__namespace.getFunctionInitPath(entry.node);
+      const id2 = getFunctionComponentIdentifier(entry.node, context);
       const name = eff.O.flatMapNullable(id2, getComponentNameFromIdentifier);
-      const key = uid_exports.next().toString();
+      const key = getId();
       components.set(key, {
         _: key,
         id: id2,
         kind: "function",
         name,
-        node: currentFn,
+        node: entry.node,
         displayName: eff.O.none(),
         flag: getComponentFlag(initPath),
         hint,
-        hookCalls,
+        hookCalls: entry.hookCalls,
         initPath
       });
     },
     "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']"(node) {
-      if (node.type !== types.AST_NODE_TYPES.AssignmentExpression) return;
       const { left, right } = node;
-      if (left.type !== types.AST_NODE_TYPES.MemberExpression) return;
-      const maybeComponentName = tsPattern.match(left.object).with({ type: types.AST_NODE_TYPES.Identifier }, (n) => eff.O.some(n.name)).otherwise(eff.O.none);
-      if (eff.O.isNone(maybeComponentName)) return;
-      const component = Array.from(components.values()).findLast(({ name }) => eff.O.exists(name, (n) => n === maybeComponentName.value));
+      const mbComponentName = tsPattern.match(left.object).with({ type: types.AST_NODE_TYPES.Identifier }, (n) => eff.O.some(n.name)).otherwise(eff.O.none);
+      if (eff.O.isNone(mbComponentName)) return;
+      const componentName = mbComponentName.value;
+      const component = Array.from(components.values()).findLast(({ name }) => eff.O.exists(name, (n) => n === componentName));
       if (!component) return;
       components.set(component._, {
         ...component,
@@ -589,34 +592,33 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
     },
     "CallExpression[type]:exit"(node) {
       if (!isReactHookCall(node)) return;
-      const maybeCurrentFn = getCurrentFunction();
-      if (eff.O.isNone(maybeCurrentFn)) return;
-      const [key, currentFn, isComponent, hookCalls] = maybeCurrentFn.value;
-      functionStack.pop();
-      functionStack.push([key, currentFn, isComponent, [...hookCalls, node]]);
+      const mbEntry = getCurrentFunction();
+      if (eff.O.isNone(mbEntry)) return;
+      const entry = mbEntry.value;
+      functionEntries.pop();
+      functionEntries.push({ ...entry, hookCalls: [...entry.hookCalls, node] });
     },
     "ReturnStatement[type]"(node) {
-      const maybeCurrentFn = getCurrentFunction();
-      if (eff.O.isNone(maybeCurrentFn)) return;
-      const [key, currentFn, isKnown, hookCalls] = maybeCurrentFn.value;
-      if (isKnown) return;
-      const isComponent = hasNoneOrValidComponentName(currentFn, context) && JSX4__namespace.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(currentFn, context, hint);
+      const mbEntry = getCurrentFunction();
+      if (eff.O.isNone(mbEntry)) return;
+      const entry = mbEntry.value;
+      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4__namespace.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
       if (!isComponent) return;
-      functionStack.pop();
-      functionStack.push([key, currentFn, true, []]);
-      const initPath = AST9__namespace.getFunctionInitPath(currentFn);
-      const id2 = getFunctionComponentIdentifier(currentFn, context);
+      functionEntries.pop();
+      functionEntries.push({ ...entry, isComponent });
+      const initPath = AST9__namespace.getFunctionInitPath(entry.node);
+      const id2 = getFunctionComponentIdentifier(entry.node, context);
       const name = eff.O.flatMapNullable(id2, getComponentNameFromIdentifier);
-      components.set(key, {
-        _: key,
+      components.set(entry.key, {
+        _: entry.key,
         id: id2,
         kind: "function",
         name,
-        node: currentFn,
+        node: entry.node,
         displayName: eff.O.none(),
         flag: getComponentFlag(initPath),
         hint,
-        hookCalls,
+        hookCalls: entry.hookCalls,
         initPath
       });
     }
@@ -627,10 +629,10 @@ function isSetupFunction(node) {
   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 nearestRet = eff.O.getOrNull(AST9__namespace.traverseUpGuard(node, AST9__namespace.is(types.AST_NODE_TYPES.ReturnStatement)));
+  const nearestRet = eff.O.getOrNull(AST9__namespace.findParentNodeGuard(node, AST9__namespace.is(types.AST_NODE_TYPES.ReturnStatement)));
   if (!nearestRet) return false;
-  const nearestFunction = eff.O.getOrNull(AST9__namespace.traverseUpGuard(node, AST9__namespace.isFunction));
-  const nearestFunctionOfRet = eff.O.getOrNull(AST9__namespace.traverseUpGuard(nearestRet, AST9__namespace.isFunction));
+  const nearestFunction = eff.O.getOrNull(AST9__namespace.findParentNodeGuard(node, AST9__namespace.isFunction));
+  const nearestFunctionOfRet = eff.O.getOrNull(AST9__namespace.findParentNodeGuard(nearestRet, AST9__namespace.isFunction));
   if (!nearestFunction || !nearestFunctionOfRet) return false;
   return nearestFunction === nearestFunctionOfRet && isSetupFunction(nearestFunction);
 }
@@ -654,7 +656,7 @@ function isDeclaredInRenderPropLoose(node) {
     return true;
   }
   return eff.F.pipe(
-    AST9__namespace.traverseUpGuard(node, AST9__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer)),
+    AST9__namespace.findParentNodeGuard(node, AST9__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer)),
     eff.O.flatMapNullable((c) => c.parent),
     eff.O.filter(AST9__namespace.is(types.AST_NODE_TYPES.JSXAttribute)),
     eff.O.flatMapNullable((a) => a.name),
@@ -696,6 +698,7 @@ exports.RE_HOOK_NAME = RE_HOOK_NAME;
 exports.getComponentNameFromIdentifier = getComponentNameFromIdentifier;
 exports.getElementRepresentName = getElementRepresentName;
 exports.getFunctionComponentIdentifier = getFunctionComponentIdentifier;
+exports.getId = getId;
 exports.hasNoneOrValidComponentName = hasNoneOrValidComponentName;
 exports.isCallFromReact = isCallFromReact;
 exports.isCallFromReactMember = isCallFromReactMember;
@@ -768,7 +771,6 @@ exports.isUseRefCall = isUseRefCall;
 exports.isUseStateCall = isUseStateCall;
 exports.isUseSyncExternalStoreCall = isUseSyncExternalStoreCall;
 exports.isUseTransitionCall = isUseTransitionCall;
-exports.uid = uid_exports;
 exports.useComponentCollector = useComponentCollector;
 exports.useComponentCollectorLegacy = useComponentCollectorLegacy;
 exports.useHookCollector = useHookCollector;

package/dist/index.mjs

@@ -3,19 +3,15 @@ import { F, isString, O } from '@eslint-react/eff';
 import * as JSX4 from '@eslint-react/jsx';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { isMatching, P, match } from 'ts-pattern';
-import { normalizeSettings, decodeSettings, unsafeReadSettings } from '@eslint-react/shared';
+import { getSettingsFromContext, unsafeDecodeSettings } from '@eslint-react/shared';
 import * as VAR from '@eslint-react/var';
 import { birecord } from '@eslint-react/types';
 
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
+// src/component/component-collector.ts
 function getElementRepresentName(node, context) {
   const rawElementName = JSX4.getElementName(node);
   if (rawElementName === rawElementName.toLowerCase()) return rawElementName;
-  const { components, polymorphicPropName } = normalizeSettings(decodeSettings(context.settings));
+  const { components, polymorphicPropName } = getSettingsFromContext(context);
   const asElementName = components.get(rawElementName);
   if (isString(asElementName)) return asElementName;
   return F.pipe(
@@ -26,34 +22,55 @@ function getElementRepresentName(node, context) {
     O.getOrElse(() => rawElementName)
   );
 }
-function isInitializedFromReact(name, initialScope, settings) {
-  if (!settings.strictImportCheck) return true;
-  if (name.toLowerCase() === "react") return true;
-  const { importSource = "react" } = settings;
-  return VAR.isInitializedFromSource(name, importSource, initialScope);
+
+// src/utils/get-id.ts
+var id = 0n;
+var getId = () => (id++).toString();
+function isInitializedFromReact(name, initialScope, importSource = "react") {
+  return name.toLowerCase() === "react" || VAR.isInitializedFromSource(
+    name,
+    importSource,
+    initialScope
+  );
 }
 
 // src/utils/is-from-react.ts
 function isFromReact(name) {
   return (node, context) => {
-    const settings = unsafeReadSettings(context.settings);
+    const settings = unsafeDecodeSettings(context.settings);
+    if (!settings.strictImportCheck) {
+      if (node.type === AST_NODE_TYPES.MemberExpression) {
+        return node.object.type === AST_NODE_TYPES.Identifier && node.property.type === AST_NODE_TYPES.Identifier && node.property.name === name;
+      }
+      return node.name === name;
+    }
     const initialScope = context.sourceCode.getScope(node);
     if (node.type === AST_NODE_TYPES.MemberExpression) {
-      return node.object.type === AST_NODE_TYPES.Identifier && node.property.type === AST_NODE_TYPES.Identifier && node.property.name === name && isInitializedFromReact(node.object.name, initialScope, settings);
+      return node.object.type === AST_NODE_TYPES.Identifier && node.property.type === AST_NODE_TYPES.Identifier && node.property.name === name && isInitializedFromReact(node.object.name, initialScope, settings.importSource);
+    }
+    if (node.name === name) {
+      return isInitializedFromReact(name, initialScope, settings.importSource);
     }
-    if (node.name === name) return isInitializedFromReact(name, initialScope, settings);
     return false;
   };
 }
 function isFromReactMember(memberName, name) {
   return (node, context) => {
-    const settings = unsafeReadSettings(context.settings);
+    const settings = unsafeDecodeSettings(context.settings);
+    if (!settings.strictImportCheck) {
+      if (node.property.type !== AST_NODE_TYPES.Identifier || node.property.name !== name) return false;
+      if (node.object.type === AST_NODE_TYPES.Identifier && node.object.name === memberName) return true;
+      if (node.object.type === AST_NODE_TYPES.MemberExpression && node.object.object.type === AST_NODE_TYPES.Identifier && node.object.property.type === AST_NODE_TYPES.Identifier) {
+        return node.object.property.name === memberName;
+      }
+      return false;
+    }
     const initialScope = context.sourceCode.getScope(node);
     if (node.property.type !== AST_NODE_TYPES.Identifier || node.property.name !== name) return false;
     if (node.object.type === AST_NODE_TYPES.Identifier && node.object.name === memberName) {
-      return isInitializedFromReact(node.object.name, initialScope, settings);
+      return isInitializedFromReact(node.object.name, initialScope, settings.importSource);
     }
-    if (node.object.type === AST_NODE_TYPES.MemberExpression && node.object.object.type === AST_NODE_TYPES.Identifier && isInitializedFromReact(node.object.object.name, initialScope, settings) && node.object.property.type === AST_NODE_TYPES.Identifier) {
+    if (node.object.type === AST_NODE_TYPES.MemberExpression && node.object.object.type === AST_NODE_TYPES.Identifier && isInitializedFromReact(node.object.object.name, initialScope, settings.importSource) && node.object.property.type === AST_NODE_TYPES.Identifier) {
       return node.object.property.name === memberName;
     }
     return false;
@@ -104,22 +121,12 @@ var isCreateRefCall = isReactAPICallWithName("createRef");
 var isForwardRefCall = isReactAPICallWithName("forwardRef");
 var isMemoCall = isReactAPICallWithName("memo");
 
-// src/utils/uid.ts
-var uid_exports = {};
-__export(uid_exports, {
-  next: () => next
-});
-var id = 0n;
-function next() {
-  return id++;
-}
-
 // src/element/hierarchy.ts
 function isInsideCreateElementProps(node, context) {
   return F.pipe(
     O.Do,
-    O.bind("call", () => AST9.traverseUpGuard(node, isCreateElementCall(context))),
-    O.bind("prop", () => AST9.traverseUpGuard(node, AST9.is(AST_NODE_TYPES.ObjectExpression))),
+    O.bind("call", () => AST9.findParentNodeGuard(node, isCreateElementCall(context))),
+    O.bind("prop", () => AST9.findParentNodeGuard(node, AST9.is(AST_NODE_TYPES.ObjectExpression))),
     O.bind("arg1", ({ call }) => O.fromNullable(call.arguments[1])),
     O.exists(({ arg1, prop }) => prop === arg1)
   );
@@ -158,14 +165,14 @@ function isReactHookCall(node) {
   return false;
 }
 function isReactHookCallWithName(node, context) {
-  const settings = unsafeReadSettings(context.settings);
+  const settings = unsafeDecodeSettings(context.settings);
   return (name) => {
     const initialScope = context.sourceCode.getScope(node);
     switch (true) {
       case (node.callee.type === AST_NODE_TYPES.Identifier && node.callee.name === name):
-        return isInitializedFromReact(name, initialScope, settings);
+        return !settings.strictImportCheck || isInitializedFromReact(name, initialScope, settings.importSource);
       case (node.callee.type === AST_NODE_TYPES.MemberExpression && node.callee.property.type === AST_NODE_TYPES.Identifier && node.callee.property.name === name && "name" in node.callee.object):
-        return isInitializedFromReact(node.callee.object.name, initialScope, settings);
+        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, initialScope, settings.importSource);
       default:
         return false;
     }
@@ -184,14 +191,14 @@ function isReactHookCallWithNameLoose(node) {
   };
 }
 function isReactHookCallWithNameAlias(name, context, alias) {
-  const settings = unsafeReadSettings(context.settings);
+  const settings = unsafeDecodeSettings(context);
   return (node) => {
     const initialScope = context.sourceCode.getScope(node);
     switch (true) {
       case (node.callee.type === AST_NODE_TYPES.Identifier && node.callee.name === name):
-        return isInitializedFromReact(name, initialScope, settings);
+        return !settings.strictImportCheck || isInitializedFromReact(name, initialScope, settings.importSource);
       case (node.callee.type === AST_NODE_TYPES.MemberExpression && node.callee.property.type === AST_NODE_TYPES.Identifier && node.callee.property.name === name && "name" in node.callee.object):
-        return isInitializedFromReact(node.callee.object.name, initialScope, settings);
+        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, initialScope, settings.importSource);
       default:
         return alias.some(isReactHookCallWithNameLoose(node));
     }
@@ -226,7 +233,7 @@ var isUseTransitionCall = F.flip(isReactHookCallWithName)("useTransition");
 
 // src/hook/hierarchy.ts
 function isInsideReactHook(node) {
-  return O.exists(AST9.traverseUpGuard(node, AST9.isFunction), isReactHook);
+  return O.exists(AST9.findParentNodeGuard(node, AST9.isFunction), isReactHook);
 }
 function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
@@ -235,7 +242,7 @@ function useHookCollector() {
     const id2 = AST9.getFunctionIdentifier(node);
     const name = O.flatMapNullable(id2, (id3) => id3.name);
     if (O.isSome(id2) && O.isSome(name) && isReactHookName(name.value)) {
-      const key = uid_exports.next().toString();
+      const key = getId();
       fStack.push([node, O.some(key)]);
       hooks.set(key, {
         _: key,
@@ -393,7 +400,7 @@ function useComponentCollectorLegacy() {
   const collect = (node) => {
     if (!isClassComponent(node)) return;
     const id2 = AST9.getClassIdentifier(node);
-    const key = uid_exports.next().toString();
+    const key = getId();
     const flag = isPureComponent(node) ? ERClassComponentFlag.PureComponent : ERClassComponentFlag.None;
     components.set(
       key,
@@ -438,21 +445,18 @@ function isFunctionOfRenderMethod(node) {
   return isClassComponent(node.parent.parent.parent);
 }
 function isInsideRenderMethod(node) {
-  return O.isSome(AST9.traverseUp(node, (node2) => {
+  return O.isSome(AST9.findParentNode(node, (node2) => {
     return isRenderMethodLike(node2) && isClassComponent(node2.parent.parent);
   }));
 }
 function hasNoneOrValidComponentName(node, context) {
-  return O.match(
-    getFunctionComponentIdentifier(node, context),
-    {
-      onNone: F.constTrue,
-      onSome: (id2) => {
-        const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
-        return !!name && isComponentName(name);
-      }
-    }
-  );
+  const mbIdentifier = getFunctionComponentIdentifier(node, context);
+  if (O.isNone(mbIdentifier)) {
+    return true;
+  }
+  const id2 = mbIdentifier.value;
+  const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
+  return !!name && isComponentName(name);
 }
 
 // src/component/component-collector.ts
@@ -473,7 +477,7 @@ function hasValidHierarchy(node, context, hint) {
     return false;
   }
   return !O.exists(
-    AST9.traverseUp(
+    AST9.findParentNode(
       node,
       AST9.isOneOf([
         AST_NODE_TYPES.JSXExpressionContainer,
@@ -499,20 +503,20 @@ function getComponentFlag(initPath) {
 function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
   const jsxCtx = { getScope: (node) => context.sourceCode.getScope(node) };
   const components = /* @__PURE__ */ new Map();
-  const functionStack = [];
-  const getCurrentFunction = () => O.fromNullable(functionStack.at(-1));
+  const functionEntries = [];
+  const getCurrentFunction = () => O.fromNullable(functionEntries.at(-1));
   const onFunctionEnter = (node) => {
-    const key = uid_exports.next().toString();
-    functionStack.push([key, node, false, []]);
+    const key = getId();
+    functionEntries.push({ key, node, hookCalls: [], isComponent: false });
   };
   const onFunctionExit = () => {
-    const [key, fn, isComponent] = functionStack.at(-1) ?? [];
-    if (!key || !fn || !isComponent) return functionStack.pop();
-    const shouldDrop = AST9.getNestedReturnStatements(fn.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === fn && r.argument !== null && !JSX4.isJSXValue(r.argument, jsxCtx, hint);
+    const { key, node, isComponent } = functionEntries.at(-1) ?? {};
+    if (!key || !node || !isComponent) return functionEntries.pop();
+    const shouldDrop = AST9.getNestedReturnStatements(node.body).slice().reverse().some((r) => {
+      return context.sourceCode.getScope(r).block === node && r.argument !== null && !JSX4.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) components.delete(key);
-    return functionStack.pop();
+    return functionEntries.pop();
   };
   const ctx = {
     getAllComponents(_) {
@@ -520,43 +524,42 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
     },
     getCurrentFunction,
     getCurrentFunctionStack() {
-      return [...functionStack];
+      return [...functionEntries];
     }
   };
   const listeners = {
     ":function[type]": onFunctionEnter,
     ":function[type]:exit": onFunctionExit,
     "ArrowFunctionExpression[type][body.type!='BlockStatement']"() {
-      const maybeCurrentFn = getCurrentFunction();
-      if (O.isNone(maybeCurrentFn)) return;
-      const [_key, currentFn, _isComponent, hookCalls] = maybeCurrentFn.value;
-      const { body } = currentFn;
-      const isComponent = hasNoneOrValidComponentName(currentFn, context) && JSX4.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(currentFn, context, hint);
+      const mbEntry = getCurrentFunction();
+      if (O.isNone(mbEntry)) return;
+      const entry = mbEntry.value;
+      const { body } = entry.node;
+      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
       if (!isComponent) return;
-      const initPath = AST9.getFunctionInitPath(currentFn);
-      const id2 = getFunctionComponentIdentifier(currentFn, context);
+      const initPath = AST9.getFunctionInitPath(entry.node);
+      const id2 = getFunctionComponentIdentifier(entry.node, context);
       const name = O.flatMapNullable(id2, getComponentNameFromIdentifier);
-      const key = uid_exports.next().toString();
+      const key = getId();
       components.set(key, {
         _: key,
         id: id2,
         kind: "function",
         name,
-        node: currentFn,
+        node: entry.node,
         displayName: O.none(),
         flag: getComponentFlag(initPath),
         hint,
-        hookCalls,
+        hookCalls: entry.hookCalls,
         initPath
       });
     },
     "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']"(node) {
-      if (node.type !== AST_NODE_TYPES.AssignmentExpression) return;
       const { left, right } = node;
-      if (left.type !== AST_NODE_TYPES.MemberExpression) return;
-      const maybeComponentName = match(left.object).with({ type: AST_NODE_TYPES.Identifier }, (n) => O.some(n.name)).otherwise(O.none);
-      if (O.isNone(maybeComponentName)) return;
-      const component = Array.from(components.values()).findLast(({ name }) => O.exists(name, (n) => n === maybeComponentName.value));
+      const mbComponentName = match(left.object).with({ type: AST_NODE_TYPES.Identifier }, (n) => O.some(n.name)).otherwise(O.none);
+      if (O.isNone(mbComponentName)) return;
+      const componentName = mbComponentName.value;
+      const component = Array.from(components.values()).findLast(({ name }) => O.exists(name, (n) => n === componentName));
       if (!component) return;
       components.set(component._, {
         ...component,
@@ -565,34 +568,33 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
     },
     "CallExpression[type]:exit"(node) {
       if (!isReactHookCall(node)) return;
-      const maybeCurrentFn = getCurrentFunction();
-      if (O.isNone(maybeCurrentFn)) return;
-      const [key, currentFn, isComponent, hookCalls] = maybeCurrentFn.value;
-      functionStack.pop();
-      functionStack.push([key, currentFn, isComponent, [...hookCalls, node]]);
+      const mbEntry = getCurrentFunction();
+      if (O.isNone(mbEntry)) return;
+      const entry = mbEntry.value;
+      functionEntries.pop();
+      functionEntries.push({ ...entry, hookCalls: [...entry.hookCalls, node] });
     },
     "ReturnStatement[type]"(node) {
-      const maybeCurrentFn = getCurrentFunction();
-      if (O.isNone(maybeCurrentFn)) return;
-      const [key, currentFn, isKnown, hookCalls] = maybeCurrentFn.value;
-      if (isKnown) return;
-      const isComponent = hasNoneOrValidComponentName(currentFn, context) && JSX4.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(currentFn, context, hint);
+      const mbEntry = getCurrentFunction();
+      if (O.isNone(mbEntry)) return;
+      const entry = mbEntry.value;
+      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
       if (!isComponent) return;
-      functionStack.pop();
-      functionStack.push([key, currentFn, true, []]);
-      const initPath = AST9.getFunctionInitPath(currentFn);
-      const id2 = getFunctionComponentIdentifier(currentFn, context);
+      functionEntries.pop();
+      functionEntries.push({ ...entry, isComponent });
+      const initPath = AST9.getFunctionInitPath(entry.node);
+      const id2 = getFunctionComponentIdentifier(entry.node, context);
       const name = O.flatMapNullable(id2, getComponentNameFromIdentifier);
-      components.set(key, {
-        _: key,
+      components.set(entry.key, {
+        _: entry.key,
         id: id2,
         kind: "function",
         name,
-        node: currentFn,
+        node: entry.node,
         displayName: O.none(),
         flag: getComponentFlag(initPath),
         hint,
-        hookCalls,
+        hookCalls: entry.hookCalls,
         initPath
       });
     }
@@ -603,10 +605,10 @@ function isSetupFunction(node) {
   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 nearestRet = O.getOrNull(AST9.traverseUpGuard(node, AST9.is(AST_NODE_TYPES.ReturnStatement)));
+  const nearestRet = O.getOrNull(AST9.findParentNodeGuard(node, AST9.is(AST_NODE_TYPES.ReturnStatement)));
   if (!nearestRet) return false;
-  const nearestFunction = O.getOrNull(AST9.traverseUpGuard(node, AST9.isFunction));
-  const nearestFunctionOfRet = O.getOrNull(AST9.traverseUpGuard(nearestRet, AST9.isFunction));
+  const nearestFunction = O.getOrNull(AST9.findParentNodeGuard(node, AST9.isFunction));
+  const nearestFunctionOfRet = O.getOrNull(AST9.findParentNodeGuard(nearestRet, AST9.isFunction));
   if (!nearestFunction || !nearestFunctionOfRet) return false;
   return nearestFunction === nearestFunctionOfRet && isSetupFunction(nearestFunction);
 }
@@ -630,7 +632,7 @@ function isDeclaredInRenderPropLoose(node) {
     return true;
   }
   return F.pipe(
-    AST9.traverseUpGuard(node, AST9.is(AST_NODE_TYPES.JSXExpressionContainer)),
+    AST9.findParentNodeGuard(node, AST9.is(AST_NODE_TYPES.JSXExpressionContainer)),
     O.flatMapNullable((c) => c.parent),
     O.filter(AST9.is(AST_NODE_TYPES.JSXAttribute)),
     O.flatMapNullable((a) => a.name),
@@ -662,4 +664,4 @@ function isThisSetState(node) {
   return callee.type === AST_NODE_TYPES.MemberExpression && AST9.isThisExpression(callee.object) && callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "setState";
 }
 
-export { DEFAULT_COMPONENT_HINT, ERClassComponentFlag, ERComponentHint, ERFunctionComponentFlag, ERPhaseRelevance, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementRepresentName, getFunctionComponentIdentifier, 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, isRenderPropLoose, isSetupFunction, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, uid_exports as uid, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+export { DEFAULT_COMPONENT_HINT, ERClassComponentFlag, ERComponentHint, ERFunctionComponentFlag, ERPhaseRelevance, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementRepresentName, 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, isRenderPropLoose, isSetupFunction, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.23.1",
+  "version": "1.23.2-beta.6",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and Patterns.",
   "homepage": "https://github.com/rEl1cx/eslint-react",
   "bugs": {
@@ -33,17 +33,17 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.19.0",
-    "@typescript-eslint/type-utils": "^8.19.0",
-    "@typescript-eslint/types": "^8.19.0",
-    "@typescript-eslint/utils": "^8.19.0",
+    "@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",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.23.1",
-    "@eslint-react/eff": "1.23.1",
-    "@eslint-react/jsx": "1.23.1",
-    "@eslint-react/types": "1.23.1",
-    "@eslint-react/shared": "1.23.1",
-    "@eslint-react/var": "1.23.1"
+    "@eslint-react/ast": "1.23.2-beta.6",
+    "@eslint-react/eff": "1.23.2-beta.6",
+    "@eslint-react/jsx": "1.23.2-beta.6",
+    "@eslint-react/shared": "1.23.2-beta.6",
+    "@eslint-react/types": "1.23.2-beta.6",
+    "@eslint-react/var": "1.23.2-beta.6"
   },
   "devDependencies": {
     "tsup": "^8.3.5",