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

package/src/internals/procedure.ts

@@ -1,51 +1,59 @@
 /* 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';
+import { InferLast } from '../types';
+import { getCauseFromUnknown, getErrorFromUnknown } from './errors';
+import {
+  MiddlewareFunction,
+  MiddlewareResult,
+  middlewareMarker,
+} from './middlewares';
+
 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 ProcedureResolver<TContext, TParsedInput, TOutput> = (opts: {
+export type ProcedureParser<T> =
+  | ProcedureParserYupEsque<T>
+  | ProcedureParserSuperstructEsque<T>
+  | ProcedureParserCustomValidatorEsque<T>
+  | ProcedureParserMyZodEsque<T>;
+
+export type ProcedureResolver<TContext, TInput, TOutput> = (opts: {
   ctx: TContext;
-  input: TParsedInput;
+  input: TInput;
   type: ProcedureType;
 }) => Promise<TOutput> | TOutput;
 
-interface ProcedureOptions<TContext, TParsedInput, TOutput> {
-  middlewares: Array<MiddlewareFunction<any, any>>;
-  resolver: ProcedureResolver<TContext, TParsedInput, TOutput>;
-  inputParser: ProcedureInputParser<TParsedInput>;
+interface ProcedureOptions<TContext, TMeta, TInput, TOutput, TParsedOutput> {
+  middlewares: Array<MiddlewareFunction<any, any, any>>;
+  resolver: ProcedureResolver<TContext, TInput, TOutput>;
+  inputParser: ProcedureParser<TInput>;
+  outputParser: ProcedureParser<TParsedOutput>;
+  meta: TMeta;
 }
 
 /**
@@ -58,36 +66,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,42 +102,82 @@ function getParseFn<TParsedInput>(
 /**
  * @internal
  */
-export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
-  private middlewares: Readonly<Array<MiddlewareFunction<any, any>>>;
+export class Procedure<
+  TInputContext,
+  TContext,
+  TMeta,
+  TInput,
+  TParsedInput,
+  TOutput,
+  TParsedOutput,
+  TFinalOutput = unknown extends TParsedOutput ? TOutput : TParsedOutput,
+> {
+  private middlewares: Readonly<Array<MiddlewareFunction<any, 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>;
+  public readonly meta: TMeta;
 
-  constructor(opts: ProcedureOptions<TContext, TParsedInput, TOutput>) {
+  constructor(
+    opts: ProcedureOptions<
+      TContext,
+      TMeta,
+      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);
+    this.meta = opts.meta;
   }
 
   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',
-        cause,
+        cause: getCauseFromUnknown(cause),
+      });
+    }
+  }
+
+  private async parseOutput(rawOutput: TOutput): Promise<TFinalOutput> {
+    try {
+      return await this.parseOutputFn(rawOutput);
+    } catch (cause) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        cause: getCauseFromUnknown(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 }) => {
+      async ({ ctx }: { ctx: any }) => {
         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,
@@ -142,30 +187,40 @@ export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
       },
     ]);
 
-    // create `next()` calls in resolvers
-    const nextFns = middlewaresWithResolver.map((fn, index) => {
-      return async (nextOpts?: { ctx: TContext }) => {
-        const res = await wrapCallSafe(() =>
-          fn({
-            ctx: nextOpts ? nextOpts.ctx : opts.ctx,
-            type: opts.type,
-            path: opts.path,
-            rawInput: opts.rawInput,
-            next: nextFns[index + 1],
-          }),
-        );
-        if (res.ok) {
-          return res.data;
-        }
+    // run the middlewares recursively with the resolver as the last one
+    const callRecursive = async (
+      callOpts: { ctx: any; index: number } = {
+        index: 0,
+        ctx: opts.ctx,
+      },
+    ): Promise<MiddlewareResult<any>> => {
+      try {
+        const result = await middlewaresWithResolver[callOpts.index]({
+          ctx: callOpts.ctx,
+          type: opts.type,
+          path: opts.path,
+          rawInput: opts.rawInput,
+          meta: this.meta,
+          next: async (nextOpts?: { ctx: any }) => {
+            return await callRecursive({
+              index: callOpts.index + 1,
+              ctx: nextOpts ? nextOpts.ctx : callOpts.ctx,
+            });
+          },
+        });
+        return result;
+      } catch (cause) {
         return {
-          ok: false as const,
-          error: getErrorFromUnknown(res.error),
+          ctx: callOpts.ctx,
+          ok: false,
+          error: getErrorFromUnknown(cause),
+          marker: middlewareMarker,
         };
-      };
-    });
+      }
+    };
 
     // there's always at least one "next" since we wrap this.resolver in a middleware
