Skip to content

Commit b38eed6

Browse files
committed
chore: fix prettier
1 parent a470f46 commit b38eed6

File tree

2 files changed

+39
-21
lines changed

2 files changed

+39
-21
lines changed

src/react/tests/useQueries.test.tsx

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -924,24 +924,28 @@ describe('useQueries', () => {
924924
const getSelectorB = (): SelectorB => data => [data, +data]
925925

926926
// Wrapper with strongly typed array-parameter
927-
function useWrappedQueries<TQueryFnData, TError, TData, TQueryKey extends QueryKey>(
928-
queries: UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>[]
929-
) {
927+
function useWrappedQueries<
928+
TQueryFnData,
929+
TError,
930+
TData,
931+
TQueryKey extends QueryKey
932+
>(queries: UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>[]) {
930933
return useQueries(
931934
queries.map(
932935
// no need to type the mapped query
933-
(query) => {
934-
const { queryFn: fn, queryKey: key, onError: err } = query;
935-
expectType<QueryFunction<TQueryFnData, TQueryKey> | undefined>(fn)
936-
return {
937-
queryKey: key,
938-
onError: err,
939-
queryFn: (ctx: QueryFunctionContext<TQueryKey>) => {
940-
expectType<EnsuredQueryKey<TQueryKey>>(ctx.queryKey)
941-
return fn?.call({}, ctx);
936+
query => {
937+
const { queryFn: fn, queryKey: key, onError: err } = query
938+
expectType<QueryFunction<TQueryFnData, TQueryKey> | undefined>(fn)
939+
return {
940+
queryKey: key,
941+
onError: err,
942+
queryFn: (ctx: QueryFunctionContext<TQueryKey>) => {
943+
expectType<EnsuredQueryKey<TQueryKey>>(ctx.queryKey)
944+
return fn?.call({}, ctx)
945+
},
942946
}
943947
}
944-
})
948+
)
945949
)
946950
}
947951

@@ -980,13 +984,17 @@ describe('useQueries', () => {
980984
withSelector[1]
981985
)
982986

983-
const withWrappedQueries = useWrappedQueries(Array(10).map(() => ({
984-
queryKey: getQueryKeyA(),
985-
queryFn: getQueryFunctionA(),
986-
select: getSelectorA(),
987-
})))
987+
const withWrappedQueries = useWrappedQueries(
988+
Array(10).map(() => ({
989+
queryKey: getQueryKeyA(),
990+
queryFn: getQueryFunctionA(),
991+
select: getSelectorA(),
992+
}))
993+
)
988994

989-
expectType<QueryObserverResult<number | undefined, unknown>[]>(withWrappedQueries);
995+
expectType<QueryObserverResult<number | undefined, unknown>[]>(
996+
withWrappedQueries
997+
)
990998
}
991999
})
9921000

src/react/useQueries.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@ export type QueriesOptions<
8484
? T
8585
: // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
8686
// use this to infer the param types in the case of Array.map() argument
87-
T extends UseQueryOptions<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>[]
87+
T extends UseQueryOptions<
88+
infer TQueryFnData,
89+
infer TError,
90+
infer TData,
91+
infer TQueryKey
92+
>[]
8893
? UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>[]
8994
: // Fallback
9095
UseQueryOptions[]
@@ -104,7 +109,12 @@ export type QueriesResults<
104109
? [...Result, GetResults<Head>]
105110
: T extends [infer Head, ...infer Tail]
106111
? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>
107-
: T extends UseQueryOptions<infer TQueryFnData, infer TError, infer TData, any>[]
112+
: T extends UseQueryOptions<
113+
infer TQueryFnData,
114+
infer TError,
115+
infer TData,
116+
any
117+
>[]
108118
? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
109119
UseQueryResult<unknown extends TData ? TQueryFnData : TData, TError>[]
110120
: // Fallback

0 commit comments

Comments
 (0)