Skip to content

Commit 3fa5323

Browse files
manudelimanudeli
authored
types(react-query): rename useSuspenseQueries, useQueries internal type name intuitively (TanStack#7216)
1 parent 565a241 commit 3fa5323

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎packages/react-query/src/useQueries.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ type UseQueryOptionsForUseQueries<
5555
// Avoid TS depth-limit error in case of large array literal
5656
type MAXIMUM_DEPTH = 20
5757

58-
type GetOptions<T> =
58+
type GetUseQueryOptionsForUseQueries<T> =
5959
// Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }
6060
T extends {
6161
queryFnData: infer TQueryFnData
@@ -120,7 +120,7 @@ type GetDefinedOrUndefinedQueryResult<T, TData, TError = unknown> = T extends {
120120
: UseQueryResult<TData, TError>
121121
: UseQueryResult<TData, TError>
122122

123-
type GetResults<T> =
123+
type GetUseQueryResult<T> =
124124
// Part 1: responsible for mapping explicit type parameter to function result, if object
125125
T extends { queryFnData: any; error?: infer TError; data: infer TData }
126126
? GetDefinedOrUndefinedQueryResult<T, TData, TError>
@@ -165,18 +165,18 @@ type GetResults<T> =
165165
*/
166166
export type QueriesOptions<
167167
T extends Array<any>,
168-
TResult extends Array<any> = [],
168+
TResults extends Array<any> = [],
169169
TDepth extends ReadonlyArray<number> = [],
170170
> = TDepth['length'] extends MAXIMUM_DEPTH
171171
? Array<UseQueryOptionsForUseQueries>
172172
: T extends []
173173
? []
174174
: T extends [infer Head]
175-
? [...TResult, GetOptions<Head>]
176-
: T extends [infer Head, ...infer Tail]
175+
? [...TResults, GetUseQueryOptionsForUseQueries<Head>]
176+
: T extends [infer Head, ...infer Tails]
177177
? QueriesOptions<
178-
[...Tail],
179-
[...TResult, GetOptions<Head>],
178+
[...Tails],
179+
[...TResults, GetUseQueryOptionsForUseQueries<Head>],
180180
[...TDepth, 1]
181181
>
182182
: ReadonlyArray<unknown> extends T
@@ -207,18 +207,18 @@ export type QueriesOptions<
207207
*/
208208
export type QueriesResults<
209209
T extends Array<any>,
210-
TResult extends Array<any> = [],
210+
TResults extends Array<any> = [],
211211
TDepth extends ReadonlyArray<number> = [],
212212
> = TDepth['length'] extends MAXIMUM_DEPTH
213213
? Array<UseQueryResult>
214214
: T extends []
215215
? []
216216
: T extends [infer Head]
217-
? [...TResult, GetResults<Head>]
218-
: T extends [infer Head, ...infer Tail]
217+
? [...TResults, GetUseQueryResult<Head>]
218+
: T extends [infer Head, ...infer Tails]
219219
? QueriesResults<
220-
[...Tail],
221-
[...TResult, GetResults<Head>],
220+
[...Tails],
221+
[...TResults, GetUseQueryResult<Head>],
222222
[...TDepth, 1]
223223
>
224224
: T extends Array<

‎packages/react-query/src/useSuspenseQueries.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import type {
1313
// Avoid TS depth-limit error in case of large array literal
1414
type MAXIMUM_DEPTH = 20
1515

16-
type GetSuspenseOptions<T> =
16+
type GetUseSuspenseQueryOptions<T> =
1717
// Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }
1818
T extends {
1919
queryFnData: infer TQueryFnData
@@ -61,7 +61,7 @@ type GetSuspenseOptions<T> =
6161
: // Fallback
6262
UseSuspenseQueryOptions
6363

64-
type GetSuspenseResults<T> =
64+
type GetUseSuspenseQueryResult<T> =
6565
// Part 1: responsible for mapping explicit type parameter to function result, if object
6666
T extends { queryFnData: any; error?: infer TError; data: infer TData }
6767
? UseSuspenseQueryResult<TData, TError>
@@ -104,18 +104,18 @@ type GetSuspenseResults<T> =
104104
*/
105105
export type SuspenseQueriesOptions<
106106
T extends Array<any>,
107-
TResult extends Array<any> = [],
107+
TResults extends Array<any> = [],
108108
TDepth extends ReadonlyArray<number> = [],
109109
> = TDepth['length'] extends MAXIMUM_DEPTH
110110
? Array<UseSuspenseQueryOptions>
111111
: T extends []
112112
? []
113113
: T extends [infer Head]
114-
? [...TResult, GetSuspenseOptions<Head>]
115-
: T extends [infer Head, ...infer Tail]
114+
? [...TResults, GetUseSuspenseQueryOptions<Head>]
115+
: T extends [infer Head, ...infer Tails]
116116
? SuspenseQueriesOptions<
117-
[...Tail],
118-
[...TResult, GetSuspenseOptions<Head>],
117+
[...Tails],
118+
[...TResults, GetUseSuspenseQueryOptions<Head>],
119119
[...TDepth, 1]
120120
>
121121
: Array<unknown> extends T
@@ -141,18 +141,18 @@ export type SuspenseQueriesOptions<
141141
*/
142142
export type SuspenseQueriesResults<
143143
T extends Array<any>,
144-
TResult extends Array<any> = [],
144+
TResults extends Array<any> = [],
145145
TDepth extends ReadonlyArray<number> = [],
146146
> = TDepth['length'] extends MAXIMUM_DEPTH
147147
? Array<UseSuspenseQueryResult>
148148
: T extends []
149149
? []
150150
: T extends [infer Head]
151-
? [...TResult, GetSuspenseResults<Head>]
152-
: T extends [infer Head, ...infer Tail]
151+
? [...TResults, GetUseSuspenseQueryResult<Head>]
152+
: T extends [infer Head, ...infer Tails]
153153
? SuspenseQueriesResults<
154-
[...Tail],
155-
[...TResult, GetSuspenseResults<Head>],
154+
[...Tails],
155+
[...TResults, GetUseSuspenseQueryResult<Head>],
156156
[...TDepth, 1]
157157
>
158158
: T extends Array<

0 commit comments

Comments
 (0)