@trpc/server 10.0.0-alpha.26 → 10.0.0-alpha.29

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 (78) hide show
  1. package/dist/{TRPCError-ddec3395.js → TRPCError-9050a68d.js} +0 -0
  2. package/dist/{TRPCError-7971540a.mjs → TRPCError-b7fa0c31.mjs} +0 -0
  3. package/dist/adapters/express.js +3 -3
  4. package/dist/adapters/express.mjs +3 -3
  5. package/dist/adapters/fastify/index.js +2 -2
  6. package/dist/adapters/fastify/index.mjs +2 -2
  7. package/dist/adapters/fetch/index.js +2 -2
  8. package/dist/adapters/fetch/index.mjs +2 -2
  9. package/dist/adapters/next.d.ts.map +1 -1
  10. package/dist/adapters/next.js +3 -3
  11. package/dist/adapters/next.mjs +3 -3
  12. package/dist/adapters/node-http/index.js +3 -3
  13. package/dist/adapters/node-http/index.mjs +3 -3
  14. package/dist/adapters/node-http/internals/getPostBody.d.ts +1 -1
  15. package/dist/adapters/node-http/internals/getPostBody.d.ts.map +1 -1
  16. package/dist/adapters/standalone.js +3 -3
  17. package/dist/adapters/standalone.mjs +3 -3
  18. package/dist/adapters/ws.d.ts +2 -1
  19. package/dist/adapters/ws.d.ts.map +1 -1
  20. package/dist/adapters/ws.js +1 -1
  21. package/dist/adapters/ws.mjs +1 -1
  22. package/dist/core/internals/internalProcedure.d.ts +1 -1
  23. package/dist/core/internals/internalProcedure.d.ts.map +1 -1
  24. package/dist/core/internals/mergeRoutersGeneric.d.ts +21 -0
  25. package/dist/core/internals/mergeRoutersGeneric.d.ts.map +1 -0
  26. package/dist/core/internals/procedureBuilder.d.ts +3 -2
  27. package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
  28. package/dist/core/router.d.ts +13 -1
  29. package/dist/core/router.d.ts.map +1 -1
  30. package/dist/deprecated/internals/middlewares.d.ts +1 -1
  31. package/dist/deprecated/internals/middlewares.d.ts.map +1 -1
  32. package/dist/deprecated/internals/procedure.d.ts.map +1 -1
  33. package/dist/deprecated/router.d.ts +1 -1
  34. package/dist/deprecated/router.d.ts.map +1 -1
  35. package/dist/error/TRPCError.d.ts +1 -1
  36. package/dist/error/TRPCError.d.ts.map +1 -1
  37. package/dist/http/internals/getHTTPStatusCode.d.ts +1 -1
  38. package/dist/http/internals/getHTTPStatusCode.d.ts.map +1 -1
  39. package/dist/http/internals/types.d.ts +1 -1
  40. package/dist/http/internals/types.d.ts.map +1 -1
  41. package/dist/http/resolveHTTPResponse.d.ts +1 -1
  42. package/dist/http/resolveHTTPResponse.d.ts.map +1 -1
  43. package/dist/index.d.ts +1 -1
  44. package/dist/index.d.ts.map +1 -1
  45. package/dist/index.js +65 -62
  46. package/dist/index.mjs +67 -64
  47. package/dist/internals/types.d.ts +1 -1
  48. package/dist/internals/types.d.ts.map +1 -1
  49. package/dist/{nodeHTTPRequestHandler-5ad62229.mjs → nodeHTTPRequestHandler-174459c5.mjs} +2 -2
  50. package/dist/{nodeHTTPRequestHandler-9ddd18f2.js → nodeHTTPRequestHandler-6b7c8622.js} +2 -2
  51. package/dist/{resolveHTTPResponse-ccb9cfa1.mjs → resolveHTTPResponse-8657b8de.mjs} +1 -1
  52. package/dist/{resolveHTTPResponse-5932d785.js → resolveHTTPResponse-fcc8f644.js} +1 -1
  53. package/dist/subscription.js +1 -1
  54. package/dist/subscription.mjs +1 -1
  55. package/package.json +3 -2
  56. package/src/adapters/next.ts +1 -1
  57. package/src/adapters/node-http/internals/getPostBody.ts +1 -1
  58. package/src/adapters/ws.ts +11 -3
  59. package/src/core/internals/internalProcedure.ts +4 -4
  60. package/src/core/internals/mergeRoutersGeneric.ts +35 -0
  61. package/src/core/internals/procedureBuilder.ts +3 -2
  62. package/src/core/router.ts +46 -1
  63. package/src/deprecated/internals/middlewares.ts +1 -1
  64. package/src/deprecated/internals/procedure.ts +2 -5
  65. package/src/deprecated/router.ts +3 -13
  66. package/src/error/TRPCError.ts +2 -2
  67. package/src/http/internals/getHTTPStatusCode.ts +1 -1
  68. package/src/http/internals/types.ts +1 -1
  69. package/src/http/resolveHTTPResponse.ts +2 -2
  70. package/src/index.ts +1 -1
  71. package/src/internals/types.ts +1 -1
  72. package/src/subscription.ts +1 -1
  73. package/dist/TRPCError.d.ts +0 -11
  74. package/dist/TRPCError.d.ts.map +0 -1
  75. package/dist/internals/errors.d.ts +0 -5
  76. package/dist/internals/errors.d.ts.map +0 -1
  77. package/src/TRPCError.ts +0 -27
  78. package/src/internals/errors.ts +0 -49
