Skip to content

Commit 8d3f77a

Browse files
ci: apply automated fixes
1 parent 7709309 commit 8d3f77a

File tree

2 files changed

+62
-41
lines changed

2 files changed

+62
-41
lines changed

packages/vue-query/src/queryOptions.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ export function queryOptions<
2121
options: TOptions,
2222
): TOptions extends { value: unknown }
2323
? DefinedInitialQueryOptionsRef<TQueryFnData, TError, TData, TQueryKey> &
24-
TOptions
24+
TOptions
2525
: DefinedInitialQueryOptionsBase<TQueryFnData, TError, TData, TQueryKey> &
26-
TOptions
26+
TOptions
2727

2828
export function queryOptions<
2929
TQueryFnData = unknown,
@@ -35,17 +35,15 @@ export function queryOptions<
3535
TError,
3636
TData,
3737
TQueryKey
38-
>
38+
>,
3939
>(
4040
options: TOptions,
4141
): TOptions extends { value: unknown }
4242
? UndefinedInitialQueryOptionsRef<TQueryFnData, TError, TData, TQueryKey> &
43-
TOptions
43+
TOptions
4444
: UndefinedInitialQueryOptionsBase<TQueryFnData, TError, TData, TQueryKey> &
45-
TOptions
45+
TOptions
4646

4747
export function queryOptions(options: unknown) {
4848
return options
4949
}
50-
51-

packages/vue-query/src/useQuery.ts

Lines changed: 57 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@ export type UseQueryOptionsBase<
3434
TQueryData,
3535
TQueryKey
3636
>]: Property extends 'enabled'
37-
?
38-
| MaybeRefOrGetter<boolean | undefined>
39-
| (() => Enabled<
40-
TQueryFnData,
41-
TError,
42-
TQueryData,
43-
DeepUnwrapRef<TQueryKey>
44-
>)
45-
: MaybeRefDeep<
46-
QueryObserverOptions<
47-
TQueryFnData,
48-
TError,
49-
TData,
50-
TQueryData,
51-
DeepUnwrapRef<TQueryKey>
52-
>[Property]
53-
>
37+
?
38+
| MaybeRefOrGetter<boolean | undefined>
39+
| (() => Enabled<
40+
TQueryFnData,
41+
TError,
42+
TQueryData,
43+
DeepUnwrapRef<TQueryKey>
44+
>)
45+
: MaybeRefDeep<
46+
QueryObserverOptions<
47+
TQueryFnData,
48+
TError,
49+
TData,
50+
TQueryData,
51+
DeepUnwrapRef<TQueryKey>
52+
>[Property]
53+
>
5454
} & ShallowOption
5555

5656
export type UseQueryOptionsRef<
@@ -62,8 +62,8 @@ export type UseQueryOptionsRef<
6262
> =
6363
| Ref<UseQueryOptionsBase<TQueryFnData, TError, TData, TQueryData, TQueryKey>>
6464
| ComputedRef<
65-
UseQueryOptionsBase<TQueryFnData, TError, TData, TQueryData, TQueryKey>
66-
>
65+
UseQueryOptionsBase<TQueryFnData, TError, TData, TQueryData, TQueryKey>
66+
>
6767

6868
export type UseQueryOptions<
6969
TQueryFnData = unknown,
@@ -80,11 +80,17 @@ export type UndefinedInitialQueryOptionsBase<
8080
TError = DefaultError,
8181
TData = TQueryFnData,
8282
TQueryKey extends QueryKey = QueryKey,
83-
> = UseQueryOptionsBase<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
83+
> = UseQueryOptionsBase<
84+
TQueryFnData,
85+
TError,
86+
TData,
87+
TQueryFnData,
88+
TQueryKey
89+
> & {
8490
initialData?:
85-
| undefined
86-
| InitialDataFunction<NonUndefinedGuard<TQueryFnData>>
87-
| NonUndefinedGuard<TQueryFnData>
91+
| undefined
92+
| InitialDataFunction<NonUndefinedGuard<TQueryFnData>>
93+
| NonUndefinedGuard<TQueryFnData>
8894
}
8995

