Skip to content

Commit 89fb2fb

Browse files
committed
refactor(query-core, react-query): update deprecation notices and improve type definitions
- Updated JSDoc comments to clarify deprecation warnings for several methods in QueryCache and QueryClient. - Enhanced type definitions in queryOptions and types files to improve type safety and clarity. - Introduced new types for infinite queries and updated related hooks to reflect changes in the API. - Added support for new options in useInfiniteQuery and adjusted existing overloads to indicate future removals.
1 parent 7e5e9f5 commit 89fb2fb

15 files changed

+678
-178
lines changed

packages/query-core/src/queryCache.ts

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,12 @@ export class QueryCache extends Subscribable<QueryCacheListener> {
168168
find<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData>(
169169
filters: QueryFilters,
170170
): Query<TQueryFnData, TError, TData> | undefined
171-
/**
172-
* @deprecated This method should be used with only one object argument.
173-
*/
171+
/** @deprecated This method should be used with only one object argument. */
174172
find<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData>(
175173
queryKey: QueryKey,
176174
filters?: OmitKeyof<QueryFilters, 'queryKey'>,
177175
): Query<TQueryFnData, TError, TData> | undefined
178-
/**
179-
* @deprecated This method should be used with only one object argument.
180-
*/
176+
/** @deprecated This method should be used with only one object argument. */
181177
find<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData>(
182178
arg1: QueryKey | QueryFilters,
183179
arg2?: OmitKeyof<QueryFilters, 'queryKey'>,
@@ -192,23 +188,17 @@ export class QueryCache extends Subscribable<QueryCacheListener> {
192188
}
193189

194190
findAll(filters?: QueryFilters): Query[]
195-
/**
196-
* @deprecated This method should be used with only one object argument.
197-
*/
191+
/** @deprecated This method should be used with only one object argument. */
198192
findAll(
199193
queryKey?: QueryKey,
200194
filters?: OmitKeyof<QueryFilters, 'queryKey'>,
201195
): Query[]
202-
/**
203-
* @deprecated This method should be used with only one object argument.
204-
*/
196+
/** @deprecated This method should be used with only one object argument. */
205197
findAll(
206198
arg1?: QueryKey | QueryFilters,
207199
arg2?: OmitKeyof<QueryFilters, 'queryKey'>,
208200
): Query[]
209-
/**
210-
* @deprecated This method should be used with only one object argument.
211-
*/
201+
/** @deprecated This method should be used with only one object argument. */
212202
findAll(
213203
arg1?: QueryKey | QueryFilters,
214204
arg2?: OmitKeyof<QueryFilters, 'queryKey'>,

packages/query-core/src/queryClient.ts

Lines changed: 34 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,12 @@ export class QueryClient {
113113
}
114114

115115
isFetching(filters?: QueryFilters): number
116-
/**
117-
* @deprecated This method should be used with only one object argument.
118-
*/
116+
/** @deprecated This method should be used with only one object argument. */
119117
isFetching(
120118
queryKey?: QueryKey,
121119
filters?: OmitKeyof<QueryFilters, 'queryKey'>,
122120
): number
123-
/**
124-
* @deprecated This method should be used with only one object argument.
125-
*/
121+
/** @deprecated This method should be used with only one object argument. */
126122
isFetching(arg1?: QueryKey | QueryFilters, arg2?: QueryFilters): number {
127123
const [filters] = parseFilterArgs(arg1, arg2)
128124
filters.fetchStatus = 'fetching'
@@ -136,16 +132,12 @@ export class QueryClient {
136132
getQueryData<TQueryFnData = unknown>(
137133
queryKey: QueryKey,
138134
): TQueryFnData | undefined
139-
/**
140-
* @deprecated This method will accept only queryKey in the next major version.
141-
*/
135+
/** @deprecated This method will accept only queryKey in the next major version. */
142136
getQueryData<TQueryFnData = unknown>(
143137
queryKey: QueryKey,
144138
filters: OmitKeyof<QueryFilters, 'queryKey'>,
145139
): TQueryFnData | undefined
146-
/**
147-
* @deprecated This method will accept only queryKey in the next major version.
148-
*/
140+
/** @deprecated This method will accept only queryKey in the next major version. */
149141
getQueryData<TQueryFnData = unknown>(
150142
queryKey: QueryKey,
151143
filters?: OmitKeyof<QueryFilters, 'queryKey'>,
@@ -164,9 +156,7 @@ export class QueryClient {
164156
'queryKey'
165157
>,
166158
): Promise<TData>
167-
/**
168-
* @deprecated This method should be used with only one object argument.
169-
*/
159+
/** @deprecated This method should be used with only one object argument. */
170160
ensureQueryData<
171161
TQueryFnData = unknown,
172162
TError = unknown,
@@ -179,9 +169,7 @@ export class QueryClient {
179169
'queryKey'
180170
>,
181171
): Promise<TData>
182-
/**
183-
* @deprecated This method should be used with only one object argument.
184-
*/
172+
/** @deprecated This method should be used with only one object argument. */
185173
ensureQueryData<
186174
TQueryFnData = unknown,
187175
TError = unknown,
@@ -195,9 +183,7 @@ export class QueryClient {
195183
'queryKey' | 'queryFn'
196184
>,
197185
): Promise<TData>
198-
/**
199-
* @deprecated This method should be used with only one object argument.
200-
*/
186+
/** @deprecated This method should be used with only one object argument. */
201187
ensureQueryData<
202188
TQueryFnData,
203189
TError,
@@ -226,15 +212,11 @@ export class QueryClient {
226212
getQueriesData<TQueryFnData = unknown>(
227213
filters: QueryFilters,
228214
): [QueryKey, TQueryFnData | undefined][]
229-
/**
230-
* @deprecated This method should be used with only one object argument.
231-
*/
215+
/** @deprecated This method should be used with only one object argument. */
232216
getQueriesData<TQueryFnData = unknown>(
233217
queryKey: QueryKey,
234218
): [QueryKey, TQueryFnData | undefined][]
235-
/**
236-
* @deprecated This method should be used with only one object argument.
237-
*/
219+
/** @deprecated This method should be used with only one object argument. */
238220
getQueriesData<TQueryFnData = unknown>(
239221
queryKeyOrFilters: QueryKey | QueryFilters,
240222
): [QueryKey, TQueryFnData | undefined][] {
@@ -271,17 +253,13 @@ export class QueryClient {
271253
updater: Updater<TQueryFnData | undefined, TQueryFnData | undefined>,
272254
options?: SetDataOptions,
273255
): [QueryKey, TQueryFnData | undefined][]
274-
/**
275-
* @deprecated This method should be used with only one object argument.
276-
*/
256+
/** @deprecated This method should be used with only one object argument. */
277257
setQueriesData<TQueryFnData>(
278258
queryKey: QueryKey,
279259
updater: Updater<TQueryFnData | undefined, TQueryFnData | undefined>,
280260
options?: SetDataOptions,
281261
): [QueryKey, TQueryFnData | undefined][]
282-
/**
283-
* @deprecated This method should be used with only one object argument.
284-
*/
262+
/** @deprecated This method should be used with only one object argument. */
285263
setQueriesData<TQueryFnData>(
286264
queryKeyOrFilters: QueryKey | QueryFilters,
287265
updater: Updater<TQueryFnData | undefined, TQueryFnData | undefined>,
@@ -299,25 +277,19 @@ export class QueryClient {
299277

300278
getQueryState<TQueryFnData = unknown, TError = undefined>(
301279
queryKey: QueryKey,
302-
/**
303-
* @deprecated This filters will be removed in the next major version.
304-
*/
280+
/** @deprecated This filters will be removed in the next major version. */
305281
filters?: OmitKeyof<QueryFilters, 'queryKey'>,
306282
): QueryState<TQueryFnData, TError> | undefined {
307283
return this.queryCache.find<TQueryFnData, TError>(queryKey, filters)?.state
308284
}
309285

310286
removeQueries(filters?: QueryFilters): void
311-
/**
312-
* @deprecated This method should be used with only one object argument.
313-
*/
287+
/** @deprecated This method should be used with only one object argument. */
314288
removeQueries(
315289
queryKey?: QueryKey,
316290
filters?: OmitKeyof<QueryFilters, 'queryKey'>,
317291
): void
318-
/**
319-
* @deprecated This method should be used with only one object argument.
320-
*/
292+
/** @deprecated This method should be used with only one object argument. */
321293
removeQueries(
322294
arg1?: QueryKey | QueryFilters,
323295
arg2?: OmitKeyof<QueryFilters, 'queryKey'>,
@@ -335,17 +307,13 @@ export class QueryClient {
335307
filters?: ResetQueryFilters<TPageData>,
336308
options?: ResetOptions,
337309
): Promise<void>
338-
/**
339-
* @deprecated This method should be used with only one object argument.
340-
*/
310+
/** @deprecated This method should be used with only one object argument. */
341311
resetQueries<TPageData = unknown>(
342312
queryKey?: QueryKey,
343313
filters?: OmitKeyof<ResetQueryFilters<TPageData>, 'queryKey'>,
344314
options?: ResetOptions,
345315
): Promise<void>
346-
/**
347-
* @deprecated This method should be used with only one object argument.
348-
*/
316+
/** @deprecated This method should be used with only one object argument. */
349317
resetQueries(
350318
arg1?: QueryKey | ResetQueryFilters,
351319
arg2?: OmitKeyof<ResetQueryFilters, 'queryKey'> | ResetOptions,
@@ -368,17 +336,13 @@ export class QueryClient {
368336
}
369337

370338
cancelQueries(filters?: QueryFilters, options?: CancelOptions): Promise<void>
371-
/**
372-
* @deprecated This method should be used with only one object argument.
373-
*/
339+
/** @deprecated This method should be used with only one object argument. */
374340
cancelQueries(
375341
queryKey?: QueryKey,
376342
filters?: OmitKeyof<QueryFilters, 'queryKey'>,
377343
options?: CancelOptions,
378344
): Promise<void>
379-
/**
380-
* @deprecated This method should be used with only one object argument.
381-
*/
345+
/** @deprecated This method should be used with only one object argument. */
382346
cancelQueries(
383347
arg1?: QueryKey | QueryFilters,
384348
arg2?: OmitKeyof<QueryFilters, 'queryKey'> | CancelOptions,
@@ -403,17 +367,13 @@ export class QueryClient {
403367
filters?: InvalidateQueryFilters<TPageData>,
404368
options?: InvalidateOptions,
405369
): Promise<void>
406-
/**
407-
* @deprecated This method should be used with only one object argument.
408-
*/
370+
/** @deprecated This method should be used with only one object argument. */
409371
invalidateQueries<TPageData = unknown>(
410372
queryKey?: QueryKey,
411373
filters?: OmitKeyof<InvalidateQueryFilters<TPageData>, 'queryKey'>,
412374
options?: InvalidateOptions,
413375
): Promise<void>
414-
/**
415-
* @deprecated This method should be used with only one object argument.
416-
*/
376+
/** @deprecated This method should be used with only one object argument. */
417377
invalidateQueries(
418378
arg1?: QueryKey | InvalidateQueryFilters,
419379
arg2?: OmitKeyof<InvalidateQueryFilters, 'queryKey'> | InvalidateOptions,
@@ -441,17 +401,13 @@ export class QueryClient {
441401
filters?: RefetchQueryFilters<TPageData>,
442402
options?: RefetchOptions,
443403
): Promise<void>
444-
/**
445-
* @deprecated This method should be used with only one object argument.
446-
*/
404+
/** @deprecated This method should be used with only one object argument. */
447405
refetchQueries<TPageData = unknown>(
448406
queryKey?: QueryKey,
449407
filters?: OmitKeyof<RefetchQueryFilters<TPageData>, 'queryKey'>,
450408
options?: RefetchOptions,
451409
): Promise<void>
452-
/**
453-
* @deprecated This method should be used with only one object argument.
454-
*/
410+
/** @deprecated This method should be used with only one object argument. */
455411
refetchQueries(
456412
arg1?: QueryKey | RefetchQueryFilters,
457413
arg2?: OmitKeyof<RefetchQueryFilters, 'queryKey'> | RefetchOptions,
@@ -489,9 +445,7 @@ export class QueryClient {
489445
>(
490446
options: FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
491447
): Promise<TData>
492-
/**
493-
* @deprecated This method should be used with only one object argument.
494-
*/
448+
/** @deprecated This method should be used with only one object argument. */
495449
fetchQuery<
496450
TQueryFnData = unknown,
497451
TError = unknown,
@@ -504,9 +458,7 @@ export class QueryClient {
504458
'queryKey'
505459
>,
506460
): Promise<TData>
507-
/**
508-
* @deprecated This method should be used with only one object argument.
509-
*/
461+
/** @deprecated This method should be used with only one object argument. */
510462
fetchQuery<
511463
TQueryFnData = unknown,
512464
TError = unknown,
@@ -520,9 +472,7 @@ export class QueryClient {
520472
'queryKey' | 'queryFn'
521473
>,
522474
): Promise<TData>
523-
/**
524-
* @deprecated This method should be used with only one object argument.
525-
*/
475+
/** @deprecated This method should be used with only one object argument. */
526476
fetchQuery<
527477
TQueryFnData,
528478
TError,
@@ -564,9 +514,7 @@ export class QueryClient {
564514
>(
565515
options: FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
566516
): Promise<void>
567-
/**
568-
* @deprecated This method should be used with only one object argument.
569-
*/
517+
/** @deprecated This method should be used with only one object argument. */
570518
prefetchQuery<
571519
TQueryFnData = unknown,
572520
TError = unknown,
@@ -579,9 +527,7 @@ export class QueryClient {
579527
'queryKey'
580528
>,
581529
): Promise<void>
582-
/**
583-
* @deprecated This method should be used with only one object argument.
584-
*/
530+
/** @deprecated This method should be used with only one object argument. */
585531
prefetchQuery<
586532
TQueryFnData = unknown,
587533
TError = unknown,
@@ -595,9 +541,7 @@ export class QueryClient {
595541
'queryKey' | 'queryFn'
596542
>,
597543
): Promise<void>
598-
/**
599-
* @deprecated This method should be used with only one object argument.
600-
*/
544+
/** @deprecated This method should be used with only one object argument. */
601545
prefetchQuery<
602546
TQueryFnData = unknown,
603547
TError = unknown,
@@ -629,9 +573,7 @@ export class QueryClient {
629573
>(
630574
options: FetchInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
631575
): Promise<InfiniteData<TData>>
632-
/**
633-
* @deprecated This method should be used with only one object argument.
634-
*/
576+
/** @deprecated This method should be used with only one object argument. */
635577
fetchInfiniteQuery<
636578
TQueryFnData = unknown,
637579
TError = unknown,
@@ -644,9 +586,7 @@ export class QueryClient {
644586
'queryKey'
645587
>,
646588
): Promise<InfiniteData<TData>>
647-
/**
648-
* @deprecated This method should be used with only one object argument.
649-
*/
589+
/** @deprecated This method should be used with only one object argument. */
650590
fetchInfiniteQuery<
651591
TQueryFnData = unknown,
652592
TError = unknown,
@@ -660,9 +600,7 @@ export class QueryClient {
660600
'queryKey' | 'queryFn'
661601
>,
662602
): Promise<InfiniteData<TData>>
663-
/**
664-
* @deprecated This method should be used with only one object argument.
665-
*/
603+
/** @deprecated This method should be used with only one object argument. */
666604
fetchInfiniteQuery<
667605
TQueryFnData,
668606
TError,
@@ -700,9 +638,7 @@ export class QueryClient {
700638
>(
701639
options: FetchInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
702640
): Promise<void>
703-
/**
704-
* @deprecated This method should be used with only one object argument.
705-
*/
641+
/** @deprecated This method should be used with only one object argument. */
706642
prefetchInfiniteQuery<
707643
TQueryFnData = unknown,
708644
TError = unknown,
@@ -715,9 +651,7 @@ export class QueryClient {
715651
'queryKey'
716652
>,
717653
): Promise<void>
718-
/**
719-
* @deprecated This method should be used with only one object argument.
720-
*/
654+
/** @deprecated This method should be used with only one object argument. */
721655
prefetchInfiniteQuery<
722656
TQueryFnData = unknown,
723657
TError = unknown,
@@ -731,9 +665,7 @@ export class QueryClient {
731665
'queryKey' | 'queryFn'
732666
>,
733667
): Promise<void>
734-
/**
735-
* @deprecated This method should be used with only one object argument.
736-
*/
668+
/** @deprecated This method should be used with only one object argument. */
737669
prefetchInfiniteQuery<
738670
TQueryFnData,
739671
TError,

0 commit comments

Comments
 (0)