@trpc/server 10.0.0-alpha.41 → 10.0.0-alpha.44

package/dist/rpc/envelopes.d.ts

@@ -33,30 +33,30 @@ export declare namespace JSONRPC2 {
         error: TError;
     }
 }
-/**
- * TRPC HTTP Envelopes
- */
-export declare type TRPCRequest = JSONRPC2.Request<ProcedureType, {
+export interface TRPCRequest extends JSONRPC2.Request<ProcedureType, {
     path: string;
     input: unknown;
-}>;
-export declare type TRPCResult<TData = unknown> = {
+}> {
+}
+export interface TRPCResult<TData = unknown> {
     data: TData;
-};
-export declare type TRPCErrorResponse<TError extends TRPCErrorShape = TRPCErrorShape> = JSONRPC2.ErrorResponse<TError>;
-export declare type TRPCResponse<TResult = unknown, TError extends TRPCErrorShape = TRPCErrorShape> = JSONRPC2.ResultResponse<TRPCResult<TResult>> | TRPCErrorResponse<TError>;
-/**
- * HTTP WS Envelopes
- */
+}
+export interface TRPCSuccessResponse<TData> extends JSONRPC2.ResultResponse<TRPCResult<TData> & {
+    type?: 'data';
+}> {
+}
+export interface TRPCErrorResponse<TError extends TRPCErrorShape = TRPCErrorShape> extends JSONRPC2.ErrorResponse<TError> {
+}
+export declare type TRPCResponse<TData = unknown, TError extends TRPCErrorShape = TRPCErrorShape> = TRPCSuccessResponse<TData> | TRPCErrorResponse<TError>;
 export declare type TRPCRequestMessage = {
     id: JSONRPC2.RequestId;
 } & TRPCRequest;
 /**
  * The client asked the server to unsubscribe
  */
-export declare type TRPCSubscriptionStopNotification = {
+export interface TRPCSubscriptionStopNotification extends JSONRPC2.BaseRequest<'subscription.stop'> {
     id: null;
-} & JSONRPC2.BaseRequest<'subscription.stop'>;
+}
 /**
  * The client's outgoing request types
  */
@@ -67,22 +67,23 @@ export declare type TRPCClientOutgoingRequest = TRPCSubscriptionStopNotification
 export declare type TRPCClientOutgoingMessage = TRPCRequestMessage | ({
     id: JSONRPC2.RequestId;
 } & JSONRPC2.BaseRequest<'subscription.stop'>);
-export declare type TRPCResultMessage<TData = unknown> = ({
+export interface TRPCResultMessage<TData> extends JSONRPC2.ResultResponse<(TRPCResult<TData> & {
     type: 'data';
-} & TRPCResult<TData>) | {
+}) | {
     type: 'started';
 } | {
     type: 'stopped';
-};
-export declare type TRPCResponseMessage<TResult = unknown, TError extends TRPCErrorShape = TRPCErrorShape> = {
+}> {
+}
+export declare type TRPCResponseMessage<TData = unknown, TError extends TRPCErrorShape = TRPCErrorShape> = {
     id: JSONRPC2.RequestId;
-} & (JSONRPC2.ResultResponse<TRPCResultMessage<TResult>> | TRPCErrorResponse<TError>);
+} & (TRPCResultMessage<TData> | TRPCErrorResponse<TError>);
 /**
  * The server asked the client to reconnect - useful when restarting/redeploying service
  */
-export declare type TRPCReconnectNotification = {
+export interface TRPCReconnectNotification extends JSONRPC2.BaseRequest<'reconnect'> {
     id: JSONRPC2.RequestId;
-} & JSONRPC2.BaseRequest<'reconnect'>;
+}
 /**
  * The client's incoming request types
  */

