@trpc/server 9.20.2 → 9.22.0

package/dist/{transformTRPCResponse-8248515e.cjs.dev.js → transformTRPCResponse-1e125b28.cjs.prod.js}

@@ -1,29 +1,33 @@
 'use strict';
 
-async function callProcedure(opts) {
-  const {
-    type,
-    path,
-    input
-  } = opts;
-  const caller = opts.router.createCaller(opts.ctx);
-
-  if (type === 'query') {
-    return caller.query(path, input);
+function getMessageFromUnkownError(err, fallback) {
+  if (typeof err === 'string') {
+    return err;
   }
 
-  if (type === 'mutation') {
-    return caller.mutation(path, input);
+  if (err instanceof Error && typeof err.message === 'string') {
+    return err.message;
   }
 
-  if (type === 'subscription') {
-    const sub = await caller.subscription(path, input);
-    return sub;
+  return fallback;
+}
+function getErrorFromUnknown(cause) {
+  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
+  // ref https://github.com/trpc/trpc/issues/331
+  if (cause instanceof Error && cause.name === 'TRPCError') {
+    return cause;
   }
-  /* istanbul ignore next */
 
+  const err = new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    cause
+  }); // take stack trace from cause
 
-  throw new Error(`Unknown procedure type ${type}`);
+  if (cause instanceof Error) {
+    err.stack = cause.stack;
+  }
+
+  return err;
 }
 
 class TRPCError extends Error {
@@ -52,34 +56,30 @@ class TRPCError extends Error {
 
 }
 
-function getMessageFromUnkownError(err, fallback) {
-  if (typeof err === 'string') {
-    return err;
-  }
+async function callProcedure(opts) {
+  const {
+    type,
+    path,
+    input
+  } = opts;
+  const caller = opts.router.createCaller(opts.ctx);
 
-  if (err instanceof Error && typeof err.message === 'string') {
-    return err.message;
+  if (type === 'query') {
+    return caller.query(path, input);
   }
 
-  return fallback;
-}
-function getErrorFromUnknown(cause) {
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (cause instanceof Error && cause.name === 'TRPCError') {
-    return cause;
+  if (type === 'mutation') {
+    return caller.mutation(path, input);
   }
 
-  const err = new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    cause
-  }); // take stack trace from cause
-
-  if (cause instanceof Error) {
-    err.stack = cause.stack;
+  if (type === 'subscription') {
+    const sub = await caller.subscription(path, input);
+    return sub;
   }
+  /* istanbul ignore next */
 
-  return err;
+
+  throw new Error(`Unknown procedure type ${type}`);
 }
 
 function transformTRPCResponseItem(router, item) {

package/dist/{transformTRPCResponse-f73dc4a2.esm.js → transformTRPCResponse-45c225c3.esm.js}

@@ -1,27 +1,31 @@
-async function callProcedure(opts) {
-  const {
-    type,
-    path,
-    input
-  } = opts;
-  const caller = opts.router.createCaller(opts.ctx);
-
-  if (type === 'query') {
-    return caller.query(path, input);
+function getMessageFromUnkownError(err, fallback) {
+  if (typeof err === 'string') {
+    return err;
   }
 
-  if (type === 'mutation') {
-    return caller.mutation(path, input);
+  if (err instanceof Error && typeof err.message === 'string') {
+    return err.message;
   }
 
-  if (type === 'subscription') {
-    const sub = await caller.subscription(path, input);
-    return sub;
+  return fallback;
+}
+function getErrorFromUnknown(cause) {
+  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
+  // ref https://github.com/trpc/trpc/issues/331
+  if (cause instanceof Error && cause.name === 'TRPCError') {
+    return cause;
   }
-  /* istanbul ignore next */
 
+  const err = new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    cause
+  }); // take stack trace from cause
 
-  throw new Error(`Unknown procedure type ${type}`);
+  if (cause instanceof Error) {
+    err.stack = cause.stack;
+  }
+
+  return err;
 }
 
 class TRPCError extends Error {
@@ -50,34 +54,30 @@ class TRPCError extends Error {
 
 }
 
-function getMessageFromUnkownError(err, fallback) {
-  if (typeof err === 'string') {
-    return err;
-  }
+async function callProcedure(opts) {
+  const {
+    type,
+    path,
+    input
+  } = opts;
+  const caller = opts.router.createCaller(opts.ctx);
 
-  if (err instanceof Error && typeof err.message === 'string') {
-    return err.message;
+  if (type === 'query') {
+    return caller.query(path, input);
   }
 
-  return fallback;
-}
-function getErrorFromUnknown(cause) {
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (cause instanceof Error && cause.name === 'TRPCError') {
-    return cause;
+  if (type === 'mutation') {
+    return caller.mutation(path, input);
   }
 
-  const err = new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    cause
-  }); // take stack trace from cause
-
-  if (cause instanceof Error) {
-    err.stack = cause.stack;
+  if (type === 'subscription') {
+    const sub = await caller.subscription(path, input);
+    return sub;
   }
+  /* istanbul ignore next */
 
-  return err;
+
+  throw new Error(`Unknown procedure type ${type}`);
 }
 
 function transformTRPCResponseItem(router, item) {

package/dist/{transformTRPCResponse-dcbf66c5.cjs.prod.js → transformTRPCResponse-c654ea92.cjs.dev.js}

@@ -1,29 +1,33 @@
 'use strict';
 
-async function callProcedure(opts) {
-  const {
-    type,
-    path,
-    input
-  } = opts;
-  const caller = opts.router.createCaller(opts.ctx);
-
-  if (type === 'query') {
-    return caller.query(path, input);
+function getMessageFromUnkownError(err, fallback) {
+  if (typeof err === 'string') {
+    return err;
   }
 
-  if (type === 'mutation') {
-    return caller.mutation(path, input);
+  if (err instanceof Error && typeof err.message === 'string') {
+    return err.message;
   }
 
-  if (type === 'subscription') {
-    const sub = await caller.subscription(path, input);
-    return sub;
+  return fallback;
+}
+function getErrorFromUnknown(cause) {
+  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
+  // ref https://github.com/trpc/trpc/issues/331
+  if (cause instanceof Error && cause.name === 'TRPCError') {
+    return cause;
   }
-  /* istanbul ignore next */
 
+  const err = new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    cause
+  }); // take stack trace from cause
 
-  throw new Error(`Unknown procedure type ${type}`);
+  if (cause instanceof Error) {
+    err.stack = cause.stack;
+  }
+
+  return err;
 }
 
 class TRPCError extends Error {
@@ -52,34 +56,30 @@ class TRPCError extends Error {
 
 }
 
-function getMessageFromUnkownError(err, fallback) {
-  if (typeof err === 'string') {
-    return err;
-  }
+async function callProcedure(opts) {
+  const {
+    type,
+    path,
+    input
+  } = opts;
+  const caller = opts.router.createCaller(opts.ctx);
 
-  if (err instanceof Error && typeof err.message === 'string') {
-    return err.message;
+  if (type === 'query') {
+    return caller.query(path, input);
   }
 
-  return fallback;
-}
-function getErrorFromUnknown(cause) {
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (cause instanceof Error && cause.name === 'TRPCError') {
-    return cause;
+  if (type === 'mutation') {
+    return caller.mutation(path, input);
   }
 
-  const err = new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    cause
-  }); // take stack trace from cause
-
-  if (cause instanceof Error) {
-    err.stack = cause.stack;
+  if (type === 'subscription') {
+    const sub = await caller.subscription(path, input);
+    return sub;
   }
+  /* istanbul ignore next */
 
-  return err;
+
+  throw new Error(`Unknown procedure type ${type}`);
 }
 
 function transformTRPCResponseItem(router, item) {

package/dist/trpc-server.cjs.dev.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-3867844c.cjs.dev.js');
-var subscription = require('./subscription-b8831081.cjs.dev.js');
-var transformTRPCResponse = require('./transformTRPCResponse-8248515e.cjs.dev.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-780f5cab.cjs.dev.js');
+var subscription = require('./subscription-7de48383.cjs.dev.js');
+var transformTRPCResponse = require('./transformTRPCResponse-c654ea92.cjs.dev.js');
 var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.dev.js');
-var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-2cc444d8.cjs.dev.js');
+var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-620da2b7.cjs.dev.js');
 var codes = require('./codes-33cef953.cjs.dev.js');
 require('events');
 require('http');
@@ -32,6 +32,7 @@ const createHttpHandler = adapters_standalone_dist_trpcServerAdaptersStandalone.
 /**
  * @deprecated use `nodeHTTPRequestHandler` from `@trpc/server/adapters/node-http`
  */
+
 const requestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
 /**
  * @deprecated use `NodeHTTPCreateContextFn` from `@trpc/server/adapters/node-http`
@@ -61,31 +62,31 @@ async function wrapCallSafe(fn) {
 /* eslint-disable @typescript-eslint/no-explicit-any */
 resolveHTTPResponse.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);
   }
 
@@ -101,16 +102,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 transformTRPCResponse.TRPCError({
         code: 'BAD_REQUEST',
@@ -118,8 +125,20 @@ class Procedure {
       });
     }
   }
+
+  async parseOutput(rawOutput) {
+    try {
+      return await this.parseOutputFn(rawOutput);
+    } catch (cause) {
+      throw new transformTRPCResponse.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
    */
 
@@ -130,10 +149,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,
@@ -149,6 +169,7 @@ class Procedure {
           type: opts.type,
           path: opts.path,
           rawInput: opts.rawInput,
+          meta: this.meta,
           next: nextFns[index + 1]
         }));
 
@@ -190,7 +211,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;
   }
@@ -207,10 +230,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/dist/trpc-server.cjs.prod.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-562c3d62.cjs.prod.js');
-var subscription = require('./subscription-c2e0bfbc.cjs.prod.js');
-var transformTRPCResponse = require('./transformTRPCResponse-dcbf66c5.cjs.prod.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-d1d2695d.cjs.prod.js');
+var subscription = require('./subscription-f03bec71.cjs.prod.js');
+var transformTRPCResponse = require('./transformTRPCResponse-1e125b28.cjs.prod.js');
 var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.prod.js');
-var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-8ddacc19.cjs.prod.js');
+var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-9cfa7523.cjs.prod.js');
 var codes = require('./codes-e0df67c4.cjs.prod.js');
 require('events');
 require('http');
@@ -32,6 +32,7 @@ const createHttpHandler = adapters_standalone_dist_trpcServerAdaptersStandalone.
 /**
  * @deprecated use `nodeHTTPRequestHandler` from `@trpc/server/adapters/node-http`
  */
+
 const requestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
 /**
  * @deprecated use `NodeHTTPCreateContextFn` from `@trpc/server/adapters/node-http`
@@ -61,31 +62,31 @@ async function wrapCallSafe(fn) {
 /* eslint-disable @typescript-eslint/no-explicit-any */
 resolveHTTPResponse.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);
   }
 
@@ -101,16 +102,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 transformTRPCResponse.TRPCError({
         code: 'BAD_REQUEST',
@@ -118,8 +125,20 @@ class Procedure {
       });
     }
   }
+
+  async parseOutput(rawOutput) {
+    try {
+      return await this.parseOutputFn(rawOutput);
+    } catch (cause) {
+      throw new transformTRPCResponse.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
    */
 
@@ -130,10 +149,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,
@@ -149,6 +169,7 @@ class Procedure {
           type: opts.type,
           path: opts.path,
           rawInput: opts.rawInput,
+          meta: this.meta,
           next: nextFns[index + 1]
         }));
 
@@ -190,7 +211,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;
   }
@@ -207,10 +230,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
   });
 }