|
1 | 1 | import type { |
2 | 2 | DataTag, |
3 | 3 | DefaultError, |
4 | | - InitialDataFunction, |
5 | | - NonUndefinedGuard, |
| 4 | + QueryFunction, |
6 | 5 | QueryKey, |
7 | | - QueryObserverOptions, |
8 | 6 | } from '@tanstack/query-core' |
9 | | -import type { DeepUnwrapRef, ShallowOption } from './types' |
| 7 | +import type { |
| 8 | + DefinedInitialQueryOptions, |
| 9 | + UndefinedInitialQueryOptions, |
| 10 | +} from './useQuery' |
| 11 | +import type { DeepUnwrapRef } from './types' |
10 | 12 |
|
11 | 13 | /** |
12 | | - * Options for queryOptions with defined initial data. |
13 | | - * These are unwrapped types (not MaybeRef) so that properties like queryFn are directly accessible. |
| 14 | + * Augmented version of UndefinedInitialQueryOptions that explicitly exposes |
| 15 | + * queryFn and other properties for direct TypeScript access. |
14 | 16 | */ |
15 | | -export type DefinedInitialDataOptions< |
| 17 | +export type UndefinedInitialDataOptions< |
16 | 18 | TQueryFnData = unknown, |
17 | 19 | TError = DefaultError, |
18 | 20 | TData = TQueryFnData, |
19 | 21 | TQueryKey extends QueryKey = QueryKey, |
20 | | -> = QueryObserverOptions< |
21 | | - TQueryFnData, |
22 | | - TError, |
23 | | - TData, |
24 | | - TQueryFnData, |
25 | | - DeepUnwrapRef<TQueryKey> |
26 | | -> & |
27 | | - ShallowOption & { |
28 | | - initialData: |
29 | | - | NonUndefinedGuard<TQueryFnData> |
30 | | - | (() => NonUndefinedGuard<TQueryFnData>) |
31 | | - } |
| 22 | +> = UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey> & { |
| 23 | + queryKey: TQueryKey |
| 24 | + queryFn?: QueryFunction<TQueryFnData, DeepUnwrapRef<TQueryKey>> |
| 25 | +} |
32 | 26 |
|
33 | 27 | /** |
34 | | - * Options for queryOptions with undefined initial data. |
35 | | - * These are unwrapped types (not MaybeRef) so that properties like queryFn are directly accessible. |
| 28 | + * Augmented version of DefinedInitialQueryOptions that explicitly exposes |
| 29 | + * queryFn and other properties for direct TypeScript access. |
36 | 30 | */ |
37 | | -export type UndefinedInitialDataOptions< |
| 31 | +export type DefinedInitialDataOptions< |
38 | 32 | TQueryFnData = unknown, |
39 | 33 | TError = DefaultError, |
40 | 34 | TData = TQueryFnData, |
41 | 35 | TQueryKey extends QueryKey = QueryKey, |
42 | | -> = QueryObserverOptions< |
43 | | - TQueryFnData, |
44 | | - TError, |
45 | | - TData, |
46 | | - TQueryFnData, |
47 | | - DeepUnwrapRef<TQueryKey> |
48 | | -> & |
49 | | - ShallowOption & { |
50 | | - initialData?: |
51 | | - | undefined |
52 | | - | InitialDataFunction<NonUndefinedGuard<TQueryFnData>> |
53 | | - | NonUndefinedGuard<TQueryFnData> |
54 | | - } |
| 36 | +> = DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey> & { |
| 37 | + queryKey: TQueryKey |
| 38 | + queryFn?: QueryFunction<TQueryFnData, DeepUnwrapRef<TQueryKey>> |
| 39 | +} |
55 | 40 |
|
56 | 41 | export function queryOptions< |
57 | 42 | TQueryFnData = unknown, |
|
0 commit comments