refactor: minor improvements

Rel1cx · Rel1cx · commit e5300edb6807 · 2025-04-23T17:38:03.000+08:00
diff --git a/examples/vite-react-dom-js-with-babel-eslint-parser-app/eslint.config.js b/examples/vite-react-dom-js-with-babel-eslint-parser-app/eslint.config.js
@@ -67,7 +67,7 @@ export default defineConfig([
       eslintPluginReactWebApi.configs.recommended,
       eslintPluginReactNamingConvention.configs.recommended,
       eslintPluginReactRefresh.configs.recommended,
-      eslintPluginReactDebug.configs.all,
+      // eslintPluginReactDebug.configs.all,
     ],
     plugins: {
       "react-hooks": eslintPluginReactHooks,
diff --git a/packages/core/docs/README.md b/packages/core/docs/README.md
@@ -140,6 +140,7 @@
 - [isReactHookCallWithName](functions/isReactHookCallWithName.md)
 - [isReactHookCallWithNameAlias](functions/isReactHookCallWithNameAlias.md)
 - [isReactHookCallWithNameLoose](functions/isReactHookCallWithNameLoose.md)
+- [isReactHookId](functions/isReactHookId.md)
 - [isReactHookName](functions/isReactHookName.md)
 - [isRenderFunctionLoose](functions/isRenderFunctionLoose.md)
 - [isRenderLike](functions/isRenderLike.md)
diff --git a/packages/core/docs/functions/isReactHookId.md b/packages/core/docs/functions/isReactHookId.md
@@ -0,0 +1,19 @@
+[**@eslint-react/core**](../README.md)
+
+***
+
+[@eslint-react/core](../README.md) / isReactHookId
+
+# Function: isReactHookId()
+
+> **isReactHookId**(`id`): `boolean`
+
+## Parameters
+
+### id
+
+`Identifier` | `MemberExpression`
+
+## Returns
+
+`boolean`
diff --git a/packages/core/src/hook/hook-id.ts b/packages/core/src/hook/hook-id.ts
@@ -1,13 +1,14 @@
 import type { TSESTree } from "@typescript-eslint/types";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
+import { isReactHookName } from "./hook-name";
 
-export function isReactHookIdentifier(id: TSESTree.Identifier | TSESTree.MemberExpression) {
+export function isReactHookId(id: TSESTree.Identifier | TSESTree.MemberExpression) {
   switch (id.type) {
     case T.Identifier:
-      return id.name.startsWith("use");
+      return isReactHookName(id.name);
     case T.MemberExpression:
       return "name" in id.property
-        && id.property.name.startsWith("use");
+        && isReactHookName(id.property.name);
     default:
       return false;
   }
diff --git a/packages/core/src/hook/index.ts b/packages/core/src/hook/index.ts
@@ -1,4 +1,5 @@
 export * from "./hook-collector";
+export * from "./hook-id";
 export * from "./hook-is";
 export type * from "./hook-kind";
 export * from "./hook-name";
diff --git a/packages/plugins/eslint-plugin-react-x/src/hooks/use-no-direct-set-state-in-use-effect.ts b/packages/plugins/eslint-plugin-react-x/src/hooks/use-no-direct-set-state-in-use-effect.ts
@@ -9,13 +9,7 @@ import * as VAR from "@eslint-react/var";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 import { match } from "ts-pattern";
 
-import {
-  isFromUseStateCall,
-  isFunctionOfImmediatelyInvoked,
-  isSetFunctionCall,
-  isThenCall,
-  isVariableDeclaratorFromHookCall,
-} from "../utils";
+import { isFromUseStateCall, isSetFunctionCall, isVariableDeclaratorFromHookCall } from "../utils";
 
 type CallKind =
   | "useEffect"
@@ -93,14 +87,14 @@ export function useNoDirectSetStateInUseEffect<Ctx extends RuleContext>(
       .when(isUseStateCall, () => "useState")
       .when(isUseEffectLikeCall, () => useEffectKind)
       .when(isSetStateCall, () => "setState")
-      .when(isThenCall, () => "then")
+      .when(AST.isThenCall, () => "then")
       .otherwise(() => "other");
   }
 
   function getFunctionKind(node: AST.TSESTreeFunction) {
     return match<AST.TSESTreeFunction, FunctionKind>(node)
       .when(isFunctionOfUseEffectSetup, () => "setup")
-      .when(isFunctionOfImmediatelyInvoked, () => "immediate")
+      .when(AST.isImmediatelyInvokedFunction, () => "immediate")
       .otherwise(() => "other");
   }
 
diff --git a/packages/plugins/eslint-plugin-react-x/src/utils/constants.ts b/packages/plugins/eslint-plugin-react-x/src/utils/constants.ts
@@ -0,0 +1,21 @@
+export const REACT_BUILD_IN_HOOKS = [
+  "use",
+  "useActionState",
+  "useCallback",
+  "useContext",
+  "useDebugValue",
+  "useDeferredValue",
+  "useEffect",
+  "useFormStatus",
+  "useId",
+  "useImperativeHandle",
+  "useInsertionEffect",
+  "useLayoutEffect",
+  "useMemo",
+  "useOptimistic",
+  "useReducer",
+  "useRef",
+  "useState",
+  "useSyncExternalStore",
+  "useTransition",
+] as const;
diff --git a/packages/plugins/eslint-plugin-react-x/src/utils/index.ts b/packages/plugins/eslint-plugin-react-x/src/utils/index.ts
@@ -1,8 +1,6 @@
+export * from "./constants";
 export * from "./create-rule";
 export * from "./is-from-hook-call";
 export * from "./is-from-use-state-call";
-export * from "./is-function-of-immediately-invoked";
-export * from "./is-react-hook-identifier";
 export * from "./is-set-function-call";
-export * from "./is-then-call";
 export * from "./is-variable-declarator-from-hook-call";
diff --git a/packages/plugins/eslint-plugin-react-x/src/utils/is-from-hook-call.ts b/packages/plugins/eslint-plugin-react-x/src/utils/is-from-hook-call.ts
@@ -1,33 +1,12 @@
 import type { RuleContext } from "@eslint-react/kit";
 import type { ESLintReactSettingsNormalized } from "@eslint-react/shared";
 import type { TSESTree } from "@typescript-eslint/types";
+import type { REACT_BUILD_IN_HOOKS } from "./constants";
 import * as ER from "@eslint-react/core";
 import { constTrue } from "@eslint-react/eff";
 import * as VAR from "@eslint-react/var";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 
-export const REACT_BUILD_IN_HOOKS = [
-  "use",
-  "useActionState",
-  "useCallback",
-  "useContext",
-  "useDebugValue",
-  "useDeferredValue",
-  "useEffect",
-  "useFormStatus",
-  "useId",
-  "useImperativeHandle",
-  "useInsertionEffect",
-  "useLayoutEffect",
-  "useMemo",
-  "useOptimistic",
-  "useReducer",
-  "useRef",
-  "useState",
-  "useSyncExternalStore",
-  "useTransition",
-] as const;
-
 export function isFromHookCall(
   context: RuleContext,
   name: (typeof REACT_BUILD_IN_HOOKS)[number],
diff --git a/packages/plugins/eslint-plugin-react-x/src/utils/is-function-of-immediately-invoked.ts b/packages/plugins/eslint-plugin-react-x/src/utils/is-function-of-immediately-invoked.ts
diff --git a/packages/plugins/eslint-plugin-react-x/src/utils/is-variable-declarator-from-hook-call.ts b/packages/plugins/eslint-plugin-react-x/src/utils/is-variable-declarator-from-hook-call.ts
@@ -2,17 +2,12 @@ import type { TSESTree } from "@typescript-eslint/types";
 import * as ER from "@eslint-react/core";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 
-export function isVariableDeclaratorFromHookCall(node: TSESTree.Node): node is
-  & {
-    id: TSESTree.Identifier;
-    init:
-      & {
-        callee: TSESTree.Identifier | TSESTree.MemberExpression;
-      }
-      & TSESTree.CallExpression;
-  }
-  & TSESTree.VariableDeclarator
-{
+type VariableDeclaratorFromHookCall = {
+  id: TSESTree.Identifier;
+  init: { callee: TSESTree.Identifier | TSESTree.MemberExpression } & TSESTree.CallExpression;
+} & TSESTree.VariableDeclarator;
+
+export function isVariableDeclaratorFromHookCall(node: TSESTree.Node): node is VariableDeclaratorFromHookCall {
   if (node.type !== T.VariableDeclarator) {
     return false;
   }
diff --git a/packages/utilities/ast/src/ast-function-is.ts b/packages/utilities/ast/src/ast-function-is.ts
@@ -6,3 +6,9 @@ export function isEmptyFunction(node: TSESTreeFunction) {
   return node.body.type === T.BlockStatement
     && node.body.body.length === 0;
 }
+
+export function isImmediatelyInvokedFunction(node: TSESTreeFunction) {
+  return node.type !== T.FunctionDeclaration
+    && node.parent.type === T.CallExpression
+    && node.parent.callee === node;
+}
diff --git a/packages/utilities/ast/src/ast-then.ts b/packages/utilities/ast/src/ast-then.ts
diff --git a/packages/utilities/ast/src/index.ts b/packages/utilities/ast/src/index.ts
@@ -13,4 +13,5 @@ export type * from "./ast-node";
 export * from "./ast-node-equal";
 export * from "./ast-process-env-node-env";
 export * from "./ast-property-name";
+export * from "./ast-then";
 export * from "./ast-to-string";

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export * from "./hook-collector";`
	`2`	`+export * from "./hook-id";`
`2`	`3`	`export * from "./hook-is";`
`3`	`4`	`export type * from "./hook-kind";`
`4`	`5`	`export * from "./hook-name";`