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

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-ccb9cfa1.mjs';
-export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-ccb9cfa1.mjs';
+import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-8657b8de.mjs';
+export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-8657b8de.mjs';
 import { T as TRPC_ERROR_CODES_BY_KEY } from './envelopes-af8c2959.mjs';
-import { T as TRPCError, g as getCauseFromUnknown$1, a as getErrorFromUnknown } from './TRPCError-7971540a.mjs';
-export { T as TRPCError } from './TRPCError-7971540a.mjs';
+import { T as TRPCError, g as getCauseFromUnknown, a as getErrorFromUnknown } from './TRPCError-b7fa0c31.mjs';
+export { T as TRPCError } from './TRPCError-b7fa0c31.mjs';
 import './transformTRPCResponse-747b9a68.mjs';
 
 assertNotBrowser();
@@ -49,7 +49,7 @@ function getDataTransformer$1(transformer) {
 /**
  * @internal
  */
-const defaultTransformer$1 = {
+const defaultTransformer = {
   _default: true,
   input: {
     serialize: obj => obj,
@@ -61,6 +61,23 @@ const defaultTransformer$1 = {
   }
 };
 
+/**
+ * @internal
+ */
+
+/**
+ * @internal
+ */
+
+/**
+ * @internal
+ */
+const defaultFormatter = ({
+  shape
+}) => {
+  return shape;
+};
+
 /**
  * @deprecated
  */
@@ -139,7 +156,7 @@ class Procedure {
     } catch (cause) {
       throw new TRPCError({
         code: 'BAD_REQUEST',
-        cause: getCauseFromUnknown$1(cause)
+        cause: getCauseFromUnknown(cause)
       });
     }
   }
@@ -150,7 +167,7 @@ class Procedure {
     } catch (cause) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
-        cause: getCauseFromUnknown$1(cause),
+        cause: getCauseFromUnknown(cause),
         message: 'Output validation failed'
       });
     }
@@ -309,14 +326,6 @@ function getParseFnOrPassThrough(procedureParser) {
   return getParseFn(procedureParser);
 }
 
-function getCauseFromUnknown(cause) {
-  if (cause instanceof Error) {
-    return cause;
-  }
-
-  return undefined;
-}
-
 /**
  * Ensures there are no duplicate keys when building a procedure.
  */
@@ -536,7 +545,7 @@ function createInternalBuilder(initDef) {
       return createProcedureCaller(finalBuilder._def);
     },
 
-    concat(builder) {
+    unstable_concat(builder) {
       return createNewInternalBuilder(_def, builder._def);
     },
 
@@ -549,23 +558,6 @@ function createInternalBuilder(initDef) {
   };
 }
 
-/**
- * @internal
- */
-
-/**
- * @internal
- */
-
-/**
- * @internal
- */
-const defaultFormatter$1 = ({
-  shape
-}) => {
-  return shape;
-};
-
 /**
  * Create an object without inheriting anything from `Object.prototype`
  * @internal
@@ -575,6 +567,16 @@ function omitPrototype(obj1) {
 }
 
 /* eslint-disable @typescript-eslint/ban-types */
+
+function createRouterProxy(callback) {
+  return new Proxy({}, {
+    get(_, path) {
+      return (...args) => callback(path, ...args);
+    }
+
+  });
+}
+
 const emptyRouter = {
   _ctx: null,
   _errorShape: null,
@@ -582,8 +584,8 @@ const emptyRouter = {
   queries: {},
   mutations: {},
   subscriptions: {},
-  errorFormatter: defaultFormatter$1,
-  transformer: defaultTransformer$1
+  errorFormatter: defaultFormatter,
+  transformer: defaultTransformer
 }; // type EmptyRouter = typeof emptyRouter;
 
 const PROCEDURE_DEFINITION_MAP$1 = {
@@ -601,8 +603,8 @@ function createRouterFactory(defaults) {
     var _defaults$transformer, _defaults$errorFormat;
 
     const result = mergeWithoutOverrides({
-      transformer: (_defaults$transformer = defaults === null || defaults === void 0 ? void 0 : defaults.transformer) !== null && _defaults$transformer !== void 0 ? _defaults$transformer : defaultTransformer$1,
-      errorFormatter: (_defaults$errorFormat = defaults === null || defaults === void 0 ? void 0 : defaults.errorFormatter) !== null && _defaults$errorFormat !== void 0 ? _defaults$errorFormat : defaultFormatter$1
+      transformer: (_defaults$transformer = defaults === null || defaults === void 0 ? void 0 : defaults.transformer) !== null && _defaults$transformer !== void 0 ? _defaults$transformer : defaultTransformer,
+      errorFormatter: (_defaults$errorFormat = defaults === null || defaults === void 0 ? void 0 : defaults.errorFormatter) !== null && _defaults$errorFormat !== void 0 ? _defaults$errorFormat : defaultFormatter
     }, {
       queries: omitPrototype(procedures.queries),
       mutations: omitPrototype(procedures.mutations),
@@ -656,7 +658,25 @@ function createRouterFactory(defaults) {
             rawInput: args[0],
             ctx,
             type: 'subscription'
-          })
+          }),
+          queries: createRouterProxy((path, rawInput) => callProcedure({
+            path,
+            rawInput,
+            ctx,
+            type: 'query'
+          })),
+          mutations: createRouterProxy((path, rawInput) => callProcedure({
+            path,
+            rawInput,
+            ctx,
+            type: 'mutation'
+          })),
+          subscriptions: createRouterProxy((path, rawInput) => callProcedure({
+            path,
+            rawInput,
+            ctx,
+            type: 'subscription'
+          }))
         };
       },
 
