Skip to content

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

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

Closed
DarioSiroki wants to merge 9 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7da5d75
refactor(queryClient): accept generics on setQueryDefaults and setMut…
DarioSiroki Sep 9, 2023
c0e32d7
Merge branch 'beta' into feature/generics-on-mutation-defaults
TkDodo Sep 11, 2023
4e0d3de
Merge branch 'beta' into feature/generics-on-mutation-defaults
TkDodo Sep 16, 2023
6af9ad7
Merge branch 'beta' into feature/generics-on-mutation-defaults
TkDodo Sep 16, 2023
5aab87b
fix(useQuery): align vue generic types with core types
DarioSiroki Sep 18, 2023
aeed330
Merge branch 'feature/generics-on-mutation-defaults' of github.com:Da…
DarioSiroki Sep 18, 2023
8b125c0
Merge branch 'beta' into feature/generics-on-mutation-defaults
TkDodo Sep 25, 2023
3acbc3a
fix(queryClient): setQueryDefaults typings
DarioSiroki Oct 1, 2023
d8730c3
Merge branch 'rc' into feature/generics-on-mutation-defaults
TkDodo Oct 17, 2023
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
24 changes: 20 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 @@ -393,10 +393,18 @@ export class QueryClient {
this.#defaultOptions = options
}

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

setMutationDefaults(
setMutationDefaults<
TData = unknown,
TError = DefaultError,
TVariables = void,
TContext = unknown,
>(
mutationKey: MutationKey,
options: Omit<MutationObserverOptions<any, any, any, any>, 'mutationKey'>,
options: Omit<
MutationObserverOptions<TData, TError, TVariables, TContext>,
'mutationKey'
>,
): void {
this.#mutationDefaults.set(hashKey(mutationKey), {
mutationKey,
Expand Down
19 changes: 15 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 @@ -252,10 +252,14 @@ export class QueryClient extends QC {
super.setDefaultOptions(cloneDeepUnref(options))
}

setQueryDefaults(
setQueryDefaults<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
>(
queryKey: MaybeRefDeep<QueryKey>,
options: MaybeRefDeep<
Omit<QueryObserverOptions<unknown, any, any, any>, 'queryKey'>
Omit<QueryObserverOptions<TQueryFnData, TError, TData, any>, 'queryKey'>
>,
): void {
super.setQueryDefaults(cloneDeepUnref(queryKey), cloneDeepUnref(options))
Expand All @@ -267,9 +271,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