@orpc/server 0.25.0 → 0.26.0

package/dist/{chunk-B2EZJB7X.js → chunk-6BY63WA5.js}

@@ -4,7 +4,7 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-6A7XHEBH.js";
+} from "./chunk-E7GUWVR4.js";
 
 // src/adapters/fetch/super-json.ts
 var super_json_exports = {};
@@ -300,4 +300,4 @@ export {
   ORPCProcedureMatcher,
   ORPCHandler
 };
-//# sourceMappingURL=chunk-B2EZJB7X.js.map
+//# sourceMappingURL=chunk-6BY63WA5.js.map

package/dist/{chunk-6A7XHEBH.js → chunk-E7GUWVR4.js}

@@ -74,12 +74,13 @@ function createProcedureClient(options) {
     };
     const executeWithValidation = async () => {
       const validInput = await validateInput(procedure, input);
-      const output = await executeMiddlewareChain(
-        procedure,
-        validInput,
+      const output = await executeMiddlewareChain({
         context,
-        meta
-      );
+        input: validInput,
+        path,
+        procedure,
+        signal: callerOptions?.signal
+      });
       return validateOutput(procedure, output);
     };
     return executeWithHooks({
@@ -119,23 +120,19 @@ async function validateOutput(procedure, output) {
   }
   return result.value;
 }
-async function executeMiddlewareChain(procedure, input, context, meta) {
-  const middlewares = procedure["~orpc"].middlewares ?? [];
+async function executeMiddlewareChain(opt) {
+  const middlewares = opt.procedure["~orpc"].middlewares ?? [];
   let currentMidIndex = 0;
-  let currentContext = context;
+  let currentContext = opt.context;
   const next = async (nextOptions) => {
     const mid = middlewares[currentMidIndex];
     currentMidIndex += 1;
     currentContext = mergeContext(currentContext, nextOptions.context);
     if (mid) {
-      return await mid(input, currentContext, {
-        ...meta,
-        next,
-        output: (output) => ({ output, context: void 0 })
-      });
+      return await mid({ ...opt, context: currentContext, next }, opt.input, (output) => ({ output, context: void 0 }));
     }
     const result = {
-      output: await procedure["~orpc"].handler(input, currentContext, meta),
+      output: await opt.procedure["~orpc"].handler({ ...opt, context: currentContext }),
       context: currentContext
     };
     return result;
@@ -186,4 +183,4 @@ export {
   createProcedureClient,
   getRouterChild
 };
-//# sourceMappingURL=chunk-6A7XHEBH.js.map
+//# sourceMappingURL=chunk-E7GUWVR4.js.map

package/dist/fetch.js

@@ -3,8 +3,8 @@ import {
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
   super_json_exports
-} from "./chunk-B2EZJB7X.js";
-import "./chunk-6A7XHEBH.js";
+} from "./chunk-6BY63WA5.js";
+import "./chunk-E7GUWVR4.js";
 
 // src/adapters/fetch/composite-handler.ts
 var CompositeHandler = class {

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   lazy,
   mergeContext,
   unlazy
-} from "./chunk-6A7XHEBH.js";
+} from "./chunk-E7GUWVR4.js";
 
 // src/builder.ts
 import { ContractProcedure } from "@orpc/contract";
@@ -23,17 +23,17 @@ function decorateMiddleware(middleware) {
   const decorated = middleware;
   decorated.mapInput = (mapInput) => {
     const mapped = decorateMiddleware(
-      (input, ...rest) => middleware(mapInput(input), ...rest)
+      (options, input, ...rest) => middleware(options, mapInput(input), ...rest)
     );
     return mapped;
   };
   decorated.concat = (concatMiddleware, mapInput) => {
     const mapped = mapInput ? decorateMiddleware(concatMiddleware).mapInput(mapInput) : concatMiddleware;
-    const concatted = decorateMiddleware((input, context, meta, ...rest) => {
-      const next = async (options) => {
-        return mapped(input, mergeContext(context, options.context), meta, ...rest);
+    const concatted = decorateMiddleware((options, input, output, ...rest) => {
+      const next = async (nextOptions) => {
+        return mapped({ ...options, context: mergeContext(nextOptions.context, options.context) }, input, output, ...rest);
       };
-      const merged = middleware(input, context, { ...meta, next }, ...rest);
+      const merged = middleware({ ...options, next }, input, output, ...rest);
       return merged;
     });
     return concatted;

package/dist/node.js

@@ -1,7 +1,7 @@
 import {
   ORPCHandler
-} from "./chunk-B2EZJB7X.js";
-import "./chunk-6A7XHEBH.js";
+} from "./chunk-6BY63WA5.js";
+import "./chunk-E7GUWVR4.js";
 
 // src/adapters/node/composite-handler.ts
 var CompositeHandler = class {

package/dist/src/builder.d.ts

@@ -6,7 +6,7 @@ import type { Router } from './router';
 import type { AdaptedRouter } from './router-builder';
 import type { Context, MergeContext, WELL_CONTEXT } from './types';
 import { type ChainableImplementer } from './implementer-chainable';
-import { type ProcedureFunc } from './procedure';
+import { type ProcedureHandler } from './procedure';
 import { ProcedureBuilder } from './procedure-builder';
 import { type DecoratedProcedure } from './procedure-decorated';
 import { RouterBuilder } from './router-builder';
@@ -23,7 +23,7 @@ export declare class Builder<TContext extends Context, TExtraContext extends Con
     route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, undefined, undefined>;
     input<USchema extends Schema = undefined>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilder<TContext, TExtraContext, USchema, undefined>;
     output<USchema extends Schema = undefined>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilder<TContext, TExtraContext, undefined, USchema>;
-    handler<UFuncOutput = undefined>(handler: ProcedureFunc<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
+    handler<UFuncOutput = undefined>(handler: ProcedureHandler<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
     prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext>;
     tag(...tags: string[]): RouterBuilder<TContext, TExtraContext>;
     router<U extends Router<MergeContext<TContext, TExtraContext>, any>>(router: U): AdaptedRouter<TContext, U>;

package/dist/src/middleware.d.ts

@@ -1,19 +1,29 @@
 import type { Promisable } from '@orpc/shared';
-import type { Context, Meta } from './types';
+import type { ANY_PROCEDURE } from './procedure';
+import type { Context } from './types';
 export type MiddlewareResult<TExtraContext extends Context, TOutput> = Promisable<{
     output: TOutput;
     context: TExtraContext;
 }>;
-export interface MiddlewareMeta<TOutput> extends Meta {
-    next: <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
+export interface MiddlewareNextFn<TOutput> {
+    <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
         context?: UExtraContext;
     } : {
         context: UExtraContext;
-    }) => MiddlewareResult<UExtraContext, TOutput>;
-    output: <UOutput>(output: UOutput) => MiddlewareResult<undefined, UOutput>;
+    }): MiddlewareResult<UExtraContext, TOutput>;
+}
+export interface MiddlewareOutputFn<TOutput> {
+    (output: TOutput): MiddlewareResult<undefined, TOutput>;
+}
+export interface MiddlewareOptions<TContext extends Context, TOutput> {
+    context: TContext;
+    path: string[];
+    procedure: ANY_PROCEDURE;
+    signal?: AbortSignal;
+    next: MiddlewareNextFn<TOutput>;
 }
 export interface Middleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput> {
-    (input: TInput, context: TContext, meta: MiddlewareMeta<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
+    (options: MiddlewareOptions<TContext, TOutput>, input: TInput, output: MiddlewareOutputFn<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
 }
 export type ANY_MIDDLEWARE = Middleware<any, any, any, any>;
 export interface MapInputMiddleware<TInput, TMappedInput> {

package/dist/src/procedure-builder.d.ts

@@ -2,7 +2,7 @@ import type { MapInputMiddleware, Middleware } from './middleware';
 import type { DecoratedProcedure } from './procedure-decorated';
 import type { Context, MergeContext } from './types';
 import { type ContractProcedure, type RouteOptions, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-import { type ProcedureFunc } from './procedure';
+import { type ProcedureHandler } from './procedure';
 import { ProcedureImplementer } from './procedure-implementer';
 export interface ProcedureBuilderDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> {
     contract: ContractProcedure<TInputSchema, TOutputSchema>;
@@ -17,6 +17,6 @@ export declare class ProcedureBuilder<TContext extends Context, TExtraContext ex
     output<U extends Schema = undefined>(schema: U, example?: SchemaOutput<U>): ProcedureBuilder<TContext, TExtraContext, TInputSchema, U>;
     use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
     use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
-    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
 }
 //# sourceMappingURL=procedure-builder.d.ts.map

package/dist/src/procedure-implementer.d.ts

@@ -1,6 +1,6 @@
 import type { ContractProcedure, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { MapInputMiddleware, Middleware } from './middleware';
-import type { ProcedureFunc } from './procedure';
+import type { ProcedureHandler } from './procedure';
 import type { DecoratedProcedure } from './procedure-decorated';
 import type { Context, MergeContext } from './types';
 export type ProcedureImplementerDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> = {
@@ -13,6 +13,6 @@ export declare class ProcedureImplementer<TContext extends Context, TExtraContex
     constructor(def: ProcedureImplementerDef<TContext, TExtraContext, TInputSchema, TOutputSchema>);
     use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
     use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
-    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
 }
 //# sourceMappingURL=procedure-implementer.d.ts.map

package/dist/src/procedure.d.ts

@@ -1,15 +1,22 @@
 import type { Promisable } from '@orpc/shared';
 import type { Lazy } from './lazy';
 import type { Middleware } from './middleware';
-import type { Context, MergeContext, Meta } from './types';
+import type { AbortSignal, Context, MergeContext } from './types';
 import { type ContractProcedure, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-export interface ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
-    (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
+export interface ProcedureHandlerOptions<TContext extends Context, TInput> {
+    context: TContext;
+    input: TInput;
+    path: string[];
+    procedure: ANY_PROCEDURE;
+    signal?: AbortSignal;
+}
+export interface ProcedureHandler<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
+    (opt: ProcedureHandlerOptions<MergeContext<TContext, TExtraContext>, SchemaOutput<TInputSchema>>): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
 }
 export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
     middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, SchemaOutput<TInputSchema>, any>[];
     contract: ContractProcedure<TInputSchema, TOutputSchema>;
-    handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
 }
 export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
     '~type': "Procedure";

package/dist/src/types.d.ts

@@ -1,7 +1,9 @@
+import type { FindGlobalInstanceType } from '@orpc/shared';
 import type { ANY_PROCEDURE } from './procedure';
 export type Context = Record<string, any> | undefined;
 export type WELL_CONTEXT = Record<string, unknown> | undefined;
 export type MergeContext<TA extends Context, TB extends Context> = TA extends undefined ? TB : TB extends undefined ? TA : TA & TB;
+export type AbortSignal = FindGlobalInstanceType<'AbortSignal'>;
 export interface WithSignal {
     signal?: AbortSignal;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -40,8 +40,8 @@
   ],
   "dependencies": {
     "@mjackson/node-fetch-server": "^0.5.0",
-    "@orpc/contract": "0.25.0",
-    "@orpc/shared": "0.25.0"
+    "@orpc/contract": "0.26.0",
+    "@orpc/shared": "0.26.0"
   },
   "devDependencies": {
     "zod": "^3.24.1"