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

fix: allow partial query keys in `QueryFilters`
29 changes: 27 additions & 2 deletions packages/query-core/src/__tests__/utils.test-d.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { describe, expectTypeOf, it } from 'vitest'
import { assertType, describe, expectTypeOf, it } from 'vitest'
import { QueryClient } from '../queryClient'
import type { QueryFilters } from '../utils'
import type { DataTag, QueryKey } from '../types'
Expand Down Expand Up @@ -35,11 +35,36 @@ describe('QueryFilters', () => {
}

const queryClient = new QueryClient()

const data = queryClient.getQueryData(a.queryKey!)
expectTypeOf(data).toEqualTypeOf<unknown>()

const error = queryClient.getQueryState(a.queryKey!)?.error
expectTypeOf(error).toEqualTypeOf<Error | null | undefined>()
})

it('should allow a partial query key to be passed', () => {
const filters: QueryFilters<readonly ['key', { a: number; b: string }]> = {
queryKey: ['key'],
}

expectTypeOf(filters.queryKey).toEqualTypeOf<
| undefined
| readonly []
| ['key']
| readonly [
'key',
{
a: number
b: string
},
]
>()
})

it('should error on invalid query keys', () => {
assertType<QueryFilters<readonly ['key', { a: number; b: string }]>>({
// @ts-expect-error cannot pass invalid query key
queryKey: ['invalid', { a: 1, b: '1' }],
})
})
})
15 changes: 13 additions & 2 deletions packages/query-core/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ import type { FetchOptions, Query } from './query'

// TYPES

type DropLast<T extends ReadonlyArray<unknown>> = T extends readonly [
...infer R,
unknown,
]
? R
: never

type TuplePrefixes<T extends ReadonlyArray<unknown>> = T extends readonly []
? readonly []
: TuplePrefixes<DropLast<T>> | T

export interface QueryFilters<TQueryKey extends QueryKey = QueryKey> {
/**
* Filter to active queries, inactive queries or all queries
Expand All @@ -32,7 +43,7 @@ export interface QueryFilters<TQueryKey extends QueryKey = QueryKey> {
/**
* Include queries matching this query key
*/
queryKey?: TQueryKey
queryKey?: TuplePrefixes<TQueryKey>
/**
* Include or exclude stale queries
*/
Expand Down Expand Up @@ -62,7 +73,7 @@ export interface MutationFilters<
/**
* Include mutations matching this mutation key
*/
mutationKey?: MutationKey
mutationKey?: TuplePrefixes<MutationKey>
/**
* Filter by mutation status
*/
Expand Down