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

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

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/core/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/core/router.ts"],"names":[],"mappings":"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"}

package/dist/core/types.d.ts

@@ -1,17 +1,17 @@
 import { inferObservableValue } from '../observable';
-import { inferAsyncReturnType } from '../types';
 import { Procedure, ProcedureArgs } from './procedure';
-import { AnyRouter, AnyRouterParams, Router } from './router';
-export declare type inferRouterParams<TRouter extends AnyRouter> = TRouter extends Router<infer TParams> ? TParams extends AnyRouterParams<any> ? TParams : never : never;
-export declare type inferRouterContext<TRouter extends AnyRouter> = inferRouterParams<TRouter>['_ctx'];
-export declare type inferRouterError<TRouter extends AnyRouter> = inferRouterParams<TRouter>['_errorShape'];
-export declare type inferRouterMeta<TRouter extends AnyRouter> = inferRouterParams<TRouter>['_meta'];
+import { AnyRouter, AnyRouterDef, Router } from './router';
+export declare type inferRouterDef<TRouter extends AnyRouter> = TRouter extends Router<infer TParams> ? TParams extends AnyRouterDef<any> ? TParams : never : never;
+export declare type inferRouterContext<TRouter extends AnyRouter> = inferRouterDef<TRouter>['_ctx'];
+export declare type inferRouterError<TRouter extends AnyRouter> = inferRouterDef<TRouter>['_errorShape'];
+export declare type inferRouterMeta<TRouter extends AnyRouter> = inferRouterDef<TRouter>['_meta'];
 /**
  * @public
  */
 export declare type ProcedureType = 'query' | 'mutation' | 'subscription';
-export declare type inferHandlerInput<TProcedure extends Procedure<any>> = TProcedure extends Procedure<infer TParams> ? ProcedureArgs<TParams> : never;
+export declare type inferHandlerInput<TProcedure extends Procedure<any>> = ProcedureArgs<inferProcedureParams<TProcedure>>;
 export declare type inferProcedureInput<TProcedure extends Procedure<any>> = inferHandlerInput<TProcedure>[0];
-export declare type inferProcedureOutput<TProcedure extends Procedure<any>> = inferAsyncReturnType<TProcedure>;
-export declare type inferSubscriptionOutput<TRouter extends AnyRouter, TPath extends keyof TRouter['subscriptions'] & string> = inferObservableValue<inferProcedureOutput<TRouter['subscriptions'][TPath]>>;
+export declare type inferProcedureParams<TProcedure extends Procedure<any>> = TProcedure extends Procedure<infer $Params> ? $Params : never;
+export declare type inferProcedureOutput<TProcedure extends Procedure<any>> = inferProcedureParams<TProcedure>['_output_out'];
+export declare type inferSubscriptionOutput<TRouter extends AnyRouter, TPath extends keyof TRouter['_def']['subscriptions'] & string> = inferObservableValue<inferProcedureOutput<TRouter['_def']['subscriptions'][TPath]>>;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAE9D,oBAAY,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,OAAO,SAAS,MAAM,CAAC,MAAM,OAAO,CAAC,GACjC,OAAO,SAAS,eAAe,CAAC,GAAG,CAAC,GAClC,OAAO,GACP,KAAK,GACP,KAAK,CAAC;AAEZ,oBAAY,kBAAkB,CAAC,OAAO,SAAS,SAAS,IACtD,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AACrC,oBAAY,gBAAgB,CAAC,OAAO,SAAS,SAAS,IACpD,iBAAiB,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;AAC5C,oBAAY,eAAe,CAAC,OAAO,SAAS,SAAS,IACnD,iBAAiB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAEtC;;GAEG;AACH,oBAAY,aAAa,GAAG,OAAO,GAAG,UAAU,GAAG,cAAc,CAAC;AAElE,oBAAY,iBAAiB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAC7D,UAAU,SAAS,SAAS,CAAC,MAAM,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;AAE/E,oBAAY,mBAAmB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAC/D,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAEnC,oBAAY,oBAAoB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAChE,oBAAoB,CAAC,UAAU,CAAC,CAAC;AAEnC,oBAAY,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,KAAK,SAAS,MAAM,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,IACnD,oBAAoB,CAAC,oBAAoB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAE3D,oBAAY,cAAc,CAAC,OAAO,SAAS,SAAS,IAAI,OAAO,SAAS,MAAM,CAC5E,MAAM,OAAO,CACd,GACG,OAAO,SAAS,YAAY,CAAC,GAAG,CAAC,GAC/B,OAAO,GACP,KAAK,GACP,KAAK,CAAC;AAEV,oBAAY,kBAAkB,CAAC,OAAO,SAAS,SAAS,IACtD,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAClC,oBAAY,gBAAgB,CAAC,OAAO,SAAS,SAAS,IACpD,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;AACzC,oBAAY,eAAe,CAAC,OAAO,SAAS,SAAS,IACnD,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAEnC;;GAEG;AACH,oBAAY,aAAa,GAAG,OAAO,GAAG,UAAU,GAAG,cAAc,CAAC;AAElE,oBAAY,iBAAiB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAC7D,aAAa,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;AAElD,oBAAY,mBAAmB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAC/D,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAcnC,oBAAY,oBAAoB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAChE,UAAU,SAAS,SAAS,CAAC,MAAM,OAAO,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC;AAChE,oBAAY,oBAAoB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAChE,oBAAoB,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC,CAAC;AAElD,oBAAY,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,KAAK,SAAS,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,GAAG,MAAM,IAC3D,oBAAoB,CACtB,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,CAC9D,CAAC"}

