@trpc/server 10.0.0-alpha.30 → 10.0.0-alpha.31

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 (34) hide show
  1. package/dist/core/initTRPC.d.ts +29 -6
  2. package/dist/core/initTRPC.d.ts.map +1 -1
  3. package/dist/core/internals/__generated__/mergeRoutersGeneric.d.ts +80 -20
  4. package/dist/core/internals/__generated__/mergeRoutersGeneric.d.ts.map +1 -1
  5. package/dist/core/internals/config.d.ts +2 -2
  6. package/dist/core/internals/config.d.ts.map +1 -1
  7. package/dist/core/internals/procedureBuilder.d.ts +4 -0
  8. package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
  9. package/dist/core/middleware.d.ts +9 -1
  10. package/dist/core/middleware.d.ts.map +1 -1
  11. package/dist/core/procedure.d.ts +12 -1
  12. package/dist/core/procedure.d.ts.map +1 -1
  13. package/dist/core/router.d.ts +27 -17
  14. package/dist/core/router.d.ts.map +1 -1
  15. package/dist/core/types.d.ts +2 -2
  16. package/dist/core/types.d.ts.map +1 -1
  17. package/dist/deprecated/interop.d.ts +22 -6
  18. package/dist/deprecated/interop.d.ts.map +1 -1
  19. package/dist/index.js +13 -10
  20. package/dist/index.mjs +13 -10
  21. package/dist/types.d.ts +5 -3
  22. package/dist/types.d.ts.map +1 -1
  23. package/package.json +2 -2
  24. package/src/core/initTRPC.ts +1 -1
  25. package/src/core/internals/__generated__/mergeRoutersGeneric.ts +260 -200
  26. package/src/core/internals/config.ts +3 -2
  27. package/src/core/internals/mergeRouters.ts +3 -3
  28. package/src/core/internals/procedureBuilder.ts +4 -0
  29. package/src/core/middleware.ts +2 -0
  30. package/src/core/procedure.ts +13 -0
  31. package/src/core/router.ts +58 -29
  32. package/src/core/types.ts +4 -3
  33. package/src/deprecated/interop.ts +65 -32
  34. package/src/types.ts +5 -3
