Skip to content
Open
Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions .changeset/vue-query-fetch-query-getter-options.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tanstack/vue-query": patch
---

Unwrap getter function options passed to `queryClient.fetchQuery`.
14 changes: 14 additions & 0 deletions packages/vue-query/src/__tests__/queryClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,20 @@ describe('QueryCache', () => {
queryKey: queryKeyUnref,
})
})

it('should unwrap getter function options', () => {
const queryClient = new QueryClient()

queryClient.fetchQuery(() => ({
queryKey: queryKeyRef,
queryFn: fn,
}))

expect(QueryClientOrigin.prototype.fetchQuery).toHaveBeenCalledWith({
queryKey: queryKeyUnref,
queryFn: fn,
})
})
})

describe('query', () => {
Expand Down
12 changes: 10 additions & 2 deletions packages/vue-query/src/queryClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ import type {
Updater,
} from '@tanstack/query-core'

type MaybeRefDeepOrGetter<T> = MaybeRefDeep<T> | (() => T)

function cloneDeepUnrefOrGet<T>(value: MaybeRefDeepOrGetter<T>): T {
const unwrapped = typeof value === 'function' ? (value as () => T)() : value

return cloneDeepUnref(unwrapped as MaybeRefDeep<T>)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

export class QueryClient extends QC {
constructor(config: QueryClientConfig = {}) {
const vueQueryConfig = {
Expand Down Expand Up @@ -340,11 +348,11 @@ export class QueryClient extends QC {
TQueryKey extends QueryKey = QueryKey,
TPageParam = never,
>(
options: MaybeRefDeep<
options: MaybeRefDeepOrGetter<
FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>
>,
): Promise<TData> {
return super.fetchQuery(cloneDeepUnref(options))
return super.fetchQuery(cloneDeepUnrefOrGet(options))
}

/**
Expand Down
Loading