@trpc/client 10.26.0 → 10.27.0

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.
@@ -1,14 +1,14 @@
1
1
  import { AnyProcedure, AnyRouter, DefaultErrorShape, Maybe, inferRouterError } from '@trpc/server';
2
- import { TRPCErrorResponse } from '@trpc/server/rpc';
3
- declare type RouterOrProcedure = AnyRouter | AnyProcedure;
4
- declare type inferErrorShape<TRouterOrProcedure extends RouterOrProcedure> = TRouterOrProcedure extends AnyRouter ? inferRouterError<TRouterOrProcedure> : TRouterOrProcedure['_def']['_config']['$types']['errorShape'];
2
+ import { TRPCErrorResponse, TRPCErrorShape } from '@trpc/server/rpc';
3
+ declare type ErrorInferrable = AnyRouter | AnyProcedure | TRPCErrorShape<number>;
4
+ declare type inferErrorShape<TInferrable extends ErrorInferrable> = TInferrable extends AnyRouter ? inferRouterError<TInferrable> : TInferrable extends AnyProcedure ? TInferrable['_def']['_config']['$types']['errorShape'] : TInferrable;
5
5
  export interface TRPCClientErrorBase<TShape extends DefaultErrorShape> {
6
6
  readonly message: string;
7
7
  readonly shape: Maybe<TShape>;
8
8
  readonly data: Maybe<TShape['data']>;
9
9
  }
10
- export declare type TRPCClientErrorLike<TRouterOrProcedure extends RouterOrProcedure> = TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>>;
11
- export declare class TRPCClientError<TRouterOrProcedure extends RouterOrProcedure> extends Error implements TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>> {
10
+ export declare type TRPCClientErrorLike<TRouterOrProcedure extends ErrorInferrable> = TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>>;
11
+ export declare class TRPCClientError<TRouterOrProcedure extends ErrorInferrable> extends Error implements TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>> {
12
12
  readonly cause: Error | undefined;
13
13
  readonly shape: Maybe<inferErrorShape<TRouterOrProcedure>>;
14
14
  readonly data: Maybe<inferErrorShape<TRouterOrProcedure>['data']>;
@@ -18,7 +18,7 @@ export declare class TRPCClientError<TRouterOrProcedure extends RouterOrProcedur
18
18
  cause?: Error;
19
19
  meta?: Record<string, unknown>;
20
20
  });
