@trpc/server 9.21.0 → 9.22.0

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();
 
@@ -37,6 +38,7 @@ export type ProcedureType = 'query' | 'mutation' | 'subscription';
 export type ProcedureRecord<
   TInputContext = any,
   TContext = any,
+  TMeta = any,
   TInput = any,
   TParsedInput = any,
   TOutput = any,
@@ -46,6 +48,7 @@ export type ProcedureRecord<
   Procedure<
     TInputContext,
     TContext,
+    TMeta,
     TInput,
     TParsedInput,
     TOutput,
@@ -57,8 +60,8 @@ export type ProcedureRecord<
  * @public
  */
 export type inferProcedureInput<
-  TProcedure extends Procedure<any, any, any, any, any, any>,
-> = TProcedure extends Procedure<any, any, infer Input, any, any, any>
+  TProcedure extends Procedure<any, any, any, any, any, any, any>,
+> = TProcedure extends Procedure<any, 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
@@ -74,7 +77,7 @@ export type inferAsyncReturnType<TFunction extends (...args: any) => any> =
  * @public
  */
 export type inferProcedureOutput<
-  TProcedure extends Procedure<any, any, any, any, any, any>,
+  TProcedure extends Procedure<any, any, any, any, any, any, any>,
 > = inferAsyncReturnType<TProcedure['call']>;
 
 /**
@@ -102,8 +105,8 @@ function getDataTransformer(
  * @internal
  */
 export type inferHandlerInput<
-  TProcedure extends Procedure<any, any, any, any, any, any>,
-> = TProcedure extends Procedure<any, any, infer TInput, any, any, any>
+  TProcedure extends Procedure<any, any, any, any, any, any, any>,
+> = TProcedure extends Procedure<any, 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
@@ -126,6 +129,21 @@ export type inferRouterContext<TRouter extends AnyRouter> = Parameters<
   TRouter['createCaller']
 >[0];
 
+/**
+ * @internal
+ */
+export type inferRouterMeta<TRouter extends AnyRouter> = TRouter extends Router<
+  any,
+  any,
+  infer TMeta,
+  any,
+  any,
+  any,
+  any
+>
+  ? TMeta
+  : {};
+
 /**
  * @public
  */
@@ -135,6 +153,7 @@ export type AnyRouter<TContext = any> = Router<
   any,
   any,
   any,
+  any,
   any
 >;
 
@@ -213,12 +232,13 @@ const defaultTransformer: CombinedDataTransformer = {
 };
 
 type SwapProcedureContext<
-  TProcedure extends Procedure<any, any, any, any, any, any>,
+  TProcedure extends Procedure<any, any, any, any, any, any, any>,
   TNewContext,
 > = TProcedure extends Procedure<
   infer TInputContext,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   infer _TOldContext,
+  infer TMeta,
   infer TInput,
   infer TParsedInput,
   infer TOutput,
@@ -227,6 +247,7 @@ type SwapProcedureContext<
   ? Procedure<
       TInputContext,
       TNewContext,
+      TMeta,
       TInput,
       TParsedInput,
       TOutput,
@@ -247,13 +268,23 @@ type SwapContext<
 export class Router<
   TInputContext,
   TContext,
-  TQueries extends ProcedureRecord<TInputContext, TContext, any, any, any, any>,
+  TMeta extends Record<string, any>,
+  TQueries extends ProcedureRecord<
+    TInputContext,
+    TContext,
+    any,
+    any,
+    any,
+    any,
+    any
+  >,
   TMutations extends ProcedureRecord<
     TInputContext,
     TContext,
     any,
     any,
     any,
+    any,
     any
   >,
   TSubscriptions extends ProcedureRecord<
@@ -262,6 +293,7 @@ export class Router<
     unknown,
     unknown,
     Subscription<unknown>,
+    unknown,
     unknown
   >,
   TErrorShape extends TRPCErrorShape<number>,
