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

package/src/deprecated/interop.ts

@@ -1,49 +1,80 @@
+import { CombinedDataTransformer, ProcedureParams, ProcedureType } from '..';
+import { CreateRootConfig, RootConfig } from '../core/internals/config';
 import { getParseFnOrPassThrough } from '../core/internals/getParseFn';
 import {
   createInputMiddleware,
   createInternalBuilder,
   createOutputMiddleware,
 } from '../core/internals/internalProcedure';
-import { Procedure as NewProcedure } from '../core/procedure';
-import { Router as NewRouter, createRouterFactory } from '../core/router';
+import { mergeWithoutOverrides } from '../core/internals/mergeWithoutOverrides';
+import {
+  MutationProcedure,
+  Procedure as NewProcedure,
+  QueryProcedure,
+  SubscriptionProcedure,
+} from '../core/procedure';
+import {
+  Router as NewRouter,
+  RouterDef,
+  createRouterFactory,
+} 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';
 
 type AnyOldProcedure = OldProcedure<any, any, any, any, any, any, any, any>;
-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 type MigrateProcedureRecord<T extends ProcedureRecord<any>> = {
-  [K in keyof T]: MigrateProcedure<T[K]>;
+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;
+
+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 type MigrateProcedureRecord<
+  TConfig extends RootConfig,
+  T extends ProcedureRecord<any>,
+  TType extends ProcedureType,
+> = {
+  [K in keyof T]: MigrateProcedure<TConfig, T[K], TType>;
 };
 
 export type MigrateRouter<
-  TInputContext,
+  TInputContext extends Record<string, any>,
   TContext,
   TMeta extends Record<string, any>,
   TQueries extends ProcedureRecord<
@@ -73,17 +104,44 @@ export type MigrateRouter<
     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;
-}>;
+  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 type MigrateOldRouter<TRouter extends AnyOldRouter> =
   TRouter extends OldRouter<
@@ -106,9 +164,10 @@ export type MigrateOldRouter<TRouter extends AnyOldRouter> =
       >
     : never;
 
-function migrateProcedure<TProcedure extends AnyOldProcedure>(
-  oldProc: TProcedure,
-): MigrateProcedure<TProcedure> {
+function migrateProcedure<
+  TProcedure extends AnyOldProcedure,
+  TType extends ProcedureType,
+>(oldProc: TProcedure, type: TType): MigrateProcedure<any, TProcedure, TType> {
   const def = oldProc._def();
 
   const inputParser = getParseFnOrPassThrough(def.inputParser);
@@ -125,9 +184,12 @@ function migrateProcedure<TProcedure extends AnyOldProcedure>(
     ],
     meta: def.meta,
     output: def.outputParser,
+    mutation: type === 'mutation',
+    query: type === 'query',
+    subscription: type === 'subscription',
   });
 
-  const proc = builder.resolve((opts) => def.resolver(opts as any));
+  const proc = builder[type]((opts) => def.resolver(opts as any));
 
   return proc as any;
 }
@@ -143,27 +205,25 @@ export function migrateRouter<TOldRouter extends AnyOldRouter>(
   const mutations: ProcRecord = {};
   const subscriptions: ProcRecord = {};
   for (const [name, procedure] of Object.entries(oldRouter._def.queries)) {
-    queries[name] = migrateProcedure(procedure as any);
+    queries[name] = migrateProcedure(procedure as any, 'query');
   }
 
   for (const [name, procedure] of Object.entries(oldRouter._def.mutations)) {
-    mutations[name] = migrateProcedure(procedure as any);
+    mutations[name] = migrateProcedure(procedure as any, 'mutation');
   }
 
   for (const [name, procedure] of Object.entries(
     oldRouter._def.subscriptions,
   )) {
-    subscriptions[name] = migrateProcedure(procedure as any);
+    subscriptions[name] = migrateProcedure(procedure as any, 'subscription');
   }
 
+  const procedures = mergeWithoutOverrides(queries, mutations, subscriptions);
+
   const newRouter = createRouterFactory<any>({
     transformer,
     errorFormatter,
-  })({
-    mutations,
-    queries,
-    subscriptions,
-  });
+  })(procedures);
 
   return newRouter as any;
 }

package/src/http/internals/types.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';
@@ -24,8 +24,8 @@ export interface HTTPRequest {
  * @internal
  */
 export 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/src/internals/types.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';
@@ -20,5 +20,5 @@ export 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;

package/src/observable/observable.ts

@@ -1,9 +1,12 @@
 import { pipeFromArray } from './internals/pipe';
 import { Observable, Observer, OperatorFunction, TeardownLogic } from './types';
 
-export type inferObservableValue<
-  TObservable extends Observable<unknown, unknown>,
-> = TObservable extends Observable<infer TValue, unknown> ? TValue : never;
+export type inferObservableValue<TObservable> = TObservable extends Observable<
+  infer TValue,
+  unknown
+>
+  ? TValue
+  : never;
 
 export function isObservable(x: unknown): x is Observable<unknown, unknown> {
   return typeof x === 'object' && x !== null && 'subscribe' in x;

package/src/types.ts

@@ -65,3 +65,12 @@ export type InferLast<T> = T & { [K in keyof T]: T[K] };
  */
 export type inferAsyncReturnType<TFunction extends (...args: any) => any> =
   ThenArg<ReturnType<TFunction>>;
+
+type FilterKeys<T extends object, K> = {
+  [TKey in keyof T]: T[TKey] extends K ? TKey : never;
+}[keyof T];
+
+/**
+ * @internal
+ */
+export type Filter<T extends object, K> = Pick<T, FilterKeys<T, K>>;

package/dist/core/internals/mergeRoutersGeneric.d.ts

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

package/dist/core/internals/mergeRoutersGeneric.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mergeRoutersGeneric.d.ts","sourceRoot":"","sources":["../../../src/core/internals/mergeRoutersGeneric.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAI/D,aAAK,qBAAqB,CAAC,QAAQ,SAAS,eAAe,EAAE,EAAE,QAAQ,SAAS,MAAM,eAAe,EAAE,GAAG,GAAG,OAAO,IAEhH,QAAQ,SAAS,CAAC,MAAM,IAAI,SAAS,eAAe,EAAE,GAAG,MAAM,IAAI,SAAS,eAAe,EAAE,CAAC,GAAG,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;AAGvK,aAAK,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAEjF,aAAK,eAAe,CAAC,CAAC,EAAE,GAAG,SAAS,OAAO,EAAE,GAAG,EAAE,IAC9C,CAAC,SAAS,CAAC,MAAM,IAAI,SAAS,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC,GAAG,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;AAE3H,wBAAgB,mBAAmB,CAAC,OAAO,SAAS,CAAC,GAAG,SAAS,EAAE,CAAC,EAChE,GAAG,OAAO,EAAE,OAAO,GAClB,eAAe,CAAC,OAAO,CAAC,SAAS,MAAM,SAAS,SAAS,eAAe,EAAE,GAC1E,MAAM,CAAC;IACJ,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACxC,WAAW,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IACtD,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1C,WAAW,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IACtD,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC5D,OAAO,EAAE,qBAAqB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACrD,SAAS,EAAE,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACzD,aAAa,EAAE,qBAAqB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;CACpE,CAAC,GAAG,KAAK,CAEb"}

package/src/core/internals/mergeRoutersGeneric.ts

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