@trpc/server 10.10.0 → 10.11.0

package/dist/core/initTRPC.d.ts

@@ -1,8 +1,8 @@
-import { mergeRoutersGeneric } from './internals/__generated__/mergeRoutersGeneric';
 import { DefaultErrorShape, ErrorFormatter, ErrorFormatterShape } from '../error/formatter';
 import { DataTransformerOptions, DefaultDataTransformer } from '../transformer';
 import { FlatOverwrite, Unwrap } from '../types';
 import { CreateRootConfigTypes, RootConfig, RootConfigTypes, RuntimeConfig } from './internals/config';
+import { mergeRouters } from './internals/mergeRouters';
 import { PickFirstDefined, ValidateShape } from './internals/utils';
 declare type PartialRootConfigTypes = Partial<RootConfigTypes>;
 declare type CreateRootConfigTypesFromPartial<TTypes extends PartialRootConfigTypes> = CreateRootConfigTypes<{
@@ -94,7 +94,7 @@ declare class TRPCBuilder<TParams extends PartialRootConfigTypes = object> {
         /**
          * Merge Routers
          */
-        mergeRouters: typeof mergeRoutersGeneric;
+        mergeRouters: typeof mergeRouters;
     };
 }
 /**

package/dist/core/initTRPC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../src/core/initTRPC.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EAEpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,eAAe,EACf,aAAa,EAEd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIpE,aAAK,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEvD,aAAK,gCAAgC,CAAC,MAAM,SAAS,sBAAsB,IACzE,qBAAqB,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,eAAe,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;IAC3E,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,GAChD,MAAM,CAAC,MAAM,CAAC,GACd,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IACjC,WAAW,EAAE,sBAAsB,CAAC;CACrC,CAAC,CAAC;AAEL;;;;;GAKG;AAEH,cAAM,WAAW,CAAC,OAAO,SAAS,sBAAsB,GAAG,MAAM;IAC/D,OAAO,CACL,WAAW,SACP,eAAe,CAAC,KAAK,CAAC,GACtB,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC;aAGpB,OAAO,WAAW,CAAC;;IAGrD,IAAI,CAAC,QAAQ,SAAS,eAAe,CAAC,MAAM,CAAC;cACW,QAAQ;;IAEhE,MAAM,CACJ,QAAQ,SAAS,OAAO,CACtB,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CACzD,EAED,OAAO,CAAC,EACJ,aAAa,CACX,QAAQ,EACR,OAAO,CAAC,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,CAClE,GACD,SAAS;QAsEX;;;WAGG;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;QAEH;;WAEG;;;CArFR;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ,qBAAoB,CAAC"}
+{"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../src/core/initTRPC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EAEpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,eAAe,EACf,aAAa,EAEd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIpE,aAAK,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEvD,aAAK,gCAAgC,CAAC,MAAM,SAAS,sBAAsB,IACzE,qBAAqB,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,eAAe,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;IAC3E,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,GAChD,MAAM,CAAC,MAAM,CAAC,GACd,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IACjC,WAAW,EAAE,sBAAsB,CAAC;CACrC,CAAC,CAAC;AAEL;;;;;GAKG;AAEH,cAAM,WAAW,CAAC,OAAO,SAAS,sBAAsB,GAAG,MAAM;IAC/D,OAAO,CACL,WAAW,SACP,eAAe,CAAC,KAAK,CAAC,GACtB,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC;aAGpB,OAAO,WAAW,CAAC;;IAGrD,IAAI,CAAC,QAAQ,SAAS,eAAe,CAAC,MAAM,CAAC;cACW,QAAQ;;IAEhE,MAAM,CACJ,QAAQ,SAAS,OAAO,CACtB,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CACzD,EAED,OAAO,CAAC,EACJ,aAAa,CACX,QAAQ,EACR,OAAO,CAAC,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,CAClE,GACD,SAAS;QAsEX;;;WAGG;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;QAEH;;WAEG;;;CArFR;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ,qBAAoB,CAAC"}

package/dist/core/internals/mergeRouters.d.ts

@@ -1,3 +1,18 @@
-import { AnyRouter } from '../router';
-export declare function mergeRouters(...routerList: AnyRouter[]): AnyRouter;
+import { AnyRouter, AnyRouterDef, Router, RouterDef } from '../router';
+/**
+ * @internal
+ */
+export declare type MergeRouters<TRouters extends AnyRouter[], TRouterDef extends AnyRouterDef = RouterDef<TRouters[0]['_def']['_config'], {}>> = TRouters extends [
+    infer Head extends AnyRouter,
+    ...infer Tail extends AnyRouter[]
+] ? MergeRouters<Tail, {
+    _config: TRouterDef['_config'] & Head['_def']['_config'];
+    router: true;
+    procedures: TRouterDef['procedures'] & Head['_def']['procedures'];
+    record: TRouterDef['record'] & Head['_def']['record'];
+    queries: TRouterDef['queries'] & Head['_def']['queries'];
+    mutations: TRouterDef['mutations'] & Head['_def']['mutations'];
+    subscriptions: TRouterDef['subscriptions'] & Head['_def']['subscriptions'];
+}> : Router<TRouterDef> & TRouterDef['record'];
+export declare function mergeRouters<TRouters extends AnyRouter[]>(...routerList: [...TRouters]): MergeRouters<TRouters>;
 //# sourceMappingURL=mergeRouters.d.ts.map

