@trpc/client 10.0.0-alpha.43 → 10.0.0-alpha.44

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.
Files changed (5) hide show
  1. package/dist/TRPCClientError.d.ts +13 -10
  2. package/dist/TRPCClientError.d.ts.map +1 -1
  3. package/package.json +4 -4
  4. package/src/TRPCClientError.ts +29 -17
  5. package/src/links/wsLink.ts +1 -1
package/dist/TRPCClientError.d.ts CHANGED
@@ -1,22 +1,25 @@
1
- import { AnyRouter, Maybe, inferRouterError } from '@trpc/server';
1
+ import { AnyRouter, Maybe, Procedure, inferRouterError } from '@trpc/server';
2
2
  import { TRPCErrorResponse } from '@trpc/server/rpc';
3
- export interface TRPCClientErrorLike<TRouter extends AnyRouter> {
3
+ declare type RouterOrProcedure = AnyRouter | Procedure<any>;
4
+ declare type inferErrorShape<TRouterOrProcedure extends AnyRouter | Procedure<any>> = TRouterOrProcedure extends AnyRouter ? inferRouterError<TRouterOrProcedure> : TRouterOrProcedure['_def']['_config']['errorShape'];
5
+ export interface TRPCClientErrorLike<TRouterOrProcedure extends RouterOrProcedure> {
4
6
  readonly message: string;
5
- readonly shape: Maybe<inferRouterError<TRouter>>;
6
- readonly data: Maybe<inferRouterError<TRouter>['data']>;
7
+ readonly shape: Maybe<inferErrorShape<TRouterOrProcedure>>;
8
+ readonly data: Maybe<inferErrorShape<TRouterOrProcedure>['data']>;
7
9
  }
8
- export declare class TRPCClientError<TRouter extends AnyRouter> extends Error implements TRPCClientErrorLike<TRouter> {
10
+ export declare class TRPCClientError<TRouterOrProcedure extends RouterOrProcedure> extends Error implements TRPCClientErrorLike<TRouterOrProcedure> {
9
11
  readonly cause: Error | undefined;
10
- readonly shape: Maybe<inferRouterError<TRouter>>;
11
- readonly data: Maybe<inferRouterError<TRouter>['data']>;
12
+ readonly shape: Maybe<inferErrorShape<TRouterOrProcedure>>;
13
+ readonly data: Maybe<inferErrorShape<TRouterOrProcedure>['data']>;
12
14
  readonly meta: Record<string, unknown> | undefined;
13
15
  constructor(message: string, opts?: {
14
- result?: Maybe<TRPCErrorResponse<inferRouterError<TRouter>>>;
16
+ result?: Maybe<inferErrorShape<TRouterOrProcedure>>;
15
17
  cause?: Error;
16
18
  meta?: Record<string, unknown>;
17
19
  });
18
- static from<TRouter extends AnyRouter>(cause: Error | TRPCErrorResponse<any>, opts?: {
20
+ static from<TRouterOrProcedure extends RouterOrProcedure>(cause: Error | TRPCErrorResponse<any>, opts?: {
19
21
  meta?: Record<string, unknown>;
20
- }): TRPCClientError<TRouter>;
22
+ }): TRPCClientError<TRouterOrProcedure>;
21
23
  }
24
+ export {};
22
25
  //# sourceMappingURL=TRPCClientError.d.ts.map
package/dist/TRPCClientError.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,mBAAmB,CAAC,OAAO,SAAS,SAAS;IAC5D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;CACzD;AAED,qBAAa,eAAe,CAAC,OAAO,SAAS,SAAS,CACpD,SAAQ,KACR,YAAW,mBAAmB,CAAC,OAAO,CAAC;IAEvC,SAAgB,KAAK,oBAAC;IACtB,SAAgB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,SAAgB,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,SAAgB,IAAI,sCAAC;gBAGnB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC7D,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,OAAO,SAAS,SAAS,EAC1C,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACrC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,OAAO,CAAC;CAkB5B"}
1
+ {"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,aAAK,iBAAiB,GAAG,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;AAEpD,aAAK,eAAe,CAAC,kBAAkB,SAAS,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,IACxE,kBAAkB,SAAS,SAAS,GAChC,gBAAgB,CAAC,kBAAkB,CAAC,GACpC,kBAAkB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC;AAE1D,MAAM,WAAW,mBAAmB,CAClC,kBAAkB,SAAS,iBAAiB;IAE5C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC3D,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;CACnE;AAED,qBAAa,eAAe,CAAC,kBAAkB,SAAS,iBAAiB,CACvE,SAAQ,KACR,YAAW,mBAAmB,CAAC,kBAAkB,CAAC;IAElD,SAAgB,KAAK,oBAAC;IACtB,SAAgB,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAClE,SAAgB,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,SAAgB,IAAI,sCAAC;gBAGnB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACpD,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,kBAAkB,SAAS,iBAAiB,EAC7D,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACrC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,kBAAkB,CAAC;CAqBvC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/client",
3
- "version": "10.0.0-alpha.43",
3
+ "version": "10.0.0-alpha.44",
4
4
  "description": "tRPC Client lib",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -67,13 +67,13 @@
67
67
  "@babel/runtime": "^7.9.0"
68
68
  },
69
69
  "peerDependencies": {
70
- "@trpc/server": "10.0.0-alpha.43"
70
+ "@trpc/server": "10.0.0-alpha.44"
71
71
  },
72
72
  "devDependencies": {
73
- "@trpc/server": "10.0.0-alpha.43"
73
+ "@trpc/server": "10.0.0-alpha.44"
74
74
  },
75
75
  "publishConfig": {
76
76
  "access": "public"
77
77
  },
78
- "gitHead": "aa47943ffce5844c9bc5d48a4103d766e14d42d9"
78
+ "gitHead": "02ec6d14567380810f64ffbd82f18f8dcde07fd4"
79
79
  }
package/src/TRPCClientError.ts CHANGED
@@ -1,25 +1,34 @@
1
- import { AnyRouter, Maybe, inferRouterError } from '@trpc/server';
1
+ import { AnyRouter, Maybe, Procedure, inferRouterError } from '@trpc/server';
2
2
  import { TRPCErrorResponse } from '@trpc/server/rpc';
3
3
 
4
- export interface TRPCClientErrorLike<TRouter extends AnyRouter> {
4
+ type RouterOrProcedure = AnyRouter | Procedure<any>;
5
+
6
+ type inferErrorShape<TRouterOrProcedure extends AnyRouter | Procedure<any>> =
7
+ TRouterOrProcedure extends AnyRouter
8
+ ? inferRouterError<TRouterOrProcedure>
9
+ : TRouterOrProcedure['_def']['_config']['errorShape'];
10
+
11
+ export interface TRPCClientErrorLike<
12
+ TRouterOrProcedure extends RouterOrProcedure,
13
+ > {
5
14
  readonly message: string;
6
- readonly shape: Maybe<inferRouterError<TRouter>>;
7
- readonly data: Maybe<inferRouterError<TRouter>['data']>;
15
+ readonly shape: Maybe<inferErrorShape<TRouterOrProcedure>>;
16
+ readonly data: Maybe<inferErrorShape<TRouterOrProcedure>['data']>;
8
17
  }
9
18
 
10
- export class TRPCClientError<TRouter extends AnyRouter>
19
+ export class TRPCClientError<TRouterOrProcedure extends RouterOrProcedure>
11
20
  extends Error
12
- implements TRPCClientErrorLike<TRouter>
21
+ implements TRPCClientErrorLike<TRouterOrProcedure>
13
22
  {
14
23
  public readonly cause;
15
- public readonly shape: Maybe<inferRouterError<TRouter>>;
16
- public readonly data: Maybe<inferRouterError<TRouter>['data']>;
24
+ public readonly shape: Maybe<inferErrorShape<TRouterOrProcedure>>;
25
+ public readonly data: Maybe<inferErrorShape<TRouterOrProcedure>['data']>;
17
26
  public readonly meta;
18
27
 
19
28
  constructor(
20
29
  message: string,
21
30
  opts?: {
22
- result?: Maybe<TRPCErrorResponse<inferRouterError<TRouter>>>;
31
+ result?: Maybe<inferErrorShape<TRouterOrProcedure>>;
23
32
  cause?: Error;
24
33
  meta?: Record<string, unknown>;
25
34
  },
@@ -40,22 +49,25 @@ export class TRPCClientError<TRouter extends AnyRouter>
40
49
  Object.setPrototypeOf(this, TRPCClientError.prototype);
41
50
  }
42
51
 
43
- public static from<TRouter extends AnyRouter>(
52
+ public static from<TRouterOrProcedure extends RouterOrProcedure>(
44
53
  cause: Error | TRPCErrorResponse<any>,
45
54
  opts: { meta?: Record<string, unknown> } = {},
46
- ): TRPCClientError<TRouter> {
55
+ ): TRPCClientError<TRouterOrProcedure> {
47
56
  if (!(cause instanceof Error)) {
48
- return new TRPCClientError<TRouter>((cause.error as any).message ?? '', {
49
- ...opts,
50
- cause: undefined,
51
- result: cause,
52
- });
57
+ return new TRPCClientError<TRouterOrProcedure>(
58
+ (cause.error as any).message ?? '',
59
+ {
60
+ ...opts,
61
+ cause: undefined,
62
+ result: cause as any,
63
+ },
64
+ );
53
65
  }
54
66
  if (cause.name === 'TRPCClientError') {
55
67
  return cause as TRPCClientError<any>;
56
68
  }
57
69
 
58
- return new TRPCClientError<TRouter>(cause.message, {
70
+ return new TRPCClientError<TRouterOrProcedure>(cause.message, {
59
71
  ...opts,
60
72
  cause,
61
73
  result: null,
package/src/links/wsLink.ts CHANGED
@@ -317,7 +317,7 @@ export function wsLink<TRouter extends AnyRouter>(
317
317
  {
318
318
  error(err) {
319
319
  isDone = true;
320
- observer.error(err);
320
+ observer.error(err as any);
321
321
  unsub();
322
322
  },
323
323
  complete() {