@trpc/client 10.0.0-alpha.15 → 10.0.0-alpha.18
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/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1081 -18
- package/dist/index.mjs +1064 -13
- package/dist/internals/TRPCClient.d.ts +3 -3
- package/dist/internals/TRPCClient.d.ts.map +1 -1
- package/dist/links/httpBatchLink.d.ts +1 -1
- package/dist/links/httpBatchLink.d.ts.map +1 -1
- package/dist/links/httpLink.d.ts +1 -1
- package/dist/links/httpLink.d.ts.map +1 -1
- package/dist/links/index.d.ts +11 -0
- package/dist/links/index.d.ts.map +1 -0
- package/dist/links/{httpUtils.d.ts → internals/httpUtils.d.ts} +1 -1
- package/dist/links/internals/httpUtils.d.ts.map +1 -0
- package/dist/links/transformerLink.d.ts.map +1 -1
- package/dist/links/types.d.ts +1 -1
- package/dist/links/types.d.ts.map +1 -1
- package/dist/links/wsLink.d.ts +1 -1
- package/dist/links/wsLink.d.ts.map +1 -1
- package/dist/observable/index.d.ts +4 -0
- package/dist/observable/index.d.ts.map +1 -0
- package/dist/{rx/operators → observable}/index.js +3 -3
- package/dist/{rx/operators → observable}/index.mjs +1 -2
- package/dist/{rx → observable}/index.ts.js +0 -0
- package/dist/{rx/util → observable/internals}/identity.d.ts +0 -0
- package/dist/observable/internals/identity.d.ts.map +1 -0
- package/dist/{rx/util → observable/internals}/observableToPromise.d.ts +0 -0
- package/dist/observable/internals/observableToPromise.d.ts.map +1 -0
- package/dist/{rx/util → observable/internals}/pipe.d.ts +0 -0
- package/dist/observable/internals/pipe.d.ts.map +1 -0
- package/dist/{rx → observable}/observable.d.ts +0 -0
- package/dist/observable/observable.d.ts.map +1 -0
- package/dist/{rx → observable}/operators/index.d.ts +0 -0
- package/dist/observable/operators/index.d.ts.map +1 -0
- package/dist/{rx → observable}/operators/map.d.ts +0 -0
- package/dist/observable/operators/map.d.ts.map +1 -0
- package/dist/{rx → observable}/operators/share.d.ts +0 -0
- package/dist/observable/operators/share.d.ts.map +1 -0
- package/dist/{rx → observable}/operators/tap.d.ts +0 -0
- package/dist/observable/operators/tap.d.ts.map +1 -0
- package/dist/{rx → observable}/types.d.ts +0 -0
- package/dist/observable/types.d.ts.map +1 -0
- package/dist/{share-671b63fa.mjs → tap-4bc60fb0.mjs} +131 -1
- package/dist/{share-4d79dc49.js → tap-fcd41ae6.js} +132 -0
- package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.d.ts +1 -11
- package/{dist/links/httpBatchLink.js → links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.dev.js} +63 -44
- package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.js +6 -15
- package/links/httpBatchLink/dist/trpc-client-links-httpBatchLink.cjs.prod.js +214 -0
- package/{dist/links/httpBatchLink.mjs → links/httpBatchLink/dist/trpc-client-links-httpBatchLink.esm.js} +62 -43
- package/links/httpLink/dist/trpc-client-links-httpLink.cjs.d.ts +1 -11
- package/links/httpLink/dist/trpc-client-links-httpLink.cjs.dev.js +67 -0
- package/links/httpLink/dist/trpc-client-links-httpLink.cjs.js +6 -15
- package/links/httpLink/dist/trpc-client-links-httpLink.cjs.prod.js +67 -0
- package/links/httpLink/dist/trpc-client-links-httpLink.esm.js +63 -0
- package/links/loggerLink/dist/trpc-client-links-loggerLink.cjs.d.ts +1 -11
- package/links/loggerLink/dist/trpc-client-links-loggerLink.cjs.dev.js +89 -0
- package/links/loggerLink/dist/trpc-client-links-loggerLink.cjs.js +6 -15
- package/links/loggerLink/dist/trpc-client-links-loggerLink.cjs.prod.js +89 -0
- package/links/loggerLink/dist/trpc-client-links-loggerLink.esm.js +85 -0
- package/links/splitLink/dist/trpc-client-links-splitLink.cjs.d.ts +1 -11
- package/links/splitLink/dist/trpc-client-links-splitLink.cjs.dev.js +19 -0
- package/links/splitLink/dist/trpc-client-links-splitLink.cjs.js +6 -15
- package/links/splitLink/dist/trpc-client-links-splitLink.cjs.prod.js +19 -0
- package/links/splitLink/dist/trpc-client-links-splitLink.esm.js +15 -0
- package/links/wsLink/dist/trpc-client-links-wsLink.cjs.d.ts +1 -11
- package/{dist/links/wsLink.js → links/wsLink/dist/trpc-client-links-wsLink.cjs.dev.js} +92 -82
- package/links/wsLink/dist/trpc-client-links-wsLink.cjs.js +6 -15
- package/links/wsLink/dist/trpc-client-links-wsLink.cjs.prod.js +395 -0
- package/{dist/links/wsLink.mjs → links/wsLink/dist/trpc-client-links-wsLink.esm.js} +87 -67
- package/package.json +8 -43
- package/src/index.ts +1 -1
- package/src/internals/TRPCClient.ts +8 -11
- package/src/links/dedupeLink.test.ts +1 -1
- package/src/links/dedupeLink.ts +5 -5
- package/src/links/httpBatchLink.ts +6 -2
- package/src/links/httpLink.ts +2 -2
- package/src/links/index.ts +10 -0
- package/src/links/internals/createChain.test.ts +5 -5
- package/src/links/internals/createChain.ts +3 -3
- package/src/links/{httpUtils.ts → internals/httpUtils.ts} +1 -1
- package/src/links/loggerLink.ts +2 -2
- package/src/links/retryLink.ts +2 -2
- package/src/links/splitLink.test.ts +3 -3
- package/src/links/splitLink.ts +1 -1
- package/src/links/transformerLink.ts +9 -5
- package/src/links/types.ts +1 -1
- package/src/links/wsLink.ts +1 -2
- package/src/{rx → observable}/index.ts +1 -0
- package/src/{rx/util → observable/internals}/identity.ts +0 -0
- package/src/{rx/util → observable/internals}/observableToPromise.ts +0 -0
- package/src/{rx/util → observable/internals}/pipe.ts +0 -0
- package/src/{rx → observable}/observable.test.ts +21 -1
- package/src/{rx → observable}/observable.ts +1 -1
- package/src/{rx → observable}/operators/index.ts +0 -0
- package/src/{rx → observable}/operators/map.test.ts +0 -0
- package/src/{rx → observable}/operators/map.ts +0 -0
- package/src/{rx → observable}/operators/share.test.ts +0 -0
- package/src/{rx → observable}/operators/share.ts +0 -0
- package/src/{rx → observable}/operators/tap.ts +0 -0
- package/src/{rx → observable}/types.ts +0 -0
- package/dist/TRPCClientError-17b117e1.mjs +0 -81
- package/dist/TRPCClientError-ec6bd2ca.js +0 -94
- package/dist/createChain-389cc116.mjs +0 -25
- package/dist/createChain-864dbb30.js +0 -27
- package/dist/httpUtils-1f9e4e3c.js +0 -97
- package/dist/httpUtils-c09d7b79.mjs +0 -91
- package/dist/links/httpBatchLink.ts.js +0 -1
- package/dist/links/httpLink.js +0 -44
- package/dist/links/httpLink.mjs +0 -40
- package/dist/links/httpLink.ts.js +0 -1
- package/dist/links/httpUtils.d.ts.map +0 -1
- package/dist/links/loggerLink.js +0 -108
- package/dist/links/loggerLink.mjs +0 -99
- package/dist/links/loggerLink.ts.js +0 -1
- package/dist/links/splitLink.js +0 -32
- package/dist/links/splitLink.mjs +0 -28
- package/dist/links/splitLink.ts.js +0 -1
- package/dist/links/transformerLink.js +0 -75
- package/dist/links/transformerLink.mjs +0 -67
- package/dist/links/transformerLink.ts.js +0 -1
- package/dist/links/wsLink.ts.js +0 -1
- package/dist/observable-7e66cb56.mjs +0 -102
- package/dist/observable-85669100.js +0 -104
- package/dist/rx/index.d.ts +0 -3
- package/dist/rx/index.d.ts.map +0 -1
- package/dist/rx/index.js +0 -9
- package/dist/rx/index.mjs +0 -1
- package/dist/rx/observable.d.ts.map +0 -1
- package/dist/rx/operators/index.d.ts.map +0 -1
- package/dist/rx/operators/index.ts.js +0 -1
- package/dist/rx/operators/map.d.ts.map +0 -1
- package/dist/rx/operators/share.d.ts.map +0 -1
- package/dist/rx/operators/tap.d.ts.map +0 -1
- package/dist/rx/types.d.ts.map +0 -1
- package/dist/rx/util/identity.d.ts.map +0 -1
- package/dist/rx/util/observableToPromise.d.ts.map +0 -1
- package/dist/rx/util/pipe.d.ts.map +0 -1
- package/dist/tap-538fa07f.mjs +0 -30
- package/dist/tap-799a2d33.js +0 -32
- package/links/httpBatchLink/index.d.ts +0 -1
- package/links/httpBatchLink/index.js +0 -1
- package/links/httpLink/index.d.ts +0 -1
- package/links/httpLink/index.js +0 -1
- package/links/loggerLink/index.d.ts +0 -1
- package/links/loggerLink/index.js +0 -1
- package/links/splitLink/index.d.ts +0 -1
- package/links/splitLink/index.js +0 -1
- package/links/transformerLink/index.d.ts +0 -1
- package/links/transformerLink/index.js +0 -1
- package/links/wsLink/index.d.ts +0 -1
- package/links/wsLink/index.js +0 -1
- package/rx/index.d.ts +0 -1
- package/rx/index.js +0 -1
- package/rx/operators/index.d.ts +0 -1
- package/rx/operators/index.js +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/client",
|
|
3
|
-
"version": "10.0.0-alpha.
|
|
3
|
+
"version": "10.0.0-alpha.18",
|
|
4
4
|
"description": "tRPC Client lib",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -19,45 +19,10 @@
|
|
|
19
19
|
"require": "./dist/index.js",
|
|
20
20
|
"default": "./dist/index.js"
|
|
21
21
|
},
|
|
22
|
-
"./
|
|
23
|
-
"import": "./dist/
|
|
24
|
-
"require": "./dist/
|
|
25
|
-
"default": "./dist/
|
|
26
|
-
},
|
|
27
|
-
"./links/httpLink": {
|
|
28
|
-
"import": "./dist/links/httpLink.mjs",
|
|
29
|
-
"require": "./dist/links/httpLink.js",
|
|
30
|
-
"default": "./dist/links/httpLink.js"
|
|
31
|
-
},
|
|
32
|
-
"./links/loggerLink": {
|
|
33
|
-
"import": "./dist/links/loggerLink.mjs",
|
|
34
|
-
"require": "./dist/links/loggerLink.js",
|
|
35
|
-
"default": "./dist/links/loggerLink.js"
|
|
36
|
-
},
|
|
37
|
-
"./links/splitLink": {
|
|
38
|
-
"import": "./dist/links/splitLink.mjs",
|
|
39
|
-
"require": "./dist/links/splitLink.js",
|
|
40
|
-
"default": "./dist/links/splitLink.js"
|
|
41
|
-
},
|
|
42
|
-
"./links/transformerLink": {
|
|
43
|
-
"import": "./dist/links/transformerLink.mjs",
|
|
44
|
-
"require": "./dist/links/transformerLink.js",
|
|
45
|
-
"default": "./dist/links/transformerLink.js"
|
|
46
|
-
},
|
|
47
|
-
"./links/wsLink": {
|
|
48
|
-
"import": "./dist/links/wsLink.mjs",
|
|
49
|
-
"require": "./dist/links/wsLink.js",
|
|
50
|
-
"default": "./dist/links/wsLink.js"
|
|
51
|
-
},
|
|
52
|
-
"./rx": {
|
|
53
|
-
"import": "./dist/rx/index.mjs",
|
|
54
|
-
"require": "./dist/rx/index.js",
|
|
55
|
-
"default": "./dist/rx/index.js"
|
|
56
|
-
},
|
|
57
|
-
"./rx/operators": {
|
|
58
|
-
"import": "./dist/rx/operators/index.mjs",
|
|
59
|
-
"require": "./dist/rx/operators/index.js",
|
|
60
|
-
"default": "./dist/rx/operators/index.js"
|
|
22
|
+
"./observable": {
|
|
23
|
+
"import": "./dist/observable/index.mjs",
|
|
24
|
+
"require": "./dist/observable/index.js",
|
|
25
|
+
"default": "./dist/observable/index.js"
|
|
61
26
|
}
|
|
62
27
|
},
|
|
63
28
|
"files": [
|
|
@@ -74,13 +39,13 @@
|
|
|
74
39
|
"@babel/runtime": "^7.9.0"
|
|
75
40
|
},
|
|
76
41
|
"peerDependencies": {
|
|
77
|
-
"@trpc/server": "10.0.0-alpha.
|
|
42
|
+
"@trpc/server": "10.0.0-alpha.18"
|
|
78
43
|
},
|
|
79
44
|
"devDependencies": {
|
|
80
|
-
"@trpc/server": "10.0.0-alpha.
|
|
45
|
+
"@trpc/server": "10.0.0-alpha.18"
|
|
81
46
|
},
|
|
82
47
|
"publishConfig": {
|
|
83
48
|
"access": "public"
|
|
84
49
|
},
|
|
85
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "b586f4a6e5830db0d6762df20492844fbdbaed8e"
|
|
86
51
|
}
|
package/src/index.ts
CHANGED
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
import { TRPCResult } from '@trpc/server/rpc';
|
|
9
9
|
import { CancelFn } from '..';
|
|
10
10
|
import { getFetch } from '../getFetch';
|
|
11
|
-
import { httpBatchLink } from '../links
|
|
11
|
+
import { httpBatchLink } from '../links';
|
|
12
12
|
import { createChain } from '../links/internals/createChain';
|
|
13
13
|
import { transformOperationResult } from '../links/internals/transformOperationResult';
|
|
14
14
|
import {
|
|
@@ -18,11 +18,11 @@ import {
|
|
|
18
18
|
OperationLink,
|
|
19
19
|
TRPCLink,
|
|
20
20
|
} from '../links/types';
|
|
21
|
-
import {
|
|
22
|
-
import { inferObservableValue } from '../
|
|
23
|
-
import { share } from '../
|
|
24
|
-
import { Observer } from '../
|
|
25
|
-
import { observableToPromise } from '../
|
|
21
|
+
import { Unsubscribable } from '../observable';
|
|
22
|
+
import { inferObservableValue } from '../observable/observable';
|
|
23
|
+
import { share } from '../observable/operators';
|
|
24
|
+
import { Observer } from '../observable/types';
|
|
25
|
+
import { observableToPromise } from '../observable/internals/observableToPromise';
|
|
26
26
|
import { TRPCClientError } from '../TRPCClientError';
|
|
27
27
|
import { getAbortController } from './fetchHelpers';
|
|
28
28
|
|
|
@@ -218,14 +218,14 @@ export class TRPCClient<TRouter extends AnyRouter> {
|
|
|
218
218
|
input: TInput,
|
|
219
219
|
opts: TRPCRequestOptions &
|
|
220
220
|
Partial<Observer<TRPCResult<TOutput>, TRPCClientError<TRouter>>>,
|
|
221
|
-
):
|
|
221
|
+
): Unsubscribable {
|
|
222
222
|
const observable$ = this.$request<TInput, TOutput>({
|
|
223
223
|
type: 'subscription',
|
|
224
224
|
path,
|
|
225
225
|
input,
|
|
226
226
|
context: opts.context,
|
|
227
227
|
});
|
|
228
|
-
|
|
228
|
+
return observable$.subscribe({
|
|
229
229
|
next(result) {
|
|
230
230
|
if ('error' in result.data) {
|
|
231
231
|
const err = TRPCClientError.from(result.data, {
|
|
@@ -244,8 +244,5 @@ export class TRPCClient<TRouter extends AnyRouter> {
|
|
|
244
244
|
opts.complete?.();
|
|
245
245
|
},
|
|
246
246
|
});
|
|
247
|
-
return () => {
|
|
248
|
-
observer.unsubscribe();
|
|
249
|
-
};
|
|
250
247
|
}
|
|
251
248
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { waitFor } from '@testing-library/dom';
|
|
2
2
|
import { AnyRouter } from '@trpc/server';
|
|
3
3
|
import { OperationLink } from '..';
|
|
4
|
-
import { observable } from '../
|
|
4
|
+
import { observable } from '../observable/observable';
|
|
5
5
|
import { dedupeLink } from './dedupeLink';
|
|
6
6
|
import { createChain } from './internals/createChain';
|
|
7
7
|
|
package/src/links/dedupeLink.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AnyRouter } from '@trpc/server';
|
|
2
|
-
import { observable } from '../
|
|
3
|
-
import { share } from '../
|
|
4
|
-
import { Observable } from '../
|
|
2
|
+
import { observable } from '../observable/observable';
|
|
3
|
+
import { share } from '../observable/operators';
|
|
4
|
+
import { Observable } from '../observable/types';
|
|
5
5
|
import { TRPCLink } from './types';
|
|
6
6
|
|
|
7
7
|
export function dedupeLink<
|
|
@@ -28,7 +28,7 @@ export function dedupeLink<
|
|
|
28
28
|
function reset() {
|
|
29
29
|
delete pending[key];
|
|
30
30
|
}
|
|
31
|
-
const
|
|
31
|
+
const subscription = next(op).subscribe({
|
|
32
32
|
next(v) {
|
|
33
33
|
observer.next(v);
|
|
34
34
|
},
|
|
@@ -43,7 +43,7 @@ export function dedupeLink<
|
|
|
43
43
|
});
|
|
44
44
|
return () => {
|
|
45
45
|
reset();
|
|
46
|
-
|
|
46
|
+
subscription.unsubscribe();
|
|
47
47
|
};
|
|
48
48
|
}).pipe(share());
|
|
49
49
|
pending[key] = shared$;
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { AnyRouter, ProcedureType } from '@trpc/server';
|
|
2
2
|
import { dataLoader } from '../internals/dataLoader';
|
|
3
|
-
import { observable } from '../
|
|
3
|
+
import { observable } from '../observable/observable';
|
|
4
4
|
import { TRPCLink } from './types';
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
HTTPLinkOptions,
|
|
7
|
+
httpRequest,
|
|
8
|
+
ResponseShape,
|
|
9
|
+
} from './internals/httpUtils';
|
|
6
10
|
|
|
7
11
|
export interface HttpBatchLinkOptions extends HTTPLinkOptions {
|
|
8
12
|
maxBatchSize?: number;
|
package/src/links/httpLink.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AnyRouter } from '@trpc/server';
|
|
2
|
-
import { observable } from '../
|
|
2
|
+
import { observable } from '../observable/observable';
|
|
3
3
|
import { TRPCLink } from './types';
|
|
4
|
-
import { HTTPLinkOptions, httpRequest } from './httpUtils';
|
|
4
|
+
import { HTTPLinkOptions, httpRequest } from './internals/httpUtils';
|
|
5
5
|
|
|
6
6
|
export function httpLink<TRouter extends AnyRouter>(
|
|
7
7
|
opts: HTTPLinkOptions,
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export * from './dedupeLink';
|
|
2
|
+
export * from './httpBatchLink';
|
|
3
|
+
export * from './httpLink';
|
|
4
|
+
export * from './loggerLink';
|
|
5
|
+
export * from './loggerLink';
|
|
6
|
+
export * from './retryLink';
|
|
7
|
+
export * from './splitLink';
|
|
8
|
+
export * from './transformerLink';
|
|
9
|
+
export * from './wsLink';
|
|
10
|
+
export * from './types';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AnyRouter } from '@trpc/server/src';
|
|
2
2
|
import { createChain } from './createChain';
|
|
3
|
-
import { observable } from '../../
|
|
3
|
+
import { observable } from '../../observable/observable';
|
|
4
4
|
|
|
5
5
|
describe('chain', () => {
|
|
6
6
|
test('trivial', () => {
|
|
@@ -8,9 +8,9 @@ describe('chain', () => {
|
|
|
8
8
|
links: [
|
|
9
9
|
({ next, op }) => {
|
|
10
10
|
return observable((observer) => {
|
|
11
|
-
const
|
|
11
|
+
const subscription = next(op).subscribe(observer);
|
|
12
12
|
return () => {
|
|
13
|
-
|
|
13
|
+
subscription.unsubscribe();
|
|
14
14
|
};
|
|
15
15
|
});
|
|
16
16
|
},
|
|
@@ -62,9 +62,9 @@ describe('chain', () => {
|
|
|
62
62
|
},
|
|
63
63
|
},
|
|
64
64
|
});
|
|
65
|
-
const
|
|
65
|
+
const subscription = next(op).subscribe(observer);
|
|
66
66
|
return () => {
|
|
67
|
-
|
|
67
|
+
subscription.unsubscribe();
|
|
68
68
|
};
|
|
69
69
|
});
|
|
70
70
|
},
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AnyRouter } from '@trpc/server';
|
|
2
|
-
import { observable } from '../../
|
|
2
|
+
import { observable } from '../../observable/observable';
|
|
3
3
|
import { Operation, OperationLink, OperationResultObservable } from '../types';
|
|
4
4
|
|
|
5
5
|
/** @internal */
|
|
@@ -14,7 +14,7 @@ export function createChain<
|
|
|
14
14
|
return observable((observer) => {
|
|
15
15
|
function execute(index = 0, op = opts.op) {
|
|
16
16
|
const next = opts.links[index];
|
|
17
|
-
const
|
|
17
|
+
const subscription = next({
|
|
18
18
|
op,
|
|
19
19
|
next(nextOp) {
|
|
20
20
|
const nextObserver = execute(index + 1, nextOp);
|
|
@@ -22,7 +22,7 @@ export function createChain<
|
|
|
22
22
|
return nextObserver;
|
|
23
23
|
},
|
|
24
24
|
});
|
|
25
|
-
return
|
|
25
|
+
return subscription;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
const obs$ = execute();
|
package/src/links/loggerLink.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AnyRouter } from '@trpc/server';
|
|
2
2
|
import { TRPCClientError } from '..';
|
|
3
|
-
import { observable } from '../
|
|
4
|
-
import { tap } from '../
|
|
3
|
+
import { observable } from '../observable/observable';
|
|
4
|
+
import { tap } from '../observable/operators';
|
|
5
5
|
import { Operation, OperationResult, TRPCLink } from './types';
|
|
6
6
|
|
|
7
7
|
type ConsoleEsque = {
|
package/src/links/retryLink.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AnyRouter } from '@trpc/server';
|
|
2
|
-
import { observable } from '../
|
|
3
|
-
import { Unsubscribable } from '../
|
|
2
|
+
import { observable } from '../observable/observable';
|
|
3
|
+
import { Unsubscribable } from '../observable/types';
|
|
4
4
|
import { TRPCLink } from './types';
|
|
5
5
|
|
|
6
6
|
export function retryLink<TRouter extends AnyRouter = AnyRouter>(opts: {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-empty-function */
|
|
2
2
|
import { AnyRouter } from '../../../server/src';
|
|
3
3
|
import { createChain } from '../links/internals/createChain';
|
|
4
|
-
import { splitLink } from '../
|
|
5
|
-
import { OperationLink, TRPCLink } from '../
|
|
6
|
-
import { observable } from '../
|
|
4
|
+
import { splitLink } from '../';
|
|
5
|
+
import { OperationLink, TRPCLink } from '../';
|
|
6
|
+
import { observable } from '../observable';
|
|
7
7
|
|
|
8
8
|
test('splitLink', () => {
|
|
9
9
|
const wsLinkSpy = jest.fn();
|
package/src/links/splitLink.ts
CHANGED
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
ClientDataTransformerOptions,
|
|
4
4
|
DataTransformer,
|
|
5
5
|
} from '@trpc/server';
|
|
6
|
-
import { observable } from '../
|
|
6
|
+
import { observable } from '../observable/observable';
|
|
7
7
|
import { OperationResult, TRPCLink } from './types';
|
|
8
8
|
|
|
9
9
|
/**
|
|
@@ -55,15 +55,19 @@ export function transformerLink<TRouter extends AnyRouter = AnyRouter>(
|
|
|
55
55
|
return (props) => {
|
|
56
56
|
const input = _transformer.serialize(props.op.input);
|
|
57
57
|
return observable((observer) => {
|
|
58
|
-
const
|
|
58
|
+
const subscription = props.next({ ...props.op, input }).subscribe({
|
|
59
59
|
next(value) {
|
|
60
60
|
const transformed = transformOperationResult(value, _transformer);
|
|
61
61
|
observer.next(transformed);
|
|
62
62
|
},
|
|
63
|
-
error
|
|
64
|
-
|
|
63
|
+
error(err) {
|
|
64
|
+
observer.error(err);
|
|
65
|
+
},
|
|
66
|
+
complete() {
|
|
67
|
+
observer.complete();
|
|
68
|
+
},
|
|
65
69
|
});
|
|
66
|
-
return
|
|
70
|
+
return subscription;
|
|
67
71
|
});
|
|
68
72
|
};
|
|
69
73
|
};
|
package/src/links/types.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AnyRouter, inferRouterError, Dict } from '@trpc/server';
|
|
2
2
|
import { TRPCResponse } from '@trpc/server/rpc';
|
|
3
|
-
import { Observable, Observer } from '../
|
|
3
|
+
import { Observable, Observer } from '../observable/types';
|
|
4
4
|
import { TRPCClientError } from '../TRPCClientError';
|
|
5
5
|
|
|
6
6
|
export type CancelFn = () => void;
|
package/src/links/wsLink.ts
CHANGED
|
@@ -6,8 +6,7 @@ import {
|
|
|
6
6
|
TRPCResponse,
|
|
7
7
|
} from '@trpc/server/rpc';
|
|
8
8
|
import { retryDelay } from '../internals/retryDelay';
|
|
9
|
-
import { UnsubscribeFn } from '../
|
|
10
|
-
import { observable } from '../rx/observable';
|
|
9
|
+
import { observable, UnsubscribeFn } from '../observable';
|
|
11
10
|
import { TRPCClientError } from '../TRPCClientError';
|
|
12
11
|
import { Operation, OperationResultObserver, TRPCLink } from './types';
|
|
13
12
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -3,7 +3,7 @@ import { observable } from './observable';
|
|
|
3
3
|
import { tap } from './operators';
|
|
4
4
|
import { share } from './operators/share';
|
|
5
5
|
|
|
6
|
-
test('vanilla observable', () => {
|
|
6
|
+
test('vanilla observable - complete()', () => {
|
|
7
7
|
const obs = observable<number, Error>((observer) => {
|
|
8
8
|
observer.next(1);
|
|
9
9
|
observer.complete();
|
|
@@ -23,6 +23,26 @@ test('vanilla observable', () => {
|
|
|
23
23
|
expect(next.mock.calls[0][0]).toBe(1);
|
|
24
24
|
});
|
|
25
25
|
|
|
26
|
+
test('vanilla observable - unsubscribe()', () => {
|
|
27
|
+
const obs$ = observable<number, Error>((observer) => {
|
|
28
|
+
observer.next(1);
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
const next = jest.fn();
|
|
32
|
+
const error = jest.fn();
|
|
33
|
+
const complete = jest.fn();
|
|
34
|
+
const sub = obs$.subscribe({
|
|
35
|
+
next,
|
|
36
|
+
error,
|
|
37
|
+
complete,
|
|
38
|
+
});
|
|
39
|
+
sub.unsubscribe();
|
|
40
|
+
expect(next.mock.calls).toHaveLength(1);
|
|
41
|
+
expect(complete.mock.calls).toHaveLength(0);
|
|
42
|
+
expect(error.mock.calls).toHaveLength(0);
|
|
43
|
+
expect(next.mock.calls[0][0]).toBe(1);
|
|
44
|
+
});
|
|
45
|
+
|
|
26
46
|
test('pipe - combine operators', () => {
|
|
27
47
|
const taps = {
|
|
28
48
|
next: jest.fn(),
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -1,81 +0,0 @@
|
|
|
1
|
-
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
2
|
-
import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
3
|
-
import _createClass from '@babel/runtime/helpers/createClass';
|
|
4
|
-
import _assertThisInitialized from '@babel/runtime/helpers/assertThisInitialized';
|
|
5
|
-
import _inherits from '@babel/runtime/helpers/inherits';
|
|
6
|
-
import _possibleConstructorReturn from '@babel/runtime/helpers/possibleConstructorReturn';
|
|
7
|
-
import _getPrototypeOf from '@babel/runtime/helpers/getPrototypeOf';
|
|
8
|
-
import _wrapNativeSuper from '@babel/runtime/helpers/wrapNativeSuper';
|
|
9
|
-
|
|
10
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
11
|
-
|
|
12
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
13
|
-
|
|
14
|
-
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
15
|
-
|
|
16
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
17
|
-
|
|
18
|
-
var TRPCClientError = /*#__PURE__*/function (_Error) {
|
|
19
|
-
_inherits(TRPCClientError, _Error);
|
|
20
|
-
|
|
21
|
-
var _super = /*#__PURE__*/_createSuper(TRPCClientError);
|
|
22
|
-
|
|
23
|
-
/**
|
|
24
|
-
* @deprecated use `cause`
|
|
25
|
-
*/
|
|
26
|
-
function TRPCClientError(message, opts) {
|
|
27
|
-
var _opts$cause, _opts$result, _opts$result2;
|
|
28
|
-
|
|
29
|
-
var _this;
|
|
30
|
-
|
|
31
|
-
_classCallCheck(this, TRPCClientError);
|
|
32
|
-
|
|
33
|
-
var cause = (_opts$cause = opts === null || opts === void 0 ? void 0 : opts.cause) !== null && _opts$cause !== void 0 ? _opts$cause : opts === null || opts === void 0 ? void 0 : opts.originalError; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
34
|
-
// @ts-ignore https://github.com/tc39/proposal-error-cause
|
|
35
|
-
|
|
36
|
-
_this = _super.call(this, message, {
|
|
37
|
-
cause: cause
|
|
38
|
-
});
|
|
39
|
-
_this.originalError = void 0;
|
|
40
|
-
_this.cause = void 0;
|
|
41
|
-
_this.shape = void 0;
|
|
42
|
-
_this.data = void 0;
|
|
43
|
-
_this.meta = void 0;
|
|
44
|
-
_this.meta = opts === null || opts === void 0 ? void 0 : opts.meta;
|
|
45
|
-
_this.cause = _this.originalError = cause;
|
|
46
|
-
_this.shape = opts === null || opts === void 0 ? void 0 : (_opts$result = opts.result) === null || _opts$result === void 0 ? void 0 : _opts$result.error;
|
|
47
|
-
_this.data = opts === null || opts === void 0 ? void 0 : (_opts$result2 = opts.result) === null || _opts$result2 === void 0 ? void 0 : _opts$result2.error.data;
|
|
48
|
-
_this.name = 'TRPCClientError';
|
|
49
|
-
Object.setPrototypeOf(_assertThisInitialized(_this), TRPCClientError.prototype);
|
|
50
|
-
return _this;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
_createClass(TRPCClientError, null, [{
|
|
54
|
-
key: "from",
|
|
55
|
-
value: function from(cause) {
|
|
56
|
-
var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
57
|
-
|
|
58
|
-
if (!(cause instanceof Error)) {
|
|
59
|
-
var _message;
|
|
60
|
-
|
|
61
|
-
return new TRPCClientError((_message = cause.error.message) !== null && _message !== void 0 ? _message : '', _objectSpread(_objectSpread({}, opts), {}, {
|
|
62
|
-
cause: null,
|
|
63
|
-
result: cause
|
|
64
|
-
}));
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
if (cause.name === 'TRPCClientError') {
|
|
68
|
-
return cause;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
return new TRPCClientError(cause.message, _objectSpread(_objectSpread({}, opts), {}, {
|
|
72
|
-
cause: cause,
|
|
73
|
-
result: null
|
|
74
|
-
}));
|
|
75
|
-
}
|
|
76
|
-
}]);
|
|
77
|
-
|
|
78
|
-
return TRPCClientError;
|
|
79
|
-
}( /*#__PURE__*/_wrapNativeSuper(Error));
|
|
80
|
-
|
|
81
|
-
export { TRPCClientError as T };
|
|
@@ -1,94 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
4
|
-
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
5
|
-
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
6
|
-
var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
|
|
7
|
-
var _inherits = require('@babel/runtime/helpers/inherits');
|
|
8
|
-
var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
|
|
9
|
-
var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
|
|
10
|
-
var _wrapNativeSuper = require('@babel/runtime/helpers/wrapNativeSuper');
|
|
11
|
-
|
|
12
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
13
|
-
|
|
14
|
-
var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
|
|
15
|
-
var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
|
|
16
|
-
var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
|
|
17
|
-
var _assertThisInitialized__default = /*#__PURE__*/_interopDefaultLegacy(_assertThisInitialized);
|
|
18
|
-
var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
|
|
19
|
-
var _possibleConstructorReturn__default = /*#__PURE__*/_interopDefaultLegacy(_possibleConstructorReturn);
|
|
20
|
-
var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeOf);
|
|
21
|
-
var _wrapNativeSuper__default = /*#__PURE__*/_interopDefaultLegacy(_wrapNativeSuper);
|
|
22
|
-
|
|
23
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
24
|
-
|
|
25
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
26
|
-
|
|
27
|
-
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf__default["default"](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default["default"](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default["default"](this, result); }; }
|
|
28
|
-
|
|
29
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
30
|
-
|
|
31
|
-
var TRPCClientError = /*#__PURE__*/function (_Error) {
|
|
32
|
-
_inherits__default["default"](TRPCClientError, _Error);
|
|
33
|
-
|
|
34
|
-
var _super = /*#__PURE__*/_createSuper(TRPCClientError);
|
|
35
|
-
|
|
36
|
-
/**
|
|
37
|
-
* @deprecated use `cause`
|
|
38
|
-
*/
|
|
39
|
-
function TRPCClientError(message, opts) {
|
|
40
|
-
var _opts$cause, _opts$result, _opts$result2;
|
|
41
|
-
|
|
42
|
-
var _this;
|
|
43
|
-
|
|
44
|
-
_classCallCheck__default["default"](this, TRPCClientError);
|
|
45
|
-
|
|
46
|
-
var cause = (_opts$cause = opts === null || opts === void 0 ? void 0 : opts.cause) !== null && _opts$cause !== void 0 ? _opts$cause : opts === null || opts === void 0 ? void 0 : opts.originalError; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
47
|
-
// @ts-ignore https://github.com/tc39/proposal-error-cause
|
|
48
|
-
|
|
49
|
-
_this = _super.call(this, message, {
|
|
50
|
-
cause: cause
|
|
51
|
-
});
|
|
52
|
-
_this.originalError = void 0;
|
|
53
|
-
_this.cause = void 0;
|
|
54
|
-
_this.shape = void 0;
|
|
55
|
-
_this.data = void 0;
|
|
56
|
-
_this.meta = void 0;
|
|
57
|
-
_this.meta = opts === null || opts === void 0 ? void 0 : opts.meta;
|
|
58
|
-
_this.cause = _this.originalError = cause;
|
|
59
|
-
_this.shape = opts === null || opts === void 0 ? void 0 : (_opts$result = opts.result) === null || _opts$result === void 0 ? void 0 : _opts$result.error;
|
|
60
|
-
_this.data = opts === null || opts === void 0 ? void 0 : (_opts$result2 = opts.result) === null || _opts$result2 === void 0 ? void 0 : _opts$result2.error.data;
|
|
61
|
-
_this.name = 'TRPCClientError';
|
|
62
|
-
Object.setPrototypeOf(_assertThisInitialized__default["default"](_this), TRPCClientError.prototype);
|
|
63
|
-
return _this;
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
_createClass__default["default"](TRPCClientError, null, [{
|
|
67
|
-
key: "from",
|
|
68
|
-
value: function from(cause) {
|
|
69
|
-
var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
70
|
-
|
|
71
|
-
if (!(cause instanceof Error)) {
|
|
72
|
-
var _message;
|
|
73
|
-
|
|
74
|
-
return new TRPCClientError((_message = cause.error.message) !== null && _message !== void 0 ? _message : '', _objectSpread(_objectSpread({}, opts), {}, {
|
|
75
|
-
cause: null,
|
|
76
|
-
result: cause
|
|
77
|
-
}));
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
if (cause.name === 'TRPCClientError') {
|
|
81
|
-
return cause;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
return new TRPCClientError(cause.message, _objectSpread(_objectSpread({}, opts), {}, {
|
|
85
|
-
cause: cause,
|
|
86
|
-
result: null
|
|
87
|
-
}));
|
|
88
|
-
}
|
|
89
|
-
}]);
|
|
90
|
-
|
|
91
|
-
return TRPCClientError;
|
|
92
|
-
}( /*#__PURE__*/_wrapNativeSuper__default["default"](Error));
|
|
93
|
-
|
|
94
|
-
exports.TRPCClientError = TRPCClientError;
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
import { o as observable } from './observable-7e66cb56.mjs';
|
|
2
|
-
|
|
3
|
-
/** @internal */
|
|
4
|
-
function createChain(opts) {
|
|
5
|
-
return observable(function (observer) {
|
|
6
|
-
function execute() {
|
|
7
|
-
var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
|
|
8
|
-
var op = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : opts.op;
|
|
9
|
-
var next = opts.links[index];
|
|
10
|
-
var next$ = next({
|
|
11
|
-
op: op,
|
|
12
|
-
next: function next(nextOp) {
|
|
13
|
-
var nextObserver = execute(index + 1, nextOp);
|
|
14
|
-
return nextObserver;
|
|
15
|
-
}
|
|
16
|
-
});
|
|
17
|
-
return next$;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
var obs$ = execute();
|
|
21
|
-
return obs$.subscribe(observer);
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
export { createChain as c };
|