@@ -270,7 +302,7 @@ export class Router<
     queries: TQueries;
     mutations: TMutations;
     subscriptions: TSubscriptions;
-    middlewares: MiddlewareFunction<TInputContext, TContext>[];
+    middlewares: MiddlewareFunction<TInputContext, TContext, TMeta>[];
     errorFormatter: ErrorFormatter<TContext, TErrorShape>;
     transformer: CombinedDataTransformer;
   };
@@ -279,7 +311,7 @@ export class Router<
     queries?: TQueries;
     mutations?: TMutations;
     subscriptions?: TSubscriptions;
-    middlewares?: MiddlewareFunction<TInputContext, TContext>[];
+    middlewares?: MiddlewareFunction<TInputContext, TContext, TMeta>[];
     errorFormatter?: ErrorFormatter<TContext, TErrorShape>;
     transformer?: CombinedDataTransformer;
   }) {
@@ -314,6 +346,7 @@ export class Router<
     path: TPath,
     procedure: CreateProcedureWithInputOutputParser<
       TContext,
+      TMeta,
       TInput,
       TParsedInput,
       TOutput,
@@ -322,6 +355,7 @@ export class Router<
   ): Router<
     TInputContext,
     TContext,
+    TMeta,
     TQueries &
       Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
     TMutations,
@@ -331,10 +365,11 @@ export class Router<
 
   public query<TPath extends string, TInput, TOutput>(
     path: TPath,
-    procedure: CreateProcedureWithInput<TContext, TInput, TOutput>,
+    procedure: CreateProcedureWithInput<TContext, TMeta, TInput, TOutput>,
   ): Router<
     TInputContext,
     TContext,
+    TMeta,
     TQueries &
       Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
     TMutations,
@@ -344,10 +379,16 @@ export class Router<
 
   public query<TPath extends string, TOutput, TParsedOutput>(
     path: TPath,
-    procedure: CreateProcedureWithoutInput<TContext, TOutput, TParsedOutput>,
+    procedure: CreateProcedureWithoutInput<
+      TContext,
+      TMeta,
+      TOutput,
+      TParsedOutput
+    >,
   ): Router<
     TInputContext,
     TContext,
+    TMeta,
     TQueries &
       Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
     TMutations,