package/dist/core/internals/mergeRouters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeRouters.d.ts","sourceRoot":"","sources":["../../../src/core/internals/mergeRouters.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAuB,MAAM,WAAW,CAAC;AAI3D,wBAAgB,YAAY,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,CAmDlE"}
+{"version":3,"file":"mergeRouters.d.ts","sourceRoot":"","sources":["../../../src/core/internals/mergeRouters.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EACT,YAAY,EACZ,MAAM,EACN,SAAS,EAEV,MAAM,WAAW,CAAC;AAGnB;;GAEG;AACH,oBAAY,YAAY,CACtB,QAAQ,SAAS,SAAS,EAAE,EAC5B,UAAU,SAAS,YAAY,GAAG,SAAS,CACzC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAE9B,EAAE,CACH,IACC,QAAQ,SAAS;IACnB,MAAM,IAAI,SAAS,SAAS;IAC5B,GAAG,MAAM,IAAI,SAAS,SAAS,EAAE;CAClC,GACG,YAAY,CACV,IAAI,EACJ;IACE,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,EAAE,IAAI,CAAC;IACb,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;IAClE,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;IACtD,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;IACzD,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;IAC/D,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,GACxC,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC;CACjC,CACF,GACD,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;AAE9C,wBAAgB,YAAY,CAAC,QAAQ,SAAS,SAAS,EAAE,EACvD,GAAG,UAAU,EAAE,CAAC,GAAG,QAAQ,CAAC,GAC3B,YAAY,CAAC,QAAQ,CAAC,CAmDxB"}

package/dist/index.js

@@ -753,7 +753,6 @@ function safeObject(...args) {
     return new Router();
 }
 
-// ts-prune-ignore-next -- Used in generated code
 function mergeRouters(...routerList) {
     const record = mergeWithoutOverrides({}, ...routerList.map((r)=>r._def.record));
     const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter)=>{
@@ -785,10 +784,6 @@ function mergeRouters(...routerList) {
     return router;
 }
 
-function mergeRoutersGeneric(...args) {
-    return mergeRouters(...args);
-}
-
 /**
  * TODO: This can be improved:
  * - We should be able to chain `.meta()`/`.context()` only once
@@ -847,7 +842,7 @@ function createTRPCInner() {
        */ router: config.createRouterFactory(config$1),
             /**
        * Merge Routers
-       */ mergeRouters: mergeRoutersGeneric
+       */ mergeRouters
         };
     };
 }

package/dist/index.mjs

@@ -751,7 +751,6 @@ function safeObject(...args) {
     return new Router();
 }
 
-// ts-prune-ignore-next -- Used in generated code
 function mergeRouters(...routerList) {
     const record = mergeWithoutOverrides({}, ...routerList.map((r)=>r._def.record));
     const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter)=>{
@@ -783,10 +782,6 @@ function mergeRouters(...routerList) {
     return router;
 }
 
-function mergeRoutersGeneric(...args) {
-    return mergeRouters(...args);
-}
-
 /**
  * TODO: This can be improved:
  * - We should be able to chain `.meta()`/`.context()` only once
@@ -845,7 +840,7 @@ function createTRPCInner() {
        */ router: createRouterFactory(config),
             /**
        * Merge Routers
-       */ mergeRouters: mergeRoutersGeneric
+       */ mergeRouters
         };
     };
 }

package/dist/internals.d.ts

@@ -2,7 +2,7 @@
  * These types have to be exported so users can generate their own types definitions files
  */
 export type { DefaultErrorShape } from './error/formatter';
-export type { mergeRoutersGeneric } from './core/internals/__generated__/mergeRoutersGeneric';
+export type { MergeRouters } from './core/internals/mergeRouters';
 export type { RootConfig, AnyRootConfig } from './core/internals/config';
 export type { ProcedureBuilder, BuildProcedure, } from './core/internals/procedureBuilder';
 export type { Overwrite, unsetMarker } from './core/internals/utils';

