@orpc/server 1.0.0-beta.5 → 1.0.0-beta.6

package/dist/adapters/fetch/index.d.mts

@@ -1,14 +1,21 @@
 import { C as Context, R as Router } from '../../shared/server.DLt5njUb.mjs';
 import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared';
-import { c as StandardHandlerPlugin, S as StandardHandleOptions, i as StandardHandler } from '../../shared/server.CzxlqYZL.mjs';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.DGnN7q3R.mjs';
+import { i as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, S as StandardHandleOptions, b as StandardHandler } from '../../shared/server.DOYDVeMX.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.CGCwEAt_.mjs';
 import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.B77ImKAP.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.DCQgF_JR.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
 
+interface FetchHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
+    initRuntimeAdapter?(options: FetchHandlerOptions<T>): void;
+}
+declare class CompositeFetchHandlerPlugin<T extends Context, TPlugin extends FetchHandlerPlugin<T>> extends CompositeStandardHandlerPlugin<T, TPlugin> implements FetchHandlerPlugin<T> {
+    initRuntimeAdapter(options: FetchHandlerOptions<T>): void;
+}
+
 type FetchHandleResult = {
     matched: true;
     response: Response;
@@ -16,9 +23,6 @@ type FetchHandleResult = {
     matched: false;
     response: undefined;
 };
-interface FetchHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
-    initRuntimeAdapter?(options: FetchHandlerOptions<T>): void;
-}
 interface FetchHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
     request: Request;
     toFetchResponseOptions: ToFetchResponseOptions;
@@ -51,4 +55,4 @@ declare class RPCHandler<T extends Context> extends FetchHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<FetchHandlerOptions<T> & StandardRPCHandlerOptions<T>>);
 }
 
-export { BodyLimitPlugin, type BodyLimitPluginOptions, type FetchHandleResult, FetchHandler, type FetchHandlerInterceptorOptions, type FetchHandlerOptions, type FetchHandlerPlugin, RPCHandler };
+export { BodyLimitPlugin, type BodyLimitPluginOptions, CompositeFetchHandlerPlugin, type FetchHandleResult, FetchHandler, type FetchHandlerInterceptorOptions, type FetchHandlerOptions, type FetchHandlerPlugin, RPCHandler };

package/dist/adapters/fetch/index.d.ts

@@ -1,14 +1,21 @@
 import { C as Context, R as Router } from '../../shared/server.DLt5njUb.js';
 import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared';
-import { c as StandardHandlerPlugin, S as StandardHandleOptions, i as StandardHandler } from '../../shared/server.BHlRCrf_.js';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.Cud5qk0c.js';
+import { i as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, S as StandardHandleOptions, b as StandardHandler } from '../../shared/server.DFFT_EZo.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server._2UufoXA.js';
 import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.DUF89eb-.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.C8NkqxHo.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
 
+interface FetchHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
+    initRuntimeAdapter?(options: FetchHandlerOptions<T>): void;
+}
+declare class CompositeFetchHandlerPlugin<T extends Context, TPlugin extends FetchHandlerPlugin<T>> extends CompositeStandardHandlerPlugin<T, TPlugin> implements FetchHandlerPlugin<T> {
+    initRuntimeAdapter(options: FetchHandlerOptions<T>): void;
+}
+
 type FetchHandleResult = {
     matched: true;
     response: Response;
@@ -16,9 +23,6 @@ type FetchHandleResult = {
     matched: false;
     response: undefined;
 };
-interface FetchHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
-    initRuntimeAdapter?(options: FetchHandlerOptions<T>): void;
-}
 interface FetchHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
     request: Request;
     toFetchResponseOptions: ToFetchResponseOptions;
@@ -51,4 +55,4 @@ declare class RPCHandler<T extends Context> extends FetchHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<FetchHandlerOptions<T> & StandardRPCHandlerOptions<T>>);
 }
 
-export { BodyLimitPlugin, type BodyLimitPluginOptions, type FetchHandleResult, FetchHandler, type FetchHandlerInterceptorOptions, type FetchHandlerOptions, type FetchHandlerPlugin, RPCHandler };
+export { BodyLimitPlugin, type BodyLimitPluginOptions, CompositeFetchHandlerPlugin, type FetchHandleResult, FetchHandler, type FetchHandlerInterceptorOptions, type FetchHandlerOptions, type FetchHandlerPlugin, RPCHandler };