21
- static from<TRouterOrProcedure extends RouterOrProcedure>(cause: Error | TRPCErrorResponse<any>, opts?: {
21
+ static from<TRouterOrProcedure extends ErrorInferrable>(cause: Error | TRPCErrorResponse<any>, opts?: {
22
22
  meta?: Record<string, unknown>;
23
23
  }): TRPCClientError<TRouterOrProcedure>;
24
24
  }
@@ -1 +1 @@
1
- {"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,KAAK,EACL,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,aAAK,iBAAiB,GAAG,SAAS,GAAG,YAAY,CAAC;AAElD,aAAK,eAAe,CAAC,kBAAkB,SAAS,iBAAiB,IAC/D,kBAAkB,SAAS,SAAS,GAChC,gBAAgB,CAAC,kBAAkB,CAAC,GACpC,kBAAkB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;AAEpE,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,iBAAiB;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;CACtC;AACD,oBAAY,mBAAmB,CAAC,kBAAkB,SAAS,iBAAiB,IAC1E,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAE3D,qBAAa,eAAe,CAAC,kBAAkB,SAAS,iBAAiB,CACvE,SAAQ,KACR,YAAW,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAEnE,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"}
1
+ {"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,KAAK,EACL,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAErE,aAAK,eAAe,GAAG,SAAS,GAAG,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;AAEzE,aAAK,eAAe,CAAC,WAAW,SAAS,eAAe,IACtD,WAAW,SAAS,SAAS,GACzB,gBAAgB,CAAC,WAAW,CAAC,GAC7B,WAAW,SAAS,YAAY,GAChC,WAAW,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,GACtD,WAAW,CAAC;AAElB,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,iBAAiB;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;CACtC;AACD,oBAAY,mBAAmB,CAAC,kBAAkB,SAAS,eAAe,IACxE,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAE3D,qBAAa,eAAe,CAAC,kBAAkB,SAAS,eAAe,CACrE,SAAQ,KACR,YAAW,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAEnE,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,eAAe,EAC3D,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/dist/index.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var observable = require('@trpc/server/observable');
6
- var transformResult = require('./transformResult-ee98835f.js');
6
+ var transformResult = require('./transformResult-70f95ffb.js');
7
7
  var links_splitLink = require('./splitLink-f29e84be.js');
8
8
  var shared = require('@trpc/server/shared');
9
9
  var httpUtils = require('./httpUtils-90a6bccb.js');
package/dist/index.mjs CHANGED
@@ -1,6 +1,6 @@
1
1
  import { share, observableToPromise } from '@trpc/server/observable';
2
- import { T as TRPCClientError } from './transformResult-a4d3dad0.mjs';
3
- export { T as TRPCClientError } from './transformResult-a4d3dad0.mjs';
2
+ import { T as TRPCClientError } from './transformResult-9a244fe7.mjs';
3
+ export { T as TRPCClientError } from './transformResult-9a244fe7.mjs';
4
4
  import { c as createChain } from './splitLink-4c75f7be.mjs';
5
5
  export { s as splitLink } from './splitLink-4c75f7be.mjs';
6
6
  import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
@@ -1 +1 @@
1
- {"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAIxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EACL,mBAAmB,EAKpB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE3D,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,OAAO,CAAC,EACJ,WAAW,GACX,CAAC,CAAC,IAAI,EAAE;QACN,MAAM,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;KAClC,KAAK,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CAC/C;AAED,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA2GnB"}
1
+ {"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAIxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EACL,mBAAmB,EAKpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE3D,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,OAAO,CAAC,EACJ,WAAW,GACX,CAAC,CAAC,IAAI,EAAE;QACN,MAAM,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;KAClC,KAAK,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CAC/C;AAED,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA2GnB"}
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var observable = require('@trpc/server/observable');
6
- var transformResult = require('../transformResult-ee98835f.js');
6
+ var transformResult = require('../transformResult-70f95ffb.js');
7
7
  var httpUtils = require('../httpUtils-90a6bccb.js');
8
8
 
9
9
  /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
@@ -1,5 +1,5 @@
1
1
  import { observable } from '@trpc/server/observable';
2
- import { t as transformResult, T as TRPCClientError } from '../transformResult-a4d3dad0.mjs';
2
+ import { t as transformResult, T as TRPCClientError } from '../transformResult-9a244fe7.mjs';
3
3
  import { r as resolveHTTPLinkOptions, a as getUrl, j as jsonHttpRequester } from '../httpUtils-8a5c637a.mjs';
4
4
 
5
5
  /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
@@ -1 +1 @@
1
- {"version":3,"file":"httpLink.d.ts","sourceRoot":"","sources":["../../src/links/httpLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EACL,mBAAmB,EACnB,SAAS,EAGV,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE3D,MAAM,WAAW,eAAgB,SAAQ,mBAAmB;IAC1D;;;OAGG;IACH,OAAO,CAAC,EACJ,WAAW,GACX,CAAC,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,KAAK,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CACvE;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,qCAE3D,eAAe,uBAmDxB;AAED,eAAO,MAAM,QAAQ,oCArDX,eAAe,sBAqDgD,CAAC"}
1
+ {"version":3,"file":"httpLink.d.ts","sourceRoot":"","sources":["../../src/links/httpLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,OAAO,EACL,mBAAmB,EACnB,SAAS,EAGV,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE3D,MAAM,WAAW,eAAgB,SAAQ,mBAAmB;IAC1D;;;OAGG;IACH,OAAO,CAAC,EACJ,WAAW,GACX,CAAC,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,KAAK,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CACvE;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,qCAE3D,eAAe,uBAmDxB;AAED,eAAO,MAAM,QAAQ,oCArDX,eAAe,sBAqDgD,CAAC"}
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var observable = require('@trpc/server/observable');
6
- var transformResult = require('../transformResult-ee98835f.js');
6
+ var transformResult = require('../transformResult-70f95ffb.js');
7
7
  var httpUtils = require('../httpUtils-90a6bccb.js');
8
8
 
9
9
  function httpLinkFactory(factoryOpts) {
@@ -1,5 +1,5 @@
1
1
  import { observable } from '@trpc/server/observable';
2
- import { t as transformResult, T as TRPCClientError } from '../transformResult-a4d3dad0.mjs';
2
+ import { t as transformResult, T as TRPCClientError } from '../transformResult-9a244fe7.mjs';
3
3
  import { r as resolveHTTPLinkOptions, j as jsonHttpRequester } from '../httpUtils-8a5c637a.mjs';
4
4
 
5
5
  function httpLinkFactory(factoryOpts) {
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var observable = require('@trpc/server/observable');
6
- var transformResult = require('../transformResult-ee98835f.js');
6
+ var transformResult = require('../transformResult-70f95ffb.js');
7
7
 
8
8
  /* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
9
9
 
@@ -1,5 +1,5 @@
1
1
  import { observable } from '@trpc/server/observable';
2
- import { T as TRPCClientError, t as transformResult } from '../transformResult-a4d3dad0.mjs';
2
+ import { T as TRPCClientError, t as transformResult } from '../transformResult-9a244fe7.mjs';
3
3
 
4
4
  /* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
5
5
 
@@ -0,0 +1,2 @@
1
+ export * from './transformResult';
2
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC"}
@@ -0,0 +1,9 @@
1
+ 'use strict';
2
+
3
+ Object.defineProperty(exports, '__esModule', { value: true });
4
+
5
+ var transformResult = require('../transformResult-70f95ffb.js');
6
+
7
+
8
+
9
+ exports.transformResult = transformResult.transformResult;
@@ -0,0 +1 @@
1
+ export { t as transformResult } from '../transformResult-9a244fe7.mjs';
@@ -1,6 +1,6 @@
1
1
  import { AnyRouter, inferRouterError } from '@trpc/server';
2
2
  import { TRPCResponse, TRPCResponseMessage } from '@trpc/server/rpc';
3
- import { TRPCClientRuntime } from '..';
3
+ import { TRPCClientRuntime } from '../links';
4
4
  /** @internal */
5
5
  declare function transformResultInner<TRouter extends AnyRouter, TOutput>(response: TRPCResponseMessage<TOutput, inferRouterError<TRouter>> | TRPCResponse<TOutput, inferRouterError<TRouter>>, runtime: TRPCClientRuntime): {
6
6
  readonly ok: false;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"transformResult.d.ts","sourceRoot":"","sources":["../../src/shared/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAM7C,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACvD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EACpD,OAAO,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;EAuB3B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACvD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EACpD,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/client",
3
- "version": "10.26.0",
3
+ "version": "10.27.0",
4
4
  "description": "The tRPC client library",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -59,6 +59,11 @@
59
59
  "import": "./dist/links/wsLink.mjs",
60
60
  "require": "./dist/links/wsLink.js",
61
61
  "default": "./dist/links/wsLink.js"
62
+ },
63
+ "./shared": {
64
+ "import": "./dist/shared/index.mjs",
65
+ "require": "./dist/shared/index.js",
66
+ "default": "./dist/shared/index.js"
62
67
  }
63
68
  },
64
69
  "files": [
@@ -66,14 +71,15 @@
66
71
  "src",
67
72
  "README.md",
68
73
  "package.json",
69
- "links"
74
+ "links",
75
+ "shared"
70
76
  ],
71
77
  "peerDependencies": {
72
- "@trpc/server": "10.26.0"
78
+ "@trpc/server": "10.27.0"
73
79
  },
74
80
  "devDependencies": {
75
81
  "@testing-library/dom": "^9.0.0",
76
- "@trpc/server": "10.26.0",
82
+ "@trpc/server": "10.27.0",
77
83
  "@types/isomorphic-fetch": "^0.0.36",
78
84
  "@types/node": "^18.7.20",
79
85
  "eslint": "^8.40.0",
@@ -88,5 +94,5 @@
88
94
  "publishConfig": {
89
95
  "access": "public"
90
96
  },
91
- "gitHead": "877c5b499676e21e7ebdf79eacde300ffc03325d"
97
+ "gitHead": "e6c8ff151ba15273361e9df233fe17b7d0f6db36"
92
98
  }
@@ -0,0 +1 @@
1
+ export * from '../dist/shared';
@@ -0,0 +1 @@
1
+ module.exports = require('../dist/shared');
@@ -5,24 +5,26 @@ import {
5
5
  Maybe,
6
6
  inferRouterError,
7
7
  } from '@trpc/server';
8
- import { TRPCErrorResponse } from '@trpc/server/rpc';
8
+ import { TRPCErrorResponse, TRPCErrorShape } from '@trpc/server/rpc';
9
9
 
10
- type RouterOrProcedure = AnyRouter | AnyProcedure;
10
+ type ErrorInferrable = AnyRouter | AnyProcedure | TRPCErrorShape<number>;
11
11
 
12
- type inferErrorShape<TRouterOrProcedure extends RouterOrProcedure> =
13
- TRouterOrProcedure extends AnyRouter
14
- ? inferRouterError<TRouterOrProcedure>
15
- : TRouterOrProcedure['_def']['_config']['$types']['errorShape'];
12
+ type inferErrorShape<TInferrable extends ErrorInferrable> =
13
+ TInferrable extends AnyRouter
14
+ ? inferRouterError<TInferrable>
15
+ : TInferrable extends AnyProcedure
16
+ ? TInferrable['_def']['_config']['$types']['errorShape']
17
+ : TInferrable;
16
18
 
17
19
  export interface TRPCClientErrorBase<TShape extends DefaultErrorShape> {
18
20
  readonly message: string;
19
21
  readonly shape: Maybe<TShape>;
20
22
  readonly data: Maybe<TShape['data']>;
21
23
  }
22
- export type TRPCClientErrorLike<TRouterOrProcedure extends RouterOrProcedure> =
24
+ export type TRPCClientErrorLike<TRouterOrProcedure extends ErrorInferrable> =
23
25
  TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>>;
24
26
 
25
- export class TRPCClientError<TRouterOrProcedure extends RouterOrProcedure>
27
+ export class TRPCClientError<TRouterOrProcedure extends ErrorInferrable>
26
28
  extends Error
27
29
  implements TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>>
28
30
  {
@@ -55,7 +57,7 @@ export class TRPCClientError<TRouterOrProcedure extends RouterOrProcedure>
55
57
  Object.setPrototypeOf(this, TRPCClientError.prototype);
56
58
  }
57
59
 
58
- public static from<TRouterOrProcedure extends RouterOrProcedure>(
60
+ public static from<TRouterOrProcedure extends ErrorInferrable>(
59
61
  cause: Error | TRPCErrorResponse<any>,
60
62
  opts: { meta?: Record<string, unknown> } = {},
61
63
  ): TRPCClientError<TRouterOrProcedure> {
@@ -3,6 +3,7 @@ import { observable } from '@trpc/server/observable';
3
3
  import { TRPCClientError } from '../TRPCClientError';
4
4
  import { dataLoader } from '../internals/dataLoader';
5
5
  import { NonEmptyArray } from '../internals/types';
6
+ import { transformResult } from '../shared/transformResult';
6
7
  import {
7
8
  HTTPLinkBaseOptions,
8
9
  HTTPResult,
@@ -10,7 +11,6 @@ import {
10
11
  jsonHttpRequester,
11
12
  resolveHTTPLinkOptions,
12
13
  } from './internals/httpUtils';
13
- import { transformResult } from './internals/transformResult';
14
14
  import { HTTPHeaders, Operation, TRPCLink } from './types';
15
15
 
16
16
  export interface HttpBatchLinkOptions extends HTTPLinkBaseOptions {
@@ -1,13 +1,13 @@
1
1
  import { AnyRouter } from '@trpc/server';
2
2
  import { observable } from '@trpc/server/observable';
3
3
  import { TRPCClientError } from '../TRPCClientError';
4
+ import { transformResult } from '../shared/transformResult';
4
5
  import {
5
6
  HTTPLinkBaseOptions,
6
7
  Requester,
7
8
  jsonHttpRequester,
8
9
  resolveHTTPLinkOptions,
9
10
  } from './internals/httpUtils';
10
- import { transformResult } from './internals/transformResult';
11
11
  import { HTTPHeaders, Operation, TRPCLink } from './types';
12
12
 
13
13
  export interface HTTPLinkOptions extends HTTPLinkBaseOptions {
@@ -9,7 +9,7 @@ import {
9
9
  } from '@trpc/server/rpc';
10
10
  import { TRPCClientError } from '../TRPCClientError';
11
11
  import { retryDelay } from '../internals/retryDelay';
12
- import { transformResult } from './internals/transformResult';
12
+ import { transformResult } from '../shared/transformResult';
13
13
  import { Operation, TRPCLink } from './types';
14
14
 
15
15
  type WSCallbackResult<TRouter extends AnyRouter, TOutput> = TRPCResponseMessage<
@@ -0,0 +1 @@
1
+ export * from './transformResult';
@@ -4,9 +4,9 @@ import {
4
4
  TRPCResponseMessage,
5
5
  TRPCResultMessage,
6
6
  } from '@trpc/server/rpc';
7
- import { TRPCClientRuntime } from '..';
8
- import { TRPCClientError } from '../../TRPCClientError';
9
- import { isObject } from './isObject';
7
+ import { TRPCClientError } from '../TRPCClientError';
8
+ import { TRPCClientRuntime } from '../links';
9
+ import { isObject } from '../links/internals/isObject';
10
10
 
11
11
  // FIXME:
12
12
  // - the generics here are probably unnecessary
@@ -1 +0,0 @@
1
- {"version":3,"file":"transformResult.d.ts","sourceRoot":"","sources":["../../../src/links/internals/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAOvC,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACvD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EACpD,OAAO,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;EAuB3B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACvD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EACpD,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}