package/dist/deprecated/interop.d.ts

@@ -1,33 +1,17 @@
-import { Procedure as NewProcedure } from '../core/procedure';
-import { Router as NewRouter } from '../core/router';
+import { ProcedureParams, ProcedureType } from '..';
+import { MutationProcedure, QueryProcedure, SubscriptionProcedure } from '../core/procedure';
+import { Router as NewRouter, RouterDef } from '../core/router';
 import { AnyRouter as AnyOldRouter, Router as OldRouter } from '../deprecated/router';
 import { TRPCErrorShape } from '../rpc';
-import { CombinedDataTransformer } from '../transformer';
 import { Procedure as OldProcedure } from './internals/procedure';
 import { ProcedureRecord } from './router';
 declare type AnyOldProcedure = OldProcedure<any, any, any, any, any, any, any, any>;
-declare type MigrateProcedure<TProcedure extends AnyOldProcedure> = TProcedure extends OldProcedure<infer TInputContext, infer TContext, infer TMeta, infer TInput, infer TParsedInput, infer TOutput, infer _TParsedOutput, infer TFinalInput> ? NewProcedure<{
-    _ctx_in: TInputContext;
-    _ctx_out: TContext;
-    _meta: TMeta;
-    _input_in: TInput;
-    _input_out: TParsedInput;
-    _output_in: TOutput;
-    _output_out: TFinalInput;
-}> : never;
-export declare type MigrateProcedureRecord<T extends ProcedureRecord<any>> = {
-    [K in keyof T]: MigrateProcedure<T[K]>;
+declare type convertProcedureParams<TProcedure extends AnyOldProcedure> = TProcedure extends OldProcedure<infer TInputContext, infer TContext, infer TMeta, infer TInput, infer TParsedInput, infer TOutput, infer _TParsedOutput, infer TFinalInput> ? ProcedureParams<TInputContext, TContext, TInput, TParsedInput, TOutput, TFinalInput, TMeta> : never;
+declare type MigrateProcedure<TProcedure extends AnyOldProcedure, TType extends ProcedureType> = TType extends 'query' ? QueryProcedure<convertProcedureParams<TProcedure>> : TType extends 'mutation' ? MutationProcedure<convertProcedureParams<TProcedure>> : TType extends 'subscription' ? SubscriptionProcedure<convertProcedureParams<TProcedure>> : never;
+export declare type MigrateProcedureRecord<T extends ProcedureRecord<any>, TType extends ProcedureType> = {
+    [K in keyof T]: MigrateProcedure<T[K], TType>;
 };
-export declare type MigrateRouter<TInputContext, TContext, TMeta extends Record<string, any>, TQueries extends ProcedureRecord<TInputContext, TContext, any, any, any, any, any>, TMutations extends ProcedureRecord<TInputContext, TContext, any, any, any, any, any>, TSubscriptions extends ProcedureRecord<TInputContext, TContext, unknown, unknown, any, unknown, unknown>, TErrorShape extends TRPCErrorShape<number>> = NewRouter<{
-    _ctx: TInputContext;
-    _errorShape: TErrorShape;
-    _meta: TMeta;
-    errorFormatter: never;
-    mutations: MigrateProcedureRecord<TMutations>;
-    queries: MigrateProcedureRecord<TQueries>;
-    subscriptions: MigrateProcedureRecord<TSubscriptions>;
-    transformer: CombinedDataTransformer;
-}>;
+export declare type MigrateRouter<TInputContext, TContext, TMeta extends Record<string, any>, TQueries extends ProcedureRecord<TInputContext, TContext, any, any, any, any, any>, TMutations extends ProcedureRecord<TInputContext, TContext, any, any, any, any, any>, TSubscriptions extends ProcedureRecord<TInputContext, TContext, unknown, unknown, any, unknown, unknown>, TErrorShape extends TRPCErrorShape<number>> = NewRouter<RouterDef<TInputContext, TErrorShape, TMeta, MigrateProcedureRecord<TQueries, 'query'> & MigrateProcedureRecord<TMutations, 'mutation'> & MigrateProcedureRecord<TSubscriptions, 'subscription'>>>;
 export declare type MigrateOldRouter<TRouter extends AnyOldRouter> = TRouter extends OldRouter<infer TInputContext, infer TContext, infer TMeta, infer TQueries, infer TMutations, infer TSubscriptions, infer TErrorShape> ? MigrateRouter<TInputContext, TContext, TMeta, TQueries, TMutations, TSubscriptions, TErrorShape> : never;
 export declare function migrateRouter<TOldRouter extends AnyOldRouter>(oldRouter: TOldRouter): MigrateOldRouter<TOldRouter>;
 export {};

package/dist/deprecated/interop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interop.d.ts","sourceRoot":"","sources":["../../src/deprecated/interop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interop.d.ts","sourceRoot":"","sources":["../../src/deprecated/interop.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,4 @@
-import { AnyRouter, ProcedureType, inferRouterParams } from '../../core';
+import { AnyRouter, ProcedureType, inferRouterDef } from '../../core';
 import { TRPCError } from '../../error/TRPCError';
 import { BaseHandlerOptions } from '../../internals/types';
 import { TRPCResponse } from '../../rpc';
@@ -20,8 +20,8 @@ export interface HTTPRequest {
  * @internal
  */
 export declare type ResponseMetaFn<TRouter extends AnyRouter> = (opts: {
-    data: TRPCResponse<unknown, inferRouterParams<TRouter>['_error']>[];
-    ctx?: inferRouterParams<TRouter>['_ctx'];
+    data: TRPCResponse<unknown, inferRouterDef<TRouter>['_error']>[];
+    ctx?: inferRouterDef<TRouter>['_ctx'];
     /**
      * The different tRPC paths requested
      **/

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/http/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,oBAAY,WAAW,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAElD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AAED;;GAEG;AACH,oBAAY,cAAc,CAAC,OAAO,SAAS,SAAS,IAAI,CAAC,IAAI,EAAE;IAC7D,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IACpE,GAAG,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IACzC;;QAEI;IACJ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB,KAAK,YAAY,CAAC;AAEnB;;GAEG;AACH,MAAM,WAAW,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ,CACzE,SAAQ,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC7C;;;;OAIG;IACH,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACxC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/http/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,oBAAY,WAAW,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAElD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AAED;;GAEG;AACH,oBAAY,cAAc,CAAC,OAAO,SAAS,SAAS,IAAI,CAAC,IAAI,EAAE;IAC7D,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IACjE,GAAG,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IACtC;;QAEI;IACJ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB,KAAK,YAAY,CAAC;AAEnB;;GAEG;AACH,MAAM,WAAW,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ,CACzE,SAAQ,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC7C;;;;OAIG;IACH,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACxC"}

package/dist/index.js

@@ -500,6 +500,23 @@ function createOutputMiddleware(parse) {
     }
   };
 }
+
+function createResolver(_def, resolver) {
+  const finalBuilder = createNewInternalBuilder(_def, {
+    resolver,
+    middlewares: [async function resolveMiddleware(opts) {
+      const data = await resolver(opts);
+      return {
+        marker: middlewareMarker,
+        ok: true,
+        data,
+        ctx: opts.ctx
+      };
+    }]
+  });
+  return createProcedureCaller(finalBuilder._def);
+}
+
 function createInternalBuilder(initDef) {
   const _def = initDef || {
     middlewares: []
@@ -531,20 +548,9 @@ function createInternalBuilder(initDef) {
       });
     },
 
+    /** @deprecated **/
     resolve(resolver) {
-      const finalBuilder = createNewInternalBuilder(_def, {
-        resolver,
-        middlewares: [async function resolveMiddleware(opts) {
-          const data = await resolver(opts);
-          return {
-            marker: middlewareMarker,
-            ok: true,
-            data,
-            ctx: opts.ctx
-          };
-        }]
-      });
-      return createProcedureCaller(finalBuilder._def);
+      return createResolver(_def, resolver);
     },
 
     unstable_concat(builder) {
@@ -555,6 +561,24 @@ function createInternalBuilder(initDef) {
       return createNewInternalBuilder(_def, {
         middlewares: [middleware]
       });
+    },
+
+    query(resolver) {
+      return createResolver({ ..._def,
+        query: true
+      }, resolver);
+    },
+
+    mutation(resolver) {
+      return createResolver({ ..._def,
+        mutation: true
+      }, resolver);
+    },
+
+    subscription(resolver) {
+      return createResolver({ ..._def,
+        subscription: true
+      }, resolver);
     }
 
   };
@@ -588,12 +612,6 @@ const emptyRouter = {
   subscriptions: {},
   errorFormatter: defaultFormatter,
   transformer: defaultTransformer
-}; // type EmptyRouter = typeof emptyRouter;
-
-const PROCEDURE_DEFINITION_MAP$1 = {
-  query: 'queries',
-  mutation: 'mutations',
-  subscription: 'subscriptions'
 };
 /**
  *
@@ -604,20 +622,47 @@ function createRouterFactory(defaults) {
   return function createRouterInner(procedures) {
     var _defaults$transformer, _defaults$errorFormat;
 
+    const routerProcedures = omitPrototype({});
+
+    function recursiveGetPaths(procedures, path = '') {
+      for (const [key, procedureOrRouter] of Object.entries(procedures !== null && procedures !== void 0 ? procedures : {})) {
+        const newPath = `${path}${key}`;
+
+        if (typeof procedureOrRouter === 'object') {
+          const router = procedureOrRouter;
+          recursiveGetPaths(router._def.procedures, `${newPath}.`);
+          continue;
+        }
+
+        routerProcedures[newPath] = procedureOrRouter;
+      }
+    }
+
+    recursiveGetPaths(procedures);
     const result = mergeWithoutOverrides({
       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),
-      subscriptions: omitPrototype(procedures.subscriptions)
+      procedures: routerProcedures
     });
-    const _def = { ...emptyRouter,
-      ...result
+    const _def = {
+      procedures: {},
+      ...emptyRouter,
+      ...result,
+      queries: Object.entries(result.procedures || {}).filter(pair => pair[1]._def.query).reduce((acc, [key, val]) => ({ ...acc,
+        [key]: val
+      }), {}),
+      mutations: Object.entries(result.procedures || {}).filter(pair => pair[1]._def.mutation).reduce((acc, [key, val]) => ({ ...acc,
+        [key]: val
+      }), {}),
+      subscriptions: Object.entries(result.procedures || {}).filter(pair => pair[1]._def.subscription).reduce((acc, [key, val]) => ({ ...acc,
+        [key]: val
+      }), {})
     };
     const def = {
       _def,
-      ..._def
+      transformer: _def.transformer,
+      errorFormatter: _def.errorFormatter
     };
 
     function callProcedure(opts) {
@@ -625,17 +670,15 @@ function createRouterFactory(defaults) {
         type,
         path
       } = opts;
-      const defTarget = PROCEDURE_DEFINITION_MAP$1[type];
-      const defs = def[defTarget];
 
-      if (!(path in defs)) {
+      if (!(path in _def.procedures) || !_def.procedures[path]['_def'][type]) {
         throw new TRPCError.TRPCError({
           code: 'NOT_FOUND',
           message: `No "${type}"-procedure on path "${path}"`
         });
       }
 
-      const procedure = defs[path];
+      const procedure = _def.procedures[path];
       return procedure(opts);
     }
 
@@ -717,7 +760,7 @@ function createRouterFactory(defaults) {
   };
 }
 
-function migrateProcedure(oldProc) {
+function migrateProcedure(oldProc, type) {
   const def = oldProc._def();
 
   const inputParser = getParseFnOrPassThrough(def.inputParser);
@@ -727,9 +770,12 @@ function migrateProcedure(oldProc) {
     input: def.inputParser,
     middlewares: [...def.middlewares, inputMiddleware, createOutputMiddleware(outputParser)],
     meta: def.meta,
-    output: def.outputParser
+    output: def.outputParser,
+    mutation: type === 'mutation',
+    query: type === 'query',
+    subscription: type === 'subscription'
   });
-  const proc = builder.resolve(opts => def.resolver(opts));
+  const proc = builder[type](opts => def.resolver(opts));
   return proc;
 }
 
@@ -741,25 +787,22 @@ function migrateRouter(oldRouter) {
   const subscriptions = {};
 
   for (const [name, procedure] of Object.entries(oldRouter._def.queries)) {
-    queries[name] = migrateProcedure(procedure);
+    queries[name] = migrateProcedure(procedure, 'query');
   }
 
   for (const [name, procedure] of Object.entries(oldRouter._def.mutations)) {
-    mutations[name] = migrateProcedure(procedure);
+    mutations[name] = migrateProcedure(procedure, 'mutation');
   }
 
   for (const [name, procedure] of Object.entries(oldRouter._def.subscriptions)) {
-    subscriptions[name] = migrateProcedure(procedure);
+    subscriptions[name] = migrateProcedure(procedure, 'subscription');
   }
 
+  const procedures = mergeWithoutOverrides(queries, mutations, subscriptions);
   const newRouter = createRouterFactory({
     transformer,
     errorFormatter
-  })({
-    mutations,
-    queries,
-    subscriptions
-  });
+  })(procedures);
   return newRouter;
 }
 
@@ -1058,9 +1101,7 @@ function router() {
 }
 
 function mergeRouters(...routerList) {
-  const queries = mergeWithoutOverrides({}, ...routerList.map(r => r.queries));
-  const mutations = mergeWithoutOverrides({}, ...routerList.map(r => r.mutations));
-  const subscriptions = mergeWithoutOverrides({}, ...routerList.map(r => r.subscriptions));
+  const procedures = mergeWithoutOverrides({}, ...routerList.map(r => r._def.procedures));
   const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter) => {
     if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter) {
       if (currentErrorFormatter !== defaultFormatter && currentErrorFormatter !== nextRouter.errorFormatter) {
@@ -1086,24 +1127,14 @@ function mergeRouters(...routerList) {
   const router = createRouterFactory({
     errorFormatter,
     transformer
-  })({
-    queries,
-    mutations,
-    subscriptions
-  });
+  })(procedures);
   return router;
 }
 
-/**
- * Thanks to @phryneas!
- * 
- * @link https://twitter.com/phry/status/1538516854058242048
- */
-function mergeRoutersGeneric(...routers) {
-  return mergeRouters(...routers);
+function mergeRoutersGeneric(...args) {
+  return mergeRouters(...args);
 }
 
-// TODO make this into a callbag?
 function createBuilder() {
   return createInternalBuilder();
 }
@@ -1145,12 +1176,18 @@ function initTRPC() {
 
     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);
+    const _config = {
+      transformer,
+      errorShape: null,
+      ctx: null,
+      meta: null
+    };
     return {
       /**
        * These are just types, they can't be used
        * @internal
        */
-      _config: null,
+      _config,
 
       /**
        * Builder object for creating procedures
@@ -1164,7 +1201,6 @@ function initTRPC() {
 
       /**
        * Create a router
-       * FIXME this should also use error formatter
        */
       router: createRouterFactory({
         errorFormatter,