package/dist/adapters/fetch/index.mjs

@@ -1,9 +1,11 @@
-export { B as BodyLimitPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.T5WmDoWQ.mjs';
+export { B as BodyLimitPlugin, C as CompositeFetchHandlerPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.Bm0UqHzd.mjs';
 import '@orpc/client';
-import '@orpc/client/standard';
-import '../../shared/server.Dfx1jV-K.mjs';
 import '@orpc/shared';
-import '../../shared/server.e3W6AG3-.mjs';
 import '@orpc/contract';
+import '../../shared/server.DFuJLDuo.mjs';
+import '@orpc/client/standard';
+import '@orpc/standard-server/batch';
+import '../../shared/server.BW-nUGgA.mjs';
+import '../../shared/server.C37gDhSZ.mjs';
 import '@orpc/standard-server-fetch';
 import '../../shared/server.BVwwTHyO.mjs';

package/dist/adapters/hono/index.d.mts

@@ -1,12 +1,12 @@
 import { FetchHandler } from '../fetch/index.mjs';
-export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.mjs';
+export { BodyLimitPlugin, BodyLimitPluginOptions, CompositeFetchHandlerPlugin, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.mjs';
 import { Value, MaybeOptionalOptions } from '@orpc/shared';
 import { Context as Context$1, MiddlewareHandler } from 'hono';
 import { C as Context } from '../../shared/server.DLt5njUb.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.CzxlqYZL.mjs';
-import '../../shared/server.DGnN7q3R.mjs';
+import { S as StandardHandleOptions } from '../../shared/server.DOYDVeMX.mjs';
+import '../../shared/server.CGCwEAt_.mjs';
 import '@orpc/standard-server-fetch';
-import '../../shared/server.B77ImKAP.mjs';
+import '../../shared/server.DCQgF_JR.mjs';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/contract';
@@ -17,6 +17,6 @@ type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>,
 } : {
     context: Value<T, [Context$1]>;
 });
-declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
+declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...rest: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
 
 export { type CreateMiddlewareOptions, FetchHandler, createMiddleware };

package/dist/adapters/hono/index.d.ts

@@ -1,12 +1,12 @@
 import { FetchHandler } from '../fetch/index.js';
-export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.js';
+export { BodyLimitPlugin, BodyLimitPluginOptions, CompositeFetchHandlerPlugin, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.js';
 import { Value, MaybeOptionalOptions } from '@orpc/shared';
 import { Context as Context$1, MiddlewareHandler } from 'hono';
 import { C as Context } from '../../shared/server.DLt5njUb.js';
-import { S as StandardHandleOptions } from '../../shared/server.BHlRCrf_.js';
-import '../../shared/server.Cud5qk0c.js';
+import { S as StandardHandleOptions } from '../../shared/server.DFFT_EZo.js';
+import '../../shared/server._2UufoXA.js';
 import '@orpc/standard-server-fetch';
-import '../../shared/server.DUF89eb-.js';
+import '../../shared/server.C8NkqxHo.js';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/contract';
@@ -17,6 +17,6 @@ type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>,
 } : {
     context: Value<T, [Context$1]>;
 });
-declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
+declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...rest: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
 
 export { type CreateMiddlewareOptions, FetchHandler, createMiddleware };

package/dist/adapters/hono/index.mjs

