@trpc/react-query 11.0.0-rc.377 → 11.0.0-rc.382
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/bundle-analysis.json +19 -19
- package/dist/shared/hooks/createHooksInternal.d.ts.map +1 -1
- package/dist/shared/hooks/createHooksInternal.js +24 -2
- package/dist/shared/hooks/createHooksInternal.mjs +24 -2
- package/dist/shared/hooks/types.d.ts +3 -1
- package/dist/shared/hooks/types.d.ts.map +1 -1
- package/package.json +7 -6
- package/src/shared/hooks/createHooksInternal.tsx +29 -2
- package/src/shared/hooks/types.ts +7 -1
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
|
-
"bundleSize":
|
|
3
|
-
"bundleOrigSize":
|
|
4
|
-
"bundleReduction":
|
|
2
|
+
"bundleSize": 29431,
|
|
3
|
+
"bundleOrigSize": 63440,
|
|
4
|
+
"bundleReduction": 53.61,
|
|
5
5
|
"modules": [
|
|
6
6
|
{
|
|
7
7
|
"id": "/src/shared/hooks/createHooksInternal.tsx",
|
|
8
|
-
"size":
|
|
9
|
-
"origSize":
|
|
8
|
+
"size": 13743,
|
|
9
|
+
"origSize": 15767,
|
|
10
10
|
"renderedExports": [
|
|
11
11
|
"createRootHooks"
|
|
12
12
|
],
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
"dependents": [
|
|
15
15
|
"/src/createTRPCReact.tsx"
|
|
16
16
|
],
|
|
17
|
-
"percent":
|
|
18
|
-
"reduction":
|
|
17
|
+
"percent": 46.7,
|
|
18
|
+
"reduction": 12.84
|
|
19
19
|
},
|
|
20
20
|
{
|
|
21
21
|
"id": "/src/utils/createUtilityFunctions.ts",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"/src/createTRPCQueryUtils.tsx",
|
|
30
30
|
"/src/shared/hooks/createHooksInternal.tsx"
|
|
31
31
|
],
|
|
32
|
-
"percent":
|
|
32
|
+
"percent": 12.85,
|
|
33
33
|
"reduction": 6.34
|
|
34
34
|
},
|
|
35
35
|
{
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"dependents": [
|
|
44
44
|
"/src/server/index.ts"
|
|
45
45
|
],
|
|
46
|
-
"percent": 12.
|
|
46
|
+
"percent": 12.48,
|
|
47
47
|
"reduction": 50.38
|
|
48
48
|
},
|
|
49
49
|
{
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"dependents": [
|
|
60
60
|
"/src/shared/index.ts"
|
|
61
61
|
],
|
|
62
|
-
"percent":
|
|
62
|
+
"percent": 9.75,
|
|
63
63
|
"reduction": 74.38
|
|
64
64
|
},
|
|
65
65
|
{
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"/src/shared/proxy/useQueriesProxy.ts",
|
|
79
79
|
"/src/shared/hooks/createHooksInternal.tsx"
|
|
80
80
|
],
|
|
81
|
-
"percent":
|
|
81
|
+
"percent": 6.79,
|
|
82
82
|
"reduction": 42.49
|
|
83
83
|
},
|
|
84
84
|
{
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
"dependents": [
|
|
94
94
|
"/src/index.ts"
|
|
95
95
|
],
|
|
96
|
-
"percent": 2.
|
|
96
|
+
"percent": 2.89,
|
|
97
97
|
"reduction": 89.28
|
|
98
98
|
},
|
|
99
99
|
{
|
|
@@ -107,7 +107,7 @@
|
|
|
107
107
|
"dependents": [
|
|
108
108
|
"/src/shared/index.ts"
|
|
109
109
|
],
|
|
110
|
-
"percent": 2.
|
|
110
|
+
"percent": 2.74,
|
|
111
111
|
"reduction": 23.16
|
|
112
112
|
},
|
|
113
113
|
{
|
|
@@ -122,7 +122,7 @@
|
|
|
122
122
|
"/src/shared/index.ts",
|
|
123
123
|
"/src/shared/hooks/createHooksInternal.tsx"
|
|
124
124
|
],
|
|
125
|
-
"percent": 1.
|
|
125
|
+
"percent": 1.93,
|
|
126
126
|
"reduction": 82.03
|
|
127
127
|
},
|
|
128
128
|
{
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
"/src/shared/hooks/createHooksInternal.tsx",
|
|
139
139
|
"/src/utils/createUtilityFunctions.ts"
|
|
140
140
|
],
|
|
141
|
-
"percent": 1.
|
|
141
|
+
"percent": 1.61,
|
|
142
142
|
"reduction": 17.31
|
|
143
143
|
},
|
|
144
144
|
{
|
|
@@ -152,7 +152,7 @@
|
|
|
152
152
|
"dependents": [
|
|
153
153
|
"/src/shared/hooks/createHooksInternal.tsx"
|
|
154
154
|
],
|
|
155
|
-
"percent": 0.
|
|
155
|
+
"percent": 0.75,
|
|
156
156
|
"reduction": 36.21
|
|
157
157
|
},
|
|
158
158
|
{
|
|
@@ -166,7 +166,7 @@
|
|
|
166
166
|
"dependents": [
|
|
167
167
|
"/src/index.ts"
|
|
168
168
|
],
|
|
169
|
-
"percent": 0.
|
|
169
|
+
"percent": 0.55,
|
|
170
170
|
"reduction": 66.6
|
|
171
171
|
},
|
|
172
172
|
{
|
|
@@ -184,7 +184,7 @@
|
|
|
184
184
|
"/src/shared/proxy/utilsProxy.ts",
|
|
185
185
|
"/src/shared/hooks/createHooksInternal.tsx"
|
|
186
186
|
],
|
|
187
|
-
"percent": 0.
|
|
187
|
+
"percent": 0.52,
|
|
188
188
|
"reduction": 97.59
|
|
189
189
|
},
|
|
190
190
|
{
|
|
@@ -198,7 +198,7 @@
|
|
|
198
198
|
"dependents": [
|
|
199
199
|
"/src/shared/index.ts"
|
|
200
200
|
],
|
|
201
|
-
"percent": 0.
|
|
201
|
+
"percent": 0.44,
|
|
202
202
|
"reduction": 74.9
|
|
203
203
|
},
|
|
204
204
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createHooksInternal.d.ts","sourceRoot":"","sources":["../../../src/shared/hooks/createHooksInternal.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"createHooksInternal.d.ts","sourceRoot":"","sources":["../../../src/shared/hooks/createHooksInternal.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAG1E,OAAO,KAAK,EAAY,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAM1E,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACvB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,sBAAsB,EAAuB,MAAM,UAAU,CAAC;AAC5E,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EAEZ,2BAA2B,EAC3B,0BAA0B,EAC1B,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EAClB,0BAA0B,EAC1B,mCAAmC,EACnC,kCAAkC,EAClC,2BAA2B,EAC3B,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,SAAS,SAAS,EACzB,WAAW,GAAG,OAAO,EACrB,MAAM,CAAC,EAAE,sBAAsB,CAAC,OAAO,CAAC;;;;;qBAmFhC,MAAM,EAAE,SACP,OAAO;6BAuFR,MAAM,EAAE,SACP,OAAO;;;wBAsCR,MAAM,EAAE;4BA0CR,MAAM,EAAE,SACP,OAAO;6BA6CR,MAAM,EAAE,SACP,OAAO;qCAyER,MAAM,EAAE,SACP,OAAO;EAsHjB;AAED;;;GAGG;AACH,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,WAAW,GAAG,OAAO,IACnB,UAAU,CAAC,OAAO,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var reactQuery = require('@tanstack/react-query');
|
|
4
4
|
var client = require('@trpc/client');
|
|
5
|
+
var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
|
|
5
6
|
var React = require('react');
|
|
6
7
|
var context = require('../../internals/context.js');
|
|
7
8
|
var getClientArgs = require('../../internals/getClientArgs.js');
|
|
@@ -109,7 +110,7 @@ var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React);
|
|
|
109
110
|
const hook = reactQuery.useQuery({
|
|
110
111
|
...ssrOpts,
|
|
111
112
|
queryKey: queryKey,
|
|
112
|
-
queryFn: isInputSkipToken ? input : (queryFunctionContext)=>{
|
|
113
|
+
queryFn: isInputSkipToken ? input : async (queryFunctionContext)=>{
|
|
113
114
|
const actualOpts = {
|
|
114
115
|
...ssrOpts,
|
|
115
116
|
trpc: {
|
|
@@ -119,7 +120,28 @@ var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React);
|
|
|
119
120
|
} : {}
|
|
120
121
|
}
|
|
121
122
|
};
|
|
122
|
-
|
|
123
|
+
const result = await client.query(...getClientArgs.getClientArgs(queryKey, actualOpts));
|
|
124
|
+
if (unstableCoreDoNotImport.isAsyncIterable(result)) {
|
|
125
|
+
const queryCache = queryClient.getQueryCache();
|
|
126
|
+
const query = queryCache.build(queryFunctionContext.queryKey, {
|
|
127
|
+
queryKey
|
|
128
|
+
});
|
|
129
|
+
query.setState({
|
|
130
|
+
data: [],
|
|
131
|
+
status: 'success'
|
|
132
|
+
});
|
|
133
|
+
const aggregate = [];
|
|
134
|
+
for await (const value of result){
|
|
135
|
+
aggregate.push(value);
|
|
136
|
+
query.setState({
|
|
137
|
+
data: [
|
|
138
|
+
...aggregate
|
|
139
|
+
]
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
return aggregate;
|
|
143
|
+
}
|
|
144
|
+
return result;
|
|
123
145
|
}
|
|
124
146
|
}, queryClient);
|
|
125
147
|
hook.trpc = useHookResult.useHookResult({
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { useQuery, useSuspenseQuery, useQueryClient, useMutation, hashKey, useInfiniteQuery, useSuspenseInfiniteQuery, useQueries, useSuspenseQueries, skipToken } from '@tanstack/react-query';
|
|
2
2
|
import { createTRPCUntypedClient } from '@trpc/client';
|
|
3
|
+
import { isAsyncIterable } from '@trpc/server/unstable-core-do-not-import';
|
|
3
4
|
import * as React from 'react';
|
|
4
5
|
import { TRPCContext } from '../../internals/context.mjs';
|
|
5
6
|
import { getClientArgs } from '../../internals/getClientArgs.mjs';
|
|
@@ -88,7 +89,7 @@ import { createUseQueries } from '../proxy/useQueriesProxy.mjs';
|
|
|
88
89
|
const hook = useQuery({
|
|
89
90
|
...ssrOpts,
|
|
90
91
|
queryKey: queryKey,
|
|
91
|
-
queryFn: isInputSkipToken ? input : (queryFunctionContext)=>{
|
|
92
|
+
queryFn: isInputSkipToken ? input : async (queryFunctionContext)=>{
|
|
92
93
|
const actualOpts = {
|
|
93
94
|
...ssrOpts,
|
|
94
95
|
trpc: {
|
|
@@ -98,7 +99,28 @@ import { createUseQueries } from '../proxy/useQueriesProxy.mjs';
|
|
|
98
99
|
} : {}
|
|
99
100
|
}
|
|
100
101
|
};
|
|
101
|
-
|
|
102
|
+
const result = await client.query(...getClientArgs(queryKey, actualOpts));
|
|
103
|
+
if (isAsyncIterable(result)) {
|
|
104
|
+
const queryCache = queryClient.getQueryCache();
|
|
105
|
+
const query = queryCache.build(queryFunctionContext.queryKey, {
|
|
106
|
+
queryKey
|
|
107
|
+
});
|
|
108
|
+
query.setState({
|
|
109
|
+
data: [],
|
|
110
|
+
status: 'success'
|
|
111
|
+
});
|
|
112
|
+
const aggregate = [];
|
|
113
|
+
for await (const value of result){
|
|
114
|
+
aggregate.push(value);
|
|
115
|
+
query.setState({
|
|
116
|
+
data: [
|
|
117
|
+
...aggregate
|
|
118
|
+
]
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
return aggregate;
|
|
122
|
+
}
|
|
123
|
+
return result;
|
|
102
124
|
}
|
|
103
125
|
}, queryClient);
|
|
104
126
|
hook.trpc = useHookResult({
|
|
@@ -58,10 +58,11 @@ export interface TRPCProviderProps<TRouter extends AnyRouter, TSSRContext> exten
|
|
|
58
58
|
export type TRPCProvider<TRouter extends AnyRouter, TSSRContext> = (props: TRPCProviderProps<TRouter, TSSRContext>) => JSX.Element;
|
|
59
59
|
export type UseDehydratedState<TRouter extends AnyRouter> = (client: TRPCUntypedClient<TRouter>, trpcState: DehydratedState | undefined) => DehydratedState | undefined;
|
|
60
60
|
export type CreateClient<TRouter extends AnyRouter> = (opts: CreateTRPCClientOptions<TRouter>) => TRPCUntypedClient<TRouter>;
|
|
61
|
+
type coerceAsyncIterableToArray<TValue> = TValue extends AsyncIterable<infer $Inferred> ? $Inferred[] : TValue;
|
|
61
62
|
/**
|
|
62
63
|
* @internal
|
|
63
64
|
*/
|
|
64
|
-
export type UseTRPCQueryResult<TData, TError> = TRPCHookResult & UseQueryResult<TData
|
|
65
|
+
export type UseTRPCQueryResult<TData, TError> = TRPCHookResult & UseQueryResult<coerceAsyncIterableToArray<TData>, TError>;
|
|
65
66
|
/**
|
|
66
67
|
* @internal
|
|
67
68
|
*/
|
|
@@ -101,4 +102,5 @@ export interface TRPCHookResult {
|
|
|
101
102
|
path: string;
|
|
102
103
|
};
|
|
103
104
|
}
|
|
105
|
+
export {};
|
|
104
106
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/shared/hooks/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/shared/hooks/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EACf,YAAY,EACZ,kCAAkC,EAClC,mBAAmB,EACnB,0BAA0B,EAC1B,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EACjB,cAAc,EACd,+BAA+B,EAC/B,8BAA8B,EAC9B,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EACjB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,MAAM,MAAM,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,IAAI;IACnD,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACvB,IAAI,EAAE,KAAK,CAAC;CACb,CAAC;AAEF,MAAM,WAAW,uBAEf,SAAQ,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC;IAC1C;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,IAAI,CAAC,EAAE,uBAAuB,CAAC;CAChC;AAED,MAAM,WAAW,mBAAmB,CAClC,OAAO,EACP,KAAK,EACL,MAAM,EACN,cAAc,GAAG,OAAO,CACxB,SAAQ,gBAAgB,CACpB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,CAAC,EAChE,UAAU,CACX,EACD,uBAAuB;CAAG;AAE9B,MAAM,WAAW,2BAA2B,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CACjE,SAAQ,gBAAgB,CACpB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,EACpD,UAAU,CACX,EACD,uBAAuB;CAAG;AAE9B,iBAAiB;AACjB,MAAM,WAAW,0BAA0B,CACzC,OAAO,EACP,KAAK,EACL,MAAM,EACN,cAAc,GAAG,OAAO,CACxB,SAAQ,gBAAgB,CACtB,mBAAmB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAC3D,UAAU,CACX;IACD,WAAW,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;CACnE;AAED,MAAM,WAAW,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAC7C,SAAQ,gBAAgB,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,UAAU,CAAC,EAC3E,uBAAuB;IACzB,QAAQ,EAAE,YAAY,CAAC;CACxB;AAED,MAAM,MAAM,iBAAiB,CAAC,MAAM,IAAI,MAAM,SAAS;IAAE,MAAM,CAAC,EAAE,GAAG,CAAA;CAAE,GACnE,MAAM,CAAC,QAAQ,CAAC,GAChB,OAAO,CAAC;AAEZ,MAAM,WAAW,2BAA2B,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAClE,SAAQ,gBAAgB,CACpB,uBAAuB,CACrB,OAAO,EACP,MAAM,EACN,OAAO,EACP,OAAO,EACP,GAAG,EACH,iBAAiB,CAAC,MAAM,CAAC,CAC1B,EACD,UAAU,GAAG,kBAAkB,CAChC,EACD,uBAAuB;IACzB,aAAa,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,mCAAmC,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAC1E,SAAQ,gBAAgB,CACpB,+BAA+B,CAC7B,OAAO,EACP,MAAM,EACN,OAAO,EACP,OAAO,EACP,GAAG,EACH,iBAAiB,CAAC,MAAM,CAAC,CAC1B,EACD,UAAU,GAAG,kBAAkB,CAChC,EACD,uBAAuB;IACzB,aAAa,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,sBAAsB,CACrC,MAAM,EACN,MAAM,EACN,OAAO,EACP,QAAQ,GAAG,OAAO,CAClB,SAAQ,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAC3D,uBAAuB;CAAG;AAE9B,MAAM,WAAW,0BAA0B,CAAC,OAAO,EAAE,MAAM;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAChC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AACD,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,SAAS,EAAE,WAAW,CACvE,SAAQ,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9C,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,SAAS,EAAE,WAAW,IAAI,CACjE,KAAK,EAAE,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,KAC3C,GAAG,CAAC,OAAO,CAAC;AAEjB,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAClC,SAAS,EAAE,eAAe,GAAG,SAAS,KACnC,eAAe,GAAG,SAAS,CAAC;AAEjC,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,SAAS,IAAI,CACpD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,KACnC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AAEhC,KAAK,0BAA0B,CAAC,MAAM,IAAI,MAAM,SAAS,aAAa,CACpE,MAAM,SAAS,CAChB,GACG,SAAS,EAAE,GACX,MAAM,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,KAAK,EAAE,MAAM,IAAI,cAAc,GAC5D,cAAc,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;AAE5D;;GAEG;AACH,MAAM,MAAM,yBAAyB,CAAC,KAAK,EAAE,MAAM,IAAI,qBAAqB,CAC1E,KAAK,EACL,MAAM,CACP,GACC,cAAc,CAAC;AAEjB;;GAEG;AACH,MAAM,MAAM,yBAAyB,CAAC,KAAK,EAAE,MAAM,IACjD,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,cAAc,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,0BAA0B,CAAC,KAAK,EAAE,MAAM,IAAI;IACtD,KAAK;IACL,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,cAAc;CACvD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,cAAc,GAC5E,sBAAsB,CACpB,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,EAClE,MAAM,CACP,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,iCAAiC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,IACjE,kCAAkC,CAChC,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,EAClE,MAAM,CACP,GACC,cAAc,CAAC;AAEnB;;GAEG;AACH,MAAM,MAAM,kCAAkC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI;IACtE,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;IAClE,8BAA8B,CAC5B,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,EAClE,MAAM,CACP,GACC,cAAc;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,IACnE,cAAc,GAAG,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AAE1E,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/react-query",
|
|
3
|
-
"version": "11.0.0-rc.
|
|
3
|
+
"version": "11.0.0-rc.382+94f198fec",
|
|
4
4
|
"description": "The tRPC React library",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -58,15 +58,15 @@
|
|
|
58
58
|
},
|
|
59
59
|
"peerDependencies": {
|
|
60
60
|
"@tanstack/react-query": "^5.25.0",
|
|
61
|
-
"@trpc/client": "11.0.0-rc.
|
|
62
|
-
"@trpc/server": "11.0.0-rc.
|
|
61
|
+
"@trpc/client": "11.0.0-rc.382+94f198fec",
|
|
62
|
+
"@trpc/server": "11.0.0-rc.382+94f198fec",
|
|
63
63
|
"react": ">=18.2.0",
|
|
64
64
|
"react-dom": ">=18.2.0"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
67
|
"@tanstack/react-query": "^5.25.0",
|
|
68
|
-
"@trpc/client": "11.0.0-rc.
|
|
69
|
-
"@trpc/server": "11.0.0-rc.
|
|
68
|
+
"@trpc/client": "11.0.0-rc.382+94f198fec",
|
|
69
|
+
"@trpc/server": "11.0.0-rc.382+94f198fec",
|
|
70
70
|
"@types/express": "^4.17.17",
|
|
71
71
|
"@types/node": "^20.10.0",
|
|
72
72
|
"@types/react": "^18.3.1",
|
|
@@ -76,6 +76,7 @@
|
|
|
76
76
|
"react": "^18.3.1",
|
|
77
77
|
"react-dom": "^18.3.1",
|
|
78
78
|
"rollup": "^4.9.5",
|
|
79
|
+
"tslib": "^2.5.0",
|
|
79
80
|
"tsx": "^4.0.0",
|
|
80
81
|
"zod": "^3.0.0"
|
|
81
82
|
},
|
|
@@ -85,5 +86,5 @@
|
|
|
85
86
|
"funding": [
|
|
86
87
|
"https://trpc.io/sponsor"
|
|
87
88
|
],
|
|
88
|
-
"gitHead": "
|
|
89
|
+
"gitHead": "94f198fece23e9328f7a30d1badf74de524b0ebb"
|
|
89
90
|
}
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
import type { TRPCClientErrorLike } from '@trpc/client';
|
|
14
14
|
import { createTRPCUntypedClient } from '@trpc/client';
|
|
15
15
|
import type { AnyRouter } from '@trpc/server/unstable-core-do-not-import';
|
|
16
|
+
import { isAsyncIterable } from '@trpc/server/unstable-core-do-not-import';
|
|
16
17
|
import * as React from 'react';
|
|
17
18
|
import type { SSRState, TRPCContextState } from '../../internals/context';
|
|
18
19
|
import { TRPCContext } from '../../internals/context';
|
|
@@ -170,7 +171,7 @@ export function createRootHooks<
|
|
|
170
171
|
queryKey: queryKey as any,
|
|
171
172
|
queryFn: isInputSkipToken
|
|
172
173
|
? input
|
|
173
|
-
: (queryFunctionContext) => {
|
|
174
|
+
: async (queryFunctionContext) => {
|
|
174
175
|
const actualOpts = {
|
|
175
176
|
...ssrOpts,
|
|
176
177
|
trpc: {
|
|
@@ -181,7 +182,33 @@ export function createRootHooks<
|
|
|
181
182
|
},
|
|
182
183
|
};
|
|
183
184
|
|
|
184
|
-
|
|
185
|
+
const result = await client.query(
|
|
186
|
+
...getClientArgs(queryKey, actualOpts),
|
|
187
|
+
);
|
|
188
|
+
|
|
189
|
+
if (isAsyncIterable(result)) {
|
|
190
|
+
const queryCache = queryClient.getQueryCache();
|
|
191
|
+
|
|
192
|
+
const query = queryCache.build(queryFunctionContext.queryKey, {
|
|
193
|
+
queryKey,
|
|
194
|
+
});
|
|
195
|
+
|
|
196
|
+
query.setState({
|
|
197
|
+
data: [],
|
|
198
|
+
status: 'success',
|
|
199
|
+
});
|
|
200
|
+
|
|
201
|
+
const aggregate: unknown[] = [];
|
|
202
|
+
for await (const value of result) {
|
|
203
|
+
aggregate.push(value);
|
|
204
|
+
|
|
205
|
+
query.setState({
|
|
206
|
+
data: [...aggregate],
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
return aggregate;
|
|
210
|
+
}
|
|
211
|
+
return result;
|
|
185
212
|
},
|
|
186
213
|
},
|
|
187
214
|
queryClient,
|
|
@@ -160,11 +160,17 @@ export type CreateClient<TRouter extends AnyRouter> = (
|
|
|
160
160
|
opts: CreateTRPCClientOptions<TRouter>,
|
|
161
161
|
) => TRPCUntypedClient<TRouter>;
|
|
162
162
|
|
|
163
|
+
type coerceAsyncIterableToArray<TValue> = TValue extends AsyncIterable<
|
|
164
|
+
infer $Inferred
|
|
165
|
+
>
|
|
166
|
+
? $Inferred[]
|
|
167
|
+
: TValue;
|
|
168
|
+
|
|
163
169
|
/**
|
|
164
170
|
* @internal
|
|
165
171
|
*/
|
|
166
172
|
export type UseTRPCQueryResult<TData, TError> = TRPCHookResult &
|
|
167
|
-
UseQueryResult<TData
|
|
173
|
+
UseQueryResult<coerceAsyncIterableToArray<TData>, TError>;
|
|
168
174
|
|
|
169
175
|
/**
|
|
170
176
|
* @internal
|