@trpc/server 10.0.0-alpha.2 → 10.0.0-alpha.20

package/src/internals/procedure.ts

@@ -1,51 +1,54 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { TRPCError } from '../TRPCError';
 import { assertNotBrowser } from '../assertNotBrowser';
 import { ProcedureType } from '../router';
-import { TRPCError } from '../TRPCError';
 import { getErrorFromUnknown } from './errors';
 import { MiddlewareFunction, middlewareMarker } from './middlewares';
 import { wrapCallSafe } from './wrapCallSafe';
+
 assertNotBrowser();
 
-export type ProcedureInputParserZodEsque<TInput, TParsedInput> = {
+export type ProcedureParserZodEsque<TInput, TOutput> = {
   _input: TInput;
-  _output: TParsedInput;
+  _output: TOutput;
 };
 
-export type ProcedureInputParserMyZodEsque<TInput> = {
-  parse: (input: any) => TInput;
+export type ProcedureParserMyZodEsque<T> = {
+  parse: (input: any) => T;
 };
 
-export type ProcedureInputParserSuperstructEsque<TInput> = {
-  create: (input: unknown) => TInput;
+export type ProcedureParserSuperstructEsque<T> = {
+  create: (input: unknown) => T;
 };
 
-export type ProcedureInputParserCustomValidatorEsque<TInput> = (
+export type ProcedureParserCustomValidatorEsque<T> = (
   input: unknown,
-) => TInput | Promise<TInput>;
+) => T | Promise<T>;
 
-export type ProcedureInputParserYupEsque<TInput> = {
-  validateSync: (input: unknown) => TInput;
+export type ProcedureParserYupEsque<T> = {
+  validateSync: (input: unknown) => T;
 };
-export type ProcedureInputParser<TInput> =
-  | ProcedureInputParserYupEsque<TInput>
-  | ProcedureInputParserSuperstructEsque<TInput>
-  | ProcedureInputParserCustomValidatorEsque<TInput>
-  | ProcedureInputParserMyZodEsque<TInput>;
 
-export type ProcedureInputParserWithInputOutput<TInput, TParsedInput> =
-  ProcedureInputParserZodEsque<TInput, TParsedInput>;
+export type ProcedureParserWithInputOutput<TInput, TOutput> =
+  ProcedureParserZodEsque<TInput, TOutput>;
+
+export type ProcedureParser<T> =
+  | ProcedureParserYupEsque<T>
+  | ProcedureParserSuperstructEsque<T>
+  | ProcedureParserCustomValidatorEsque<T>
+  | ProcedureParserMyZodEsque<T>;
 
-export type ProcedureResolver<TContext, TParsedInput, TOutput> = (opts: {
+export type ProcedureResolver<TContext, TInput, TOutput> = (opts: {
   ctx: TContext;
-  input: TParsedInput;
+  input: TInput;
   type: ProcedureType;
 }) => Promise<TOutput> | TOutput;
 
-interface ProcedureOptions<TContext, TParsedInput, TOutput> {
+interface ProcedureOptions<TContext, TInput, TOutput, TParsedOutput> {
   middlewares: Array<MiddlewareFunction<any, any>>;
-  resolver: ProcedureResolver<TContext, TParsedInput, TOutput>;
-  inputParser: ProcedureInputParser<TParsedInput>;
+  resolver: ProcedureResolver<TContext, TInput, TOutput>;
+  inputParser: ProcedureParser<TInput>;
+  outputParser: ProcedureParser<TParsedOutput>;
 }
 
 /**
@@ -58,36 +61,33 @@ export interface ProcedureCallOptions<TContext> {
   type: ProcedureType;
 }
 
-type ParseFn<TParsedInput> = (
-  value: unknown,
-) => TParsedInput | Promise<TParsedInput>;
-function getParseFn<TParsedInput>(
-  inputParser: ProcedureInputParser<TParsedInput>,
-): ParseFn<TParsedInput> {
-  const parser = inputParser as any;
+type ParseFn<T> = (value: unknown) => T | Promise<T>;
+
+function getParseFn<T>(procedureParser: ProcedureParser<T>): ParseFn<T> {
+  const parser = procedureParser as any;
 
   if (typeof parser === 'function') {
-    // ProcedureInputParserCustomValidatorEsque
+    // ProcedureParserCustomValidatorEsque
     return parser;
   }
 
   if (typeof parser.parseAsync === 'function') {
-    // ProcedureInputParserZodEsque
+    // ProcedureParserZodEsque
     return parser.parseAsync.bind(parser);
   }
 
   if (typeof parser.parse === 'function') {
-    // ProcedureInputParserZodEsque
+    // ProcedureParserZodEsque
     return parser.parse.bind(parser);
   }
 
   if (typeof parser.validateSync === 'function') {
-    // ProcedureInputParserYupEsque
+    // ProcedureParserYupEsque
     return parser.validateSync.bind(parser);
   }
 
   if (typeof parser.create === 'function') {
-    // ProcedureInputParserSuperstructEsque
+    // ProcedureParserSuperstructEsque
     return parser.create.bind(parser);
   }
 
@@ -97,22 +97,36 @@ function getParseFn<TParsedInput>(
 /**
  * @internal
  */
-export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
+export class Procedure<
+  TInputContext,
+  TContext,
+  TInput,
+  TParsedInput,
+  TOutput,
+  TParsedOutput,
+  TFinalOutput = unknown extends TParsedOutput ? TOutput : TParsedOutput,
+> {
   private middlewares: Readonly<Array<MiddlewareFunction<any, any>>>;
   private resolver: ProcedureResolver<TContext, TParsedInput, TOutput>;
-  private readonly inputParser: ProcedureInputParser<TParsedInput>;
-  private parse: ParseFn<TParsedInput>;
+  private readonly inputParser: ProcedureParser<TParsedInput>;
+  private parseInputFn: ParseFn<TParsedInput>;
+  private readonly outputParser: ProcedureParser<TFinalOutput>;
+  private parseOutputFn: ParseFn<TFinalOutput>;
 
-  constructor(opts: ProcedureOptions<TContext, TParsedInput, TOutput>) {
+  constructor(
+    opts: ProcedureOptions<TContext, TParsedInput, TOutput, TFinalOutput>,
+  ) {
     this.middlewares = opts.middlewares;
     this.resolver = opts.resolver;
     this.inputParser = opts.inputParser;
-    this.parse = getParseFn(this.inputParser);
+    this.parseInputFn = getParseFn(this.inputParser);
+    this.outputParser = opts.outputParser;
+    this.parseOutputFn = getParseFn(this.outputParser);
   }
 
   private async parseInput(rawInput: unknown): Promise<TParsedInput> {
     try {
-      return await this.parse(rawInput);
+      return await this.parseInputFn(rawInput);
     } catch (cause) {
       throw new TRPCError({
         code: 'BAD_REQUEST',
@@ -121,18 +135,31 @@ export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
     }
   }
 
+  private async parseOutput(rawOutput: TOutput): Promise<TFinalOutput> {
+    try {
+      return await this.parseOutputFn(rawOutput);
+    } catch (cause) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        cause,
+        message: 'Output validation failed',
+      });
+    }
+  }
+
   /**
-   * Trigger middlewares in order, parse raw input & call resolver
+   * Trigger middlewares in order, parse raw input, call resolver & parse raw output
    * @internal
    */
   public async call(
     opts: ProcedureCallOptions<TInputContext>,
-  ): Promise<TOutput> {
+  ): Promise<TFinalOutput> {
     // wrap the actual resolver and treat as the last "middleware"
     const middlewaresWithResolver = this.middlewares.concat([
       async ({ ctx }: { ctx: TContext }) => {
         const input = await this.parseInput(opts.rawInput);
-        const data = await this.resolver({ ...opts, ctx, input });
+        const rawOutput = await this.resolver({ ...opts, ctx, input });
+        const data = await this.parseOutput(rawOutput);
         return {
           marker: middlewareMarker,
           ok: true,
@@ -178,7 +205,7 @@ export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
       throw result.error;
     }
 
-    return result.data as TOutput;
+    return result.data as TFinalOutput;
   }
 
   /**
@@ -189,12 +216,15 @@ export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
     middlewares: MiddlewareFunction<TInputContext, TContext>[],
   ): this {
     const Constructor: {
-      new (opts: ProcedureOptions<TContext, TParsedInput, TOutput>): Procedure<
+      new (
+        opts: ProcedureOptions<TContext, TParsedInput, TOutput, TFinalOutput>,
+      ): Procedure<
         TInputContext,
         TContext,
         TInput,
         TParsedInput,
-        TOutput
+        TOutput,
+        TParsedOutput
       >;
     } = (this as any).constructor;
 
@@ -202,27 +232,35 @@ export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
       middlewares: [...middlewares, ...this.middlewares],
       resolver: this.resolver,
       inputParser: this.inputParser,
+      outputParser: this.outputParser,
     });
 
     return instance as any;
   }
 }
 
-export type CreateProcedureWithInput<TContext, TInput, TParsedInput, TOutput> =
-  {
-    input: ProcedureInputParser<TInput>;
-    resolve: ProcedureResolver<TContext, TParsedInput, TOutput>;
-  };
+export type CreateProcedureWithInput<TContext, TInput, TOutput> = {
+  input: ProcedureParser<TInput>;
+  output?: ProcedureParser<TOutput>;
+  resolve: ProcedureResolver<TContext, TInput, TOutput>;
+};
+
 export type CreateProcedureWithInputOutputParser<
   TContext,
   TInput,
   TParsedInput,
   TOutput,
+  TParsedOutput,
 > = {
-  input: ProcedureInputParserWithInputOutput<TInput, TParsedInput>;
+  input: ProcedureParserWithInputOutput<TInput, TParsedInput>;
+  output?: ProcedureParserWithInputOutput<TOutput, TParsedOutput>;
   resolve: ProcedureResolver<TContext, TParsedInput, TOutput>;
 };
-export type CreateProcedureWithoutInput<TContext, TOutput> = {
+
+export type CreateProcedureWithoutInput<TContext, TOutput, TParsedOutput> = {
+  output?:
+    | ProcedureParserWithInputOutput<TOutput, TParsedOutput>
+    | ProcedureParser<TOutput>;
   resolve: ProcedureResolver<TContext, undefined, TOutput>;
 };
 
@@ -231,19 +269,33 @@ export type CreateProcedureOptions<
   TInput = undefined,
   TParsedInput = undefined,
   TOutput = undefined,
+  TParsedOutput = undefined,
 > =
-  | CreateProcedureWithInput<TContext, TInput, TParsedInput, TOutput>
   | CreateProcedureWithInputOutputParser<
       TContext,
       TInput,
       TParsedInput,
-      TOutput
+      TOutput,
+      TParsedOutput
     >
-  | CreateProcedureWithoutInput<TContext, TOutput>;
+  | CreateProcedureWithInput<TContext, TInput, TOutput>
+  | CreateProcedureWithoutInput<TContext, TOutput, TParsedOutput>;
 
-export function createProcedure<TContext, TInput, TParsedInput, TOutput>(
-  opts: CreateProcedureOptions<TContext, TInput, TParsedInput, TOutput>,
-): Procedure<unknown, TContext, TInput, TParsedInput, TOutput> {
+export function createProcedure<
+  TContext,
+  TInput,
+  TParsedInput,
+  TOutput,
+  TParsedOutput,
+>(
+  opts: CreateProcedureOptions<
+    TContext,
+    TInput,
+    TParsedInput,
+    TOutput,
+    TParsedOutput
+  >,
+): Procedure<unknown, TContext, TInput, TParsedInput, TOutput, TParsedOutput> {
   const inputParser =
     'input' in opts
       ? opts.input
@@ -257,27 +309,35 @@ export function createProcedure<TContext, TInput, TParsedInput, TOutput>(
           return undefined;
         };
 
+  const outputParser =
+    'output' in opts && opts.output
+      ? opts.output
+      : (output: unknown) => output as TOutput;
+
   return new Procedure({
     inputParser: inputParser as any,
     resolver: opts.resolve as any,
     middlewares: [],
+    outputParser: outputParser as any,
   });
 }
 
 export type inferProcedureFromOptions<
   TInputContext,
-  TOptions extends CreateProcedureOptions<any, any, any, any>,
+  TOptions extends CreateProcedureOptions<any, any, any, any, any>,
 > = TOptions extends CreateProcedureOptions<
   infer TContext,
   infer TInput,
   infer TParsedInput,
-  infer TOutput
+  infer TOutput,
+  infer TParsedOutput
 >
   ? Procedure<
       TInputContext,
       TContext,
       unknown extends TInput ? undefined : TInput,
       unknown extends TParsedInput ? undefined : TParsedInput,
-      TOutput
+      TOutput,
+      TParsedOutput
     >
   : never;

package/src/router.ts

@@ -1,17 +1,19 @@
 /* eslint-disable @typescript-eslint/ban-types */
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { TRPCError } from './TRPCError';
 import { assertNotBrowser } from './assertNotBrowser';
 import { getHTTPStatusCodeFromError } from './http/internals/getHTTPStatusCode';
 import { MiddlewareFunction } from './internals/middlewares';
 import {
-  createProcedure,
   CreateProcedureOptions,
   CreateProcedureWithInput,
   CreateProcedureWithInputOutputParser,
   CreateProcedureWithoutInput,
-  inferProcedureFromOptions,
   Procedure,
   ProcedureCallOptions,
+  createProcedure,
+  inferProcedureFromOptions,
 } from './internals/procedure';
 import {
   TRPCErrorShape,
@@ -21,8 +23,7 @@ import {
 } from './rpc';
 import { Subscription } from './subscription';
 import { CombinedDataTransformer, DataTransformerOptions } from './transformer';
-import { TRPCError } from './TRPCError';
-import { flatten, Prefixer, ThenArg } from './types';
+import { Prefixer, ThenArg, flatten } from './types';
 
 assertNotBrowser();
 
@@ -40,17 +41,25 @@ export type ProcedureRecord<
   TInput = any,
   TParsedInput = any,
   TOutput = any,
+  TParsedOutput = any,
 > = Record<
   string,
-  Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput>
+  Procedure<
+    TInputContext,
+    TContext,
+    TInput,
+    TParsedInput,
+    TOutput,
+    TParsedOutput
+  >
 >;
 
 /**
  * @public
  */
 export type inferProcedureInput<
-  TProcedure extends Procedure<any, any, any, any, any>,
-> = TProcedure extends Procedure<any, any, infer Input, any, any>
+  TProcedure extends Procedure<any, any, any, any, any, any>,
+> = TProcedure extends Procedure<any, any, infer Input, any, any, any>
   ? undefined extends Input
     ? Input | null | void // void is necessary to allow procedures with nullish input to be called without an input
     : Input
@@ -66,7 +75,7 @@ export type inferAsyncReturnType<TFunction extends (...args: any) => any> =
  * @public
  */
 export type inferProcedureOutput<
-  TProcedure extends Procedure<any, any, any, any, any>,
+  TProcedure extends Procedure<any, any, any, any, any, any>,
 > = inferAsyncReturnType<TProcedure['call']>;
 
 /**
@@ -94,8 +103,8 @@ function getDataTransformer(
  * @internal
  */
 export type inferHandlerInput<
-  TProcedure extends Procedure<any, any, any, any, any>,
-> = TProcedure extends Procedure<any, any, infer TInput, any, any>
+  TProcedure extends Procedure<any, any, any, any, any, any>,
+> = TProcedure extends Procedure<any, any, infer TInput, any, any, any>
   ? undefined extends TInput // ? is input optional
     ? unknown extends TInput // ? is input unset
       ? [(null | undefined)?] // -> there is no input
@@ -205,7 +214,7 @@ const defaultTransformer: CombinedDataTransformer = {
 };
 
 type SwapProcedureContext<
-  TProcedure extends Procedure<any, any, any, any, any>,
+  TProcedure extends Procedure<any, any, any, any, any, any>,
   TNewContext,
 > = TProcedure extends Procedure<
   infer TInputContext,
@@ -213,13 +222,21 @@ type SwapProcedureContext<
   infer _TOldContext,
   infer TInput,
   infer TParsedInput,
-  infer TOutput
+  infer TOutput,
+  infer TParsedOutput
 >
-  ? Procedure<TInputContext, TNewContext, TInput, TParsedInput, TOutput>
+  ? Procedure<
+      TInputContext,
+      TNewContext,
+      TInput,
+      TParsedInput,
+      TOutput,
+      TParsedOutput
+    >
   : never;
 
 type SwapContext<
-  TObj extends ProcedureRecord<any, any, any, any>,
+  TObj extends ProcedureRecord<any, any, any, any, any, any>,
   TNewContext,
 > = {
   [P in keyof TObj]: SwapProcedureContext<TObj[P], TNewContext>;
@@ -231,13 +248,22 @@ type SwapContext<
 export class Router<
   TInputContext,
   TContext,
-  TQueries extends ProcedureRecord<TInputContext, TContext>,
-  TMutations extends ProcedureRecord<TInputContext, TContext>,
+  TQueries extends ProcedureRecord<TInputContext, TContext, any, any, any, any>,
+  TMutations extends ProcedureRecord<
+    TInputContext,
+    TContext,
+    any,
+    any,
+    any,
+    any
+  >,
   TSubscriptions extends ProcedureRecord<
     TInputContext,
     TContext,
     unknown,
-    Subscription<unknown>
+    unknown,
+    Subscription<unknown>,
+    unknown
   >,
   TErrorShape extends TRPCErrorShape<number>,
 > {
@@ -279,13 +305,20 @@ export class Router<
     return eps as any;
   }
 
-  public query<TPath extends string, TInput, TParsedInput, TOutput>(
+  public query<
+    TPath extends string,
+    TInput,
+    TParsedInput,
+    TOutput,
+    TParsedOutput,
+  >(
     path: TPath,
     procedure: CreateProcedureWithInputOutputParser<
       TContext,
       TInput,
       TParsedInput,
-      TOutput
+      TOutput,
+      TParsedOutput
     >,
   ): Router<
     TInputContext,
@@ -296,9 +329,10 @@ export class Router<
     TSubscriptions,
     TErrorShape
   >;
+
   public query<TPath extends string, TInput, TOutput>(
     path: TPath,
-    procedure: CreateProcedureWithInput<TContext, TInput, TInput, TOutput>,
+    procedure: CreateProcedureWithInput<TContext, TInput, TOutput>,
   ): Router<
     TInputContext,
     TContext,
@@ -309,9 +343,9 @@ export class Router<
     TErrorShape
   >;
 
-  public query<TPath extends string, TOutput>(
+  public query<TPath extends string, TOutput, TParsedOutput>(
     path: TPath,
-    procedure: CreateProcedureWithoutInput<TContext, TOutput>,
+    procedure: CreateProcedureWithoutInput<TContext, TOutput, TParsedOutput>,
   ): Router<
     TInputContext,
     TContext,
@@ -324,7 +358,7 @@ export class Router<
 
   query(
     path: string,
-    procedure: CreateProcedureOptions<TContext, any, any, any>,
+    procedure: CreateProcedureOptions<TContext, any, any, any, any>,
   ) {
     const router = new Router<TContext, TContext, any, {}, {}, any>({
       queries: safeObject({
@@ -335,13 +369,20 @@ export class Router<
     return this.merge(router);
   }
 
-  public mutation<TPath extends string, TInput, TParsedInput, TOutput>(
+  public mutation<
+    TPath extends string,
+    TInput,
+    TParsedInput,
+    TOutput,
+    TParsedOutput,
+  >(
     path: TPath,
     procedure: CreateProcedureWithInputOutputParser<
       TContext,
       TInput,
       TParsedInput,
-      TOutput
+      TOutput,
+      TParsedOutput
     >,
   ): Router<
     TInputContext,
@@ -352,9 +393,10 @@ export class Router<
     TSubscriptions,
     TErrorShape
   >;
+
   public mutation<TPath extends string, TInput, TOutput>(
     path: TPath,
-    procedure: CreateProcedureWithInput<TContext, TInput, TInput, TOutput>,
+    procedure: CreateProcedureWithInput<TContext, TInput, TOutput>,
   ): Router<
     TInputContext,
     TContext,
@@ -365,9 +407,9 @@ export class Router<
     TErrorShape
   >;
 
-  public mutation<TPath extends string, TOutput>(
+  public mutation<TPath extends string, TOutput, TParsedOutput>(
     path: TPath,
-    procedure: CreateProcedureWithoutInput<TContext, TOutput>,
+    procedure: CreateProcedureWithoutInput<TContext, TOutput, TParsedOutput>,
   ): Router<
     TInputContext,
     TContext,
@@ -380,7 +422,7 @@ export class Router<
 
   public mutation(
     path: string,
-    procedure: CreateProcedureOptions<TContext, any, any, any>,
+    procedure: CreateProcedureOptions<TContext, any, any, any, any>,
   ) {
     const router = new Router<TContext, TContext, {}, any, {}, any>({
       mutations: safeObject({
@@ -401,11 +443,15 @@ export class Router<
     TOutput extends Subscription<unknown>,
   >(
     path: TPath,
-    procedure: CreateProcedureWithInputOutputParser<
-      TContext,
-      TInput,
-      TParsedInput,
-      TOutput
+    procedure: Omit<
+      CreateProcedureWithInputOutputParser<
+        TContext,
+        TInput,
+        TParsedInput,
+        TOutput,
+        unknown
+      >,
+      'output'
     >,
   ): Router<
     TInputContext,
@@ -426,7 +472,10 @@ export class Router<
     TOutput extends Subscription<unknown>,
   >(
     path: TPath,
-    procedure: CreateProcedureWithInput<TContext, TInput, TInput, TOutput>,
+    procedure: Omit<
+      CreateProcedureWithInput<TContext, TInput, TOutput>,
+      'output'
+    >,
   ): Router<
     TInputContext,
     TContext,
@@ -445,7 +494,10 @@ export class Router<
     TOutput extends Subscription<unknown>,
   >(
     path: TPath,
-    procedure: CreateProcedureWithoutInput<TContext, TOutput>,
+    procedure: Omit<
+      CreateProcedureWithoutInput<TContext, TOutput, unknown>,
+      'output'
+    >,
   ): Router<
     TInputContext,
     TContext,
@@ -458,7 +510,10 @@ export class Router<
 
   public subscription(
     path: string,
-    procedure: CreateProcedureOptions<TContext, any, any, any>,
+    procedure: Omit<
+      CreateProcedureOptions<TContext, any, any, any, any>,
+      'output'
+    >,
   ) {
     const router = new Router<TContext, TContext, {}, {}, any, any>({
       subscriptions: safeObject({
@@ -577,7 +632,7 @@ export class Router<
     const defTarget = PROCEDURE_DEFINITION_MAP[type];
     const defs = this._def[defTarget];
     const procedure = defs[path] as
-      | Procedure<TInputContext, TContext, any, any, any>
+      | Procedure<TInputContext, TContext, any, any, any, any>
       | undefined;
 
     if (!procedure) {
@@ -740,31 +795,6 @@ export class Router<
   }
 }
 
-/**
- * Subclass of `VNextRouter` with `TInputContext` and `TContext` set to the same type, for backcompat.
- *
- * @deprecated
- */
-export class LegacyRouter<
-  TContext,
-  TQueries extends ProcedureRecord<TContext, TContext>,
-  TMutations extends ProcedureRecord<TContext, TContext>,
-  TSubscriptions extends ProcedureRecord<
-    TContext,
-    TContext,
-    unknown,
-    Subscription<unknown>
-  >,
-  TErrorShape extends TRPCErrorShape<number>,
-> extends Router<
-  TContext,
-  TContext,
-  TQueries,
-  TMutations,
-  TSubscriptions,
-  TErrorShape
-> {}
-
 export function router<TContext>() {
   return new Router<TContext, TContext, {}, {}, {}, DefaultErrorShape>();
 }

package/src/subscription.ts

@@ -147,7 +147,7 @@ export function subscriptionPullFactory<TOutput>(opts: {
   }
 
   return new Subscription<TOutput>((emit) => {
-    _pull(emit);
+    _pull(emit).catch((err) => emit.error(getErrorFromUnknown(err)));
     return () => {
       clearTimeout(timer);
       stopped = true;