Skip to content

Commit 23ae6c3

Browse files
DamianOsipiukDamianOsipiuk
authored
feat: update core package 3.30.0 -> 3.34.5 (#100)
* feat: update core package 3.30.0 -> 3.34.5 * fix: update types to use core types
1 parent e5c15dc commit 23ae6c3

File tree

8 files changed

+112
-62
lines changed

8 files changed

+112
-62
lines changed

‎package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"homepage": "https://github.com/DamianOsipiuk/vue-query#readme",
4242
"dependencies": {
4343
"match-sorter": "^6.3.1",
44-
"react-query": "^3.30.0",
44+
"react-query": "^3.34.5",
4545
"vue-demi": "^0.10.1"
4646
},
4747
"peerDependencies": {

‎src/vue/useBaseQuery.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ import {
77
watchEffect,
88
} from "vue-demi";
99

10-
import type { QueryObserver, QueryKey } from "react-query/core";
1110
import type {
12-
UseBaseQueryOptions as UBQO,
13-
UseQueryResult,
14-
} from "react-query/types/react/types";
11+
QueryObserver,
12+
QueryKey,
13+
QueryObserverOptions,
14+
QueryObserverResult,
15+
} from "react-query/core";
1516

1617
import { useQueryClient } from "./useQueryClient";
1718
import { updateState } from "./utils";
@@ -24,13 +25,13 @@ export type UseBaseQueryOptions<
2425
TQueryData = unknown,
2526
TQueryKey extends QueryKey = QueryKey
2627
> = WithQueryClientKey<
27-
UBQO<TQueryFnData, TError, TData, TQueryData, TQueryKey>
28+
QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>
2829
>;
2930

3031
export type UseQueryReturnType<
3132
TData,
3233
TError,
33-
Result = UseQueryResult<TData, TError>
34+
Result = QueryObserverResult<TData, TError>
3435
> = ToRefs<Readonly<Result>> & {
3536
suspense: () => Promise<Result>;
3637
};

‎src/vue/useInfiniteQuery.ts‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ import type {
44
QueryObserver,
55
QueryFunction,
66
QueryKey,
7+
QueryObserverOptions,
8+
InfiniteQueryObserverOptions,
9+
InfiniteQueryObserverResult,
710
} from "react-query/types/core";
8-
import type {
9-
UseInfiniteQueryOptions as UIQO,
10-
UseInfiniteQueryResult,
11-
UseBaseQueryOptions,
12-
} from "react-query/types/react/types";
1311

1412
import { useBaseQuery, UseQueryReturnType } from "./useBaseQuery";
1513
import { parseQueryArgs } from "./utils";
@@ -22,7 +20,13 @@ export type UseInfiniteQueryOptions<
2220
TData = TQueryFnData,
2321
TQueryKey extends QueryKey = QueryKey
2422
> = WithQueryClientKey<
25-
UIQO<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>
23+
InfiniteQueryObserverOptions<
24+
TQueryFnData,
25+
TError,
26+
TData,
27+
TQueryFnData,
28+
TQueryKey
29+
>
2630
>;
2731

2832
export function useInfiniteQuery<
@@ -32,7 +36,11 @@ export function useInfiniteQuery<
3236
TQueryKey extends QueryKey = QueryKey
3337
>(
3438
options: UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey>
35-
): UseQueryReturnType<TData, TError, UseInfiniteQueryResult<TData, TError>>;
39+
): UseQueryReturnType<
40+
TData,
41+
TError,
42+
InfiniteQueryObserverResult<TData, TError>
43+
>;
3644
export function useInfiniteQuery<
3745
TQueryFnData = unknown,
3846
TError = unknown,
@@ -44,7 +52,11 @@ export function useInfiniteQuery<
4452
UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
4553
"queryKey"
4654
>
47-
): UseQueryReturnType<TData, TError, UseInfiniteQueryResult<TData, TError>>;
55+
): UseQueryReturnType<
56+
TData,
57+
TError,
58+
InfiniteQueryObserverResult<TData, TError>
59+
>;
4860
export function useInfiniteQuery<
4961
TQueryFnData = unknown,
5062
TError = unknown,
@@ -57,7 +69,11 @@ export function useInfiniteQuery<
5769
UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
5870
"queryKey" | "queryFn"
5971
>
60-
): UseQueryReturnType<TData, TError, UseInfiniteQueryResult<TData, TError>>;
72+
): UseQueryReturnType<
73+
TData,
74+
TError,
75+
InfiniteQueryObserverResult<TData, TError>
76+
>;
6177
export function useInfiniteQuery<
6278
TQueryFnData,
6379
TError,
@@ -71,15 +87,22 @@ export function useInfiniteQuery<
7187
| QueryFunction<TQueryFnData, TQueryKey>
7288
| UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
7389
arg3?: UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey>
74-
): UseQueryReturnType<TData, TError, UseInfiniteQueryResult<TData, TError>> {
75-
const parsedOptions = parseQueryArgs(arg1, arg2, arg3) as UseBaseQueryOptions<
76-
TQueryFnData,
77-
TError,
78-
TData,
79-
TQueryKey
80-
>;
90+
): UseQueryReturnType<
91+
TData,
92+
TError,
93+
InfiniteQueryObserverResult<TData, TError>
94+
> {
95+
const parsedOptions = parseQueryArgs(
96+
arg1,
97+
arg2,
98+
arg3
99+
) as QueryObserverOptions<TQueryFnData, TError, TData, TQueryKey>;
81100
return useBaseQuery(
82101
parsedOptions,
83102
InfiniteQueryObserver as typeof QueryObserver
84-
) as UseQueryReturnType<TData, TError, UseInfiniteQueryResult<TData, TError>>;
103+
) as UseQueryReturnType<
104+
TData,
105+
TError,
106+
InfiniteQueryObserverResult<TData, TError>
107+
>;
85108
}