-    const result = await nextFns[0]();
+    const result = await callRecursive();
     if (!result) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -178,7 +233,7 @@ export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
       throw result.error;
     }
 
-    return result.data as TOutput;
+    return result.data as TFinalOutput;
   }
 
   /**
@@ -186,15 +241,25 @@ export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
    * @param middlewares
    */
   public inheritMiddlewares(
-    middlewares: MiddlewareFunction<TInputContext, TContext>[],
+    middlewares: MiddlewareFunction<TInputContext, TContext, TMeta>[],
   ): this {
     const Constructor: {
-      new (opts: ProcedureOptions<TContext, TParsedInput, TOutput>): Procedure<
+      new (
+        opts: ProcedureOptions<
+          TContext,
+          TMeta,
+          TParsedInput,
+          TOutput,
+          TFinalOutput
+        >,
+      ): Procedure<
         TInputContext,
         TContext,
+        TMeta,
         TInput,
         TParsedInput,
-        TOutput
+        TOutput,
+        TParsedOutput
       >;
     } = (this as any).constructor;
 
@@ -202,48 +267,92 @@ export class Procedure<TInputContext, TContext, TInput, TParsedInput, TOutput> {
       middlewares: [...middlewares, ...this.middlewares],
       resolver: this.resolver,
       inputParser: this.inputParser,
+      outputParser: this.outputParser,
+      meta: this.meta,
     });
 
     return instance as any;
   }
 }
 
-export type CreateProcedureWithInput<TContext, TInput, TParsedInput, TOutput> =
-  {
-    input: ProcedureInputParser<TInput>;
-    resolve: ProcedureResolver<TContext, TParsedInput, TOutput>;
-  };
+export type CreateProcedureWithInput<TContext, TMeta, TInput, TOutput> = {
+  input: ProcedureParser<TInput>;
+  output?: ProcedureParser<TOutput>;
+  meta?: TMeta;
+  resolve: ProcedureResolver<TContext, TInput, InferLast<TOutput>>;
+};
+
 export type CreateProcedureWithInputOutputParser<
   TContext,
+  TMeta,
   TInput,
   TParsedInput,
   TOutput,
+  TParsedOutput,
 > = {
-  input: ProcedureInputParserWithInputOutput<TInput, TParsedInput>;
-  resolve: ProcedureResolver<TContext, TParsedInput, TOutput>;
+  input: ProcedureParserWithInputOutput<TInput, TParsedInput>;
+  output?: ProcedureParserWithInputOutput<TOutput, TParsedOutput>;
+  meta?: TMeta;
+  resolve: ProcedureResolver<TContext, TParsedInput, InferLast<TOutput>>;
 };
-export type CreateProcedureWithoutInput<TContext, TOutput> = {
-  resolve: ProcedureResolver<TContext, undefined, TOutput>;
+
+export type CreateProcedureWithoutInput<
+  TContext,
+  TMeta,
+  TOutput,
+  TParsedOutput,
+> = {
+  output?:
+    | ProcedureParserWithInputOutput<TOutput, TParsedOutput>
+    | ProcedureParser<TOutput>;
+  meta?: TMeta;
+  resolve: ProcedureResolver<TContext, undefined, InferLast<TOutput>>;
 };
 
 export type CreateProcedureOptions<
   TContext,
+  TMeta = undefined,
   TInput = undefined,
   TParsedInput = undefined,
   TOutput = undefined,
+  TParsedOutput = undefined,
 > =
-  | CreateProcedureWithInput<TContext, TInput, TParsedInput, TOutput>
   | CreateProcedureWithInputOutputParser<
       TContext,
+      TMeta,
       TInput,
       TParsedInput,
-      TOutput
+      TOutput,
+      TParsedOutput
     >
-  | CreateProcedureWithoutInput<TContext, TOutput>;
+  | CreateProcedureWithInput<TContext, TMeta, TInput, TOutput>
+  | CreateProcedureWithoutInput<TContext, TMeta, 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,
+  TMeta,
+  TInput,
+  TParsedInput,
+  TOutput,
+  TParsedOutput,
+>(
+  opts: CreateProcedureOptions<
+    TContext,
+    TMeta,
+    TInput,
+    TParsedInput,
+    TOutput,
+    TParsedOutput
+  >,
+): Procedure<
+  unknown,
+  TContext,
+  TMeta,
+  TInput,
+  TParsedInput,
+  TOutput,
+  TParsedOutput
+> {
   const inputParser =
     'input' in opts
       ? opts.input
@@ -257,27 +366,38 @@ 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,
+    meta: opts.meta as any,
   });
 }
 
 export type inferProcedureFromOptions<
   TInputContext,
