refactor: minor improvements

Rel1cx · Rel1cx · commit 0f461c74915f · 2025-01-16T16:36:31.000+08:00
diff --git a/packages/core/docs/README.md b/packages/core/docs/README.md
@@ -20,11 +20,9 @@
 - [ERComponentHint](type-aliases/ERComponentHint.md)
 - [ERComponentKind](type-aliases/ERComponentKind.md)
 - [EREffectKind](type-aliases/EREffectKind.md)
-- [EREffectMethodKind](type-aliases/EREffectMethodKind.md)
 - [EREffectPhaseKind](type-aliases/EREffectPhaseKind.md)
 - [ERFunctionComponentFlag](type-aliases/ERFunctionComponentFlag.md)
 - [ERHookKind](type-aliases/ERHookKind.md)
-- [ERLifecycleMethodKind](type-aliases/ERLifecycleMethodKind.md)
 - [ERLifecyclePhaseKind](type-aliases/ERLifecyclePhaseKind.md)
 - [ERPhaseKind](type-aliases/ERPhaseKind.md)
 - [ERStateKind](type-aliases/ERStateKind.md)
diff --git a/packages/core/docs/type-aliases/EREffectKind.md b/packages/core/docs/type-aliases/EREffectKind.md
@@ -6,4 +6,4 @@
 
 # Type Alias: EREffectKind
 
-> **EREffectKind**: `"effect"` \| `"insertionEffect"` \| `"layoutEffect"`
+> **EREffectKind**: `"useEffect"` \| `"useLayoutEffect"` \| `"useInsertionEffect"`
diff --git a/packages/core/docs/type-aliases/EREffectMethodKind.md b/packages/core/docs/type-aliases/EREffectMethodKind.md
diff --git a/packages/core/docs/type-aliases/ERLifecycleMethodKind.md b/packages/core/docs/type-aliases/ERLifecycleMethodKind.md
diff --git a/packages/core/src/component/component-method-kind.ts b/packages/core/src/component/component-method-kind.ts
diff --git a/packages/core/src/component/index.ts b/packages/core/src/component/index.ts
@@ -5,7 +5,6 @@ export * from "./component-flag";
 export * from "./component-id";
 export type * from "./component-kind";
 export * from "./component-lifecycle";
-export type * from "./component-method-kind";
 export * from "./component-name";
 export * from "./component-phase";
 export * from "./component-render-prop";
diff --git a/packages/core/src/effect/effect-kind.ts b/packages/core/src/effect/effect-kind.ts
@@ -1 +1,4 @@
-export type EREffectKind = "effect" | "insertionEffect" | "layoutEffect";
+export type EREffectKind =
+  | "useEffect"
+  | "useLayoutEffect"
+  | "useInsertionEffect";
diff --git a/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-event-listener.ts b/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-event-listener.ts
@@ -1,5 +1,5 @@
 import * as AST from "@eslint-react/ast";
-import type { EREffectMethodKind, ERLifecycleMethodKind, ERPhaseKind } from "@eslint-react/core";
+import type { ERPhaseKind } from "@eslint-react/core";
 import { ERPhaseRelevance, isInversePhase } from "@eslint-react/core";
 import { _ } from "@eslint-react/eff";
 import type { RuleFeature } from "@eslint-react/shared";
@@ -31,7 +31,9 @@ export type MessageID =
 
 type FunctionKind = ERPhaseKind | "other";
 type EventMethodKind = "addEventListener" | "removeEventListener";
-type CallKind = EventMethodKind | EREffectMethodKind | ERLifecycleMethodKind | "abort" | "other";
+type EffectMethodKind = "useEffect" | "useInsertionEffect" | "useLayoutEffect";
+type LifecycleMethodKind = "componentDidMount" | "componentWillUnmount";
+type CallKind = EventMethodKind | EffectMethodKind | LifecycleMethodKind | "abort" | "other";
 
 export type AEntry = EventListenerEntry & { kind: "addEventListener" };
 
