@trpc/client 11.0.0-rc.601 → 11.0.0-rc.604
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 +33 -33
- package/dist/createTRPCClient.d.ts.map +1 -1
- package/dist/links/internals/retryLink.d.ts.map +1 -1
- package/dist/links/internals/retryLink.js +5 -1
- package/dist/links/internals/retryLink.mjs +5 -1
- package/dist/links/loggerLink.d.ts.map +1 -1
- package/dist/links/loggerLink.js +16 -12
- package/dist/links/loggerLink.mjs +16 -12
- package/dist/links/wsLink.d.ts.map +1 -1
- package/dist/links/wsLink.js +6 -2
- package/dist/links/wsLink.mjs +6 -2
- package/package.json +7 -7
- package/src/createTRPCClient.ts +21 -21
- package/src/links/internals/retryLink.ts +5 -1
- package/src/links/loggerLink.ts +4 -2
- package/src/links/wsLink.ts +6 -2
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
|
-
"bundleSize":
|
|
3
|
-
"bundleOrigSize":
|
|
4
|
-
"bundleReduction": 22.
|
|
2
|
+
"bundleSize": 62678,
|
|
3
|
+
"bundleOrigSize": 81062,
|
|
4
|
+
"bundleReduction": 22.68,
|
|
5
5
|
"modules": [
|
|
6
6
|
{
|
|
7
7
|
"id": "/src/links/wsLink.ts",
|
|
8
|
-
"size":
|
|
9
|
-
"origSize":
|
|
8
|
+
"size": 18035,
|
|
9
|
+
"origSize": 20084,
|
|
10
10
|
"renderedExports": [
|
|
11
11
|
"createWSClient",
|
|
12
12
|
"wsLink"
|
|
13
13
|
],
|
|
14
14
|
"removedExports": [],
|
|
15
15
|
"dependents": [],
|
|
16
|
-
"percent": 28.
|
|
17
|
-
"reduction": 10.
|
|
16
|
+
"percent": 28.77,
|
|
17
|
+
"reduction": 10.2
|
|
18
18
|
},
|
|
19
19
|
{
|
|
20
20
|
"id": "/src/links/httpSubscriptionLink.ts",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
],
|
|
26
26
|
"removedExports": [],
|
|
27
27
|
"dependents": [],
|
|
28
|
-
"percent": 10.
|
|
28
|
+
"percent": 10.73,
|
|
29
29
|
"reduction": 0
|
|
30
30
|
},
|
|
31
31
|
{
|
|
@@ -37,20 +37,20 @@
|
|
|
37
37
|
],
|
|
38
38
|
"removedExports": [],
|
|
39
39
|
"dependents": [],
|
|
40
|
-
"percent": 9.
|
|
40
|
+
"percent": 9.58,
|
|
41
41
|
"reduction": 4.41
|
|
42
42
|
},
|
|
43
43
|
{
|
|
44
44
|
"id": "/src/links/loggerLink.ts",
|
|
45
|
-
"size":
|
|
46
|
-
"origSize":
|
|
45
|
+
"size": 5609,
|
|
46
|
+
"origSize": 6946,
|
|
47
47
|
"renderedExports": [
|
|
48
48
|
"loggerLink"
|
|
49
49
|
],
|
|
50
50
|
"removedExports": [],
|
|
51
51
|
"dependents": [],
|
|
52
|
-
"percent": 8.
|
|
53
|
-
"reduction":
|
|
52
|
+
"percent": 8.95,
|
|
53
|
+
"reduction": 19.25
|
|
54
54
|
},
|
|
55
55
|
{
|
|
56
56
|
"id": "/src/internals/dataLoader.ts",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"/src/links/httpBatchLink.ts",
|
|
65
65
|
"/src/links/httpBatchStreamLink.ts"
|
|
66
66
|
],
|
|
67
|
-
"percent": 6.
|
|
67
|
+
"percent": 6.52,
|
|
68
68
|
"reduction": 5.64
|
|
69
69
|
},
|
|
70
70
|
{
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
],
|
|
77
77
|
"removedExports": [],
|
|
78
78
|
"dependents": [],
|
|
79
|
-
"percent": 6.
|
|
79
|
+
"percent": 6.28,
|
|
80
80
|
"reduction": 5.56
|
|
81
81
|
},
|
|
82
82
|
{
|
|
@@ -94,12 +94,12 @@
|
|
|
94
94
|
],
|
|
95
95
|
"removedExports": [],
|
|
96
96
|
"dependents": [
|
|
97
|
-
"/src/links/httpBatchLink.ts",
|
|
98
97
|
"/src/links/httpLink.ts",
|
|
98
|
+
"/src/links/httpBatchLink.ts",
|
|
99
99
|
"/src/links/httpBatchStreamLink.ts",
|
|
100
100
|
"/src/links/httpSubscriptionLink.ts"
|
|
101
101
|
],
|
|
102
|
-
"percent": 5.
|
|
102
|
+
"percent": 5.89,
|
|
103
103
|
"reduction": 37.12
|
|
104
104
|
},
|
|
105
105
|
{
|
|
@@ -111,7 +111,7 @@
|
|
|
111
111
|
],
|
|
112
112
|
"removedExports": [],
|
|
113
113
|
"dependents": [],
|
|
114
|
-
"percent": 5.
|
|
114
|
+
"percent": 5.08,
|
|
115
115
|
"reduction": 14.14
|
|
116
116
|
},
|
|
117
117
|
{
|
|
@@ -126,7 +126,7 @@
|
|
|
126
126
|
"/src/createTRPCUntypedClient.ts",
|
|
127
127
|
"/src/createTRPCClient.ts"
|
|
128
128
|
],
|
|
129
|
-
"percent": 4.
|
|
129
|
+
"percent": 4.32,
|
|
130
130
|
"reduction": 40.88
|
|
131
131
|
},
|
|
132
132
|
{
|
|
@@ -139,27 +139,27 @@
|
|
|
139
139
|
"removedExports": [],
|
|
140
140
|
"dependents": [
|
|
141
141
|
"/src/index.ts",
|
|
142
|
-
"/src/links/httpBatchLink.ts",
|
|
143
142
|
"/src/links/httpLink.ts",
|
|
143
|
+
"/src/links/httpBatchLink.ts",
|
|
144
144
|
"/src/links/wsLink.ts",
|
|
145
145
|
"/src/links/httpBatchStreamLink.ts",
|
|
146
146
|
"/src/links/httpSubscriptionLink.ts",
|
|
147
147
|
"/src/internals/TRPCUntypedClient.ts"
|
|
148
148
|
],
|
|
149
|
-
"percent": 3.
|
|
149
|
+
"percent": 3.1,
|
|
150
150
|
"reduction": 45.57
|
|
151
151
|
},
|
|
152
152
|
{
|
|
153
153
|
"id": "/src/links/internals/retryLink.ts",
|
|
154
|
-
"size":
|
|
155
|
-
"origSize":
|
|
154
|
+
"size": 1421,
|
|
155
|
+
"origSize": 1995,
|
|
156
156
|
"renderedExports": [
|
|
157
157
|
"retryLink"
|
|
158
158
|
],
|
|
159
159
|
"removedExports": [],
|
|
160
160
|
"dependents": [],
|
|
161
|
-
"percent": 2.
|
|
162
|
-
"reduction":
|
|
161
|
+
"percent": 2.27,
|
|
162
|
+
"reduction": 28.77
|
|
163
163
|
},
|
|
164
164
|
{
|
|
165
165
|
"id": "/src/internals/signals.ts",
|
|
@@ -175,13 +175,13 @@
|
|
|
175
175
|
"/src/links/httpBatchStreamLink.ts",
|
|
176
176
|
"/src/links/httpSubscriptionLink.ts"
|
|
177
177
|
],
|
|
178
|
-
"percent": 1.
|
|
178
|
+
"percent": 1.9,
|
|
179
179
|
"reduction": 3.88
|
|
180
180
|
},
|
|
181
181
|
{
|
|
182
182
|
"id": "/src/createTRPCClient.ts",
|
|
183
183
|
"size": 1187,
|
|
184
|
-
"origSize":
|
|
184
|
+
"origSize": 4478,
|
|
185
185
|
"renderedExports": [
|
|
186
186
|
"clientCallTypeToProcedureType",
|
|
187
187
|
"createTRPCClientProxy",
|
|
@@ -192,8 +192,8 @@
|
|
|
192
192
|
"dependents": [
|
|
193
193
|
"/src/index.ts"
|
|
194
194
|
],
|
|
195
|
-
"percent": 1.
|
|
196
|
-
"reduction": 73.
|
|
195
|
+
"percent": 1.89,
|
|
196
|
+
"reduction": 73.49
|
|
197
197
|
},
|
|
198
198
|
{
|
|
199
199
|
"id": "/src/links/internals/createChain.ts",
|
|
@@ -207,7 +207,7 @@
|
|
|
207
207
|
"/src/links/splitLink.ts",
|
|
208
208
|
"/src/internals/TRPCUntypedClient.ts"
|
|
209
209
|
],
|
|
210
|
-
"percent": 1.
|
|
210
|
+
"percent": 1.1,
|
|
211
211
|
"reduction": 32.75
|
|
212
212
|
},
|
|
213
213
|
{
|
|
@@ -219,7 +219,7 @@
|
|
|
219
219
|
],
|
|
220
220
|
"removedExports": [],
|
|
221
221
|
"dependents": [],
|
|
222
|
-
"percent": 0.
|
|
222
|
+
"percent": 0.97,
|
|
223
223
|
"reduction": 44.95
|
|
224
224
|
},
|
|
225
225
|
{
|
|
@@ -233,7 +233,7 @@
|
|
|
233
233
|
"dependents": [
|
|
234
234
|
"/src/unstable-internals.ts"
|
|
235
235
|
],
|
|
236
|
-
"percent": 0.
|
|
236
|
+
"percent": 0.9,
|
|
237
237
|
"reduction": 66.71
|
|
238
238
|
},
|
|
239
239
|
{
|
|
@@ -248,7 +248,7 @@
|
|
|
248
248
|
"/src/index.ts",
|
|
249
249
|
"/src/links/internals/httpUtils.ts"
|
|
250
250
|
],
|
|
251
|
-
"percent": 0.
|
|
251
|
+
"percent": 0.68,
|
|
252
252
|
"reduction": 33.54
|
|
253
253
|
},
|
|
254
254
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,mBAAmB,EACnB,+BAA+B,EAC/B,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,YAAY,EACb,MAAM,0CAA0C,CAAC;AAKlD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,KAAK,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD;;IAEI;AACJ,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;AAE/D,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,GAAG,CAAC;CACjB,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,QAAQ,CAAC,IAAI,SAAS,WAAW,IAAI,CAC/C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EACpB,IAAI,CAAC,EAAE,gBAAgB,KACpB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAE7B,KAAK,oBAAoB,CAAC,IAAI,SAAS,WAAW,IAAI,CACpD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EACpB,IAAI,CAAC,EAAE,OAAO,CACZ,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC,CAChE,GACC,gBAAgB,KACf,cAAc,CAAC;AAEpB,KAAK,iBAAiB,CACpB,KAAK,SAAS,aAAa,EAC3B,IAAI,SAAS,WAAW,IACtB,KAAK,SAAS,OAAO,GACrB;IACE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CACvB,GACD,KAAK,SAAS,UAAU,
|
|
1
|
+
{"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retryLink.d.ts","sourceRoot":"","sources":["../../../src/links/internals/retryLink.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpD,UAAU,gBAAgB,CAAC,WAAW,SAAS,qBAAqB;IAClE;;OAEG;IACH,KAAK,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC;CACvD;AAED,UAAU,cAAc,CAAC,WAAW,SAAS,qBAAqB;IAChE;;OAEG;IACH,EAAE,EAAE,SAAS,CAAC;IACd;;OAEG;IACH,KAAK,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;IACpC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,WAAW,SAAS,qBAAqB,EACjE,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,GAClC,QAAQ,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"retryLink.d.ts","sourceRoot":"","sources":["../../../src/links/internals/retryLink.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpD,UAAU,gBAAgB,CAAC,WAAW,SAAS,qBAAqB;IAClE;;OAEG;IACH,KAAK,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC;CACvD;AAED,UAAU,cAAc,CAAC,WAAW,SAAS,qBAAqB;IAChE;;OAEG;IACH,EAAE,EAAE,SAAS,CAAC;IACd;;OAEG;IACH,KAAK,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;IACpC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,WAAW,SAAS,qBAAqB,EACjE,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,GAClC,QAAQ,CAAC,WAAW,CAAC,CAuCvB"}
|
|
@@ -22,7 +22,11 @@ var observable = require('@trpc/server/observable');
|
|
|
22
22
|
attempts,
|
|
23
23
|
error
|
|
24
24
|
});
|
|
25
|
-
|
|
25
|
+
if (shouldRetry) {
|
|
26
|
+
attempt(attempts + 1);
|
|
27
|
+
} else {
|
|
28
|
+
observer.error(error);
|
|
29
|
+
}
|
|
26
30
|
},
|
|
27
31
|
next (result) {
|
|
28
32
|
observer.next(result);
|
|
@@ -20,7 +20,11 @@ import { observable } from '@trpc/server/observable';
|
|
|
20
20
|
attempts,
|
|
21
21
|
error
|
|
22
22
|
});
|
|
23
|
-
|
|
23
|
+
if (shouldRetry) {
|
|
24
|
+
attempt(attempts + 1);
|
|
25
|
+
} else {
|
|
26
|
+
observer.error(error);
|
|
27
|
+
}
|
|
24
28
|
},
|
|
25
29
|
next (result) {
|
|
26
30
|
observer.next(result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5E,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,KAAK,eAAe,CAAC,OAAO,SAAS,qBAAqB,IACtD;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EACF,uBAAuB,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,GAC1D,eAAe,CAAC,OAAO,CAAC,CAAC;CAC9B,GACD,CAAC,SAAS,GAAG;IACX,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC,CAAC;AACP,KAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,KAAK,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS,GAC7D,CACI;IACE;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EACF,uBAAuB,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,GAC1D,eAAe,CAAC,OAAO,CAAC,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;CACnB,GACD;IACE;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;CACjB,CACJ,CAAC;AAEJ,KAAK,YAAY,CAAC,OAAO,SAAS,SAAS,IAAI,CAC7C,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAC/B,IAAI,CAAC;AAEV,KAAK,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;AAEzC,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,SAAS;IAC1D,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAqID;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5E,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,KAAK,eAAe,CAAC,OAAO,SAAS,qBAAqB,IACtD;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EACF,uBAAuB,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,GAC1D,eAAe,CAAC,OAAO,CAAC,CAAC;CAC9B,GACD,CAAC,SAAS,GAAG;IACX,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC,CAAC;AACP,KAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,KAAK,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS,GAC7D,CACI;IACE;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EACF,uBAAuB,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,GAC1D,eAAe,CAAC,OAAO,CAAC,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;CACnB,GACD;IACE;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;CACjB,CACJ,CAAC;AAEJ,KAAK,YAAY,CAAC,OAAO,SAAS,SAAS,IAAI,CAC7C,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAC/B,IAAI,CAAC;AAEV,KAAK,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;AAEzC,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,SAAS;IAC1D,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAqID;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CAoDnB"}
|
package/dist/links/loggerLink.js
CHANGED
|
@@ -137,26 +137,30 @@ const defaultLogger = ({ c =console , colorMode ='css' , withContext })=>(props
|
|
|
137
137
|
return ({ op , next })=>{
|
|
138
138
|
return observable.observable((observer)=>{
|
|
139
139
|
// ->
|
|
140
|
-
enabled({
|
|
140
|
+
if (enabled({
|
|
141
141
|
...op,
|
|
142
142
|
direction: 'up'
|
|
143
|
-
})
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
143
|
+
})) {
|
|
144
|
+
logger({
|
|
145
|
+
...op,
|
|
146
|
+
direction: 'up'
|
|
147
|
+
});
|
|
148
|
+
}
|
|
147
149
|
const requestStartTime = Date.now();
|
|
148
150
|
function logResult(result) {
|
|
149
151
|
const elapsedMs = Date.now() - requestStartTime;
|
|
150
|
-
enabled({
|
|
152
|
+
if (enabled({
|
|
151
153
|
...op,
|
|
152
154
|
direction: 'down',
|
|
153
155
|
result
|
|
154
|
-
})
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
156
|
+
})) {
|
|
157
|
+
logger({
|
|
158
|
+
...op,
|
|
159
|
+
direction: 'down',
|
|
160
|
+
elapsedMs,
|
|
161
|
+
result
|
|
162
|
+
});
|
|
163
|
+
}
|
|
160
164
|
}
|
|
161
165
|
return next(op).pipe(observable.tap({
|
|
162
166
|
next (result) {
|
|
@@ -135,26 +135,30 @@ const defaultLogger = ({ c =console , colorMode ='css' , withContext })=>(props
|
|
|
135
135
|
return ({ op , next })=>{
|
|
136
136
|
return observable((observer)=>{
|
|
137
137
|
// ->
|
|
138
|
-
enabled({
|
|
138
|
+
if (enabled({
|
|
139
139
|
...op,
|
|
140
140
|
direction: 'up'
|
|
141
|
-
})
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
141
|
+
})) {
|
|
142
|
+
logger({
|
|
143
|
+
...op,
|
|
144
|
+
direction: 'up'
|
|
145
|
+
});
|
|
146
|
+
}
|
|
145
147
|
const requestStartTime = Date.now();
|
|
146
148
|
function logResult(result) {
|
|
147
149
|
const elapsedMs = Date.now() - requestStartTime;
|
|
148
|
-
enabled({
|
|
150
|
+
if (enabled({
|
|
149
151
|
...op,
|
|
150
152
|
direction: 'down',
|
|
151
153
|
result
|
|
152
|
-
})
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
154
|
+
})) {
|
|
155
|
+
logger({
|
|
156
|
+
...op,
|
|
157
|
+
direction: 'down',
|
|
158
|
+
elapsedMs,
|
|
159
|
+
result
|
|
160
|
+
});
|
|
161
|
+
}
|
|
158
162
|
}
|
|
159
163
|
return next(op).pipe(tap({
|
|
160
164
|
next (result) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGvE,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAMhB,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInD,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,KAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,QAAA,MAAM,kBAAkB,iBAAkB,MAAM,WACoB,CAAC;AAErE,MAAM,WAAW,sBAAuB,SAAQ,8BAA8B;IAC5E;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACzC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IAChC;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9C;;OAEG;IACH,IAAI,CAAC,EAAE;QACL;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF;;OAEG;IACH,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB;;;WAGG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;CACH;AAQD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;
|
|
1
|
+
{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGvE,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAMhB,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInD,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,KAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,QAAA,MAAM,kBAAkB,iBAAkB,MAAM,WACoB,CAAC;AAErE,MAAM,WAAW,sBAAuB,SAAQ,8BAA8B;IAC5E;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACzC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IAChC;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9C;;OAEG;IACH,IAAI,CAAC,EAAE;QACL;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF;;OAEG;IACH,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB;;;WAGG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;CACH;AAQD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;oBA2blC;QACrB,EAAE,EAAE,SAAS,CAAC;QACd,SAAS,yCAAa;QACtB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC,KAAG,aAAa;;YA9YX,MAAM;;eAGC,MAAM;YACT,SAAS;;eAGN,QAAQ;YACX,SAAS;;eAGN,YAAY;aACd,SAAS;;IA0clB;;OAEG;uBA1YqB,KAAK,GAAG,IAAI;;EA8YvC;AAED;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,MAAM,EAAE,mBAAmB,CAAC;CAC7B,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAgBlD;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAClC,QAAQ,CAAC,OAAO,CAAC,CA2DnB"}
|
package/dist/links/wsLink.js
CHANGED
|
@@ -95,7 +95,9 @@ const lazyDefaults = {
|
|
|
95
95
|
}
|
|
96
96
|
const oldConnection = activeConnection;
|
|
97
97
|
activeConnection = createConnection();
|
|
98
|
-
|
|
98
|
+
if (oldConnection) {
|
|
99
|
+
closeIfNoPending(oldConnection);
|
|
100
|
+
}
|
|
99
101
|
const currentState = connectionState.get();
|
|
100
102
|
if (currentState.state !== 'connecting') {
|
|
101
103
|
connectionState.next({
|
|
@@ -399,7 +401,9 @@ const lazyDefaults = {
|
|
|
399
401
|
})));
|
|
400
402
|
}
|
|
401
403
|
}
|
|
402
|
-
|
|
404
|
+
if (activeConnection) {
|
|
405
|
+
closeIfNoPending(activeConnection);
|
|
406
|
+
}
|
|
403
407
|
clearTimeout(connectTimer);
|
|
404
408
|
connectTimer = undefined;
|
|
405
409
|
activeConnection = null;
|
package/dist/links/wsLink.mjs
CHANGED
|
@@ -93,7 +93,9 @@ const lazyDefaults = {
|
|
|
93
93
|
}
|
|
94
94
|
const oldConnection = activeConnection;
|
|
95
95
|
activeConnection = createConnection();
|
|
96
|
-
|
|
96
|
+
if (oldConnection) {
|
|
97
|
+
closeIfNoPending(oldConnection);
|
|
98
|
+
}
|
|
97
99
|
const currentState = connectionState.get();
|
|
98
100
|
if (currentState.state !== 'connecting') {
|
|
99
101
|
connectionState.next({
|
|
@@ -397,7 +399,9 @@ const lazyDefaults = {
|
|
|
397
399
|
})));
|
|
398
400
|
}
|
|
399
401
|
}
|
|
400
|
-
|
|
402
|
+
if (activeConnection) {
|
|
403
|
+
closeIfNoPending(activeConnection);
|
|
404
|
+
}
|
|
401
405
|
clearTimeout(connectTimer);
|
|
402
406
|
connectTimer = undefined;
|
|
403
407
|
activeConnection = null;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/client",
|
|
3
|
-
"version": "11.0.0-rc.
|
|
3
|
+
"version": "11.0.0-rc.604+03cd991db",
|
|
4
4
|
"description": "The tRPC client library",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"build": "rollup --config rollup.config.ts --configPlugin rollup-plugin-swc3",
|
|
26
26
|
"dev": "pnpm build --watch",
|
|
27
27
|
"codegen-entrypoints": "tsx entrypoints.script.ts",
|
|
28
|
-
"lint": "eslint --cache
|
|
28
|
+
"lint": "eslint --cache src",
|
|
29
29
|
"ts-watch": "tsc --watch"
|
|
30
30
|
},
|
|
31
31
|
"exports": {
|
|
@@ -76,13 +76,13 @@
|
|
|
76
76
|
"!**/*.test.*"
|
|
77
77
|
],
|
|
78
78
|
"peerDependencies": {
|
|
79
|
-
"@trpc/server": "11.0.0-rc.
|
|
79
|
+
"@trpc/server": "11.0.0-rc.604+03cd991db"
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
|
-
"@trpc/server": "11.0.0-rc.
|
|
82
|
+
"@trpc/server": "11.0.0-rc.604+03cd991db",
|
|
83
83
|
"@types/isomorphic-fetch": "^0.0.39",
|
|
84
|
-
"@types/node": "^
|
|
85
|
-
"eslint": "^
|
|
84
|
+
"@types/node": "^20.17.3",
|
|
85
|
+
"eslint": "^9.13.0",
|
|
86
86
|
"isomorphic-fetch": "^3.0.0",
|
|
87
87
|
"node-fetch": "^3.3.0",
|
|
88
88
|
"rollup": "^4.9.5",
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
"funding": [
|
|
97
97
|
"https://trpc.io/sponsor"
|
|
98
98
|
],
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "03cd991dba00fe219759b308897137ecca1fe111"
|
|
100
100
|
}
|
package/src/createTRPCClient.ts
CHANGED
|
@@ -58,14 +58,14 @@ type DecorateProcedure<
|
|
|
58
58
|
query: Resolver<TDef>;
|
|
59
59
|
}
|
|
60
60
|
: TType extends 'mutation'
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
61
|
+
? {
|
|
62
|
+
mutate: Resolver<TDef>;
|
|
63
|
+
}
|
|
64
|
+
: TType extends 'subscription'
|
|
65
|
+
? {
|
|
66
|
+
subscribe: SubscriptionResolver<TDef>;
|
|
67
|
+
}
|
|
68
|
+
: never;
|
|
69
69
|
|
|
70
70
|
/**
|
|
71
71
|
* @internal
|
|
@@ -78,19 +78,19 @@ type DecoratedProcedureRecord<
|
|
|
78
78
|
? $Value extends RouterRecord
|
|
79
79
|
? DecoratedProcedureRecord<TRouter, $Value>
|
|
80
80
|
: $Value extends AnyProcedure
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
81
|
+
? DecorateProcedure<
|
|
82
|
+
$Value['_def']['type'],
|
|
83
|
+
{
|
|
84
|
+
input: inferProcedureInput<$Value>;
|
|
85
|
+
output: inferTransformedProcedureOutput<
|
|
86
|
+
inferClientTypes<TRouter>,
|
|
87
|
+
$Value
|
|
88
|
+
>;
|
|
89
|
+
errorShape: inferClientTypes<TRouter>['errorShape'];
|
|
90
|
+
transformer: inferClientTypes<TRouter>['transformer'];
|
|
91
|
+
}
|
|
92
|
+
>
|
|
93
|
+
: never
|
|
94
94
|
: never;
|
|
95
95
|
};
|
|
96
96
|
|
|
@@ -52,7 +52,11 @@ export function retryLink<TInferrable extends InferrableClientTypes>(
|
|
|
52
52
|
attempts,
|
|
53
53
|
error,
|
|
54
54
|
});
|
|
55
|
-
|
|
55
|
+
if (shouldRetry) {
|
|
56
|
+
attempt(attempts + 1);
|
|
57
|
+
} else {
|
|
58
|
+
observer.error(error);
|
|
59
|
+
}
|
|
56
60
|
},
|
|
57
61
|
next(result) {
|
|
58
62
|
observer.next(result);
|
package/src/links/loggerLink.ts
CHANGED
|
@@ -227,11 +227,12 @@ export function loggerLink<TRouter extends AnyRouter = AnyRouter>(
|
|
|
227
227
|
return ({ op, next }) => {
|
|
228
228
|
return observable((observer) => {
|
|
229
229
|
// ->
|
|
230
|
-
enabled({ ...op, direction: 'up' })
|
|
230
|
+
if (enabled({ ...op, direction: 'up' })) {
|
|
231
231
|
logger({
|
|
232
232
|
...op,
|
|
233
233
|
direction: 'up',
|
|
234
234
|
});
|
|
235
|
+
}
|
|
235
236
|
const requestStartTime = Date.now();
|
|
236
237
|
function logResult(
|
|
237
238
|
result:
|
|
@@ -240,13 +241,14 @@ export function loggerLink<TRouter extends AnyRouter = AnyRouter>(
|
|
|
240
241
|
) {
|
|
241
242
|
const elapsedMs = Date.now() - requestStartTime;
|
|
242
243
|
|
|
243
|
-
enabled({ ...op, direction: 'down', result })
|
|
244
|
+
if (enabled({ ...op, direction: 'down', result })) {
|
|
244
245
|
logger({
|
|
245
246
|
...op,
|
|
246
247
|
direction: 'down',
|
|
247
248
|
elapsedMs,
|
|
248
249
|
result,
|
|
249
250
|
});
|
|
251
|
+
}
|
|
250
252
|
}
|
|
251
253
|
return next(op)
|
|
252
254
|
.pipe(
|
package/src/links/wsLink.ts
CHANGED
|
@@ -242,7 +242,9 @@ export function createWSClient(opts: WebSocketClientOptions) {
|
|
|
242
242
|
}
|
|
243
243
|
const oldConnection = activeConnection;
|
|
244
244
|
activeConnection = createConnection();
|
|
245
|
-
|
|
245
|
+
if (oldConnection) {
|
|
246
|
+
closeIfNoPending(oldConnection);
|
|
247
|
+
}
|
|
246
248
|
|
|
247
249
|
const currentState = connectionState.get();
|
|
248
250
|
if (currentState.state !== 'connecting') {
|
|
@@ -614,7 +616,9 @@ export function createWSClient(opts: WebSocketClientOptions) {
|
|
|
614
616
|
);
|
|
615
617
|
}
|
|
616
618
|
}
|
|
617
|
-
|
|
619
|
+
if (activeConnection) {
|
|
620
|
+
closeIfNoPending(activeConnection);
|
|
621
|
+
}
|
|
618
622
|
clearTimeout(connectTimer);
|
|
619
623
|
connectTimer = undefined;
|
|
620
624
|
activeConnection = null;
|