@eslint-react/core 2.7.5-next.8 → 2.8.0

package/dist/index.d.ts

@@ -251,20 +251,12 @@ interface ClassComponentSemanticNode extends SemanticNode {
 type ComponentSemanticNode = ClassComponentSemanticNode | FunctionComponentSemanticNode;
 //#endregion
 //#region src/component/component-collector.d.ts
-type FunctionEntry$1 = {
-  key: string;
-  node: AST.TSESTreeFunction;
-  hookCalls: TSESTree.CallExpression[];
-  isComponent: boolean;
+interface FunctionEntry$1 extends FunctionComponentSemanticNode {
   isComponentDefinition: boolean;
-  isExportDefault: boolean;
-  isExportDefaultDeclaration: boolean;
-  rets: TSESTree.ReturnStatement["argument"][];
-};
+}
 declare namespace useComponentCollector {
   type Options = {
     collectDisplayName?: boolean;
-    collectHookCalls?: boolean;
     hint?: ComponentDetectionHint;
   };
   type ReturnType = {
@@ -540,7 +532,7 @@ type FindEnclosingComponentOrHookFilter = (n: TSESTree.Node, name: string | null
  * @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.FunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | undefined;
+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
 /**
@@ -574,7 +566,6 @@ interface HookSemanticNode extends SemanticNode {
 type FunctionEntry = {
   key: string;
   node: AST.TSESTreeFunction;
-  isHook: boolean;
 };
 declare namespace useHookCollector {
   type ReturnType = {
@@ -724,7 +715,7 @@ declare function resolveJsxAttributeValue(context: RuleContext, attribute: AST.T
   readonly toStatic: () => string | number | bigint | boolean | RegExp | null;
 } | {
   readonly kind: "expression";
-  readonly node: TSESTree.Expression | TSESTree.JSXEmptyExpression;
+  readonly node: TSESTree.JSXEmptyExpression | TSESTree.Expression;
   readonly toStatic: () => unknown;
 } | {
   readonly kind: "element";
@@ -732,7 +723,7 @@ declare function resolveJsxAttributeValue(context: RuleContext, attribute: AST.T
   readonly toStatic: () => undefined;
 } | {
   readonly kind: "spreadChild";
-  readonly node: TSESTree.Expression | TSESTree.JSXEmptyExpression;
+  readonly node: TSESTree.JSXEmptyExpression | TSESTree.Expression;
   readonly toStatic: () => undefined;
 } | {
   readonly kind: "spreadProps";

package/dist/index.js

@@ -269,28 +269,20 @@ function useHookCollector(context) {
 	const onFunctionEnter = (node) => {
 		const id = AST.getFunctionId(node);
 		const key = idGen$2.next();
-		if (id != null && isHookId(id)) {
-			functionEntries.push({
-				key,
-				node,
-				isHook: true
-			});
-			hooks.set(key, {
-				id,
-				key,
-				kind: "function",
-				name: AST.toStringFormat(id, getText),
-				node,
-				flag: 0n,
-				hint: 0n,
-				hookCalls: []
-			});
-			return;
-		}
 		functionEntries.push({
 			key,
+			node
+		});
+		if (id == null || !isHookId(id)) return;
+		hooks.set(key, {
+			id,
+			key,
+			kind: "function",
+			name: AST.toStringFormat(id, getText),
 			node,
-			isHook: false
+			flag: 0n,
+			hint: 0n,
+			hookCalls: []
 		});
 	};
 	const onFunctionExit = () => {
@@ -309,11 +301,9 @@ function useHookCollector(context) {
 			":function:exit": onFunctionExit,
 			CallExpression(node) {
 				if (!isHookCall(node)) return;
-				const fEntry = getCurrentEntry();
-				if (fEntry?.key == null) return;
-				const hook = hooks.get(fEntry.key);
-				if (hook == null) return;
-				hook.hookCalls.push(node);
+				const entry = getCurrentEntry();
+				if (entry == null) return;
+				hooks.get(entry.key)?.hookCalls.push(node);
 			}
 		}
 	};
@@ -721,6 +711,99 @@ function isPureComponent(node) {
 	return false;
 }
 
+//#endregion
+//#region src/component/component-wrapper.ts
+/**
+* Check if the node is a call expression for a component wrapper
+* @param context The ESLint rule context
+* @param node The node to check
+* @returns `true` if the node is a call expression for a component wrapper
+*/
+function isComponentWrapperCall(context, node) {
+	if (node.type !== AST_NODE_TYPES.CallExpression) return false;
+	return isMemoCall(context, node) || isForwardRefCall(context, node);
+}
+/**
+* Check if the node is a call expression for a component wrapper loosely
+* @param context The ESLint rule context
+* @param node The node to check
+* @returns `true` if the node is a call expression for a component wrapper loosely
+*/
+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
+/**
+* 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
+*/
+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) 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;
+}
+
+//#endregion
+//#region src/component/component-name.ts
+/**
+* Check if a string matches the strict component name pattern
+* @param name The name to check
+*/
+function isComponentName(name) {
+	return RE_COMPONENT_NAME.test(name);
+}
+/**
+* Check if a string matches the loose component name pattern
+* @param name The name to check
+*/
+function isComponentNameLoose(name) {
+	return RE_COMPONENT_NAME_LOOSE.test(name);
+}
+/**
+* Check if the function has no name or a loose component name
+* @param context The rule context
+* @param fn The function node
+*/
+function hasNoneOrLooseComponentName(context, fn) {
+	const id = getFunctionComponentId(context, fn);
+	if (id == null) return true;
+	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
 //#region src/component/component-render-method.ts
 /**
@@ -799,6 +882,7 @@ function isChildrenOfCreateElement(context, node) {
 * @returns `true` if the node is considered a component definition
 */
 function isComponentDefinition(context, node, hint) {
+	if (!hasNoneOrLooseComponentName(context, node)) return false;
 	if (isChildrenOfCreateElement(context, node) || isRenderMethodCallback(node)) return false;
 	if (shouldExcludeBasedOnHint(node, hint)) return false;
 	const significantParent = AST.findParentNode(node, AST.isOneOf([
@@ -813,70 +897,6 @@ function isComponentDefinition(context, node, hint) {
 	return true;
 }
 
-//#endregion
-//#region src/component/component-wrapper.ts
-/**
-* Check if the node is a call expression for a component wrapper
-* @param context The ESLint rule context
-* @param node The node to check
-* @returns `true` if the node is a call expression for a component wrapper
-*/
-function isComponentWrapperCall(context, node) {
-	if (node.type !== AST_NODE_TYPES.CallExpression) return false;
-	return isMemoCall(context, node) || isForwardRefCall(context, node);
-}
-/**
-* Check if the node is a call expression for a component wrapper loosely
-* @param context The ESLint rule context
-* @param node The node to check
-* @returns `true` if the node is a call expression for a component wrapper loosely
-*/
-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
-/**
-* 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
-*/
-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) 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;
-}
-
 //#endregion
 //#region src/component/component-flag.ts
 /**
@@ -904,35 +924,6 @@ function getComponentFlagFromInitPath(initPath) {
 	return flag;
 }
 
-//#endregion
-//#region src/component/component-name.ts
-/**
-* Check if a string matches the strict component name pattern
-* @param name The name to check
-*/
-function isComponentName(name) {
-	return RE_COMPONENT_NAME.test(name);
-}
-/**
-* Check if a string matches the loose component name pattern
-* @param name The name to check
-*/
-function isComponentNameLoose(name) {
-	return RE_COMPONENT_NAME_LOOSE.test(name);
-}
-/**
-* Check if the function has no name or a loose component name
-* @param context The rule context
-* @param fn The function node
-*/
-function hasNoneOrLooseComponentName(context, fn) {
-	const id = getFunctionComponentId(context, fn);
-	if (id == null) return true;
-	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
 //#region src/component/component-collector.ts
 const idGen$1 = new IdGenerator("function_component_");
@@ -943,7 +934,7 @@ const idGen$1 = new IdGenerator("function_component_");
 * @returns The ctx and visitor of the collector
 */
 function useComponentCollector(context, options = {}) {
-	const { collectDisplayName = false, collectHookCalls = false, hint = DEFAULT_COMPONENT_DETECTION_HINT } = options;
+	const { collectDisplayName = false, hint = DEFAULT_COMPONENT_DETECTION_HINT } = options;
 	const functionEntries = [];
 	const components = /* @__PURE__ */ new Map();
 	const getText = (n) => context.sourceCode.getText(n);
@@ -953,11 +944,20 @@ function useComponentCollector(context, options = {}) {
 		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.toStringFormat(id, getText);
+		const initPath = AST.getFunctionInitPath(node);
 		functionEntries.push({
+			id: getFunctionComponentId(context, node),
 			key,
+			kind: "function",
+			name,
 			node,
+			displayName: unit,
+			flag: getComponentFlagFromInitPath(initPath),
+			hint,
 			hookCalls: [],
-			isComponent: false,
+			initPath,
 			isComponentDefinition: isComponentDefinition(context, node, hint),
 			isExportDefault,
 			isExportDefaultDeclaration,
@@ -983,29 +983,12 @@ function useComponentCollector(context, options = {}) {
 			"ArrowFunctionExpression[body.type!='BlockStatement']"() {
 				const entry = getCurrentEntry();
 				if (entry == null) return;
-				if (!entry.isComponentDefinition) return;
 				const { body } = entry.node;
 				if (body.type === AST_NODE_TYPES.BlockStatement) return;
-				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint))) return;
-				const initPath = AST.getFunctionInitPath(entry.node);
-				const id = getFunctionComponentId(context, entry.node);
-				const key = entry.key;
-				const name = id == null ? unit : AST.toStringFormat(id, getText);
-				components.set(key, {
-					id,
-					key,
-					kind: "function",
-					name,
-					node: entry.node,
-					displayName: unit,
-					flag: getComponentFlagFromInitPath(initPath),
-					hint,
-					hookCalls: entry.hookCalls,
-					initPath,
-					isExportDefault: entry.isExportDefault,
-					isExportDefaultDeclaration: entry.isExportDefaultDeclaration,
-					rets: [body]
-				});
+				entry.rets.push(body);
+				if (!entry.isComponentDefinition) return;
+				if (!components.has(entry.key) && !isJsxLike(context.sourceCode, body, hint)) return;
+				components.set(entry.key, entry);
 			},
 			...collectDisplayName ? { [AST.SEL_DISPLAY_NAME_ASSIGNMENT_EXPRESSION](node) {
 				const { left, right } = node;
@@ -1015,39 +998,22 @@ function useComponentCollector(context, options = {}) {
 				if (component == null) return;
 				component.displayName = right;
 			} } : {},
-			...collectHookCalls ? { "CallExpression:exit"(node) {
+			CallExpression(node) {
 				if (!isHookCall(node)) return;
 				const entry = getCurrentEntry();
 				if (entry == null) return;
 				entry.hookCalls.push(node);
-			} } : {},
+				if (!entry.isComponentDefinition) return;
+				components.set(entry.key, entry);
+			},
 			ReturnStatement(node) {
 				const entry = getCurrentEntry();
 				if (entry == null) return;
+				entry.rets.push(node.argument);
 				if (!entry.isComponentDefinition) return;
 				const { argument } = node;
-				entry.rets.push(argument);
-				if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, argument, hint))) return;
-				entry.isComponent = true;
-				const initPath = AST.getFunctionInitPath(entry.node);
-				const id = getFunctionComponentId(context, entry.node);
-				const key = entry.key;
-				const name = id == null ? unit : AST.toStringFormat(id, getText);
-				components.set(key, {
-					id,
-					key,
-					kind: "function",
-					name,
-					node: entry.node,
-					displayName: unit,
-					flag: getComponentFlagFromInitPath(initPath),
-					hint,
-					hookCalls: entry.hookCalls,
-					initPath,
-					isExportDefault: entry.isExportDefault,
-					isExportDefaultDeclaration: entry.isExportDefaultDeclaration,
-					rets: entry.rets
-				});
+				if (!components.has(entry.key) && !isJsxLike(context.sourceCode, argument, hint)) return;
+				components.set(entry.key, entry);
 			}
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "2.7.5-next.8",
+  "version": "2.8.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": {
@@ -34,10 +34,10 @@
     "@typescript-eslint/types": "^8.54.0",
     "@typescript-eslint/utils": "^8.54.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.7.5-next.8",
-    "@eslint-react/eff": "2.7.5-next.8",
-    "@eslint-react/shared": "2.7.5-next.8",
-    "@eslint-react/var": "2.7.5-next.8"
+    "@eslint-react/ast": "2.8.0",
+    "@eslint-react/eff": "2.8.0",
+    "@eslint-react/shared": "2.8.0",
+    "@eslint-react/var": "2.8.0"
   },
   "devDependencies": {
     "tsdown": "^0.20.1",