Skip to content
Open
Changes from all commits
Commits
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
58 changes: 40 additions & 18 deletions packages/vue-query/src/queryClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,21 +202,28 @@ export class QueryClient extends QC {
TInferredError = InferErrorFromTag<TError, TTaggedQueryKey>,
>(
filters?:
| InvalidateQueryFilters<TTaggedQueryKey>
| (() => InvalidateQueryFilters<TTaggedQueryKey>),
options?: MaybeRefDeep<InvalidateOptions>,
| MaybeRefDeep<InvalidateQueryFilters<TTaggedQueryKey>>
| (() => MaybeRefDeep<InvalidateQueryFilters<TTaggedQueryKey>>),
options?:
| MaybeRefDeep<InvalidateOptions>
| (() => MaybeRefDeep<InvalidateOptions>),
): Promise<void>
invalidateQueries<TTaggedQueryKey extends QueryKey = QueryKey>(
filters:
| MaybeRefDeep<InvalidateQueryFilters<TTaggedQueryKey>>
| (() => InvalidateQueryFilters<TTaggedQueryKey>) = {},
options: MaybeRefDeep<InvalidateOptions> | (() => InvalidateOptions) = {},
| (() => MaybeRefDeep<InvalidateQueryFilters<TTaggedQueryKey>>) = {},
options:
| MaybeRefDeep<InvalidateOptions>
| (() => MaybeRefDeep<InvalidateOptions>) = {},
): Promise<void> {
const unwrappedFilters = typeof filters === 'function' ? filters() : filters
const unwrappedOptions = typeof options === 'function' ? options() : options

const filtersCloned = cloneDeepUnref(
filters as MaybeRefDeep<InvalidateQueryFilters<TTaggedQueryKey>>,
unwrappedFilters as MaybeRefDeep<InvalidateQueryFilters<TTaggedQueryKey>>,
)
const optionsCloned = cloneDeepUnref(
options as MaybeRefDeep<InvalidateOptions>,
unwrappedOptions as MaybeRefDeep<InvalidateOptions>,
)

super.invalidateQueries(
Expand Down Expand Up @@ -286,13 +293,16 @@ export class QueryClient extends QC {
| MaybeRefDeep<
FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>
>
| (() => FetchQueryOptions<
TQueryFnData,
TError,
TData,
TQueryKey,
TPageParam
>),
| (() =>
MaybeRefDeep<
FetchQueryOptions<
TQueryFnData,
TError,
TData,
TQueryKey,
TPageParam
>
>),
): Promise<TData>
fetchQuery<
TQueryFnData,
Expand All @@ -301,11 +311,23 @@ export class QueryClient extends QC {
TQueryKey extends QueryKey = QueryKey,
TPageParam = never,
>(
options: MaybeRefDeep<
FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>
>,
options:
| MaybeRefDeep<
FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>
>
| (() =>
MaybeRefDeep<
FetchQueryOptions<
TQueryFnData,
TError,
TData,
TQueryKey,
TPageParam
>
>),
): Promise<TData> {
return super.fetchQuery(cloneDeepUnref(options))
const unwrappedOptions = typeof options === 'function' ? options() : options
return super.fetchQuery(cloneDeepUnref(unwrappedOptions))
}

prefetchQuery<
Expand Down