@trpc/server 9.20.2 → 9.22.0

package/dist/trpc-server.esm.js

@@ -1,10 +1,10 @@
-import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-85f3f5df.esm.js';
-export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-85f3f5df.esm.js';
-export { S as Subscription, s as subscriptionPullFactory } from './subscription-fbda2888.esm.js';
-import { T as TRPCError, g as getErrorFromUnknown } from './transformTRPCResponse-f73dc4a2.esm.js';
-export { T as TRPCError } from './transformTRPCResponse-f73dc4a2.esm.js';
+import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-12cc3012.esm.js';
+export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-12cc3012.esm.js';
+export { S as Subscription, s as subscriptionPullFactory } from './subscription-2ea469a3.esm.js';
+import { T as TRPCError, g as getErrorFromUnknown } from './transformTRPCResponse-45c225c3.esm.js';
+export { T as TRPCError } from './transformTRPCResponse-45c225c3.esm.js';
 import { createHTTPServer, createHTTPHandler } from '../adapters/standalone/dist/trpc-server-adapters-standalone.esm.js';
-import { n as nodeHTTPRequestHandler } from './nodeHTTPRequestHandler-d00c1126.esm.js';
+import { n as nodeHTTPRequestHandler } from './nodeHTTPRequestHandler-87105aef.esm.js';
 import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-fe07bf82.esm.js';
 import 'events';
 import 'http';
@@ -30,6 +30,7 @@ const createHttpHandler = createHTTPHandler;
 /**
  * @deprecated use `nodeHTTPRequestHandler` from `@trpc/server/adapters/node-http`
  */
+
 const requestHandler = nodeHTTPRequestHandler;
 /**
  * @deprecated use `NodeHTTPCreateContextFn` from `@trpc/server/adapters/node-http`
@@ -59,31 +60,31 @@ async function wrapCallSafe(fn) {
 /* eslint-disable @typescript-eslint/no-explicit-any */
 assertNotBrowser();
 
-function getParseFn(inputParser) {
-  const parser = inputParser;
+function getParseFn(procedureParser) {
+  const parser = procedureParser;
 
   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);
   }
 
