Remove redundant code in component/hook collectors

Author: Rel1cx

.vscode/settings.json

@@ -15,7 +15,7 @@
   "editor.codeActionsOnSave": {
     "source.fixAll": "never",
     "source.fixAll.eslint": "explicit",
-    "source.formatting": "explicit",
+    "source.formatting": "always",
     "source.organizeImports": "never"
   },
   "eslint.rules.customizations": [

packages/core/src/component/component-collector.ts

@@ -18,15 +18,8 @@ import { hasNoneOrLooseComponentName } from "./component-name";
 
 const idGen = new IdGenerator("function_component_");
 
-type FunctionEntry = {
-  key: string;
-  node: AST.TSESTreeFunction;
-  hookCalls: TSESTree.CallExpression[];
-  isComponent: boolean;
+type FunctionEntry = FunctionComponentSemanticNode & {
   isComponentDefinition: boolean;
-  isExportDefault: boolean;
-  isExportDefaultDeclaration: boolean;
-  rets: TSESTree.ReturnStatement["argument"][];
 };
 
 export declare namespace useComponentCollector {
@@ -71,12 +64,21 @@ export function useComponentCollector(
     const exp = AST.findParentNode(node, (n) => n.type === T.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: [],
@@ -103,32 +105,12 @@ export function useComponentCollector(
     "ArrowFunctionExpression[body.type!='BlockStatement']"() {
       const entry = getCurrentEntry();
       if (entry == null) return;
-      // If the function is not a component definition, skip the rest of the checks
-      if (!entry.isComponentDefinition) return;
       const { body } = entry.node;
       if (body.type === T.BlockStatement) return;
-      const isComponent = hasNoneOrLooseComponentName(context, entry.node)
-        && isJsxLike(context.sourceCode, body, hint);
-      if (!isComponent) 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
       ? {
@@ -157,33 +139,11 @@ export function useComponentCollector(
     ReturnStatement(node: TSESTree.ReturnStatement) {
       const entry = getCurrentEntry();
       if (entry == null) return;
-      // If the function is not a component definition, skip the rest of the checks
+      entry.rets.push(node.argument);
       if (!entry.isComponentDefinition) return;
       const { argument } = node;
-      entry.rets.push(argument);
-      const isComponent = hasNoneOrLooseComponentName(context, entry.node)
-        && isJsxLike(context.sourceCode, argument, hint);
-      if (!isComponent) 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);
     },
   } as const satisfies ESLintUtils.RuleListener;
   return { ctx, visitor } as const;

packages/core/src/hook/hook-collector.ts

@@ -12,7 +12,6 @@ const idGen = new IdGenerator("hook_");
 type FunctionEntry = {
   key: string;
   node: AST.TSESTreeFunction;
-  isHook: boolean;
 };
 
 export declare namespace useHookCollector {
@@ -39,21 +38,18 @@ export function useHookCollector(context: RuleContext): useHookCollector.ReturnT
   const onFunctionEnter = (node: AST.TSESTreeFunction) => {
     const id = AST.getFunctionId(node);
     const key = idGen.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, isHook: false });
+    functionEntries.push({ key, node });
+    if (id == null || !isHookId(id)) return;
+    hooks.set(key, {
+      id,
+      key,
+      kind: "function",
+      name: AST.toStringFormat(id, getText),
+      node,
+      flag: 0n,
+      hint: 0n,
+      hookCalls: [],
+    });
   };
   const onFunctionExit = () => {
     functionEntries.pop();
@@ -70,18 +66,10 @@ export function useHookCollector(context: RuleContext): useHookCollector.ReturnT
     ":function": onFunctionEnter,
     ":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);
+      if (!isHookCall(node)) return;
+      const entry = getCurrentEntry();
+      if (entry == null) return;
+      hooks.get(entry.key)?.hookCalls.push(node);
     },
   } as const satisfies ESLintUtils.RuleListener;
   return { ctx, visitor } as const;