@trpc/client 10.38.2 → 10.38.4

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 (32) hide show
  1. package/dist/{TRPCClientError-fef6cf44.mjs → TRPCClientError-0de4d231.mjs} +21 -11
  2. package/dist/{TRPCClientError-8462a9bf.js → TRPCClientError-23c8aa93.js} +23 -10
  3. package/dist/{TRPCClientError-dffb44e0.js → TRPCClientError-e224e397.js} +21 -11
  4. package/dist/TRPCClientError.d.ts +1 -1
  5. package/dist/TRPCClientError.d.ts.map +1 -1
  6. package/dist/{httpBatchLink-8b963505.js → httpBatchLink-78d2f90a.js} +3 -3
  7. package/dist/{httpBatchLink-7ecce46b.js → httpBatchLink-abfe4d66.js} +3 -3
  8. package/dist/{httpBatchLink-64296887.mjs → httpBatchLink-cee1f56c.mjs} +3 -3
  9. package/dist/{httpUtils-e8fecf0a.mjs → httpUtils-0cb58db4.mjs} +1 -1
  10. package/dist/{httpUtils-b94fce6f.js → httpUtils-b0a649f7.js} +1 -1
  11. package/dist/{httpUtils-5142e9e1.js → httpUtils-cc0625f8.js} +1 -1
  12. package/dist/index.js +4 -4
  13. package/dist/index.mjs +7 -7
  14. package/dist/internals/isObject.d.ts.map +1 -0
  15. package/dist/links/httpBatchLink.js +4 -4
  16. package/dist/links/httpBatchLink.mjs +4 -4
  17. package/dist/links/httpLink.js +3 -3
  18. package/dist/links/httpLink.mjs +3 -3
  19. package/dist/links/wsLink.js +2 -2
  20. package/dist/links/wsLink.mjs +2 -2
  21. package/dist/shared/index.js +1 -1
  22. package/dist/shared/index.mjs +1 -1
  23. package/dist/shared/transformResult.d.ts.map +1 -1
  24. package/dist/{transformResult-7ab522e6.mjs → transformResult-ace864b8.mjs} +1 -1
  25. package/dist/{transformResult-82684494.js → transformResult-c1422cb5.js} +1 -1
  26. package/dist/{transformResult-26a22823.js → transformResult-dfce8f15.js} +1 -0
  27. package/package.json +4 -4
  28. package/src/TRPCClientError.ts +28 -15
  29. package/src/shared/transformResult.ts +1 -1
  30. package/dist/links/internals/isObject.d.ts.map +0 -1
  31. /package/dist/{links/internals → internals}/isObject.d.ts +0 -0
  32. /package/src/{links/internals → internals}/isObject.ts +0 -0
@@ -1,18 +1,17 @@
1
+ import { i as isObject } from './transformResult-ace864b8.mjs';
2
+
1
3
  function isTRPCClientError(cause) {
2
4
  return cause instanceof TRPCClientError || /**
3
5
  * @deprecated
4
6
  * Delete in next major
5
- */ cause.name === 'TRPCClientError';
7
+ */ cause instanceof Error && cause.name === 'TRPCClientError';
8
+ }
9
+ function isTRPCErrorResponse(obj) {
10
+ return isObject(obj) && isObject(obj.error) && typeof obj.error.code === 'number' && typeof obj.error.message === 'string';
6
11
  }