diff --git a/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-interval.ts b/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-interval.ts
@@ -1,5 +1,5 @@
 import type * as AST from "@eslint-react/ast";
-import type { EREffectMethodKind, ERLifecycleMethodKind, ERPhaseKind } from "@eslint-react/core";
+import type { ERPhaseKind } from "@eslint-react/core";
 import { ERPhaseRelevance } from "@eslint-react/core";
 import type { RuleFeature } from "@eslint-react/shared";
 import * as VAR from "@eslint-react/var";
@@ -29,7 +29,9 @@ export type MessageID =
 
 type FunctionKind = ERPhaseKind | "other";
 type EventMethodKind = "setInterval" | "clearInterval";
-type CallKind = EventMethodKind | EREffectMethodKind | ERLifecycleMethodKind | "other";
+type EffectMethodKind = "useEffect" | "useInsertionEffect" | "useLayoutEffect";
+type LifecycleMethodKind = "componentDidMount" | "componentWillUnmount";
+type CallKind = EventMethodKind | EffectMethodKind | LifecycleMethodKind | "other";
 
 // #endregion
 
diff --git a/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-resize-observer.ts b/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-resize-observer.ts
@@ -1,5 +1,5 @@
 import * as AST from "@eslint-react/ast";
-import type { EREffectMethodKind, ERPhaseKind } from "@eslint-react/core";
+import type { ERPhaseKind } from "@eslint-react/core";
 import { ERPhaseRelevance } from "@eslint-react/core";
 import { _, or } from "@eslint-react/eff";
 import type { RuleContext, RuleFeature } from "@eslint-react/shared";
@@ -29,7 +29,8 @@ export type MessageID =
 // #region Types
 
 type FunctionKind = ERPhaseKind | "other";
-type CallKind = ObserverMethod | EREffectMethodKind | "other";
+type EffectMethodKind = "useEffect" | "useInsertionEffect" | "useLayoutEffect";
+type CallKind = ObserverMethod | EffectMethodKind | "other";
 
 export type OEntry = ObserverEntry & { kind: "observe" };
 export type UEntry = ObserverEntry & { kind: "unobserve" };
diff --git a/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-timeout.ts b/packages/plugins/eslint-plugin-react-web-api/src/rules/no-leaked-timeout.ts
@@ -1,5 +1,5 @@
 import type * as AST from "@eslint-react/ast";
-import type { EREffectMethodKind, ERLifecycleMethodKind, ERPhaseKind } from "@eslint-react/core";
+import type { ERPhaseKind } from "@eslint-react/core";
 import { ERPhaseRelevance } from "@eslint-react/core";
 import type { RuleFeature } from "@eslint-react/shared";
 import * as VAR from "@eslint-react/var";
@@ -29,7 +29,9 @@ export type MessageID =
 
 type FunctionKind = ERPhaseKind | "other";
 type EventMethodKind = "setTimeout" | "clearTimeout";
-type CallKind = EventMethodKind | EREffectMethodKind | ERLifecycleMethodKind | "other";
+type EffectMethodKind = "useEffect" | "useInsertionEffect" | "useLayoutEffect";
+type LifecycleMethodKind = "componentDidMount" | "componentWillUnmount";
+type CallKind = EventMethodKind | EffectMethodKind | LifecycleMethodKind | "other";
 
 // #endregion
 
diff --git a/packages/utilities/jsx/src/index.ts b/packages/utilities/jsx/src/index.ts
@@ -1,7 +1,7 @@
 export * from "./find-parent-attribute";
+export * from "./get-attribute";
 export * from "./get-attribute-name";
 export * from "./get-attribute-value";
-export * from "./get-attribute";
 export * from "./get-element-name";
 export * from "./has-attribute";
 export * from "./is-element";

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@`
`6`	`6`
`7`	`7`	`# Type Alias: EREffectKind`
`8`	`8`
`9`		-> EREffectKind: `"effect"` \\| `"insertionEffect"` \\| `"layoutEffect"`
	`9`	+> EREffectKind: `"useEffect"` \\| `"useLayoutEffect"` \\| `"useInsertionEffect"`