@@ -774,23 +794,6 @@ function safeObject(...args) {
   return Object.assign(Object.create(null), ...args);
 }
 
-const defaultFormatter = ({
-  shape
-}) => {
-  return shape;
-};
-
-const defaultTransformer = {
-  input: {
-    serialize: obj => obj,
-    deserialize: obj => obj
-  },
-  output: {
-    serialize: obj => obj,
-    deserialize: obj => obj
-  }
-};
-
 /**
  * @internal The type signature of this class may change without warning.
  * @deprecated
@@ -1057,8 +1060,8 @@ function mergeRouters(...routerList) {
   const mutations = mergeWithoutOverrides({}, ...routerList.map(r => r.mutations));
   const subscriptions = mergeWithoutOverrides({}, ...routerList.map(r => r.subscriptions));
   const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter) => {
-    if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter$1) {
-      if (currentErrorFormatter !== defaultFormatter$1 && currentErrorFormatter !== nextRouter.errorFormatter) {
+    if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter) {
+      if (currentErrorFormatter !== defaultFormatter && currentErrorFormatter !== nextRouter.errorFormatter) {
         throw new Error('You seem to have several error formatters');
       }
 
@@ -1066,10 +1069,10 @@ function mergeRouters(...routerList) {
     }
 
     return currentErrorFormatter;
-  }, defaultFormatter$1);
+  }, defaultFormatter);
   const transformer = routerList.reduce((prev, current) => {
-    if (current.transformer && current.transformer !== defaultTransformer$1) {
-      if (prev !== defaultTransformer$1 && prev !== current.transformer) {
+    if (current.transformer && current.transformer !== defaultTransformer) {
+      if (prev !== defaultTransformer && prev !== current.transformer) {
         throw new Error('You seem to have several transformers');
       }
 
@@ -1077,7 +1080,7 @@ function mergeRouters(...routerList) {
     }
 
     return prev;
-  }, defaultTransformer$1);
+  }, defaultTransformer);
   const router = createRouterFactory({
     errorFormatter,
     transformer
@@ -1089,6 +1092,10 @@ function mergeRouters(...routerList) {
   return router;
 }
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
+
 function mergeRoutersGeneric(...args) {
   return mergeRouters(...args);
 }
@@ -1133,8 +1140,8 @@ function initTRPC() {
   return function initTRPCInner(options) {
     var _options$errorFormatt, _options$transformer;
 
-    const errorFormatter = (_options$errorFormatt = options === null || options === void 0 ? void 0 : options.errorFormatter) !== null && _options$errorFormatt !== void 0 ? _options$errorFormatt : defaultFormatter$1;
-    const transformer = getDataTransformer$1((_options$transformer = options === null || options === void 0 ? void 0 : options.transformer) !== null && _options$transformer !== void 0 ? _options$transformer : defaultTransformer$1);
+    const errorFormatter = (_options$errorFormatt = options === null || options === void 0 ? void 0 : options.errorFormatter) !== null && _options$errorFormatt !== void 0 ? _options$errorFormatt : defaultFormatter;
+    const transformer = getDataTransformer$1((_options$transformer = options === null || options === void 0 ? void 0 : options.transformer) !== null && _options$transformer !== void 0 ? _options$transformer : defaultTransformer);
     return {
       /**
        * These are just types, they can't be used
@@ -1169,4 +1176,4 @@ function initTRPC() {
   };
 }
 
-export { defaultTransformer$1 as defaultTransformer, getDataTransformer$1 as getDataTransformer, initTRPC, router };
+export { defaultTransformer, getDataTransformer$1 as getDataTransformer, initTRPC, router };

package/dist/internals/types.d.ts

@@ -1,7 +1,7 @@
-import { TRPCError } from '../TRPCError';
 import { inferRouterParams } from '../core';
 import { ProcedureType } from '../core';
 import { AnyRouter } from '../core/router';
+import { TRPCError } from '../error/TRPCError';
 /**
  * Base interface for any response handler
  */