package/dist/index.js CHANGED
@@ -2,9 +2,9 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var resolveHTTPResponse = require('./resolveHTTPResponse-5932d785.js');
5
+ var resolveHTTPResponse = require('./resolveHTTPResponse-fcc8f644.js');
6
6
  var envelopes = require('./envelopes-b6dd0367.js');
7
- var TRPCError = require('./TRPCError-ddec3395.js');
7
+ var TRPCError = require('./TRPCError-9050a68d.js');
8
8
  require('./transformTRPCResponse-0c261655.js');
9
9
 
10
10
  resolveHTTPResponse.assertNotBrowser();
@@ -51,7 +51,7 @@ function getDataTransformer$1(transformer) {
51
51
  /**
52
52
  * @internal
53
53
  */
54
- const defaultTransformer$1 = {
54
+ const defaultTransformer = {
55
55
  _default: true,
56
56
  input: {
57
57
  serialize: obj => obj,
@@ -63,6 +63,23 @@ const defaultTransformer$1 = {
63
63
  }
64
64
  };
65
65
 
66
+ /**
67
+ * @internal
68
+ */
69
+
70
+ /**
71
+ * @internal
72
+ */
73
+
74
+ /**
75
+ * @internal
76
+ */
77
+ const defaultFormatter = ({
78
+ shape
79
+ }) => {
80
+ return shape;
81
+ };
82
+
66
83
  /**
67
84
  * @deprecated
68
85
  */
@@ -311,14 +328,6 @@ function getParseFnOrPassThrough(procedureParser) {
311
328
  return getParseFn(procedureParser);
312
329
  }
313
330
 
314
- function getCauseFromUnknown(cause) {
315
- if (cause instanceof Error) {
316
- return cause;
317
- }
318
-
319
- return undefined;
320
- }
321
-
322
331
  /**
323
332
  * Ensures there are no duplicate keys when building a procedure.
324
333
  */
@@ -456,7 +465,7 @@ function createInputMiddleware(parse) {
456
465
  } catch (cause) {
457
466
  throw new TRPCError.TRPCError({
458
467
  code: 'BAD_REQUEST',
459
- cause: getCauseFromUnknown(cause)
468
+ cause: TRPCError.getCauseFromUnknown(cause)
460
469
  });
461
470
  } // TODO fix this typing?
462
471
 
@@ -486,7 +495,7 @@ function createOutputMiddleware(parse) {
486
495
  throw new TRPCError.TRPCError({
487
496
  message: 'Output validation failed',
488
497
  code: 'INTERNAL_SERVER_ERROR',
489
- cause: getCauseFromUnknown(cause)
498
+ cause: TRPCError.getCauseFromUnknown(cause)
490
499
  });
491
500
  }
492
501
  };
@@ -538,7 +547,7 @@ function createInternalBuilder(initDef) {
538
547
  return createProcedureCaller(finalBuilder._def);
539
548
  },
540
549
 
541
- concat(builder) {
550
+ unstable_concat(builder) {
542
551
  return createNewInternalBuilder(_def, builder._def);
543
552
  },
544
553
 
@@ -551,23 +560,6 @@ function createInternalBuilder(initDef) {
551
560
  };
552
561
  }
553
562
 
554
- /**
555
- * @internal
556
- */
557
-
558
- /**
559
- * @internal
560
- */
561
-
562
- /**
563
- * @internal
564
- */
565
- const defaultFormatter$1 = ({
566
- shape
567
- }) => {
568
- return shape;
569
- };
570
-
571
563
  /**
572
564
  * Create an object without inheriting anything from `Object.prototype`
573
565
  * @internal
@@ -577,6 +569,16 @@ function omitPrototype(obj1) {
577
569
  }
578
570
 
579
571
  /* eslint-disable @typescript-eslint/ban-types */
572
+
573
+ function createRouterProxy(callback) {
574
+ return new Proxy({}, {
575
+ get(_, path) {
576
+ return (...args) => callback(path, ...args);
577
+ }
578
+
579
+ });
580
+ }
581
+
580
582
  const emptyRouter = {
581
583
  _ctx: null,
582
584
  _errorShape: null,
@@ -584,8 +586,8 @@ const emptyRouter = {
584
586
  queries: {},
585
587
  mutations: {},
586
588
  subscriptions: {},
587
- errorFormatter: defaultFormatter$1,
588
- transformer: defaultTransformer$1
589
+ errorFormatter: defaultFormatter,
590
+ transformer: defaultTransformer
589
591
  }; // type EmptyRouter = typeof emptyRouter;
590
592
 
591
593
  const PROCEDURE_DEFINITION_MAP$1 = {
@@ -603,8 +605,8 @@ function createRouterFactory(defaults) {
603
605
  var _defaults$transformer, _defaults$errorFormat;
604
606
 
605
607
  const result = mergeWithoutOverrides({
606
- transformer: (_defaults$transformer = defaults === null || defaults === void 0 ? void 0 : defaults.transformer) !== null && _defaults$transformer !== void 0 ? _defaults$transformer : defaultTransformer$1,
607
- errorFormatter: (_defaults$errorFormat = defaults === null || defaults === void 0 ? void 0 : defaults.errorFormatter) !== null && _defaults$errorFormat !== void 0 ? _defaults$errorFormat : defaultFormatter$1
608
+ transformer: (_defaults$transformer = defaults === null || defaults === void 0 ? void 0 : defaults.transformer) !== null && _defaults$transformer !== void 0 ? _defaults$transformer : defaultTransformer,
609
+ errorFormatter: (_defaults$errorFormat = defaults === null || defaults === void 0 ? void 0 : defaults.errorFormatter) !== null && _defaults$errorFormat !== void 0 ? _defaults$errorFormat : defaultFormatter
608
610
  }, {
609
611
  queries: omitPrototype(procedures.queries),
610
612
  mutations: omitPrototype(procedures.mutations),
@@ -658,7 +660,25 @@ function createRouterFactory(defaults) {
658
660
  rawInput: args[0],
659
661
  ctx,
660
662
  type: 'subscription'
661
- })
663
+ }),
664
+ queries: createRouterProxy((path, rawInput) => callProcedure({
665
+ path,
666
+ rawInput,
667
+ ctx,
668
+ type: 'query'
669
+ })),
670
+ mutations: createRouterProxy((path, rawInput) => callProcedure({
671
+ path,
672
+ rawInput,
673
+ ctx,
674
+ type: 'mutation'
675
+ })),
676
+ subscriptions: createRouterProxy((path, rawInput) => callProcedure({
677
+ path,
678
+ rawInput,
679
+ ctx,
680
+ type: 'subscription'
681
+ }))
662
682
  };
663
683
  },
664
684
 
@@ -776,23 +796,6 @@ function safeObject(...args) {
776
796
  return Object.assign(Object.create(null), ...args);
777
797
  }
778
798
 
779
- const defaultFormatter = ({
780
- shape
781
- }) => {
782
- return shape;
783
- };
784
-
785
- const defaultTransformer = {
786
- input: {
787
- serialize: obj => obj,
788
- deserialize: obj => obj
789
- },
790
- output: {
791
- serialize: obj => obj,
792
- deserialize: obj => obj
793
- }
794
- };
795
-
796
799
  /**
797
800
  * @internal The type signature of this class may change without warning.
798
801
  * @deprecated
@@ -1059,8 +1062,8 @@ function mergeRouters(...routerList) {
1059
1062
  const mutations = mergeWithoutOverrides({}, ...routerList.map(r => r.mutations));
1060
1063
  const subscriptions = mergeWithoutOverrides({}, ...routerList.map(r => r.subscriptions));
1061
1064
  const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter) => {
1062
- if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter$1) {
1063
- if (currentErrorFormatter !== defaultFormatter$1 && currentErrorFormatter !== nextRouter.errorFormatter) {
1065
+ if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter) {
1066
+ if (currentErrorFormatter !== defaultFormatter && currentErrorFormatter !== nextRouter.errorFormatter) {
1064
1067
  throw new Error('You seem to have several error formatters');
1065
1068
  }
1066
1069
 
@@ -1068,10 +1071,10 @@ function mergeRouters(...routerList) {
1068
1071
  }
1069
1072
 
1070
1073
  return currentErrorFormatter;
1071
- }, defaultFormatter$1);
1074
+ }, defaultFormatter);
1072
1075
  const transformer = routerList.reduce((prev, current) => {
1073
- if (current.transformer && current.transformer !== defaultTransformer$1) {
1074
- if (prev !== defaultTransformer$1 && prev !== current.transformer) {
1076
+ if (current.transformer && current.transformer !== defaultTransformer) {
1077
+ if (prev !== defaultTransformer && prev !== current.transformer) {
1075
1078
  throw new Error('You seem to have several transformers');
1076
1079
  }
1077
1080
 
@@ -1079,7 +1082,7 @@ function mergeRouters(...routerList) {
1079
1082
  }
1080
1083
 
1081
1084
  return prev;
1082
- }, defaultTransformer$1);
1085
+ }, defaultTransformer);
1083
1086
  const router = createRouterFactory({
1084
1087
  errorFormatter,
1085
1088
  transformer
@@ -1135,8 +1138,8 @@ function initTRPC() {
1135
1138
  return function initTRPCInner(options) {
1136
1139
  var _options$errorFormatt, _options$transformer;
1137
1140
 
1138
- const errorFormatter = (_options$errorFormatt = options === null || options === void 0 ? void 0 : options.errorFormatter) !== null && _options$errorFormatt !== void 0 ? _options$errorFormatt : defaultFormatter$1;
1139
- const transformer = getDataTransformer$1((_options$transformer = options === null || options === void 0 ? void 0 : options.transformer) !== null && _options$transformer !== void 0 ? _options$transformer : defaultTransformer$1);
1141
+ const errorFormatter = (_options$errorFormatt = options === null || options === void 0 ? void 0 : options.errorFormatter) !== null && _options$errorFormatt !== void 0 ? _options$errorFormatt : defaultFormatter;
1142
+ const transformer = getDataTransformer$1((_options$transformer = options === null || options === void 0 ? void 0 : options.transformer) !== null && _options$transformer !== void 0 ? _options$transformer : defaultTransformer);
1140
1143
  return {
1141
1144
  /**
1142
1145
  * These are just types, they can't be used
@@ -1174,7 +1177,7 @@ function initTRPC() {
1174
1177
  exports.assertNotBrowser = resolveHTTPResponse.assertNotBrowser;
1175
1178
  exports.resolveHTTPResponse = resolveHTTPResponse.resolveHTTPResponse;
1176
1179
  exports.TRPCError = TRPCError.TRPCError;
1177
- exports.defaultTransformer = defaultTransformer$1;
1180
+ exports.defaultTransformer = defaultTransformer;
1178
1181
  exports.getDataTransformer = getDataTransformer$1;
1179
1182
  exports.initTRPC = initTRPC;
1180
1183
  exports.router = router;
package/dist/index.mjs CHANGED
@@ -1,8 +1,8 @@
1
- import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-ccb9cfa1.mjs';
2
- export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-ccb9cfa1.mjs';
1
+ import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-8657b8de.mjs';
2
+ export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-8657b8de.mjs';
3
3
  import { T as TRPC_ERROR_CODES_BY_KEY } from './envelopes-af8c2959.mjs';
4
- import { T as TRPCError, g as getCauseFromUnknown$1, a as getErrorFromUnknown } from './TRPCError-7971540a.mjs';
5
- export { T as TRPCError } from './TRPCError-7971540a.mjs';
4
+ import { T as TRPCError, g as getCauseFromUnknown, a as getErrorFromUnknown } from './TRPCError-b7fa0c31.mjs';
5
+ export { T as TRPCError } from './TRPCError-b7fa0c31.mjs';
6
6
  import './transformTRPCResponse-747b9a68.mjs';
7
7
 
8
8
  assertNotBrowser();
@@ -49,7 +49,7 @@ function getDataTransformer$1(transformer) {
49
49
  /**
50
50
  * @internal
51
51
  */
52
- const defaultTransformer$1 = {
52
+ const defaultTransformer = {
53
53
  _default: true,
54
54
  input: {
55
55
  serialize: obj => obj,
@@ -61,6 +61,23 @@ const defaultTransformer$1 = {
61
61
  }
62
62
  };
63
63
 
64
+ /**
65
+ * @internal
66
+ */
67
+
68
+ /**
69
+ * @internal
70
+ */
71
+
72
+ /**
73
+ * @internal
74
+ */
75
+ const defaultFormatter = ({
76
+ shape
77
+ }) => {
78
+ return shape;
79
+ };
80
+
64
81
  /**
65
82
  * @deprecated
66
83
  */
@@ -139,7 +156,7 @@ class Procedure {
139
156
  } catch (cause) {
140
157
  throw new TRPCError({
141
158
  code: 'BAD_REQUEST',
142
- cause: getCauseFromUnknown$1(cause)
159
+ cause: getCauseFromUnknown(cause)
143
160
  });
144
161
  }
145
162
  }
@@ -150,7 +167,7 @@ class Procedure {
150
167
  } catch (cause) {
151
168
  throw new TRPCError({
152
169
  code: 'INTERNAL_SERVER_ERROR',
153
- cause: getCauseFromUnknown$1(cause),
170
+ cause: getCauseFromUnknown(cause),
154
171
  message: 'Output validation failed'
155
172
  });
156
173
  }
@@ -309,14 +326,6 @@ function getParseFnOrPassThrough(procedureParser) {
309
326
  return getParseFn(procedureParser);
310
327
  }
311
328
 
312
- function getCauseFromUnknown(cause) {
313
- if (cause instanceof Error) {
314
- return cause;
315
- }
316
-
317
- return undefined;
318
- }
319
-
320
329
  /**
321
330
  * Ensures there are no duplicate keys when building a procedure.
322
331
  */
@@ -536,7 +545,7 @@ function createInternalBuilder(initDef) {
536
545
  return createProcedureCaller(finalBuilder._def);
537
546
  },
538
547
 
539
- concat(builder) {
548
+ unstable_concat(builder) {
540
549
  return createNewInternalBuilder(_def, builder._def);
541
550
  },
542
551
 
@@ -549,23 +558,6 @@ function createInternalBuilder(initDef) {
549
558
  };
550
559
  }
551
560
 
552
- /**
553
- * @internal
554
- */
555
-
556
- /**
557
- * @internal
558
- */
559
-
560
- /**
561
- * @internal
562
- */
563
- const defaultFormatter$1 = ({
564
- shape
565
- }) => {
566
- return shape;
567
- };
568
-
569
561
  /**
570
562
  * Create an object without inheriting anything from `Object.prototype`
571
563
  * @internal
@@ -575,6 +567,16 @@ function omitPrototype(obj1) {
575
567
  }
576
568
 
577
569
  /* eslint-disable @typescript-eslint/ban-types */
570
+
571
+ function createRouterProxy(callback) {
572
+ return new Proxy({}, {
573
+ get(_, path) {
574
+ return (...args) => callback(path, ...args);
575
+ }
576
+
577
+ });
578
+ }
579
+
578
580
  const emptyRouter = {
579
581
  _ctx: null,
580
582
  _errorShape: null,
@@ -582,8 +584,8 @@ const emptyRouter = {
582
584
  queries: {},
583
585
  mutations: {},
584
586
  subscriptions: {},
585
- errorFormatter: defaultFormatter$1,
586
- transformer: defaultTransformer$1
587
+ errorFormatter: defaultFormatter,
588
+ transformer: defaultTransformer
587
589
  }; // type EmptyRouter = typeof emptyRouter;
588
590
 
589
591
  const PROCEDURE_DEFINITION_MAP$1 = {
@@ -601,8 +603,8 @@ function createRouterFactory(defaults) {
601
603
  var _defaults$transformer, _defaults$errorFormat;
602
604
 
603
605
  const result = mergeWithoutOverrides({
604
- transformer: (_defaults$transformer = defaults === null || defaults === void 0 ? void 0 : defaults.transformer) !== null && _defaults$transformer !== void 0 ? _defaults$transformer : defaultTransformer$1,
605
- errorFormatter: (_defaults$errorFormat = defaults === null || defaults === void 0 ? void 0 : defaults.errorFormatter) !== null && _defaults$errorFormat !== void 0 ? _defaults$errorFormat : defaultFormatter$1
606
+ transformer: (_defaults$transformer = defaults === null || defaults === void 0 ? void 0 : defaults.transformer) !== null && _defaults$transformer !== void 0 ? _defaults$transformer : defaultTransformer,
607
+ errorFormatter: (_defaults$errorFormat = defaults === null || defaults === void 0 ? void 0 : defaults.errorFormatter) !== null && _defaults$errorFormat !== void 0 ? _defaults$errorFormat : defaultFormatter
606
608
  }, {
607
609
  queries: omitPrototype(procedures.queries),
608
610
  mutations: omitPrototype(procedures.mutations),
@@ -656,7 +658,25 @@ function createRouterFactory(defaults) {
656
658
  rawInput: args[0],
657
659
  ctx,
658
660
  type: 'subscription'
659
- })
661
+ }),
662
+ queries: createRouterProxy((path, rawInput) => callProcedure({
663
+ path,
664
+ rawInput,
665
+ ctx,
666
+ type: 'query'
667
+ })),
668
+ mutations: createRouterProxy((path, rawInput) => callProcedure({
669
+ path,
670
+ rawInput,
671
+ ctx,
672
+ type: 'mutation'
673
+ })),
674
+ subscriptions: createRouterProxy((path, rawInput) => callProcedure({
675
+ path,
676
+ rawInput,
677
+ ctx,
678
+ type: 'subscription'
679
+ }))
660
680
  };
661
681
  },
662
682
 
@@ -774,23 +794,6 @@ function safeObject(...args) {
774
794
  return Object.assign(Object.create(null), ...args);
775
795
  }
776
796
 
777
- const defaultFormatter = ({
778
- shape
779
- }) => {
780
- return shape;
781
- };
782
-
783
- const defaultTransformer = {
784
- input: {
785
- serialize: obj => obj,
786
- deserialize: obj => obj
787
- },
788
- output: {
789
- serialize: obj => obj,
790
- deserialize: obj => obj
791
- }
792
- };
793
-
794
797
  /**
795
798
  * @internal The type signature of this class may change without warning.
796
799
  * @deprecated
@@ -1057,8 +1060,8 @@ function mergeRouters(...routerList) {
1057
1060
  const mutations = mergeWithoutOverrides({}, ...routerList.map(r => r.mutations));
1058
1061
  const subscriptions = mergeWithoutOverrides({}, ...routerList.map(r => r.subscriptions));
1059
1062
  const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter) => {
1060
- if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter$1) {
1061
- if (currentErrorFormatter !== defaultFormatter$1 && currentErrorFormatter !== nextRouter.errorFormatter) {
1063
+ if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter) {
1064
+ if (currentErrorFormatter !== defaultFormatter && currentErrorFormatter !== nextRouter.errorFormatter) {
1062
1065
  throw new Error('You seem to have several error formatters');
1063
1066
  }
1064
1067
 
@@ -1066,10 +1069,10 @@ function mergeRouters(...routerList) {
1066
1069
  }
1067
1070
 
1068
1071
  return currentErrorFormatter;
1069
- }, defaultFormatter$1);
1072
+ }, defaultFormatter);
1070
1073
  const transformer = routerList.reduce((prev, current) => {
1071
- if (current.transformer && current.transformer !== defaultTransformer$1) {
1072
- if (prev !== defaultTransformer$1 && prev !== current.transformer) {
1074
+ if (current.transformer && current.transformer !== defaultTransformer) {
1075
+ if (prev !== defaultTransformer && prev !== current.transformer) {
1073
1076
  throw new Error('You seem to have several transformers');
1074
1077
  }
1075
1078
 
@@ -1077,7 +1080,7 @@ function mergeRouters(...routerList) {
1077
1080
  }
1078
1081
 
1079
1082
  return prev;
1080
- }, defaultTransformer$1);
1083
+ }, defaultTransformer);
1081
1084
  const router = createRouterFactory({
1082
1085
  errorFormatter,
1083
1086
  transformer
@@ -1133,8 +1136,8 @@ function initTRPC() {
1133
1136
  return function initTRPCInner(options) {
1134
1137
  var _options$errorFormatt, _options$transformer;
1135
1138
 
1136
- const errorFormatter = (_options$errorFormatt = options === null || options === void 0 ? void 0 : options.errorFormatter) !== null && _options$errorFormatt !== void 0 ? _options$errorFormatt : defaultFormatter$1;
1137
- const transformer = getDataTransformer$1((_options$transformer = options === null || options === void 0 ? void 0 : options.transformer) !== null && _options$transformer !== void 0 ? _options$transformer : defaultTransformer$1);
1139
+ const errorFormatter = (_options$errorFormatt = options === null || options === void 0 ? void 0 : options.errorFormatter) !== null && _options$errorFormatt !== void 0 ? _options$errorFormatt : defaultFormatter;
1140
+ const transformer = getDataTransformer$1((_options$transformer = options === null || options === void 0 ? void 0 : options.transformer) !== null && _options$transformer !== void 0 ? _options$transformer : defaultTransformer);
1138
1141
  return {
1139
1142
  /**
1140
1143
  * These are just types, they can't be used
@@ -1169,4 +1172,4 @@ function initTRPC() {
1169
1172
  };
1170
1173
  }
1171
1174
 
1172
- export { defaultTransformer$1 as defaultTransformer, getDataTransformer$1 as getDataTransformer, initTRPC, router };
1175
+ export { defaultTransformer, getDataTransformer$1 as getDataTransformer, initTRPC, router };
@@ -1,7 +1,7 @@
1
- import { TRPCError } from '../TRPCError';
2
1
  import { inferRouterParams } from '../core';
3
2
  import { ProcedureType } from '../core';
4
3
  import { AnyRouter } from '../core/router';
4
+ import { TRPCError } from '../error/TRPCError';
5
5
  /**
6
6
  * Base interface for any response handler
7
7
  */
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ;IACrE,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,oBAAY,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ,IAAI,CAAC,IAAI,EAAE;IACxE,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,GAAG,EAAE,QAAQ,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,SAAS,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;CACrD,KAAK,IAAI,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ;IACrE,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,oBAAY,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ,IAAI,CAAC,IAAI,EAAE;IACxE,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,GAAG,EAAE,QAAQ,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,SAAS,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;CACrD,KAAK,IAAI,CAAC"}
@@ -1,5 +1,5 @@
1
- import { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-ccb9cfa1.mjs';
2
- import { T as TRPCError } from './TRPCError-7971540a.mjs';
1
+ import { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-8657b8de.mjs';
2
+ import { T as TRPCError } from './TRPCError-b7fa0c31.mjs';
3
3
 
4
4
  async function getPostBody({
5
5
  req,
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
- var resolveHTTPResponse = require('./resolveHTTPResponse-5932d785.js');
4
- var TRPCError = require('./TRPCError-ddec3395.js');
3
+ var resolveHTTPResponse = require('./resolveHTTPResponse-fcc8f644.js');
4
+ var TRPCError = require('./TRPCError-9050a68d.js');
5
5
 
6
6
  async function getPostBody({
7
7
  req,
@@ -1,4 +1,4 @@
1
- import { T as TRPCError, a as getErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-7971540a.mjs';
1
+ import { T as TRPCError, a as getErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-b7fa0c31.mjs';
2
2
  import { t as transformTRPCResponse } from './transformTRPCResponse-747b9a68.mjs';
3
3
  import { T as TRPC_ERROR_CODES_BY_KEY } from './envelopes-af8c2959.mjs';
4
4
 
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var TRPCError = require('./TRPCError-ddec3395.js');
3
+ var TRPCError = require('./TRPCError-9050a68d.js');
4
4
  var transformTRPCResponse = require('./transformTRPCResponse-0c261655.js');
5
5
  var envelopes = require('./envelopes-b6dd0367.js');
6
6
 
@@ -2,7 +2,7 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var TRPCError = require('./TRPCError-ddec3395.js');
5
+ var TRPCError = require('./TRPCError-9050a68d.js');
6
6
  var observable = require('./observable-3aa4d911.js');
7
7
 
8
8
  function subscriptionPullFactory(opts) {
@@ -1,4 +1,4 @@
1
- import { a as getErrorFromUnknown } from './TRPCError-7971540a.mjs';
1
+ import { a as getErrorFromUnknown } from './TRPCError-b7fa0c31.mjs';
2
2
  import { o as observable } from './observable-137ea1bd.mjs';
3
3
 
4
4
  function subscriptionPullFactory(opts) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/server",
3
- "version": "10.0.0-alpha.26",
3
+ "version": "10.0.0-alpha.29",
4
4
  "description": "tRPC Server",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -22,6 +22,7 @@
22
22
  "scripts": {
23
23
  "test": "jest",
24
24
  "build": "rollup -c",
25
+ "benchmark": "yarn tsc --project tsconfig.benchmark.json",
25
26
  "ts-watch": "tsc --project tsconfig.watch.json"
26
27
  },
27
28
  "main": "dist/index.js",
@@ -132,5 +133,5 @@
132
133
  "dependencies": {
133
134
  "tslib": "^2.1.0"
134
135
  },
135
- "gitHead": "412d2ba0d5f857e7f7d2e0fd3af6f1334e4f108a"
136
+ "gitHead": "26c39efe913475ed0544c9953e821fc9b9d53fff"
136
137
  }
@@ -5,8 +5,8 @@ import type {
5
5
  NextApiRequest,
6
6
  NextApiResponse,
7
7
  } from 'next/types';
8
- import { TRPCError } from '../TRPCError';
9
8
  import { AnyRouter } from '../core';
9
+ import { TRPCError } from '../error/TRPCError';
10
10
  import { nodeHTTPRequestHandler } from './node-http';
11
11
  import {
12
12
  NodeHTTPCreateContextFnOptions,
@@ -1,4 +1,4 @@
1
- import { TRPCError } from '../../../TRPCError';
1
+ import { TRPCError } from '../../../error/TRPCError';
2
2
  import { NodeHTTPRequest } from '../types';
3
3
 
4
4
  export async function getPostBody({
@@ -1,8 +1,8 @@
1
1
  import { IncomingMessage } from 'http';
2
2
  import ws from 'ws';
3
- import { TRPCError } from '../TRPCError';
4
3
  import { AnyRouter, ProcedureType, inferRouterContext } from '../core';
5
- import { getCauseFromUnknown, getErrorFromUnknown } from '../internals/errors';
4
+ import { TRPCError } from '../error/TRPCError';
5
+ import { getCauseFromUnknown, getErrorFromUnknown } from '../error/utils';
6
6
  import { transformTRPCResponse } from '../internals/transformTRPCResponse';
7
7
  import { BaseHandlerOptions } from '../internals/types';
8
8
  import { Unsubscribable, isObservable } from '../observable';
@@ -13,7 +13,10 @@ import {
13
13
  TRPCResponseMessage,
14
14
  } from '../rpc';
15
15
  import { CombinedDataTransformer } from '../transformer';
16
- import { NodeHTTPCreateContextOption } from './node-http';
16
+ import {
17
+ NodeHTTPCreateContextFnOptions,
18
+ NodeHTTPCreateContextOption,
19
+ } from './node-http';
17
20
 
18
21
  /* istanbul ignore next */
19
22
  function assertIsObject(obj: unknown): asserts obj is Record<string, unknown> {
@@ -97,6 +100,11 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<
97
100
  process?: NodeJS.Process;
98
101
  } & NodeHTTPCreateContextOption<TRouter, IncomingMessage, ws>;
99
102
 
103
+ export type CreateWSSContextFnOptions = NodeHTTPCreateContextFnOptions<
104
+ IncomingMessage,
105
+ ws
106
+ >;
107
+
100
108
  export function applyWSSHandler<TRouter extends AnyRouter>(
101
109
  opts: WSSHandlerOptions<TRouter>,
102
110
  ) {
@@ -2,9 +2,9 @@
2
2
  * This is the actual internal representation of a builder
3
3
  * FIXME - I want to get rid of this and use the public API instead
4
4
  */
5
- import { TRPCError } from '../../TRPCError';
5
+ import { TRPCError } from '../../error/TRPCError';
6
6
  import { getCauseFromUnknown } from '../../error/utils';
7
- import { getErrorFromUnknown } from '../../internals/errors';
7
+ import { getErrorFromUnknown } from '../../error/utils';
8
8
  import { MaybePromise } from '../../types';
9
9
  import { MiddlewareFunction, MiddlewareResult } from '../middleware';
10
10
  import { Parser } from '../parser';
@@ -55,7 +55,7 @@ interface ProcedureBuilderInternal {
55
55
  /**
56
56
  * @internal
57
57
  */
58
- concat: (proc: ProcedureBuilderInternal) => ProcedureBuilderInternal;
58
+ unstable_concat: (proc: ProcedureBuilderInternal) => ProcedureBuilderInternal;
59
59
  /**
60
60
  * @internal
61
61
  */
@@ -253,7 +253,7 @@ export function createInternalBuilder(
253
253
 
254
254
  return createProcedureCaller(finalBuilder._def);
255
255
  },
256
- concat(builder) {
256
+ unstable_concat(builder) {
257
257
  return createNewInternalBuilder(_def, builder._def);
258
258
  },
259
259
  use(middleware) {