package/dist/internals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internals.d.ts","sourceRoot":"","sources":["../src/internals.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,YAAY,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACzE,YAAY,EACV,gBAAgB,EAChB,cAAc,GACf,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrE,YAAY,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"internals.d.ts","sourceRoot":"","sources":["../src/internals.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACzE,YAAY,EACV,gBAAgB,EAChB,cAAc,GACf,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrE,YAAY,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.10.0",
+  "version": "10.11.0",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -33,7 +33,6 @@
     "build": "rollup --config rollup.config.ts --configPlugin rollup-plugin-swc3",
     "dev": "pnpm build --watch",
     "codegen:entrypoints": "tsx entrypoints.script.ts",
-    "codegen:mergeRouters": "tsx ../../scripts/generateMergeRouters.ts",
     "benchmark": "tsc --project tsconfig.benchmark.json",
     "lint": "eslint --ext \".js,.ts,.tsx\" --ignore-path ../../.gitignore --report-unused-disable-directives src",
     "ts-watch": "tsc --project tsconfig.watch.json"
@@ -162,5 +161,5 @@
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "ca69d4acfe7be286afcd06a39b652194ca6a87d9"
+  "gitHead": "e77ed59be62562e7e8519468f9cc39387ed78476"
 }

package/src/core/initTRPC.ts

@@ -1,4 +1,3 @@
-import { mergeRoutersGeneric } from './internals/__generated__/mergeRoutersGeneric';
 import {
   DefaultErrorShape,
   ErrorFormatter,
@@ -20,6 +19,7 @@ import {
   RuntimeConfig,
   isServerDefault,
 } from './internals/config';
+import { mergeRouters } from './internals/mergeRouters';
 import { createBuilder } from './internals/procedureBuilder';
 import { PickFirstDefined, ValidateShape } from './internals/utils';
 import { createMiddlewareFactory } from './middleware';
@@ -157,7 +157,7 @@ function createTRPCInner<TParams extends PartialRootConfigTypes>() {
       /**
        * Merge Routers
        */
-      mergeRouters: mergeRoutersGeneric,
+      mergeRouters,
     };
   };
 }

package/src/core/internals/mergeRouters.ts

@@ -1,10 +1,46 @@
 import { defaultFormatter } from '../../error/formatter';
 import { CombinedDataTransformer, defaultTransformer } from '../../transformer';
-import { AnyRouter, createRouterFactory } from '../router';
+import {
+  AnyRouter,
+  AnyRouterDef,
+  Router,
+  RouterDef,
+  createRouterFactory,
+} from '../router';
 import { mergeWithoutOverrides } from './mergeWithoutOverrides';
 
-// ts-prune-ignore-next -- Used in generated code
-export function mergeRouters(...routerList: AnyRouter[]): AnyRouter {
+/**
+ * @internal
+ */
+export type MergeRouters<
+  TRouters extends AnyRouter[],
+  TRouterDef extends AnyRouterDef = RouterDef<
+    TRouters[0]['_def']['_config'],
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    {}
+  >,
+> = TRouters extends [
+  infer Head extends AnyRouter,
+  ...infer Tail extends AnyRouter[],
+]
+  ? MergeRouters<
+      Tail,
+      {
+        _config: TRouterDef['_config'] & Head['_def']['_config'];
+        router: true;
+        procedures: TRouterDef['procedures'] & Head['_def']['procedures'];
+        record: TRouterDef['record'] & Head['_def']['record'];
+        queries: TRouterDef['queries'] & Head['_def']['queries'];
+        mutations: TRouterDef['mutations'] & Head['_def']['mutations'];
+        subscriptions: TRouterDef['subscriptions'] &
+          Head['_def']['subscriptions'];
+      }
+    >
+  : Router<TRouterDef> & TRouterDef['record'];
+
+export function mergeRouters<TRouters extends AnyRouter[]>(
+  ...routerList: [...TRouters]
+): MergeRouters<TRouters> {
   const record = mergeWithoutOverrides(
     {},
     ...routerList.map((r) => r._def.record),
@@ -54,5 +90,5 @@ export function mergeRouters(...routerList: AnyRouter[]): AnyRouter {
     isServer: routerList.some((r) => r._def._config.isServer),
     $types: routerList[0]?._def._config.$types as any,
   })(record);
-  return router;
+  return router as any;
 }

package/src/internals.ts

@@ -2,7 +2,7 @@
  * These types have to be exported so users can generate their own types definitions files
  */
 export type { DefaultErrorShape } from './error/formatter';
-export type { mergeRoutersGeneric } from './core/internals/__generated__/mergeRoutersGeneric';
+export type { MergeRouters } from './core/internals/mergeRouters';
 export type { RootConfig, AnyRootConfig } from './core/internals/config';
 export type {
   ProcedureBuilder,