fix: make queryKey typesafe

Author: ecyrbe

packages/query-core/src/queryCache.ts

@@ -165,7 +165,7 @@ export class QueryCache extends Subscribable<QueryCacheListener> {
   }
 
   find<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData>(
-    arg1: QueryKey,
+    arg1: QueryKey | QueryFilters,
     arg2?: QueryFilters,
   ): Query<TQueryFnData, TError, TData> | undefined {
     const [filters] = parseFilterArgs(arg1, arg2)

packages/query-core/src/queryClient.ts

@@ -10,7 +10,6 @@ import {
   MutationFilters,
   functionalUpdate,
   ExtendedQueryFilters,
-  isQueryKey,
 } from './utils'
 import type {
   QueryClientConfig,
@@ -119,11 +118,7 @@ export class QueryClient {
     arg1: QueryKey | ExtendedQueryFilters<TData, any, TData, QueryKey>,
     arg2?: QueryFilters,
   ): TData | undefined {
-    if (isQueryKey(arg1))
-      return this.queryCache.find<TData>(arg1, arg2)?.state.data
-    if (arg1.queryKey)
-      return this.queryCache.find<TData>(arg1.queryKey, arg1)?.state.data
-    return undefined
+    return this.queryCache.find<TData>(arg1, arg2)?.state.data
   }
 
   getQueriesData<TData = unknown>(queryKey: QueryKey): [QueryKey, TData][]

packages/query-core/src/tests/queryClient.test.tsx

@@ -471,11 +471,14 @@ describe('queryClient', () => {
     test('should return the query data with stale filter', () => {
       const key = queryKey()
       queryClient.setQueryData([key, 'id'], 'bar')
-      expect(queryClient.getQueryData([key, 'id'], { stale: false })).toBe(
-        'bar',
-      )
       expect(
-        queryClient.getQueryData({ queryKey: [key, 'id'], stale: false }),
+        queryClient.getQueryData<string>([key, 'id'], { stale: false }),
+      ).toBe('bar')
+      expect(
+        queryClient.getQueryData<string>({
+          queryKey: [key, 'id'],
+          stale: false,
+        }),
       ).toBe('bar')
     })
 
@@ -485,7 +488,7 @@ describe('queryClient', () => {
       expect(
         queryClient.getQueryData({
           queryKey: [key, 'id'],
-          queryFn: async () => 1,
+          queryFn: async () => 'foo',
           cacheTime: 1000,
           retry: false,
         }),

packages/query-core/src/utils.ts

@@ -45,7 +45,9 @@ export interface ExtendedQueryFilters<
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > extends Omit<QueryFilters, 'queryKey'>,
-    QueryOptions<TQueryFnData, TError, TData, TQueryKey> {}
+    Omit<QueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey'> {
+  queryKey: TQueryKey
+}
 
 export interface MutationFilters {
   /**