@trpc/tanstack-react-query 0.0.0-alpha.2 → 0.0.0-alpha.3
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/internals/Context.d.ts +2 -4
- package/dist/internals/Context.d.ts.map +1 -1
- package/dist/internals/createOptionsProxy.d.ts +5 -3
- package/dist/internals/createOptionsProxy.d.ts.map +1 -1
- package/dist/internals/createOptionsProxy.js +10 -7
- package/dist/internals/createOptionsProxy.mjs +11 -8
- package/dist/internals/infiniteQueryOptions.d.ts +7 -4
- package/dist/internals/infiniteQueryOptions.d.ts.map +1 -1
- package/dist/internals/queryOptions.d.ts +7 -4
- package/dist/internals/queryOptions.d.ts.map +1 -1
- package/package.json +5 -6
- package/src/internals/createOptionsProxy.ts +27 -10
- package/src/internals/infiniteQueryOptions.ts +3 -3
- package/src/internals/queryOptions.ts +3 -3
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
import { type QueryClient } from '@tanstack/react-query';
|
|
2
|
-
import type
|
|
2
|
+
import { type CreateTRPCClient } from '@trpc/client';
|
|
3
3
|
import type { AnyTRPCRouter } from '@trpc/server';
|
|
4
4
|
import * as React from 'react';
|
|
5
5
|
import { type TRPCOptionsProxy } from './createOptionsProxy';
|
|
6
|
-
type AnyTRPCClient = inferRouterClient<AnyTRPCRouter>;
|
|
7
6
|
export declare function createTRPCContext<TRouter extends AnyTRPCRouter>(): {
|
|
8
7
|
TRPCProvider: (props: Readonly<{
|
|
9
8
|
children: React.ReactNode;
|
|
10
9
|
queryClient: QueryClient;
|
|
11
|
-
trpcClient:
|
|
10
|
+
trpcClient: CreateTRPCClient<TRouter>;
|
|
12
11
|
}>) => React.JSX.Element;
|
|
13
12
|
useTRPC: () => TRPCOptionsProxy<TRouter>;
|
|
14
13
|
};
|
|
15
|
-
export {};
|
|
16
14
|
//# sourceMappingURL=Context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/internals/Context.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/internals/Context.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,aAAa;0BAMpD,QAAQ,CAAC;QACd,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;QAC1B,WAAW,EAAE,WAAW,CAAC;QACzB,UAAU,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;KACvC,CAAC;;EA0BL"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { DataTag } from '@tanstack/react-query';
|
|
1
2
|
import { type QueryClient, type QueryFilters } from '@tanstack/react-query';
|
|
2
3
|
import { TRPCUntypedClient, type CreateTRPCClient } from '@trpc/client';
|
|
3
4
|
import { type AnyProcedure, type inferProcedureInput, type inferRouterContext, type inferTransformedProcedureOutput, type ProcedureType } from '@trpc/server';
|
|
@@ -20,7 +21,7 @@ export interface DecorateQueryKeyable {
|
|
|
20
21
|
*
|
|
21
22
|
* @see https://tanstack.com/query/latest/docs/framework/react/guides/filters
|
|
22
23
|
*/
|
|
23
|
-
queryFilter: () => QueryFilters;
|
|
24
|
+
queryFilter: (input?: undefined, filters?: QueryFilters) => QueryFilters;
|
|
24
25
|
}
|
|
25
26
|
export type InferInput<TProcedure extends DecorateQueryProcedure<any> | DecorateMutationProcedure<any>> = TProcedure['~types']['input'];
|
|
26
27
|
export type InferOutput<TProcedure extends DecorateQueryProcedure<any> | DecorateMutationProcedure<any>> = TProcedure['~types']['output'];
|
|
@@ -31,6 +32,7 @@ export interface DecorateQueryProcedure<TDef extends ResolverDef> {
|
|
|
31
32
|
'~types': {
|
|
32
33
|
input: TDef['input'];
|
|
33
34
|
output: TDef['output'];
|
|
35
|
+
errorShape: TDef['errorShape'];
|
|
34
36
|
};
|
|
35
37
|
/**
|
|
36
38
|
* @see https://tanstack.com/query/latest/docs/framework/react/reference/queryOptions#queryoptions
|
|
@@ -45,13 +47,13 @@ export interface DecorateQueryProcedure<TDef extends ResolverDef> {
|
|
|
45
47
|
*
|
|
46
48
|
* @see https://tanstack.com/query/latest/docs/framework/react/guides/query-keys
|
|
47
49
|
*/
|
|
48
|
-
queryKey: (input?: TDef['input']) => TRPCQueryKey
|
|
50
|
+
queryKey: (input?: TDef['input']) => DataTag<TRPCQueryKey, TDef['output'], TDef['errorShape']>;
|
|
49
51
|
/**
|
|
50
52
|
* Calculate a Tanstack Query Filter for a Query Procedure
|
|
51
53
|
*
|
|
52
54
|
* @see https://tanstack.com/query/latest/docs/framework/react/guides/filters
|
|
53
55
|
*/
|
|
54
|
-
queryFilter: (input?: TDef['input']) => QueryFilters
|
|
56
|
+
queryFilter: (input?: TDef['input'], filters?: QueryFilters<TDef['output'], TDef['errorShape']>) => QueryFilters<TDef['output'], TDef['errorShape'], TDef['output'], DataTag<TRPCQueryKey, TDef['output'], TDef['errorShape']>>;
|
|
55
57
|
}
|
|
56
58
|
export interface DecorateMutationProcedure<TDef extends ResolverDef> {
|
|
57
59
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOptionsProxy.d.ts","sourceRoot":"","sources":["../../src/internals/createOptionsProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAEL,iBAAiB,EACjB,KAAK,gBAAgB,EAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,+BAA+B,EACpC,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,YAAY,EACb,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAEV,WAAW,EACX,eAAe,EACf,YAAY,EACb,MAAM,SAAS,CAAC;AAOjB,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,QAAQ,EAAE,MAAM,YAAY,CAAC;IAE7B;;;;OAIG;IACH,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"createOptionsProxy.d.ts","sourceRoot":"","sources":["../../src/internals/createOptionsProxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAEL,iBAAiB,EACjB,KAAK,gBAAgB,EAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,+BAA+B,EACpC,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,YAAY,EACb,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAEV,WAAW,EACX,eAAe,EACf,YAAY,EACb,MAAM,SAAS,CAAC;AAOjB,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,QAAQ,EAAE,MAAM,YAAY,CAAC;IAE7B;;;;OAIG;IACH,WAAW,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,YAAY,KAAK,YAAY,CAAC;CAC1E;AAED,MAAM,MAAM,UAAU,CACpB,UAAU,SACN,sBAAsB,CAAC,GAAG,CAAC,GAC3B,yBAAyB,CAAC,GAAG,CAAC,IAChC,UAAU,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC;AAElC,MAAM,MAAM,WAAW,CACrB,UAAU,SACN,sBAAsB,CAAC,GAAG,CAAC,GAC3B,yBAAyB,CAAC,GAAG,CAAC,IAChC,UAAU,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;AAEnC,MAAM,WAAW,sBAAsB,CAAC,IAAI,SAAS,WAAW;IAC9D;;OAEG;IACH,QAAQ,EAAE;QACR,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvB,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;KAChC,CAAC;IAEF;;OAEG;IACH,YAAY,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAErC;;OAEG;IACH,oBAAoB,EAAE,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAErD;;;;OAIG;IACH,QAAQ,EAAE,CACR,KAAK,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAElB,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAE/D;;;;OAIG;IACH,WAAW,EAAE,CACX,KAAK,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EACrB,OAAO,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,KACvD,YAAY,CACf,IAAI,CAAC,QAAQ,CAAC,EACd,IAAI,CAAC,YAAY,CAAC,EAClB,IAAI,CAAC,QAAQ,CAAC,EACd,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAC1D,CAAC;CACH;AAED,MAAM,WAAW,yBAAyB,CAAC,IAAI,SAAS,WAAW;IACjE;;OAEG;IACH,QAAQ,EAAE;QACR,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;KACxB,CAAC;IAEF;;OAEG;IACH,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAE3C;;OAEG;IACH,WAAW,EAAE,MAAM,eAAe,CAAC;CACpC;AAED,MAAM,WAAW,6BAA6B,CAAC,IAAI,SAAS,WAAW;IACrE;;OAEG;IACH,mBAAmB,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;CACpD;AAED,MAAM,MAAM,iBAAiB,CAC3B,KAAK,SAAS,aAAa,EAC3B,IAAI,SAAS,WAAW,IACtB,KAAK,SAAS,OAAO,GACrB,sBAAsB,CAAC,IAAI,CAAC,GAC5B,KAAK,SAAS,UAAU,GACtB,yBAAyB,CAAC,IAAI,CAAC,GAC/B,KAAK,SAAS,cAAc,GAC1B,6BAA6B,CAAC,IAAI,CAAC,GACnC,KAAK,CAAC;AAEd;;GAEG;AACH,MAAM,MAAM,6BAA6B,CACvC,KAAK,SAAS,YAAY,EAC1B,OAAO,SAAS,YAAY,IAC1B;KACD,IAAI,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,MAAM,MAAM,GACvD,MAAM,SAAS,YAAY,GACzB,6BAA6B,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,oBAAoB,GACnE,MAAM,SAAS,YAAY,GACzB,iBAAiB,CACf,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EACtB;QACE,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,EAAE,+BAA+B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACvD,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;QAClC,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;KACjC,CACF,GACD,KAAK,GACT,KAAK;CACV,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,OAAO,SAAS,SAAS,IACpD,6BAA6B,CAC3B,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,EACpC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAC1B,GACC,oBAAoB,CAAC;AAEzB,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;IAC/C,SAAS,CAAC,EAAE;QACV,SAAS,CAAC,EAAE,uBAAuB,CAAC;KACrC,CAAC;CACH;AAED,MAAM,WAAW,+BAA+B,CAAC,OAAO,SAAS,SAAS;IACxE,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EACC,kBAAkB,CAAC,OAAO,CAAC,GAC3B,CAAC,MAAM,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,+BAA+B,CAAC,OAAO,SAAS,SAAS;IACxE,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;CAChE;AAED,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,SAAS,IAC3D,2BAA2B,GACzB,CACI,+BAA+B,CAAC,OAAO,CAAC,GACxC,+BAA+B,CAAC,OAAO,CAAC,CAC3C,CAAC;AAkBN,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACrC,gBAAgB,CAAC,OAAO,CAAC,CA0F3B"}
|
|
@@ -41,19 +41,22 @@ function createTRPCOptionsProxy(opts) {
|
|
|
41
41
|
];
|
|
42
42
|
const utilName = path.pop();
|
|
43
43
|
const [arg1, arg2] = args;
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
function getQueryKey() {
|
|
45
|
+
const queryType = getQueryType(utilName);
|
|
46
|
+
return utils.getQueryKeyInternal(path, arg1, queryType ?? 'any');
|
|
47
|
+
}
|
|
46
48
|
const contextMap = {
|
|
47
49
|
'~types': undefined,
|
|
48
50
|
mutationKey: ()=>{
|
|
49
51
|
return utils.getMutationKeyInternal(path);
|
|
50
52
|
},
|
|
51
53
|
queryKey: ()=>{
|
|
52
|
-
return
|
|
54
|
+
return getQueryKey();
|
|
53
55
|
},
|
|
54
56
|
queryFilter: ()=>{
|
|
55
57
|
return {
|
|
56
|
-
|
|
58
|
+
...arg2,
|
|
59
|
+
queryKey: getQueryKey()
|
|
57
60
|
};
|
|
58
61
|
},
|
|
59
62
|
infiniteQueryOptions: ()=>{
|
|
@@ -61,7 +64,7 @@ function createTRPCOptionsProxy(opts) {
|
|
|
61
64
|
opts: arg2,
|
|
62
65
|
path,
|
|
63
66
|
queryClient: opts.queryClient,
|
|
64
|
-
queryKey:
|
|
67
|
+
queryKey: getQueryKey(),
|
|
65
68
|
query: callIt('query')
|
|
66
69
|
});
|
|
67
70
|
},
|
|
@@ -70,7 +73,7 @@ function createTRPCOptionsProxy(opts) {
|
|
|
70
73
|
opts: arg2,
|
|
71
74
|
path,
|
|
72
75
|
queryClient: opts.queryClient,
|
|
73
|
-
queryKey:
|
|
76
|
+
queryKey: getQueryKey(),
|
|
74
77
|
query: callIt('query')
|
|
75
78
|
});
|
|
76
79
|
},
|
|
@@ -87,7 +90,7 @@ function createTRPCOptionsProxy(opts) {
|
|
|
87
90
|
return subscriptionOptions.trpcSubscriptionOptions({
|
|
88
91
|
opts: arg2,
|
|
89
92
|
path,
|
|
90
|
-
queryKey:
|
|
93
|
+
queryKey: getQueryKey(),
|
|
91
94
|
subscribe: callIt('subscription')
|
|
92
95
|
});
|
|
93
96
|
}
|
|
@@ -5,7 +5,7 @@ import { trpcInfiniteQueryOptions } from './infiniteQueryOptions.mjs';
|
|
|
5
5
|
import { trpcMutationOptions } from './mutationOptions.mjs';
|
|
6
6
|
import { trpcQueryOptions } from './queryOptions.mjs';
|
|
7
7
|
import { trpcSubscriptionOptions } from './subscriptionOptions.mjs';
|
|
8
|
-
import {
|
|
8
|
+
import { getMutationKeyInternal, unwrapLazyArg, getQueryKeyInternal } from './utils.mjs';
|
|
9
9
|
|
|
10
10
|
function getQueryType(method) {
|
|
11
11
|
const map = {
|
|
@@ -39,19 +39,22 @@ function createTRPCOptionsProxy(opts) {
|
|
|
39
39
|
];
|
|
40
40
|
const utilName = path.pop();
|
|
41
41
|
const [arg1, arg2] = args;
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
function getQueryKey() {
|
|
43
|
+
const queryType = getQueryType(utilName);
|
|
44
|
+
return getQueryKeyInternal(path, arg1, queryType ?? 'any');
|
|
45
|
+
}
|
|
44
46
|
const contextMap = {
|
|
45
47
|
'~types': undefined,
|
|
46
48
|
mutationKey: ()=>{
|
|
47
49
|
return getMutationKeyInternal(path);
|
|
48
50
|
},
|
|
49
51
|
queryKey: ()=>{
|
|
50
|
-
return
|
|
52
|
+
return getQueryKey();
|
|
51
53
|
},
|
|
52
54
|
queryFilter: ()=>{
|
|
53
55
|
return {
|
|
54
|
-
|
|
56
|
+
...arg2,
|
|
57
|
+
queryKey: getQueryKey()
|
|
55
58
|
};
|
|
56
59
|
},
|
|
57
60
|
infiniteQueryOptions: ()=>{
|
|
@@ -59,7 +62,7 @@ function createTRPCOptionsProxy(opts) {
|
|
|
59
62
|
opts: arg2,
|
|
60
63
|
path,
|
|
61
64
|
queryClient: opts.queryClient,
|
|
62
|
-
queryKey:
|
|
65
|
+
queryKey: getQueryKey(),
|
|
63
66
|
query: callIt('query')
|
|
64
67
|
});
|
|
65
68
|
},
|
|
@@ -68,7 +71,7 @@ function createTRPCOptionsProxy(opts) {
|
|
|
68
71
|
opts: arg2,
|
|
69
72
|
path,
|
|
70
73
|
queryClient: opts.queryClient,
|
|
71
|
-
queryKey:
|
|
74
|
+
queryKey: getQueryKey(),
|
|
72
75
|
query: callIt('query')
|
|
73
76
|
});
|
|
74
77
|
},
|
|
@@ -85,7 +88,7 @@ function createTRPCOptionsProxy(opts) {
|
|
|
85
88
|
return trpcSubscriptionOptions({
|
|
86
89
|
opts: arg2,
|
|
87
90
|
path,
|
|
88
|
-
queryKey:
|
|
91
|
+
queryKey: getQueryKey(),
|
|
89
92
|
subscribe: callIt('subscription')
|
|
90
93
|
});
|
|
91
94
|
}
|
|
@@ -8,21 +8,21 @@ interface UndefinedTRPCInfiniteQueryOptionsIn<TInput, TQueryFnData, TData, TErro
|
|
|
8
8
|
initialCursor?: NonNullable<ExtractCursorType<TInput>> | null;
|
|
9
9
|
}
|
|
10
10
|
interface UndefinedTRPCInfiniteQueryOptionsOut<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UndefinedInitialDataInfiniteOptions<TQueryFnData, TError, InfiniteData<TData, NonNullable<ExtractCursorType<TInput>> | null>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, 'initialPageParam'>, TRPCQueryOptionsResult {
|
|
11
|
-
queryKey: DataTag<TRPCQueryKey, TData>;
|
|
11
|
+
queryKey: DataTag<TRPCQueryKey, TData, TError>;
|
|
12
12
|
initialPageParam: NonNullable<ExtractCursorType<TInput>> | null;
|
|
13
13
|
}
|
|
14
14
|
interface DefinedTRPCInfiniteQueryOptionsIn<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, InfiniteData<TData, NonNullable<ExtractCursorType<TInput>> | null>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, ReservedOptions>, TRPCQueryBaseOptions {
|
|
15
15
|
initialCursor?: NonNullable<ExtractCursorType<TInput>> | null;
|
|
16
16
|
}
|
|
17
17
|
interface DefinedTRPCInfiniteQueryOptionsOut<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, InfiniteData<TData, NonNullable<ExtractCursorType<TInput>> | null>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, 'initialPageParam'>, TRPCQueryOptionsResult {
|
|
18
|
-
queryKey: DataTag<TRPCQueryKey, TData>;
|
|
18
|
+
queryKey: DataTag<TRPCQueryKey, TData, TError>;
|
|
19
19
|
initialPageParam: NonNullable<ExtractCursorType<TInput>> | null;
|
|
20
20
|
}
|
|
21
21
|
interface UnusedSkipTokenTRPCInfiniteQueryOptionsIn<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UnusedSkipTokenInfiniteOptions<TQueryFnData, TError, InfiniteData<TData, NonNullable<ExtractCursorType<TInput>> | null>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, ReservedOptions>, TRPCQueryBaseOptions {
|
|
22
22
|
initialCursor?: NonNullable<ExtractCursorType<TInput>> | null;
|
|
23
23
|
}
|
|
24
24
|
interface UnusedSkipTokenTRPCInfiniteQueryOptionsOut<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UnusedSkipTokenInfiniteOptions<TQueryFnData, TError, InfiniteData<TData, NonNullable<ExtractCursorType<TInput>> | null>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, 'initialPageParam'>, TRPCQueryOptionsResult {
|
|
25
|
-
queryKey: DataTag<TRPCQueryKey, TData>;
|
|
25
|
+
queryKey: DataTag<TRPCQueryKey, TData, TError>;
|
|
26
26
|
initialPageParam: NonNullable<ExtractCursorType<TInput>> | null;
|
|
27
27
|
}
|
|
28
28
|
export interface TRPCInfiniteQueryOptions<TDef extends ResolverDef> {
|
|
@@ -39,7 +39,10 @@ export declare function trpcInfiniteQueryOptions(args: {
|
|
|
39
39
|
}): import("@tanstack/react-query").UseInfiniteQueryOptions<unknown, unknown, InfiniteData<unknown, {} | null>, unknown, TRPCQueryKey, {} | null> & {
|
|
40
40
|
initialData?: InfiniteData<unknown, {} | null> | import("@tanstack/react-query").InitialDataFunction<InfiniteData<unknown, {} | null>> | undefined;
|
|
41
41
|
} & {
|
|
42
|
-
queryKey:
|
|
42
|
+
queryKey: TRPCQueryKey & {
|
|
43
|
+
[dataTagSymbol]: InfiniteData<unknown, unknown>;
|
|
44
|
+
[dataTagErrorSymbol]: unknown;
|
|
45
|
+
};
|
|
43
46
|
} & {
|
|
44
47
|
trpc: {
|
|
45
48
|
path: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infiniteQueryOptions.d.ts","sourceRoot":"","sources":["../../src/internals/infiniteQueryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,iCAAiC,EACjC,YAAY,EAEZ,mCAAmC,EACnC,8BAA8B,EAC/B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAGL,KAAK,WAAW,EAChB,KAAK,SAAS,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EACV,iBAAiB,EACjB,WAAW,EACX,oBAAoB,EACpB,YAAY,EACZ,sBAAsB,EACvB,MAAM,SAAS,CAAC;AAGjB,KAAK,eAAe,GAChB,UAAU,GACV,SAAS,GACT,aAAa,GACb,WAAW,GACX,kBAAkB,CAAC;AAEvB,UAAU,mCAAmC,CAC3C,MAAM,EACN,YAAY,EACZ,KAAK,EACL,MAAM,CACN,SAAQ,gBAAgB,CACpB,mCAAmC,CACjC,YAAY,EACZ,MAAM,EACN,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,EAClE,YAAY,EACZ,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAC9C,EACD,eAAe,CAChB,EACD,oBAAoB;IACtB,aAAa,CAAC,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;CAC/D;AAED,UAAU,oCAAoC,CAC5C,MAAM,EACN,YAAY,EACZ,KAAK,EACL,MAAM,CACN,SAAQ,gBAAgB,CACpB,mCAAmC,CACjC,YAAY,EACZ,MAAM,EACN,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,EAClE,YAAY,EACZ,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAC9C,EACD,kBAAkB,CACnB,EACD,sBAAsB;IACxB,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"infiniteQueryOptions.d.ts","sourceRoot":"","sources":["../../src/internals/infiniteQueryOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,17 +7,17 @@ type ReservedOptions = 'queryKey' | 'queryFn' | 'queryHashFn' | 'queryHash';
|
|
|
7
7
|
interface UndefinedTRPCQueryOptionsIn<TQueryFnData, TData, TError> extends DistributiveOmit<UndefinedInitialDataOptions<coerceAsyncIterableToArray<TQueryFnData>, TError, coerceAsyncIterableToArray<TData>, TRPCQueryKey>, ReservedOptions>, TRPCQueryBaseOptions {
|
|
8
8
|
}
|
|
9
9
|
interface UndefinedTRPCQueryOptionsOut<TQueryFnData, TOutput, TError> extends UndefinedInitialDataOptions<coerceAsyncIterableToArray<TQueryFnData>, TError, coerceAsyncIterableToArray<TOutput>, TRPCQueryKey>, TRPCQueryOptionsResult {
|
|
10
|
-
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TOutput
|
|
10
|
+
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TOutput>, TError>;
|
|
11
11
|
}
|
|
12
12
|
interface DefinedTRPCQueryOptionsIn<TQueryFnData, TData, TError> extends DistributiveOmit<DefinedInitialDataOptions<coerceAsyncIterableToArray<TQueryFnData>, TError, coerceAsyncIterableToArray<TData>, TRPCQueryKey>, ReservedOptions>, TRPCQueryBaseOptions {
|
|
13
13
|
}
|
|
14
14
|
interface DefinedTRPCQueryOptionsOut<TQueryFnData, TData, TError> extends DefinedInitialDataOptions<coerceAsyncIterableToArray<TQueryFnData>, TError, coerceAsyncIterableToArray<TData>, TRPCQueryKey>, TRPCQueryOptionsResult {
|
|
15
|
-
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TData
|
|
15
|
+
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TData>, TError>;
|
|
16
16
|
}
|
|
17
17
|
interface UnusedSkipTokenTRPCQueryOptionsIn<TQueryFnData, TData, TError> extends DistributiveOmit<UnusedSkipTokenOptions<coerceAsyncIterableToArray<TQueryFnData>, TError, coerceAsyncIterableToArray<TData>, TRPCQueryKey>, ReservedOptions>, TRPCQueryBaseOptions {
|
|
18
18
|
}
|
|
19
19
|
interface UnusedSkipTokenTRPCQueryOptionsOut<TQueryFnData, TOutput, TError> extends UnusedSkipTokenOptions<coerceAsyncIterableToArray<TQueryFnData>, TError, coerceAsyncIterableToArray<TOutput>, TRPCQueryKey>, TRPCQueryOptionsResult {
|
|
20
|
-
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TOutput
|
|
20
|
+
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TOutput>, TError>;
|
|
21
21
|
}
|
|
22
22
|
export interface TRPCQueryOptions<TDef extends ResolverDef> {
|
|
23
23
|
<TQueryFnData extends TDef['output'], TData = TQueryFnData>(input: TDef['input'] | SkipToken, opts: DefinedTRPCQueryOptionsIn<TQueryFnData, TData, TRPCClientErrorLike<{
|
|
@@ -51,7 +51,10 @@ export declare function trpcQueryOptions(args: {
|
|
|
51
51
|
}): import("@tanstack/react-query").UseQueryOptions<unknown, unknown, unknown, TRPCQueryKey> & {
|
|
52
52
|
initialData?: unknown;
|
|
53
53
|
} & {
|
|
54
|
-
queryKey:
|
|
54
|
+
queryKey: TRPCQueryKey & {
|
|
55
|
+
[dataTagSymbol]: unknown;
|
|
56
|
+
[dataTagErrorSymbol]: unknown;
|
|
57
|
+
};
|
|
55
58
|
} & {
|
|
56
59
|
trpc: {
|
|
57
60
|
path: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryOptions.d.ts","sourceRoot":"","sources":["../../src/internals/queryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,yBAAyB,EACzB,WAAW,EAEX,2BAA2B,EAC3B,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,KAAK,EACV,0BAA0B,EAC1B,gBAAgB,EACjB,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EACV,WAAW,EACX,oBAAoB,EACpB,YAAY,EACZ,sBAAsB,EACvB,MAAM,SAAS,CAAC;AAQjB,KAAK,eAAe,GAAG,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC;AAE5E,UAAU,2BAA2B,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,CAC/D,SAAQ,gBAAgB,CACpB,2BAA2B,CACzB,0BAA0B,CAAC,YAAY,CAAC,EACxC,MAAM,EACN,0BAA0B,CAAC,KAAK,CAAC,EACjC,YAAY,CACb,EACD,eAAe,CAChB,EACD,oBAAoB;CAAG;AAE3B,UAAU,4BAA4B,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAClE,SAAQ,2BAA2B,CAC/B,0BAA0B,CAAC,YAAY,CAAC,EACxC,MAAM,EACN,0BAA0B,CAAC,OAAO,CAAC,EACnC,YAAY,CACb,EACD,sBAAsB;IACxB,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"queryOptions.d.ts","sourceRoot":"","sources":["../../src/internals/queryOptions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/tanstack-react-query",
|
|
3
|
-
"version": "0.0.0-alpha.
|
|
3
|
+
"version": "0.0.0-alpha.3",
|
|
4
4
|
"description": "Tanstack React Query Integration for tRPC",
|
|
5
5
|
"author": "juliusmarminge",
|
|
6
6
|
"license": "MIT",
|
|
@@ -39,24 +39,23 @@
|
|
|
39
39
|
"@typescript-eslint/prefer-function-type": "off"
|
|
40
40
|
}
|
|
41
41
|
},
|
|
42
|
-
"dependencies": {},
|
|
43
42
|
"peerDependencies": {
|
|
44
|
-
"@tanstack/react-query": "^5.
|
|
43
|
+
"@tanstack/react-query": "^5.62.9",
|
|
45
44
|
"@trpc/client": "10.45.1",
|
|
46
45
|
"@trpc/server": "^10.45.1",
|
|
47
46
|
"react": ">=18.2.0",
|
|
48
47
|
"react-dom": ">=18.2.0",
|
|
49
|
-
"typescript": ">=5.
|
|
48
|
+
"typescript": ">=5.7.2"
|
|
50
49
|
},
|
|
51
50
|
"devDependencies": {
|
|
52
|
-
"@tanstack/react-query": "^5.
|
|
51
|
+
"@tanstack/react-query": "^5.62.9",
|
|
53
52
|
"@trpc/client": "10.45.1",
|
|
54
53
|
"@trpc/server": "^10.45.1",
|
|
55
54
|
"@types/node": "^20.10.0",
|
|
56
55
|
"@types/react": "^18.3.1",
|
|
57
56
|
"eslint": "^8.57.0",
|
|
58
57
|
"konn": "^0.7.0",
|
|
59
|
-
"react": "^
|
|
58
|
+
"react": "^19.0.0",
|
|
60
59
|
"react-dom": "^18.3.1",
|
|
61
60
|
"rollup": "^4.9.5",
|
|
62
61
|
"tsx": "^4.0.0",
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { DataTag } from '@tanstack/react-query';
|
|
1
2
|
import { type QueryClient, type QueryFilters } from '@tanstack/react-query';
|
|
2
3
|
import {
|
|
3
4
|
getUntypedClient,
|
|
@@ -59,7 +60,7 @@ export interface DecorateQueryKeyable {
|
|
|
59
60
|
*
|
|
60
61
|
* @see https://tanstack.com/query/latest/docs/framework/react/guides/filters
|
|
61
62
|
*/
|
|
62
|
-
queryFilter: () => QueryFilters;
|
|
63
|
+
queryFilter: (input?: undefined, filters?: QueryFilters) => QueryFilters;
|
|
63
64
|
}
|
|
64
65
|
|
|
65
66
|
export type InferInput<
|
|
@@ -81,6 +82,7 @@ export interface DecorateQueryProcedure<TDef extends ResolverDef> {
|
|
|
81
82
|
'~types': {
|
|
82
83
|
input: TDef['input'];
|
|
83
84
|
output: TDef['output'];
|
|
85
|
+
errorShape: TDef['errorShape'];
|
|
84
86
|
};
|
|
85
87
|
|
|
86
88
|
/**
|
|
@@ -98,14 +100,25 @@ export interface DecorateQueryProcedure<TDef extends ResolverDef> {
|
|
|
98
100
|
*
|
|
99
101
|
* @see https://tanstack.com/query/latest/docs/framework/react/guides/query-keys
|
|
100
102
|
*/
|
|
101
|
-
queryKey: (
|
|
103
|
+
queryKey: (
|
|
104
|
+
input?: TDef['input'],
|
|
105
|
+
// tslint seems to be wrong here, the type is correct
|
|
106
|
+
) => DataTag<TRPCQueryKey, TDef['output'], TDef['errorShape']>;
|
|
102
107
|
|
|
103
108
|
/**
|
|
104
109
|
* Calculate a Tanstack Query Filter for a Query Procedure
|
|
105
110
|
*
|
|
106
111
|
* @see https://tanstack.com/query/latest/docs/framework/react/guides/filters
|
|
107
112
|
*/
|
|
108
|
-
queryFilter: (
|
|
113
|
+
queryFilter: (
|
|
114
|
+
input?: TDef['input'],
|
|
115
|
+
filters?: QueryFilters<TDef['output'], TDef['errorShape']>,
|
|
116
|
+
) => QueryFilters<
|
|
117
|
+
TDef['output'],
|
|
118
|
+
TDef['errorShape'],
|
|
119
|
+
TDef['output'],
|
|
120
|
+
DataTag<TRPCQueryKey, TDef['output'], TDef['errorShape']>
|
|
121
|
+
>;
|
|
109
122
|
}
|
|
110
123
|
|
|
111
124
|
export interface DecorateMutationProcedure<TDef extends ResolverDef> {
|
|
@@ -250,8 +263,11 @@ export function createTRPCOptionsProxy<TRouter extends AnyRouter>(
|
|
|
250
263
|
const utilName = path.pop() as UtilsMethods;
|
|
251
264
|
const [arg1, arg2] = args as any[];
|
|
252
265
|
|
|
253
|
-
|
|
254
|
-
|
|
266
|
+
function getQueryKey() {
|
|
267
|
+
const queryType = getQueryType(utilName);
|
|
268
|
+
|
|
269
|
+
return getQueryKeyInternal(path, arg1, queryType ?? 'any');
|
|
270
|
+
}
|
|
255
271
|
|
|
256
272
|
const contextMap: Record<UtilsMethods, () => unknown> = {
|
|
257
273
|
'~types': undefined as any,
|
|
@@ -260,11 +276,12 @@ export function createTRPCOptionsProxy<TRouter extends AnyRouter>(
|
|
|
260
276
|
return getMutationKeyInternal(path);
|
|
261
277
|
},
|
|
262
278
|
queryKey: () => {
|
|
263
|
-
return
|
|
279
|
+
return getQueryKey();
|
|
264
280
|
},
|
|
265
281
|
queryFilter: (): QueryFilters => {
|
|
266
282
|
return {
|
|
267
|
-
|
|
283
|
+
...arg2,
|
|
284
|
+
queryKey: getQueryKey(),
|
|
268
285
|
};
|
|
269
286
|
},
|
|
270
287
|
infiniteQueryOptions: () => {
|
|
@@ -272,7 +289,7 @@ export function createTRPCOptionsProxy<TRouter extends AnyRouter>(
|
|
|
272
289
|
opts: arg2,
|
|
273
290
|
path,
|
|
274
291
|
queryClient: opts.queryClient,
|
|
275
|
-
queryKey:
|
|
292
|
+
queryKey: getQueryKey(),
|
|
276
293
|
query: callIt('query'),
|
|
277
294
|
});
|
|
278
295
|
},
|
|
@@ -281,7 +298,7 @@ export function createTRPCOptionsProxy<TRouter extends AnyRouter>(
|
|
|
281
298
|
opts: arg2,
|
|
282
299
|
path,
|
|
283
300
|
queryClient: opts.queryClient,
|
|
284
|
-
queryKey:
|
|
301
|
+
queryKey: getQueryKey(),
|
|
285
302
|
query: callIt('query'),
|
|
286
303
|
});
|
|
287
304
|
},
|
|
@@ -298,7 +315,7 @@ export function createTRPCOptionsProxy<TRouter extends AnyRouter>(
|
|
|
298
315
|
return trpcSubscriptionOptions({
|
|
299
316
|
opts: arg2,
|
|
300
317
|
path,
|
|
301
|
-
queryKey:
|
|
318
|
+
queryKey: getQueryKey(),
|
|
302
319
|
subscribe: callIt('subscription'),
|
|
303
320
|
});
|
|
304
321
|
},
|
|
@@ -65,7 +65,7 @@ interface UndefinedTRPCInfiniteQueryOptionsOut<
|
|
|
65
65
|
'initialPageParam'
|
|
66
66
|
>,
|
|
67
67
|
TRPCQueryOptionsResult {
|
|
68
|
-
queryKey: DataTag<TRPCQueryKey, TData>;
|
|
68
|
+
queryKey: DataTag<TRPCQueryKey, TData, TError>;
|
|
69
69
|
initialPageParam: NonNullable<ExtractCursorType<TInput>> | null;
|
|
70
70
|
}
|
|
71
71
|
|
|
@@ -100,7 +100,7 @@ interface DefinedTRPCInfiniteQueryOptionsOut<
|
|
|
100
100
|
'initialPageParam'
|
|
101
101
|
>,
|
|
102
102
|
TRPCQueryOptionsResult {
|
|
103
|
-
queryKey: DataTag<TRPCQueryKey, TData>;
|
|
103
|
+
queryKey: DataTag<TRPCQueryKey, TData, TError>;
|
|
104
104
|
initialPageParam: NonNullable<ExtractCursorType<TInput>> | null;
|
|
105
105
|
}
|
|
106
106
|
|
|
@@ -139,7 +139,7 @@ interface UnusedSkipTokenTRPCInfiniteQueryOptionsOut<
|
|
|
139
139
|
'initialPageParam'
|
|
140
140
|
>,
|
|
141
141
|
TRPCQueryOptionsResult {
|
|
142
|
-
queryKey: DataTag<TRPCQueryKey, TData>;
|
|
142
|
+
queryKey: DataTag<TRPCQueryKey, TData, TError>;
|
|
143
143
|
initialPageParam: NonNullable<ExtractCursorType<TInput>> | null;
|
|
144
144
|
}
|
|
145
145
|
|
|
@@ -48,7 +48,7 @@ interface UndefinedTRPCQueryOptionsOut<TQueryFnData, TOutput, TError>
|
|
|
48
48
|
TRPCQueryKey
|
|
49
49
|
>,
|
|
50
50
|
TRPCQueryOptionsResult {
|
|
51
|
-
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TOutput
|
|
51
|
+
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TOutput>, TError>;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
interface DefinedTRPCQueryOptionsIn<TQueryFnData, TData, TError>
|
|
@@ -71,7 +71,7 @@ interface DefinedTRPCQueryOptionsOut<TQueryFnData, TData, TError>
|
|
|
71
71
|
TRPCQueryKey
|
|
72
72
|
>,
|
|
73
73
|
TRPCQueryOptionsResult {
|
|
74
|
-
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TData
|
|
74
|
+
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TData>, TError>;
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
interface UnusedSkipTokenTRPCQueryOptionsIn<TQueryFnData, TData, TError>
|
|
@@ -94,7 +94,7 @@ interface UnusedSkipTokenTRPCQueryOptionsOut<TQueryFnData, TOutput, TError>
|
|
|
94
94
|
TRPCQueryKey
|
|
95
95
|
>,
|
|
96
96
|
TRPCQueryOptionsResult {
|
|
97
|
-
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TOutput
|
|
97
|
+
queryKey: DataTag<TRPCQueryKey, coerceAsyncIterableToArray<TOutput>, TError>;
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
export interface TRPCQueryOptions<TDef extends ResolverDef> {
|