From bf85fc0855b36ea6e6088d6b77bbd845852469c0 Mon Sep 17 00:00:00 2001 From: Jonghyeon Ko Date: Wed, 3 Apr 2024 02:43:29 +0900 Subject: [PATCH] refactor(react-query): rename useSuspenseQueries, useQueries internal type name intuitively --- packages/react-query/src/useQueries.ts | 24 +++++++++---------- .../react-query/src/useSuspenseQueries.ts | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/react-query/src/useQueries.ts b/packages/react-query/src/useQueries.ts index dd24ccf72a..8b53687622 100644 --- a/packages/react-query/src/useQueries.ts +++ b/packages/react-query/src/useQueries.ts @@ -55,7 +55,7 @@ type UseQueryOptionsForUseQueries< // Avoid TS depth-limit error in case of large array literal type MAXIMUM_DEPTH = 20 -type GetOptions = +type GetUseQueryOptionsForUseQueries = // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData } T extends { queryFnData: infer TQueryFnData @@ -120,7 +120,7 @@ type GetDefinedOrUndefinedQueryResult = T extends { : UseQueryResult : UseQueryResult -type GetResults = +type GetUseQueryResult = // Part 1: responsible for mapping explicit type parameter to function result, if object T extends { queryFnData: any; error?: infer TError; data: infer TData } ? GetDefinedOrUndefinedQueryResult @@ -165,18 +165,18 @@ type GetResults = */ export type QueriesOptions< T extends Array, - TResult extends Array = [], + TResults extends Array = [], TDepth extends ReadonlyArray = [], > = TDepth['length'] extends MAXIMUM_DEPTH ? Array : T extends [] ? [] : T extends [infer Head] - ? [...TResult, GetOptions] - : T extends [infer Head, ...infer Tail] + ? [...TResults, GetUseQueryOptionsForUseQueries] + : T extends [infer Head, ...infer Tails] ? QueriesOptions< - [...Tail], - [...TResult, GetOptions], + [...Tails], + [...TResults, GetUseQueryOptionsForUseQueries], [...TDepth, 1] > : ReadonlyArray extends T @@ -207,18 +207,18 @@ export type QueriesOptions< */ export type QueriesResults< T extends Array, - TResult extends Array = [], + TResults extends Array = [], TDepth extends ReadonlyArray = [], > = TDepth['length'] extends MAXIMUM_DEPTH ? Array : T extends [] ? [] : T extends [infer Head] - ? [...TResult, GetResults] - : T extends [infer Head, ...infer Tail] + ? [...TResults, GetUseQueryResult] + : T extends [infer Head, ...infer Tails] ? QueriesResults< - [...Tail], - [...TResult, GetResults], + [...Tails], + [...TResults, GetUseQueryResult], [...TDepth, 1] > : T extends Array< diff --git a/packages/react-query/src/useSuspenseQueries.ts b/packages/react-query/src/useSuspenseQueries.ts index 510b3ecce8..400944fb75 100644 --- a/packages/react-query/src/useSuspenseQueries.ts +++ b/packages/react-query/src/useSuspenseQueries.ts @@ -13,7 +13,7 @@ import type { // Avoid TS depth-limit error in case of large array literal type MAXIMUM_DEPTH = 20 -type GetSuspenseOptions = +type GetUseSuspenseQueryOptions = // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData } T extends { queryFnData: infer TQueryFnData @@ -61,7 +61,7 @@ type GetSuspenseOptions = : // Fallback UseSuspenseQueryOptions -type GetSuspenseResults = +type GetUseSuspenseQueryResult = // Part 1: responsible for mapping explicit type parameter to function result, if object T extends { queryFnData: any; error?: infer TError; data: infer TData } ? UseSuspenseQueryResult @@ -104,18 +104,18 @@ type GetSuspenseResults = */ export type SuspenseQueriesOptions< T extends Array, - TResult extends Array = [], + TResults extends Array = [], TDepth extends ReadonlyArray = [], > = TDepth['length'] extends MAXIMUM_DEPTH ? Array : T extends [] ? [] : T extends [infer Head] - ? [...TResult, GetSuspenseOptions] - : T extends [infer Head, ...infer Tail] + ? [...TResults, GetUseSuspenseQueryOptions] + : T extends [infer Head, ...infer Tails] ? SuspenseQueriesOptions< - [...Tail], - [...TResult, GetSuspenseOptions], + [...Tails], + [...TResults, GetUseSuspenseQueryOptions], [...TDepth, 1] > : Array extends T @@ -141,18 +141,18 @@ export type SuspenseQueriesOptions< */ export type SuspenseQueriesResults< T extends Array, - TResult extends Array = [], + TResults extends Array = [], TDepth extends ReadonlyArray = [], > = TDepth['length'] extends MAXIMUM_DEPTH ? Array : T extends [] ? [] : T extends [infer Head] - ? [...TResult, GetSuspenseResults] - : T extends [infer Head, ...infer Tail] + ? [...TResults, GetUseSuspenseQueryResult] + : T extends [infer Head, ...infer Tails] ? SuspenseQueriesResults< - [...Tail], - [...TResult, GetSuspenseResults], + [...Tails], + [...TResults, GetUseSuspenseQueryResult], [...TDepth, 1] > : T extends Array<