‎src/vue/useMutation.ts‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import {
1111
MutationObserver,
1212
MutationObserverResult,
1313
} from "react-query/core";
14-
import { MutationFunction, MutationKey } from "react-query/types/core";
15-
import type {
16-
UseMutationOptions as UMO,
17-
UseMutateFunction,
18-
UseMutateAsyncFunction,
19-
} from "react-query/types/react/types";
14+
import {
15+
MutationFunction,
16+
MutationKey,
17+
MutationObserverOptions,
18+
MutateFunction,
19+
} from "react-query/types/core";
2020
import { parseMutationArgs, updateState } from "./utils";
2121
import { useQueryClient } from "./useQueryClient";
2222
import { WithQueryClientKey } from "./types";
@@ -27,7 +27,18 @@ type MutationResult<TData, TError, TVariables, TContext> = Omit<
2727
>;
2828

2929
export type UseMutationOptions<TData, TError, TVariables, TContext> =
30-
WithQueryClientKey<UMO<TData, TError, TVariables, TContext>>;
30+
WithQueryClientKey<
31+
MutationObserverOptions<TData, TError, TVariables, TContext>
32+
>;
33+
34+
type MutateSyncFunction<
35+
TData = unknown,
36+
TError = unknown,
37+
TVariables = void,
38+
TContext = unknown
39+
> = (
40+
...options: Parameters<MutateFunction<TData, TError, TVariables, TContext>>
41+
) => void;
3142

3243
export type UseMutationReturnType<
3344
TData,
@@ -36,8 +47,8 @@ export type UseMutationReturnType<
3647
TContext,
3748
Result = MutationResult<TData, TError, TVariables, TContext>
3849
> = ToRefs<Readonly<Result>> & {
39-
mutate: UseMutateFunction<TData, TError, TVariables, TContext>;
40-
mutateAsync: UseMutateAsyncFunction<TData, TError, TVariables, TContext>;
50+
mutate: MutateSyncFunction<TData, TError, TVariables, TContext>;
51+
mutateAsync: MutateFunction<TData, TError, TVariables, TContext>;
4152
};
4253

4354
export function useMutation<

‎src/vue/useQueries.ts‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
import { QueriesObserver } from "react-query/core";
33
import { onUnmounted, reactive, readonly, set, watch } from "vue-demi";
44

5-
import type { QueryFunction } from "react-query/types/core";
6-
import type { UseQueryResult } from "react-query/types/react/types";
5+
import type {
6+
QueryFunction,
7+
QueryObserverResult,
8+
} from "react-query/types/core";
79