@@ -1,14 +1,17 @@
-export { B as BodyLimitPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.T5WmDoWQ.mjs';
-import { value } from '@orpc/shared';
+export { B as BodyLimitPlugin, C as CompositeFetchHandlerPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.Bm0UqHzd.mjs';
+import { resolveMaybeOptionalOptions, value } from '@orpc/shared';
 import '@orpc/client';
-import '@orpc/client/standard';
-import '../../shared/server.Dfx1jV-K.mjs';
-import '../../shared/server.e3W6AG3-.mjs';
 import '@orpc/contract';
+import '../../shared/server.DFuJLDuo.mjs';
+import '@orpc/client/standard';
+import '@orpc/standard-server/batch';
+import '../../shared/server.BW-nUGgA.mjs';
+import '../../shared/server.C37gDhSZ.mjs';
 import '@orpc/standard-server-fetch';
 import '../../shared/server.BVwwTHyO.mjs';
 
-function createMiddleware(handler, ...[options]) {
+function createMiddleware(handler, ...rest) {
+  const options = resolveMaybeOptionalOptions(rest);
   return async (c, next) => {
     const bodyProps = /* @__PURE__ */ new Set(["arrayBuffer", "blob", "formData", "json", "text"]);
     const request = c.req.method === "GET" || c.req.method === "HEAD" ? c.req.raw : new Proxy(c.req.raw, {
@@ -20,7 +23,7 @@ function createMiddleware(handler, ...[options]) {
         return Reflect.get(target, prop, target);
       }
     });
-    const context = await value(options?.context ?? {}, c);
+    const context = await value(options.context ?? {}, c);
     const { matched, response } = await handler.handle(request, { ...options, context });
     if (matched) {
       return c.newResponse(response.body, response);

package/dist/adapters/next/index.d.mts

@@ -1,12 +1,12 @@
 import { FetchHandler } from '../fetch/index.mjs';
-export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.mjs';
+export { BodyLimitPlugin, BodyLimitPluginOptions, CompositeFetchHandlerPlugin, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.mjs';
 import { Value, MaybeOptionalOptions } from '@orpc/shared';
 import { NextRequest } from 'next/server';
 import { C as Context } from '../../shared/server.DLt5njUb.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.CzxlqYZL.mjs';
-import '../../shared/server.DGnN7q3R.mjs';
+import { S as StandardHandleOptions } from '../../shared/server.DOYDVeMX.mjs';
+import '../../shared/server.CGCwEAt_.mjs';
 import '@orpc/standard-server-fetch';
-import '../../shared/server.B77ImKAP.mjs';
+import '../../shared/server.DCQgF_JR.mjs';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/contract';
@@ -24,6 +24,6 @@ interface ServeResult {
     PATCH(req: NextRequest): Promise<Response>;
     DELETE(req: NextRequest): Promise<Response>;
 }
-declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
+declare function serve<T extends Context>(handler: FetchHandler<T>, ...rest: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
 
 export { FetchHandler, type ServeOptions, type ServeResult, serve };

package/dist/adapters/next/index.d.ts

@@ -1,12 +1,12 @@
 import { FetchHandler } from '../fetch/index.js';
-export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.js';
+export { BodyLimitPlugin, BodyLimitPluginOptions, CompositeFetchHandlerPlugin, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.js';
 import { Value, MaybeOptionalOptions } from '@orpc/shared';
 import { NextRequest } from 'next/server';
 import { C as Context } from '../../shared/server.DLt5njUb.js';
-import { S as StandardHandleOptions } from '../../shared/server.BHlRCrf_.js';
-import '../../shared/server.Cud5qk0c.js';
+import { S as StandardHandleOptions } from '../../shared/server.DFFT_EZo.js';
+import '../../shared/server._2UufoXA.js';
 import '@orpc/standard-server-fetch';
-import '../../shared/server.DUF89eb-.js';
+import '../../shared/server.C8NkqxHo.js';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/contract';
@@ -24,6 +24,6 @@ interface ServeResult {
     PATCH(req: NextRequest): Promise<Response>;
     DELETE(req: NextRequest): Promise<Response>;
 }
-declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
+declare function serve<T extends Context>(handler: FetchHandler<T>, ...rest: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
 
 export { FetchHandler, type ServeOptions, type ServeResult, serve };

package/dist/adapters/next/index.mjs

@@ -1,16 +1,19 @@
-export { B as BodyLimitPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.T5WmDoWQ.mjs';
-import { value } from '@orpc/shared';
+export { B as BodyLimitPlugin, C as CompositeFetchHandlerPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.Bm0UqHzd.mjs';
+import { resolveMaybeOptionalOptions, value } from '@orpc/shared';
 import '@orpc/client';
-import '@orpc/client/standard';
-import '../../shared/server.Dfx1jV-K.mjs';
-import '../../shared/server.e3W6AG3-.mjs';
 import '@orpc/contract';
+import '../../shared/server.DFuJLDuo.mjs';
+import '@orpc/client/standard';
+import '@orpc/standard-server/batch';
+import '../../shared/server.BW-nUGgA.mjs';
+import '../../shared/server.C37gDhSZ.mjs';
 import '@orpc/standard-server-fetch';
 import '../../shared/server.BVwwTHyO.mjs';
 
-function serve(handler, ...[options]) {
+function serve(handler, ...rest) {
+  const options = resolveMaybeOptionalOptions(rest);
   const main = async (req) => {
-    const context = await value(options?.context ?? {}, req);
+    const context = await value(options.context ?? {}, req);
     const { matched, response } = await handler.handle(req, { ...options, context });
     if (matched) {
       return response;

package/dist/adapters/node/index.d.mts

@@ -1,22 +1,26 @@
 import { C as Context, R as Router } from '../../shared/server.DLt5njUb.mjs';
 import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared';
 import { SendStandardResponseOptions, NodeHttpRequest, NodeHttpResponse } from '@orpc/standard-server-node';
-import { c as StandardHandlerPlugin, S as StandardHandleOptions, i as StandardHandler } from '../../shared/server.CzxlqYZL.mjs';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.DGnN7q3R.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.B77ImKAP.mjs';
+import { i as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, S as StandardHandleOptions, b as StandardHandler } from '../../shared/server.DOYDVeMX.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.CGCwEAt_.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.DCQgF_JR.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
 
+interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
+    initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;
+}
+declare class CompositeNodeHttpHandlerPlugin<T extends Context, TPlugin extends NodeHttpHandlerPlugin<T>> extends CompositeStandardHandlerPlugin<T, TPlugin> implements NodeHttpHandlerPlugin<T> {
+    initRuntimeAdapter(options: NodeHttpHandlerOptions<T>): void;
+}
+
 type NodeHttpHandleResult = {
     matched: true;
 } | {
     matched: false;
 };
-interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
-    initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;
-}
 interface NodeHttpHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
     request: NodeHttpRequest;
     response: NodeHttpResponse;
@@ -50,4 +54,4 @@ declare class RPCHandler<T extends Context> extends NodeHttpHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T> & NodeHttpHandlerOptions<T>>);
 }
 
-export { BodyLimitPlugin, type BodyLimitPluginOptions, type NodeHttpHandleResult, NodeHttpHandler, type NodeHttpHandlerInterceptorOptions, type NodeHttpHandlerOptions, type NodeHttpHandlerPlugin, RPCHandler };
+export { BodyLimitPlugin, type BodyLimitPluginOptions, CompositeNodeHttpHandlerPlugin, type NodeHttpHandleResult, NodeHttpHandler, type NodeHttpHandlerInterceptorOptions, type NodeHttpHandlerOptions, type NodeHttpHandlerPlugin, RPCHandler };

package/dist/adapters/node/index.d.ts

@@ -1,22 +1,26 @@
 import { C as Context, R as Router } from '../../shared/server.DLt5njUb.js';
 import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared';
 import { SendStandardResponseOptions, NodeHttpRequest, NodeHttpResponse } from '@orpc/standard-server-node';
-import { c as StandardHandlerPlugin, S as StandardHandleOptions, i as StandardHandler } from '../../shared/server.BHlRCrf_.js';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.Cud5qk0c.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.DUF89eb-.js';
+import { i as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, S as StandardHandleOptions, b as StandardHandler } from '../../shared/server.DFFT_EZo.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server._2UufoXA.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.C8NkqxHo.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
 
+interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
+    initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;
+}
+declare class CompositeNodeHttpHandlerPlugin<T extends Context, TPlugin extends NodeHttpHandlerPlugin<T>> extends CompositeStandardHandlerPlugin<T, TPlugin> implements NodeHttpHandlerPlugin<T> {
+    initRuntimeAdapter(options: NodeHttpHandlerOptions<T>): void;
+}
+
 type NodeHttpHandleResult = {
     matched: true;
 } | {
     matched: false;
 };
-interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
-    initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;
-}
 interface NodeHttpHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
     request: NodeHttpRequest;
     response: NodeHttpResponse;
@@ -50,4 +54,4 @@ declare class RPCHandler<T extends Context> extends NodeHttpHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T> & NodeHttpHandlerOptions<T>>);
 }
 
-export { BodyLimitPlugin, type BodyLimitPluginOptions, type NodeHttpHandleResult, NodeHttpHandler, type NodeHttpHandlerInterceptorOptions, type NodeHttpHandlerOptions, type NodeHttpHandlerPlugin, RPCHandler };
+export { BodyLimitPlugin, type BodyLimitPluginOptions, CompositeNodeHttpHandlerPlugin, type NodeHttpHandleResult, NodeHttpHandler, type NodeHttpHandlerInterceptorOptions, type NodeHttpHandlerOptions, type NodeHttpHandlerPlugin, RPCHandler };

package/dist/adapters/node/index.mjs

@@ -2,10 +2,12 @@ import { ORPCError } from '@orpc/client';
 import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-node';
 import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
-import { StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
-import { S as StandardHandler, b as StandardRPCMatcher, a as StandardRPCCodec } from '../../shared/server.Dfx1jV-K.mjs';
-import '../../shared/server.e3W6AG3-.mjs';
 import '@orpc/contract';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.DFuJLDuo.mjs';
+import '@orpc/client/standard';
+import '@orpc/standard-server/batch';
+import '../../shared/server.BW-nUGgA.mjs';
+import '../../shared/server.C37gDhSZ.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;
@@ -39,12 +41,19 @@ class BodyLimitPlugin {
   }
 }
 
+class CompositeNodeHttpHandlerPlugin extends CompositeStandardHandlerPlugin {
+  initRuntimeAdapter(options) {
+    for (const plugin of this.plugins) {
+      plugin.initRuntimeAdapter?.(options);
+    }
+  }
+}
+
 class NodeHttpHandler {
   constructor(standardHandler, options = {}) {
     this.standardHandler = standardHandler;
-    for (const plugin of toArray(options.plugins)) {
-      plugin.initRuntimeAdapter?.(options);
-    }
+    const plugin = new CompositeNodeHttpHandlerPlugin(options.plugins);
+    plugin.initRuntimeAdapter(options);
     this.adapterInterceptors = toArray(options.adapterInterceptors);
     this.sendStandardResponseOptions = options;
   }
@@ -74,12 +83,8 @@ class NodeHttpHandler {
 
 class RPCHandler extends NodeHttpHandler {
   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);
+    super(new StandardRPCHandler(router, options), options);
   }
 }
 
-export { BodyLimitPlugin, NodeHttpHandler, RPCHandler };
+export { BodyLimitPlugin, CompositeNodeHttpHandlerPlugin, NodeHttpHandler, RPCHandler };

package/dist/adapters/standard/index.d.mts

@@ -1,10 +1,10 @@
-import { d as StandardCodec, e as StandardParams, f as StandardMatcher, g as StandardMatchResult } from '../../shared/server.CzxlqYZL.mjs';
-export { S as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, b as StandardHandlerInterceptorOptions, a as StandardHandlerOptions, c as StandardHandlerPlugin } from '../../shared/server.CzxlqYZL.mjs';
+import { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.DOYDVeMX.mjs';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandleOptions, g as StandardHandleResult, b as StandardHandler, h as StandardHandlerInterceptorOptions, a as StandardHandlerOptions, i as StandardHandlerPlugin } from '../../shared/server.DOYDVeMX.mjs';
 import { ORPCError, HTTPPath } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
 import { A as AnyProcedure, a as AnyRouter } from '../../shared/server.DLt5njUb.mjs';
-export { S as StandardRPCHandlerOptions } from '../../shared/server.B77ImKAP.mjs';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.DCQgF_JR.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 

package/dist/adapters/standard/index.d.ts

@@ -1,10 +1,10 @@
-import { d as StandardCodec, e as StandardParams, f as StandardMatcher, g as StandardMatchResult } from '../../shared/server.BHlRCrf_.js';
-export { S as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, b as StandardHandlerInterceptorOptions, a as StandardHandlerOptions, c as StandardHandlerPlugin } from '../../shared/server.BHlRCrf_.js';
+import { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.DFFT_EZo.js';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandleOptions, g as StandardHandleResult, b as StandardHandler, h as StandardHandlerInterceptorOptions, a as StandardHandlerOptions, i as StandardHandlerPlugin } from '../../shared/server.DFFT_EZo.js';
 import { ORPCError, HTTPPath } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
 import { A as AnyProcedure, a as AnyRouter } from '../../shared/server.DLt5njUb.js';
-export { S as StandardRPCHandlerOptions } from '../../shared/server.DUF89eb-.js';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.C8NkqxHo.js';
 import '@orpc/contract';
 import '@orpc/shared';
 

package/dist/adapters/standard/index.mjs

@@ -1,6 +1,8 @@
-export { S as StandardHandler, a as StandardRPCCodec, b as StandardRPCMatcher } from '../../shared/server.Dfx1jV-K.mjs';
-import '@orpc/client';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.DFuJLDuo.mjs';
+import '@orpc/client/standard';
 import '@orpc/shared';
-import '../../shared/server.e3W6AG3-.mjs';
+import '@orpc/standard-server/batch';
+import '@orpc/client';
+import '../../shared/server.BW-nUGgA.mjs';
 import '@orpc/contract';
-import '@orpc/client/standard';
+import '../../shared/server.C37gDhSZ.mjs';

package/dist/index.d.mts

@@ -1,9 +1,9 @@
 import { ORPCErrorJSON, ORPCError, Client, ClientContext, HTTPPath, ClientPromiseResult } from '@orpc/client';
-export { HTTPMethod, HTTPPath, ORPCError, isDefinedError, safe } from '@orpc/client';
+export { ClientContext, HTTPMethod, HTTPPath, ORPCError, isDefinedError, safe } from '@orpc/client';
 import { AnySchema, ErrorMap, InferSchemaInput, InferSchemaOutput, ErrorFromErrorMap, Meta, MergedErrorMap, Route, EnhanceRouteOptions, AnyContractRouter, AnyContractProcedure, Schema, ContractRouter, ContractProcedureDef, ContractProcedure, InferContractRouterErrorMap, InferContractRouterMeta } from '@orpc/contract';
 export { ContractProcedure, ContractProcedureDef, ContractRouter, ErrorMap, ErrorMapItem, InferSchemaInput, InferSchemaOutput, InputStructure, MergedErrorMap, Meta, OutputStructure, Route, Schema, ValidationError, eventIterator, type } from '@orpc/contract';
 import { ThrowableError, IntersectPick, MaybeOptionalOptions } from '@orpc/shared';
-export { Registry, ThrowableError, onError, onFinish, onStart, onSuccess } from '@orpc/shared';
+export { IntersectPick, Registry, ThrowableError, onError, onFinish, onStart, onSuccess } from '@orpc/shared';
 import { C as Context, b as Procedure, M as Middleware, O as ORPCErrorConstructorMap, c as MergedInitialContext, d as MergedCurrentContext, e as MapInputMiddleware, f as CreateProcedureClientOptions, g as ProcedureClient, h as AnyMiddleware, L as Lazyable, a as AnyRouter, i as Lazy, A as AnyProcedure, j as ProcedureHandler, R as Router, I as InferRouterInitialContext } from './shared/server.DLt5njUb.mjs';
 export { J as InferRouterCurrentContexts, H as InferRouterInitialContexts, K as InferRouterInputs, N as InferRouterOutputs, o as LAZY_SYMBOL, p as LazyMeta, x as MiddlewareNextFn, w as MiddlewareNextFnOptions, z as MiddlewareOptions, y as MiddlewareOutputFn, t as MiddlewareResult, l as ORPCErrorConstructorMapItem, k as ORPCErrorConstructorMapItemOptions, P as ProcedureClientInterceptorOptions, E as ProcedureDef, D as ProcedureHandlerOptions, n as createORPCErrorConstructorMap, G as createProcedureClient, s as getLazyMeta, r as isLazy, F as isProcedure, q as lazy, m as mergeCurrentContext, B as middlewareOutputFn, u as unlazy, v as validateORPCError } from './shared/server.DLt5njUb.mjs';
 export { getEventMeta, withEventMeta } from '@orpc/standard-server';
@@ -283,7 +283,7 @@ declare function call<TInitialContext extends Context, TInputSchema extends AnyS
 type RouterClient<TRouter extends AnyRouter, TClientContext extends ClientContext = Record<never, never>> = TRouter extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UErrorMap, any> ? ProcedureClient<TClientContext, UInputSchema, UOutputSchema, UErrorMap> : {
     [K in keyof TRouter]: TRouter[K] extends Lazyable<infer U extends AnyRouter> ? RouterClient<U, TClientContext> : never;
 };
-declare function createRouterClient<T extends AnyRouter, TClientContext extends ClientContext>(router: Lazyable<T | undefined>, ...[options]: MaybeOptionalOptions<CreateProcedureClientOptions<InferRouterInitialContext<T>, Schema<unknown, unknown>, ErrorMap, Meta, TClientContext>>): RouterClient<T, TClientContext>;
+declare function createRouterClient<T extends AnyRouter, TClientContext extends ClientContext>(router: Lazyable<T | undefined>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<InferRouterInitialContext<T>, Schema<unknown, unknown>, ErrorMap, Meta, TClientContext>>): RouterClient<T, TClientContext>;
 
 declare function setHiddenRouterContract<T extends Lazyable<AnyRouter>>(router: T, contract: AnyContractRouter): T;
 declare function getHiddenRouterContract(router: Lazyable<AnyRouter | AnyContractRouter>): AnyContractRouter | undefined;

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import { ORPCErrorJSON, ORPCError, Client, ClientContext, HTTPPath, ClientPromiseResult } from '@orpc/client';
-export { HTTPMethod, HTTPPath, ORPCError, isDefinedError, safe } from '@orpc/client';
+export { ClientContext, HTTPMethod, HTTPPath, ORPCError, isDefinedError, safe } from '@orpc/client';
 import { AnySchema, ErrorMap, InferSchemaInput, InferSchemaOutput, ErrorFromErrorMap, Meta, MergedErrorMap, Route, EnhanceRouteOptions, AnyContractRouter, AnyContractProcedure, Schema, ContractRouter, ContractProcedureDef, ContractProcedure, InferContractRouterErrorMap, InferContractRouterMeta } from '@orpc/contract';
 export { ContractProcedure, ContractProcedureDef, ContractRouter, ErrorMap, ErrorMapItem, InferSchemaInput, InferSchemaOutput, InputStructure, MergedErrorMap, Meta, OutputStructure, Route, Schema, ValidationError, eventIterator, type } from '@orpc/contract';
 import { ThrowableError, IntersectPick, MaybeOptionalOptions } from '@orpc/shared';
-export { Registry, ThrowableError, onError, onFinish, onStart, onSuccess } from '@orpc/shared';
+export { IntersectPick, Registry, ThrowableError, onError, onFinish, onStart, onSuccess } from '@orpc/shared';
 import { C as Context, b as Procedure, M as Middleware, O as ORPCErrorConstructorMap, c as MergedInitialContext, d as MergedCurrentContext, e as MapInputMiddleware, f as CreateProcedureClientOptions, g as ProcedureClient, h as AnyMiddleware, L as Lazyable, a as AnyRouter, i as Lazy, A as AnyProcedure, j as ProcedureHandler, R as Router, I as InferRouterInitialContext } from './shared/server.DLt5njUb.js';
 export { J as InferRouterCurrentContexts, H as InferRouterInitialContexts, K as InferRouterInputs, N as InferRouterOutputs, o as LAZY_SYMBOL, p as LazyMeta, x as MiddlewareNextFn, w as MiddlewareNextFnOptions, z as MiddlewareOptions, y as MiddlewareOutputFn, t as MiddlewareResult, l as ORPCErrorConstructorMapItem, k as ORPCErrorConstructorMapItemOptions, P as ProcedureClientInterceptorOptions, E as ProcedureDef, D as ProcedureHandlerOptions, n as createORPCErrorConstructorMap, G as createProcedureClient, s as getLazyMeta, r as isLazy, F as isProcedure, q as lazy, m as mergeCurrentContext, B as middlewareOutputFn, u as unlazy, v as validateORPCError } from './shared/server.DLt5njUb.js';
 export { getEventMeta, withEventMeta } from '@orpc/standard-server';
@@ -283,7 +283,7 @@ declare function call<TInitialContext extends Context, TInputSchema extends AnyS
 type RouterClient<TRouter extends AnyRouter, TClientContext extends ClientContext = Record<never, never>> = TRouter extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UErrorMap, any> ? ProcedureClient<TClientContext, UInputSchema, UOutputSchema, UErrorMap> : {
     [K in keyof TRouter]: TRouter[K] extends Lazyable<infer U extends AnyRouter> ? RouterClient<U, TClientContext> : never;
 };
-declare function createRouterClient<T extends AnyRouter, TClientContext extends ClientContext>(router: Lazyable<T | undefined>, ...[options]: MaybeOptionalOptions<CreateProcedureClientOptions<InferRouterInitialContext<T>, Schema<unknown, unknown>, ErrorMap, Meta, TClientContext>>): RouterClient<T, TClientContext>;
+declare function createRouterClient<T extends AnyRouter, TClientContext extends ClientContext>(router: Lazyable<T | undefined>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<InferRouterInitialContext<T>, Schema<unknown, unknown>, ErrorMap, Meta, TClientContext>>): RouterClient<T, TClientContext>;
 
 declare function setHiddenRouterContract<T extends Lazyable<AnyRouter>>(router: T, contract: AnyContractRouter): T;
 declare function getHiddenRouterContract(router: Lazyable<AnyRouter | AnyContractRouter>): AnyContractRouter | undefined;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { mergeErrorMap, mergeMeta, mergeRoute, mergePrefix, mergeTags, isContractProcedure, getContractRouter } from '@orpc/contract';
 export { ValidationError, eventIterator, type } from '@orpc/contract';
-import { P as Procedure, b as addMiddleware, c as createProcedureClient, e as enhanceRouter, l as lazy, s as setHiddenRouterContract, i as isProcedure, d as isLazy, f as createAssertedLazyProcedure, g as getRouter } from './shared/server.e3W6AG3-.mjs';
-export { L as LAZY_SYMBOL, p as call, r as createAccessibleLazyRouter, a as createContractedProcedure, h as createORPCErrorConstructorMap, q as getHiddenRouterContract, j as getLazyMeta, n as isStartWithMiddlewares, m as mergeCurrentContext, o as mergeMiddlewares, k as middlewareOutputFn, w as resolveContractProcedures, t as traverseContractProcedures, u as unlazy, x as unlazyRouter, v as validateORPCError } from './shared/server.e3W6AG3-.mjs';
+import { P as Procedure, b as addMiddleware, c as createProcedureClient, e as enhanceRouter, l as lazy, s as setHiddenRouterContract, i as isProcedure, d as isLazy, f as createAssertedLazyProcedure, g as getRouter } from './shared/server.C37gDhSZ.mjs';
+export { L as LAZY_SYMBOL, p as call, r as createAccessibleLazyRouter, a as createContractedProcedure, h as createORPCErrorConstructorMap, q as getHiddenRouterContract, j as getLazyMeta, n as isStartWithMiddlewares, m as mergeCurrentContext, o as mergeMiddlewares, k as middlewareOutputFn, w as resolveContractProcedures, t as traverseContractProcedures, u as unlazy, x as unlazyRouter, v as validateORPCError } from './shared/server.C37gDhSZ.mjs';
 import { toORPCError } from '@orpc/client';
 export { ORPCError, isDefinedError, safe } from '@orpc/client';
 export { onError, onFinish, onStart, onSuccess } from '@orpc/shared';
@@ -336,12 +336,12 @@ function implement(contract, config = {}) {
   return impl;
 }
 
-function createRouterClient(router, ...[options]) {
+function createRouterClient(router, ...rest) {
   if (isProcedure(router)) {
-    const caller = createProcedureClient(router, options);
+    const caller = createProcedureClient(router, ...rest);
     return caller;
   }
-  const procedureCaller = isLazy(router) ? createProcedureClient(createAssertedLazyProcedure(router), options) : {};
+  const procedureCaller = isLazy(router) ? createProcedureClient(createAssertedLazyProcedure(router), ...rest) : {};
   const recursive = new Proxy(procedureCaller, {
     get(target, key) {
       if (typeof key !== "string") {
@@ -352,8 +352,8 @@ function createRouterClient(router, ...[options]) {
         return Reflect.get(target, key);
       }
       return createRouterClient(next, {
-        ...options,
-        path: [...options?.path ?? [], key]
+        ...rest[0],
+        path: [...rest[0]?.path ?? [], key]
       });
     }
   });