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

package/dist/index.d.ts

@@ -251,15 +251,8 @@ 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;
+type FunctionEntry$1 = FunctionComponentSemanticNode & {
   isComponentDefinition: boolean;
-  isExportDefault: boolean;
-  isExportDefaultDeclaration: boolean;
-  rets: TSESTree.ReturnStatement["argument"][];
 };
 declare namespace useComponentCollector {
   type Options = {
@@ -574,7 +567,6 @@ interface HookSemanticNode extends SemanticNode {
 type FunctionEntry = {
   key: string;
   node: AST.TSESTreeFunction;
-  isHook: boolean;
 };
 declare namespace useHookCollector {
   type ReturnType = {

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);
 			}
 		}
 	};
@@ -953,12 +943,21 @@ 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,
-			isComponentDefinition: isComponentDefinition(context, node, hint),
+			initPath,
+			isComponentDefinition: hasNoneOrLooseComponentName(context, node) && isComponentDefinition(context, node, hint),
 			isExportDefault,
 			isExportDefaultDeclaration,
 			rets: []
@@ -983,29 +982,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;
@@ -1024,30 +1006,11 @@ function useComponentCollector(context, options = {}) {
 			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.7.5-next.9",
   "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.7.5-next.9",
+    "@eslint-react/eff": "2.7.5-next.9",
+    "@eslint-react/shared": "2.7.5-next.9",
+    "@eslint-react/var": "2.7.5-next.9"
   },
   "devDependencies": {
     "tsdown": "^0.20.1",