package/dist/rpc/envelopes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"envelopes.d.ts","sourceRoot":"","sources":["../../src/rpc/envelopes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,cAAc,CAC7B,KAAK,SAAS,MAAM,GAAG,sBAAsB,EAC7C,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAE/D,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,CAAC;CACb;AAED;;GAEG;AACH,yBAAiB,QAAQ,CAAC;IACxB,KAAY,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAE/C;;OAEG;IACH,UAAiB,YAAY;QAC3B,EAAE,CAAC,EAAE,SAAS,CAAC;QACf,OAAO,CAAC,EAAE,KAAK,CAAC;KACjB;IAED,UAAiB,WAAW,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,CAC1D,SAAQ,YAAY;QACpB,MAAM,EAAE,OAAO,CAAC;KACjB;IAED,UAAiB,OAAO,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,OAAO,GAAG,OAAO,CACzE,SAAQ,WAAW,CAAC,OAAO,CAAC;QAC5B,MAAM,EAAE,OAAO,CAAC;KACjB;IAED,UAAiB,cAAc,CAAC,OAAO,GAAG,OAAO,CAAE,SAAQ,YAAY;QACrE,MAAM,EAAE,OAAO,CAAC;KACjB;IAED,UAAiB,aAAa,CAAC,MAAM,SAAS,cAAc,GAAG,cAAc,CAC3E,SAAQ,YAAY;QACpB,KAAK,EAAE,MAAM,CAAC;KACf;CACF;AAED;;GAEG;AAEH,oBAAY,WAAW,GAAG,QAAQ,CAAC,OAAO,CACxC,aAAa,EACb;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CACjC,CAAC;AAEF,oBAAY,UAAU,CAAC,KAAK,GAAG,OAAO,IAAI;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC;AAE1D,oBAAY,iBAAiB,CAAC,MAAM,SAAS,cAAc,GAAG,cAAc,IAC1E,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;AAEjC,oBAAY,YAAY,CACtB,OAAO,GAAG,OAAO,EACjB,MAAM,SAAS,cAAc,GAAG,cAAc,IAC5C,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;AAE7E;;GAEG;AAEH,oBAAY,kBAAkB,GAAG;IAC/B,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC;CACxB,GAAG,WAAW,CAAC;AAEhB;;GAEG;AACH,oBAAY,gCAAgC,GAAG;IAC7C,EAAE,EAAE,IAAI,CAAC;CACV,GAAG,QAAQ,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;AAE9C;;GAEG;AACH,oBAAY,yBAAyB,GAAG,gCAAgC,CAAC;AAEzE;;GAEG;AACH,oBAAY,yBAAyB,GACjC,kBAAkB,GAClB,CAAC;IAAE,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAA;CAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;AAE7E,oBAAY,iBAAiB,CAAC,KAAK,GAAG,OAAO,IACzC,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,GACtC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAExB,oBAAY,mBAAmB,CAC7B,OAAO,GAAG,OAAO,EACjB,MAAM,SAAS,cAAc,GAAG,cAAc,IAC5C;IAAE,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAA;CAAE,GAAG,CAC7B,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,GACnD,iBAAiB,CAAC,MAAM,CAAC,CAC5B,CAAC;AAEF;;GAEG;AACH,oBAAY,yBAAyB,GAAG;IACtC,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC;CACxB,GAAG,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;AAEtC;;GAEG;AACH,oBAAY,yBAAyB,GAAG,yBAAyB,CAAC;AAElE;;GAEG;AACH,oBAAY,yBAAyB,CACnC,OAAO,GAAG,OAAO,EACjB,MAAM,SAAS,cAAc,GAAG,cAAc,IAC5C,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,yBAAyB,CAAC"}
+{"version":3,"file":"envelopes.d.ts","sourceRoot":"","sources":["../../src/rpc/envelopes.ts"],"names":[],"mappings":"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"}

package/dist/rpc/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var envelopes = require('../envelopes-b6dd0367.js');
+var envelopes = require('../envelopes-2ae27c9f.js');
 
 
 

package/dist/rpc/index.mjs