package/dist/index.js CHANGED
@@ -619,7 +619,7 @@ const emptyRouter = {
619
619
  */
620
620
 
621
621
  function createRouterFactory(defaults) {
622
- return function createRouterInner(procedures) {
622
+ return function createRouterInner(opts) {
623
623
  var _defaults$transformer, _defaults$errorFormat;
624
624
 
625
625
  const routerProcedures = omitPrototype({});
@@ -638,7 +638,7 @@ function createRouterFactory(defaults) {
638
638
  }
639
639
  }
640
640
 
641
- recursiveGetPaths(procedures);
641
+ recursiveGetPaths(opts);
642
642
  const result = mergeWithoutOverrides({
643
643
  transformer: (_defaults$transformer = defaults === null || defaults === void 0 ? void 0 : defaults.transformer) !== null && _defaults$transformer !== void 0 ? _defaults$transformer : defaultTransformer,
644
644
  errorFormatter: (_defaults$errorFormat = defaults === null || defaults === void 0 ? void 0 : defaults.errorFormatter) !== null && _defaults$errorFormat !== void 0 ? _defaults$errorFormat : defaultFormatter
@@ -646,9 +646,11 @@ function createRouterFactory(defaults) {
646
646
  procedures: routerProcedures
647
647
  });
648
648
  const _def = {
649
+ router: true,
649
650
  procedures: {},
650
651
  ...emptyRouter,
651
652
  ...result,
653
+ record: opts,
652
654
  queries: Object.entries(result.procedures || {}).filter(pair => pair[1]._def.query).reduce((acc, [key, val]) => ({ ...acc,
653
655
  [key]: val
654
656
  }), {}),
@@ -657,13 +659,11 @@ function createRouterFactory(defaults) {
657
659
  }), {}),
658
660
  subscriptions: Object.entries(result.procedures || {}).filter(pair => pair[1]._def.subscription).reduce((acc, [key, val]) => ({ ...acc,
659
661
  [key]: val
662
+ }), {}),
663
+ routers: Object.entries(result.procedures || {}).filter(pair => pair[1]._def._router).reduce((acc, [key, val]) => ({ ...acc,
664
+ [key]: val
660
665
  }), {})
661
666
  };
662
- const def = {
663
- _def,
664
- transformer: _def.transformer,
665
- errorFormatter: _def.errorFormatter
666
- };
667
667
 
668
668
  function callProcedure(opts) {
669
669
  const {
@@ -682,7 +682,10 @@ function createRouterFactory(defaults) {
682
682
  return procedure(opts);
683
683
  }
684
684
 
685
- const router = { ...def,
685
+ const router = { ...opts,
686
+ _def,
687
+ transformer: _def.transformer,
688
+ errorFormatter: _def.errorFormatter,
686
689
 
687
690
  createCaller(ctx) {
688
691
  return {
@@ -1101,7 +1104,7 @@ function router() {
1101
1104
  }
1102
1105
 
1103
1106
  function mergeRouters(...routerList) {
1104
- const procedures = mergeWithoutOverrides({}, ...routerList.map(r => r._def.procedures));
1107
+ const record = mergeWithoutOverrides({}, ...routerList.map(r => r._def.record));
1105
1108
  const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter) => {
1106
1109
  if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter) {
1107
1110
  if (currentErrorFormatter !== defaultFormatter && currentErrorFormatter !== nextRouter.errorFormatter) {
@@ -1127,7 +1130,7 @@ function mergeRouters(...routerList) {
1127
1130
  const router = createRouterFactory({
1128
1131
  errorFormatter,
1129
1132
  transformer
1130
- })(procedures);
1133
+ })(record);
1131
1134
  return router;
1132
1135
  }
1133
1136
 
package/dist/index.mjs CHANGED
@@ -617,7 +617,7 @@ const emptyRouter = {
617
617
  */
618
618
 
619
619
  function createRouterFactory(defaults) {
620
- return function createRouterInner(procedures) {
620
+ return function createRouterInner(opts) {
621
621
  var _defaults$transformer, _defaults$errorFormat;
622
622
 
623
623
  const routerProcedures = omitPrototype({});
@@ -636,7 +636,7 @@ function createRouterFactory(defaults) {
636
636
  }
637
637
  }
638
638
 
639
- recursiveGetPaths(procedures);
639
+ recursiveGetPaths(opts);
640
640
  const result = mergeWithoutOverrides({
641
641
  transformer: (_defaults$transformer = defaults === null || defaults === void 0 ? void 0 : defaults.transformer) !== null && _defaults$transformer !== void 0 ? _defaults$transformer : defaultTransformer,
642
642
  errorFormatter: (_defaults$errorFormat = defaults === null || defaults === void 0 ? void 0 : defaults.errorFormatter) !== null && _defaults$errorFormat !== void 0 ? _defaults$errorFormat : defaultFormatter
@@ -644,9 +644,11 @@ function createRouterFactory(defaults) {
644
644
  procedures: routerProcedures
645
645
  });
646
646
  const _def = {
647
+ router: true,
647
648
  procedures: {},
648
649
  ...emptyRouter,
649
650
  ...result,
651
+ record: opts,
650
652
  queries: Object.entries(result.procedures || {}).filter(pair => pair[1]._def.query).reduce((acc, [key, val]) => ({ ...acc,
651
653
  [key]: val
652
654
  }), {}),
@@ -655,13 +657,11 @@ function createRouterFactory(defaults) {
655
657
  }), {}),
656
658
  subscriptions: Object.entries(result.procedures || {}).filter(pair => pair[1]._def.subscription).reduce((acc, [key, val]) => ({ ...acc,
657
659
  [key]: val
660
+ }), {}),
661
+ routers: Object.entries(result.procedures || {}).filter(pair => pair[1]._def._router).reduce((acc, [key, val]) => ({ ...acc,
662
+ [key]: val
658
663
  }), {})
659
664
  };
660
- const def = {
661
- _def,
662
- transformer: _def.transformer,
663
- errorFormatter: _def.errorFormatter
664
- };
665
665
 
666
666
  function callProcedure(opts) {
667
667
  const {
@@ -680,7 +680,10 @@ function createRouterFactory(defaults) {
680
680
  return procedure(opts);
681
681
  }
682
682
 
683
- const router = { ...def,
683
+ const router = { ...opts,
684
+ _def,
685
+ transformer: _def.transformer,
686
+ errorFormatter: _def.errorFormatter,
684
687
 
685
688
  createCaller(ctx) {
686
689
  return {
@@ -1099,7 +1102,7 @@ function router() {
1099
1102
  }
1100
1103
 
1101
1104
  function mergeRouters(...routerList) {
1102
- const procedures = mergeWithoutOverrides({}, ...routerList.map(r => r._def.procedures));
1105
+ const record = mergeWithoutOverrides({}, ...routerList.map(r => r._def.record));
1103
1106
  const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter) => {
1104
1107
  if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter) {
1105
1108
  if (currentErrorFormatter !== defaultFormatter && currentErrorFormatter !== nextRouter.errorFormatter) {
@@ -1125,7 +1128,7 @@ function mergeRouters(...routerList) {
1125
1128
  const router = createRouterFactory({
1126
1129
  errorFormatter,
1127
1130
  transformer
1128
- })(procedures);
1131
+ })(record);
1129
1132
  return router;
1130
1133
  }
1131
1134
 
package/dist/types.d.ts CHANGED
@@ -47,10 +47,12 @@ export declare type InferLast<T> = T & {
47
47
  * @public
48
48
  */
49
49
  export declare type inferAsyncReturnType<TFunction extends (...args: any) => any> = ThenArg<ReturnType<TFunction>>;
50
+ declare type FilterKeys<T extends object, K> = {
51
+ [TKey in keyof T]: T[TKey] extends K ? TKey : never;
52
+ }[keyof T];
50
53
  /**
51
54
  * @internal
52
55
  */
53
- export declare type Filter<T extends Record<any, any> | any[], K> = {
54
- [TKey in keyof T]: T[TKey] extends K ? T[TKey] : never;
55
- };
56
+ export declare type Filter<T extends object, K> = Pick<T, FilterKeys<T, K>>;
57
+ export {};
56
58
  //# sourceMappingURL=types.d.ts.map
package/dist/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;AAEpE;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GACvC,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,SAAS,MAAM,CAAC,GACjB,CAAC,CAAC,CAAC,CAAC,GACJ,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,QAAQ,CAClB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,SAAS,MAAM,IACpB;KACD,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;AAEpD;;GAEG;AACH,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAExD;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,IAAI;KACzD,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK;CACvD,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;AAEpE;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GACvC,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,SAAS,MAAM,CAAC,GACjB,CAAC,CAAC,CAAC,CAAC,GACJ,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,QAAQ,CAClB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,SAAS,MAAM,IACpB;KACD,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;AAEpD;;GAEG;AACH,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAExD;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,aAAK,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI;KACpC,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,KAAK;CACpD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/server",
3
- "version": "10.0.0-alpha.30",
3
+ "version": "10.0.0-alpha.31",
4
4
  "description": "tRPC Server",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -133,5 +133,5 @@
133
133
  "dependencies": {
134
134
  "tslib": "^2.1.0"
135
135
  },
136
- "gitHead": "31e28de6c0469b28a6f39378f931f35e469f17f4"
136
+ "gitHead": "c5ec72d9866dcb1e2df1ec881a6e4bb18362c7b6"
137
137
  }
package/src/core/initTRPC.ts CHANGED
@@ -31,7 +31,7 @@ export function initTRPC<TParams extends Partial<InitGenerics> = {}>() {
31
31
  }>;
32
32
 
33
33
  type $Context = $Generics['ctx'];
34
- type $Meta = $Generics['meta'];
34
+ type $Meta = PickFirstDefined<$Generics['meta'], undefined>;
35
35
  type $Options = Partial<InitOptions<$Generics>>;
36
36
 
37
37
  return function initTRPCInner<TOptions extends $Options>(