@orpc/server 0.0.0-next.6c5bfe4 → 0.0.0-next.6d75718

package/dist/shared/{server.BZRSVRDu.d.ts → server.23VRZIfj.d.ts}

@@ -1,7 +1,7 @@
 import { HTTPPath, AnySchema, Meta, InferSchemaOutput, ErrorFromErrorMap } from '@orpc/contract';
-import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
+import { Interceptor } from '@orpc/shared';
 import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
-import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.CPteJIPP.js';
+import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.MZvbGc3n.js';
 import { ORPCError } from '@orpc/client';
 
 type StandardParams = Record<string, string>;
@@ -20,16 +20,10 @@ interface StandardCodec {
     decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
 }
 
-type StandardHandleOptions<T extends Context> = {
+interface StandardHandleOptions<T extends Context> {
     prefix?: HTTPPath;
-} & (Record<never, never> extends T ? {
-    context?: T;
-} : {
     context: T;
-});
-type WellStandardHandleOptions<T extends Context> = StandardHandleOptions<T> & {
-    context: T;
-};
+}
 type StandardHandleResult = {
     matched: true;
     response: StandardResponse;
@@ -37,11 +31,14 @@ type StandardHandleResult = {
     matched: false;
     response: undefined;
 };
-type StandardHandlerInterceptorOptions<TContext extends Context> = WellStandardHandleOptions<TContext> & {
+interface StandardHandlerPlugin<TContext extends Context> {
+    init?(options: StandardHandlerOptions<TContext>): void;
+}
+interface StandardHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
     request: StandardLazyRequest;
-};
+}
 interface StandardHandlerOptions<TContext extends Context> {
-    plugins?: HandlerPlugin<TContext>[];
+    plugins?: StandardHandlerPlugin<TContext>[];
     /**
      * Interceptors at the request level, helpful when you want catch errors
      */
@@ -59,19 +56,11 @@ interface StandardHandlerOptions<TContext extends Context> {
 declare class StandardHandler<T extends Context> {
     private readonly matcher;
     private readonly codec;
-    private readonly options;
-    private readonly plugin;
+    private readonly interceptors;
+    private readonly clientInterceptors;
+    private readonly rootInterceptors;
     constructor(router: Router<any, T>, matcher: StandardMatcher, codec: StandardCodec, options: NoInfer<StandardHandlerOptions<T>>);
-    handle(request: StandardLazyRequest, ...[options]: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<StandardHandleResult>;
-}
-
-interface HandlerPlugin<TContext extends Context> {
-    init?(options: StandardHandlerOptions<TContext>): void;
-}
-declare class CompositePlugin<TContext extends Context> implements HandlerPlugin<TContext> {
-    private readonly plugins;
-    constructor(plugins?: HandlerPlugin<TContext>[]);
-    init(options: StandardHandlerOptions<TContext>): void;
+    handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
 }
 
-export { CompositePlugin as C, type HandlerPlugin as H, type StandardHandleOptions as S, type WellStandardHandleOptions as W, type StandardHandlerInterceptorOptions as a, type StandardHandlerOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleResult as g, StandardHandler as h };
+export { type StandardHandleOptions as S, type StandardHandlerOptions as a, type StandardHandlerInterceptorOptions as b, type StandardHandlerPlugin as c, type StandardCodec as d, type StandardParams as e, type StandardMatcher as f, type StandardMatchResult as g, type StandardHandleResult as h, StandardHandler as i };

package/dist/shared/server.BG5ftPWa.d.ts

@@ -0,0 +1,10 @@
+import { C as Context } from './server.MZvbGc3n.js';
+import { S as StandardHandleOptions } from './server.23VRZIfj.js';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };

package/dist/shared/server.BVwwTHyO.mjs

@@ -0,0 +1,9 @@
+function resolveFriendlyStandardHandleOptions(options) {
+  return {
+    ...options,
+    context: options?.context ?? {}
+    // Context only optional if all fields are optional
+  };
+}
+
+export { resolveFriendlyStandardHandleOptions as r };

package/dist/shared/{server.kPUGzsdw.mjs → server.BtxZnWJ9.mjs}

@@ -21,19 +21,25 @@ function unlazy(lazied) {
   return isLazy(lazied) ? lazied[LAZY_SYMBOL].loader() : Promise.resolve({ default: lazied });
 }
 
-function dedupeMiddlewares(compare, middlewares) {
-  let min = 0;
+function isStartWithMiddlewares(middlewares, compare) {
+  if (compare.length > middlewares.length) {
+    return false;
+  }
   for (let i = 0; i < middlewares.length; i++) {
-    const index = compare.indexOf(middlewares[i], min);
-    if (index === -1) {
-      return middlewares.slice(i);
+    if (compare[i] === void 0) {
+      return true;
+    }
+    if (middlewares[i] !== compare[i]) {
+      return false;
     }
-    min = index + 1;
   }
-  return [];
+  return true;
 }
-function mergeMiddlewares(first, second) {
-  return [...first, ...dedupeMiddlewares(first, second)];
+function mergeMiddlewares(first, second, options) {
+  if (options.dedupeLeading && isStartWithMiddlewares(second, first)) {
+    return second;
+  }
+  return [...first, ...second];
 }
 function addMiddleware(middlewares, addition) {
   return [...middlewares, addition];
@@ -52,6 +58,10 @@ function isProcedure(item) {
   return isContractProcedure(item) && "middlewares" in item["~orpc"] && "inputValidationIndex" in item["~orpc"] && "outputValidationIndex" in item["~orpc"] && "handler" in item["~orpc"];
 }
 
+function mergeCurrentContext(context, other) {
+  return { ...context, ...other };
+}
+
 function createORPCErrorConstructorMap(errors) {
   const proxy = new Proxy(errors, {
     get(target, code) {
@@ -164,23 +174,30 @@ async function executeProcedureInternal(procedure, options) {
   let currentInput = options.input;
   const next = async (...[nextOptions]) => {
     const index = currentIndex;
+    const midContext = nextOptions?.context ?? {};
     currentIndex += 1;
-    currentContext = { ...currentContext, ...nextOptions?.context };
+    currentContext = mergeCurrentContext(currentContext, midContext);
     if (index === inputValidationIndex) {
       currentInput = await validateInput(procedure, currentInput);
     }
     const mid = middlewares[index];
-    const result = mid ? await mid({ ...options, context: currentContext, next }, currentInput, middlewareOutputFn) : { output: await procedure["~orpc"].handler({ ...options, context: currentContext, input: currentInput }), context: currentContext };
+    const result = mid ? {
+      context: midContext,
+      output: (await mid({ ...options, context: currentContext, next }, currentInput, middlewareOutputFn)).output
+    } : {
+      context: midContext,
+      output: await procedure["~orpc"].handler({ ...options, context: currentContext, input: currentInput })
+    };
     if (index === outputValidationIndex) {
       const validatedOutput = await validateOutput(procedure, result.output);
       return {
-        ...result,
+        context: result.context,
         output: validatedOutput
       };
     }
     return result;
   };
-  return (await next({})).output;
+  return (await next()).output;
 }
 
 const HIDDEN_ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_HIDDEN_ROUTER_CONTRACT");
@@ -250,7 +267,7 @@ function enhanceRouter(router, options) {
     return accessible;
   }
   if (isProcedure(router)) {
-    const newMiddlewares = mergeMiddlewares(options.middlewares, router["~orpc"].middlewares);
+    const newMiddlewares = mergeMiddlewares(options.middlewares, router["~orpc"].middlewares, { dedupeLeading: options.dedupeLeadingMiddlewares });
     const newMiddlewareAdded = newMiddlewares.length - router["~orpc"].middlewares.length;
     const enhanced2 = new Procedure({
       ...router["~orpc"],
@@ -354,4 +371,4 @@ function toHttpPath(path) {
   return `/${path.map(encodeURIComponent).join("/")}`;
 }
 
-export { LAZY_SYMBOL as L, Procedure as P, toHttpPath as a, createContractedProcedure as b, createProcedureClient as c, addMiddleware as d, enhanceRouter as e, isLazy as f, getRouter as g, createAssertedLazyProcedure as h, isProcedure as i, getLazyMeta as j, call as k, lazy as l, middlewareOutputFn as m, getHiddenRouterContract as n, createAccessibleLazyRouter as o, unlazyRouter as p, resolveContractProcedures as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u };
+export { LAZY_SYMBOL as L, Procedure as P, toHttpPath as a, createContractedProcedure as b, createProcedureClient as c, addMiddleware as d, enhanceRouter as e, isLazy as f, getRouter as g, createAssertedLazyProcedure as h, isProcedure as i, createORPCErrorConstructorMap as j, getLazyMeta as k, lazy as l, mergeCurrentContext as m, middlewareOutputFn as n, isStartWithMiddlewares as o, mergeMiddlewares as p, call as q, getHiddenRouterContract as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u, validateORPCError as v, createAccessibleLazyRouter as w, resolveContractProcedures as x, unlazyRouter as y };

package/dist/shared/server.C-CCcROC.d.mts

@@ -0,0 +1,10 @@
+import { C as Context } from './server.MZvbGc3n.mjs';
+import { S as StandardHandleOptions } from './server.DJqfB27m.mjs';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };

package/dist/shared/server.CIbpOMZX.d.mts

@@ -0,0 +1,8 @@
+import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
+import { C as Context } from './server.MZvbGc3n.mjs';
+import { a as StandardHandlerOptions } from './server.DJqfB27m.mjs';
+
+interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
+}
+
+export type { StandardRPCHandlerOptions as S };

package/dist/shared/server.CTt4UYhI.mjs

@@ -0,0 +1,51 @@
+import { StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
+import { S as StandardHandler, b as StandardRPCMatcher, a as StandardRPCCodec } from './server.CVNC_Jz8.mjs';
+import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
+import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
+import { r as resolveFriendlyStandardHandleOptions } from './server.BVwwTHyO.mjs';
+
+class FetchHandler {
+  constructor(standardHandler, options = {}) {
+    this.standardHandler = standardHandler;
+    for (const plugin of toArray(options.plugins)) {
+      plugin.initRuntimeAdapter?.(options);
+    }
+    this.adapterInterceptors = toArray(options.adapterInterceptors);
+    this.toFetchResponseOptions = options;
+  }
+  toFetchResponseOptions;
+  adapterInterceptors;
+  async handle(request, ...rest) {
+    return intercept(
+      this.adapterInterceptors,
+      {
+        ...resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest)),
+        request,
+        toFetchResponseOptions: this.toFetchResponseOptions
+      },
+      async ({ request: request2, toFetchResponseOptions, ...options }) => {
+        const standardRequest = toStandardLazyRequest(request2);
+        const result = await this.standardHandler.handle(standardRequest, options);
+        if (!result.matched) {
+          return result;
+        }
+        return {
+          matched: true,
+          response: toFetchResponse(result.response, toFetchResponseOptions)
+        };
+      }
+    );
+  }
+}
+
+class RPCHandler extends FetchHandler {
+  constructor(router, options = {}) {
+    const jsonSerializer = new StandardRPCJsonSerializer(options);
+    const serializer = new StandardRPCSerializer(jsonSerializer);
+    const matcher = new StandardRPCMatcher();
+    const codec = new StandardRPCCodec(serializer);
+    super(new StandardHandler(router, matcher, codec, options), options);
+  }
+}
+
+export { FetchHandler as F, RPCHandler as R };

package/dist/shared/{server.N2ttmv6r.mjs → server.CVNC_Jz8.mjs}

@@ -1,51 +1,50 @@
 import { ORPCError, toORPCError } from '@orpc/client';
-import { intercept, trim, parseEmptyableJSON } from '@orpc/shared';
-import { C as CompositePlugin } from './server.Q6ZmnTgO.mjs';
-import { c as createProcedureClient, t as traverseContractProcedures, a as toHttpPath, i as isProcedure, u as unlazy, g as getRouter, b as createContractedProcedure } from './server.kPUGzsdw.mjs';
+import { toArray, intercept, trim, parseEmptyableJSON } from '@orpc/shared';
+import { c as createProcedureClient, t as traverseContractProcedures, a as toHttpPath, i as isProcedure, u as unlazy, g as getRouter, b as createContractedProcedure } from './server.BtxZnWJ9.mjs';
 
 class StandardHandler {
   constructor(router, matcher, codec, options) {
     this.matcher = matcher;
     this.codec = codec;
-    this.options = options;
-    this.plugin = new CompositePlugin(options.plugins);
-    this.plugin.init(this.options);
+    for (const plugin of toArray(options.plugins)) {
+      plugin.init?.(options);
+    }
+    this.interceptors = toArray(options.interceptors);
+    this.clientInterceptors = toArray(options.clientInterceptors);
+    this.rootInterceptors = toArray(options.rootInterceptors);
     this.matcher.init(router);
   }
-  plugin;
-  handle(request, ...[options]) {
+  interceptors;
+  clientInterceptors;
+  rootInterceptors;
+  handle(request, options) {
     return intercept(
-      this.options.rootInterceptors ?? [],
-      {
-        request,
-        ...options,
-        context: options?.context ?? {}
-        // context is optional only when all fields are optional so we can safely force it to have a context
-      },
+      this.rootInterceptors,
+      { ...options, request },
       async (interceptorOptions) => {
         let isDecoding = false;
         try {
           return await intercept(
-            this.options.interceptors ?? [],
+            this.interceptors,
             interceptorOptions,
-            async (interceptorOptions2) => {
-              const method = interceptorOptions2.request.method;
-              const url = interceptorOptions2.request.url;
-              const pathname = `/${trim(url.pathname.replace(interceptorOptions2.prefix ?? "", ""), "/")}`;
+            async ({ request: request2, context, prefix }) => {
+              const method = request2.method;
+              const url = request2.url;
+              const pathname = `/${trim(url.pathname.replace(prefix ?? "", ""), "/")}`;
               const match = await this.matcher.match(method, pathname);
               if (!match) {
                 return { matched: false, response: void 0 };
               }
               const client = createProcedureClient(match.procedure, {
-                context: interceptorOptions2.context,
+                context,
                 path: match.path,
-                interceptors: this.options.clientInterceptors
+                interceptors: this.clientInterceptors
               });
               isDecoding = true;
-              const input = await this.codec.decode(request, match.params, match.procedure);
+              const input = await this.codec.decode(request2, match.params, match.procedure);
               isDecoding = false;
-              const lastEventId = Array.isArray(request.headers["last-event-id"]) ? request.headers["last-event-id"].at(-1) : request.headers["last-event-id"];
-              const output = await client(input, { signal: request.signal, lastEventId });
+              const lastEventId = Array.isArray(request2.headers["last-event-id"]) ? request2.headers["last-event-id"].at(-1) : request2.headers["last-event-id"];
+              const output = await client(input, { signal: request2.signal, lastEventId });
               const response = this.codec.encode(output, match.procedure);
               return {
                 matched: true,
@@ -54,7 +53,7 @@ class StandardHandler {
             }
           );
         } catch (e) {
-          const error = isDecoding ? new ORPCError("BAD_REQUEST", {
+          const error = isDecoding && !(e instanceof ORPCError) ? new ORPCError("BAD_REQUEST", {
             message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
             cause: e
           }) : toORPCError(e);
@@ -69,7 +68,7 @@ class StandardHandler {
   }
 }
 
-class RPCCodec {
+class StandardRPCCodec {
   constructor(serializer) {
     this.serializer = serializer;
   }
@@ -93,7 +92,7 @@ class RPCCodec {
   }
 }
 
-class RPCMatcher {
+class StandardRPCMatcher {
   tree = {};
   pendingRouters = [];
   init(router, path = []) {
@@ -155,4 +154,4 @@ class RPCMatcher {
   }
 }
 
-export { RPCCodec as R, StandardHandler as S, RPCMatcher as a };
+export { StandardHandler as S, StandardRPCCodec as a, StandardRPCMatcher as b };

package/dist/shared/server.DCcCuA52.d.ts

@@ -0,0 +1,8 @@
+import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
+import { C as Context } from './server.MZvbGc3n.js';
+import { a as StandardHandlerOptions } from './server.23VRZIfj.js';
+
+interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
+}
+
+export type { StandardRPCHandlerOptions as S };

package/dist/shared/{server.iM8li30u.d.mts → server.DJqfB27m.d.mts}

@@ -1,7 +1,7 @@
 import { HTTPPath, AnySchema, Meta, InferSchemaOutput, ErrorFromErrorMap } from '@orpc/contract';
-import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
+import { Interceptor } from '@orpc/shared';
 import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
-import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.CPteJIPP.mjs';
+import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.MZvbGc3n.mjs';
 import { ORPCError } from '@orpc/client';
 
 type StandardParams = Record<string, string>;
@@ -20,16 +20,10 @@ interface StandardCodec {
     decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
 }
 
-type StandardHandleOptions<T extends Context> = {
+interface StandardHandleOptions<T extends Context> {
     prefix?: HTTPPath;
-} & (Record<never, never> extends T ? {
-    context?: T;
-} : {
     context: T;
-});
-type WellStandardHandleOptions<T extends Context> = StandardHandleOptions<T> & {
-    context: T;
-};
+}
 type StandardHandleResult = {
     matched: true;
     response: StandardResponse;
@@ -37,11 +31,14 @@ type StandardHandleResult = {
     matched: false;
     response: undefined;
 };
-type StandardHandlerInterceptorOptions<TContext extends Context> = WellStandardHandleOptions<TContext> & {
+interface StandardHandlerPlugin<TContext extends Context> {
+    init?(options: StandardHandlerOptions<TContext>): void;
+}
+interface StandardHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
     request: StandardLazyRequest;
-};
+}
 interface StandardHandlerOptions<TContext extends Context> {
-    plugins?: HandlerPlugin<TContext>[];
+    plugins?: StandardHandlerPlugin<TContext>[];
     /**
      * Interceptors at the request level, helpful when you want catch errors
      */
@@ -59,19 +56,11 @@ interface StandardHandlerOptions<TContext extends Context> {
 declare class StandardHandler<T extends Context> {
     private readonly matcher;
     private readonly codec;
-    private readonly options;
-    private readonly plugin;
+    private readonly interceptors;
+    private readonly clientInterceptors;
+    private readonly rootInterceptors;
     constructor(router: Router<any, T>, matcher: StandardMatcher, codec: StandardCodec, options: NoInfer<StandardHandlerOptions<T>>);
-    handle(request: StandardLazyRequest, ...[options]: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<StandardHandleResult>;
-}
-
-interface HandlerPlugin<TContext extends Context> {
-    init?(options: StandardHandlerOptions<TContext>): void;
-}
-declare class CompositePlugin<TContext extends Context> implements HandlerPlugin<TContext> {
-    private readonly plugins;
-    constructor(plugins?: HandlerPlugin<TContext>[]);
-    init(options: StandardHandlerOptions<TContext>): void;
+    handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
 }
 
-export { CompositePlugin as C, type HandlerPlugin as H, type StandardHandleOptions as S, type WellStandardHandleOptions as W, type StandardHandlerInterceptorOptions as a, type StandardHandlerOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleResult as g, StandardHandler as h };
+export { type StandardHandleOptions as S, type StandardHandlerOptions as a, type StandardHandlerInterceptorOptions as b, type StandardHandlerPlugin as c, type StandardCodec as d, type StandardParams as e, type StandardMatcher as f, type StandardMatchResult as g, type StandardHandleResult as h, StandardHandler as i };

package/dist/shared/{server.CPteJIPP.d.mts → server.MZvbGc3n.d.mts}

@@ -1,19 +1,19 @@
 import { ORPCErrorCode, ORPCErrorOptions, ORPCError, ClientContext, Client } from '@orpc/client';
-import { IsNever, MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
+import { MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
 import { ErrorMap, ErrorMapItem, InferSchemaInput, HTTPPath, AnySchema, Meta, ContractProcedureDef, InferSchemaOutput, ErrorFromErrorMap, AnyContractRouter, ContractProcedure } from '@orpc/contract';
 
 type Context = Record<string, any>;
-type MergedContext<T extends Context, U extends Context> = T & U;
-declare function mergeContext<T extends Context, U extends Context>(context: T, other: U): MergedContext<T, U>;
-type ConflictContextGuard<T extends Context> = true extends IsNever<T> | {
-    [K in keyof T]: IsNever<T[K]>;
-}[keyof T] ? never : unknown;
+type MergedInitialContext<TInitial extends Context, TAdditional extends Context, TCurrent extends Context> = TInitial & Omit<TAdditional, keyof TCurrent>;
+type MergedCurrentContext<T extends Context, U extends Context> = Omit<T, keyof U> & U;
+declare function mergeCurrentContext<T extends Context, U extends Context>(context: T, other: U): MergedCurrentContext<T, U>;
 
 type ORPCErrorConstructorMapItemOptions<TData> = Omit<ORPCErrorOptions<TData>, 'defined' | 'status'>;
 type ORPCErrorConstructorMapItem<TCode extends ORPCErrorCode, TInData> = (...rest: MaybeOptionalOptions<ORPCErrorConstructorMapItemOptions<TInData>>) => ORPCError<TCode, TInData>;
 type ORPCErrorConstructorMap<T extends ErrorMap> = {
     [K in keyof T]: K extends ORPCErrorCode ? T[K] extends ErrorMapItem<infer UInputSchema> ? ORPCErrorConstructorMapItem<K, InferSchemaInput<UInputSchema>> : never : never;
 };
+declare function createORPCErrorConstructorMap<T extends ErrorMap>(errors: T): ORPCErrorConstructorMap<T>;
+declare function validateORPCError(map: ErrorMap, error: ORPCError<any, any>): Promise<ORPCError<string, unknown>>;
 
 declare const LAZY_SYMBOL: unique symbol;
 interface LazyMeta {
@@ -51,7 +51,7 @@ interface ProcedureHandler<TCurrentContext extends Context, TInput, THandlerOutp
 }
 interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TInputSchema, TOutputSchema, TErrorMap, TMeta> {
     __initialContext?: (type: TInitialContext) => unknown;
-    middlewares: AnyMiddleware[];
+    middlewares: readonly AnyMiddleware[];
     inputValidationIndex: number;
     outputValidationIndex: number;
     handler: ProcedureHandler<TCurrentContext, any, any, any, any>;
@@ -72,8 +72,8 @@ type MiddlewareNextFnOptions<TOutContext extends Context> = Record<never, never>
 } : {
     context: TOutContext;
 };
-interface MiddlewareNextFn<TInContext extends Context, TOutput> {
-    <U extends Context & Partial<TInContext> = Record<never, never>>(...rest: MaybeOptionalOptions<MiddlewareNextFnOptions<U>>): MiddlewareResult<U, TOutput>;
+interface MiddlewareNextFn<TOutput> {
+    <U extends Context = Record<never, never>>(...rest: MaybeOptionalOptions<MiddlewareNextFnOptions<U>>): MiddlewareResult<U, TOutput>;
 }
 interface MiddlewareOutputFn<TOutput> {
     (output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;
@@ -84,7 +84,7 @@ interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorConstruct
     procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
     signal?: AbortSignal;
     lastEventId: string | undefined;
-    next: MiddlewareNextFn<TInContext, TOutput>;
+    next: MiddlewareNextFn<TOutput>;
     errors: TErrorConstructorMap;
 }
 interface Middleware<TInContext extends Context, TOutContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
@@ -140,4 +140,4 @@ type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
 };
 
-export { type AnyProcedure as A, createProcedureClient as B, type Context as C, type InferRouterInitialContexts as D, type InferRouterCurrentContexts as E, type InferRouterInputs as F, type InferRouterOutputs as G, type InferRouterInitialContext as I, type Lazyable as L, type Middleware as M, type ORPCErrorConstructorMap as O, type ProcedureClientInterceptorOptions as P, type Router as R, type AnyRouter as a, Procedure as b, type ConflictContextGuard as c, type MergedContext as d, type MapInputMiddleware as e, type CreateProcedureClientOptions as f, type ProcedureClient as g, type AnyMiddleware as h, type Lazy as i, type ProcedureHandler as j, LAZY_SYMBOL as k, type LazyMeta as l, mergeContext as m, lazy as n, isLazy as o, getLazyMeta as p, type MiddlewareResult as q, type MiddlewareNextFnOptions as r, type MiddlewareNextFn as s, type MiddlewareOutputFn as t, unlazy as u, type MiddlewareOptions as v, middlewareOutputFn as w, type ProcedureHandlerOptions as x, type ProcedureDef as y, isProcedure as z };
+export { type AnyProcedure as A, middlewareOutputFn as B, type Context as C, type ProcedureHandlerOptions as D, type ProcedureDef as E, isProcedure as F, createProcedureClient as G, type InferRouterInitialContexts as H, type InferRouterInitialContext as I, type InferRouterCurrentContexts as J, type InferRouterInputs as K, type Lazyable as L, type Middleware as M, type InferRouterOutputs as N, type ORPCErrorConstructorMap as O, type ProcedureClientInterceptorOptions as P, type Router as R, type AnyRouter as a, Procedure as b, type MergedInitialContext as c, type MergedCurrentContext as d, type MapInputMiddleware as e, type CreateProcedureClientOptions as f, type ProcedureClient as g, type AnyMiddleware as h, type Lazy as i, type ProcedureHandler as j, type ORPCErrorConstructorMapItemOptions as k, type ORPCErrorConstructorMapItem as l, mergeCurrentContext as m, createORPCErrorConstructorMap as n, LAZY_SYMBOL as o, type LazyMeta as p, lazy as q, isLazy as r, getLazyMeta as s, type MiddlewareResult as t, unlazy as u, validateORPCError as v, type MiddlewareNextFnOptions as w, type MiddlewareNextFn as x, type MiddlewareOutputFn as y, type MiddlewareOptions as z };

package/dist/shared/{server.CPteJIPP.d.ts → server.MZvbGc3n.d.ts}

@@ -1,19 +1,19 @@
 import { ORPCErrorCode, ORPCErrorOptions, ORPCError, ClientContext, Client } from '@orpc/client';
-import { IsNever, MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
+import { MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
 import { ErrorMap, ErrorMapItem, InferSchemaInput, HTTPPath, AnySchema, Meta, ContractProcedureDef, InferSchemaOutput, ErrorFromErrorMap, AnyContractRouter, ContractProcedure } from '@orpc/contract';
 
 type Context = Record<string, any>;
-type MergedContext<T extends Context, U extends Context> = T & U;
-declare function mergeContext<T extends Context, U extends Context>(context: T, other: U): MergedContext<T, U>;
-type ConflictContextGuard<T extends Context> = true extends IsNever<T> | {
-    [K in keyof T]: IsNever<T[K]>;
-}[keyof T] ? never : unknown;
+type MergedInitialContext<TInitial extends Context, TAdditional extends Context, TCurrent extends Context> = TInitial & Omit<TAdditional, keyof TCurrent>;
+type MergedCurrentContext<T extends Context, U extends Context> = Omit<T, keyof U> & U;
+declare function mergeCurrentContext<T extends Context, U extends Context>(context: T, other: U): MergedCurrentContext<T, U>;
 
 type ORPCErrorConstructorMapItemOptions<TData> = Omit<ORPCErrorOptions<TData>, 'defined' | 'status'>;
 type ORPCErrorConstructorMapItem<TCode extends ORPCErrorCode, TInData> = (...rest: MaybeOptionalOptions<ORPCErrorConstructorMapItemOptions<TInData>>) => ORPCError<TCode, TInData>;
 type ORPCErrorConstructorMap<T extends ErrorMap> = {
     [K in keyof T]: K extends ORPCErrorCode ? T[K] extends ErrorMapItem<infer UInputSchema> ? ORPCErrorConstructorMapItem<K, InferSchemaInput<UInputSchema>> : never : never;
 };
+declare function createORPCErrorConstructorMap<T extends ErrorMap>(errors: T): ORPCErrorConstructorMap<T>;
+declare function validateORPCError(map: ErrorMap, error: ORPCError<any, any>): Promise<ORPCError<string, unknown>>;
 
 declare const LAZY_SYMBOL: unique symbol;
 interface LazyMeta {
@@ -51,7 +51,7 @@ interface ProcedureHandler<TCurrentContext extends Context, TInput, THandlerOutp
 }
 interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TInputSchema, TOutputSchema, TErrorMap, TMeta> {
     __initialContext?: (type: TInitialContext) => unknown;
-    middlewares: AnyMiddleware[];
+    middlewares: readonly AnyMiddleware[];
     inputValidationIndex: number;
     outputValidationIndex: number;
     handler: ProcedureHandler<TCurrentContext, any, any, any, any>;
@@ -72,8 +72,8 @@ type MiddlewareNextFnOptions<TOutContext extends Context> = Record<never, never>
 } : {
     context: TOutContext;
 };
-interface MiddlewareNextFn<TInContext extends Context, TOutput> {
-    <U extends Context & Partial<TInContext> = Record<never, never>>(...rest: MaybeOptionalOptions<MiddlewareNextFnOptions<U>>): MiddlewareResult<U, TOutput>;
+interface MiddlewareNextFn<TOutput> {
+    <U extends Context = Record<never, never>>(...rest: MaybeOptionalOptions<MiddlewareNextFnOptions<U>>): MiddlewareResult<U, TOutput>;
 }
 interface MiddlewareOutputFn<TOutput> {
     (output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;
@@ -84,7 +84,7 @@ interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorConstruct
     procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
     signal?: AbortSignal;
     lastEventId: string | undefined;
-    next: MiddlewareNextFn<TInContext, TOutput>;
+    next: MiddlewareNextFn<TOutput>;
     errors: TErrorConstructorMap;
 }
 interface Middleware<TInContext extends Context, TOutContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
@@ -140,4 +140,4 @@ type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
 };
 
-export { type AnyProcedure as A, createProcedureClient as B, type Context as C, type InferRouterInitialContexts as D, type InferRouterCurrentContexts as E, type InferRouterInputs as F, type InferRouterOutputs as G, type InferRouterInitialContext as I, type Lazyable as L, type Middleware as M, type ORPCErrorConstructorMap as O, type ProcedureClientInterceptorOptions as P, type Router as R, type AnyRouter as a, Procedure as b, type ConflictContextGuard as c, type MergedContext as d, type MapInputMiddleware as e, type CreateProcedureClientOptions as f, type ProcedureClient as g, type AnyMiddleware as h, type Lazy as i, type ProcedureHandler as j, LAZY_SYMBOL as k, type LazyMeta as l, mergeContext as m, lazy as n, isLazy as o, getLazyMeta as p, type MiddlewareResult as q, type MiddlewareNextFnOptions as r, type MiddlewareNextFn as s, type MiddlewareOutputFn as t, unlazy as u, type MiddlewareOptions as v, middlewareOutputFn as w, type ProcedureHandlerOptions as x, type ProcedureDef as y, isProcedure as z };
+export { type AnyProcedure as A, middlewareOutputFn as B, type Context as C, type ProcedureHandlerOptions as D, type ProcedureDef as E, isProcedure as F, createProcedureClient as G, type InferRouterInitialContexts as H, type InferRouterInitialContext as I, type InferRouterCurrentContexts as J, type InferRouterInputs as K, type Lazyable as L, type Middleware as M, type InferRouterOutputs as N, type ORPCErrorConstructorMap as O, type ProcedureClientInterceptorOptions as P, type Router as R, type AnyRouter as a, Procedure as b, type MergedInitialContext as c, type MergedCurrentContext as d, type MapInputMiddleware as e, type CreateProcedureClientOptions as f, type ProcedureClient as g, type AnyMiddleware as h, type Lazy as i, type ProcedureHandler as j, type ORPCErrorConstructorMapItemOptions as k, type ORPCErrorConstructorMapItem as l, mergeCurrentContext as m, createORPCErrorConstructorMap as n, LAZY_SYMBOL as o, type LazyMeta as p, lazy as q, isLazy as r, getLazyMeta as s, type MiddlewareResult as t, unlazy as u, validateORPCError as v, type MiddlewareNextFnOptions as w, type MiddlewareNextFn as x, type MiddlewareOutputFn as y, type MiddlewareOptions as z };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.6c5bfe4",
+  "version": "0.0.0-next.6d75718",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -58,15 +58,15 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@orpc/client": "0.0.0-next.6c5bfe4",
-    "@orpc/contract": "0.0.0-next.6c5bfe4",
-    "@orpc/standard-server": "0.0.0-next.6c5bfe4",
-    "@orpc/shared": "0.0.0-next.6c5bfe4",
-    "@orpc/standard-server-node": "0.0.0-next.6c5bfe4",
-    "@orpc/standard-server-fetch": "0.0.0-next.6c5bfe4"
+    "@orpc/client": "0.0.0-next.6d75718",
+    "@orpc/shared": "0.0.0-next.6d75718",
+    "@orpc/contract": "0.0.0-next.6d75718",
+    "@orpc/standard-server": "0.0.0-next.6d75718",
+    "@orpc/standard-server-fetch": "0.0.0-next.6d75718",
+    "@orpc/standard-server-node": "0.0.0-next.6d75718"
   },
   "devDependencies": {
-    "light-my-request": "^6.5.1"
+    "supertest": "^7.0.0"
   },
   "scripts": {
     "build": "unbuild",