@eslint-react/core 3.0.0-next.62 → 3.0.0-next.64

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import * as ast from "@eslint-react/ast";
-import { unit } from "@eslint-react/eff";
 import { TSESTree } from "@typescript-eslint/types";
 import { RegExpLike, RuleContext } from "@eslint-react/shared";
 import { ESLintUtils, TSESTree as TSESTree$1 } from "@typescript-eslint/utils";
@@ -11,9 +10,9 @@ import * as typescript from "typescript";
  * Find the import source of a variable
  * @param name The variable name
  * @param initialScope The initial scope to search
- * @returns The import source or undefined if not found
+ * @returns The import source or null if not found
  */
-declare function findImportSource(name: string, initialScope: Scope): string | undefined;
+declare function findImportSource(name: string, initialScope: Scope): string | null;
 //#endregion
 //#region src/api/is-from-react.d.ts
 /**
@@ -38,8 +37,8 @@ declare function isInitializedFromReactNative(name: string, initialScope: Scope,
 //#region src/api/is-react-api.d.ts
 declare namespace isReactAPI {
   type ReturnType = {
-    (context: RuleContext, node: unit | null | TSESTree.Node): node is TSESTree.Identifier | TSESTree.MemberExpression;
-    (context: RuleContext): (node: unit | null | TSESTree.Node) => node is TSESTree.MemberExpression | TSESTree.Identifier;
+    (context: RuleContext, node: null | TSESTree.Node): node is TSESTree.Identifier | TSESTree.MemberExpression;
+    (context: RuleContext): (node: null | TSESTree.Node) => node is TSESTree.MemberExpression | TSESTree.Identifier;
   };
 }
 /**
@@ -50,8 +49,8 @@ declare namespace isReactAPI {
 declare function isReactAPI(api: string): isReactAPI.ReturnType;
 declare namespace isReactAPICall {
   type ReturnType = {
-    (context: RuleContext, node: unit | null | TSESTree.Node): node is TSESTree.CallExpression;
-    (context: RuleContext): (node: unit | null | TSESTree.Node) => node is TSESTree.CallExpression;
+    (context: RuleContext, node: null | TSESTree.Node): node is TSESTree.CallExpression;
+    (context: RuleContext): (node: null | TSESTree.Node) => node is TSESTree.CallExpression;
   };
 }
 /**
@@ -134,13 +133,13 @@ declare function isComponentDefinition(context: RuleContext, node: ast.TSESTreeF
  */
 interface SemanticNode {
   /** The identifier of the node */
-  id: unit | TSESTree.Node;
+  id: null | TSESTree.Node;
   /** The unique key of the node */
   key: string;
   /** The kind of the node */
   kind: string;
   /** The name of the node */
-  name: unit | string;
+  name: null | string;
   /** The flag of the node */
   flag: bigint;
   /** The hint of the node */
@@ -160,9 +159,9 @@ interface SemanticFunc extends SemanticNode {
   /** The AST node of the function */
   node: ast.TSESTreeFunction;
   /** The name of the function */
-  name: string | unit;
+  name: string | null;
   /** The return type annotation of the function */
-  type: TSESTree.TSTypeAnnotation | unit;
+  type: TSESTree.TSTypeAnnotation | null;
   /** The body of the function */
   body: TSESTree.BlockStatement | TSESTree.Expression;
   /** The directives of the function (e.g., "use strict", "use client", "use server", etc.) */
@@ -170,7 +169,7 @@ interface SemanticFunc extends SemanticNode {
   /** The parameters of the function */
   parameters: TSESTree.Parameter[];
   /** The type parameters of the function */
-  typeParameters: TSESTree.TSTypeParameterDeclaration | unit;
+  typeParameters: TSESTree.TSTypeParameterDeclaration | null;
 }
 //#endregion
 //#region src/component/component-semantic-node.d.ts
@@ -205,7 +204,7 @@ interface FunctionComponentSemanticNode extends SemanticNode {
   /**
    * The initialization path of the function
    */
-  initPath: unit | ast.FunctionInitPath;
+  initPath: null | ast.FunctionInitPath;
   /**
    * Indicates if the component is inside an export default declaration
    */
@@ -221,7 +220,7 @@ interface FunctionComponentSemanticNode extends SemanticNode {
   /**
    * The display name of the component
    */
-  displayName: unit | TSESTree.Expression;
+  displayName: null | TSESTree.Expression;
   /**
    * The directives used in the function (e.g., "use strict", "use client", etc.)
    */
@@ -234,7 +233,7 @@ interface ClassComponentSemanticNode extends SemanticNode {
   /**
    * The identifier of the component
    */
-  id: unit | TSESTree.BindingName;
+  id: null | TSESTree.BindingName;
   /**
    * The kind of component
    */
@@ -258,7 +257,7 @@ interface ClassComponentSemanticNode extends SemanticNode {
   /**
    * The display name of the component
    */
-  displayName: unit | TSESTree.Expression;
+  displayName: null | TSESTree.Expression;
 }
 /**
  * Represents a React Component
@@ -278,7 +277,7 @@ declare namespace useComponentCollector {
     ctx: {
       getAllComponents: (node: TSESTree.Program) => FunctionComponentSemanticNode[];
       getCurrentEntries: () => FunctionEntry$1[];
-      getCurrentEntry: () => FunctionEntry$1 | unit;
+      getCurrentEntry: () => FunctionEntry$1 | null;
     };
     visitor: ESLintUtils.RuleListener;
   };
@@ -413,7 +412,7 @@ declare function getComponentFlagFromInitPath(initPath: FunctionComponentSemanti
  * Get function component identifier from `const Component = memo(() => {});`
  * @param context The rule context
  * @param node The function node to analyze
- * @returns The function identifier or `unit` if not found
+ * @returns The function identifier or `null` if not found
  */
 declare function getFunctionComponentId(context: RuleContext, node: ast.TSESTreeFunction): ast.FunctionID;
 //#endregion
@@ -502,12 +501,12 @@ type FunctionSemanticNode = ClientFunctionSemanticNode | ServerFunctionSemanticN
  * Determine if a node is the setup function passed to a useEffect-like hook
  * @param node The AST node to check
  */
-declare function isUseEffectSetupCallback(node: TSESTree.Node | unit): boolean;
+declare function isUseEffectSetupCallback(node: TSESTree.Node | null): boolean;
 /**
  * Determine if a node is the cleanup function returned by a useEffect-like hook's setup function
  * @param node The AST node to check
  */
-declare function isUseEffectCleanupCallback(node: TSESTree.Node | unit): boolean;
+declare function isUseEffectCleanupCallback(node: TSESTree.Node | null): boolean;
 //#endregion
 //#region src/hook/hook-semantic-node.d.ts
 /**
@@ -537,7 +536,7 @@ declare namespace useHookCollector {
     ctx: {
       getAllHooks(node: TSESTree$1.Program): HookSemanticNode[];
       getCurrentEntries(): FunctionEntry[];
-      getCurrentEntry(): FunctionEntry | unit;
+      getCurrentEntry(): FunctionEntry | null;
     };
     visitor: ESLintUtils.RuleListener;
   };
@@ -563,53 +562,53 @@ declare function isHookId(id: TSESTree.Node): id is TSESTree.Identifier | TSESTr
  * @param node The function node to check
  * @returns True if the function is a React Hook, false otherwise
  */
-declare function isHook(node: ast.TSESTreeFunction | unit): boolean;
+declare function isHook(node: ast.TSESTreeFunction | null): boolean;
 /**
  * Check if the given node is a React Hook call by its name.
  * @param node The node to check.
  * @returns `true` if the node is a React Hook call, `false` otherwise.
  */
-declare function isHookCall(node: TSESTree.Node | unit): node is TSESTree.CallExpression;
+declare function isHookCall(node: TSESTree.Node | null): node is TSESTree.CallExpression;
 /**
  * Check if a node is a call to a specific React hook.
  * Returns a function that accepts a hook name to check against.
  * @param node The AST node to check
  * @returns A function that takes a hook name and returns boolean
  */
-declare function isHookCallWithName(node: TSESTree.Node | unit): (name: string) => boolean;
+declare function isHookCallWithName(node: TSESTree.Node | null): (name: string) => boolean;
 /**
  * Detect useEffect calls and variations (useLayoutEffect, etc.) using a regex pattern
  * @param node The AST node to check
  * @param additionalEffectHooks Regex pattern matching custom hooks that should be treated as effect hooks
  * @returns True if the node is a useEffect-like call
  */
-declare function isUseEffectLikeCall(node: TSESTree.Node | unit, additionalEffectHooks?: RegExpLike): node is TSESTree.CallExpression;
+declare function isUseEffectLikeCall(node: TSESTree.Node | null, additionalEffectHooks?: RegExpLike): node is TSESTree.CallExpression;
 /**
  * Detect useState calls and variations (useCustomState, etc.) using a regex pattern
  * @param node The AST node to check
  * @param additionalStateHooks Regex pattern matching custom hooks that should be treated as state hooks
  * @returns True if the node is a useState-like call
  */
-declare function isUseStateLikeCall(node: TSESTree.Node | unit, additionalStateHooks?: RegExpLike): node is TSESTree.CallExpression;
-declare const isUseCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseActionStateCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseCallbackCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseContextCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseDebugValueCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseDeferredValueCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseEffectCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseFormStatusCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseIdCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseImperativeHandleCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseInsertionEffectCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseLayoutEffectCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseMemoCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseOptimisticCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseReducerCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseRefCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseStateCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseSyncExternalStoreCall: (node: TSESTree.Node | undefined) => boolean;
-declare const isUseTransitionCall: (node: TSESTree.Node | undefined) => boolean;
+declare function isUseStateLikeCall(node: TSESTree.Node | null, additionalStateHooks?: RegExpLike): node is TSESTree.CallExpression;
+declare const isUseCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseActionStateCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseCallbackCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseContextCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseDebugValueCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseDeferredValueCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseEffectCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseFormStatusCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseIdCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseImperativeHandleCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseInsertionEffectCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseLayoutEffectCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseMemoCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseOptimisticCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseReducerCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseRefCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseStateCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseSyncExternalStoreCall: (node: TSESTree.Node | null) => boolean;
+declare const isUseTransitionCall: (node: TSESTree.Node | null) => boolean;
 //#endregion
 //#region src/hook/hook-name.d.ts
 declare const REACT_BUILTIN_HOOK_NAMES: readonly ["use", "useActionState", "useCallback", "useContext", "useDebugValue", "useDeferredValue", "useEffect", "useFormStatus", "useId", "useImperativeHandle", "useInsertionEffect", "useLayoutEffect", "useMemo", "useOptimistic", "useReducer", "useRef", "useState", "useSyncExternalStore", "useTransition"];
@@ -690,11 +689,11 @@ declare function resolveJsxAttributeValue(context: RuleContext, attribute: ast.T
 } | {
   readonly kind: "element";
   readonly node: TSESTree.JSXElement;
-  readonly toStatic: () => undefined;
+  readonly toStatic: () => null;
 } | {
   readonly kind: "spreadChild";
   readonly node: TSESTree.JSXEmptyExpression | TSESTree.Expression;
-  readonly toStatic: () => undefined;
+  readonly toStatic: () => null;
 } | {
   readonly kind: "spreadProps";
   readonly node: TSESTree.Expression;
@@ -763,20 +762,17 @@ declare const DEFAULT_JSX_DETECTION_HINT: bigint;
  * @param node The AST node to check
  * @returns `true` if the node is a `JSXText` or a `Literal` node
  */
-declare function isJsxText(node: TSESTree$1.Node | null | unit): node is TSESTree$1.JSXText | TSESTree$1.Literal;
+declare function isJsxText(node: TSESTree$1.Node | null): node is TSESTree$1.JSXText | TSESTree$1.Literal;
 /**
  * Determine if a node represents JSX-like content based on heuristics
  * Supports configuration through hint flags to customize detection behavior
  *
- * @param code The source code with scope lookup capability
- * @param code.getScope The function to get the scope of a node
+ * @param context The rule context with scope lookup capability
  * @param node The AST node to analyze
  * @param hint The configuration flags to adjust detection behavior
  * @returns boolean Whether the node is considered JSX-like
  */
-declare function isJsxLike(code: {
-  getScope: (node: TSESTree$1.Node) => Scope;
-}, node: TSESTree$1.Node | unit | null, hint?: JsxDetectionHint): boolean;
+declare function isJsxLike(context: RuleContext, node: TSESTree$1.Node | null, hint?: JsxDetectionHint): boolean;
 //#endregion
 //#region src/jsx/jsx-element-is.d.ts
 /**
@@ -819,9 +815,9 @@ declare function getJsxElementType(context: RuleContext, node: TSESTree.JSXEleme
  * @param node The starting AST node
  * @param test Optional predicate function to test if the attribute meets criteria
  *               Defaults to always returning true (matches any attribute)
- * @returns The first matching JSX attribute node found when traversing upwards, or undefined
+ * @returns The first matching JSX attribute node found when traversing upwards, or null
  */
-declare function findParentJsxAttribute(node: TSESTree.Node, test?: (node: TSESTree.JSXAttribute) => boolean): TSESTree.JSXAttribute | unit;
+declare function findParentJsxAttribute(node: TSESTree.Node, test?: (node: TSESTree.JSXAttribute) => boolean): TSESTree.JSXAttribute | null;
 //#endregion
 //#region src/jsx/jsx-stringify.d.ts
 /**
@@ -847,9 +843,9 @@ declare function isInitializedFromRef(name: string, initialScope: Scope): boolea
  * Get the init expression of a ref variable
  * @param name The variable name
  * @param initialScope The initial scope
- * @returns The init expression node if the variable is derived from a ref, or undefined otherwise
+ * @returns The init expression node if the variable is derived from a ref, or null otherwise
  */
-declare function getRefInit(name: string, initialScope: Scope): TSESTree$1.Expression | unit;
+declare function getRefInit(name: string, initialScope: Scope): TSESTree$1.Expression | null;
 //#endregion
 //#region src/ref/ref-name.d.ts
 /**

package/dist/index.js

@@ -1,17 +1,17 @@
 import * as ast from "@eslint-react/ast";
-import { constFalse, constTrue, dual, flip, getOrElseUpdate, identity, unit } from "@eslint-react/eff";
-import { findVariable } from "@eslint-react/var";
+import { constFalse, constTrue, dual, flip, getOrElseUpdate, identity } from "@eslint-react/eff";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
+import { findVariable, getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import { P, match } from "ts-pattern";
 import { IdGenerator, RE_ANNOTATION_JSX, RE_ANNOTATION_JSX_FRAG, RE_ANNOTATION_JSX_IMPORT_SOURCE, RE_ANNOTATION_JSX_RUNTIME, RE_COMPONENT_NAME, RE_COMPONENT_NAME_LOOSE } from "@eslint-react/shared";
-import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
+import { resolve } from "@eslint-react/var";
 import { AST_NODE_TYPES as AST_NODE_TYPES$1 } from "@typescript-eslint/utils";
 
 //#region src/api/find-import-source.ts
 /**
 * Get the arguments of a require expression
 * @param node The node to match
-* @returns The require expression arguments or undefined if the node is not a require expression
+* @returns The require expression arguments or null if the node is not a require expression
 * @internal
 */
 function getRequireExpressionArguments(node) {
@@ -31,22 +31,22 @@ function getRequireExpressionArguments(node) {
 * Find the import source of a variable
 * @param name The variable name
 * @param initialScope The initial scope to search
-* @returns The import source or undefined if not found
+* @returns The import source or null if not found
 */
 function findImportSource(name, initialScope) {
-	const latestDef = findVariable(name, initialScope)?.defs.at(-1);
-	if (latestDef == null) return unit;
+	const latestDef = findVariable(initialScope, name)?.defs.at(-1);
+	if (latestDef == null) return null;
 	const { node, parent } = latestDef;
 	if (node.type === AST_NODE_TYPES.VariableDeclarator && node.init != null) {
 		const { init } = node;
 		if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) return findImportSource(init.object.name, initialScope);
 		if (init.type === AST_NODE_TYPES.Identifier) return findImportSource(init.name, initialScope);
 		const arg0 = getRequireExpressionArguments(init)?.[0];
-		if (arg0 == null || !ast.isLiteral(arg0, "string")) return unit;
+		if (arg0 == null || !ast.isLiteral(arg0, "string")) return null;
 		return arg0.value;
 	}
 	if (parent?.type === AST_NODE_TYPES.ImportDeclaration) return parent.source.value;
-	return unit;
+	return null;
 }
 
 //#endregion
@@ -313,7 +313,7 @@ function useHookCollector(context) {
 	const hooks = /* @__PURE__ */ new Map();
 	const functionEntries = [];
 	const getText = (n) => context.sourceCode.getText(n);
-	const getCurrentEntry = () => functionEntries.at(-1);
+	const getCurrentEntry = () => functionEntries.at(-1) ?? null;
 	const onFunctionEnter = (node) => {
 		const id = ast.getFunctionId(node);
 		const key = idGen$2.next();
@@ -401,7 +401,7 @@ function getJsxAttributeName(context, node) {
 * @param initialScope (Optional) The initial scope to use for variable resolution
 */
 function getJsxAttribute(context, node, initialScope) {
-	const scope = initialScope ?? context.sourceCode.getScope(node);
+	initialScope ?? context.sourceCode.getScope(node);
 	const attributes = node.openingElement.attributes;
 	/**
 	* Finds the last occurrence of a specific attribute
@@ -412,15 +412,7 @@ function getJsxAttribute(context, node, initialScope) {
 			if (attr.type === AST_NODE_TYPES.JSXAttribute) return getJsxAttributeName(context, attr) === name;
 			switch (attr.argument.type) {
 				case AST_NODE_TYPES.Identifier: {
-					const variable = findVariable(attr.argument.name, scope);
-					function resolve(v) {
-						if (v == null) return unit;
-						const def = v.defs.at(0);
-						if (def == null) return unit;
-						if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
-						return unit;
-					}
-					const initNode = resolve(variable);
+					const initNode = resolve(context, attr.argument);
 					if (initNode?.type === AST_NODE_TYPES.ObjectExpression) return ast.findProperty(initNode.properties, name) != null;
 					return false;
 				}
@@ -478,14 +470,14 @@ function resolveJsxAttributeValue(context, attribute) {
 				kind: "element",
 				node: node.value,
 				toStatic() {
-					return unit;
+					return null;
 				}
 			};
 			case AST_NODE_TYPES.JSXSpreadChild: return {
 				kind: "spreadChild",
 				node: node.value.expression,
 				toStatic() {
-					return unit;
+					return null;
 				}
 			};
 		}
@@ -499,8 +491,8 @@ function resolveJsxAttributeValue(context, attribute) {
 			kind: "spreadProps",
 			node: node.argument,
 			toStatic(name) {
-				if (name == null) return unit;
-				return match(getStaticValue(node.argument, initialScope)?.value).with({ [name]: P.select(P.any) }, identity).otherwise(() => unit);
+				if (name == null) return null;
+				return match(getStaticValue(node.argument, initialScope)?.value).with({ [name]: P.select(P.any) }, identity).otherwise(() => null);
 			}
 		};
 	}
@@ -594,13 +586,12 @@ function isJsxText(node) {
 * Determine if a node represents JSX-like content based on heuristics
 * Supports configuration through hint flags to customize detection behavior
 *
-* @param code The source code with scope lookup capability
-* @param code.getScope The function to get the scope of a node
+* @param context The rule context with scope lookup capability
 * @param node The AST node to analyze
 * @param hint The configuration flags to adjust detection behavior
 * @returns boolean Whether the node is considered JSX-like
 */
-function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
+function isJsxLike(context, node, hint = DEFAULT_JSX_DETECTION_HINT) {
 	if (node == null) return false;
 	if (ast.isJSX(node)) return true;
 	switch (node.type) {
@@ -616,27 +607,27 @@ function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
 		case AST_NODE_TYPES.TemplateLiteral: return !(hint & JsxDetectionHint.DoNotIncludeJsxWithStringValue);
 		case AST_NODE_TYPES.ArrayExpression:
 			if (node.elements.length === 0) return !(hint & JsxDetectionHint.DoNotIncludeJsxWithEmptyArrayValue);
-			if (hint & JsxDetectionHint.RequireAllArrayElementsToBeJsx) return node.elements.every((n) => isJsxLike(code, n, hint));
-			return node.elements.some((n) => isJsxLike(code, n, hint));
+			if (hint & JsxDetectionHint.RequireAllArrayElementsToBeJsx) return node.elements.every((n) => isJsxLike(context, n, hint));
+			return node.elements.some((n) => isJsxLike(context, n, hint));
 		case AST_NODE_TYPES.LogicalExpression:
-			if (hint & JsxDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx) return isJsxLike(code, node.left, hint) && isJsxLike(code, node.right, hint);
-			return isJsxLike(code, node.left, hint) || isJsxLike(code, node.right, hint);
+			if (hint & JsxDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx) return isJsxLike(context, node.left, hint) && isJsxLike(context, node.right, hint);
+			return isJsxLike(context, node.left, hint) || isJsxLike(context, node.right, hint);
 		case AST_NODE_TYPES.ConditionalExpression: {
 			function leftHasJSX(node) {
 				if (Array.isArray(node.consequent)) {
 					if (node.consequent.length === 0) return !(hint & JsxDetectionHint.DoNotIncludeJsxWithEmptyArrayValue);
-					if (hint & JsxDetectionHint.RequireAllArrayElementsToBeJsx) return node.consequent.every((n) => isJsxLike(code, n, hint));
-					return node.consequent.some((n) => isJsxLike(code, n, hint));
+					if (hint & JsxDetectionHint.RequireAllArrayElementsToBeJsx) return node.consequent.every((n) => isJsxLike(context, n, hint));
+					return node.consequent.some((n) => isJsxLike(context, n, hint));
 				}
-				return isJsxLike(code, node.consequent, hint);
+				return isJsxLike(context, node.consequent, hint);
 			}
 			function rightHasJSX(node) {
-				return isJsxLike(code, node.alternate, hint);
+				return isJsxLike(context, node.alternate, hint);
 			}
 			if (hint & JsxDetectionHint.RequireBothBranchesOfConditionalExpressionToBeJsx) return leftHasJSX(node) && rightHasJSX(node);
 			return leftHasJSX(node) || rightHasJSX(node);
 		}
-		case AST_NODE_TYPES.SequenceExpression: return isJsxLike(code, node.expressions.at(-1), hint);
+		case AST_NODE_TYPES.SequenceExpression: return isJsxLike(context, node.expressions.at(-1) ?? null, hint);
 		case AST_NODE_TYPES.CallExpression:
 			if (hint & JsxDetectionHint.DoNotIncludeJsxWithCreateElementValue) return false;
 			switch (node.callee.type) {
@@ -644,19 +635,10 @@ function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
 				case AST_NODE_TYPES.MemberExpression: return node.callee.property.type === AST_NODE_TYPES.Identifier && node.callee.property.name === "createElement";
 			}
 			return false;
-		case AST_NODE_TYPES.Identifier: {
-			const { name } = node;
-			if (name === "undefined") return !(hint & JsxDetectionHint.DoNotIncludeJsxWithUndefinedValue);
+		case AST_NODE_TYPES.Identifier:
+			if (node.name === "undefined") return !(hint & JsxDetectionHint.DoNotIncludeJsxWithUndefinedValue);
 			if (ast.isJSXTagNameExpression(node)) return true;
-			function resolve(v) {
-				if (v == null) return unit;
-				const def = v.defs.at(0);
-				if (def == null) return unit;
-				if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
-				return unit;
-			}
-			return isJsxLike(code, resolve(findVariable(name, code.getScope(node))), hint);
-		}
+			return isJsxLike(context, resolve(context, node), hint);
 	}
 	return false;
 }
@@ -714,7 +696,7 @@ function isJsxFragmentElement(context, node, jsxConfig) {
 * @param node The starting AST node
 * @param test Optional predicate function to test if the attribute meets criteria
 *               Defaults to always returning true (matches any attribute)
-* @returns The first matching JSX attribute node found when traversing upwards, or undefined
+* @returns The first matching JSX attribute node found when traversing upwards, or null
 */
 function findParentJsxAttribute(node, test = constTrue) {
 	const guard = (node) => {
@@ -902,7 +884,7 @@ function isComponentWrapperCallbackLoose(context, node) {
 * Get function component identifier from `const Component = memo(() => {});`
 * @param context The rule context
 * @param node The function node to analyze
-* @returns The function identifier or `unit` if not found
+* @returns The function identifier or `null` if not found
 */
 function getFunctionComponentId(context, node) {
 	const functionId = ast.getFunctionId(node);
@@ -910,7 +892,7 @@ function getFunctionComponentId(context, node) {
 	const { parent } = node;
 	if (parent.type === AST_NODE_TYPES.CallExpression && isComponentWrapperCallLoose(context, parent) && parent.parent.type === AST_NODE_TYPES.VariableDeclarator) return parent.parent.id;
 	if (parent.type === AST_NODE_TYPES.CallExpression && isComponentWrapperCallLoose(context, parent) && parent.parent.type === AST_NODE_TYPES.CallExpression && isComponentWrapperCallLoose(context, parent.parent) && parent.parent.parent.type === AST_NODE_TYPES.VariableDeclarator) return parent.parent.parent.id;
-	return unit;
+	return null;
 }
 
 //#endregion
@@ -1050,14 +1032,14 @@ function useComponentCollector(context, options = {}) {
 	const functionEntries = [];
 	const components = /* @__PURE__ */ new Map();
 	const getText = (n) => context.sourceCode.getText(n);
-	const getCurrentEntry = () => functionEntries.at(-1);
+	const getCurrentEntry = () => functionEntries.at(-1) ?? null;
 	const onFunctionEnter = (node) => {
 		const key = idGen$1.next();
 		const exp = ast.findParentNode(node, (n) => n.type === AST_NODE_TYPES.ExportDefaultDeclaration);
 		const isExportDefault = exp != null;
 		const isExportDefaultDeclaration = exp != null && ast.getUnderlyingExpression(exp.declaration) === node;
 		const id = getFunctionComponentId(context, node);
-		const name = id == null ? unit : ast.getFullyQualifiedName(id, getText);
+		const name = id == null ? null : ast.getFullyQualifiedName(id, getText);
 		const initPath = ast.getFunctionInitPath(node);
 		const directives = ast.getFunctionDirectives(node);
 		const entry = {
@@ -1066,7 +1048,7 @@ function useComponentCollector(context, options = {}) {
 			kind: "function-component",
 			name,
 			directives,
-			displayName: unit,
+			displayName: null,
 			flag: getComponentFlagFromInitPath(initPath),
 			hint,
 			hookCalls: [],
@@ -1104,13 +1086,13 @@ function useComponentCollector(context, options = {}) {
 				if (body.type === AST_NODE_TYPES.BlockStatement) return;
 				entry.rets.push(body);
 				if (!entry.isComponentDefinition) return;
-				if (!components.has(entry.key) && !isJsxLike(context.sourceCode, body, hint)) return;
+				if (!components.has(entry.key) && !isJsxLike(context, body, hint)) return;
 				components.set(entry.key, entry);
 			},
 			...collectDisplayName ? { [ast.SEL_DISPLAY_NAME_ASSIGNMENT_EXPRESSION](node) {
 				const { left, right } = node;
 				if (left.type !== AST_NODE_TYPES.MemberExpression) return;
-				const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : unit;
+				const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : null;
 				const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
 				if (component == null) return;
 				component.displayName = right;
@@ -1129,7 +1111,7 @@ function useComponentCollector(context, options = {}) {
 				entry.rets.push(node.argument);
 				if (!entry.isComponentDefinition) return;
 				const { argument } = node;
-				if (!components.has(entry.key) && !isJsxLike(context.sourceCode, argument, hint)) return;
+				if (!components.has(entry.key) && !isJsxLike(context, argument, hint)) return;
 				components.set(entry.key, entry);
 			}
 		}
@@ -1154,14 +1136,14 @@ function useComponentCollectorLegacy(context) {
 		if (!isClassComponent(node)) return;
 		const id = ast.getClassId(node);
 		const key = idGen.next();
-		const name = id == null ? unit : ast.getFullyQualifiedName(id, getText);
+		const name = id == null ? null : ast.getFullyQualifiedName(id, getText);
 		const flag = isPureComponent(node) ? ComponentFlag.PureComponent : ComponentFlag.None;
 		components.set(key, {
 			id,
 			key,
 			kind: "class-component",
 			name,
-			displayName: unit,
+			displayName: null,
 			flag,
 			hint: 0n,
 			methods: [],
@@ -1209,10 +1191,10 @@ function isInitializedFromRef(name, initialScope) {
 * Get the init expression of a ref variable
 * @param name The variable name
 * @param initialScope The initial scope
-* @returns The init expression node if the variable is derived from a ref, or undefined otherwise
+* @returns The init expression node if the variable is derived from a ref, or null otherwise
 */
 function getRefInit(name, initialScope) {
-	for (const { node } of findVariable(initialScope)(name)?.defs ?? []) {
+	for (const { node } of findVariable(initialScope, name)?.defs ?? []) {
 		if (node.type !== AST_NODE_TYPES$1.VariableDeclarator) continue;
 		const init = node.init;
 		if (init == null) continue;
@@ -1221,7 +1203,7 @@ function getRefInit(name, initialScope) {
 			case init.type === AST_NODE_TYPES$1.CallExpression && isUseRefCall(init): return init;
 		}
 	}
-	return unit;
+	return null;
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "3.0.0-next.62",
+  "version": "3.0.0-next.64",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -34,10 +34,10 @@
     "@typescript-eslint/types": "canary",
     "@typescript-eslint/utils": "canary",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-next.62",
-    "@eslint-react/var": "3.0.0-next.62",
-    "@eslint-react/eff": "3.0.0-next.62",
-    "@eslint-react/shared": "3.0.0-next.62"
+    "@eslint-react/ast": "3.0.0-next.64",
+    "@eslint-react/shared": "3.0.0-next.64",
+    "@eslint-react/eff": "3.0.0-next.64",
+    "@eslint-react/var": "3.0.0-next.64"
   },
   "devDependencies": {
     "tsdown": "^0.21.0-beta.2",