fix: detect callee objects as dependencies in exhaustive-deps rule

Newbie012 · Newbie012 · commit f643d7282082 · 2026-03-08T11:25:22.000+02:00
diff --git a/packages/eslint-plugin-query/src/__tests__/exhaustive-deps.test.ts b/packages/eslint-plugin-query/src/__tests__/exhaustive-deps.test.ts
@@ -34,20 +34,6 @@ ruleTester.run('exhaustive-deps', rule, {
       name: 'should not pass api.entity.get',
       code: 'useQuery({ queryKey: ["entity", id], queryFn: () => api.entity.get(id) });',
     },
-    {
-      name: 'should not pass api when is being used for calling a function',
-      code: `
-        import useApi from './useApi'
-
-        const useFoo = () => {
-          const api = useApi();
-          return useQuery({
-            queryKey: ['foo'],
-            queryFn: () => api.fetchFoo(),
-          })
-        }
-      `,
-    },
     {
       name: 'should pass props.src',
       code: `
@@ -698,6 +684,43 @@ ruleTester.run('exhaustive-deps', rule, {
     },
   ],
   invalid: [
+    {
+      name: 'should fail when api from hook is used for calling a function',
+      code: normalizeIndent`
+        import useApi from './useApi'
+
+        const useFoo = () => {
+          const api = useApi();
+          return useQuery({
+            queryKey: ['foo'],
+            queryFn: () => api.fetchFoo(),
+          })
+        }
+      `,
+      errors: [
+        {
+          messageId: 'missingDeps',
+          data: { deps: 'api' },
+          suggestions: [
+            {
+              messageId: 'fixTo',
+              data: { result: "['foo', api]" },
+              output: normalizeIndent`
+                import useApi from './useApi'
+
+                const useFoo = () => {
+                  const api = useApi();
+                  return useQuery({
+                    queryKey: ['foo', api],
+                    queryFn: () => api.fetchFoo(),
+                  })
+                }
+              `,
+            },
+          ],
+        },
+      ],
+    },
     {
       name: 'should fail when deps are missing in query factory',
       code: normalizeIndent`
diff --git a/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.rule.ts b/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.rule.ts
@@ -95,15 +95,16 @@ export const rule = createRule({
         const missingRefs = relevantRefs
           .map((ref) => ({
             ref: ref,
-            text: ASTUtils.mapKeyNodeToBaseText(
-              ref.identifier,
-              context.sourceCode,
-            ),
+            text: ASTUtils.isAncestorIsCallee(ref.identifier)
+              ? ref.identifier.name
+              : ASTUtils.mapKeyNodeToBaseText(
+                  ref.identifier,
+                  context.sourceCode,
+                ),
           }))
           .filter(({ ref, text }) => {
             return (
               !ref.isTypeReference &&
-              !ASTUtils.isAncestorIsCallee(ref.identifier) &&
               !queryKeyDeps.has(text) &&
               !queryKeyDeps.has(text.split(/[?.]/)[0] ?? '')
             )
@@ -117,9 +118,7 @@ export const rule = createRule({
 
         if (uniqueMissingRefs.length > 0) {
           const missingAsText = uniqueMissingRefs
-            .map((ref) =>
-              ASTUtils.mapKeyNodeToText(ref.identifier, context.sourceCode),
-            )
+            .map((ref) => ref.text)
             .join(', ')
 
           const queryKeyValue = context.sourceCode.getText(queryKeyNode)
diff --git a/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.utils.ts b/packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.utils.ts
@@ -80,8 +80,12 @@ export const ExhaustiveDepsUtils = {
     }
 
     function visitChildren(node: TSESTree.Node): void {
-      for (const key of visitorKeys[node.type] ?? []) {
-        const value = (node as Record<string, unknown>)[key]
+      const keys = (visitorKeys[node.type] ?? []) as ReadonlyArray<
+        keyof TSESTree.Node
+      >
+
+      for (const key of keys) {
+        const value = node[key]
 
         if (Array.isArray(value)) {
           for (const item of value) {
@@ -122,7 +126,15 @@ export const ExhaustiveDepsUtils = {
           visit(node.value)
           return
         case AST_NODE_TYPES.MemberExpression:
-          visit(node.object)
+          if (
+            node.parent.type === AST_NODE_TYPES.CallExpression &&
+            node.parent.callee === node &&
+            node.object.type === AST_NODE_TYPES.Identifier
+          ) {
+            deps.add(node.object.name)
+          } else {
+            visit(node.object)
+          }
           return
         case AST_NODE_TYPES.CallExpression:
           node.arguments.forEach((argument) => visit(argument))
@@ -154,9 +166,7 @@ export const ExhaustiveDepsUtils = {
   },
 
   collectExternalRefsInFunction(params: {
-    functionNode:
-      | TSESTree.ArrowFunctionExpression
-      | TSESTree.FunctionExpression
+    functionNode: TSESTree.ArrowFunctionExpression | TSESTree.FunctionExpression
     scopeManager: TSESLint.Scope.ScopeManager
   }): Array<TSESLint.Scope.Reference> {
     const { functionNode, scopeManager } = params