7
12
  class TRPCClientError extends Error {
8
- static from(cause, opts = {}) {
9
- if (!(cause instanceof Error)) {
10
- return new TRPCClientError(cause.error.message ?? '', {
11
- ...opts,
12
- cause: undefined,
13
- result: cause
14
- });
15
- }
13
+ static from(_cause, opts = {}) {
14
+ const cause = _cause;
16
15
  if (isTRPCClientError(cause)) {
17
16
  if (opts.meta) {
18
17
  // Decorate with meta error data
@@ -23,10 +22,21 @@ class TRPCClientError extends Error {
23
22
  }
24
23
  return cause;
25
24
  }
25
+ if (isTRPCErrorResponse(cause)) {
26
+ return new TRPCClientError(cause.error.message, {
27
+ ...opts,
28
+ result: cause
29
+ });
30
+ }
31
+ if (!(cause instanceof Error)) {
32
+ return new TRPCClientError('Unknown error', {
33
+ ...opts,
34
+ cause: cause
35
+ });
36
+ }
26
37
  return new TRPCClientError(cause.message, {
27
38
  ...opts,
28
- cause,
29
- result: null
39
+ cause
30
40
  });
31
41
  }
32
42
  constructor(message, opts){
@@ -1,10 +1,18 @@
1
+ import { i as isObject } from './transformResult-c1422cb5.js';
2
+
1
3
  function isTRPCClientError(cause) {
2
4
  return (cause instanceof TRPCClientError ||
3
5
  /**
4
6
  * @deprecated
5
7
  * Delete in next major
6
8
  */
7
- cause.name === 'TRPCClientError');
9
+ (cause instanceof Error && cause.name === 'TRPCClientError'));
10
+ }
11
+ function isTRPCErrorResponse(obj) {
12
+ return (isObject(obj) &&
13
+ isObject(obj.error) &&
14
+ typeof obj.error.code === 'number' &&
15
+ typeof obj.error.message === 'string');
8
16
  }
9
17
  class TRPCClientError extends Error {
10
18
  constructor(message, opts) {
@@ -19,14 +27,8 @@ class TRPCClientError extends Error {
19
27
  this.name = 'TRPCClientError';
20
28
  Object.setPrototypeOf(this, TRPCClientError.prototype);
21
29
  }
22
- static from(cause, opts = {}) {
23
- if (!(cause instanceof Error)) {
24
- return new TRPCClientError(cause.error.message ?? '', {
25
- ...opts,
26
- cause: undefined,
27
- result: cause,
28
- });
29
- }
30
+ static from(_cause, opts = {}) {
31
+ const cause = _cause;
30
32
  if (isTRPCClientError(cause)) {
31
33
  if (opts.meta) {
32
34
  // Decorate with meta error data
@@ -37,10 +39,21 @@ class TRPCClientError extends Error {
37
39
  }
38
40
  return cause;
39
41
  }
42
+ if (isTRPCErrorResponse(cause)) {
43
+ return new TRPCClientError(cause.error.message, {
44
+ ...opts,
45
+ result: cause,
46
+ });
47
+ }
48
+ if (!(cause instanceof Error)) {
49
+ return new TRPCClientError('Unknown error', {
50
+ ...opts,
51
+ cause: cause,
52
+ });
53
+ }
40
54
  return new TRPCClientError(cause.message, {
41
55
  ...opts,
42
56
  cause,
43
- result: null,
44
57
  });
45
58
  }
46
59
  }
@@ -1,20 +1,19 @@
1
1
  'use strict';
2
2
 
3
+ var transformResult = require('./transformResult-dfce8f15.js');
4
+
3
5
  function isTRPCClientError(cause) {
4
6
  return cause instanceof TRPCClientError || /**
5
7
  * @deprecated
6
8
  * Delete in next major
7
- */ cause.name === 'TRPCClientError';
9
+ */ cause instanceof Error && cause.name === 'TRPCClientError';
10
+ }
11
+ function isTRPCErrorResponse(obj) {
12
+ return transformResult.isObject(obj) && transformResult.isObject(obj.error) && typeof obj.error.code === 'number' && typeof obj.error.message === 'string';
8
13
  }
9
14
  class TRPCClientError extends Error {
10
- static from(cause, opts = {}) {
11
- if (!(cause instanceof Error)) {
12
- return new TRPCClientError(cause.error.message ?? '', {
13
- ...opts,
14
- cause: undefined,
15
- result: cause
16
- });
17
- }
15
+ static from(_cause, opts = {}) {
16
+ const cause = _cause;
18
17
  if (isTRPCClientError(cause)) {
19
18
  if (opts.meta) {
20
19
  // Decorate with meta error data
@@ -25,10 +24,21 @@ class TRPCClientError extends Error {
25
24
  }
26
25
  return cause;
27
26
  }
27
+ if (isTRPCErrorResponse(cause)) {
28
+ return new TRPCClientError(cause.error.message, {
29
+ ...opts,
30
+ result: cause
31
+ });
32
+ }
33
+ if (!(cause instanceof Error)) {
34
+ return new TRPCClientError('Unknown error', {
35
+ ...opts,
36
+ cause: cause
37
+ });
38
+ }
28
39
  return new TRPCClientError(cause.message, {
29
40
  ...opts,
30
- cause,
31
- result: null
41
+ cause
32
42
  });
33
43
  }
34
44
  constructor(message, opts){
@@ -22,7 +22,7 @@ export declare class TRPCClientError<TRouterOrProcedure extends ErrorInferrable>
22
22
  cause?: Error;
23
23
  meta?: Record<string, unknown>;
24
24
  });
25
- static from<TRouterOrProcedure extends ErrorInferrable>(cause: Error | TRPCErrorResponse<any>, opts?: {
25
+ static from<TRouterOrProcedure extends ErrorInferrable>(_cause: Error | TRPCErrorResponse<any>, opts?: {
26
26
  meta?: Record<string, unknown>;
27
27
  }): TRPCClientError<TRouterOrProcedure>;
28
28
  }
@@ -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,gBAAgB,EAChB,KAAK,EACN,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAErE,KAAK,eAAe,GAAG,YAAY,GAAG,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;AAEzE,KAAK,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,MAAM,MAAM,mBAAmB,CAAC,kBAAkB,SAAS,eAAe,IACxE,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAa3D,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;IAEzE;;;OAGG;IACI,IAAI,sCAAC;gBAGV,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;CA4BvC"}
1
+ {"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,KAAK,EACN,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGrE,KAAK,eAAe,GAAG,YAAY,GAAG,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;AAEzE,KAAK,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,MAAM,MAAM,mBAAmB,CAAC,kBAAkB,SAAS,eAAe,IACxE,mBAAmB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAsB3D,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;IAEzE;;;OAGG;IACI,IAAI,sCAAC;gBAGV,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,MAAM,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACtC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,kBAAkB,CAAC;CA+BvC"}
@@ -1,9 +1,9 @@
1
1
  'use strict';
2
2
 
3
3
  var observable = require('@trpc/server/observable');
4
- var transformResult = require('./transformResult-26a22823.js');
5
- var TRPCClientError = require('./TRPCClientError-dffb44e0.js');
6
- var httpUtils = require('./httpUtils-b94fce6f.js');
4
+ var transformResult = require('./transformResult-dfce8f15.js');
5
+ var TRPCClientError = require('./TRPCClientError-e224e397.js');
6
+ var httpUtils = require('./httpUtils-b0a649f7.js');
7
7
 
8
8
  /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
9
9
  * A function that should never be called unless we messed something up.
@@ -1,7 +1,7 @@
1
1
  import { observable } from '@trpc/server/observable';
2
- import { t as transformResult } from './transformResult-82684494.js';
3
- import { T as TRPCClientError } from './TRPCClientError-8462a9bf.js';
4
- import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-5142e9e1.js';
2
+ import { t as transformResult } from './transformResult-c1422cb5.js';
3
+ import { T as TRPCClientError } from './TRPCClientError-23c8aa93.js';
4
+ import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-cc0625f8.js';
5
5
 
6
6
  /**
7
7
  * A function that should never be called unless we messed something up.
@@ -1,7 +1,7 @@
1
1
  import { observable } from '@trpc/server/observable';
2
- import { t as transformResult } from './transformResult-7ab522e6.mjs';
3
- import { T as TRPCClientError } from './TRPCClientError-fef6cf44.mjs';
4
- import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-e8fecf0a.mjs';
2
+ import { t as transformResult } from './transformResult-ace864b8.mjs';
3
+ import { T as TRPCClientError } from './TRPCClientError-0de4d231.mjs';
4
+ import { r as resolveHTTPLinkOptions, g as getUrl, j as jsonHttpRequester } from './httpUtils-0cb58db4.mjs';
5
5
 
6
6
  /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
7
7
  * A function that should never be called unless we messed something up.
@@ -1,4 +1,4 @@
1
- import { T as TRPCClientError } from './TRPCClientError-fef6cf44.mjs';
1
+ import { T as TRPCClientError } from './TRPCClientError-0de4d231.mjs';
2
2
 
3
3
  const isFunction = (fn)=>typeof fn === 'function';
4
4
  function getFetch(customFetchImpl) {
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var TRPCClientError = require('./TRPCClientError-dffb44e0.js');
3
+ var TRPCClientError = require('./TRPCClientError-e224e397.js');
4
4
 
5
5
  const isFunction = (fn)=>typeof fn === 'function';
6
6
  function getFetch(customFetchImpl) {
@@ -1,4 +1,4 @@
1
- import { T as TRPCClientError } from './TRPCClientError-8462a9bf.js';
1
+ import { T as TRPCClientError } from './TRPCClientError-23c8aa93.js';
2
2
 
3
3
  const isFunction = (fn) => typeof fn === 'function';
4
4
  function getFetch(customFetchImpl) {
package/dist/index.js CHANGED
@@ -4,14 +4,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var observable = require('@trpc/server/observable');
6
6
  var links_splitLink = require('./splitLink-f29e84be.js');
7
- var TRPCClientError = require('./TRPCClientError-dffb44e0.js');
7
+ var TRPCClientError = require('./TRPCClientError-e224e397.js');
8
8
  var shared = require('@trpc/server/shared');
9
- var httpUtils = require('./httpUtils-b94fce6f.js');
10
- var links_httpBatchLink = require('./httpBatchLink-8b963505.js');
9
+ var httpUtils = require('./httpUtils-b0a649f7.js');
10
+ var links_httpBatchLink = require('./httpBatchLink-78d2f90a.js');
11
11
  var links_httpLink = require('./links/httpLink.js');
12
12
  var links_loggerLink = require('./links/loggerLink.js');
13
13
  var links_wsLink = require('./links/wsLink.js');
14
- require('./transformResult-26a22823.js');
14
+ require('./transformResult-dfce8f15.js');
15
15
 
16
16
  class TRPCUntypedClient {
17
17
  $request({ type , input , path , context ={} }) {
package/dist/index.mjs CHANGED
@@ -1,18 +1,18 @@
1
1
  import { share, observableToPromise } from '@trpc/server/observable';
2
2
  import { c as createChain } from './splitLink-4c75f7be.mjs';
3
3
  export { s as splitLink } from './splitLink-4c75f7be.mjs';
4
- import { T as TRPCClientError } from './TRPCClientError-fef6cf44.mjs';
5
- export { T as TRPCClientError } from './TRPCClientError-fef6cf44.mjs';
4
+ import { T as TRPCClientError } from './TRPCClientError-0de4d231.mjs';
5
+ export { T as TRPCClientError } from './TRPCClientError-0de4d231.mjs';
6
6
  import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
7
- import { f as fetchHTTPResponse, g as getUrl, a as getBody$1, h as httpRequest } from './httpUtils-e8fecf0a.mjs';
8
- export { b as getFetch } from './httpUtils-e8fecf0a.mjs';
9
- import { c as createHTTPBatchLink } from './httpBatchLink-64296887.mjs';
10
- export { h as httpBatchLink } from './httpBatchLink-64296887.mjs';
7
+ import { f as fetchHTTPResponse, g as getUrl, a as getBody$1, h as httpRequest } from './httpUtils-0cb58db4.mjs';
8
+ export { b as getFetch } from './httpUtils-0cb58db4.mjs';
9
+ import { c as createHTTPBatchLink } from './httpBatchLink-cee1f56c.mjs';
10
+ export { h as httpBatchLink } from './httpBatchLink-cee1f56c.mjs';
11
11
  import { httpLinkFactory } from './links/httpLink.mjs';
12
12
  export { httpLink, httpLinkFactory } from './links/httpLink.mjs';
13
13
  export { loggerLink } from './links/loggerLink.mjs';
14
14
  export { createWSClient, wsLink } from './links/wsLink.mjs';
15
- import './transformResult-7ab522e6.mjs';
15
+ import './transformResult-ace864b8.mjs';
16
16
 
17
17
  class TRPCUntypedClient {
18
18
  $request({ type , input , path , context ={} }) {
@@ -0,0 +1 @@
1
+ {"version":3,"file":"isObject.d.ts","sourceRoot":"","sources":["../../src/internals/isObject.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGzE"}
@@ -2,11 +2,11 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var links_httpBatchLink = require('../httpBatchLink-8b963505.js');
6
- require('../httpUtils-b94fce6f.js');
5
+ var links_httpBatchLink = require('../httpBatchLink-78d2f90a.js');
6
+ require('../httpUtils-b0a649f7.js');
7
7
  require('@trpc/server/observable');
8
- require('../transformResult-26a22823.js');
9
- require('../TRPCClientError-dffb44e0.js');
8
+ require('../transformResult-dfce8f15.js');
9
+ require('../TRPCClientError-e224e397.js');
10
10
 
11
11
 
12
12
 
@@ -1,5 +1,5 @@
1
- export { h as httpBatchLink } from '../httpBatchLink-64296887.mjs';
2
- import '../httpUtils-e8fecf0a.mjs';
1
+ export { h as httpBatchLink } from '../httpBatchLink-cee1f56c.mjs';
2
+ import '../httpUtils-0cb58db4.mjs';
3
3
  import '@trpc/server/observable';
4
- import '../transformResult-7ab522e6.mjs';
5
- import '../TRPCClientError-fef6cf44.mjs';
4
+ import '../transformResult-ace864b8.mjs';
5
+ import '../TRPCClientError-0de4d231.mjs';
@@ -3,9 +3,9 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var observable = require('@trpc/server/observable');
6
- var transformResult = require('../transformResult-26a22823.js');
7
- var TRPCClientError = require('../TRPCClientError-dffb44e0.js');
8
- var httpUtils = require('../httpUtils-b94fce6f.js');
6
+ var transformResult = require('../transformResult-dfce8f15.js');
7
+ var TRPCClientError = require('../TRPCClientError-e224e397.js');
8
+ var httpUtils = require('../httpUtils-b0a649f7.js');
9
9
 
10
10
  function httpLinkFactory(factoryOpts) {
11
11
  return (opts)=>{
@@ -1,7 +1,7 @@
1
1
  import { observable } from '@trpc/server/observable';
2
- import { t as transformResult } from '../transformResult-7ab522e6.mjs';
3
- import { T as TRPCClientError } from '../TRPCClientError-fef6cf44.mjs';
4
- import { r as resolveHTTPLinkOptions, j as jsonHttpRequester } from '../httpUtils-e8fecf0a.mjs';
2
+ import { t as transformResult } from '../transformResult-ace864b8.mjs';
3
+ import { T as TRPCClientError } from '../TRPCClientError-0de4d231.mjs';
4
+ import { r as resolveHTTPLinkOptions, j as jsonHttpRequester } from '../httpUtils-0cb58db4.mjs';
5
5
 
6
6
  function httpLinkFactory(factoryOpts) {
7
7
  return (opts)=>{
@@ -3,8 +3,8 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var observable = require('@trpc/server/observable');
6
- var transformResult = require('../transformResult-26a22823.js');
7
- var TRPCClientError = require('../TRPCClientError-dffb44e0.js');
6
+ var transformResult = require('../transformResult-dfce8f15.js');
7
+ var TRPCClientError = require('../TRPCClientError-e224e397.js');
8
8
 
9
9
  /* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
10
10
 
@@ -1,6 +1,6 @@
1
1
  import { observable } from '@trpc/server/observable';
2
- import { t as transformResult } from '../transformResult-7ab522e6.mjs';
3
- import { T as TRPCClientError } from '../TRPCClientError-fef6cf44.mjs';
2
+ import { t as transformResult } from '../transformResult-ace864b8.mjs';
3
+ import { T as TRPCClientError } from '../TRPCClientError-0de4d231.mjs';
4
4
 
5
5
  /* istanbul ignore next -- @preserve */ const retryDelay = (attemptIndex)=>attemptIndex === 0 ? 0 : Math.min(1000 * 2 ** attemptIndex, 30000);
6
6
 
@@ -2,7 +2,7 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var transformResult = require('../transformResult-26a22823.js');
5
+ var transformResult = require('../transformResult-dfce8f15.js');
6
6
 
7
7
 
8
8
 
@@ -1 +1 @@
1
- export { t as transformResult } from '../transformResult-7ab522e6.mjs';
1
+ export { t as transformResult } from '../transformResult-ace864b8.mjs';
@@ -1 +1 @@
1
- {"version":3,"file":"transformResult.d.ts","sourceRoot":"","sources":["../../src/shared/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAMlD,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,OAAO,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;EAuB3B;AAQD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}
1
+ {"version":3,"file":"transformResult.d.ts","sourceRoot":"","sources":["../../src/shared/transformResult.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAKlD,gBAAgB;AAChB,iBAAS,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAC9D,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,OAAO,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;EAuB3B;AAQD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,EAChE,QAAQ,EACJ,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAChD,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAC3D,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAqBzC"}
@@ -55,4 +55,4 @@ class TransformResultError extends Error {
55
55
  return result;
56
56
  }
57
57
 
58
- export { transformResult as t };
58
+ export { isObject as i, transformResult as t };
@@ -57,4 +57,4 @@ function transformResult(response, runtime) {
57
57
  return result;
58
58
  }
59
59
 
60
- export { transformResult as t };
60
+ export { isObject as i, transformResult as t };
@@ -57,4 +57,5 @@ class TransformResultError extends Error {
57
57
  return result;
58
58
  }
59
59
 
60
+ exports.isObject = isObject;
60
61
  exports.transformResult = transformResult;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/client",
3
- "version": "10.38.2",
3
+ "version": "10.38.4",
4
4
  "description": "The tRPC client library",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -76,11 +76,11 @@
76
76
  "!**/*.test.*"
77
77
  ],
78
78
  "peerDependencies": {
79
- "@trpc/server": "10.38.2"
79
+ "@trpc/server": "10.38.4"
80
80
  },
81
81
  "devDependencies": {
82
82
  "@testing-library/dom": "^9.0.0",
83
- "@trpc/server": "10.38.2",
83
+ "@trpc/server": "10.38.4",
84
84
  "@types/isomorphic-fetch": "^0.0.36",
85
85
  "@types/node": "^18.16.16",
86
86
  "eslint": "^8.40.0",
@@ -98,5 +98,5 @@
98
98
  "funding": [
99
99
  "https://trpc.io/sponsor"
100
100
  ],
101
- "gitHead": "3ae64cc8b8c73306d6b022dec9eae769b246b0fb"
101
+ "gitHead": "fe2a7fc857dfec9740cd6334bc0021f2d99b61e3"
102
102
  }
@@ -6,6 +6,7 @@ import {
6
6
  Maybe,
7
7
  } from '@trpc/server';
8
8
  import { TRPCErrorResponse, TRPCErrorShape } from '@trpc/server/rpc';
9
+ import { isObject } from './internals/isObject';
9
10
 
10
11
  type ErrorInferrable = AnyProcedure | AnyRouter | TRPCErrorShape<number>;
11
12
 
@@ -24,14 +25,23 @@ export interface TRPCClientErrorBase<TShape extends DefaultErrorShape> {
24
25
  export type TRPCClientErrorLike<TRouterOrProcedure extends ErrorInferrable> =
25
26
  TRPCClientErrorBase<inferErrorShape<TRouterOrProcedure>>;
26
27
 
27
- function isTRPCClientError(cause: Error): cause is TRPCClientError<any> {
28
+ function isTRPCClientError(cause: unknown): cause is TRPCClientError<any> {
28
29
  return (
29
30
  cause instanceof TRPCClientError ||
30
31
  /**
31
32
  * @deprecated
32
33
  * Delete in next major
33
34
  */
34
- cause.name === 'TRPCClientError'
35
+ (cause instanceof Error && cause.name === 'TRPCClientError')
36
+ );
37
+ }
38
+
39
+ function isTRPCErrorResponse(obj: unknown): obj is TRPCErrorResponse<any> {
40
+ return (
41
+ isObject(obj) &&
42
+ isObject(obj.error) &&
43
+ typeof obj.error.code === 'number' &&
44
+ typeof obj.error.message === 'string'
35
45
  );
36
46
  }
37
47
 
@@ -74,19 +84,11 @@ export class TRPCClientError<TRouterOrProcedure extends ErrorInferrable>
74
84
  }
75
85
 
76
86
  public static from<TRouterOrProcedure extends ErrorInferrable>(
77
- cause: Error | TRPCErrorResponse<any>,
87
+ _cause: Error | TRPCErrorResponse<any>,
78
88
  opts: { meta?: Record<string, unknown> } = {},
79
89
  ): TRPCClientError<TRouterOrProcedure> {
80
- if (!(cause instanceof Error)) {
81
- return new TRPCClientError<TRouterOrProcedure>(
82
- cause.error.message ?? '',
83
- {
84
- ...opts,
85
- cause: undefined,
86
- result: cause as any,
87
- },
88
- );
89
- }
90
+ const cause = _cause as unknown;
91
+
90
92
  if (isTRPCClientError(cause)) {
91
93
  if (opts.meta) {
92
94
  // Decorate with meta error data
@@ -97,11 +99,22 @@ export class TRPCClientError<TRouterOrProcedure extends ErrorInferrable>
97
99
  }
98
100
  return cause;
99
101
  }
102
+ if (isTRPCErrorResponse(cause)) {
103
+ return new TRPCClientError(cause.error.message, {
104
+ ...opts,
105
+ result: cause,
106
+ });
107
+ }
108
+ if (!(cause instanceof Error)) {
109
+ return new TRPCClientError('Unknown error', {
110
+ ...opts,
111
+ cause: cause as any,
112
+ });
113
+ }
100
114
 
101
- return new TRPCClientError<TRouterOrProcedure>(cause.message, {
115
+ return new TRPCClientError(cause.message, {
102
116
  ...opts,
103
117
  cause,
104
- result: null,
105
118
  });
106
119
  }
107
120
  }
@@ -4,8 +4,8 @@ import type {
4
4
  TRPCResponseMessage,
5
5
  TRPCResultMessage,
6
6
  } from '@trpc/server/rpc';
7
+ import { isObject } from '../internals/isObject';
7
8
  import type { TRPCClientRuntime } from '../links';
8
- import { isObject } from '../links/internals/isObject';
9
9
 
10
10
  // FIXME:
11
11
  // - the generics here are probably unnecessary
@@ -1 +0,0 @@
1
- {"version":3,"file":"isObject.d.ts","sourceRoot":"","sources":["../../../src/links/internals/isObject.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGzE"}
File without changes