address false positives

Newbie012 · Newbie012 · commit 7382e2a597be · 2026-03-22T15:15:58.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
@@ -103,6 +103,17 @@ ruleTester.run('exhaustive-deps', rule, {
         }
       `,
     },
+    {
+      name: 'should ignore type parameters used only in queryFn return type',
+      code: normalizeIndent`
+        function useThing<TData>() {
+          return useQuery({
+            queryKey: ['thing'],
+            queryFn: (): Promise<TData> => Promise.reject(new Error('nope')),
+          })
+        }
+      `,
+    },
     {
       name: 'should add "...args" to deps',
       code: `
@@ -442,7 +453,7 @@ ruleTester.run('exhaustive-deps', rule, {
     {
       name: 'should pass when queryKey uses a direct conditional expression',
       code: normalizeIndent`
-        function Component(cond, a, b) {
+        function Component({ cond, a, b }) {
           useQuery({
             queryKey: ['thing', cond ? a : b],
             queryFn: () => (cond ? a : b),
@@ -453,7 +464,7 @@ ruleTester.run('exhaustive-deps', rule, {
     {
       name: 'should pass when queryKey uses a direct binary expression',
       code: normalizeIndent`
-        function Component(a, b) {
+        function Component({ a, b }) {
           useQuery({
             queryKey: ['thing', a + b],
             queryFn: () => a + b,
@@ -810,6 +821,19 @@ ruleTester.run('exhaustive-deps', rule, {
         }
       `,
     },
+    {
+      name: 'should pass when queryKey has call expression with identifier callee',
+      code: normalizeIndent`
+        function useThing(dep) {
+          const makeKeyPart = (value) => value
+
+          return useQuery({
+            queryKey: ['thing', makeKeyPart(dep)],
+            queryFn: () => makeKeyPart(dep)
+          })
+        }
+      `,
+    },
     {
       name: 'should pass when queryKey has call expression with nested member callee',
       code: normalizeIndent`
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
@@ -14,7 +14,7 @@ export const ExhaustiveDepsUtils = {
     const component = ASTUtils.getFunctionAncestor(sourceCode, node)
     const queryFnScope = scopeManager.acquire(node)
 
-    if (queryFnScope === null) {
+    if (queryFnScope === null || reference.isValueReference === false) {
       return false
     }
 
@@ -215,12 +215,13 @@ export const ExhaustiveDepsUtils = {
           return
         case AST_NODE_TYPES.CallExpression:
           node.arguments.forEach((argument) => visit(argument))
-          if (
-            node.callee.type === AST_NODE_TYPES.MemberExpression ||
-            node.callee.type === AST_NODE_TYPES.ChainExpression ||
-            node.callee.type === AST_NODE_TYPES.TSNonNullExpression
-          ) {
-            visit(node.callee)
+          switch (node.callee.type) {
+            case AST_NODE_TYPES.Identifier:
+            case AST_NODE_TYPES.MemberExpression:
+            case AST_NODE_TYPES.ChainExpression:
+            case AST_NODE_TYPES.TSNonNullExpression:
+              visit(node.callee)
+              break
           }
           return
       }
