Skip to content

refactor(queryClient): accept generics on setQueryDefaults and setMutationDefaults #7903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DamianOsipiuk merged 3 commits into from
Sep 3, 2024
Merged

refactor(queryClient): accept generics on setQueryDefaults and setMutationDefaults #7903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ef2753
init
simonecervini Aug 14, 2024
567805c
Merge branch 'main' into sc/whole-leech
simonecervini Aug 25, 2024
139ecc5
Merge branch 'main' into sc/whole-leech
DamianOsipiuk Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions packages/query-core/src/queryClient.ts
View file
Open in desktop
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
View file
Open in desktop
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