@ainias42/tanstack-ids 0.0.1 → 0.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/QueryContext/SubQueriesContext.js +3 -3
- package/dist/QueryContext/SubQueriesContext.js.map +1 -1
- package/dist/QueryContext/useQuerySubscribeToReload.js +4 -3
- package/dist/QueryContext/useQuerySubscribeToReload.js.map +1 -1
- package/dist/generateIdsQuery.d.ts +107 -21
- package/dist/generateIdsQuery.js +56 -22
- package/dist/generateIdsQuery.js.map +1 -1
- package/dist/generateNestedIdQuery.d.ts +105 -19
- package/dist/hooks/formatInitialPage.d.ts +10 -0
- package/dist/hooks/formatInitialPage.js +13 -0
- package/dist/hooks/formatInitialPage.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/QueryContext/SubQueriesContext.tsx +3 -3
- package/src/QueryContext/useQuerySubscribeToReload.ts +4 -3
- package/src/generateIdsQuery.ts +102 -29
- package/src/hooks/formatInitialPage.ts +12 -0
- package/src/index.ts +1 -0
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { QueriesContext } from '../QueryContext/QueriesContext.js';
|
|
2
|
+
import { useClientLayoutEffect, withMemo } from '@ainias42/react-bootstrap-mobile';
|
|
2
3
|
import { useGenerateQueriesContextId } from '../QueryContext/useGenerateQueriesContextId.js';
|
|
3
4
|
import { useQueriesStore } from '../QueryContext/useQueriesStore.js';
|
|
4
|
-
import {
|
|
5
|
-
import React, { useContext, useLayoutEffect } from 'react';
|
|
5
|
+
import React, { useContext } from 'react';
|
|
6
6
|
export const SubQueriesContext = withMemo(function SubQueriesContext({ children, subContextId }) {
|
|
7
7
|
// Refs
|
|
8
8
|
// States/Variables/Selectors
|
|
@@ -13,7 +13,7 @@ export const SubQueriesContext = withMemo(function SubQueriesContext({ children,
|
|
|
13
13
|
// Dispatch
|
|
14
14
|
// Callbacks
|
|
15
15
|
// Effects
|
|
16
|
-
|
|
16
|
+
useClientLayoutEffect(() => {
|
|
17
17
|
addSubContext(parentId, usedId);
|
|
18
18
|
return () => removeSubContext(parentId, usedId);
|
|
19
19
|
}, [addSubContext, usedId, parentId, removeSubContext]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubQueriesContext.js","sourceRoot":"","sources":["../../src/QueryContext/SubQueriesContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SubQueriesContext.js","sourceRoot":"","sources":["../../src/QueryContext/SubQueriesContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,EAAkB,UAAU,EAAE,MAAM,OAAO,CAAC;AAI1D,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,SAAS,iBAAiB,CAAC,EACI,QAAQ,EACR,YAAY,EACS;IAC1F,OAAO;IAEP,6BAA6B;IAC7B,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAE5C,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAEtG,MAAM,EAAE,GAAG,2BAA2B,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC;IAElC,WAAW;IAEX,YAAY;IAEZ,UAAU;IACV,qBAAqB,CAAC,GAAG,EAAE;QACvB,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAChC,OAAO,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAExD,QAAQ;IAER,kBAAkB;IAElB,OAAO,oBAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,MAAM,IAAG,QAAQ,CAA2B,CAAC;AACxF,CAAC,CAAC,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { QueriesContext } from '../QueryContext/QueriesContext.js';
|
|
2
|
-
import {
|
|
2
|
+
import { useClientLayoutEffect } from "@ainias42/react-bootstrap-mobile";
|
|
3
|
+
import { useContext, useRef } from 'react';
|
|
3
4
|
import { useQueriesStore } from '../QueryContext/useQueriesStore.js';
|
|
4
5
|
export function useQueriesSubscribeToReload(keys, isFetching, error) {
|
|
5
6
|
const contextId = useContext(QueriesContext);
|
|
6
7
|
const setItem = useQueriesStore(s => s.setItem);
|
|
7
8
|
const removeItem = useQueriesStore(s => s.removeItem);
|
|
8
9
|
const id = useRef();
|
|
9
|
-
|
|
10
|
+
useClientLayoutEffect(() => {
|
|
10
11
|
id.current = setItem(contextId, id.current, {
|
|
11
12
|
keys,
|
|
12
13
|
error,
|
|
@@ -14,7 +15,7 @@ export function useQueriesSubscribeToReload(keys, isFetching, error) {
|
|
|
14
15
|
});
|
|
15
16
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
16
17
|
}, [contextId, error, isFetching, setItem, ...keys]);
|
|
17
|
-
|
|
18
|
+
useClientLayoutEffect(() => {
|
|
18
19
|
return () => removeItem(contextId, id.current);
|
|
19
20
|
}, [contextId, removeItem]);
|
|
20
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuerySubscribeToReload.js","sourceRoot":"","sources":["../../src/QueryContext/useQuerySubscribeToReload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useQuerySubscribeToReload.js","sourceRoot":"","sources":["../../src/QueryContext/useQuerySubscribeToReload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,MAAM,UAAU,2BAA2B,CAAC,IAAc,EAAE,UAAmB,EAAE,KAAU;IACvF,MAAM,SAAS,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACtD,MAAM,EAAE,GAAG,MAAM,EAAsB,CAAC;IAExC,qBAAqB,CAAC,GAAG,EAAE;QACvB,EAAE,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,EAAE;YACxC,IAAI;YACJ,KAAK;YACL,UAAU;SACb,CAAC,CAAC;QACH,uDAAuD;IAC3D,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAErD,qBAAqB,CAAC,GAAG,EAAE;QACvB,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Awaitable, Override, URecord } from '@ainias42/js-helper';
|
|
2
|
+
import type { CreateInfiniteQueryOptions, CreateQueryOptions, QueryHookOptions } from 'react-query-kit';
|
|
2
3
|
import type { QueryClient, QueryFunctionContext, UseQueryOptions, UseQueryResult } from '@tanstack/react-query';
|
|
3
|
-
import type { URecord } from '@ainias42/js-helper';
|
|
4
4
|
export type Unpacked<T> = T extends (infer U)[] ? U : T;
|
|
5
5
|
export declare function generateIdsQuery<IdType extends number | string | symbol, Type extends {
|
|
6
6
|
id: IdType;
|
|
@@ -10,19 +10,28 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
10
10
|
useMany: import("react-query-kit").ExposeMethods<Type, [IdType], Error> & ((ids: IdType[], otherAdditionalQueryOptions?: Omit<UseQueryOptions<Type, unknown, Type, [string, [IdType]]>, "context" | "fetcher" | "queryKey"> & {
|
|
11
11
|
reloadWithContext?: boolean;
|
|
12
12
|
}) => URecord<IdType, UseQueryResult<Type, Error>>);
|
|
13
|
-
useOne: import("react-query-kit").ExposeMethods<Type, [IdType], Error> & ((identifier: IdType
|
|
13
|
+
useOne: import("react-query-kit").ExposeMethods<Type, [IdType], Error> & ((identifier: IdType, otherAdditionalQueryOptions?: Omit<QueryHookOptions<Type, unknown, Type, [IdType]>, "context" | "fetcher" | "queryKey" | "variables"> & {
|
|
14
|
+
reloadWithContext?: boolean;
|
|
15
|
+
}) => import("react-query-kit").QueryHookResult<Type, Error>);
|
|
14
16
|
generateFilter: <Func extends (...args: any[]) => Promise<Type[]> | Type[], FuncArguments extends Parameters<Func>["length"] extends 0 ? void : Parameters<Func> = Parameters<Func>["length"] extends 0 ? void : Parameters<Func>, ResultAsArray extends boolean = false>(queryClient: QueryClient, filterFunc: Func, additionalOptions?: Omit<CreateQueryOptions<IdType[], [FuncArguments]>, "queryKey" | "fetcher"> & {
|
|
15
17
|
resultAsArray?: ResultAsArray;
|
|
16
18
|
subKey?: string;
|
|
17
19
|
}) => import("react-query-kit").ExposeMethods<IdType[], void | (void & [filter: FuncArguments]), Error> & (<Args extends FuncArguments extends void ? [] : FuncArguments>(...args: Args) => ResultAsArray extends true ? UseQueryResult<Type, Error>[] : URecord<IdType, UseQueryResult<Type, Error>>);
|
|
18
|
-
generateInfiniteQuery: <PageParams, FuncArguments extends any[]>(
|
|
19
|
-
|
|
20
|
+
generateInfiniteQuery: <PageParams, Meta, FuncArguments extends any[] = []>({ queryFn, ...options }: Omit<CreateInfiniteQueryOptions<{
|
|
21
|
+
data: IdType[];
|
|
22
|
+
meta: Meta;
|
|
23
|
+
}, FuncArguments, Error, PageParams>, "getNextPageParam" | "getPreviousPageParam" | "queryKey" | "fetcher"> & {
|
|
24
|
+
queryFn: (pageParams: PageParams, args: FuncArguments, context: QueryFunctionContext<[string, FuncArguments], PageParams>) => Awaitable<{
|
|
25
|
+
data: Type[];
|
|
26
|
+
meta: Meta;
|
|
27
|
+
}>;
|
|
20
28
|
getNextPageParam: (options: {
|
|
21
29
|
getLastPage: () => Type[];
|
|
22
30
|
getAllPages: () => Type[][];
|
|
23
31
|
lastPageParam: PageParams;
|
|
24
32
|
allPageParams: PageParams[];
|
|
25
33
|
lastPageLength: number;
|
|
34
|
+
lastPageMeta: Meta;
|
|
26
35
|
}) => PageParams | undefined;
|
|
27
36
|
getPreviousPageParam?: (options: {
|
|
28
37
|
getFirstPage: () => Type[];
|
|
@@ -30,8 +39,40 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
30
39
|
firstPageParam: PageParams;
|
|
31
40
|
allPageParams: PageParams[];
|
|
32
41
|
firstPageLength: number;
|
|
42
|
+
firstPageMeta: Meta;
|
|
33
43
|
}) => PageParams | undefined;
|
|
34
|
-
}) => import("react-query-kit").ExposeMethods<
|
|
44
|
+
}) => import("react-query-kit").ExposeMethods<{
|
|
45
|
+
data: IdType[];
|
|
46
|
+
meta: Meta;
|
|
47
|
+
}, FuncArguments, Error> & ((...args: FuncArguments extends symbol | {
|
|
48
|
+
length: 0;
|
|
49
|
+
} | undefined ? [] | [Override<import("react-query-kit").InfiniteQueryHookOptions<{
|
|
50
|
+
data: IdType[];
|
|
51
|
+
meta: Meta;
|
|
52
|
+
}, Error, unknown, FuncArguments, PageParams> & {
|
|
53
|
+
select?: undefined;
|
|
54
|
+
}, {
|
|
55
|
+
initialData?: {
|
|
56
|
+
pages: {
|
|
57
|
+
data: Type[];
|
|
58
|
+
meta: Meta;
|
|
59
|
+
}[];
|
|
60
|
+
pageParams: PageParams[];
|
|
61
|
+
};
|
|
62
|
+
}>] : [Override<import("react-query-kit").InfiniteQueryHookOptions<{
|
|
63
|
+
data: IdType[];
|
|
64
|
+
meta: Meta;
|
|
65
|
+
}, Error, unknown, FuncArguments, PageParams> & {
|
|
66
|
+
select?: undefined;
|
|
67
|
+
}, {
|
|
68
|
+
initialData?: {
|
|
69
|
+
pages: {
|
|
70
|
+
data: Type[];
|
|
71
|
+
meta: Meta;
|
|
72
|
+
}[];
|
|
73
|
+
pageParams: PageParams[];
|
|
74
|
+
};
|
|
75
|
+
}>]) => {
|
|
35
76
|
data: {
|
|
36
77
|
pages: Exclude<URecord<IdType, Type>[IdType], undefined>[][];
|
|
37
78
|
pageParams: PageParams[];
|
|
@@ -44,8 +85,14 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
44
85
|
isRefetchError: true;
|
|
45
86
|
isSuccess: false;
|
|
46
87
|
status: "error";
|
|
47
|
-
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
48
|
-
|
|
88
|
+
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
89
|
+
data: IdType[];
|
|
90
|
+
meta: Meta;
|
|
91
|
+
}, PageParams>, Error>>;
|
|
92
|
+
fetchPreviousPage: (options?: import("@tanstack/react-query").FetchPreviousPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
93
|
+
data: IdType[];
|
|
94
|
+
meta: Meta;
|
|
95
|
+
}, PageParams>, Error>>;
|
|
49
96
|
hasNextPage: boolean;
|
|
50
97
|
hasPreviousPage: boolean;
|
|
51
98
|
isFetchNextPageError: boolean;
|
|
@@ -65,7 +112,10 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
65
112
|
isPlaceholderData: boolean;
|
|
66
113
|
isRefetching: boolean;
|
|
67
114
|
isStale: boolean;
|
|
68
|
-
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
115
|
+
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
116
|
+
data: IdType[];
|
|
117
|
+
meta: Meta;
|
|
118
|
+
}, PageParams>, Error>>;
|
|
69
119
|
fetchStatus: import("@tanstack/react-query").FetchStatus;
|
|
70
120
|
} | {
|
|
71
121
|
data: {
|
|
@@ -82,8 +132,14 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
82
132
|
isFetchPreviousPageError: false;
|
|
83
133
|
isSuccess: true;
|
|
84
134
|
status: "success";
|
|
85
|
-
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
86
|
-
|
|
135
|
+
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
136
|
+
data: IdType[];
|
|
137
|
+
meta: Meta;
|
|
138
|
+
}, PageParams>, Error>>;
|
|
139
|
+
fetchPreviousPage: (options?: import("@tanstack/react-query").FetchPreviousPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
140
|
+
data: IdType[];
|
|
141
|
+
meta: Meta;
|
|
142
|
+
}, PageParams>, Error>>;
|
|
87
143
|
hasNextPage: boolean;
|
|
88
144
|
hasPreviousPage: boolean;
|
|
89
145
|
isFetchingNextPage: boolean;
|
|
@@ -101,7 +157,10 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
101
157
|
isPlaceholderData: boolean;
|
|
102
158
|
isRefetching: boolean;
|
|
103
159
|
isStale: boolean;
|
|
104
|
-
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
160
|
+
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
161
|
+
data: IdType[];
|
|
162
|
+
meta: Meta;
|
|
163
|
+
}, PageParams>, Error>>;
|
|
105
164
|
fetchStatus: import("@tanstack/react-query").FetchStatus;
|
|
106
165
|
} | {
|
|
107
166
|
data: {
|
|
@@ -118,8 +177,14 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
118
177
|
isFetchPreviousPageError: false;
|
|
119
178
|
isSuccess: false;
|
|
120
179
|
status: "error";
|
|
121
|
-
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
122
|
-
|
|
180
|
+
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
181
|
+
data: IdType[];
|
|
182
|
+
meta: Meta;
|
|
183
|
+
}, PageParams>, Error>>;
|
|
184
|
+
fetchPreviousPage: (options?: import("@tanstack/react-query").FetchPreviousPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
185
|
+
data: IdType[];
|
|
186
|
+
meta: Meta;
|
|
187
|
+
}, PageParams>, Error>>;
|
|
123
188
|
hasNextPage: boolean;
|
|
124
189
|
hasPreviousPage: boolean;
|
|
125
190
|
isFetchingNextPage: boolean;
|
|
@@ -137,7 +202,10 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
137
202
|
isPlaceholderData: boolean;
|
|
138
203
|
isRefetching: boolean;
|
|
139
204
|
isStale: boolean;
|
|
140
|
-
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
205
|
+
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
206
|
+
data: IdType[];
|
|
207
|
+
meta: Meta;
|
|
208
|
+
}, PageParams>, Error>>;
|
|
141
209
|
fetchStatus: import("@tanstack/react-query").FetchStatus;
|
|
142
210
|
} | {
|
|
143
211
|
data: {
|
|
@@ -154,8 +222,14 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
154
222
|
isFetchPreviousPageError: false;
|
|
155
223
|
isSuccess: false;
|
|
156
224
|
status: "pending";
|
|
157
|
-
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
158
|
-
|
|
225
|
+
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
226
|
+
data: IdType[];
|
|
227
|
+
meta: Meta;
|
|
228
|
+
}, PageParams>, Error>>;
|
|
229
|
+
fetchPreviousPage: (options?: import("@tanstack/react-query").FetchPreviousPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
230
|
+
data: IdType[];
|
|
231
|
+
meta: Meta;
|
|
232
|
+
}, PageParams>, Error>>;
|
|
159
233
|
hasNextPage: boolean;
|
|
160
234
|
hasPreviousPage: boolean;
|
|
161
235
|
isFetchingNextPage: boolean;
|
|
@@ -173,7 +247,10 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
173
247
|
isPlaceholderData: boolean;
|
|
174
248
|
isRefetching: boolean;
|
|
175
249
|
isStale: boolean;
|
|
176
|
-
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
250
|
+
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
251
|
+
data: IdType[];
|
|
252
|
+
meta: Meta;
|
|
253
|
+
}, PageParams>, Error>>;
|
|
177
254
|
fetchStatus: import("@tanstack/react-query").FetchStatus;
|
|
178
255
|
} | {
|
|
179
256
|
data: {
|
|
@@ -189,8 +266,14 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
189
266
|
isFetchPreviousPageError: false;
|
|
190
267
|
isSuccess: false;
|
|
191
268
|
status: "pending";
|
|
192
|
-
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
193
|
-
|
|
269
|
+
fetchNextPage: (options?: import("@tanstack/react-query").FetchNextPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
270
|
+
data: IdType[];
|
|
271
|
+
meta: Meta;
|
|
272
|
+
}, PageParams>, Error>>;
|
|
273
|
+
fetchPreviousPage: (options?: import("@tanstack/react-query").FetchPreviousPageOptions) => Promise<import("@tanstack/react-query").InfiniteQueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
274
|
+
data: IdType[];
|
|
275
|
+
meta: Meta;
|
|
276
|
+
}, PageParams>, Error>>;
|
|
194
277
|
hasNextPage: boolean;
|
|
195
278
|
hasPreviousPage: boolean;
|
|
196
279
|
isFetchingNextPage: boolean;
|
|
@@ -209,7 +292,10 @@ export declare function generateIdsQuery<IdType extends number | string | symbol
|
|
|
209
292
|
isPlaceholderData: boolean;
|
|
210
293
|
isRefetching: boolean;
|
|
211
294
|
isStale: boolean;
|
|
212
|
-
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<
|
|
295
|
+
refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<import("@tanstack/react-query").InfiniteData<{
|
|
296
|
+
data: IdType[];
|
|
297
|
+
meta: Meta;
|
|
298
|
+
}, PageParams>, Error>>;
|
|
213
299
|
fetchStatus: import("@tanstack/react-query").FetchStatus;
|
|
214
300
|
});
|
|
215
301
|
};
|
package/dist/generateIdsQuery.js
CHANGED
|
@@ -14,7 +14,7 @@ import { NotFoundError } from './NotFoundError.js';
|
|
|
14
14
|
import { create, windowScheduler } from '@yornaath/batshit';
|
|
15
15
|
import { createInfiniteQuery, createQuery } from 'react-query-kit';
|
|
16
16
|
import { generateQuery } from './generateQuery.js';
|
|
17
|
-
import { hashKey, useQueries } from '@tanstack/react-query';
|
|
17
|
+
import { hashKey, useQueries, useQueryClient } from '@tanstack/react-query';
|
|
18
18
|
import { hoistReactQueryKitAttributes } from './hoistReactQueryKitAttributes.js';
|
|
19
19
|
import { useIndexedData } from './hooks/useIndexedData.js';
|
|
20
20
|
import { useMemo, useRef } from 'react';
|
|
@@ -62,9 +62,11 @@ export function generateIdsQuery(key, fetcher, additionalQueryOptions) {
|
|
|
62
62
|
useQueriesSubscribeToReload(keys, isFetching, error);
|
|
63
63
|
return returnData.current;
|
|
64
64
|
}
|
|
65
|
-
function useOneHook(identifier) {
|
|
66
|
-
|
|
67
|
-
|
|
65
|
+
function useOneHook(identifier, otherAdditionalQueryOptions = {}) {
|
|
66
|
+
var _a;
|
|
67
|
+
const result = useQueryHook(Object.assign(Object.assign({}, otherAdditionalQueryOptions), { variables: [identifier] }));
|
|
68
|
+
const shouldReload = (_a = otherAdditionalQueryOptions.reloadWithContext) !== null && _a !== void 0 ? _a : true;
|
|
69
|
+
useQueriesSubscribeToReload(shouldReload ? [hashKey(useQueryHook.getKey([identifier]))] : [], result.isFetching, result.error);
|
|
68
70
|
return result;
|
|
69
71
|
}
|
|
70
72
|
function generateFilter(queryClient, filterFunc, additionalOptions) {
|
|
@@ -93,43 +95,75 @@ export function generateIdsQuery(key, fetcher, additionalQueryOptions) {
|
|
|
93
95
|
}
|
|
94
96
|
return hoistReactQueryKitAttributes(queryHook, useFilter);
|
|
95
97
|
}
|
|
96
|
-
function generateInfiniteQuery(
|
|
98
|
+
function generateInfiniteQuery(_a) {
|
|
97
99
|
var { queryFn } = _a, options = __rest(_a, ["queryFn"]);
|
|
100
|
+
let queryClient;
|
|
101
|
+
function getQueryClient() {
|
|
102
|
+
if (!queryClient) {
|
|
103
|
+
throw new Error("QueryClient not set");
|
|
104
|
+
}
|
|
105
|
+
return queryClient;
|
|
106
|
+
}
|
|
98
107
|
function findEntity(id) {
|
|
99
|
-
return
|
|
108
|
+
return getQueryClient().getQueryData(useQueryHook.getKey([id]));
|
|
100
109
|
}
|
|
101
110
|
const { getPreviousPageParam } = options;
|
|
102
|
-
const infiniteQueryHook = createInfiniteQuery(Object.assign(Object.assign({}, options), {
|
|
111
|
+
const infiniteQueryHook = createInfiniteQuery(Object.assign(Object.assign({}, options), { use: [function myTestMiddleware(useQueryNext) {
|
|
112
|
+
return (options, currentQueryClient) => {
|
|
113
|
+
queryClient = useQueryClient(currentQueryClient);
|
|
114
|
+
return useQueryNext(options, queryClient);
|
|
115
|
+
};
|
|
116
|
+
}], queryKey: [`${key}-infinite-query`], fetcher: async (_, ctx) => {
|
|
103
117
|
const context = ctx;
|
|
104
118
|
const result = await queryFn(context.pageParam, context.queryKey[1], context);
|
|
105
|
-
return
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
119
|
+
return {
|
|
120
|
+
meta: result.meta,
|
|
121
|
+
data: result.data.map(item => {
|
|
122
|
+
getQueryClient().setQueryData(useQueryHook.getKey([item.id]), item);
|
|
123
|
+
return item.id;
|
|
124
|
+
})
|
|
125
|
+
};
|
|
109
126
|
}, getNextPageParam: (lastPage, allPages, lastPageParam, allPageParams) => {
|
|
110
127
|
return options.getNextPageParam({
|
|
111
|
-
|
|
112
|
-
|
|
128
|
+
lastPageMeta: lastPage.meta,
|
|
129
|
+
getLastPage: () => ArrayHelper.noUndefined(lastPage.data.map(findEntity)),
|
|
130
|
+
getAllPages: () => allPages.map(page => ArrayHelper.noUndefined(page.data.map(findEntity))),
|
|
113
131
|
lastPageParam,
|
|
114
132
|
allPageParams,
|
|
115
|
-
lastPageLength: lastPage.length
|
|
133
|
+
lastPageLength: lastPage.data.length
|
|
116
134
|
});
|
|
117
135
|
}, getPreviousPageParam: !getPreviousPageParam
|
|
118
136
|
? undefined
|
|
119
137
|
: (firstPage, allPages, firstPageParam, allPageParams) => {
|
|
120
138
|
return getPreviousPageParam({
|
|
121
|
-
|
|
122
|
-
|
|
139
|
+
firstPageMeta: firstPage.meta,
|
|
140
|
+
getFirstPage: () => ArrayHelper.noUndefined(firstPage.data.map(findEntity)),
|
|
141
|
+
getAllPages: () => allPages.map(page => ArrayHelper.noUndefined(page.data.map(findEntity))),
|
|
123
142
|
firstPageParam,
|
|
124
143
|
allPageParams,
|
|
125
|
-
firstPageLength: firstPage.length
|
|
144
|
+
firstPageLength: firstPage.data.length
|
|
126
145
|
});
|
|
127
146
|
} }));
|
|
128
147
|
function useInfiniteQuery(...args) {
|
|
129
148
|
var _a;
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
|
|
149
|
+
const infiniteQueryClient = useQueryClient();
|
|
150
|
+
let infiniteOptions;
|
|
151
|
+
if (args.length === 1 && "initialData" in args[0] && args[0].initialData) {
|
|
152
|
+
const { initialData } = args[0];
|
|
153
|
+
infiniteOptions = Object.assign(Object.assign({}, args[0]), { initialData: {
|
|
154
|
+
pages: initialData.pages.map(page => (Object.assign(Object.assign({}, page), { data: page.data.map(item => {
|
|
155
|
+
infiniteQueryClient.setQueryData(useQueryHook.getKey([item.id]), item);
|
|
156
|
+
return item.id;
|
|
157
|
+
}) }))),
|
|
158
|
+
pageParams: initialData.pageParams
|
|
159
|
+
} });
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
infiniteOptions = args[0];
|
|
163
|
+
}
|
|
164
|
+
const result = infiniteQueryHook(infiniteOptions);
|
|
165
|
+
useQueriesSubscribeToReload([hashKey(infiniteQueryHook.getKey(infiniteOptions.variables))], result.isFetching, result.error);
|
|
166
|
+
const ids = useMemo(() => { var _a, _b; return (_b = (_a = result.data) === null || _a === void 0 ? void 0 : _a.pages.flatMap(page => page.data)) !== null && _b !== void 0 ? _b : []; }, [(_a = result.data) === null || _a === void 0 ? void 0 : _a.pages]);
|
|
133
167
|
// When staleTime is same as filterStaleTime, then the queries will run at the same time as the filter
|
|
134
168
|
// Because of this, use staleTime: Inifinity to prevent the queries from running again. The result of the
|
|
135
169
|
// filter will be saved inside the queryClient, so the queries will be updated with the new data.
|
|
@@ -139,12 +173,12 @@ export function generateIdsQuery(key, fetcher, additionalQueryOptions) {
|
|
|
139
173
|
const indexedData = useIndexedData(manyData);
|
|
140
174
|
const pages = useMemo(() => {
|
|
141
175
|
return result.data
|
|
142
|
-
? result.data.pages.map(page => ArrayHelper.noUndefined(page.map(id => indexedData[id])))
|
|
176
|
+
? result.data.pages.map(page => ArrayHelper.noUndefined(page.data.map(id => indexedData[id])))
|
|
143
177
|
: [];
|
|
144
178
|
}, [indexedData, result.data]);
|
|
145
179
|
return Object.assign(Object.assign({}, result), { data: !result.data ? undefined : Object.assign(Object.assign({}, result.data), { pages }) });
|
|
146
180
|
}
|
|
147
|
-
// @ts-expect-error type
|
|
181
|
+
// @ts-expect-error wrong type in tanstack-query
|
|
148
182
|
return hoistReactQueryKitAttributes(infiniteQueryHook, useInfiniteQuery);
|
|
149
183
|
}
|
|
150
184
|
const useMany = hoistReactQueryKitAttributes(useQueryHook, useManyHook);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateIdsQuery.js","sourceRoot":"","sources":["../src/generateIdsQuery.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"generateIdsQuery.js","sourceRoot":"","sources":["../src/generateIdsQuery.ts"],"names":[],"mappings":"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"}
|