810
import { useQueryClient } from "./useQueryClient";
911
import { UseQueryOptions } from "./useQuery";
@@ -44,28 +46,28 @@ type GetOptions<T> =
4446
type GetResults<T> =
4547
// Part 1: responsible for mapping explicit type parameter to function result, if object
4648
T extends { queryFnData: any; error?: infer TError; data: infer TData }
47-
? UseQueryResult<TData, TError>
49+
? QueryObserverResult<TData, TError>
4850
: T extends { queryFnData: infer TQueryFnData; error?: infer TError }
49-
? UseQueryResult<TQueryFnData, TError>
51+
? QueryObserverResult<TQueryFnData, TError>
5052
: T extends { data: infer TData; error?: infer TError }
51-
? UseQueryResult<TData, TError>
53+
? QueryObserverResult<TData, TError>
5254
: // Part 2: responsible for mapping explicit type parameter to function result, if tuple
5355
T extends [any, infer TError, infer TData]
54-
? UseQueryResult<TData, TError>
56+
? QueryObserverResult<TData, TError>
5557
: T extends [infer TQueryFnData, infer TError]
56-
? UseQueryResult<TQueryFnData, TError>
58+
? QueryObserverResult<TQueryFnData, TError>
5759
: T extends [infer TQueryFnData]
58-
? UseQueryResult<TQueryFnData>
60+
? QueryObserverResult<TQueryFnData>
5961
: // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided
6062
T extends {
6163
queryFn?: QueryFunction<any>;
6264
select: (data: any) => infer TData;
6365
}
64-
? UseQueryResult<TData>
66+
? QueryObserverResult<TData>
6567
: T extends { queryFn?: QueryFunction<infer TQueryFnData> }
66-
? UseQueryResult<TQueryFnData>
68+
? QueryObserverResult<TQueryFnData>
6769
: // Fallback
68-
UseQueryResult;
70+
QueryObserverResult;
6971

7072
/**
7173
* QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
@@ -99,7 +101,7 @@ type QueriesResults<
99101
Result extends any[] = [],
100102
Depth extends ReadonlyArray<number> = []
101103
> = Depth["length"] extends MAXIMUM_DEPTH
102-
? UseQueryResult[]
104+
? QueryObserverResult[]
103105
: T extends []
104106
? []
105107
: T extends [infer Head]
@@ -108,9 +110,9 @@ type QueriesResults<
108110
? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>
109111
: T extends UseQueryOptions<infer TQueryFnData, infer TError, infer TData>[]
110112
? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
111-
UseQueryResult<unknown extends TData ? TQueryFnData : TData, TError>[]
113+
QueryObserverResult<unknown extends TData ? TQueryFnData : TData, TError>[]
112114
: // Fallback
113-
UseQueryResult[];
115+
QueryObserverResult[];
114116

115117
export function useQueries<T extends any[]>(
116118
queries: readonly [...QueriesOptions<T>]

‎src/vue/useQuery.ts‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { QueryObserver } from "react-query/core";
22

3-
import type { QueryFunction, QueryKey } from "react-query/types/core";
43
import type {
5-
UseQueryOptions as UQO,
6-
UseBaseQueryOptions,
7-
} from "react-query/types/react/types";
4+
QueryFunction,
5+
QueryKey,
6+
QueryObserverOptions,
7+
} from "react-query/types/core";
88

99
import { useBaseQuery, UseQueryReturnType } from "./useBaseQuery";
1010
import { parseQueryArgs } from "./utils";
@@ -16,7 +16,9 @@ export type UseQueryOptions<
1616
TError = unknown,
1717
TData = TQueryFnData,
1818
TQueryKey extends QueryKey = QueryKey
19-
> = WithQueryClientKey<UQO<TQueryFnData, TError, TData, TQueryKey>>;
19+
> = WithQueryClientKey<
20+
QueryObserverOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>
21+
>;
2022

2123
export function useQuery<
2224
TQueryFnData = unknown,
@@ -63,10 +65,15 @@ export function useQuery<
6365
| UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
6466
arg3?: UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>
6567
): UseQueryReturnType<TData, TError> {
66-
const parsedOptions = parseQueryArgs(arg1, arg2, arg3) as UseBaseQueryOptions<
68+
const parsedOptions = parseQueryArgs(
69+
arg1,
70+
arg2,
71+
arg3
72+
) as QueryObserverOptions<
6773
TQueryFnData,
6874
TError,
6975
TData,
76+
TQueryFnData,
7077
TQueryKey
7178
>;
7279
return useBaseQuery(parsedOptions, QueryObserver);

‎src/vue/utils.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import type {
55
MutationOptions,
66
QueryFunction,
77
QueryKey,
8+
QueryObserverOptions,
89
} from "react-query/types/core";
9-
import type { UseBaseQueryOptions } from "react-query/types/react/types";
1010
import { QueryFilters } from "./useIsFetching";
1111
import { MutationFilters } from "./useIsMutating";
1212

@@ -19,7 +19,13 @@ export function parseQueryArgs<
1919
TError = unknown,
2020
TData = TQueryFnData,
2121
TQueryKey extends QueryKey = QueryKey,
22-
TOptions = UseBaseQueryOptions<TQueryFnData, TError, TData, TQueryKey>
22+
TOptions = QueryObserverOptions<
23+
TQueryFnData,
24+
TError,
25+
TData,
26+
TQueryFnData,
27+
TQueryKey
28+
>
2329
>(
2430
arg1: QueryKey | TOptions,
2531
arg2: QueryFunction<TQueryFnData, TQueryKey> | TOptions = {} as TOptions,

0 commit comments

Comments
 (0)