Skip to content

Commit

Permalink
fix(query-core): accept generics on setQueryDefaults and setMutationD…
Browse files Browse the repository at this point in the history
…efaults (#7903)

Co-authored-by: Damian Osipiuk <osipiukd+git@gmail.com>
  • Loading branch information
simonecervini and DamianOsipiuk authored Sep 3, 2024
1 parent c738352 commit a85382f
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 8 deletions.
21 changes: 17 additions & 4 deletions packages/query-core/src/queryClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,10 +429,18 @@ export class QueryClient {
this.#defaultOptions = options
}

setQueryDefaults(
setQueryDefaults<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
TQueryData = TQueryFnData,
>(
queryKey: QueryKey,
options: Partial<
OmitKeyof<QueryObserverOptions<unknown, any, any, any>, 'queryKey'>
OmitKeyof<
QueryObserverOptions<TQueryFnData, TError, TData, TQueryData>,
'queryKey'
>
>,
): void {
this.#queryDefaults.set(hashKey(queryKey), {
Expand All @@ -459,10 +467,15 @@ export class QueryClient {
return result
}

setMutationDefaults(
setMutationDefaults<
TData = unknown,
TError = DefaultError,
TVariables = void,
TContext = unknown,
>(
mutationKey: MutationKey,
options: OmitKeyof<
MutationObserverOptions<any, any, any, any>,
MutationObserverOptions<TData, TError, TVariables, TContext>,
'mutationKey'
>,
): void {
Expand Down
21 changes: 17 additions & 4 deletions packages/vue-query/src/queryClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { QueryClient as QC } from '@tanstack/query-core'
import { cloneDeepUnref } from './utils'
import { QueryCache } from './queryCache'
import { MutationCache } from './mutationCache'
import type { UseQueryOptions } from './useQuery'
import type { Ref } from 'vue-demi'
import type { MaybeRefDeep, NoUnknown } from './types'
import type {
Expand Down Expand Up @@ -387,10 +388,15 @@ export class QueryClient extends QC {
super.setDefaultOptions(cloneDeepUnref(options))
}

setQueryDefaults(
setQueryDefaults<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
TQueryData = TQueryFnData,
>(
queryKey: MaybeRefDeep<QueryKey>,
options: MaybeRefDeep<
OmitKeyof<QueryObserverOptions<unknown, any, any, any>, 'queryKey'>
Omit<UseQueryOptions<TQueryFnData, TError, TData, TQueryData>, 'queryKey'>
>,
): void {
super.setQueryDefaults(cloneDeepUnref(queryKey), cloneDeepUnref(options))
Expand All @@ -402,9 +408,16 @@ export class QueryClient extends QC {
return super.getQueryDefaults(cloneDeepUnref(queryKey))
}

setMutationDefaults(
setMutationDefaults<
TData = unknown,
TError = DefaultError,
TVariables = void,
TContext = unknown,
>(
mutationKey: MaybeRefDeep<MutationKey>,
options: MaybeRefDeep<MutationObserverOptions<any, any, any, any>>,
options: MaybeRefDeep<
MutationObserverOptions<TData, TError, TVariables, TContext>
>,
): void {
super.setMutationDefaults(
cloneDeepUnref(mutationKey),
Expand Down

0 comments on commit a85382f

Please sign in to comment.