@@ -99,16 +100,22 @@ class Procedure {
     this.middlewares = void 0;
     this.resolver = void 0;
     this.inputParser = void 0;
-    this.parse = void 0;
+    this.parseInputFn = void 0;
+    this.outputParser = void 0;
+    this.parseOutputFn = void 0;
+    this.meta = void 0;
     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;
   }
 
   async parseInput(rawInput) {
     try {
-      return await this.parse(rawInput);
+      return await this.parseInputFn(rawInput);
     } catch (cause) {
       throw new TRPCError({
         code: 'BAD_REQUEST',
@@ -116,8 +123,20 @@ class Procedure {
       });
     }
   }
+
+  async parseOutput(rawOutput) {
+    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
    */
 
@@ -128,10 +147,11 @@ class Procedure {
       ctx
     }) => {
       const input = await this.parseInput(opts.rawInput);
-      const data = await this.resolver({ ...opts,
+      const rawOutput = await this.resolver({ ...opts,
         ctx,
         input
       });
+      const data = await this.parseOutput(rawOutput);
       return {
         marker: middlewareMarker,
         ok: true,
@@ -147,6 +167,7 @@ class Procedure {
           type: opts.type,
           path: opts.path,
           rawInput: opts.rawInput,
+          meta: this.meta,
           next: nextFns[index + 1]
         }));
 
@@ -188,7 +209,9 @@ class Procedure {
     const instance = new Constructor({
       middlewares: [...middlewares, ...this.middlewares],
       resolver: this.resolver,
-      inputParser: this.inputParser
+      inputParser: this.inputParser,
+      outputParser: this.outputParser,
+      meta: this.meta
     });
     return instance;
   }
@@ -205,10 +228,13 @@ function createProcedure(opts) {
 
     return undefined;
   };
+  const outputParser = 'output' in opts && opts.output ? opts.output : output => output;
   return new Procedure({
     inputParser: inputParser,
     resolver: opts.resolve,
-    middlewares: []
+    middlewares: [],
+    outputParser: outputParser,
+    meta: opts.meta
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "9.20.2",
+  "version": "9.22.0",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -70,8 +70,5 @@
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "502ed037d974cdc25a922a596fc05b16fa9ae2e5",
-  "dependencies": {
-    "tslib": "^2.1.0"
-  }
+  "gitHead": "471a69c2d6997b8d5dfa1887fd62b24ada31a4d3"
 }

package/src/TRPCError.ts

@@ -1,5 +1,5 @@
-import { TRPC_ERROR_CODE_KEY } from './rpc/codes';
 import { getMessageFromUnkownError } from './internals/errors';
+import { TRPC_ERROR_CODE_KEY } from './rpc/codes';
 
 export class TRPCError extends Error {
   /**

package/src/adapters/express.ts

@@ -15,10 +15,10 @@ export type CreateExpressContextOptions = NodeHTTPCreateContextFnOptions<
 export function createExpressMiddleware<TRouter extends AnyRouter>(
   opts: NodeHTTPHandlerOptions<TRouter, express.Request, express.Response>,
 ): express.Handler {
-  return (req, res) => {
+  return async (req, res) => {
     const endpoint = req.path.slice(1);
 
-    nodeHTTPRequestHandler({
+    await nodeHTTPRequestHandler({
       ...opts,
       req,
       res,

package/src/adapters/fastify/fastifyRequestHandler.ts

@@ -1,13 +1,13 @@
-import { URLSearchParams } from 'url';
 import { FastifyReply, FastifyRequest } from 'fastify';
+import { URLSearchParams } from 'url';
 import { assertNotBrowser } from '../../assertNotBrowser';
-import { NodeHTTPCreateContextOption } from '../node-http';
-import { AnyRouter, inferRouterContext } from '../../router';
-import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
 import {
   HTTPBaseHandlerOptions,
   HTTPRequest,
 } from '../../http/internals/types';
+import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import { AnyRouter, inferRouterContext } from '../../router';
+import { NodeHTTPCreateContextOption } from '../node-http';
 
 assertNotBrowser();
 
@@ -67,13 +67,12 @@ export async function fastifyRequestHandler<
   if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
     res.statusCode = result.status;
   }
-
   for (const [key, value] of Object.entries(result.headers ?? {})) {
     if (typeof value === 'undefined') {
       continue;
     }
-    res.header(key, value);
-  }
 
-  res.send(result.body);
+    void res.header(key, value);
+  }
+  await res.send(result.body);
 }

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -1,10 +1,10 @@
 /// <reference types="fastify-websocket" />
 import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
-import { fastifyRequestHandler } from './fastifyRequestHandler';
-import { NodeHTTPCreateContextFnOptions } from '../node-http';
-import { applyWSSHandler, WSSHandlerOptions } from '../ws';
 import { FastifyHandlerOptions } from '.';
 import { AnyRouter } from '../..';
+import { NodeHTTPCreateContextFnOptions } from '../node-http';
+import { WSSHandlerOptions, applyWSSHandler } from '../ws';
+import { fastifyRequestHandler } from './fastifyRequestHandler';
 
 export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
   prefix?: string;
@@ -30,9 +30,17 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
     },
   );
 
-  fastify.all(`${opts.prefix ?? ''}/:path`, (req, res) => {
+  let prefix = opts.prefix ?? '';
+
+  // https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
+  // @ts-expect-error property 'default' does not exists on type ...
+  if (typeof fastifyTRPCPlugin.default !== 'function') {
+    prefix = ''; // handled by fastify internally
+  }
+
+  fastify.all(`${prefix}/:path`, async (req, res) => {
     const path = (req.params as any).path;
-    fastifyRequestHandler({ ...opts.trpcOptions, req, res, path });
+    await fastifyRequestHandler({ ...opts.trpcOptions, req, res, path });
   });
 
   if (opts.useWSS) {
@@ -41,7 +49,7 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
       wss: fastify.websocketServer,
     });
     // eslint-disable-next-line @typescript-eslint/no-empty-function
-    fastify.get(opts.prefix ?? '/', { websocket: true }, () => {});
+    fastify.get(prefix ?? '/', { websocket: true }, () => {});
   }
 
   done();

package/src/adapters/next.ts

@@ -1,9 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-import type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next';
+import type {
+  NextApiHandler,
+  NextApiRequest,
+  NextApiResponse,
+} from 'next/types';
+import { TRPCError } from '../TRPCError';
 import { AnyRouter } from '../router';
 import { TRPCErrorResponse } from '../rpc';
-import { TRPCError } from '../TRPCError';
 import { nodeHTTPRequestHandler } from './node-http';
 import {
   NodeHTTPCreateContextFnOptions,

package/src/adapters/node-http/internals/getPostBody.test.ts

@@ -1,5 +1,6 @@
-import { getPostBody } from './getPostBody';
 import { EventEmitter } from 'events';
+import { getPostBody } from './getPostBody';
+
 test('has body', async () => {
   const body = {};
   const resolvedBody = await getPostBody({ req: { body } } as any);

package/src/adapters/node-http/nodeHTTPRequestHandler.ts

@@ -1,15 +1,15 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { URLSearchParams } from 'url';
 import { assertNotBrowser } from '../../assertNotBrowser';
+import { HTTPRequest } from '../../http/internals/types';
+import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
+import { AnyRouter, inferRouterContext } from '../../router';
+import { getPostBody } from './internals/getPostBody';
 import {
+  NodeHTTPHandlerOptions,
   NodeHTTPRequest,
   NodeHTTPResponse,
-  NodeHTTPHandlerOptions,
 } from './types';
-import { AnyRouter, inferRouterContext } from '../../router';
-import { getPostBody } from './internals/getPostBody';
-import { HTTPRequest } from '../../http/internals/types';
-import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
 
 assertNotBrowser();
 

package/src/adapters/standalone.ts

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import http from 'http';
 import url from 'url';

package/src/adapters/ws.ts

@@ -1,10 +1,11 @@
 import http from 'http';
 import ws from 'ws';
+import { TRPCError } from '../TRPCError';
 import { BaseHandlerOptions } from '../internals/BaseHandlerOptions';
 import { callProcedure } from '../internals/callProcedure';
 import { getErrorFromUnknown } from '../internals/errors';
 import { transformTRPCResponse } from '../internals/transformTRPCResponse';
-import { AnyRouter, inferRouterContext, ProcedureType } from '../router';
+import { AnyRouter, ProcedureType, inferRouterContext } from '../router';
 import {
   TRPCErrorResponse,
   TRPCReconnectNotification,
@@ -13,7 +14,6 @@ import {
 } from '../rpc';
 import { Subscription } from '../subscription';
 import { CombinedDataTransformer } from '../transformer';
-import { TRPCError } from '../TRPCError';
 import { NodeHTTPCreateContextOption } from './node-http';
 
 /* istanbul ignore next */
@@ -96,7 +96,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
   const { wss, createContext, router } = opts;
 
   const { transformer } = router._def;
-  wss.on('connection', (client, req) => {
+  wss.on('connection', async (client, req) => {
     const clientSubscriptions = new Map<
       number | string,
       Subscription<TRouter>
@@ -285,7 +285,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
         });
       }
     }
-    createContextAsync();
+    await createContextAsync();
   });
 
   return {

package/src/deprecated/createHttpServer.ts

@@ -1,9 +1,9 @@
 // this has been moved to separate package
 import {
-  createHTTPHandler,
+  CreateHTTPContextOptions,
   CreateHTTPHandlerOptions,
+  createHTTPHandler,
   createHTTPServer,
-  CreateHTTPContextOptions,
 } from '../adapters/standalone';
 import { AnyRouter } from '../router';
 

package/src/deprecated/requestHandler.ts

@@ -1,9 +1,9 @@
+import type { AnyRouter } from '../';
 import {
-  nodeHTTPRequestHandler as requestHandlerInner,
   NodeHTTPCreateContextFn,
   NodeHTTPCreateContextFnOptions,
+  nodeHTTPRequestHandler as requestHandlerInner,
 } from '../adapters/node-http';
-import type { AnyRouter } from '../';
 
 /**
  * @deprecated use `nodeHTTPRequestHandler` from `@trpc/server/adapters/node-http`

package/src/http/internals/getHTTPStatusCode.ts

@@ -1,6 +1,6 @@
-import { TRPCResponse, TRPC_ERROR_CODES_BY_KEY } from '../../rpc';
 import { TRPCError } from '../../TRPCError';
 import { invert } from '../../internals/invert';
+import { TRPCResponse, TRPC_ERROR_CODES_BY_KEY } from '../../rpc';
 
 export const TRPC_ERROR_CODES_BY_NUMBER = invert(TRPC_ERROR_CODES_BY_KEY);
 type ValueOf<T> = T[keyof T];

package/src/http/internals/types.ts

@@ -1,11 +1,11 @@
 import {
   AnyRouter,
   Dict,
-  inferRouterContext,
-  inferRouterError,
   ProcedureType,
   ResponseMeta,
   TRPCError,
+  inferRouterContext,
+  inferRouterError,
 } from '@trpc/server';
 import { URLSearchParams } from 'url';
 import { BaseHandlerOptions } from '../../internals/BaseHandlerOptions';

package/src/http/resolveHTTPResponse.ts

@@ -1,22 +1,22 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { Maybe } from '@trpc/server';
+import { TRPCError } from '../TRPCError';
 import { callProcedure } from '../internals/callProcedure';
 import { getErrorFromUnknown } from '../internals/errors';
 import { transformTRPCResponse } from '../internals/transformTRPCResponse';
 import {
   AnyRouter,
+  ProcedureType,
   inferRouterContext,
   inferRouterError,
-  ProcedureType,
 } from '../router';
 import { TRPCErrorResponse, TRPCResponse, TRPCResultResponse } from '../rpc';
-import { TRPCError } from '../TRPCError';
 import { getHTTPStatusCode } from './internals/getHTTPStatusCode';
 import {
+  HTTPBaseHandlerOptions,
   HTTPHeaders,
   HTTPRequest,
   HTTPResponse,
-  HTTPBaseHandlerOptions,
 } from './internals/types';
 
 const HTTP_METHOD_PROCEDURE_TYPE_MAP: Record<

package/src/internals/BaseHandlerOptions.ts

@@ -1,5 +1,5 @@
-import { OnErrorFunction } from './OnErrorFunction';
 import { AnyRouter } from '../router';
+import { OnErrorFunction } from './OnErrorFunction';
 
 /**
  * Base interface for any response handler

package/src/internals/OnErrorFunction.ts

@@ -1,5 +1,5 @@
-import { AnyRouter, inferRouterContext, ProcedureType } from '../router';
 import { TRPCError } from '../TRPCError';
+import { AnyRouter, ProcedureType, inferRouterContext } from '../router';
 
 export type OnErrorFunction<TRouter extends AnyRouter, TRequest> = (opts: {
   error: TRPCError;

package/src/internals/middlewares.ts

@@ -1,5 +1,5 @@
-import { ProcedureType } from '../router';
 import { TRPCError } from '../TRPCError';
+import { ProcedureType } from '../router';
 
 export const middlewareMarker = Symbol('middlewareMarker');
 interface MiddlewareResultBase<TContext> {
@@ -27,11 +27,12 @@ export type MiddlewareResult<TContext> =
   | MiddlewareOKResult<TContext>
   | MiddlewareErrorResult<TContext>;
 
-export type MiddlewareFunction<TInputContext, TContext> = (opts: {
+export type MiddlewareFunction<TInputContext, TContext, TMeta> = (opts: {
   ctx: TInputContext;
   type: ProcedureType;
   path: string;
   rawInput: unknown;
+  meta?: TMeta;
   next: {
     (): Promise<MiddlewareResult<TInputContext>>;
     <T>(opts: { ctx: T }): Promise<MiddlewareResult<T>>;