@trpc/server 10.14.0 → 10.14.1

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 (40) hide show
  1. package/dist/{TRPCError-e7333eae.mjs → TRPCError-226f5343.mjs} +5 -10
  2. package/dist/{TRPCError-ed16b3b7.js → TRPCError-92d93cfd.js} +5 -10
  3. package/dist/{TRPCError-4cbab0d0.js → TRPCError-98f26ad6.js} +5 -10
  4. package/dist/adapters/aws-lambda/index.js +7 -3
  5. package/dist/adapters/aws-lambda/index.mjs +7 -3
  6. package/dist/adapters/aws-lambda/utils.d.ts.map +1 -1
  7. package/dist/adapters/express.js +4 -4
  8. package/dist/adapters/express.mjs +4 -4
  9. package/dist/adapters/fastify/index.js +3 -3
  10. package/dist/adapters/fastify/index.mjs +3 -3
  11. package/dist/adapters/fetch/index.js +3 -3
  12. package/dist/adapters/fetch/index.mjs +3 -3
  13. package/dist/adapters/next.js +4 -4
  14. package/dist/adapters/next.mjs +4 -4
  15. package/dist/adapters/node-http/index.js +4 -4
  16. package/dist/adapters/node-http/index.mjs +4 -4
  17. package/dist/adapters/standalone.js +4 -4
  18. package/dist/adapters/standalone.mjs +4 -4
  19. package/dist/adapters/ws.js +2 -2
  20. package/dist/adapters/ws.mjs +2 -2
  21. package/dist/{config-bd759464.js → config-046e82fc.js} +1 -1
  22. package/dist/{config-fb5f49a1.mjs → config-61d48858.mjs} +1 -1
  23. package/dist/{config-69ee2314.js → config-cac4535e.js} +1 -1
  24. package/dist/error/TRPCError.d.ts +1 -1
  25. package/dist/error/TRPCError.d.ts.map +1 -1
  26. package/dist/http/index.js +3 -3
  27. package/dist/http/index.mjs +3 -3
  28. package/dist/index.js +2 -2
  29. package/dist/index.mjs +4 -4
  30. package/dist/{nodeHTTPRequestHandler-5a5141c3.js → nodeHTTPRequestHandler-0f439ec3.js} +2 -2
  31. package/dist/{nodeHTTPRequestHandler-8c27f394.mjs → nodeHTTPRequestHandler-41accae1.mjs} +2 -2
  32. package/dist/{nodeHTTPRequestHandler-7ebe1e44.js → nodeHTTPRequestHandler-4f981ca6.js} +2 -2
  33. package/dist/{resolveHTTPResponse-cbfdc43d.js → resolveHTTPResponse-4798ae79.js} +2 -2
  34. package/dist/{resolveHTTPResponse-8e9dd846.mjs → resolveHTTPResponse-5c43d189.mjs} +2 -2
  35. package/dist/{resolveHTTPResponse-39258d19.js → resolveHTTPResponse-ef105097.js} +2 -2
  36. package/dist/subscription.js +1 -1
  37. package/dist/subscription.mjs +1 -1
  38. package/package.json +3 -2
  39. package/src/adapters/aws-lambda/utils.ts +4 -0
  40. package/src/error/TRPCError.ts +8 -13
