@eslint-react/core 2.6.4-next.0 → 2.6.5-next.0

package/dist/index.d.ts

@@ -13,18 +13,6 @@ type ComponentDetectionHint = bigint;
  * Hints for component collector
  */
 declare const ComponentDetectionHint: {
-  /**
-       * Skip function component created by React.memo
-       */
-  readonly SkipMemo: bigint;
-  /**
-       * Skip function component created by React.forwardRef
-       */
-  readonly SkipForwardRef: bigint;
-  /**
-       * Skip function component defined as array map argument
-       */
-  readonly SkipArrayMapArgument: bigint;
   /**
        * Skip function component defined on object method
        */
@@ -37,6 +25,10 @@ declare const ComponentDetectionHint: {
        * Skip function component defined on class property
        */
   readonly SkipClassProperty: bigint;
+  /**
+       * Skip function component defined as array map callback
+       */
+  readonly SkipArrayMapCallback: bigint;
   readonly None: 0n;
   readonly SkipUndefined: bigint;
   readonly SkipNullLiteral: bigint;
@@ -72,7 +64,7 @@ interface SemanticEntry {
 //#endregion
 //#region src/semantic/semantic-node.d.ts
 interface SemanticNode {
-  id: unit | TSESTree.Identifier | TSESTree.Identifier[];
+  id: unit | TSESTree.Node;
   key: string;
   kind: string;
   name: unit | string;
@@ -100,7 +92,7 @@ interface FunctionComponent extends SemanticNode {
   /**
        * The identifier or identifier sequence of the component
        */
-  id: unit | TSESTree.Identifier | TSESTree.Identifier[];
+  id: unit | AST.FunctionID;
   /**
        * The kind of component
        */
@@ -117,6 +109,10 @@ interface FunctionComponent extends SemanticNode {
        * Hint for how the component was detected
        */
   hint: ComponentDetectionHint;
+  /**
+       * List of expressions returned by the component
+       */
+  rets: TSESTree.ReturnStatement["argument"][];
   /**
        * The initialization path of the function
        */
@@ -174,6 +170,7 @@ type FunctionEntry$1 = {
   node: AST.TSESTreeFunction;
   hookCalls: TSESTree.CallExpression[];
   isComponent: boolean;
+  rets: TSESTree.ReturnStatement["argument"][];
 };
 declare namespace useComponentCollector {
   type Options = {
@@ -237,7 +234,7 @@ declare function isAssignmentToThisState(node: TSESTree$1.AssignmentExpression):
 declare function isComponentDefinition(context: RuleContext, node: AST.TSESTreeFunction, hint: bigint): boolean;
 //#endregion
 //#region src/component/component-id.d.ts
-declare function getFunctionComponentId(context: RuleContext, node: AST.TSESTreeFunction): TSESTree.Identifier | TSESTree.Identifier[] | unit;
+declare function getFunctionComponentId(context: RuleContext, node: AST.TSESTreeFunction): AST.FunctionID | unit;
 //#endregion
 //#region src/component/component-init-path.d.ts
 declare function getComponentFlagFromInitPath(initPath: FunctionComponent["initPath"]): bigint;
@@ -304,11 +301,6 @@ declare function isComponentName(name: string): boolean;
  * @param name The name to check
  */
 declare function isComponentNameLoose(name: string): boolean;
-/**
- * Get component name from an identifier or identifier sequence (e.g., MemberExpression)
- * @param id The identifier or identifier sequence
- */
-declare function getComponentNameFromId(id: TSESTree.Identifier | TSESTree.Identifier[] | unit): string | undefined;
 /**
  * Check if the function has no name or a loose component name
  * @param context The rule context
@@ -404,10 +396,56 @@ declare function isComponentWrapperCall(context: RuleContext, node: TSESTree.Nod
  * @returns `true` if the node is a call expression for a component wrapper loosely
  */
 declare function isComponentWrapperCallLoose(context: RuleContext, node: TSESTree.Node): boolean;
+/**
+ * Check if the node is a callback function passed to a component wrapper
+ * @param context The ESLint rule context
+ * @param node The node to check
+ * @returns `true` if the node is a callback function passed to a component wrapper
+ */
+declare function isComponentWrapperCallback(context: RuleContext, node: TSESTree.Node): boolean;
+/**
+ * Check if the node is a callback function passed to a component wrapper loosely
+ * @param context The ESLint rule context
+ * @param node The node to check
+ * @returns `true` if the node is a callback function passed to a component wrapper loosely
+ */
+declare function isComponentWrapperCallbackLoose(context: RuleContext, node: TSESTree.Node): boolean;
+//#endregion
+//#region src/hierarchy/find-enclosing-assignment-target.d.ts
+/**
+ * Finds the enclosing assignment target (variable, property, etc.) for a given node
+ *
+ * @todo Verify correctness and completeness of this function
+ * @param node The starting node
+ * @returns The enclosing assignment target node, or undefined if not found
+ */
+declare function findEnclosingAssignmentTarget(node: TSESTree.Node): TSESTree.ArrayExpression | TSESTree.ArrayPattern | TSESTree.ArrowFunctionExpression | TSESTree.AssignmentExpression | TSESTree.AwaitExpression | TSESTree.PrivateInExpression | TSESTree.SymmetricBinaryExpression | TSESTree.CallExpression | TSESTree.ChainExpression | TSESTree.ClassExpression | TSESTree.ConditionalExpression | TSESTree.FunctionExpression | TSESTree.Identifier | TSESTree.ImportExpression | TSESTree.JSXElement | TSESTree.JSXFragment | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.LogicalExpression | TSESTree.MemberExpressionComputedName | TSESTree.MemberExpressionNonComputedName | TSESTree.MetaProperty | TSESTree.NewExpression | TSESTree.ObjectExpression | TSESTree.ObjectPattern | TSESTree.PrivateIdentifier | TSESTree.SequenceExpression | TSESTree.Super | TSESTree.TaggedTemplateExpression | TSESTree.TemplateLiteral | TSESTree.ThisExpression | TSESTree.TSAsExpression | TSESTree.TSInstantiationExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion | TSESTree.UnaryExpressionBitwiseNot | TSESTree.UnaryExpressionDelete | TSESTree.UnaryExpressionMinus | TSESTree.UnaryExpressionNot | TSESTree.UnaryExpressionPlus | TSESTree.UnaryExpressionTypeof | TSESTree.UnaryExpressionVoid | TSESTree.UpdateExpression | TSESTree.YieldExpression | undefined;
+/**
+ * Type representing the possible assignment targets returned by `findEnclosingAssignmentTarget`
+ */
+type AssignmentTarget = ReturnType<typeof findEnclosingAssignmentTarget>;
+//#endregion
+//#region src/hierarchy/find-enclosing-component-or-hook.d.ts
+type FindEnclosingComponentOrHookFilter = (n: TSESTree.Node, name: string | null) => boolean;
+/**
+ * Find the enclosing React component or hook for a given AST node.
+ * @param node The AST node to start the search from.
+ * @param test Optional test function to customize component or hook identification.
+ * @returns The enclosing component or hook node, or `null` if none is found.
+ */
+declare function findEnclosingComponentOrHook(node: TSESTree.Node | unit, test?: FindEnclosingComponentOrHookFilter): TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression | undefined;
+//#endregion
+//#region src/hierarchy/is-inside-component-or-hook.d.ts
+/**
+ * Checks if a given AST node is inside a React component or hook.
+ * @param node The AST node to check.
+ * @returns True if the node is inside a component or hook, false otherwise.
+ */
+declare function isInsideComponentOrHook(node: TSESTree.Node | unit): boolean;
 //#endregion
 //#region src/hook/hook-semantic-node.d.ts
 interface Hook extends SemanticNode {
-  id: TSESTree.Identifier | unit;
+  id: AST.FunctionID | unit;
   node: AST.TSESTreeFunction;
   name: string;
   hookCalls: TSESTree.CallExpression[];
@@ -429,10 +467,10 @@ declare namespace useHookCollector {
     listeners: ESLintUtils.RuleListener;
   };
 }
-declare function useHookCollector(): useHookCollector.ReturnType;
+declare function useHookCollector(context: RuleContext): useHookCollector.ReturnType;
 //#endregion
 //#region src/hook/hook-id.d.ts
-declare function isReactHookId(id: TSESTree.Identifier | TSESTree.MemberExpression): boolean;
+declare function isReactHookId(id: TSESTree.Node): id is TSESTree.Identifier | TSESTree.MemberExpression;
 //#endregion
 //#region src/hook/hook-is.d.ts
 /**
@@ -720,20 +758,6 @@ declare function findParentJsxAttribute(node: TSESTree.Node, test?: (node: TSEST
  */
 declare function stringifyJsx(node: TSESTree$1.JSXIdentifier | TSESTree$1.JSXNamespacedName | TSESTree$1.JSXMemberExpression | TSESTree$1.JSXOpeningElement | TSESTree$1.JSXClosingElement | TSESTree$1.JSXOpeningFragment | TSESTree$1.JSXClosingFragment | TSESTree$1.JSXText): string;
 //#endregion
-//#region src/utils/find-enclosing-assignment-target.d.ts
-/**
- * Finds the enclosing assignment target (variable, property, etc.) for a given node
- *
- * @todo Verify correctness and completeness of this function
- * @param node The starting node
- * @returns The enclosing assignment target node, or undefined if not found
- */
-declare function findEnclosingAssignmentTarget(node: TSESTree.Node): TSESTree.ArrayExpression | TSESTree.ArrayPattern | TSESTree.ArrowFunctionExpression | TSESTree.AssignmentExpression | TSESTree.AwaitExpression | TSESTree.PrivateInExpression | TSESTree.SymmetricBinaryExpression | TSESTree.CallExpression | TSESTree.ChainExpression | TSESTree.ClassExpression | TSESTree.ConditionalExpression | TSESTree.FunctionExpression | TSESTree.Identifier | TSESTree.ImportExpression | TSESTree.JSXElement | TSESTree.JSXFragment | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.LogicalExpression | TSESTree.MemberExpressionComputedName | TSESTree.MemberExpressionNonComputedName | TSESTree.MetaProperty | TSESTree.NewExpression | TSESTree.ObjectExpression | TSESTree.ObjectPattern | TSESTree.PrivateIdentifier | TSESTree.SequenceExpression | TSESTree.Super | TSESTree.TaggedTemplateExpression | TSESTree.TemplateLiteral | TSESTree.ThisExpression | TSESTree.TSAsExpression | TSESTree.TSInstantiationExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion | TSESTree.UnaryExpressionBitwiseNot | TSESTree.UnaryExpressionDelete | TSESTree.UnaryExpressionMinus | TSESTree.UnaryExpressionNot | TSESTree.UnaryExpressionPlus | TSESTree.UnaryExpressionTypeof | TSESTree.UnaryExpressionVoid | TSESTree.UpdateExpression | TSESTree.YieldExpression | undefined;
-/**
- * Type representing the possible assignment targets returned by `findEnclosingAssignmentTarget`
- */
-type AssignmentTarget = ReturnType<typeof findEnclosingAssignmentTarget>;
-//#endregion
 //#region src/utils/is-from-react.d.ts
 /**
  * Checks if a variable is initialized from React import
@@ -810,4 +834,4 @@ declare const isForwardRefCall: isReactAPICall.ReturnType;
 declare const isMemoCall: isReactAPICall.ReturnType;
 declare const isLazyCall: isReactAPICall.ReturnType;
 //#endregion
-export { AssignmentTarget, ClassComponent, Component, ComponentDetectionHint, ComponentEffectPhaseKind, ComponentFlag, ComponentKind, ComponentLifecyclePhaseKind, ComponentPhaseKind, ComponentPhaseRelevance, DEFAULT_COMPONENT_DETECTION_HINT, DEFAULT_JSX_DETECTION_HINT, FunctionComponent, Hook, JsxAttributeValue, JsxConfig, JsxDetectionHint, JsxEmit, REACT_BUILTIN_HOOK_NAMES, SemanticEntry, SemanticNode, findEnclosingAssignmentTarget, findParentJsxAttribute, getComponentFlagFromInitPath, getComponentNameFromId, getFunctionComponentId, getJsxAttribute, getJsxAttributeName, getJsxConfigFromAnnotation, getJsxConfigFromContext, getJsxElementType, getPhaseKindOfFunction, hasNoneOrLooseComponentName, isAssignmentToThisState, isCaptureOwnerStack, isCaptureOwnerStackCall, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDefinition, isComponentDidCatch, isComponentDidMount, isComponentDidUpdate, isComponentName, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUnmount, isComponentWillUpdate, isComponentWrapperCall, isComponentWrapperCallLoose, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount, isFunctionOfUseEffectCleanup, isFunctionOfUseEffectSetup, isGetChildContext, isGetDefaultProps, isGetDerivedStateFromError, isGetDerivedStateFromProps, isGetInitialState, isGetSnapshotBeforeUpdate, isInitializedFromReact, isInitializedFromReactNative, isInstanceIdEqual, isInversePhase, isJsxFragmentElement, isJsxHostElement, isJsxLike, isJsxText, isLazy, isLazyCall, isMemo, isMemoCall, isPureComponent, isReactAPI, isReactAPICall, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookId, isReactHookName, isRender, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isShouldComponentUpdate, isThisSetState, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseActionStateCall, isUseCall, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectLikeCall, isUseFormStatusCall, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseOptimisticCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, resolveJsxAttributeValue, stringifyJsx, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+export { AssignmentTarget, ClassComponent, Component, ComponentDetectionHint, ComponentEffectPhaseKind, ComponentFlag, ComponentKind, ComponentLifecyclePhaseKind, ComponentPhaseKind, ComponentPhaseRelevance, DEFAULT_COMPONENT_DETECTION_HINT, DEFAULT_JSX_DETECTION_HINT, FindEnclosingComponentOrHookFilter, FunctionComponent, Hook, JsxAttributeValue, JsxConfig, JsxDetectionHint, JsxEmit, REACT_BUILTIN_HOOK_NAMES, SemanticEntry, SemanticNode, findEnclosingAssignmentTarget, findEnclosingComponentOrHook, findParentJsxAttribute, getComponentFlagFromInitPath, getFunctionComponentId, getJsxAttribute, getJsxAttributeName, getJsxConfigFromAnnotation, getJsxConfigFromContext, getJsxElementType, getPhaseKindOfFunction, hasNoneOrLooseComponentName, isAssignmentToThisState, isCaptureOwnerStack, isCaptureOwnerStackCall, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDefinition, isComponentDidCatch, isComponentDidMount, isComponentDidUpdate, isComponentName, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUnmount, isComponentWillUpdate, isComponentWrapperCall, isComponentWrapperCallLoose, isComponentWrapperCallback, isComponentWrapperCallbackLoose, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount, isFunctionOfUseEffectCleanup, isFunctionOfUseEffectSetup, isGetChildContext, isGetDefaultProps, isGetDerivedStateFromError, isGetDerivedStateFromProps, isGetInitialState, isGetSnapshotBeforeUpdate, isInitializedFromReact, isInitializedFromReactNative, isInsideComponentOrHook, isInstanceIdEqual, isInversePhase, isJsxFragmentElement, isJsxHostElement, isJsxLike, isJsxText, isLazy, isLazyCall, isMemo, isMemoCall, isPureComponent, isReactAPI, isReactAPICall, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookId, isReactHookName, isRender, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isShouldComponentUpdate, isThisSetState, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseActionStateCall, isUseCall, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectLikeCall, isUseFormStatusCall, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseOptimisticCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, resolveJsxAttributeValue, stringifyJsx, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/dist/index.js

@@ -40,6 +40,16 @@ function isReactHookName(name) {
 	return name === "use" || /^use[A-Z0-9]/.test(name);
 }
 
+//#endregion
+//#region src/hook/hook-id.ts
+function isReactHookId(id) {
+	switch (id.type) {
+		case AST_NODE_TYPES.Identifier: return isReactHookName(id.name);
+		case AST_NODE_TYPES.MemberExpression: return "name" in id.property && isReactHookName(id.property.name);
+		default: return false;
+	}
+}
+
 //#endregion
 //#region src/hook/hook-is.ts
 /**
@@ -50,7 +60,11 @@ function isReactHookName(name) {
 function isReactHook(node) {
 	if (node == null) return false;
 	const id = AST.getFunctionId(node);
-	return id?.name != null && isReactHookName(id.name);
+	switch (id?.type) {
+		case AST_NODE_TYPES.Identifier: return isReactHookName(id.name);
+		case AST_NODE_TYPES.MemberExpression: return "name" in id.property && isReactHookName(id.property.name);
+		default: return false;
+	}
 }
 /**
 * Check if the given node is a React Hook call by its name.
@@ -132,15 +146,15 @@ const isUseTransitionCall = flip(isReactHookCallWithName)("useTransition");
 //#endregion
 //#region src/hook/hook-collector.ts
 const idGen$2 = new IdGenerator("hook_");
-function useHookCollector() {
+function useHookCollector(context) {
 	const hooks = /* @__PURE__ */ new Map();
 	const functionEntries = [];
+	const getText = (n) => context.sourceCode.getText(n);
 	const getCurrentEntry = () => functionEntries.at(-1);
 	const onFunctionEnter = (node) => {
 		const id = AST.getFunctionId(node);
 		const key = idGen$2.next();
-		const name = id?.name;
-		if (name != null && isReactHookName(name)) {
+		if (id != null && isReactHookId(id)) {
 			functionEntries.push({
 				key,
 				node,
@@ -150,7 +164,7 @@ function useHookCollector() {
 				id,
 				key,
 				kind: "function",
-				name,
+				name: AST.toStringFormat(id, getText),
 				node,
 				flag: 0n,
 				hint: 0n,
@@ -190,16 +204,6 @@ function useHookCollector() {
 	};
 }
 
-//#endregion
-//#region src/hook/hook-id.ts
-function isReactHookId(id) {
-	switch (id.type) {
-		case AST_NODE_TYPES.Identifier: return isReactHookName(id.name);
-		case AST_NODE_TYPES.MemberExpression: return "name" in id.property && isReactHookName(id.property.name);
-		default: return false;
-	}
-}
-
 //#endregion
 //#region src/hook/hook-parts.ts
 /**
@@ -572,26 +576,6 @@ function findParentJsxAttribute(node, test = constTrue) {
 	return AST.findParentNode(node, guard);
 }
 
-//#endregion
-//#region src/utils/find-enclosing-assignment-target.ts
-/** eslint-disable jsdoc/require-param */
-/**
-* Finds the enclosing assignment target (variable, property, etc.) for a given node
-*
-* @todo Verify correctness and completeness of this function
-* @param node The starting node
-* @returns The enclosing assignment target node, or undefined if not found
-*/
-function findEnclosingAssignmentTarget(node) {
-	switch (true) {
-		case node.type === AST_NODE_TYPES.VariableDeclarator: return node.id;
-		case node.type === AST_NODE_TYPES.AssignmentExpression: return node.left;
-		case node.type === AST_NODE_TYPES.PropertyDefinition: return node.key;
-		case node.type === AST_NODE_TYPES.BlockStatement || node.type === AST_NODE_TYPES.Program || node.parent === node: return unit;
-		default: return findEnclosingAssignmentTarget(node.parent);
-	}
-}
-
 //#endregion
 //#region src/utils/is-from-react.ts
 /**
@@ -694,17 +678,15 @@ const isLazyCall = isReactAPICall("lazy");
 */
 const ComponentDetectionHint = {
 	...JsxDetectionHint,
-	SkipMemo: 1n << 64n,
-	SkipForwardRef: 1n << 65n,
-	SkipArrayMapArgument: 1n << 66n,
-	SkipObjectMethod: 1n << 67n,
-	SkipClassMethod: 1n << 68n,
-	SkipClassProperty: 1n << 69n
+	SkipObjectMethod: 1n << 64n,
+	SkipClassMethod: 1n << 65n,
+	SkipClassProperty: 1n << 66n,
+	SkipArrayMapCallback: 1n << 67n
 };
 /**
 * Default component detection hint
 */
-const DEFAULT_COMPONENT_DETECTION_HINT = 0n | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipEmptyArray | ComponentDetectionHint.SkipArrayMapArgument | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.StrictArray | ComponentDetectionHint.StrictConditional | ComponentDetectionHint.StrictLogical;
+const DEFAULT_COMPONENT_DETECTION_HINT = 0n | ComponentDetectionHint.SkipArrayMapCallback | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipEmptyArray | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.StrictArray | ComponentDetectionHint.StrictConditional | ComponentDetectionHint.StrictLogical;
 
 //#endregion
 //#region src/component/component-is.ts
@@ -809,7 +791,7 @@ function shouldExcludeBasedOnHint(node, hint) {
 	if (hint & ComponentDetectionHint.SkipObjectMethod && isMatching(FUNCTION_PATTERNS.OBJECT_METHOD)(node)) return true;
 	if (hint & ComponentDetectionHint.SkipClassMethod && isMatching(FUNCTION_PATTERNS.CLASS_METHOD)(node)) return true;
 	if (hint & ComponentDetectionHint.SkipClassProperty && isMatching(FUNCTION_PATTERNS.CLASS_PROPERTY)(node)) return true;
-	if (hint & ComponentDetectionHint.SkipArrayMapArgument && AST.isArrayMapCallLoose(node.parent)) return true;
+	if (hint & ComponentDetectionHint.SkipArrayMapCallback && AST.isArrayMapCallLoose(node.parent)) return true;
 	return false;
 }
 /**
@@ -868,6 +850,30 @@ function isComponentWrapperCallLoose(context, node) {
 	if (node.type !== AST_NODE_TYPES.CallExpression) return false;
 	return isComponentWrapperCall(context, node) || isUseCallbackCall(node);
 }
+/**
+* Check if the node is a callback function passed to a component wrapper
+* @param context The ESLint rule context
+* @param node The node to check
+* @returns `true` if the node is a callback function passed to a component wrapper
+*/
+function isComponentWrapperCallback(context, node) {
+	if (!AST.isFunction(node)) return false;
+	const parent = node.parent;
+	if (parent.type !== AST_NODE_TYPES.CallExpression) return false;
+	return isComponentWrapperCall(context, parent);
+}
+/**
+* Check if the node is a callback function passed to a component wrapper loosely
+* @param context The ESLint rule context
+* @param node The node to check
+* @returns `true` if the node is a callback function passed to a component wrapper loosely
+*/
+function isComponentWrapperCallbackLoose(context, node) {
+	if (!AST.isFunction(node)) return false;
+	const parent = node.parent;
+	if (parent.type !== AST_NODE_TYPES.CallExpression) return false;
+	return isComponentWrapperCallLoose(context, parent);
+}
 
 //#endregion
 //#region src/component/component-id.ts
@@ -875,8 +881,8 @@ function getFunctionComponentId(context, node) {
 	const functionId = AST.getFunctionId(node);
 	if (functionId != null) return functionId;
 	const { parent } = node;
-	if (parent.type === AST_NODE_TYPES.CallExpression && isComponentWrapperCallLoose(context, parent) && parent.parent.type === AST_NODE_TYPES.VariableDeclarator && parent.parent.id.type === AST_NODE_TYPES.Identifier) 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 && parent.parent.parent.id.type === AST_NODE_TYPES.Identifier) return parent.parent.parent.id;
+	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;
 }
 
@@ -917,14 +923,6 @@ function isComponentNameLoose(name) {
 	return RE_COMPONENT_NAME_LOOSE.test(name);
 }
 /**
-* Get component name from an identifier or identifier sequence (e.g., MemberExpression)
-* @param id The identifier or identifier sequence
-*/
-function getComponentNameFromId(id) {
-	if (id == null) return unit;
-	return Array.isArray(id) ? id.map((n) => n.name).join(".") : id.name;
-}
-/**
 * Check if the function has no name or a loose component name
 * @param context The rule context
 * @param fn The function node
@@ -932,8 +930,9 @@ function getComponentNameFromId(id) {
 function hasNoneOrLooseComponentName(context, fn) {
 	const id = getFunctionComponentId(context, fn);
 	if (id == null) return true;
-	const name = Array.isArray(id) ? id.at(-1)?.name : id.name;
-	return name != null && isComponentNameLoose(name);
+	if (id.type === AST_NODE_TYPES.Identifier) return isComponentNameLoose(id.name);
+	if (id.type === AST_NODE_TYPES.MemberExpression && id.property.type === AST_NODE_TYPES.Identifier) return isComponentNameLoose(id.property.name);
+	return false;
 }
 
 //#endregion
@@ -949,6 +948,7 @@ function useComponentCollector(context, options = {}) {
 	const { collectDisplayName = false, collectHookCalls = false, hint = DEFAULT_COMPONENT_DETECTION_HINT } = options;
 	const functionEntries = [];
 	const components = /* @__PURE__ */ new Map();
+	const getText = (n) => context.sourceCode.getText(n);
 	const getCurrentEntry = () => functionEntries.at(-1);
 	const onFunctionEnter = (node) => {
 		const key = idGen$1.next();
@@ -956,7 +956,8 @@ function useComponentCollector(context, options = {}) {
 			key,
 			node,
 			hookCalls: [],
-			isComponent: false
+			isComponent: false,
+			rets: []
 		});
 	};
 	const onFunctionExit = () => {
@@ -979,11 +980,12 @@ function useComponentCollector(context, options = {}) {
 				const entry = getCurrentEntry();
 				if (entry == null) return;
 				const { body } = entry.node;
+				if (body.type === AST_NODE_TYPES.BlockStatement) return;
 				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint) && isComponentDefinition(context, entry.node, hint))) return;
 				const initPath = AST.getFunctionInitPath(entry.node);
 				const id = getFunctionComponentId(context, entry.node);
 				const key = entry.key;
-				const name = getComponentNameFromId(id);
+				const name = id == null ? unit : AST.toStringFormat(id, getText);
 				components.set(key, {
 					id,
 					key,
@@ -994,7 +996,8 @@ function useComponentCollector(context, options = {}) {
 					flag: getComponentFlagFromInitPath(initPath),
 					hint,
 					hookCalls: entry.hookCalls,
-					initPath
+					initPath,
+					rets: [body]
 				});
 			},
 			...collectDisplayName ? { [AST.SEL_DISPLAY_NAME_ASSIGNMENT_EXPRESSION](node) {
@@ -1014,12 +1017,13 @@ function useComponentCollector(context, options = {}) {
 			"ReturnStatement[type]"(node) {
 				const entry = getCurrentEntry();
 				if (entry == null) return;
+				entry.rets.push(node.argument);
 				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, node.argument, hint) && isComponentDefinition(context, entry.node, hint))) return;
 				entry.isComponent = true;
 				const initPath = AST.getFunctionInitPath(entry.node);
 				const id = getFunctionComponentId(context, entry.node);
 				const key = entry.key;
-				const name = getComponentNameFromId(id);
+				const name = id == null ? unit : AST.toStringFormat(id, getText);
 				components.set(key, {
 					id,
 					key,
@@ -1030,7 +1034,8 @@ function useComponentCollector(context, options = {}) {
 					flag: getComponentFlagFromInitPath(initPath),
 					hint,
 					hookCalls: entry.hookCalls,
-					initPath
+					initPath,
+					rets: entry.rets
 				});
 			}
 		}
@@ -1173,8 +1178,13 @@ function getPhaseKindOfFunction(node) {
 */
 function isRenderFunctionLoose(context, node) {
 	if (!AST.isFunction(node)) return false;
-	if (AST.getFunctionId(node)?.name.startsWith("render") ?? false) return true;
-	return node.parent.type === AST_NODE_TYPES.JSXExpressionContainer && node.parent.parent.type === AST_NODE_TYPES.JSXAttribute && node.parent.parent.name.type === AST_NODE_TYPES.JSXIdentifier && node.parent.parent.name.name.startsWith("render");
+	const id = AST.getFunctionId(node);
+	switch (true) {
+		case id?.type === AST_NODE_TYPES.Identifier: return id.name.startsWith("render");
+		case id?.type === AST_NODE_TYPES.MemberExpression && id.property.type === AST_NODE_TYPES.Identifier: return id.property.name.startsWith("render");
+		case node.parent.type === AST_NODE_TYPES.JSXExpressionContainer && node.parent.parent.type === AST_NODE_TYPES.JSXAttribute && node.parent.parent.name.type === AST_NODE_TYPES.JSXIdentifier: return node.parent.parent.name.name.startsWith("render");
+	}
+	return false;
 }
 /**
 * Unsafe check whether given JSXAttribute is a render prop
@@ -1227,4 +1237,57 @@ function isDeclaredInRenderPropLoose(node) {
 }
 
 //#endregion
-export { ComponentDetectionHint, ComponentFlag, ComponentPhaseRelevance, DEFAULT_COMPONENT_DETECTION_HINT, DEFAULT_JSX_DETECTION_HINT, JsxDetectionHint, JsxEmit, REACT_BUILTIN_HOOK_NAMES, findEnclosingAssignmentTarget, findParentJsxAttribute, getComponentFlagFromInitPath, getComponentNameFromId, getFunctionComponentId, getJsxAttribute, getJsxAttributeName, getJsxConfigFromAnnotation, getJsxConfigFromContext, getJsxElementType, getPhaseKindOfFunction, hasNoneOrLooseComponentName, isAssignmentToThisState, isCaptureOwnerStack, isCaptureOwnerStackCall, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDefinition, isComponentDidCatch, isComponentDidMount, isComponentDidUpdate, isComponentName, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUnmount, isComponentWillUpdate, isComponentWrapperCall, isComponentWrapperCallLoose, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount, isFunctionOfUseEffectCleanup, isFunctionOfUseEffectSetup, isGetChildContext, isGetDefaultProps, isGetDerivedStateFromError, isGetDerivedStateFromProps, isGetInitialState, isGetSnapshotBeforeUpdate, isInitializedFromReact, isInitializedFromReactNative, isInstanceIdEqual, isInversePhase, isJsxFragmentElement, isJsxHostElement, isJsxLike, isJsxText, isLazy, isLazyCall, isMemo, isMemoCall, isPureComponent, isReactAPI, isReactAPICall, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookId, isReactHookName, isRender, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isShouldComponentUpdate, isThisSetState, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseActionStateCall, isUseCall, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectLikeCall, isUseFormStatusCall, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseOptimisticCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, resolveJsxAttributeValue, stringifyJsx, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+//#region src/hierarchy/find-enclosing-assignment-target.ts
+/** eslint-disable jsdoc/require-param */
+/**
+* Finds the enclosing assignment target (variable, property, etc.) for a given node
+*
+* @todo Verify correctness and completeness of this function
+* @param node The starting node
+* @returns The enclosing assignment target node, or undefined if not found
+*/
+function findEnclosingAssignmentTarget(node) {
+	switch (true) {
+		case node.type === AST_NODE_TYPES.VariableDeclarator: return node.id;
+		case node.type === AST_NODE_TYPES.AssignmentExpression: return node.left;
+		case node.type === AST_NODE_TYPES.PropertyDefinition: return node.key;
+		case node.type === AST_NODE_TYPES.BlockStatement || node.type === AST_NODE_TYPES.Program || node.parent === node: return unit;
+		default: return findEnclosingAssignmentTarget(node.parent);
+	}
+}
+
+//#endregion
+//#region src/hierarchy/find-enclosing-component-or-hook.ts
+/**
+* Find the enclosing React component or hook for a given AST node.
+* @param node The AST node to start the search from.
+* @param test Optional test function to customize component or hook identification.
+* @returns The enclosing component or hook node, or `null` if none is found.
+*/
+function findEnclosingComponentOrHook(node, test = (n, name) => {
+	if (name == null) return false;
+	return isComponentNameLoose(name) || isReactHookName(name);
+}) {
+	const enclosingNode = AST.findParentNode(node, (n) => {
+		if (!AST.isFunction(n)) return false;
+		return test(n, match(AST.getFunctionId(n)).with({ type: AST_NODE_TYPES.Identifier }, (id) => id.name).with({
+			type: AST_NODE_TYPES.MemberExpression,
+			property: { type: AST_NODE_TYPES.Identifier }
+		}, (me) => me.property.name).otherwise(() => null));
+	});
+	return AST.isFunction(enclosingNode) ? enclosingNode : unit;
+}
+
+//#endregion
+//#region src/hierarchy/is-inside-component-or-hook.ts
+/**
+* Checks if a given AST node is inside a React component or hook.
+* @param node The AST node to check.
+* @returns True if the node is inside a component or hook, false otherwise.
+*/
+function isInsideComponentOrHook(node) {
+	return findEnclosingComponentOrHook(node) != null;
+}
+
+//#endregion
+export { ComponentDetectionHint, ComponentFlag, ComponentPhaseRelevance, DEFAULT_COMPONENT_DETECTION_HINT, DEFAULT_JSX_DETECTION_HINT, JsxDetectionHint, JsxEmit, REACT_BUILTIN_HOOK_NAMES, findEnclosingAssignmentTarget, findEnclosingComponentOrHook, findParentJsxAttribute, getComponentFlagFromInitPath, getFunctionComponentId, getJsxAttribute, getJsxAttributeName, getJsxConfigFromAnnotation, getJsxConfigFromContext, getJsxElementType, getPhaseKindOfFunction, hasNoneOrLooseComponentName, isAssignmentToThisState, isCaptureOwnerStack, isCaptureOwnerStackCall, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDefinition, isComponentDidCatch, isComponentDidMount, isComponentDidUpdate, isComponentName, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUnmount, isComponentWillUpdate, isComponentWrapperCall, isComponentWrapperCallLoose, isComponentWrapperCallback, isComponentWrapperCallbackLoose, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount, isFunctionOfUseEffectCleanup, isFunctionOfUseEffectSetup, isGetChildContext, isGetDefaultProps, isGetDerivedStateFromError, isGetDerivedStateFromProps, isGetInitialState, isGetSnapshotBeforeUpdate, isInitializedFromReact, isInitializedFromReactNative, isInsideComponentOrHook, isInstanceIdEqual, isInversePhase, isJsxFragmentElement, isJsxHostElement, isJsxLike, isJsxText, isLazy, isLazyCall, isMemo, isMemoCall, isPureComponent, isReactAPI, isReactAPICall, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookId, isReactHookName, isRender, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isShouldComponentUpdate, isThisSetState, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseActionStateCall, isUseCall, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectLikeCall, isUseFormStatusCall, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseOptimisticCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, resolveJsxAttributeValue, stringifyJsx, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "2.6.4-next.0",
+  "version": "2.6.5-next.0",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -35,10 +35,10 @@
     "@typescript-eslint/utils": "^8.53.0",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.6.4-next.0",
-    "@eslint-react/eff": "2.6.4-next.0",
-    "@eslint-react/var": "2.6.4-next.0",
-    "@eslint-react/shared": "2.6.4-next.0"
+    "@eslint-react/ast": "2.6.5-next.0",
+    "@eslint-react/eff": "2.6.5-next.0",
+    "@eslint-react/var": "2.6.5-next.0",
+    "@eslint-react/shared": "2.6.5-next.0"
   },
   "devDependencies": {
     "tsdown": "^0.20.0-beta.3",