Skip to content

Commit 1d3b9ec

Browse files
author
Juan Henriquez
authored
chore: add new overloads to the other versions of the useQuery hook
1 parent 8c7f1c8 commit 1d3b9ec

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

packages/react-query/src/useQuery.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ export function useQuery<
3333
> & { initialData: TQueryFnData | (() => TQueryFnData) },
3434
): DefinedUseQueryResult<TData, TError>
3535

36+
export function useQuery<
37+
TQueryFnData = unknown,
38+
TError = unknown,
39+
TData = TQueryFnData,
40+
TQueryKey extends QueryKey = QueryKey,
41+
>(
42+
options: UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
43+
): UseQueryResult<TData, TError>
44+
3645
export function useQuery<
3746
TQueryFnData = unknown,
3847
TError = unknown,
@@ -66,11 +75,10 @@ export function useQuery<
6675
TQueryKey extends QueryKey = QueryKey,
6776
>(
6877
queryKey: TQueryKey,
69-
queryFn: QueryFunction<TQueryFnData, TQueryKey>,
7078
options?: Omit<
7179
UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
72-
'queryKey' | 'queryFn' | 'initialData'
73-
> & { initialData?: () => undefined },
80+
'queryKey'
81+
>,
7482
): UseQueryResult<TData, TError>
7583

7684
export function useQuery<
@@ -84,8 +92,8 @@ export function useQuery<
8492
options?: Omit<
8593
UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
8694
'queryKey' | 'queryFn' | 'initialData'
87-
> & { initialData: TQueryFnData | (() => TQueryFnData) },
88-
): DefinedUseQueryResult<TData, TError>
95+
> & { initialData?: () => undefined },
96+
): UseQueryResult<TData, TError>
8997

9098
export function useQuery<
9199
TQueryFnData = unknown,
@@ -97,9 +105,9 @@ export function useQuery<
97105
queryFn: QueryFunction<TQueryFnData, TQueryKey>,
98106
options?: Omit<
99107
UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
100-
'queryKey' | 'queryFn'
101-
>,
102-
): UseQueryResult<TData, TError>
108+
'queryKey' | 'queryFn' | 'initialData'
109+
> & { initialData: TQueryFnData | (() => TQueryFnData) },
110+
): DefinedUseQueryResult<TData, TError>
103111

104112
export function useQuery<
105113
TQueryFnData = unknown,
@@ -113,7 +121,7 @@ export function useQuery<
113121
UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
114122
'queryKey' | 'queryFn'
115123
>,
116-
): DefinedUseQueryResult<TData, TError>
124+
): UseQueryResult<TData, TError>
117125

118126
export function useQuery<
119127
TQueryFnData,

0 commit comments

Comments
 (0)