@@ -357,9 +398,9 @@ export class Router<
 
   query(
     path: string,
-    procedure: CreateProcedureOptions<TContext, any, any, any, any>,
+    procedure: CreateProcedureOptions<TContext, TMeta, any, any, any, any>,
   ) {
-    const router = new Router<TContext, TContext, any, {}, {}, any>({
+    const router = new Router<TContext, TContext, TMeta, any, {}, {}, any>({
       queries: safeObject({
         [path]: createProcedure(procedure),
       }),
@@ -378,6 +419,7 @@ export class Router<
     path: TPath,
     procedure: CreateProcedureWithInputOutputParser<
       TContext,
+      TMeta,
       TInput,
       TParsedInput,
       TOutput,
@@ -386,6 +428,7 @@ export class Router<
   ): Router<
     TInputContext,
     TContext,
+    TMeta,
     TQueries,
     TMutations &
       Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
@@ -395,10 +438,11 @@ export class Router<
 
   public mutation<TPath extends string, TInput, TOutput>(
     path: TPath,
-    procedure: CreateProcedureWithInput<TContext, TInput, TOutput>,
+    procedure: CreateProcedureWithInput<TContext, TMeta, TInput, TOutput>,
   ): Router<
     TInputContext,
     TContext,
+    TMeta,
     TQueries,
     TMutations &
       Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
@@ -408,10 +452,16 @@ export class Router<
 
   public mutation<TPath extends string, TOutput, TParsedOutput>(
     path: TPath,
-    procedure: CreateProcedureWithoutInput<TContext, TOutput, TParsedOutput>,
+    procedure: CreateProcedureWithoutInput<
+      TContext,
+      TMeta,
+      TOutput,
+      TParsedOutput
+    >,
   ): Router<
     TInputContext,
     TContext,
+    TMeta,
     TQueries,
     TMutations &
       Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
@@ -421,9 +471,9 @@ export class Router<
 
   public mutation(
     path: string,
-    procedure: CreateProcedureOptions<TContext, any, any, any, any>,
+    procedure: CreateProcedureOptions<TContext, TMeta, any, any, any, any>,
   ) {
-    const router = new Router<TContext, TContext, {}, any, {}, any>({
+    const router = new Router<TContext, TContext, TMeta, {}, any, {}, any>({
       mutations: safeObject({
         [path]: createProcedure(procedure),
       }),
@@ -445,6 +495,7 @@ export class Router<
     procedure: Omit<
       CreateProcedureWithInputOutputParser<
         TContext,
+        TMeta,
         TInput,
         TParsedInput,
         TOutput,
@@ -455,6 +506,7 @@ export class Router<
   ): Router<
     TInputContext,
     TContext,
+    TMeta,
     TQueries,
     TMutations,
     TSubscriptions &
@@ -472,12 +524,13 @@ export class Router<
   >(
     path: TPath,
     procedure: Omit<
-      CreateProcedureWithInput<TContext, TInput, TOutput>,
+      CreateProcedureWithInput<TContext, TMeta, TInput, TOutput>,
       'output'
     >,
   ): Router<
     TInputContext,
     TContext,
+    TMeta,
     TQueries,
     TMutations,
     TSubscriptions &
@@ -494,12 +547,13 @@ export class Router<
   >(
     path: TPath,
     procedure: Omit<
-      CreateProcedureWithoutInput<TContext, TOutput, unknown>,
+      CreateProcedureWithoutInput<TContext, TMeta, TOutput, unknown>,
       'output'
     >,
   ): Router<
     TInputContext,
     TContext,
+    TMeta,
     TQueries,
     TMutations,
     TSubscriptions &
@@ -510,11 +564,11 @@ export class Router<
   public subscription(
     path: string,
     procedure: Omit<
-      CreateProcedureOptions<TContext, any, any, any, any>,
+      CreateProcedureOptions<TContext, TMeta, any, any, any, any>,
       'output'
     >,
   ) {
-    const router = new Router<TContext, TContext, {}, {}, any, any>({
+    const router = new Router<TContext, TContext, TMeta, {}, {}, any, any>({
       subscriptions: safeObject({
         [path]: createProcedure(procedure),
       }),
@@ -527,11 +581,14 @@ export class Router<
    * Merge router with other router
    * @param router
    */
-  public merge<TChildRouter extends Router<TContext, any, any, any, any, any>>(
+  public merge<
+    TChildRouter extends Router<TContext, any, TMeta, any, any, any, any>,
+  >(
     router: TChildRouter,
   ): Router<
     TInputContext,
     inferRouterContext<TChildRouter>,
+    TMeta,
     TQueries & TChildRouter['_def']['queries'],
     TMutations & TChildRouter['_def']['mutations'],
     TSubscriptions & TChildRouter['_def']['subscriptions'],
@@ -545,13 +602,14 @@ export class Router<
    */
   public merge<
     TPath extends string,
-    TChildRouter extends Router<TContext, any, any, any, any, any>,
+    TChildRouter extends Router<TContext, any, TMeta, any, any, any, any>,
   >(
     prefix: TPath,
     router: TChildRouter,
   ): Router<
     TInputContext,
     inferRouterContext<TChildRouter>,
+    TMeta,
     TQueries & Prefixer<TChildRouter['_def']['queries'], `${TPath}`>,
     TMutations & Prefixer<TChildRouter['_def']['mutations'], `${TPath}`>,
     TSubscriptions &
@@ -604,7 +662,7 @@ export class Router<
       return Router.prefixProcedures(newDefs, prefix);
     };
 
-    return new Router<TInputContext, any, any, any, any, TErrorShape>({
+    return new Router<TInputContext, any, TMeta, any, any, any, TErrorShape>({
       ...this._def,
       queries: safeObject(
         this._def.queries,
@@ -631,7 +689,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, any>
+      | Procedure<TInputContext, TContext, TMeta, any, any, any, any>
       | undefined;
 
     if (!procedure) {
@@ -682,10 +740,11 @@ export class Router<
    * @link https://trpc.io/docs/middlewares
    */
   public middleware<TNewContext>(
-    middleware: MiddlewareFunction<TContext, TNewContext>,
+    middleware: MiddlewareFunction<TContext, TNewContext, TMeta>,
   ): Router<
     TInputContext,
     TNewContext,
+    TMeta,
     SwapContext<TQueries, TNewContext>,
     SwapContext<TMutations, TNewContext>,
     SwapContext<TSubscriptions, TNewContext>,
@@ -712,6 +771,7 @@ export class Router<
     return new Router<
       TInputContext,
       TContext,
+      TMeta,
       TQueries,
       TMutations,
       TSubscriptions,
@@ -766,6 +826,7 @@ export class Router<
     return new Router<
       TInputContext,
       TContext,
+      TMeta,
       TQueries,
       TMutations,
       TSubscriptions,
@@ -785,6 +846,7 @@ export class Router<
   public flat(): Router<
     TInputContext,
     TContext,
+    TMeta,
     flatten<{}, TQueries>,
     flatten<{}, TMutations>,
     flatten<{}, TSubscriptions>,
@@ -801,6 +863,7 @@ export class Router<
  */
 export class LegacyRouter<
   TContext,
+  TMeta extends Record<string, any>,
   TQueries extends ProcedureRecord<TContext, TContext, any, any, any, any>,
   TMutations extends ProcedureRecord<TContext, TContext, any, any, any, any>,
   TSubscriptions extends ProcedureRecord<
@@ -815,12 +878,13 @@ export class LegacyRouter<
 > extends Router<
   TContext,
   TContext,
+  TMeta,
   TQueries,
   TMutations,
   TSubscriptions,
   TErrorShape
 > {}
 
-export function router<TContext>() {
-  return new Router<TContext, TContext, {}, {}, {}, DefaultErrorShape>();
+export function router<TContext, TMeta extends Record<string, any> = {}>() {
+  return new Router<TContext, TContext, TMeta, {}, {}, {}, DefaultErrorShape>();
 }

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

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var adapters_ws_dist_trpcServerAdaptersWs = require('../../adapters/ws/dist/trpc-server-adapters-ws.cjs.dev.js');
-require('../../dist/transformTRPCResponse-8248515e.cjs.dev.js');
-require('../../dist/subscription-9e007280.cjs.dev.js');
+require('../../dist/transformTRPCResponse-c654ea92.cjs.dev.js');
+require('../../dist/subscription-7de48383.cjs.dev.js');
 require('events');
 
 /**

package/ws/dist/trpc-server-ws.cjs.prod.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var adapters_ws_dist_trpcServerAdaptersWs = require('../../adapters/ws/dist/trpc-server-adapters-ws.cjs.prod.js');
-require('../../dist/transformTRPCResponse-dcbf66c5.cjs.prod.js');
-require('../../dist/subscription-12fb50be.cjs.prod.js');
+require('../../dist/transformTRPCResponse-1e125b28.cjs.prod.js');
+require('../../dist/subscription-f03bec71.cjs.prod.js');
 require('events');
 
 /**

package/ws/dist/trpc-server-ws.esm.js

@@ -1,6 +1,6 @@
 import { applyWSSHandler as applyWSSHandler$1 } from '../../adapters/ws/dist/trpc-server-adapters-ws.esm.js';
-import '../../dist/transformTRPCResponse-f73dc4a2.esm.js';
-import '../../dist/subscription-a81120d6.esm.js';
+import '../../dist/transformTRPCResponse-45c225c3.esm.js';
+import '../../dist/subscription-2ea469a3.esm.js';
 import 'events';
 
 /**