@@ -1 +1 @@
-export { J as JSONRPC2, T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../envelopes-af8c2959.mjs';
+export { J as JSONRPC2, T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../envelopes-b9f49d4d.mjs';

package/dist/subscription.mjs

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

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;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;AAEpE;;GAEG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI;KACxB,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK;CACxD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA;;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;AAEpE;;GAEG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI;KACxB,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK;CACxD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-alpha.41",
+  "version": "10.0.0-alpha.44",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -35,9 +35,9 @@
       "default": "./dist/index.js"
     },
     "./adapters/aws-lambda": {
-      "import": "./dist/adapters/aws-lambda.mjs",
-      "require": "./dist/adapters/aws-lambda.js",
-      "default": "./dist/adapters/aws-lambda.js"
+      "import": "./dist/adapters/aws-lambda/index.mjs",
+      "require": "./dist/adapters/aws-lambda/index.js",
+      "default": "./dist/adapters/aws-lambda/index.js"
     },
     "./adapters/express": {
       "import": "./dist/adapters/express.mjs",
@@ -116,6 +116,7 @@
     "@types/hash-sum": "^1.0.0",
     "@types/ws": "^8.2.0",
     "abort-controller": "^3.0.0",
+    "aws-lambda": "^1.0.7",
     "devalue": "^2.0.1",
     "esbuild": "^0.14.38",
     "express": "^4.17.1",
@@ -139,5 +140,5 @@
   "dependencies": {
     "tslib": "^2.1.0"
   },
-  "gitHead": "927344f2dd01312598720f0165a8f7ad3972761d"
+  "gitHead": "02ec6d14567380810f64ffbd82f18f8dcde07fd4"
 }

package/src/core/index.ts

@@ -1,4 +1,8 @@
-export type { AnyRouter, ProcedureRouterRecord } from './router';
+export type {
+  AnyRouter,
+  ProcedureRecord,
+  ProcedureRouterRecord,
+} from './router';
 export { callProcedure } from './router';
 export type {
   Procedure,

package/src/core/initTRPC.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
 import { mergeRoutersGeneric } from './internals/__generated__/mergeRoutersGeneric';
 import {
   DefaultErrorShape,

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

@@ -8,6 +8,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -27,6 +28,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -46,6 +48,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -65,6 +68,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -84,6 +88,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -103,6 +108,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -122,6 +128,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -141,6 +148,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -160,6 +168,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -179,6 +188,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -198,6 +208,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -217,6 +228,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'] & RP11['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -236,6 +248,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'] & RP11['legacy'] & RP12['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -255,6 +268,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'] & RP11['legacy'] & RP12['legacy'] & RP13['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -274,6 +288,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'] & RP11['legacy'] & RP12['legacy'] & RP13['legacy'] & RP14['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -293,6 +308,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'] & RP11['legacy'] & RP12['legacy'] & RP13['legacy'] & RP14['legacy'] & RP15['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -312,6 +328,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'] & RP11['legacy'] & RP12['legacy'] & RP13['legacy'] & RP14['legacy'] & RP15['legacy'] & RP16['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -331,6 +348,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'] & RP11['legacy'] & RP12['legacy'] & RP13['legacy'] & RP14['legacy'] & RP15['legacy'] & RP16['legacy'] & RP17['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -350,6 +368,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'] & RP11['legacy'] & RP12['legacy'] & RP13['legacy'] & RP14['legacy'] & RP15['legacy'] & RP16['legacy'] & RP17['legacy'] & RP18['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];
@@ -369,6 +388,7 @@ export function mergeRoutersGeneric<
  ): Router<{
   router: true;
   _ctx: RP0['_ctx'];
+  legacy: RP0['legacy'] & RP1['legacy'] & RP2['legacy'] & RP3['legacy'] & RP4['legacy'] & RP5['legacy'] & RP6['legacy'] & RP7['legacy'] & RP8['legacy'] & RP9['legacy'] & RP10['legacy'] & RP11['legacy'] & RP12['legacy'] & RP13['legacy'] & RP14['legacy'] & RP15['legacy'] & RP16['legacy'] & RP17['legacy'] & RP18['legacy'] & RP19['legacy'];
   _errorShape: RP0['_errorShape'];
   _meta: RP0['_meta'];
   transformer: RP0['transformer'];

package/src/core/internals/procedureBuilder.ts

@@ -81,24 +81,6 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
   ): $ProcedureReturnInput extends ProcedureBuilder<infer $TParams>
     ? CreateProcedureReturnInput<TParams, $TParams>
     : never;
-
-  /** @deprecated **/
-  resolve<$TOutput>(
-    resolver: (
-      opts: ResolveOptions<TParams>,
-    ) => MaybePromise<FallbackValue<TParams['_output_in'], $TOutput>>,
-  ): UnsetMarker extends TParams['_output_out']
-    ? Procedure<
-        Overwrite<
-          TParams,
-          {
-            _output_in: $TOutput;
-            _output_out: $TOutput;
-          }
-        >
-      >
-    : Procedure<TParams>;
-
   /**
    * Query procedure
    */
@@ -229,10 +211,6 @@ export function createBuilder<TConfig extends RootConfig>(
         meta: meta as Record<string, unknown>,
       }) as AnyProcedureBuilder;
     },
