From b0b72a36d02e66078a67104a8fb5713abb56d72a Mon Sep 17 00:00:00 2001 From: Manan Telrandhe Date: Wed, 22 Jul 2026 21:33:32 +0530 Subject: [PATCH 1/3] fix(vue-query): unwrap getter function for fetchQuery options --- packages/vue-query/src/queryClient.ts | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/packages/vue-query/src/queryClient.ts b/packages/vue-query/src/queryClient.ts index b9f78e26c17..a49c2b70d15 100644 --- a/packages/vue-query/src/queryClient.ts +++ b/packages/vue-query/src/queryClient.ts @@ -212,11 +212,14 @@ export class QueryClient extends QC { | (() => InvalidateQueryFilters) = {}, options: MaybeRefDeep | (() => InvalidateOptions) = {}, ): Promise { + const unwrappedFilters = typeof filters === 'function' ? filters() : filters + const unwrappedOptions = typeof options === 'function' ? options() : options + const filtersCloned = cloneDeepUnref( - filters as MaybeRefDeep>, + unwrappedFilters as MaybeRefDeep>, ) const optionsCloned = cloneDeepUnref( - options as MaybeRefDeep, + unwrappedOptions as MaybeRefDeep, ) super.invalidateQueries( @@ -301,11 +304,20 @@ export class QueryClient extends QC { TQueryKey extends QueryKey = QueryKey, TPageParam = never, >( - options: MaybeRefDeep< - FetchQueryOptions - >, + options: + | MaybeRefDeep< + FetchQueryOptions + > + | (() => FetchQueryOptions< + TQueryFnData, + TError, + TData, + TQueryKey, + TPageParam + >), ): Promise { - return super.fetchQuery(cloneDeepUnref(options)) + const unwrappedOptions = typeof options === 'function' ? options() : options + return super.fetchQuery(cloneDeepUnref(unwrappedOptions as any)) } prefetchQuery< From 10ac8bb510e4fef9eeea9f10b7da7d63d363d074 Mon Sep 17 00:00:00 2001 From: Manan Telrandhe Date: Wed, 22 Jul 2026 23:10:08 +0530 Subject: [PATCH 2/3] fix(vue-query): widen getter overload return types to MaybeRefDeep --- packages/vue-query/src/queryClient.ts | 50 ++++++++++++++++----------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/packages/vue-query/src/queryClient.ts b/packages/vue-query/src/queryClient.ts index a49c2b70d15..64550ccf35a 100644 --- a/packages/vue-query/src/queryClient.ts +++ b/packages/vue-query/src/queryClient.ts @@ -202,15 +202,19 @@ export class QueryClient extends QC { TInferredError = InferErrorFromTag, >( filters?: - | InvalidateQueryFilters - | (() => InvalidateQueryFilters), - options?: MaybeRefDeep, + | MaybeRefDeep> + | (() => MaybeRefDeep>), + options?: + | MaybeRefDeep + | (() => MaybeRefDeep), ): Promise invalidateQueries( filters: | MaybeRefDeep> - | (() => InvalidateQueryFilters) = {}, - options: MaybeRefDeep | (() => InvalidateOptions) = {}, + | (() => MaybeRefDeep>) = {}, + options: + | MaybeRefDeep + | (() => MaybeRefDeep) = {}, ): Promise { const unwrappedFilters = typeof filters === 'function' ? filters() : filters const unwrappedOptions = typeof options === 'function' ? options() : options @@ -289,13 +293,16 @@ export class QueryClient extends QC { | MaybeRefDeep< FetchQueryOptions > - | (() => FetchQueryOptions< - TQueryFnData, - TError, - TData, - TQueryKey, - TPageParam - >), + | (() => + MaybeRefDeep< + FetchQueryOptions< + TQueryFnData, + TError, + TData, + TQueryKey, + TPageParam + > + >), ): Promise fetchQuery< TQueryFnData, @@ -308,16 +315,19 @@ export class QueryClient extends QC { | MaybeRefDeep< FetchQueryOptions > - | (() => FetchQueryOptions< - TQueryFnData, - TError, - TData, - TQueryKey, - TPageParam - >), + | (() => + MaybeRefDeep< + FetchQueryOptions< + TQueryFnData, + TError, + TData, + TQueryKey, + TPageParam + > + >), ): Promise { const unwrappedOptions = typeof options === 'function' ? options() : options - return super.fetchQuery(cloneDeepUnref(unwrappedOptions as any)) + return super.fetchQuery(cloneDeepUnref(unwrappedOptions)) } prefetchQuery< From f52101cdf4ad82d175116bbb1677baa5301cc5f0 Mon Sep 17 00:00:00 2001 From: Manan Telrandhe Date: Thu, 23 Jul 2026 14:17:44 +0530 Subject: [PATCH 3/3] fix(vue-query): revert invalidateQueries getter support --- packages/vue-query/src/queryClient.ts | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/packages/vue-query/src/queryClient.ts b/packages/vue-query/src/queryClient.ts index 64550ccf35a..e4d66f15ee3 100644 --- a/packages/vue-query/src/queryClient.ts +++ b/packages/vue-query/src/queryClient.ts @@ -201,29 +201,18 @@ export class QueryClient extends QC { TInferredQueryFnData = InferDataFromTag, TInferredError = InferErrorFromTag, >( - filters?: - | MaybeRefDeep> - | (() => MaybeRefDeep>), - options?: - | MaybeRefDeep - | (() => MaybeRefDeep), + filters?: MaybeRefDeep>, + options?: MaybeRefDeep, ): Promise invalidateQueries( - filters: - | MaybeRefDeep> - | (() => MaybeRefDeep>) = {}, - options: - | MaybeRefDeep - | (() => MaybeRefDeep) = {}, + filters: MaybeRefDeep> = {}, + options: MaybeRefDeep = {}, ): Promise { - const unwrappedFilters = typeof filters === 'function' ? filters() : filters - const unwrappedOptions = typeof options === 'function' ? options() : options - const filtersCloned = cloneDeepUnref( - unwrappedFilters as MaybeRefDeep>, + filters as MaybeRefDeep>, ) const optionsCloned = cloneDeepUnref( - unwrappedOptions as MaybeRefDeep, + options as MaybeRefDeep, ) super.invalidateQueries(