package/dist/internals/types.d.ts.map

@@ -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"}
+{"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"}

package/dist/{nodeHTTPRequestHandler-5ad62229.mjs → nodeHTTPRequestHandler-174459c5.mjs}

@@ -1,5 +1,5 @@
-import { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-ccb9cfa1.mjs';
-import { T as TRPCError } from './TRPCError-7971540a.mjs';
+import { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-8657b8de.mjs';
+import { T as TRPCError } from './TRPCError-b7fa0c31.mjs';
 
 async function getPostBody({
   req,

package/dist/{nodeHTTPRequestHandler-9ddd18f2.js → nodeHTTPRequestHandler-6b7c8622.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-5932d785.js');
-var TRPCError = require('./TRPCError-ddec3395.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-fcc8f644.js');
+var TRPCError = require('./TRPCError-9050a68d.js');
 
 async function getPostBody({
   req,

package/dist/{resolveHTTPResponse-ccb9cfa1.mjs → resolveHTTPResponse-8657b8de.mjs}

@@ -1,4 +1,4 @@
-import { T as TRPCError, a as getErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-7971540a.mjs';
+import { T as TRPCError, a as getErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-b7fa0c31.mjs';
 import { t as transformTRPCResponse } from './transformTRPCResponse-747b9a68.mjs';
 import { T as TRPC_ERROR_CODES_BY_KEY } from './envelopes-af8c2959.mjs';
 

package/dist/{resolveHTTPResponse-5932d785.js → resolveHTTPResponse-fcc8f644.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var TRPCError = require('./TRPCError-ddec3395.js');
+var TRPCError = require('./TRPCError-9050a68d.js');
 var transformTRPCResponse = require('./transformTRPCResponse-0c261655.js');
 var envelopes = require('./envelopes-b6dd0367.js');
 

package/dist/subscription.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var TRPCError = require('./TRPCError-ddec3395.js');
+var TRPCError = require('./TRPCError-9050a68d.js');
 var observable = require('./observable-3aa4d911.js');
 
 function subscriptionPullFactory(opts) {

package/dist/subscription.mjs

@@ -1,4 +1,4 @@
-import { a as getErrorFromUnknown } from './TRPCError-7971540a.mjs';
+import { a as getErrorFromUnknown } from './TRPCError-b7fa0c31.mjs';
 import { o as observable } from './observable-137ea1bd.mjs';
 
 function subscriptionPullFactory(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-alpha.26",
+  "version": "10.0.0-alpha.27",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -22,6 +22,7 @@
   "scripts": {
     "test": "jest",
     "build": "rollup -c",
+    "benchmark": "yarn tsc --project tsconfig.benchmark.json",
     "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "main": "dist/index.js",
@@ -132,5 +133,5 @@
   "dependencies": {
     "tslib": "^2.1.0"
   },
-  "gitHead": "412d2ba0d5f857e7f7d2e0fd3af6f1334e4f108a"
+  "gitHead": "bef0292d6b89d3be3a4cb8c21fb12f5f4ec2f896"
 }

package/src/adapters/next.ts

@@ -5,8 +5,8 @@ import type {
   NextApiRequest,
   NextApiResponse,
 } from 'next/types';
-import { TRPCError } from '../TRPCError';
 import { AnyRouter } from '../core';
+import { TRPCError } from '../error/TRPCError';
 import { nodeHTTPRequestHandler } from './node-http';
 import {
   NodeHTTPCreateContextFnOptions,

package/src/adapters/node-http/internals/getPostBody.ts

@@ -1,4 +1,4 @@
-import { TRPCError } from '../../../TRPCError';
+import { TRPCError } from '../../../error/TRPCError';
 import { NodeHTTPRequest } from '../types';
 
 export async function getPostBody({

package/src/adapters/ws.ts

@@ -1,8 +1,8 @@
 import { IncomingMessage } from 'http';
 import ws from 'ws';
-import { TRPCError } from '../TRPCError';
 import { AnyRouter, ProcedureType, inferRouterContext } from '../core';
-import { getCauseFromUnknown, getErrorFromUnknown } from '../internals/errors';
+import { TRPCError } from '../error/TRPCError';
+import { getCauseFromUnknown, getErrorFromUnknown } from '../error/utils';
 import { transformTRPCResponse } from '../internals/transformTRPCResponse';
 import { BaseHandlerOptions } from '../internals/types';
 import { Unsubscribable, isObservable } from '../observable';

package/src/core/internals/__generated__/mergeRoutersGeneric.ts

@@ -1,6 +1,9 @@
 import { AnyRouter, AnyRouterParams, Router } from "../../router";
 import { mergeRouters } from '../mergeRouters';
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams
 >(
@@ -16,6 +19,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams
 >(
@@ -31,6 +37,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams
 >(
@@ -46,6 +55,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams
 >(
@@ -61,6 +73,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams
 >(
@@ -76,6 +91,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams
 >(
@@ -91,6 +109,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams
 >(
@@ -106,6 +127,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams
 >(
@@ -121,6 +145,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams
 >(
@@ -136,6 +163,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams
 >(
@@ -151,6 +181,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams
 >(
@@ -166,6 +199,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'] & RP10['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams, RP11 extends AnyRouterParams
 >(
@@ -181,6 +217,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'] & RP10['subscriptions'] & RP11['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams, RP11 extends AnyRouterParams, RP12 extends AnyRouterParams
 >(
@@ -196,6 +235,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'] & RP10['subscriptions'] & RP11['subscriptions'] & RP12['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams, RP11 extends AnyRouterParams, RP12 extends AnyRouterParams, RP13 extends AnyRouterParams
 >(
@@ -211,6 +253,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'] & RP10['subscriptions'] & RP11['subscriptions'] & RP12['subscriptions'] & RP13['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams, RP11 extends AnyRouterParams, RP12 extends AnyRouterParams, RP13 extends AnyRouterParams, RP14 extends AnyRouterParams
 >(
@@ -226,6 +271,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'] & RP10['subscriptions'] & RP11['subscriptions'] & RP12['subscriptions'] & RP13['subscriptions'] & RP14['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams, RP11 extends AnyRouterParams, RP12 extends AnyRouterParams, RP13 extends AnyRouterParams, RP14 extends AnyRouterParams, RP15 extends AnyRouterParams
 >(
@@ -241,6 +289,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'] & RP10['subscriptions'] & RP11['subscriptions'] & RP12['subscriptions'] & RP13['subscriptions'] & RP14['subscriptions'] & RP15['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams, RP11 extends AnyRouterParams, RP12 extends AnyRouterParams, RP13 extends AnyRouterParams, RP14 extends AnyRouterParams, RP15 extends AnyRouterParams, RP16 extends AnyRouterParams
 >(
@@ -256,6 +307,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'] & RP10['subscriptions'] & RP11['subscriptions'] & RP12['subscriptions'] & RP13['subscriptions'] & RP14['subscriptions'] & RP15['subscriptions'] & RP16['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams, RP11 extends AnyRouterParams, RP12 extends AnyRouterParams, RP13 extends AnyRouterParams, RP14 extends AnyRouterParams, RP15 extends AnyRouterParams, RP16 extends AnyRouterParams, RP17 extends AnyRouterParams
 >(
@@ -271,6 +325,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'] & RP10['subscriptions'] & RP11['subscriptions'] & RP12['subscriptions'] & RP13['subscriptions'] & RP14['subscriptions'] & RP15['subscriptions'] & RP16['subscriptions'] & RP17['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams, RP11 extends AnyRouterParams, RP12 extends AnyRouterParams, RP13 extends AnyRouterParams, RP14 extends AnyRouterParams, RP15 extends AnyRouterParams, RP16 extends AnyRouterParams, RP17 extends AnyRouterParams, RP18 extends AnyRouterParams
 >(
@@ -286,6 +343,9 @@ export function mergeRoutersGeneric<
   subscriptions: RP0['subscriptions'] & RP1['subscriptions'] & RP2['subscriptions'] & RP3['subscriptions'] & RP4['subscriptions'] & RP5['subscriptions'] & RP6['subscriptions'] & RP7['subscriptions'] & RP8['subscriptions'] & RP9['subscriptions'] & RP10['subscriptions'] & RP11['subscriptions'] & RP12['subscriptions'] & RP13['subscriptions'] & RP14['subscriptions'] & RP15['subscriptions'] & RP16['subscriptions'] & RP17['subscriptions'] & RP18['subscriptions'];
 }>;
 
+/**
+ * @deprecated Only keeping this for future reference if our testing was a false-positive
+ */
 export function mergeRoutersGeneric<
   RP0 extends AnyRouterParams, RP1 extends AnyRouterParams, RP2 extends AnyRouterParams, RP3 extends AnyRouterParams, RP4 extends AnyRouterParams, RP5 extends AnyRouterParams, RP6 extends AnyRouterParams, RP7 extends AnyRouterParams, RP8 extends AnyRouterParams, RP9 extends AnyRouterParams, RP10 extends AnyRouterParams, RP11 extends AnyRouterParams, RP12 extends AnyRouterParams, RP13 extends AnyRouterParams, RP14 extends AnyRouterParams, RP15 extends AnyRouterParams, RP16 extends AnyRouterParams, RP17 extends AnyRouterParams, RP18 extends AnyRouterParams, RP19 extends AnyRouterParams
 >(

package/src/core/internals/internalProcedure.ts

@@ -2,9 +2,9 @@
  * This is the actual internal representation of a builder
  * FIXME - I want to get rid of this and use the public API instead
  */
-import { TRPCError } from '../../TRPCError';
+import { TRPCError } from '../../error/TRPCError';
 import { getCauseFromUnknown } from '../../error/utils';
-import { getErrorFromUnknown } from '../../internals/errors';
+import { getErrorFromUnknown } from '../../error/utils';
 import { MaybePromise } from '../../types';
 import { MiddlewareFunction, MiddlewareResult } from '../middleware';
 import { Parser } from '../parser';
@@ -55,7 +55,7 @@ interface ProcedureBuilderInternal {
   /**
    * @internal
    */
-  concat: (proc: ProcedureBuilderInternal) => ProcedureBuilderInternal;
+  unstable_concat: (proc: ProcedureBuilderInternal) => ProcedureBuilderInternal;
   /**
    * @internal
    */
@@ -253,7 +253,7 @@ export function createInternalBuilder(
 
       return createProcedureCaller(finalBuilder._def);
     },
-    concat(builder) {
+    unstable_concat(builder) {
       return createNewInternalBuilder(_def, builder._def);
     },
     use(middleware) {

package/src/core/internals/mergeRoutersGeneric.ts

@@ -0,0 +1,35 @@
+/**
+ * Thanks to @phryneas!
+ * 
+ * @link https://twitter.com/phry/status/1538516854058242048
+ */
+
+import { AnyRouterParams, AnyRouter, Router } from "../router";
+import { mergeRouters } from "./mergeRouters";
+
+
+type TailIntersectProperty<Elements extends AnyRouterParams[], Property extends keyof AnyRouterParams, Acc = unknown> =
+    // eslint-disable-next-line prettier/prettier
+    Elements extends [infer Head extends AnyRouterParams, ...infer Tail extends AnyRouterParams[]] ? TailIntersectProperty<Tail, Property, Head[Property] & Acc> : Acc;
+
+
+type RouterToParam<R extends Router<any>> = R extends Router<infer P> ? P : never
+
+type RoutersToParams<T, Acc extends unknown[] = []> =
+    T extends [infer Head extends Router<any>, ...infer Tail] ? RoutersToParams<Tail, [...Acc, RouterToParam<Head>]> : Acc;
+
+export function mergeRoutersGeneric<Routers extends [...AnyRouter[]]>(
+    ...routers: Routers
+  ): RoutersToParams<Routers> extends infer AllParams extends AnyRouterParams[] ?
+     Router<{
+        _ctx: RouterToParam<Routers[0]>['_ctx'];
+        _errorShape: RouterToParam<Routers[0]>['_errorShape'];
+        _meta: RouterToParam<Routers[0]>['_meta'];
+        transformer: RouterToParam<Routers[0]>['transformer'];
+        errorFormatter: RouterToParam<Routers[0]>['errorFormatter'];
+        queries: TailIntersectProperty<AllParams, 'queries'>;
+        mutations: TailIntersectProperty<AllParams, 'mutations'>;
+        subscriptions: TailIntersectProperty<AllParams, 'subscriptions'>;
+    }> : never { 
+      return mergeRouters(...routers) as any;
+}