diff --git a/src/vue/index.ts b/src/vue/index.ts index 5601146..1410262 100644 --- a/src/vue/index.ts +++ b/src/vue/index.ts @@ -16,8 +16,10 @@ export { parseMutationFilterArgs, } from "./utils"; +export type { UseQueryReturnType } from "./useBaseQuery"; export type { UseQueryOptions } from "./useQuery"; export type { UseInfiniteQueryOptions } from "./useInfiniteQuery"; export type { UseMutationOptions, UseMutationReturnType } from "./useMutation"; +export type { UseQueriesOptions, UseQueriesResults } from "./useQueries"; export type { MutationFilters } from "./useIsMutating"; export type { QueryFilters } from "./useIsFetching"; diff --git a/src/vue/useQueries.ts b/src/vue/useQueries.ts index 135f3b6..70f3fd3 100644 --- a/src/vue/useQueries.ts +++ b/src/vue/useQueries.ts @@ -70,9 +70,9 @@ type GetResults = QueryObserverResult; /** - * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param + * UseQueriesOptions reducer recursively unwraps function arguments to infer/enforce type param */ -type QueriesOptions< +export type UseQueriesOptions< T extends any[], Result extends any[] = [], Depth extends ReadonlyArray = [] @@ -83,7 +83,7 @@ type QueriesOptions< : T extends [infer Head] ? [...Result, GetOptions] : T extends [infer Head, ...infer Tail] - ? QueriesOptions<[...Tail], [...Result, GetOptions], [...Depth, 1]> + ? UseQueriesOptions<[...Tail], [...Result, GetOptions], [...Depth, 1]> : unknown[] extends T ? T : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type! @@ -94,9 +94,9 @@ type QueriesOptions< UseQueryOptions[]; /** - * QueriesResults reducer recursively maps type param to results + * UseQueriesResults reducer recursively maps type param to results */ -type QueriesResults< +export type UseQueriesResults< T extends any[], Result extends any[] = [], Depth extends ReadonlyArray = [] @@ -107,7 +107,7 @@ type QueriesResults< : T extends [infer Head] ? [...Result, GetResults] : T extends [infer Head, ...infer Tail] - ? QueriesResults<[...Tail], [...Result, GetResults], [...Depth, 1]> + ? UseQueriesResults<[...Tail], [...Result, GetResults], [...Depth, 1]> : T extends UseQueryOptions[] ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results QueryObserverResult[] @@ -115,8 +115,8 @@ type QueriesResults< QueryObserverResult[]; export function useQueries( - queries: readonly [...QueriesOptions] -): Readonly> { + queries: readonly [...UseQueriesOptions] +): Readonly> { const queryClientKey = queries[0]?.queryClientKey; const queryClient = useQueryClient(queryClientKey); const defaultedQueries = queries.map((options) => { @@ -146,5 +146,5 @@ export function useQueries( unsubscribe(); }); - return readonly(state) as QueriesResults; + return readonly(state) as UseQueriesResults; }