@trpc/server 10.0.0-alpha.29 → 10.0.0-alpha.31

package/dist/core/router.d.ts

@@ -1,19 +1,38 @@
+import { inferProcedureOutput } from '.';
+import { Filter, Prefixer } from '..';
 import { TRPCError } from '../error/TRPCError';
 import { ErrorFormatter } from '../error/formatter';
 import { TRPCErrorShape } from '../rpc';
 import { CombinedDataTransformer } from '../transformer';
 import { RootConfig } from './internals/config';
-import { EnsureRecord, ValidateShape } from './internals/utils';
-import { Procedure } from './procedure';
+import { MutationProcedure, Procedure, QueryProcedure, SubscriptionProcedure } from './procedure';
 import { ProcedureType } from './types';
-export declare type ProcedureRecord<_TContext> = Record<string, Procedure<any>>;
-declare type AnyProcedureRecord = ProcedureRecord<any>;
+declare type ProcedureRecord = Record<string, Procedure<any>>;
+export declare type ProcedureRouterRecord = Record<string, Procedure<any> | AnyRouter>;
 export interface ProcedureStructure {
-    queries: AnyProcedureRecord;
-    mutations: AnyProcedureRecord;
-    subscriptions: AnyProcedureRecord;
+    queries: Record<string, QueryProcedure<any>>;
+    mutations: Record<string, MutationProcedure<any>>;
+    subscriptions: Record<string, SubscriptionProcedure<any>>;
+    procedures: ProcedureRecord;
 }