9096
export type UndefinedInitialQueryOptionsRef<
@@ -94,27 +100,35 @@ export type UndefinedInitialQueryOptionsRef<
94100
TQueryKey extends QueryKey = QueryKey,
95101
> = UseQueryOptionsRef<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
96102
initialData?:
97-
| undefined
98-
| InitialDataFunction<NonUndefinedGuard<TQueryFnData>>
99-
| NonUndefinedGuard<TQueryFnData>
103+
| undefined
104+
| InitialDataFunction<NonUndefinedGuard<TQueryFnData>>
105+
| NonUndefinedGuard<TQueryFnData>
100106
}
101107

102108
export type UndefinedInitialQueryOptions<
103109
TQueryFnData = unknown,
104110
TError = DefaultError,
105111
TData = TQueryFnData,
106112
TQueryKey extends QueryKey = QueryKey,
107-
> = UndefinedInitialQueryOptionsBase<TQueryFnData, TError, TData, TQueryKey> | UndefinedInitialQueryOptionsRef<TQueryFnData, TError, TData, TQueryKey>
113+
> =
114+
| UndefinedInitialQueryOptionsBase<TQueryFnData, TError, TData, TQueryKey>
115+
| UndefinedInitialQueryOptionsRef<TQueryFnData, TError, TData, TQueryKey>
108116

109117
export type DefinedInitialQueryOptionsBase<
110118
TQueryFnData = unknown,
111119
TError = DefaultError,
112120
TData = TQueryFnData,
113121
TQueryKey extends QueryKey = QueryKey,
114-
> = UseQueryOptionsBase<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
122+
> = UseQueryOptionsBase<
123+
TQueryFnData,
124+
TError,
125+
TData,
126+
TQueryFnData,
127+
TQueryKey
128+
> & {
115129
initialData:
116-
| NonUndefinedGuard<TQueryFnData>
117-
| (() => NonUndefinedGuard<TQueryFnData>)
130+
| NonUndefinedGuard<TQueryFnData>
131+
| (() => NonUndefinedGuard<TQueryFnData>)
118132
}
119133

120134
export type DefinedInitialQueryOptionsRef<
@@ -123,9 +137,16 @@ export type DefinedInitialQueryOptionsRef<
123137
TData = TQueryFnData,
124138
TQueryKey extends QueryKey = QueryKey,
125139
> = UseQueryOptionsRef<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
126-
value: UseQueryOptionsRef<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>['value'] & {
127-
initialData: NonUndefinedGuard<TQueryFnData>
128-
| (() => NonUndefinedGuard<TQueryFnData>)
140+
value: UseQueryOptionsRef<
141+
TQueryFnData,
142+
TError,
143+
TData,
144+
TQueryFnData,
145+
TQueryKey
146+
>['value'] & {
147+
initialData:
148+
| NonUndefinedGuard<TQueryFnData>
149+
| (() => NonUndefinedGuard<TQueryFnData>)
129150
}
130151
}
131152

@@ -134,7 +155,9 @@ export type DefinedInitialQueryOptions<
134155
TError = DefaultError,
135156
TData = TQueryFnData,
136157
TQueryKey extends QueryKey = QueryKey,
137-
> = DefinedInitialQueryOptionsBase<TQueryFnData, TError, TData, TQueryKey> | DefinedInitialQueryOptionsRef<TQueryFnData, TError, TData, TQueryKey>
158+
> =
159+
| DefinedInitialQueryOptionsBase<TQueryFnData, TError, TData, TQueryKey>
160+
| DefinedInitialQueryOptionsRef<TQueryFnData, TError, TData, TQueryKey>
138161

139162
export type UseQueryReturnType<TData, TError> = UseBaseQueryReturnType<
140163
TData,

0 commit comments

Comments
 (0)