-  TOptions extends CreateProcedureOptions<any, any, any, any>,
+  TOptions extends CreateProcedureOptions<any, any, any, any, any, any>,
 > = TOptions extends CreateProcedureOptions<
   infer TContext,
+  infer TMeta,
   infer TInput,
   infer TParsedInput,
-  infer TOutput
+  infer TOutput,
+  infer TParsedOutput
 >
   ? Procedure<
       TInputContext,
       TContext,
+      TMeta,
       unknown extends TInput ? undefined : TInput,
       unknown extends TParsedInput ? undefined : TParsedInput,
-      TOutput
+      TOutput,
+      TParsedOutput
     >
   : never;

package/src/internals/transformTRPCResponse.ts

@@ -1,33 +1,38 @@
 import { AnyRouter } from '../router';
-import { TRPCResponse } from '../rpc';
+import { TRPCResponse, TRPCResponseMessage } from '../rpc';
 
-function transformTRPCResponseItem(
-  router: AnyRouter,
-  item: TRPCResponse,
-): TRPCResponse {
+function transformTRPCResponseItem<
+  TResponseItem extends TRPCResponse | TRPCResponseMessage,
+>(router: AnyRouter, item: TResponseItem): TResponseItem {
   if ('error' in item) {
     return {
       ...item,
       error: router._def.transformer.output.serialize(item.error),
     };
   }
-  if (item.result.type !== 'data') {
-    return item;
+
+  if ('data' in item.result) {
+    return {
+      ...item,
+      result: {
+        ...item.result,
+        data: router._def.transformer.output.serialize(item.result.data),
+      },
+    };
   }
-  return {
-    ...item,
-    result: {
-      ...item.result,
-      data: router._def.transformer.output.serialize(item.result.data),
-    },
-  };
+
+  return item;
 }
 
 /**
  * Takes a unserialized `TRPCResponse` and serializes it with the router's transformers
  **/
 export function transformTRPCResponse<
-  TResponse extends TRPCResponse | TRPCResponse[],
+  TResponse extends
+    | TRPCResponse
+    | TRPCResponse[]
+    | TRPCResponseMessage
+    | TRPCResponseMessage[],
 >(router: AnyRouter, itemOrItems: TResponse) {
   return Array.isArray(itemOrItems)
     ? itemOrItems.map((item) => transformTRPCResponseItem(router, item))

package/src/observable/index.ts

@@ -0,0 +1,4 @@
+export * from './observable';
+export * from './types';
+export * from './operators';
+export { observableToPromise } from './internals/observableToPromise';

package/src/observable/internals/identity.ts

@@ -0,0 +1,3 @@
+export function identity<T>(x: T): T {
+  return x;
+}

package/src/observable/internals/observableToPromise.ts

@@ -0,0 +1,49 @@
+import { Observable } from '../types';
+
+export class ObservableAbortError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'ObservableAbortError';
+    Object.setPrototypeOf(this, ObservableAbortError.prototype);
+  }
+}
+
+/** @internal */
+export function observableToPromise<TValue>(
+  observable: Observable<TValue, unknown>,
+) {
+  let abort: () => void;
+  const promise = new Promise<TValue>((resolve, reject) => {
+    let isDone = false;
+    function onDone() {
+      if (isDone) {
+        return;
+      }
+      isDone = true;
+      reject(new ObservableAbortError('This operation was cancelled.'));
+      obs$.unsubscribe();
+    }
+    const obs$ = observable.subscribe({
+      next(data) {
+        isDone = true;
+        resolve(data);
+        onDone();
+      },
+      error(data) {
+        isDone = true;
+        reject(data);
+        onDone();
+      },
+      complete() {
+        isDone = true;
+        onDone();
+      },
+    });
+    abort = onDone;
+  });
+  return {
+    promise,
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    abort: abort!,
+  };
+}

package/src/observable/internals/pipe.ts

@@ -0,0 +1,22 @@
+import { UnaryFunction } from '../types';
+import { identity } from './identity';
+
+/** @internal */
+export function pipeFromArray<T, R>(
+  fns: Array<UnaryFunction<T, R>>,
+): UnaryFunction<T, R> {
+  if (fns.length === 0) {
+    return identity as UnaryFunction<any, any>;
+  }
+
+  if (fns.length === 1) {
+    return fns[0];
+  }
+
+  return function piped(input: T): R {
+    return fns.reduce(
+      (prev: any, fn: UnaryFunction<T, R>) => fn(prev),
+      input as any,
+    );
+  };
+}