Skip to content

Commit 3a0d126

Browse files
committed
refactor(query-core, vue-query): update find method to accept filters as a parameter and improve type handling
1 parent d4d1fea commit 3a0d126

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

packages/query-core/src/queryCache.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@ import { notifyManager } from './notifyManager'
44
import { Subscribable } from './subscribable'
55
import type { QueryFilters } from './utils'
66
import type { Action, QueryState } from './query'
7-
import type {
8-
NotifyEvent,
9-
OmitKeyof,
10-
QueryKey,
11-
QueryOptions,
12-
WithRequired,
13-
} from './types'
7+
import type { NotifyEvent, OmitKeyof, QueryKey, QueryOptions } from './types'
148
import type { QueryClient } from './queryClient'
159
import type { QueryObserver } from './queryObserver'
1610

@@ -172,7 +166,7 @@ export class QueryCache extends Subscribable<QueryCacheListener> {
172166
}
173167

174168
find<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData>(
175-
filters: WithRequired<QueryFilters, 'queryKey'>,
169+
filters: QueryFilters,
176170
): Query<TQueryFnData, TError, TData> | undefined
177171
/**
178172
* @deprecated This method should be used with only one object argument.

packages/vue-query/src/queryCache.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,22 @@ import type { MaybeRefDeep } from './types'
55

66
export class QueryCache extends QC {
77
find<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData>(
8-
arg1: MaybeRefDeep<QueryKey>,
8+
filters: MaybeRefDeep<QueryFilters>,
9+
): Query<TQueryFnData, TError, TData> | undefined
10+
find<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData>(
11+
queryKey: MaybeRefDeep<QueryKey>,
12+
filters?: MaybeRefDeep<QueryFilters>,
13+
): Query<TQueryFnData, TError, TData> | undefined
14+
find<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData>(
15+
arg1: MaybeRefDeep<QueryKey> | MaybeRefDeep<QueryFilters>,
916
arg2?: MaybeRefDeep<QueryFilters>,
1017
): Query<TQueryFnData, TError, TData> | undefined {
11-
const arg1Unreffed = cloneDeepUnref(arg1)
18+
const arg1Unreffed = cloneDeepUnref(arg1) as QueryKey | QueryFilters
1219
const arg2Unreffed = cloneDeepUnref(arg2) as QueryFilters
13-
return super.find(arg1Unreffed, arg2Unreffed)
20+
if (isQueryKey(arg1Unreffed)) {
21+
return super.find(arg1Unreffed, arg2Unreffed)
22+
}
23+
return super.find(arg1Unreffed)
1424
}
1525

1626
findAll(

0 commit comments

Comments
 (0)