refactor: minor improvements

Author: Rel1cx

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

@@ -7,6 +7,15 @@ import { ERComponentFlag } from "./component-flag";
 import type { ERClassComponent } from "./component-semantic-node";
 import { isClassComponent, isPureComponent } from "./is";
 
+export declare namespace useComponentCollectorLegacy {
+  type ReturnType = {
+    ctx: {
+      getAllComponents: (node: TSESTree.Program) => Map<string, ERClassComponent>;
+    };
+    listeners: ESLintUtils.RuleListener;
+  };
+}
+
 /**
  * Get a ctx and listeners for the rule to collect class components
  * @returns The context and listeners for the rule
@@ -55,12 +64,3 @@ export function useComponentCollectorLegacy(): useComponentCollectorLegacy.Retur
 
   return { ctx, listeners } as const;
 }
-
-export declare namespace useComponentCollectorLegacy {
-  type ReturnType = {
-    ctx: {
-      getAllComponents: (node: TSESTree.Program) => Map<string, ERClassComponent>;
-    };
-    listeners: ESLintUtils.RuleListener;
-  };
-}

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

@@ -24,6 +24,21 @@ type FunctionEntry = {
   isComponent: boolean;
 };
 
+export declare namespace useComponentCollector {
+  type Options = {
+    collectDisplayName?: boolean;
+    collectHookCalls?: boolean;
+  };
+  type ReturnType = {
+    ctx: {
+      getAllComponents: (node: TSESTree.Program) => Map<string, ERFunctionComponent>;
+      getCurrentEntries: () => FunctionEntry[];
+      getCurrentEntry: () => FunctionEntry | _;
+    };
+    listeners: ESLintUtils.RuleListener;
+  };
+}
+
 /**
  * Get a ctx and listeners for the rule to collect function components
  * @param context The ESLint rule context
@@ -157,21 +172,6 @@ export function useComponentCollector(
   return { ctx, listeners } as const;
 }
 
-export declare namespace useComponentCollector {
-  type Options = {
-    collectDisplayName?: boolean;
-    collectHookCalls?: boolean;
-  };
-  type ReturnType = {
-    ctx: {
-      getAllComponents: (node: TSESTree.Program) => Map<string, ERFunctionComponent>;
-      getCurrentEntries: () => FunctionEntry[];
-      getCurrentEntry: () => FunctionEntry | _;
-    };
-    listeners: ESLintUtils.RuleListener;
-  };
-}
-
 function hasValidHierarchy(node: AST.TSESTreeFunction, context: RuleContext, hint: bigint) {
   if (isChildrenOfCreateElement(node, context) || isFunctionOfRenderMethod(node)) {
     return false;

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

@@ -12,6 +12,15 @@ type FunctionEntry = {
   isHook: boolean;
 };
 
+export declare namespace useHookCollector {
+  type ReturnType = {
+    ctx: {
+      getAllHooks(node: TSESTree.Program): Map<string, ERHook>;
+    };
+    listeners: ESLintUtils.RuleListener;
+  };
+}
+
 export function useHookCollector(): useHookCollector.ReturnType {
   const hooks = new Map<string, ERHook>();
   const functionEntries: FunctionEntry[] = [];
@@ -64,12 +73,3 @@ export function useHookCollector(): useHookCollector.ReturnType {
   } as const satisfies ESLintUtils.RuleListener;
   return { ctx, listeners } as const;
 }
-
-export declare namespace useHookCollector {
-  type ReturnType = {
-    ctx: {
-      getAllHooks(node: TSESTree.Program): Map<string, ERHook>;
-    };
-    listeners: ESLintUtils.RuleListener;
-  };
-}

packages/core/src/utils/is-from-react.ts

@@ -94,6 +94,13 @@ export function isFromReactMember(
   };
 }
 
+export declare namespace isCallFromReact {
+  type ReturnType = {
+    (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression;
+    (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression;
+  };
+}
+
 export function isCallFromReact(name: string): isCallFromReact.ReturnType {
   return dual(2, (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression => {
     if (node.type !== T.CallExpression) {
@@ -106,10 +113,17 @@ export function isCallFromReact(name: string): isCallFromReact.ReturnType {
   });
 }
 
-export declare namespace isCallFromReact {
+export declare namespace isCallFromReactMember {
   type ReturnType = {
-    (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression;
-    (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression;
+    (context: RuleContext): (node: TSESTree.Node) => node is
+      & TSESTree.CallExpression
+      & { callee: TSESTree.MemberExpression };
+    (
+      node: TSESTree.Node,
+      context: RuleContext,
+    ): node is
+      & TSESTree.CallExpression
+      & { callee: TSESTree.MemberExpression };
   };
 }
 
@@ -133,17 +147,3 @@ export function isCallFromReactMember(
     return isFromReactMember(pragmaMemberName, name)(node.callee, context);
   });
 }
-
-export declare namespace isCallFromReactMember {
-  type ReturnType = {
-    (context: RuleContext): (node: TSESTree.Node) => node is
-      & TSESTree.CallExpression
-      & { callee: TSESTree.MemberExpression };
-    (
-      node: TSESTree.Node,
-      context: RuleContext,
-    ): node is
-      & TSESTree.CallExpression
-      & { callee: TSESTree.MemberExpression };
-  };
-}