refactor: replace '_' property with 'key' in ERSemanticNode

Author: Rel1cx

packages/core/docs/interfaces/ERClassComponent.md

@@ -12,16 +12,6 @@
 
 ## Properties
 
-### \_
-
-> **\_**: `string`
-
-#### Inherited from
-
-[`ERSemanticNode`](ERSemanticNode.md).[`_`](ERSemanticNode.md#_)
-
-***
-
 ### displayName
 
 > **displayName**: `undefined` \| `Expression`
@@ -58,6 +48,16 @@
 
 ***
 
+### key
+
+> **key**: `string`
+
+#### Inherited from
+
+[`ERSemanticNode`](ERSemanticNode.md).[`key`](ERSemanticNode.md#key)
+
+***
+
 ### kind
 
 > **kind**: `"class"`

packages/core/docs/interfaces/ERFunctionComponent.md

@@ -12,16 +12,6 @@
 
 ## Properties
 
-### \_
-
-> **\_**: `string`
-
-#### Inherited from
-
-[`ERSemanticNode`](ERSemanticNode.md).[`_`](ERSemanticNode.md#_)
-
-***
-
 ### displayName
 
 > **displayName**: `undefined` \| `Expression`
@@ -70,6 +60,16 @@
 
 ***
 
+### key
+
+> **key**: `string`
+
+#### Inherited from
+
+[`ERSemanticNode`](ERSemanticNode.md).[`key`](ERSemanticNode.md#key)
+
+***
+
 ### kind
 
 > **kind**: `"function"`

packages/core/docs/interfaces/ERHook.md

@@ -12,16 +12,6 @@
 
 ## Properties
 
-### \_
-
-> **\_**: `string`
-
-#### Inherited from
-
-[`ERSemanticNode`](ERSemanticNode.md).[`_`](ERSemanticNode.md#_)
-
-***
-
 ### flag
 
 > **flag**: `bigint`
@@ -58,6 +48,16 @@
 
 ***
 
+### key
+
+> **key**: `string`
+
+#### Inherited from
+
+[`ERSemanticNode`](ERSemanticNode.md).[`key`](ERSemanticNode.md#key)
+
+***
+
 ### kind
 
 > **kind**: `string`

packages/core/docs/interfaces/ERSemanticNode.md

@@ -14,12 +14,6 @@
 
 ## Properties
 
-### \_
-
-> **\_**: `string`
-
-***
-
 ### flag
 
 > **flag**: `bigint`
@@ -38,6 +32,12 @@
 
 ***
 
+### key
+
+> **key**: `string`
+
+***
+
 ### kind
 
 > **kind**: `string`

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

@@ -29,8 +29,8 @@ export function useComponentCollectorLegacy() {
     components.set(
       key,
       {
-        _: key,
         id,
+        key,
         kind: "class",
         name: id?.name,
         node,

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

@@ -48,10 +48,10 @@ function hasValidHierarchy(node: AST.TSESTreeFunction, context: RuleContext, hin
 
 function getComponentFlag(initPath: ERFunctionComponent["initPath"]) {
   let flag = ERFunctionComponentFlag.None;
-  if (initPath != null && AST.hasCallInFunctionInitPath("memo")(initPath)) {
+  if (initPath != null && AST.hasCallInFunctionInitPath("memo", initPath)) {
     flag |= ERFunctionComponentFlag.Memo;
   }
-  if (initPath != null && AST.hasCallInFunctionInitPath("forwardRef")(initPath)) {
+  if (initPath != null && AST.hasCallInFunctionInitPath("forwardRef", initPath)) {
     flag |= ERFunctionComponentFlag.ForwardRef;
   }
   return flag;
@@ -125,8 +125,8 @@ export function useComponentCollector(
       const name = getComponentNameFromIdentifier(id);
       const key = getId();
       components.set(key, {
-        _: key,
         id,
+        key,
         kind: "function",
         name,
         node: entry.node,
@@ -149,7 +149,7 @@ export function useComponentCollector(
       if (component == null) {
         return;
       }
-      components.set(component._, {
+      components.set(component.key, {
         ...component,
         displayName: right,
       });
@@ -182,8 +182,8 @@ export function useComponentCollector(
       const id = getFunctionComponentIdentifier(entry.node, context);
       const name = getComponentNameFromIdentifier(id);
       components.set(entry.key, {
-        _: entry.key,
         id,
+        key: entry.key,
         kind: "function",
         name,
         node: entry.node,

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

@@ -17,8 +17,8 @@ export function useHookCollector() {
       const key = getId();
       fEntries.push({ key, node });
       hooks.set(key, {
-        _: key,
         id,
+        key,
         kind: "function",
         name,
         node,
@@ -57,7 +57,7 @@ export function useHookCollector() {
       if (hook == null) {
         return;
       }
-      hooks.set(hook._, {
+      hooks.set(hook.key, {
         ...hook,
         hookCalls: [
           ...hook.hookCalls,

packages/core/src/semantic-node.ts

@@ -2,11 +2,11 @@ import type { _ } from "@eslint-react/eff";
 import type { TSESTree } from "@typescript-eslint/types";
 
 export interface ERSemanticNode {
-  _: string;
   id:
     | _
     | TSESTree.Identifier
     | TSESTree.Identifier[];
+  key: string;
   kind: string;
   name:
     | _

packages/utilities/ast/src/function-init-path.ts

@@ -177,21 +177,19 @@ export function getFunctionInitPath(node: TSESTreeFunction): FunctionInitPath |
   return _;
 }
 
-export function hasCallInFunctionInitPath(callName: string) {
-  return (initPath: FunctionInitPath) => {
-    return initPath
-      .some((n) => {
-        if (n.type !== T.CallExpression) {
+export function hasCallInFunctionInitPath(callName: string, initPath: FunctionInitPath) {
+  return initPath
+    .some((n) => {
+      if (n.type !== T.CallExpression) {
+        return false;
+      }
+      switch (n.callee.type) {
+        case T.Identifier:
+          return n.callee.name === callName;
+        case T.MemberExpression:
+          return "name" in n.callee.property && n.callee.property.name === callName;
+        default:
           return false;
-        }
-        switch (n.callee.type) {
-          case T.Identifier:
-            return n.callee.name === callName;
-          case T.MemberExpression:
-            return "name" in n.callee.property && n.callee.property.name === callName;
-          default:
-            return false;
-        }
-      });
-  };
+      }
+    });
 }