Skip to content

Commit a85382f

Browse files
fix(query-core): accept generics on setQueryDefaults and setMutationDefaults (#7903)
Co-authored-by: Damian Osipiuk <[email protected]>
1 parent c738352 commit a85382f

File tree

2 files changed

+34
-8
lines changed

2 files changed

+34
-8
lines changed

packages/query-core/src/queryClient.ts

+17-4
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,18 @@ export class QueryClient {
429429
this.#defaultOptions = options
430430
}
431431

432-
setQueryDefaults(
432+
setQueryDefaults<
433+
TQueryFnData = unknown,
434+
TError = DefaultError,
435+
TData = TQueryFnData,
436+
TQueryData = TQueryFnData,
437+
>(
433438
queryKey: QueryKey,
434439
options: Partial<
435-
OmitKeyof<QueryObserverOptions<unknown, any, any, any>, 'queryKey'>
440+
OmitKeyof<
441+
QueryObserverOptions<TQueryFnData, TError, TData, TQueryData>,
442+
'queryKey'
443+
>
436444
>,
437445
): void {
438446
this.#queryDefaults.set(hashKey(queryKey), {
@@ -459,10 +467,15 @@ export class QueryClient {
459467
return result
460468
}
461469

462-
setMutationDefaults(
470+
setMutationDefaults<
471+
TData = unknown,
472+
TError = DefaultError,
473+
TVariables = void,
474+
TContext = unknown,
475+
>(
463476
mutationKey: MutationKey,
464477
options: OmitKeyof<
465-
MutationObserverOptions<any, any, any, any>,
478+
MutationObserverOptions<TData, TError, TVariables, TContext>,
466479
'mutationKey'
467480
>,
468481
): void {

packages/vue-query/src/queryClient.ts

+17-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { QueryClient as QC } from '@tanstack/query-core'
33
import { cloneDeepUnref } from './utils'
44
import { QueryCache } from './queryCache'
55
import { MutationCache } from './mutationCache'
6+
import type { UseQueryOptions } from './useQuery'
67
import type { Ref } from 'vue-demi'
78
import type { MaybeRefDeep, NoUnknown } from './types'
89
import type {
@@ -387,10 +388,15 @@ export class QueryClient extends QC {
387388
super.setDefaultOptions(cloneDeepUnref(options))
388389
}
389390

390-
setQueryDefaults(
391+
setQueryDefaults<
392+
TQueryFnData = unknown,
393+
TError = DefaultError,
394+
TData = TQueryFnData,
395+
TQueryData = TQueryFnData,
396+
>(
391397
queryKey: MaybeRefDeep<QueryKey>,
392398
options: MaybeRefDeep<
393-
OmitKeyof<QueryObserverOptions<unknown, any, any, any>, 'queryKey'>
399+
Omit<UseQueryOptions<TQueryFnData, TError, TData, TQueryData>, 'queryKey'>
394400
>,
395401
): void {
396402
super.setQueryDefaults(cloneDeepUnref(queryKey), cloneDeepUnref(options))
@@ -402,9 +408,16 @@ export class QueryClient extends QC {
402408
return super.getQueryDefaults(cloneDeepUnref(queryKey))
403409
}
404410

405-
setMutationDefaults(
411+
setMutationDefaults<
412+
TData = unknown,
413+
TError = DefaultError,
414+
TVariables = void,
415+
TContext = unknown,
416+
>(
406417
mutationKey: MaybeRefDeep<MutationKey>,
407-
options: MaybeRefDeep<MutationObserverOptions<any, any, any, any>>,
418+
options: MaybeRefDeep<
419+
MutationObserverOptions<TData, TError, TVariables, TContext>
420+
>,
408421
): void {
409422
super.setMutationDefaults(
410423
cloneDeepUnref(mutationKey),

0 commit comments

Comments
 (0)