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

package/dist/index.mjs

@@ -498,6 +498,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: []
@@ -529,20 +546,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) {
@@ -553,6 +559,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);
     }
 
   };
@@ -586,12 +610,6 @@ const emptyRouter = {
   subscriptions: {},
   errorFormatter: defaultFormatter,
   transformer: defaultTransformer
-}; // type EmptyRouter = typeof emptyRouter;
-
-const PROCEDURE_DEFINITION_MAP$1 = {
-  query: 'queries',
-  mutation: 'mutations',
-  subscription: 'subscriptions'
 };
 /**
  *
@@ -602,20 +620,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) {
@@ -623,17 +668,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({
           code: 'NOT_FOUND',
           message: `No "${type}"-procedure on path "${path}"`
         });
       }
 
-      const procedure = defs[path];
+      const procedure = _def.procedures[path];
       return procedure(opts);
     }
 
@@ -715,7 +758,7 @@ function createRouterFactory(defaults) {
   };
 }
 
-function migrateProcedure(oldProc) {
+function migrateProcedure(oldProc, type) {
   const def = oldProc._def();
 
   const inputParser = getParseFnOrPassThrough(def.inputParser);
@@ -725,9 +768,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;
 }
 
@@ -739,25 +785,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;
 }
 
@@ -1056,9 +1099,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) {
@@ -1084,24 +1125,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();
 }
@@ -1143,12 +1174,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
@@ -1162,7 +1199,6 @@ function initTRPC() {
 
       /**
        * Create a router
-       * FIXME this should also use error formatter
        */
       router: createRouterFactory({
         errorFormatter,

package/dist/internals/types.d.ts

@@ -1,4 +1,4 @@
-import { inferRouterParams } from '../core';
+import { inferRouterDef } from '../core';
 import { ProcedureType } from '../core';
 import { AnyRouter } from '../core/router';
 import { TRPCError } from '../error/TRPCError';
@@ -18,6 +18,6 @@ export declare type OnErrorFunction<TRouter extends AnyRouter, TRequest> = (opts
     path: string | undefined;
     req: TRequest;
     input: unknown;
-    ctx: undefined | inferRouterParams<TRouter>['_ctx'];
+    ctx: undefined | inferRouterDef<TRouter>['_ctx'];
 }) => void;
 //# sourceMappingURL=types.d.ts.map

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,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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,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,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;CAClD,KAAK,IAAI,CAAC"}

package/dist/observable/observable.d.ts

@@ -1,5 +1,5 @@
 import { Observable, Observer, TeardownLogic } from './types';
-export declare type inferObservableValue<TObservable extends Observable<unknown, unknown>> = TObservable extends Observable<infer TValue, unknown> ? TValue : never;
+export declare type inferObservableValue<TObservable> = TObservable extends Observable<infer TValue, unknown> ? TValue : never;
 export declare function isObservable(x: unknown): x is Observable<unknown, unknown>;
 export declare function observable<TValue, TError = unknown>(subscribe: (observer: Observer<TValue, TError>) => TeardownLogic): Observable<TValue, TError>;
 //# sourceMappingURL=observable.d.ts.map

package/dist/observable/observable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observable.d.ts","sourceRoot":"","sources":["../../src/observable/observable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAoB,aAAa,EAAE,MAAM,SAAS,CAAC;AAEhF,oBAAY,oBAAoB,CAC9B,WAAW,SAAS,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,IAC9C,WAAW,SAAS,UAAU,CAAC,MAAM,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AAE3E,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAE1E;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,EACjD,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,aAAa,GAC/D,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CA6D5B"}
+{"version":3,"file":"observable.d.ts","sourceRoot":"","sources":["../../src/observable/observable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAoB,aAAa,EAAE,MAAM,SAAS,CAAC;AAEhF,oBAAY,oBAAoB,CAAC,WAAW,IAAI,WAAW,SAAS,UAAU,CAC5E,MAAM,MAAM,EACZ,OAAO,CACR,GACG,MAAM,GACN,KAAK,CAAC;AAEV,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAE1E;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,EACjD,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,aAAa,GAC/D,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CA6D5B"}

package/dist/types.d.ts

@@ -47,4 +47,10 @@ export declare type InferLast<T> = T & {
  * @public
  */
 export declare type inferAsyncReturnType<TFunction extends (...args: any) => any> = ThenArg<ReturnType<TFunction>>;
+/**
+ * @internal
+ */
+export declare type Filter<T extends Record<any, any> | any[], K> = {
+    [TKey in keyof T]: T[TKey] extends K ? T[TKey] : never;
+};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-alpha.28",
+  "version": "10.0.0-alpha.30",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -133,5 +133,5 @@
   "dependencies": {
     "tslib": "^2.1.0"
   },
-  "gitHead": "9252bd0df8523fc90b56bdd4228b8662ad507198"
+  "gitHead": "31e28de6c0469b28a6f39378f931f35e469f17f4"
 }

package/src/adapters/node-http/nodeHTTPRequestHandler.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { assertNotBrowser } from '../../assertNotBrowser';
 import { AnyRouter } from '../../core';
-import { inferRouterParams } from '../../core/types';
+import { inferRouterDef } from '../../core/types';
 import { HTTPRequest } from '../../http/internals/types';
 import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
 import { getPostBody } from './internals/getPostBody';
@@ -29,7 +29,7 @@ export async function nodeHTTPRequestHandler<
   TResponse extends NodeHTTPResponse,
 >(opts: NodeHTTPRequestHandlerOptions<TRouter, TRequest, TResponse>) {
   const createContext = async function _createContext(): Promise<
-    inferRouterParams<TRouter>['_ctx']
+    inferRouterDef<TRouter>['_ctx']
   > {
     return await opts.createContext?.(opts);
   };

package/src/adapters/node-http/types.ts

@@ -1,6 +1,6 @@
 import { IncomingMessage, ServerResponse } from 'http';
 import { AnyRouter, inferRouterContext } from '../../core';
-import { inferRouterParams } from '../../core';
+import { inferRouterDef } from '../../core';
 import { HTTPBaseHandlerOptions } from '../../http/internals/types';
 
 interface ParsedQs {
@@ -50,6 +50,4 @@ export type NodeHTTPCreateContextFn<
   TResponse,
 > = (
   opts: NodeHTTPCreateContextFnOptions<TRequest, TResponse>,
-) =>
-  | inferRouterParams<TRouter>['_ctx']
-  | Promise<inferRouterParams<TRouter>['_ctx']>;
+) => inferRouterDef<TRouter>['_ctx'] | Promise<inferRouterDef<TRouter>['_ctx']>;

package/src/core/index.ts

@@ -1,4 +1,4 @@
-export type { AnyRouter } from './router';
+export type { AnyRouter, ProcedureRouterRecord } from './router';
 export type { Procedure, ProcedureParams } from './procedure';
 
 export { initTRPC } from './initTRPC';

package/src/core/initTRPC.ts

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-types */
+import { mergeRoutersGeneric } from './internals/__generated__/mergeRoutersGeneric';
 import {
   DefaultErrorShape,
   ErrorFormatter,
@@ -18,7 +19,6 @@ import {
   InitGenerics,
   InitOptions,
 } from './internals/config';
-import { mergeRoutersGeneric } from './internals/mergeRoutersGeneric';
 import { createBuilder } from './internals/procedureBuilder';
 import { PickFirstDefined, ValidateShape } from './internals/utils';
 import { createMiddlewareFactory } from './middleware';
@@ -42,9 +42,9 @@ export function initTRPC<TParams extends Partial<InitGenerics> = {}>() {
       ErrorFormatter<$Context, DefaultErrorShape>
     >;
     type $Transformer = TOptions['transformer'] extends DataTransformerOptions
-      ? TOptions['transformer'] extends undefined
-        ? DefaultDataTransformer
-        : CombinedDataTransformer
+      ? TOptions['transformer'] extends DataTransformerOptions
+        ? CombinedDataTransformer
+        : DefaultDataTransformer
       : DefaultDataTransformer;
     type $ErrorShape = ErrorFormatterShape<$Formatter>;
 
@@ -58,24 +58,29 @@ export function initTRPC<TParams extends Partial<InitGenerics> = {}>() {
     const errorFormatter = options?.errorFormatter ?? defaultFormatter;
     const transformer = getDataTransformer(
       options?.transformer ?? defaultTransformer,
-    );
+    ) as $Transformer;
+    const _config: $Config = {
+      transformer,
+      errorShape: null as any,
+      ctx: null as any,
+      meta: null as any,
+    };
     return {
       /**
        * These are just types, they can't be used
        * @internal
        */
-      _config: null as unknown as $Config,
+      _config,
       /**
        * Builder object for creating procedures
        */
-      procedure: createBuilder<$Context, $Meta>(),
+      procedure: createBuilder<$Config>(),
       /**
        * Create reusable middlewares
        */
-      middleware: createMiddlewareFactory<$Context, $Meta>(),
+      middleware: createMiddlewareFactory<$Config>(),
       /**
        * Create a router
-       * FIXME this should also use error formatter
        */
       router: createRouterFactory<$Config>({
         errorFormatter,