refactor: replace 'findParentNodeGuard' with 'findParentNode' across multiple files

Rel1cx · Rel1cx · commit 79c37cf09c17 · 2025-01-13T11:57:13.000+08:00
diff --git a/packages/core/src/effect/is.ts b/packages/core/src/effect/is.ts
@@ -15,8 +15,8 @@ export function isSetupFunction(node: TSESTree.Node | _) {
 }
 
 export function isCleanupFunction(node: TSESTree.Node) {
-  const nearReturn = AST.findParentNodeGuard(node, AST.is(T.ReturnStatement));
-  const nearFunction = AST.findParentNodeGuard(node, AST.isFunction);
-  const nearFunctionOfReturn = AST.findParentNodeGuard(nearReturn, AST.isFunction);
+  const nearReturn = AST.findParentNode(node, AST.is(T.ReturnStatement));
+  const nearFunction = AST.findParentNode(node, AST.isFunction);
+  const nearFunctionOfReturn = AST.findParentNode(nearReturn, AST.isFunction);
   return nearFunction === nearFunctionOfReturn && isSetupFunction(nearFunction);
 }
diff --git a/packages/core/src/element/hierarchy.ts b/packages/core/src/element/hierarchy.ts
@@ -15,9 +15,9 @@ export function isInsideCreateElementProps(
   node: TSESTree.Node,
   context: RuleContext,
 ) {
-  const call = AST.findParentNodeGuard(node, isCreateElementCall(context));
+  const call = AST.findParentNode(node, isCreateElementCall(context));
   if (call == null) return false;
-  const prop = AST.findParentNodeGuard(node, AST.is(T.ObjectExpression));
+  const prop = AST.findParentNode(node, AST.is(T.ObjectExpression));
   if (prop == null) return false;
   return prop === call.arguments[1];
 }
diff --git a/packages/core/src/hook/hierarchy.ts b/packages/core/src/hook/hierarchy.ts
@@ -4,5 +4,5 @@ import type { TSESTree } from "@typescript-eslint/types";
 import { isReactHook } from "./is";
 
 export function isInsideReactHook(node: TSESTree.Node) {
-  return isReactHook(AST.findParentNodeGuard(node, AST.isFunction));
+  return isReactHook(AST.findParentNode(node, AST.isFunction));
 }