-export interface RouterParams<TContext, TErrorShape extends TRPCErrorShape<number>, TMeta extends Record<string, unknown>, TQueries extends ProcedureRecord<TContext>, TMutations extends ProcedureRecord<TContext>, TSubscriptions extends ProcedureRecord<TContext>> extends ProcedureStructure {
+declare type ObjKeyof<T> = T extends object ? keyof T : never;
+declare type KeyofKeyof<T> = ObjKeyof<T> | {
+    [K in keyof T]: ObjKeyof<T[K]>;
+}[keyof T];
+declare type StripNever<T> = Pick<T, {
+    [K in keyof T]: [T[K]] extends [never] ? never : K;
+}[keyof T]>;
+declare type Lookup<T, K> = T extends any ? (K extends keyof T ? T[K] : never) : never;
+declare 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;
+declare 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<TContext, TErrorShape extends TRPCErrorShape<number>, TMeta extends Record<string, unknown>, TRecord extends ProcedureRouterRecord> {
+    router: true;
     /**
      * @internal
      */
@@ -26,97 +45,70 @@ export interface RouterParams<TContext, TErrorShape extends TRPCErrorShape<numbe
      * @internal
      */
     _meta: TMeta;
-    queries: TQueries;
-    mutations: TMutations;
-    subscriptions: TSubscriptions;
     errorFormatter: ErrorFormatter<TContext, TErrorShape>;
     transformer: CombinedDataTransformer;
+    procedures: Filter<TRecord, Procedure<any>> & SimpleFlatten<PrefixedProcedures<TRecord>>;
+    routers: Filter<TRecord, Router<any>>;
+    record: TRecord;
+    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>>;
 }
-export declare type AnyRouterParams<TContext = any> = RouterParams<TContext, any, any, any, any, any>;
+export declare type AnyRouterDef<TContext = any> = RouterDef<TContext, any, any, any>;
 /**
  * @internal
  */
-export declare type inferHandlerInput<TProcedure extends Procedure<any>> = TProcedure extends Procedure<infer TParams> ? undefined extends TParams['_input_in'] ? unknown extends TParams['_input_in'] ? [(null | undefined)?] : [(TParams['_input_in'] | null | undefined)?] : [TParams['_input_in']] : [(undefined | null)?];
+export declare type inferHandlerInput<TProcedure extends Procedure<any>> = TProcedure extends Procedure<infer TDef> ? undefined extends TDef['_input_in'] ? unknown extends TDef['_input_in'] ? [(null | undefined)?] : [(TDef['_input_in'] | null | undefined)?] : [TDef['_input_in']] : [(undefined | null)?];
 /**
  * @internal
  */
-declare type inferHandlerFn<TProcedures extends ProcedureRecord<any>> = <TProcedure extends TProcedures[TPath], TPath extends keyof TProcedures & string>(path: TPath, ...args: inferHandlerInput<TProcedure>) => ReturnType<TProcedure>;
+declare type inferHandlerFn<TProcedures extends Record<string, Procedure<any>>> = <TProcedure extends TProcedures[TPath], TPath extends keyof TProcedures & string>(path: TPath, ...args: inferHandlerInput<TProcedure>) => inferProcedureOutput<TProcedure>;
 /**
  * This only exists b/c of interop mode
  * @internal
  */
-declare type RouterCaller<TParams extends AnyRouterParams> = (ctx: TParams['_ctx']) => {
+declare type RouterCaller<TDef extends AnyRouterDef> = (ctx: TDef['_ctx']) => {
     /**
      * @deprecated
      */
-    query: inferHandlerFn<TParams['queries']>;
+    query: inferHandlerFn<TDef['queries']>;
     /**
      * @deprecated
      */
-    mutation: inferHandlerFn<TParams['mutations']>;
+    mutation: inferHandlerFn<TDef['mutations']>;
     /**
      * @deprecated
      */
-    subscription: inferHandlerFn<TParams['subscriptions']>;
-    queries: TParams['queries'];
-    mutations: TParams['mutations'];
-    subscriptions: TParams['subscriptions'];
+    subscription: inferHandlerFn<TDef['subscriptions']>;
 };
-export interface Router<TParams extends AnyRouterParams> extends ProcedureStructure {
-    _def: RouterParams<TParams['_ctx'], TParams['_errorShape'], TParams['_meta'], TParams['queries'], TParams['mutations'], TParams['subscriptions']>;
-    queries: TParams['queries'];
-    mutations: TParams['mutations'];
-    subscriptions: TParams['subscriptions'];
-    errorFormatter: TParams['errorFormatter'];
-    transformer: TParams['transformer'];
-    createCaller: RouterCaller<TParams>;
+export interface Router<TDef extends AnyRouterDef> {
+    _def: RouterDef<TDef['_ctx'], TDef['_errorShape'], TDef['_meta'], TDef['record']>;
+    /** @deprecated **/
+    errorFormatter: TDef['errorFormatter'];
+    /** @deprecated **/
+    transformer: TDef['transformer'];
+    createCaller: RouterCaller<TDef>;
     getErrorShape(opts: {
         error: TRPCError;
         type: ProcedureType | 'unknown';
         path: string | undefined;
         input: unknown;
-        ctx: undefined | TParams['_ctx'];
-    }): TParams['_errorShape'];
+        ctx: undefined | TDef['_ctx'];
+    }): TDef['_errorShape'];
 }
 /**
  * @internal
  */
-export declare type RouterOptions<TContext> = Partial<AnyRouterParams<TContext>>;
-/**
- * @internal
- */
-export declare type RouterDefaultOptions<TContext> = Pick<AnyRouterParams<TContext>, 'transformer' | 'errorFormatter'>;
+export declare type RouterDefaultOptions<TContext> = Pick<AnyRouterDef<TContext>, 'transformer' | 'errorFormatter'>;
 /**
  * @internal
  */
-declare type RouterBuildOptions<TContext> = Pick<RouterOptions<TContext>, 'queries' | 'subscriptions' | 'mutations'>;
+export declare type RouterBuildOptions<TContext> = Partial<Pick<AnyRouterDef<TContext>, 'procedures'>>;
 export declare type AnyRouter = Router<any>;
 /**
  *
  * @internal
  */
-export declare function createRouterFactory<TSettings extends RootConfig>(defaults?: RouterDefaultOptions<TSettings['ctx']>): <TProcedures extends RouterBuildOptions<TSettings["ctx"]>>(procedures: ValidateShape<TProcedures, RouterBuildOptions<TSettings["ctx"]>>) => Router<{
-    _ctx: TSettings['ctx'];
-    _errorShape: TSettings['errorShape'];
-    _meta: TSettings['meta'];
-    queries: EnsureRecord<TProcedures["queries"]>;
-    mutations: EnsureRecord<TProcedures["mutations"]>;
-    subscriptions: EnsureRecord<TProcedures["subscriptions"]>;
-    errorFormatter: ErrorFormatter<TSettings['ctx'], TSettings['errorShape']>;
-    transformer: TSettings['transformer'];
-}>;
-declare type combineProcedureRecords<A extends Partial<AnyRouter>, B extends Partial<AnyRouter>> = {
-    queries: A['queries'] & B['queries'];
-    mutations: A['mutations'] & B['mutations'];
-    subscriptions: A['subscriptions'] & B['subscriptions'];
-};
-/**
- * @internal
- */
-export declare type mergeProcedureRecordsVariadic<Routers extends Partial<AnyRouter>[]> = Routers extends [] ? {
-    queries: {};
-    mutations: {};
-    subscriptions: {};
-} : Routers extends [infer First, ...infer Rest] ? First extends Partial<AnyRouter> ? Rest extends Partial<AnyRouter>[] ? combineProcedureRecords<First, mergeProcedureRecordsVariadic<Rest>> : never : never : never;
+export declare function createRouterFactory<TConfig extends RootConfig>(defaults?: RouterDefaultOptions<TConfig['ctx']>): <TProcRouterRecord extends ProcedureRouterRecord>(opts: TProcRouterRecord) => Router<RouterDef<TConfig["ctx"], TConfig["errorShape"], TConfig["meta"], TProcRouterRecord>> & TProcRouterRecord;
 export {};
 //# sourceMappingURL=router.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/core/router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAEL,cAAc,EAEf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,cAAc,EAA2B,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAsB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAOhD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGxC,oBAAY,eAAe,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;AACxE,aAAK,kBAAkB,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,aAAa,EAAE,kBAAkB,CAAC;CACnC;AAED,MAAM,WAAW,YAAY,CAE3B,QAAQ,EACR,WAAW,SAAS,cAAc,CAAC,MAAM,CAAC,EAC1C,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,SAAS,eAAe,CAAC,QAAQ,CAAC,EAC1C,UAAU,SAAS,eAAe,CAAC,QAAQ,CAAC,EAC5C,cAAc,SAAS,eAAe,CAAC,QAAQ,CAAC,CAChD,SAAQ,kBAAkB;IAC1B;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC;IACzB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;IACtB,aAAa,EAAE,cAAc,CAAC;IAC9B,cAAc,EAAE,cAAc,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACtD,WAAW,EAAE,uBAAuB,CAAC;CACtC;AAED,oBAAY,eAAe,CAAC,QAAQ,GAAG,GAAG,IAAI,YAAY,CACxD,QAAQ,EACR,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,CACJ,CAAC;AAEF;;GAEG;AACH,oBAAY,iBAAiB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAC7D,UAAU,SAAS,SAAS,CAAC,MAAM,OAAO,CAAC,GACvC,SAAS,SAAS,OAAO,CAAC,WAAW,CAAC,GACpC,OAAO,SAAS,OAAO,CAAC,WAAW,CAAC,GAClC,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,GACrB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,GAC9C,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GACxB,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAE5B;;GAEG;AACH,aAAK,cAAc,CAAC,WAAW,SAAS,eAAe,CAAC,GAAG,CAAC,IAAI,CAC9D,UAAU,SAAS,WAAW,CAAC,KAAK,CAAC,EACrC,KAAK,SAAS,MAAM,WAAW,GAAG,MAAM,EAExC,IAAI,EAAE,KAAK,EACX,GAAG,IAAI,EAAE,iBAAiB,CAAC,UAAU,CAAC,KACnC,UAAU,CAAC,UAAU,CAAC,CAAC;AAE5B;;;GAGG;AAEH,aAAK,YAAY,CAAC,OAAO,SAAS,eAAe,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK;IAC7E;;OAEG;IACH,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1C;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IAC/C;;OAEG;IACH,YAAY,EAAE,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAEvD,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAChC,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACzC,CAAC;AAEF,MAAM,WAAW,MAAM,CAAC,OAAO,SAAS,eAAe,CACrD,SAAQ,kBAAkB;IAC1B,IAAI,EAAE,YAAY,CAChB,OAAO,CAAC,MAAM,CAAC,EACf,OAAO,CAAC,aAAa,CAAC,EACtB,OAAO,CAAC,OAAO,CAAC,EAChB,OAAO,CAAC,SAAS,CAAC,EAClB,OAAO,CAAC,WAAW,CAAC,EACpB,OAAO,CAAC,eAAe,CAAC,CACzB,CAAC;IACF,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAChC,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IACxC,cAAc,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC1C,WAAW,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAEpC,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IACpC,aAAa,CAAC,IAAI,EAAE;QAClB,KAAK,EAAE,SAAS,CAAC;QACjB,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;QAChC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,KAAK,EAAE,OAAO,CAAC;QACf,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;KAClC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC5B;AAED;;GAEG;AACH,oBAAY,aAAa,CAAC,QAAQ,IAAI,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,oBAAoB,CAAC,QAAQ,IAAI,IAAI,CAC/C,eAAe,CAAC,QAAQ,CAAC,EACzB,aAAa,GAAG,gBAAgB,CACjC,CAAC;AAEF;;GAEG;AACH,aAAK,kBAAkB,CAAC,QAAQ,IAAI,IAAI,CACtC,aAAa,CAAC,QAAQ,CAAC,EACvB,SAAS,GAAG,eAAe,GAAG,WAAW,CAC1C,CAAC;AAEF,oBAAY,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;AA8BpC;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,SAAS,UAAU,EAC9D,QAAQ,CAAC,EAAE,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;UAUzC,SAAS,CAAC,KAAK,CAAC;iBACT,SAAS,CAAC,YAAY,CAAC;WAC7B,SAAS,CAAC,MAAM,CAAC;;;;oBAIR,eAAe,SAAS,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;iBAC5D,SAAS,CAAC,aAAa,CAAC;GAqHxC;AAED,aAAK,uBAAuB,CAC1B,CAAC,SAAS,OAAO,CAAC,SAAS,CAAC,EAC5B,CAAC,SAAS,OAAO,CAAC,SAAS,CAAC,IAC1B;IACF,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;IACrC,SAAS,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC3C,aAAa,EAAE,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC;CACxD,CAAC;AACF;;GAEG;AACH,oBAAY,6BAA6B,CACvC,OAAO,SAAS,OAAO,CAAC,SAAS,CAAC,EAAE,IAClC,OAAO,SAAS,EAAE,GAClB;IACE,OAAO,EAAE,EAAE,CAAC;IACZ,SAAS,EAAE,EAAE,CAAC;IACd,aAAa,EAAE,EAAE,CAAC;CACnB,GACD,OAAO,SAAS,CAAC,MAAM,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,GAC5C,KAAK,SAAS,OAAO,CAAC,SAAS,CAAC,GAC9B,IAAI,SAAS,OAAO,CAAC,SAAS,CAAC,EAAE,GAC/B,uBAAuB,CAAC,KAAK,EAAE,6BAA6B,CAAC,IAAI,CAAC,CAAC,GACnE,KAAK,GACP,KAAK,GACP,KAAK,CAAC"}
+{"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> = TProcedure extends Procedure<any> ? TProcedure['_def'] : never;
+export declare type inferProcedureOutput<TProcedure> = 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,IAAI,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,GAC5E,UAAU,CAAC,MAAM,CAAC,GAClB,KAAK,CAAC;AACV,oBAAY,oBAAoB,CAAC,UAAU,IACzC,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,33 @@
-import { Procedure as NewProcedure } from '../core/procedure';
-import { Router as NewRouter } from '../core/router';
+import { CombinedDataTransformer, ProcedureParams, ProcedureType } from '..';
+import { CreateRootConfig, RootConfig } from '../core/internals/config';
+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<TConfig extends RootConfig, TProcedure extends AnyOldProcedure> = TProcedure extends OldProcedure<infer TInputContext, infer TContext, infer TMeta, infer TInput, infer TParsedInput, infer TOutput, infer _TParsedOutput, infer TFinalInput> ? ProcedureParams<TConfig, TInputContext, TContext, TInput, TParsedInput, TOutput, TFinalInput, TMeta> : never;
+declare type MigrateProcedure<TConfig extends RootConfig, TProcedure extends AnyOldProcedure, TType extends ProcedureType> = TType extends 'query' ? QueryProcedure<convertProcedureParams<TConfig, TProcedure>> : TType extends 'mutation' ? MutationProcedure<convertProcedureParams<TConfig, TProcedure>> : TType extends 'subscription' ? SubscriptionProcedure<convertProcedureParams<TConfig, TProcedure>> : never;
+export declare type MigrateProcedureRecord<TConfig extends RootConfig, T extends ProcedureRecord<any>, TType extends ProcedureType> = {
+    [K in keyof T]: MigrateProcedure<TConfig, 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>;
+export declare type MigrateRouter<TInputContext extends Record<string, any>, 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<any>> = NewRouter<RouterDef<TInputContext, TErrorShape, TMeta, MigrateProcedureRecord<CreateRootConfig<{
+    ctx: TInputContext;
+    errorShape: TErrorShape;
+    meta: TMeta;
     transformer: CombinedDataTransformer;
-}>;
+}>, TQueries, 'query'> & MigrateProcedureRecord<CreateRootConfig<{
+    ctx: TInputContext;
+    errorShape: TErrorShape;
+    meta: TMeta;
+    transformer: CombinedDataTransformer;
+}>, TMutations, 'mutation'> & MigrateProcedureRecord<CreateRootConfig<{
+    ctx: TInputContext;
+    errorShape: TErrorShape;
+    meta: TMeta;
+    transformer: CombinedDataTransformer;
+}>, 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":"AAAA,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAQxE,OAAO,EACL,iBAAiB,EAEjB,cAAc,EACd,qBAAqB,EACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,MAAM,IAAI,SAAS,EACnB,SAAS,EAEV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,SAAS,IAAI,YAAY,EACzB,MAAM,IAAI,SAAS,EACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,aAAK,eAAe,GAAG,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE5E,aAAK,sBAAsB,CACzB,OAAO,SAAS,UAAU,EAC1B,UAAU,SAAS,eAAe,IAChC,UAAU,SAAS,YAAY,CACjC,MAAM,aAAa,EACnB,MAAM,QAAQ,EACd,MAAM,KAAK,EACX,MAAM,MAAM,EACZ,MAAM,YAAY,EAClB,MAAM,OAAO,EACb,MAAM,cAAc,EACpB,MAAM,WAAW,CAClB,GACG,eAAe,CACb,OAAO,EACP,aAAa,EACb,QAAQ,EACR,MAAM,EACN,YAAY,EACZ,OAAO,EACP,WAAW,EACX,KAAK,CACN,GACD,KAAK,CAAC;AAEV,aAAK,gBAAgB,CACnB,OAAO,SAAS,UAAU,EAC1B,UAAU,SAAS,eAAe,EAClC,KAAK,SAAS,aAAa,IACzB,KAAK,SAAS,OAAO,GACrB,cAAc,CAAC,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,GAC3D,KAAK,SAAS,UAAU,GACxB,iBAAiB,CAAC,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,GAC9D,KAAK,SAAS,cAAc,GAC5B,qBAAqB,CAAC,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,GAClE,KAAK,CAAC;AAEV,oBAAY,sBAAsB,CAChC,OAAO,SAAS,UAAU,EAC1B,CAAC,SAAS,eAAe,CAAC,GAAG,CAAC,EAC9B,KAAK,SAAS,aAAa,IACzB;KACD,CAAC,IAAI,MAAM,CAAC,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;CACvD,CAAC;AAEF,oBAAY,aAAa,CACvB,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzC,QAAQ,EACR,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,QAAQ,SAAS,eAAe,CAC9B,aAAa,EACb,QAAQ,EACR,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,CACJ,EACD,UAAU,SAAS,eAAe,CAChC,aAAa,EACb,QAAQ,EACR,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,CACJ,EACD,cAAc,SAAS,eAAe,CACpC,aAAa,EACb,QAAQ,EACR,OAAO,EACP,OAAO,EACP,GAAG,EACH,OAAO,EACP,OAAO,CACR,EACD,WAAW,SAAS,cAAc,CAAC,GAAG,CAAC,IACrC,SAAS,CACX,SAAS,CACP,aAAa,EACb,WAAW,EACX,KAAK,EACL,sBAAsB,CACpB,gBAAgB,CAAC;IACf,GAAG,EAAE,aAAa,CAAC;IACnB,UAAU,EAAE,WAAW,CAAC;IACxB,IAAI,EAAE,KAAK,CAAC;IACZ,WAAW,EAAE,uBAAuB,CAAC;CACtC,CAAC,EACF,QAAQ,EACR,OAAO,CACR,GACC,sBAAsB,CACpB,gBAAgB,CAAC;IACf,GAAG,EAAE,aAAa,CAAC;IACnB,UAAU,EAAE,WAAW,CAAC;IACxB,IAAI,EAAE,KAAK,CAAC;IACZ,WAAW,EAAE,uBAAuB,CAAC;CACtC,CAAC,EACF,UAAU,EACV,UAAU,CACX,GACD,sBAAsB,CACpB,gBAAgB,CAAC;IACf,GAAG,EAAE,aAAa,CAAC;IACnB,UAAU,EAAE,WAAW,CAAC;IACxB,IAAI,EAAE,KAAK,CAAC;IACZ,WAAW,EAAE,uBAAuB,CAAC;CACtC,CAAC,EACF,cAAc,EACd,cAAc,CACf,CACJ,CACF,CAAC;AAEF,oBAAY,gBAAgB,CAAC,OAAO,SAAS,YAAY,IACvD,OAAO,SAAS,SAAS,CACvB,MAAM,aAAa,EACnB,MAAM,QAAQ,EACd,MAAM,KAAK,EACX,MAAM,QAAQ,EACd,MAAM,UAAU,EAChB,MAAM,cAAc,EACpB,MAAM,WAAW,CAClB,GACG,aAAa,CACX,aAAa,EACb,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,UAAU,EACV,cAAc,EACd,WAAW,CACZ,GACD,KAAK,CAAC;AA+BZ,wBAAgB,aAAa,CAAC,UAAU,SAAS,YAAY,EAC3D,SAAS,EAAE,UAAU,GACpB,gBAAgB,CAAC,UAAU,CAAC,CA+B9B"}

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"}