-    /** @deprecated **/
-    resolve(resolver) {
-      return createResolver(_def, resolver);
-    },
     unstable_concat(builder) {
       return createNewBuilder(_def, builder._def) as any;
     },

package/src/core/procedure.ts

@@ -20,6 +20,7 @@ export interface ProcedureOptions {
 }
 
 /**
+ * FIXME: this should only take 1 generic argument instead of a list
  * @internal
  */
 export interface ProcedureParams<

package/src/core/router.ts

@@ -1,6 +1,5 @@
-/* eslint-disable @typescript-eslint/ban-types */
 import { inferProcedureOutput } from '.';
-import { Filter, Prefixer } from '..';
+import { Filter } from '..';
 import { TRPCError } from '../error/TRPCError';
 import {
   DefaultErrorShape,
@@ -25,7 +24,8 @@ import {
 } from './procedure';
 import { ProcedureType, procedureTypes } from './types';
 
-type ProcedureRecord = Record<string, Procedure<any>>;
+/** @internal **/
+export type ProcedureRecord = Record<string, Procedure<any>>;
 
 export type ProcedureRouterRecord = Record<string, Procedure<any> | AnyRouter>;
 
@@ -36,28 +36,6 @@ export interface ProcedureStructure {
   procedures: ProcedureRecord;
 }
 
-type ObjKeyof<T> = T extends object ? keyof T : never;
-type KeyofKeyof<T> = ObjKeyof<T> | { [K in keyof T]: ObjKeyof<T[K]> }[keyof T];
-type StripNever<T> = Pick<
-  T,
-  { [K in keyof T]: [T[K]] extends [never] ? never : K }[keyof T]
->;
-type Lookup<T, K> = T extends any ? (K extends keyof T ? T[K] : never) : never;
-type SimpleFlatten<T> = T extends object
-  ? StripNever<{
-      [K in KeyofKeyof<T>]:
-        | Exclude<K extends keyof T ? T[K] : never, object>
-        | { [P in keyof T]: Lookup<T[P], K> }[keyof T];
-    }>
-  : T;
-
-type PrefixedProcedures<T extends ProcedureRouterRecord> = {
-  [K in keyof T]: T[K] extends AnyRouter
-    ? T[K] extends Procedure<any>
-      ? never
-      : Prefixer<T[K]['_def']['procedures'], `${K & string}.`>
-    : never;
-};
 export interface RouterDef<
   // FIXME this should use RootConfig
   TContext,
@@ -80,21 +58,32 @@ export interface RouterDef<
   _meta: TMeta;
   errorFormatter: ErrorFormatter<TContext, TErrorShape>;
   transformer: CombinedDataTransformer;
-  // FIXME this is slow
-  procedures: Filter<TRecord, Procedure<any>> &
-    SimpleFlatten<PrefixedProcedures<TRecord>>;
+  // FIXME this is slow:
+  // - I think this has to go & be replaced by something by only using `TRecord` without `& SimpleFlatten...`
+  // - Potentially, we have a `legacyProcedures` record where we only register the old things that are availble by string path
+  procedures: TRecord;
+  /**
+   * V9 procedures
+   * @deprecated
+   */
+  legacy: {};
   routers: Filter<TRecord, Router<any>>;
   record: TRecord;
-  // FIXME this is slow
-  subscriptions: Filter<TRecord, SubscriptionProcedure<any>> &
-    Filter<
-      SimpleFlatten<PrefixedProcedures<TRecord>>,
-      SubscriptionProcedure<any>
-    >;
-  queries: Filter<TRecord, QueryProcedure<any>> &
-    Filter<SimpleFlatten<PrefixedProcedures<TRecord>>, QueryProcedure<any>>;
-  mutations: Filter<TRecord, MutationProcedure<any>> &
-    Filter<SimpleFlatten<PrefixedProcedures<TRecord>>, MutationProcedure<any>>;
+  /**
+   * FIXME remove?
+   * @deprecated
+   */
+  subscriptions: Filter<TRecord, SubscriptionProcedure<any> & { _old: true }>;
+  /**
+   * FIXME remove?
+   * @deprecated
+   */
+  queries: Filter<TRecord, QueryProcedure<any> & { _old: true }>;
+  /**
+   * FIXME remove?
+   * @deprecated
+   */
+  mutations: Filter<TRecord, MutationProcedure<any> & { _old: true }>;
 }
 
 export type AnyRouterDef<TContext = any> = RouterDef<TContext, any, any, any>;