diff --git a/packages/core/src/render-prop/hierarchy.ts b/packages/core/src/render-prop/hierarchy.ts
@@ -38,7 +38,7 @@ export function isDeclaredInRenderPropLoose(node: TSESTree.Node) {
   if (isDirectValueOfRenderPropertyLoose(node)) {
     return true;
   }
-  const parent = AST.findParentNodeGuard(node, AST.is(T.JSXExpressionContainer))?.parent;
+  const parent = AST.findParentNode(node, AST.is(T.JSXExpressionContainer))?.parent;
   if (parent?.type !== T.JSXAttribute) {
     return false;
   }
diff --git a/packages/plugins/eslint-plugin-react-hooks-extra/src/rules/no-direct-set-state-in-use-effect.ts b/packages/plugins/eslint-plugin-react-hooks-extra/src/rules/no-direct-set-state-in-use-effect.ts
@@ -132,7 +132,7 @@ export default createRule<[], MessageID>({
                 return;
               }
               default: {
-                const variableDeclarator = AST.findParentNodeGuard(node, isVariableDeclaratorFromHookCall);
+                const variableDeclarator = AST.findParentNode(node, isVariableDeclaratorFromHookCall);
                 if (variableDeclarator == null) {
                   const calls = indSetStateCalls.get(pEntry.node) ?? [];
                   indSetStateCalls.set(pEntry.node, [...calls, node]);
@@ -177,7 +177,7 @@ export default createRule<[], MessageID>({
             if (!isUseMemoCall(parent)) {
               break;
             }
-            const variableDeclarator = AST.findParentNodeGuard(parent, isVariableDeclaratorFromHookCall);
+            const variableDeclarator = AST.findParentNode(parent, isVariableDeclaratorFromHookCall);
             if (variableDeclarator == null) {
               break;
             }
@@ -193,7 +193,7 @@ export default createRule<[], MessageID>({
             // const set = useCallback(setState, []);
             // useEffect(set, []);
             if (isUseCallbackCall(node.parent)) {
-              const variableDeclarator = AST.findParentNodeGuard(node.parent, isVariableDeclaratorFromHookCall);
+              const variableDeclarator = AST.findParentNode(node.parent, isVariableDeclaratorFromHookCall);
               if (variableDeclarator == null) {
                 break;
               }
diff --git a/packages/plugins/eslint-plugin-react-hooks-extra/src/rules/no-direct-set-state-in-use-layout-effect.ts b/packages/plugins/eslint-plugin-react-hooks-extra/src/rules/no-direct-set-state-in-use-layout-effect.ts
@@ -137,7 +137,7 @@ export default createRule<[], MessageID>({
                 return;
               }
               default: {
-                const variableDeclarator = AST.findParentNodeGuard(node, isVariableDeclaratorFromHookCall);
+                const variableDeclarator = AST.findParentNode(node, isVariableDeclaratorFromHookCall);
                 if (variableDeclarator == null) {
                   const calls = indSetStateCalls.get(pEntry.node) ?? [];
                   indSetStateCalls.set(pEntry.node, [...calls, node]);
@@ -182,7 +182,7 @@ export default createRule<[], MessageID>({
             if (!isUseMemoCall(parent)) {
               break;
             }
-            const variableDeclarator = AST.findParentNodeGuard(parent, isVariableDeclaratorFromHookCall);
+            const variableDeclarator = AST.findParentNode(parent, isVariableDeclaratorFromHookCall);
             if (variableDeclarator == null) {
               break;
             }
@@ -198,7 +198,7 @@ export default createRule<[], MessageID>({
             // const set = useCallback(setState, []);
             // useLayoutEffect(set, []);
             if (isUseCallbackCall(node.parent)) {
-              const variableDeclarator = AST.findParentNodeGuard(node.parent, isVariableDeclaratorFromHookCall);
+              const variableDeclarator = AST.findParentNode(node.parent, isVariableDeclaratorFromHookCall);
               if (variableDeclarator == null) {
                 break;
               }
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-direct-mutation-state.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-direct-mutation-state.ts
@@ -71,7 +71,7 @@ export default createRule<[], MessageID>({
         if (!isAssignmentToThisState(node)) {
           return;
         }
-        const parentClass = AST.findParentNodeGuard(
+        const parentClass = AST.findParentNode(
           node,
           AST.isOneOf([
             T.ClassDeclaration,
@@ -81,7 +81,7 @@ export default createRule<[], MessageID>({
         if (parentClass == null) return;
         if (
           isClassComponent(parentClass)
-          && context.sourceCode.getScope(node).block !== AST.findParentNodeGuard(node, isConstructorFunction)
+          && context.sourceCode.getScope(node).block !== AST.findParentNode(node, isConstructorFunction)
         ) {
           context.report({
             messageId: "noDirectMutationState",
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-duplicate-key.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-duplicate-key.ts
@@ -66,7 +66,7 @@ export default createRule<[], MessageID>({
             break;
           }
           default: {
-            const call = AST.findParentNodeGuard(jsxElement, AST.isMapCallLoose);
+            const call = AST.findParentNode(jsxElement, AST.isMapCallLoose);
             const iter = AST.findParentNode(jsxElement, (n) => n === call || AST.isFunction(n));
             if (!AST.isFunction(iter)) return;
             const arg0 = call?.arguments[0];
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-nested-components.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-nested-components.ts
@@ -114,7 +114,7 @@ export default createRule<[], MessageID>({
 
             continue;
           }
-          const parentComponent = AST.findParentNodeGuard(component, isFunctionComponent);
+          const parentComponent = AST.findParentNode(component, isFunctionComponent);
           const isParnetComponentNotDirectValueOfRenderProperty = parentComponent != null
             && !isDirectValueOfRenderPropertyLoose(parentComponent);
           if (isParnetComponentNotDirectValueOfRenderProperty) {
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-did-mount.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-did-mount.ts
@@ -44,7 +44,7 @@ export default createRule<[], MessageID>({
         if (!isThisSetState(node)) {
           return;
         }
-        const clazz = AST.findParentNodeGuard(node, isClassComponent);
+        const clazz = AST.findParentNode(node, isClassComponent);
         const method = AST.findParentNode(node, (n) => n === clazz || isComponentDidMount(n));
         if (clazz == null || method == null || method === clazz) return;
         const methodScope = context.sourceCode.getScope(method);
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-did-update.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-did-update.ts
@@ -44,7 +44,7 @@ export default createRule<[], MessageID>({
         if (!isThisSetState(node)) {
           return;
         }
-        const clazz = AST.findParentNodeGuard(node, isClassComponent);
+        const clazz = AST.findParentNode(node, isClassComponent);
         const method = AST.findParentNode(node, (n) => n === clazz || isComponentDidUpdate(n));
         if (clazz == null || method == null || method === clazz) return;
         const methodScope = context.sourceCode.getScope(method);
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-will-update.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-set-state-in-component-will-update.ts
@@ -44,7 +44,7 @@ export default createRule<[], MessageID>({
         if (!isThisSetState(node)) {
           return;
         }
-        const clazz = AST.findParentNodeGuard(node, isClassComponent);
+        const clazz = AST.findParentNode(node, isClassComponent);
         const method = AST.findParentNode(node, (n) => n === clazz || isComponentWillUpdate(n));
         if (clazz == null || method == null || method === clazz) return;
         const methodScope = context.sourceCode.getScope(method);
diff --git a/packages/utilities/ast/src/find-parent-node-guard.ts b/packages/utilities/ast/src/find-parent-node-guard.ts
diff --git a/packages/utilities/ast/src/find-parent-node.ts b/packages/utilities/ast/src/find-parent-node.ts
@@ -1,16 +1,30 @@
-import { _, dual } from "@eslint-react/eff";
+import { _ } from "@eslint-react/eff";
 import { AST_NODE_TYPES as T, type TSESTree } from "@typescript-eslint/types";
 
 /**
- * Find the first parent node that satisfies the test
- * @param node The node to start searching
+ * Find the parent node that satisfies the predicate function
+ * @param node The AST node
+ * @param predicate The predicate function
+ * @returns The parent node that satisfies the predicate or `undefined` if not found
+ */
+export function findParentNode<A extends TSESTree.Node>(
+  node: TSESTree.Node | _,
+  predicate: (n: TSESTree.Node) => n is A,
+): A | _;
+/**
+ * Find the parent node that satisfies the test function
+ * @param node The AST node
  * @param test The test function
- * @returns The first parent node that satisfies the test or undefined if not found
+ * @returns The parent node that satisfies the test or `undefined` if not found
  */
-export const findParentNode: {
-  (node: TSESTree.Node | _, test: (node: TSESTree.Node) => boolean): TSESTree.Node | _;
-  (test: (node: TSESTree.Node) => boolean): (node: TSESTree.Node) => TSESTree.Node | _;
-} = dual(2, (node: TSESTree.Node | _, test: (node: TSESTree.Node) => boolean): TSESTree.Node | _ => {
+export function findParentNode(
+  node: TSESTree.Node | _,
+  test: (node: TSESTree.Node) => boolean,
+): TSESTree.Node | _;
+export function findParentNode<A extends TSESTree.Node>(
+  node: TSESTree.Node | _,
+  test: ((node: TSESTree.Node) => boolean) | ((n: TSESTree.Node) => n is A),
+): TSESTree.Node | A | _ {
   if (node == null) return _;
   let parent = node.parent;
   while (parent != null && parent.type !== T.Program) {
@@ -20,4 +34,4 @@ export const findParentNode: {
     parent = parent.parent;
   }
   return _;
-});
+}
diff --git a/packages/utilities/ast/src/get-nested-expressions-of-type.ts b/packages/utilities/ast/src/get-nested-expressions-of-type.ts
@@ -19,7 +19,9 @@ export function getNestedExpressionsOfType<TNodeType extends T>(
       expressions.push(node);
     }
     if ("arguments" in node) {
-      const chunk = node.arguments.map(getNestedExpressionsOfType(type)).flat(1);
+      const chunk = node.arguments
+        .map(getNestedExpressionsOfType(type))
+        .flat(1);
       expressions.push(...chunk);
     }
     if (
@@ -55,15 +57,22 @@ export function getNestedExpressionsOfType<TNodeType extends T>(
       expressions.push(...chunk);
     }
     if ("elements" in node) {
-      const chunk = node.elements.filter((x) => x != null).map(getNestedExpressionsOfType(type)).flat(1);
+      const chunk = node.elements
+        .filter((x) => x != null)
+        .map(getNestedExpressionsOfType(type))
+        .flat(1);
       expressions.push(...chunk);
     }
     if ("properties" in node) {
-      const chunk = node.properties.map(boundGetNestedExpressionsOfType).flat(1);
+      const chunk = node.properties
+        .map(boundGetNestedExpressionsOfType)
+        .flat(1);
       expressions.push(...chunk);
     }
     if ("expressions" in node) {
-      const chunk = node.expressions.map(boundGetNestedExpressionsOfType).flat(1);
+      const chunk = node.expressions
+        .map(boundGetNestedExpressionsOfType)
+        .flat(1);
       expressions.push(...chunk);
     }
     if (node.type === T.Property) {
diff --git a/packages/utilities/ast/src/get-nested-return-statements.ts b/packages/utilities/ast/src/get-nested-return-statements.ts
@@ -2,7 +2,7 @@ import type { TSESTree } from "@typescript-eslint/types";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 import { simpleTraverse } from "@typescript-eslint/typescript-estree";
 
-import { findParentNodeGuard } from "./find-parent-node-guard";
+import { findParentNode } from "./find-parent-node";
 import { isFunction } from "./is";
 
 /**
@@ -14,13 +14,13 @@ export function getNestedReturnStatements(node: TSESTree.Node): readonly TSESTre
   const returnStatements: TSESTree.ReturnStatement[] = [];
   const functionNode = isFunction(node)
     ? node
-    : findParentNodeGuard(node, isFunction);
+    : findParentNode(node, isFunction);
   simpleTraverse(node, {
     enter(node) {
       if (node.type !== T.ReturnStatement) {
         return;
       }
-      const parentFunction = findParentNodeGuard(node, isFunction);
+      const parentFunction = findParentNode(node, isFunction);
       if (parentFunction !== functionNode) {
         return;
       }
diff --git a/packages/utilities/ast/src/index.ts b/packages/utilities/ast/src/index.ts
@@ -1,5 +1,4 @@
 export * from "./find-parent-node";
-export * from "./find-parent-node-guard";
 export * from "./function-init-path";
 export * from "./get-class-identifier";
 export * from "./get-function-identifier";
diff --git a/packages/utilities/jsx/src/find-parent-prop.ts b/packages/utilities/jsx/src/find-parent-prop.ts
@@ -12,5 +12,5 @@ export function findParentProp(
     return node.type === T.JSXAttribute && test(node);
   };
 
-  return AST.findParentNodeGuard(node, guard);
+  return AST.findParentNode(node, guard);
 }

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ export function isSetupFunction(node: TSESTree.Node \| _) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`export function isCleanupFunction(node: TSESTree.Node) {`
`18`		`- const nearReturn = AST.findParentNodeGuard(node, AST.is(T.ReturnStatement));`
`19`		`- const nearFunction = AST.findParentNodeGuard(node, AST.isFunction);`
`20`		`- const nearFunctionOfReturn = AST.findParentNodeGuard(nearReturn, AST.isFunction);`
	`18`	`+ const nearReturn = AST.findParentNode(node, AST.is(T.ReturnStatement));`
	`19`	`+ const nearFunction = AST.findParentNode(node, AST.isFunction);`
	`20`	`+ const nearFunctionOfReturn = AST.findParentNode(nearReturn, AST.isFunction);`
`21`	`21`	`return nearFunction === nearFunctionOfReturn && isSetupFunction(nearFunction);`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ import type { TSESTree } from "@typescript-eslint/types";`
`4`	`4`	`import { isReactHook } from "./is";`
`5`	`5`
`6`	`6`	`export function isInsideReactHook(node: TSESTree.Node) {`
`7`		`- return isReactHook(AST.findParentNodeGuard(node, AST.isFunction));`
	`7`	`+ return isReactHook(AST.findParentNode(node, AST.isFunction));`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export function isDeclaredInRenderPropLoose(node: TSESTree.Node) {`
`38`	`38`	`if (isDirectValueOfRenderPropertyLoose(node)) {`
`39`	`39`	`return true;`
`40`	`40`	`}`
`41`		`- const parent = AST.findParentNodeGuard(node, AST.is(T.JSXExpressionContainer))?.parent;`
	`41`	`+ const parent = AST.findParentNode(node, AST.is(T.JSXExpressionContainer))?.parent;`
`42`	`42`	`if (parent?.type !== T.JSXAttribute) {`
`43`	`43`	`return false;`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ export default createRule<[], MessageID>({`
`66`	`66`	`break;`
`67`	`67`	`}`
`68`	`68`	`default: {`
`69`		`- const call = AST.findParentNodeGuard(jsxElement, AST.isMapCallLoose);`
	`69`	`+ const call = AST.findParentNode(jsxElement, AST.isMapCallLoose);`
`70`	`70`	`const iter = AST.findParentNode(jsxElement, (n) => n === call \|\| AST.isFunction(n));`
`71`	`71`	`if (!AST.isFunction(iter)) return;`
`72`	`72`	`const arg0 = call?.arguments[0];`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ export default createRule<[], MessageID>({`
`114`	`114`
`115`	`115`	`continue;`
`116`	`116`	`}`
`117`		`- const parentComponent = AST.findParentNodeGuard(component, isFunctionComponent);`
	`117`	`+ const parentComponent = AST.findParentNode(component, isFunctionComponent);`
`118`	`118`	`const isParnetComponentNotDirectValueOfRenderProperty = parentComponent != null`
`119`	`119`	`&& !isDirectValueOfRenderPropertyLoose(parentComponent);`
`120`	`120`	`if (isParnetComponentNotDirectValueOfRenderProperty) {`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export default createRule<[], MessageID>({`
`44`	`44`	`if (!isThisSetState(node)) {`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`		`- const clazz = AST.findParentNodeGuard(node, isClassComponent);`
	`47`	`+ const clazz = AST.findParentNode(node, isClassComponent);`
`48`	`48`	`const method = AST.findParentNode(node, (n) => n === clazz \|\| isComponentDidMount(n));`
`49`	`49`	`if (clazz == null \|\| method == null \|\| method === clazz) return;`
`50`	`50`	`const methodScope = context.sourceCode.getScope(method);`