@@ -23,10 +23,8 @@ function getCauseFromUnknown(cause) {
23
23
 
24
24
  function getTRPCErrorFromUnknown(cause) {
25
25
  const error = getErrorFromUnknown(cause);
26
- // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
27
- // ref https://github.com/trpc/trpc/issues/331
28
- if (error.name === 'TRPCError') {
29
- return cause;
26
+ if (error instanceof TRPCError) {
27
+ return error;
30
28
  }
31
29
  const trpcError = new TRPCError({
32
30
  code: 'INTERNAL_SERVER_ERROR',
@@ -39,18 +37,15 @@ function getTRPCErrorFromUnknown(cause) {
39
37
  }
40
38
  class TRPCError extends Error {
41
39
  constructor(opts){
42
- const code = opts.code;
43
- const message = opts.message ?? getMessageFromUnknownError(opts.cause, code);
40
+ const message = opts.message ?? getMessageFromUnknownError(opts.cause, opts.code);
44
41
  const cause = opts.cause !== undefined ? getErrorFromUnknown(opts.cause) : undefined;
45
42
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
46
43
  // @ts-ignore https://github.com/tc39/proposal-error-cause
47
44
  super(message, {
48
45
  cause
49
46
  });
50
- this.code = code;
51
- this.cause = cause;
52
- this.name = 'TRPCError';
53
- Object.setPrototypeOf(this, new.target.prototype);
47
+ this.code = opts.code;
48
+ this.name = this.constructor.name;
54
49
  }
55
50
  }
56
51
 
@@ -23,10 +23,8 @@ function getCauseFromUnknown(cause) {
23
23
 
24
24
  function getTRPCErrorFromUnknown(cause) {
25
25
  const error = getErrorFromUnknown(cause);
26
- // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
27
- // ref https://github.com/trpc/trpc/issues/331
28
- if (error.name === 'TRPCError') {
29
- return cause;
26
+ if (error instanceof TRPCError) {
27
+ return error;
30
28
  }
31
29
  const trpcError = new TRPCError({
32
30
  code: 'INTERNAL_SERVER_ERROR',
@@ -39,16 +37,13 @@ function getTRPCErrorFromUnknown(cause) {
39
37
  }
40
38
  class TRPCError extends Error {
41
39
  constructor(opts) {
42
- const code = opts.code;
43
- const message = opts.message ?? getMessageFromUnknownError(opts.cause, code);
40
+ const message = opts.message ?? getMessageFromUnknownError(opts.cause, opts.code);
44
41
  const cause = opts.cause !== undefined ? getErrorFromUnknown(opts.cause) : undefined;
45
42
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
46
43
  // @ts-ignore https://github.com/tc39/proposal-error-cause
47
44
  super(message, { cause });
48
- this.code = code;
49
- this.cause = cause;
50
- this.name = 'TRPCError';
51
- Object.setPrototypeOf(this, new.target.prototype);
45
+ this.code = opts.code;
46
+ this.name = this.constructor.name;
52
47
  }
53
48
  }
54
49
 
@@ -25,10 +25,8 @@ function getCauseFromUnknown(cause) {
25
25
 
26
26
  function getTRPCErrorFromUnknown(cause) {
27
27
  const error = getErrorFromUnknown(cause);
28
- // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
29
- // ref https://github.com/trpc/trpc/issues/331
30
- if (error.name === 'TRPCError') {
31
- return cause;
28
+ if (error instanceof TRPCError) {
29
+ return error;
32
30
  }
33
31
  const trpcError = new TRPCError({
34
32
  code: 'INTERNAL_SERVER_ERROR',
@@ -41,18 +39,15 @@ function getTRPCErrorFromUnknown(cause) {
41
39
  }
42
40
  class TRPCError extends Error {
43
41
  constructor(opts){
44
- const code = opts.code;
45
- const message = opts.message ?? getMessageFromUnknownError(opts.cause, code);
42
+ const message = opts.message ?? getMessageFromUnknownError(opts.cause, opts.code);
46
43
  const cause = opts.cause !== undefined ? getErrorFromUnknown(opts.cause) : undefined;
47
44
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
48
45
  // @ts-ignore https://github.com/tc39/proposal-error-cause
49
46
  super(message, {
50
47
  cause
51
48
  });
52
- this.code = code;
53
- this.cause = cause;
54
- this.name = 'TRPCError';
55
- Object.setPrototypeOf(this, new.target.prototype);
49
+ this.code = opts.code;
50
+ this.name = this.constructor.name;
56
51
  }
57
52
  }
58
53
 
@@ -2,10 +2,10 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var TRPCError = require('../../TRPCError-4cbab0d0.js');
6
- require('../../config-bd759464.js');
5
+ var TRPCError = require('../../TRPCError-98f26ad6.js');
6
+ require('../../config-046e82fc.js');
7
7
  require('../../codes-e0ea0f4c.js');
8
- var resolveHTTPResponse = require('../../resolveHTTPResponse-cbfdc43d.js');
8
+ var resolveHTTPResponse = require('../../resolveHTTPResponse-4798ae79.js');
9
9
  require('../../index-4d2d31b6.js');
10
10
  require('../../transformTRPCResponse-d2700b72.js');
11
11
 
@@ -47,6 +47,10 @@ function getHTTPMethod(event) {
47
47
  }
48
48
  function getPath(event) {
49
49
  if (isPayloadV1(event)) {
50
+ if (!event.pathParameters) {
51
+ // Then this event was not triggered by a resource denoted with {proxy+}
52
+ return event.path.split('/').pop() || '';
53
+ }
50
54
  const matches = event.resource.matchAll(/\{(.*?)\}/g);
51
55
  for (const match of matches){
52
56
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -1,7 +1,7 @@
1
- import { T as TRPCError } from '../../TRPCError-e7333eae.mjs';
2
- import '../../config-fb5f49a1.mjs';
1
+ import { T as TRPCError } from '../../TRPCError-226f5343.mjs';
2
+ import '../../config-61d48858.mjs';
3
3
  import '../../codes-52c11119.mjs';
4
- import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-8e9dd846.mjs';
4
+ import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-5c43d189.mjs';
5
5
  import '../../index-972002da.mjs';
6
6
  import '../../transformTRPCResponse-7a73a2df.mjs';
7
7
 
@@ -43,6 +43,10 @@ function getHTTPMethod(event) {
43
43
  }
44
44
  function getPath(event) {
45
45
  if (isPayloadV1(event)) {
46
+ if (!event.pathParameters) {
47
+ // Then this event was not triggered by a resource denoted with {proxy+}
48
+ return event.path.split('/').pop() || '';
49
+ }
46
50
  const matches = event.resource.matchAll(/\{(.*?)\}/g);
47
51
  for (const match of matches){
48
52
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/adapters/aws-lambda/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,IAAI,YAAY,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,iCAAiC,EAClC,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,oBAAY,eAAe,GAAG,oBAAoB,GAAG,sBAAsB,CAAC;AAC5E,oBAAY,gBAAgB,GACxB,qBAAqB,GACrB,iCAAiC,CAAC;AAEtC,oBAAY,6BAA6B,CAAC,MAAM,SAAS,eAAe,IAAI;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,YAAY,CAAC;CACvB,CAAC;AACF,oBAAY,wBAAwB,CAClC,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAC5B,CAAC,EACH,KAAK,EACL,OAAO,GACR,EAAE,6BAA6B,CAAC,MAAM,CAAC,KACpC,kBAAkB,CAAC,OAAO,CAAC,GAC3B,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEzC,oBAAY,gBAAgB,CAC1B,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAE5B;IACE,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACxC,GAAG,CACA;IACE;;QAEI;IACJ,aAAa,EAAE,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CAC1D,GACD;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CAC3D,CACJ,CAAC;AAEN,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,GACrB,KAAK,IAAI,oBAAoB,CAE/B;AACD,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,GACrB,KAAK,IAAI,sBAAsB,CAEjC;AAoBD,wBAAgB,aAAa,CAAC,KAAK,EAAE,eAAe,UAWnD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,UA2B7C;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,WAAW,GACnB,gBAAgB,CAAC,SAAS,CAAC,CAU7B;AAED,oBAAY,+BAA+B,GAAG,KAAK,GAAG,KAAK,CAAC;AAC5D,oBAAY,8BAA8B,GACtC,+BAA+B,GAC/B,QAAQ,CAAC;AAEb,eAAO,MAAM,4CAA4C,QAEiD,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/adapters/aws-lambda/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,IAAI,YAAY,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,iCAAiC,EAClC,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,oBAAY,eAAe,GAAG,oBAAoB,GAAG,sBAAsB,CAAC;AAC5E,oBAAY,gBAAgB,GACxB,qBAAqB,GACrB,iCAAiC,CAAC;AAEtC,oBAAY,6BAA6B,CAAC,MAAM,SAAS,eAAe,IAAI;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,YAAY,CAAC;CACvB,CAAC;AACF,oBAAY,wBAAwB,CAClC,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAC5B,CAAC,EACH,KAAK,EACL,OAAO,GACR,EAAE,6BAA6B,CAAC,MAAM,CAAC,KACpC,kBAAkB,CAAC,OAAO,CAAC,GAC3B,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEzC,oBAAY,gBAAgB,CAC1B,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAE5B;IACE,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACxC,GAAG,CACA;IACE;;QAEI;IACJ,aAAa,EAAE,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CAC1D,GACD;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CAC3D,CACJ,CAAC;AAEN,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,GACrB,KAAK,IAAI,oBAAoB,CAE/B;AACD,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,GACrB,KAAK,IAAI,sBAAsB,CAEjC;AAoBD,wBAAgB,aAAa,CAAC,KAAK,EAAE,eAAe,UAWnD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,UA+B7C;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,WAAW,GACnB,gBAAgB,CAAC,SAAS,CAAC,CAU7B;AAED,oBAAY,+BAA+B,GAAG,KAAK,GAAG,KAAK,CAAC;AAC5D,oBAAY,8BAA8B,GACtC,+BAA+B,GAC/B,QAAQ,CAAC;AAEb,eAAO,MAAM,4CAA4C,QAEiD,CAAC"}
@@ -2,10 +2,10 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7ebe1e44.js');
6
- require('../resolveHTTPResponse-cbfdc43d.js');
7
- require('../config-bd759464.js');
8
- require('../TRPCError-4cbab0d0.js');
5
+ var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-4f981ca6.js');
6
+ require('../resolveHTTPResponse-4798ae79.js');
7
+ require('../config-046e82fc.js');
8
+ require('../TRPCError-98f26ad6.js');
9
9
  require('../codes-e0ea0f4c.js');
10
10
  require('../index-4d2d31b6.js');
11
11
  require('../transformTRPCResponse-d2700b72.js');
@@ -1,7 +1,7 @@
1
- import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-8c27f394.mjs';
2
- import '../resolveHTTPResponse-8e9dd846.mjs';
3
- import '../config-fb5f49a1.mjs';
4
- import '../TRPCError-e7333eae.mjs';
1
+ import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-41accae1.mjs';
2
+ import '../resolveHTTPResponse-5c43d189.mjs';
3
+ import '../config-61d48858.mjs';
4
+ import '../TRPCError-226f5343.mjs';
5
5
  import '../codes-52c11119.mjs';
6
6
  import '../index-972002da.mjs';
7
7
  import '../transformTRPCResponse-7a73a2df.mjs';
@@ -2,10 +2,10 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var resolveHTTPResponse = require('../../resolveHTTPResponse-cbfdc43d.js');
5
+ var resolveHTTPResponse = require('../../resolveHTTPResponse-4798ae79.js');
6
6
  var adapters_ws = require('../ws.js');
7
- require('../../config-bd759464.js');
8
- require('../../TRPCError-4cbab0d0.js');
7
+ require('../../config-046e82fc.js');
8
+ require('../../TRPCError-98f26ad6.js');
9
9
  require('../../codes-e0ea0f4c.js');
10
10
  require('../../index-4d2d31b6.js');
11
11
  require('../../transformTRPCResponse-d2700b72.js');
@@ -1,7 +1,7 @@
1
- import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-8e9dd846.mjs';
1
+ import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-5c43d189.mjs';
2
2
  import { applyWSSHandler } from '../ws.mjs';
3
- import '../../config-fb5f49a1.mjs';
4
- import '../../TRPCError-e7333eae.mjs';
3
+ import '../../config-61d48858.mjs';
4
+ import '../../TRPCError-226f5343.mjs';
5
5
  import '../../codes-52c11119.mjs';
6
6
  import '../../index-972002da.mjs';
7
7
  import '../../transformTRPCResponse-7a73a2df.mjs';
@@ -2,9 +2,9 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var resolveHTTPResponse = require('../../resolveHTTPResponse-cbfdc43d.js');
6
- require('../../config-bd759464.js');
7
- require('../../TRPCError-4cbab0d0.js');
5
+ var resolveHTTPResponse = require('../../resolveHTTPResponse-4798ae79.js');
6
+ require('../../config-046e82fc.js');
7
+ require('../../TRPCError-98f26ad6.js');
8
8
  require('../../codes-e0ea0f4c.js');
9
9
  require('../../index-4d2d31b6.js');
10
10
  require('../../transformTRPCResponse-d2700b72.js');
@@ -1,6 +1,6 @@
1
- import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-8e9dd846.mjs';
2
- import '../../config-fb5f49a1.mjs';
3
- import '../../TRPCError-e7333eae.mjs';
1
+ import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-5c43d189.mjs';
2
+ import '../../config-61d48858.mjs';
3
+ import '../../TRPCError-226f5343.mjs';
4
4
  import '../../codes-52c11119.mjs';
5
5
  import '../../index-972002da.mjs';
6
6
  import '../../transformTRPCResponse-7a73a2df.mjs';
@@ -2,10 +2,10 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var TRPCError = require('../TRPCError-4cbab0d0.js');
6
- var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7ebe1e44.js');
7
- require('../resolveHTTPResponse-cbfdc43d.js');
8
- require('../config-bd759464.js');
5
+ var TRPCError = require('../TRPCError-98f26ad6.js');
6
+ var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-4f981ca6.js');
7
+ require('../resolveHTTPResponse-4798ae79.js');
8
+ require('../config-046e82fc.js');
9
9
  require('../codes-e0ea0f4c.js');
10
10
  require('../index-4d2d31b6.js');
11
11
  require('../transformTRPCResponse-d2700b72.js');
@@ -1,7 +1,7 @@
1
- import { T as TRPCError } from '../TRPCError-e7333eae.mjs';
2
- import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-8c27f394.mjs';
3
- import '../resolveHTTPResponse-8e9dd846.mjs';
4
- import '../config-fb5f49a1.mjs';
1
+ import { T as TRPCError } from '../TRPCError-226f5343.mjs';
2
+ import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-41accae1.mjs';
3
+ import '../resolveHTTPResponse-5c43d189.mjs';
4
+ import '../config-61d48858.mjs';
5
5
  import '../codes-52c11119.mjs';
6
6
  import '../index-972002da.mjs';
7
7
  import '../transformTRPCResponse-7a73a2df.mjs';
@@ -2,10 +2,10 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-7ebe1e44.js');
6
- require('../../resolveHTTPResponse-cbfdc43d.js');
7
- require('../../config-bd759464.js');
8
- require('../../TRPCError-4cbab0d0.js');
5
+ var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-4f981ca6.js');
6
+ require('../../resolveHTTPResponse-4798ae79.js');
7
+ require('../../config-046e82fc.js');
8
+ require('../../TRPCError-98f26ad6.js');
9
9
  require('../../codes-e0ea0f4c.js');
10
10
  require('../../index-4d2d31b6.js');
11
11
  require('../../transformTRPCResponse-d2700b72.js');
@@ -1,7 +1,7 @@
1
- export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-8c27f394.mjs';
2
- import '../../resolveHTTPResponse-8e9dd846.mjs';
3
- import '../../config-fb5f49a1.mjs';
4
- import '../../TRPCError-e7333eae.mjs';
1
+ export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-41accae1.mjs';
2
+ import '../../resolveHTTPResponse-5c43d189.mjs';
3
+ import '../../config-61d48858.mjs';
4
+ import '../../TRPCError-226f5343.mjs';
5
5
  import '../../codes-52c11119.mjs';
6
6
  import '../../index-972002da.mjs';
7
7
  import '../../transformTRPCResponse-7a73a2df.mjs';
@@ -3,10 +3,10 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var http = require('node:http');
6
- var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7ebe1e44.js');
7
- require('../resolveHTTPResponse-cbfdc43d.js');
8
- require('../config-bd759464.js');
9
- require('../TRPCError-4cbab0d0.js');
6
+ var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-4f981ca6.js');
7
+ require('../resolveHTTPResponse-4798ae79.js');
8
+ require('../config-046e82fc.js');
9
+ require('../TRPCError-98f26ad6.js');
10
10
  require('../codes-e0ea0f4c.js');
11
11
  require('../index-4d2d31b6.js');
12
12
  require('../transformTRPCResponse-d2700b72.js');
@@ -1,8 +1,8 @@
1
1
  import http from 'node:http';
2
- import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-8c27f394.mjs';
3
- import '../resolveHTTPResponse-8e9dd846.mjs';
4
- import '../config-fb5f49a1.mjs';
5
- import '../TRPCError-e7333eae.mjs';
2
+ import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-41accae1.mjs';
3
+ import '../resolveHTTPResponse-5c43d189.mjs';
4
+ import '../config-61d48858.mjs';
5
+ import '../TRPCError-226f5343.mjs';
6
6
  import '../codes-52c11119.mjs';
7
7
  import '../index-972002da.mjs';
8
8
  import '../transformTRPCResponse-7a73a2df.mjs';
@@ -2,8 +2,8 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var config = require('../config-bd759464.js');
6
- var TRPCError = require('../TRPCError-4cbab0d0.js');
5
+ var config = require('../config-046e82fc.js');
6
+ var TRPCError = require('../TRPCError-98f26ad6.js');
7
7
  var transformTRPCResponse = require('../transformTRPCResponse-d2700b72.js');
8
8
  var observable = require('../observable-464116ac.js');
9
9
  require('../codes-e0ea0f4c.js');
@@ -1,5 +1,5 @@
1
- import { e as callProcedure } from '../config-fb5f49a1.mjs';
2
- import { T as TRPCError, g as getCauseFromUnknown, a as getTRPCErrorFromUnknown } from '../TRPCError-e7333eae.mjs';
1
+ import { e as callProcedure } from '../config-61d48858.mjs';
2
+ import { T as TRPCError, g as getCauseFromUnknown, a as getTRPCErrorFromUnknown } from '../TRPCError-226f5343.mjs';
3
3
  import { t as transformTRPCResponse } from '../transformTRPCResponse-7a73a2df.mjs';
4
4
  import { i as isObservable } from '../observable-ade1bad8.mjs';
5
5
  import '../codes-52c11119.mjs';
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var TRPCError = require('./TRPCError-4cbab0d0.js');
3
+ var TRPCError = require('./TRPCError-98f26ad6.js');
4
4
  var codes = require('./codes-e0ea0f4c.js');
5
5
  var index = require('./index-4d2d31b6.js');
6
6
 
@@ -1,4 +1,4 @@
1
- import { T as TRPCError } from './TRPCError-e7333eae.mjs';
1
+ import { T as TRPCError } from './TRPCError-226f5343.mjs';
2
2
  import { i as invert, T as TRPC_ERROR_CODES_BY_KEY } from './codes-52c11119.mjs';
3
3
  import { a as createRecursiveProxy } from './index-972002da.mjs';
4
4
 
@@ -1,4 +1,4 @@
1
- import { T as TRPCError } from './TRPCError-ed16b3b7.js';
1
+ import { T as TRPCError } from './TRPCError-92d93cfd.js';
2
2
  import { i as invert, T as TRPC_ERROR_CODES_BY_KEY } from './codes-ec2bad91.js';
3
3
  import { a as createRecursiveProxy } from './index-f38f12ba.js';
4
4
 
@@ -1,7 +1,7 @@
1
1
  import { TRPC_ERROR_CODE_KEY } from '../rpc/codes';
2
2
  export declare function getTRPCErrorFromUnknown(cause: unknown): TRPCError;
3
3
  export declare class TRPCError extends Error {
4
- readonly cause?: Error | undefined;
4
+ readonly cause?: Error;
5
5
  readonly code: "INTERNAL_SERVER_ERROR" | "PARSE_ERROR" | "BAD_REQUEST" | "UNAUTHORIZED" | "FORBIDDEN" | "NOT_FOUND" | "METHOD_NOT_SUPPORTED" | "TIMEOUT" | "CONFLICT" | "PRECONDITION_FAILED" | "PAYLOAD_TOO_LARGE" | "TOO_MANY_REQUESTS" | "CLIENT_CLOSED_REQUEST";
6
6
  constructor(opts: {
7
7
  message?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"TRPCError.d.ts","sourceRoot":"","sources":["../../src/error/TRPCError.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAkBjE;AAED,qBAAa,SAAU,SAAQ,KAAK;IAClC,SAAgB,KAAK,CAAC,oBAAC;IACvB,SAAgB,IAAI,uPAAC;gBAET,IAAI,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CAiBF"}
1
+ {"version":3,"file":"TRPCError.d.ts","sourceRoot":"","sources":["../../src/error/TRPCError.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAiBjE;AAED,qBAAa,SAAU,SAAQ,KAAK;IAClC,SAAgB,KAAK,CAAC,EAAE,KAAK,CAAC;IAC9B,SAAgB,IAAI,uPAAC;gBAET,IAAI,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CAaF"}
@@ -2,9 +2,9 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var config = require('../config-bd759464.js');
6
- var resolveHTTPResponse = require('../resolveHTTPResponse-cbfdc43d.js');
7
- require('../TRPCError-4cbab0d0.js');
5
+ var config = require('../config-046e82fc.js');
6
+ var resolveHTTPResponse = require('../resolveHTTPResponse-4798ae79.js');
7
+ require('../TRPCError-98f26ad6.js');
8
8
  require('../codes-e0ea0f4c.js');
9
9
  require('../index-4d2d31b6.js');
10
10
  require('../transformTRPCResponse-d2700b72.js');
@@ -1,6 +1,6 @@
1
- export { T as TRPC_ERROR_CODES_BY_NUMBER, f as getHTTPStatusCode, g as getHTTPStatusCodeFromError } from '../config-fb5f49a1.mjs';
2
- export { r as resolveHTTPResponse } from '../resolveHTTPResponse-8e9dd846.mjs';
3
- import '../TRPCError-e7333eae.mjs';
1
+ export { T as TRPC_ERROR_CODES_BY_NUMBER, f as getHTTPStatusCode, g as getHTTPStatusCodeFromError } from '../config-61d48858.mjs';
2
+ export { r as resolveHTTPResponse } from '../resolveHTTPResponse-5c43d189.mjs';
3
+ import '../TRPCError-226f5343.mjs';
4
4
  import '../codes-52c11119.mjs';
5
5
  import '../index-972002da.mjs';
6
6
  import '../transformTRPCResponse-7a73a2df.mjs';
package/dist/index.js CHANGED
@@ -2,8 +2,8 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var config = require('./config-bd759464.js');
6
- var TRPCError = require('./TRPCError-4cbab0d0.js');
5
+ var config = require('./config-046e82fc.js');
6
+ var TRPCError = require('./TRPCError-98f26ad6.js');
7
7
  var codes = require('./codes-e0ea0f4c.js');
8
8
  var index = require('./index-4d2d31b6.js');
9
9
 
package/dist/index.mjs CHANGED
@@ -1,7 +1,7 @@
1
- import { c as createRouterFactory, d as defaultFormatter, g as getHTTPStatusCodeFromError, a as defaultTransformer, b as getDataTransformer$1, i as isServerDefault } from './config-fb5f49a1.mjs';
2
- export { e as callProcedure, a as defaultTransformer, b as getDataTransformer, p as procedureTypes } from './config-fb5f49a1.mjs';
3
- import { T as TRPCError, g as getCauseFromUnknown, a as getTRPCErrorFromUnknown } from './TRPCError-e7333eae.mjs';
4
- export { T as TRPCError, a as getTRPCErrorFromUnknown } from './TRPCError-e7333eae.mjs';
1
+ import { c as createRouterFactory, d as defaultFormatter, g as getHTTPStatusCodeFromError, a as defaultTransformer, b as getDataTransformer$1, i as isServerDefault } from './config-61d48858.mjs';
2
+ export { e as callProcedure, a as defaultTransformer, b as getDataTransformer, p as procedureTypes } from './config-61d48858.mjs';
3
+ import { T as TRPCError, g as getCauseFromUnknown, a as getTRPCErrorFromUnknown } from './TRPCError-226f5343.mjs';
4
+ export { T as TRPCError, a as getTRPCErrorFromUnknown } from './TRPCError-226f5343.mjs';
5
5
  import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-52c11119.mjs';
6
6
  import { c as createFlatProxy } from './index-972002da.mjs';
7
7
 
@@ -1,5 +1,5 @@
1
- import { r as resolveHTTPResponse } from './resolveHTTPResponse-39258d19.js';
2
- import { T as TRPCError } from './TRPCError-ed16b3b7.js';
1
+ import { r as resolveHTTPResponse } from './resolveHTTPResponse-ef105097.js';
2
+ import { T as TRPCError } from './TRPCError-92d93cfd.js';
3
3
 
4
4
  async function getPostBody(opts) {
5
5
  const { req, maxBodySize = Infinity } = opts;
@@ -1,5 +1,5 @@
1
- import { r as resolveHTTPResponse } from './resolveHTTPResponse-8e9dd846.mjs';
2
- import { T as TRPCError } from './TRPCError-e7333eae.mjs';
1
+ import { r as resolveHTTPResponse } from './resolveHTTPResponse-5c43d189.mjs';
2
+ import { T as TRPCError } from './TRPCError-226f5343.mjs';
3
3
 
4
4
  async function getPostBody(opts) {
5
5
  const { req , maxBodySize =Infinity } = opts;
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
- var resolveHTTPResponse = require('./resolveHTTPResponse-cbfdc43d.js');
4
- var TRPCError = require('./TRPCError-4cbab0d0.js');
3
+ var resolveHTTPResponse = require('./resolveHTTPResponse-4798ae79.js');
4
+ var TRPCError = require('./TRPCError-98f26ad6.js');
5
5
 
6
6
  async function getPostBody(opts) {
7
7
  const { req , maxBodySize =Infinity } = opts;
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
- var config = require('./config-bd759464.js');
4
- var TRPCError = require('./TRPCError-4cbab0d0.js');
3
+ var config = require('./config-046e82fc.js');
4
+ var TRPCError = require('./TRPCError-98f26ad6.js');
5
5
  var transformTRPCResponse = require('./transformTRPCResponse-d2700b72.js');
6
6
 
7
7
  const HTTP_METHOD_PROCEDURE_TYPE_MAP = {
@@ -1,5 +1,5 @@
1
- import { e as callProcedure, f as getHTTPStatusCode } from './config-fb5f49a1.mjs';
2
- import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-e7333eae.mjs';
1
+ import { e as callProcedure, f as getHTTPStatusCode } from './config-61d48858.mjs';
2
+ import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-226f5343.mjs';
3
3
  import { t as transformTRPCResponse } from './transformTRPCResponse-7a73a2df.mjs';
4
4
 
5
5
  const HTTP_METHOD_PROCEDURE_TYPE_MAP = {
@@ -1,5 +1,5 @@
1
- import { e as callProcedure, f as getHTTPStatusCode } from './config-69ee2314.js';
2
- import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-ed16b3b7.js';
1
+ import { e as callProcedure, f as getHTTPStatusCode } from './config-cac4535e.js';
2
+ import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-92d93cfd.js';
3
3
  import { t as transformTRPCResponse } from './transformTRPCResponse-896669e0.js';
4
4
 
5
5
  /* eslint-disable @typescript-eslint/no-non-null-assertion */
@@ -2,7 +2,7 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var TRPCError = require('./TRPCError-4cbab0d0.js');
5
+ var TRPCError = require('./TRPCError-98f26ad6.js');
6
6
  var observable = require('./observable-464116ac.js');
7
7
 
8
8
  /**
@@ -1,4 +1,4 @@
1
- import { a as getTRPCErrorFromUnknown } from './TRPCError-e7333eae.mjs';
1
+ import { a as getTRPCErrorFromUnknown } from './TRPCError-226f5343.mjs';
2
2
  import { o as observable } from './observable-ade1bad8.mjs';
3
3
 
4
4
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/server",
3
- "version": "10.14.0",
3
+ "version": "10.14.1",
4
4
  "description": "tRPC Server",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -133,6 +133,7 @@
133
133
  "@types/hash-sum": "^1.0.0",
134
134
  "@types/node": "^18.7.20",
135
135
  "@types/react": "^18.0.9",
136
+ "@types/react-dom": "^18.0.5",
136
137
  "@types/ws": "^8.2.0",
137
138
  "aws-lambda": "^1.0.7",
138
139
  "devalue": "^4.0.0",
@@ -156,5 +157,5 @@
156
157
  "yup": "^1.0.0",
157
158
  "zod": "^3.0.0"
158
159
  },
159
- "gitHead": "452b679c1ba5ad52dc5fd8a1779cdb98544cdd30"
160
+ "gitHead": "c20c66596798ea772f7684f0319b0dffdde4af2a"
160
161
  }
@@ -99,6 +99,10 @@ export function getHTTPMethod(event: APIGatewayEvent) {
99
99
 
100
100
  export function getPath(event: APIGatewayEvent) {
101
101
  if (isPayloadV1(event)) {
102
+ if (!event.pathParameters) {
103
+ // Then this event was not triggered by a resource denoted with {proxy+}
104
+ return event.path.split('/').pop() || '';
105
+ }
102
106
  const matches = event.resource.matchAll(/\{(.*?)\}/g);
103
107
  for (const match of matches) {
104
108
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -6,10 +6,9 @@ import { TRPC_ERROR_CODE_KEY } from '../rpc/codes';
6
6
 
7
7
  export function getTRPCErrorFromUnknown(cause: unknown): TRPCError {
8
8
  const error = getErrorFromUnknown(cause);
9
- // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
10
- // ref https://github.com/trpc/trpc/issues/331
11
- if (error.name === 'TRPCError') {
12
- return cause as TRPCError;
9
+
10
+ if (error instanceof TRPCError) {
11
+ return error;
13
12
  }
14
13
 
15
14
  const trpcError = new TRPCError({
@@ -25,7 +24,7 @@ export function getTRPCErrorFromUnknown(cause: unknown): TRPCError {
25
24
  }
26
25
 
27
26
  export class TRPCError extends Error {
28
- public readonly cause?;
27
+ public readonly cause?: Error;
29
28
  public readonly code;
30
29
 
31
30
  constructor(opts: {
@@ -33,20 +32,16 @@ export class TRPCError extends Error {
33
32
  code: TRPC_ERROR_CODE_KEY;
34
33
  cause?: unknown;
35
34
  }) {
36
- const code = opts.code;
37
35
  const message =
38
- opts.message ?? getMessageFromUnknownError(opts.cause, code);
39
- const cause: Error | undefined =
36
+ opts.message ?? getMessageFromUnknownError(opts.cause, opts.code);
37
+ const cause =
40
38
  opts.cause !== undefined ? getErrorFromUnknown(opts.cause) : undefined;
41
39
 
42
40
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
43
41
  // @ts-ignore https://github.com/tc39/proposal-error-cause
44
42
  super(message, { cause });
45
43
 
46
- this.code = code;
47
- this.cause = cause;
48
- this.name = 'TRPCError';
49
-
50
- Object.setPrototypeOf(this, new.target.prototype);
44
+ this.code = opts.code;
45
+ this.name = this.constructor.name;
51
46
  }
52
47
  }