@@ -156,12 +145,7 @@ type RouterCaller<TDef extends AnyRouterDef> = (ctx: TDef['_ctx']) => {
 } & DecoratedProcedureRecord<TDef['record']>;
 
 export interface Router<TDef extends AnyRouterDef> {
-  _def: RouterDef<
-    TDef['_ctx'],
-    TDef['_errorShape'],
-    TDef['_meta'],
-    TDef['record']
-  >;
+  _def: TDef;
   /** @deprecated **/
   errorFormatter: TDef['errorFormatter'];
   /** @deprecated **/
@@ -259,6 +243,7 @@ export function createRouterFactory<TConfig extends RootConfig>(
 
     const _def: AnyRouterDef<TConfig['ctx']> = {
       router: true,
+      legacy: {},
       procedures: {},
       ...emptyRouter,
       ...result,

package/src/deprecated/interop.ts

@@ -53,16 +53,26 @@ type convertProcedureParams<
     >
   : never;
 
+/**
+ * @deprecated
+ */
+export type OldProcedureTag = {
+  _old: true;
+};
+
 type MigrateProcedure<
   TConfig extends RootConfig,
   TProcedure extends AnyOldProcedure,
   TType extends ProcedureType,
 > = TType extends 'query'
-  ? QueryProcedure<convertProcedureParams<TConfig, TProcedure>>
+  ? QueryProcedure<convertProcedureParams<TConfig, TProcedure>> &
+      OldProcedureTag
   : TType extends 'mutation'
-  ? MutationProcedure<convertProcedureParams<TConfig, TProcedure>>
+  ? MutationProcedure<convertProcedureParams<TConfig, TProcedure>> &
+      OldProcedureTag
   : TType extends 'subscription'
-  ? SubscriptionProcedure<convertProcedureParams<TConfig, TProcedure>>
+  ? SubscriptionProcedure<convertProcedureParams<TConfig, TProcedure>> &
+      OldProcedureTag
   : never;
 
 export type MigrateProcedureRecord<
@@ -106,7 +116,40 @@ export type MigrateRouter<
   >,
   TErrorShape extends TRPCErrorShape<any>,
 > = NewRouter<
-  RouterDef<
+  {
+    legacy: {
+      queries: MigrateProcedureRecord<
+        CreateRootConfig<{
+          ctx: TInputContext;
+          errorShape: TErrorShape;
+          meta: TMeta;
+          transformer: CombinedDataTransformer;
+        }>,
+        TQueries,
+        'query'
+      >;
+      mutations: MigrateProcedureRecord<
+        CreateRootConfig<{
+          ctx: TInputContext;
+          errorShape: TErrorShape;
+          meta: TMeta;
+          transformer: CombinedDataTransformer;
+        }>,
+        TMutations,
+        'mutation'
+      >;
+      subscriptions: MigrateProcedureRecord<
+        CreateRootConfig<{
+          ctx: TInputContext;
+          errorShape: TErrorShape;
+          meta: TMeta;
+          transformer: CombinedDataTransformer;
+        }>,
+        TSubscriptions,
+        'subscription'
+      >;
+    };
+  } & RouterDef<
     TInputContext,
     TErrorShape,
     TMeta,

package/src/deprecated/router.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { assertNotBrowser } from '../assertNotBrowser';
 import { TRPCError } from '../error/TRPCError';