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/tidy-lions-cache.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@tanstack/query-core': patch
---

Memoize falsy `combine` results when the function and query results are unchanged.
35 changes: 35 additions & 0 deletions packages/query-core/src/__tests__/queriesObserver.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,41 @@ describe('queriesObserver', () => {
expect(combined1).toBe(combined2)
})

it.each([
['zero', 0],
['negative zero', -0],
['NaN', Number.NaN],
['false', false],
['empty string', ''],
['null', null],
['undefined', undefined],
['zero bigint', 0n],
])(
'should cache the falsy combined result %s when nothing has changed',
(_name, value) => {
const combine = vi.fn(() => value)
const key = queryKey()
const queries = [{ queryKey: key, queryFn: () => 1 }]
const observer = new QueriesObserver<typeof value>(queryClient, queries, {
combine,
})

const [raw1, getCombined1] = observer.getOptimisticResult(
queries,
combine,
)
getCombined1(raw1)

const [raw2, getCombined2] = observer.getOptimisticResult(
queries,
combine,
)
getCombined2(raw2)

expect(combine).toHaveBeenCalledTimes(1)
},
)

it('should track properties on all observers when trackResult is called', () => {
const key1 = queryKey()
const key2 = queryKey()
Expand Down
3 changes: 1 addition & 2 deletions packages/query-core/src/queriesObserver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export class QueriesObserver<
#queries: Array<QueryObserverOptions>
#options?: QueriesObserverOptions<TCombinedResult>
#observers: Array<QueryObserver>
#combinedResult?: TCombinedResult
#combinedResult!: TCombinedResult
#lastCombine?: CombineFn<TCombinedResult>
#lastResult?: Array<QueryObserverResult>
#lastQueryHashes?: Array<string>
Expand Down Expand Up @@ -227,7 +227,6 @@ export class QueriesObserver<
queryHashes.some((hash, i) => hash !== lastHashes[i]))

if (
!this.#combinedResult ||
this.#result !== this.#lastResult ||
queryHashesChanged ||
combine !== this.#lastCombine
Expand Down