@orpc/server 0.36.1 → 0.38.0

package/dist/{chunk-F75AQ6KO.js → chunk-GIXDBJGV.js}

@@ -6,7 +6,7 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-SV6DBVXJ.js";
+} from "./chunk-XP6YRLY2.js";
 import {
   CompositePlugin
 } from "./chunk-XFBAK67J.js";
@@ -75,9 +75,12 @@ var StandardHandler = class {
 };
 
 // src/adapters/standard/rpc-serializer.ts
-import { findDeepMatches, isPlainObject, set } from "@orpc/shared";
+import { findDeepMatches, isObject, set } from "@orpc/shared";
 var RPCSerializer = class {
   serialize(data) {
+    if (data === void 0) {
+      return void 0;
+    }
     if (data instanceof Blob) {
       return data;
     }
@@ -95,6 +98,9 @@ var RPCSerializer = class {
     return form;
   }
   deserialize(serialized) {
+    if (serialized === void 0) {
+      return void 0;
+    }
     if (serialized instanceof Blob) {
       return serialized;
     }
@@ -131,7 +137,7 @@ function serializeRPCJson(value, segments = [], meta = []) {
     meta.push(["url", segments]);
     return { json: value.toString(), meta };
   }
-  if (isPlainObject(value)) {
+  if (isObject(value)) {
     const json = {};
     for (const k in value) {
       json[k] = serializeRPCJson(value[k], [...segments, k], meta).json;
@@ -310,4 +316,4 @@ export {
   RPCCodec,
   RPCMatcher
 };
-//# sourceMappingURL=chunk-F75AQ6KO.js.map
+//# sourceMappingURL=chunk-GIXDBJGV.js.map

package/dist/{chunk-GQ4376GR.js → chunk-WJ2G7572.js}

@@ -2,7 +2,7 @@ import {
   RPCCodec,
   RPCMatcher,
   StandardHandler
-} from "./chunk-F75AQ6KO.js";
+} from "./chunk-GIXDBJGV.js";
 
 // src/adapters/fetch/utils.ts
 import { once } from "@orpc/shared";
@@ -25,12 +25,14 @@ async function fetchReToStandardBody(re) {
     return void 0;
   }
   const contentDisposition2 = re.headers.get("content-disposition");
-  const fileName = contentDisposition2 ? parseContentDisposition(contentDisposition2).parameters.filename : void 0;
-  if (typeof fileName === "string") {
-    const blob2 = await re.blob();
-    return new File([blob2], fileName, {
-      type: blob2.type
-    });
+  if (contentDisposition2) {
+    const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
+    if (typeof fileName === "string") {
+      const blob2 = await re.blob();
+      return new File([blob2], fileName, {
+        type: blob2.type
+      });
+    }
   }
   const contentType = re.headers.get("content-type");
   if (!contentType || contentType.startsWith("application/json")) {
@@ -85,24 +87,32 @@ function standardResponseToFetchHeaders(response) {
       fetchHeaders.append(key, value);
     }
   }
-  if (response.body instanceof Blob && !fetchHeaders.has("content-disposition")) {
-    fetchHeaders.set("content-disposition", contentDisposition(response.body instanceof File ? response.body.name : "blob"));
-  } else if (!(response.body instanceof Blob) && !(response.body instanceof URLSearchParams) && !(response.body instanceof FormData) && response.body !== void 0 && !fetchHeaders.has("content-type")) {
-    fetchHeaders.set("content-type", "application/json");
-  }
   return fetchHeaders;
 }
-function standardBodyToFetchBody(body) {
-  if (body instanceof Blob || body instanceof FormData || body instanceof URLSearchParams) {
-    return body;
-  }
-  return JSON.stringify(body);
-}
 function standardResponseToFetchResponse(response) {
-  return new Response(standardBodyToFetchBody(response.body), {
-    headers: standardResponseToFetchHeaders(response),
-    status: response.status
-  });
+  const resHeaders = standardResponseToFetchHeaders(response);
+  resHeaders.delete("content-type");
+  resHeaders.delete("content-disposition");
+  if (response.body === void 0) {
+    return new Response(void 0, { headers: resHeaders, status: response.status });
+  }
+  if (response.body instanceof Blob) {
+    resHeaders.set("content-type", response.body.type);
+    resHeaders.set("content-length", response.body.size.toString());
+    resHeaders.set(
+      "content-disposition",
+      contentDisposition(response.body instanceof File ? response.body.name : "blob", { type: "inline" })
+    );
+    return new Response(response.body, { headers: resHeaders, status: response.status });
+  }
+  if (response.body instanceof FormData) {
+    return new Response(response.body, { headers: resHeaders, status: response.status });
+  }
+  if (response.body instanceof URLSearchParams) {
+    return new Response(response.body, { headers: resHeaders, status: response.status });
+  }
+  resHeaders.set("content-type", "application/json");
+  return new Response(JSON.stringify(response.body), { headers: resHeaders, status: response.status });
 }
 
 // src/adapters/fetch/rpc-handler.ts
@@ -129,8 +139,7 @@ var RPCHandler = class {
 export {
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse,
   RPCHandler
 };
-//# sourceMappingURL=chunk-GQ4376GR.js.map
+//# sourceMappingURL=chunk-WJ2G7572.js.map

package/dist/{chunk-SV6DBVXJ.js → chunk-XP6YRLY2.js}

@@ -68,7 +68,8 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
   return async (...[input, callerOptions]) => {
     const path = options?.path ?? [];
     const { default: procedure } = await unlazy(lazyableProcedure);
-    const context = await value(options?.context ?? {}, callerOptions?.context);
+    const clientContext = callerOptions?.context ?? {};
+    const context = await value(options?.context ?? {}, clientContext);
     const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
     try {
       return await intercept(
@@ -374,4 +375,4 @@ export {
   convertPathToHttpPath,
   createContractedProcedure
 };
-//# sourceMappingURL=chunk-SV6DBVXJ.js.map
+//# sourceMappingURL=chunk-XP6YRLY2.js.map

package/dist/fetch.js

@@ -2,17 +2,15 @@ import {
   RPCHandler,
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
-} from "./chunk-GQ4376GR.js";
-import "./chunk-F75AQ6KO.js";
-import "./chunk-SV6DBVXJ.js";
+} from "./chunk-WJ2G7572.js";
+import "./chunk-GIXDBJGV.js";
+import "./chunk-XP6YRLY2.js";
 import "./chunk-XFBAK67J.js";
 export {
   RPCHandler,
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
 };
 //# sourceMappingURL=fetch.js.map

package/dist/hono.js

@@ -2,11 +2,10 @@ import {
   RPCHandler,
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
-} from "./chunk-GQ4376GR.js";
-import "./chunk-F75AQ6KO.js";
-import "./chunk-SV6DBVXJ.js";
+} from "./chunk-WJ2G7572.js";
+import "./chunk-GIXDBJGV.js";
+import "./chunk-XP6YRLY2.js";
 import "./chunk-XFBAK67J.js";
 
 // src/adapters/hono/middleware.ts
@@ -36,7 +35,6 @@ export {
   createMiddleware,
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
 };
 //# sourceMappingURL=hono.js.map

package/dist/index.js

@@ -21,7 +21,7 @@ import {
   middlewareOutputFn,
   setRouterContract,
   unlazy
-} from "./chunk-SV6DBVXJ.js";
+} from "./chunk-XP6YRLY2.js";
 
 // src/builder.ts
 import { mergeErrorMap as mergeErrorMap2, mergeMeta as mergeMeta2, mergePrefix, mergeRoute as mergeRoute2, mergeTags } from "@orpc/contract";

package/dist/next.js

@@ -2,11 +2,10 @@ import {
   RPCHandler,
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
-} from "./chunk-GQ4376GR.js";
-import "./chunk-F75AQ6KO.js";
-import "./chunk-SV6DBVXJ.js";
+} from "./chunk-WJ2G7572.js";
+import "./chunk-GIXDBJGV.js";
+import "./chunk-XP6YRLY2.js";
 import "./chunk-XFBAK67J.js";
 
 // src/adapters/next/serve.ts
@@ -33,7 +32,6 @@ export {
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
   serve,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
 };
 //# sourceMappingURL=next.js.map

package/dist/node.js

@@ -2,8 +2,8 @@ import {
   RPCCodec,
   RPCMatcher,
   StandardHandler
-} from "./chunk-F75AQ6KO.js";
-import "./chunk-SV6DBVXJ.js";
+} from "./chunk-GIXDBJGV.js";
+import "./chunk-XP6YRLY2.js";
 import "./chunk-XFBAK67J.js";
 
 // src/adapters/node/utils.ts
@@ -38,20 +38,21 @@ function nodeHttpResponseSendStandardResponse(res, standardResponse) {
   return new Promise((resolve, reject) => {
     res.on("error", reject);
     res.on("finish", resolve);
+    const resHeaders = standardResponse.headers;
+    delete resHeaders["content-type"];
+    delete resHeaders["content-disposition"];
     if (standardResponse.body === void 0) {
       res.writeHead(standardResponse.status, standardResponse.headers);
       res.end();
       return;
     }
     if (standardResponse.body instanceof Blob) {
-      const resHeaders = {
-        ...standardResponse.headers,
-        "content-type": standardResponse.body.type,
-        "content-length": standardResponse.body.size.toString()
-      };
-      if (!standardResponse.headers["content-disposition"] && standardResponse.body instanceof Blob) {
-        resHeaders["content-disposition"] = contentDisposition(standardResponse.body instanceof File ? standardResponse.body.name : "blob");
-      }
+      resHeaders["content-type"] = standardResponse.body.type;
+      resHeaders["content-length"] = standardResponse.body.size.toString();
+      resHeaders["content-disposition"] = contentDisposition(
+        standardResponse.body instanceof File ? standardResponse.body.name : "blob",
+        { type: "inline" }
+      );
       res.writeHead(standardResponse.status, resHeaders);
       Readable.fromWeb(
         standardResponse.body.stream()
@@ -61,10 +62,8 @@ function nodeHttpResponseSendStandardResponse(res, standardResponse) {
     }
     if (standardResponse.body instanceof FormData) {
       const response = new Response(standardResponse.body);
-      res.writeHead(standardResponse.status, {
-        ...standardResponse.headers,
-        "content-type": response.headers.get("content-type")
-      });
+      resHeaders["content-type"] = response.headers.get("content-type");
+      res.writeHead(standardResponse.status, resHeaders);
       Readable.fromWeb(
         response.body
         // Conflict between types=node and lib=dom so we need to cast it
@@ -72,20 +71,14 @@ function nodeHttpResponseSendStandardResponse(res, standardResponse) {
       return;
     }
     if (standardResponse.body instanceof URLSearchParams) {
-      res.writeHead(standardResponse.status, {
-        ...standardResponse.headers,
-        "content-type": "application/x-www-form-urlencoded"
-      });
-      const string2 = standardResponse.body.toString();
-      res.end(string2);
+      resHeaders["content-type"] = "application/x-www-form-urlencoded";
+      res.writeHead(standardResponse.status, resHeaders);
+      res.end(standardResponse.body.toString());
       return;
     }
-    res.writeHead(standardResponse.status, {
-      ...standardResponse.headers,
-      "content-type": "application/json"
-    });
-    const string = JSON.stringify(standardResponse.body);
-    res.end(string);
+    resHeaders["content-type"] = "application/json";
+    res.writeHead(standardResponse.status, resHeaders);
+    res.end(JSON.stringify(standardResponse.body));
   });
 }
 async function nodeHttpRequestToStandardBody(req) {
@@ -94,10 +87,12 @@ async function nodeHttpRequestToStandardBody(req) {
     return void 0;
   }
   const contentDisposition2 = req.headers["content-disposition"];
-  const fileName = contentDisposition2 ? parseContentDisposition(contentDisposition2).parameters.filename : void 0;
   const contentType = req.headers["content-type"];
-  if (typeof fileName === "string") {
-    return await streamToFile(req, fileName, contentType || "application/octet-stream");
+  if (contentDisposition2) {
+    const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
+    if (typeof fileName === "string") {
+      return await streamToFile(req, fileName, contentType || "application/octet-stream");
+    }
   }
   if (!contentType || contentType.startsWith("application/json")) {
     const text = await streamToString(req);

package/dist/src/adapters/fetch/rpc-handler.d.ts

@@ -1,10 +1,11 @@
+import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { Context } from '../../context';
 import type { Router } from '../../router';
-import type { RPCHandlerOptions, StandardHandleRest } from '../standard';
+import type { RPCHandlerOptions, StandardHandleOptions } from '../standard';
 import type { FetchHandler, FetchHandleResult } from './types';
 export declare class RPCHandler<T extends Context> implements FetchHandler<T> {
     private readonly standardHandler;
     constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
-    handle(request: Request, ...rest: StandardHandleRest<T>): Promise<FetchHandleResult>;
+    handle(request: Request, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=rpc-handler.d.ts.map

package/dist/src/adapters/fetch/types.d.ts

@@ -1,5 +1,6 @@
+import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { Context } from '../../context';
-import type { StandardHandleRest } from '../standard';
+import type { StandardHandleOptions } from '../standard';
 export type FetchHandleResult = {
     matched: true;
     response: Response;
@@ -8,6 +9,6 @@ export type FetchHandleResult = {
     response: undefined;
 };
 export interface FetchHandler<T extends Context> {
-    handle(request: Request, ...rest: StandardHandleRest<T>): Promise<FetchHandleResult>;
+    handle(request: Request, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/src/adapters/fetch/utils.d.ts

@@ -1,6 +1,5 @@
 import type { StandardBody, StandardRequest, StandardResponse } from '../standard';
 export declare function fetchReToStandardBody(re: Request | Response): Promise<StandardBody>;
 export declare function fetchRequestToStandardRequest(request: Request): StandardRequest;
-export declare function standardBodyToFetchBody(body: StandardBody): Blob | FormData | URLSearchParams | string | undefined;
 export declare function standardResponseToFetchResponse(response: StandardResponse): Response;
 //# sourceMappingURL=utils.d.ts.map

package/dist/src/adapters/hono/middleware.d.ts

@@ -1,13 +1,12 @@
+import type { MaybeOptionalOptions, Value } from '@orpc/shared';
 import type { Context as HonoContext, MiddlewareHandler } from 'hono';
 import type { Context } from '../../context';
 import type { FetchHandler } from '../fetch';
 import type { StandardHandleOptions } from '../standard';
-import { type Value } from '@orpc/shared';
 export type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: Value<T, [HonoContext]>;
 } : {
     context: Value<T, [HonoContext]>;
 });
-export type CreateMiddlewareRest<T extends Context> = [options: CreateMiddlewareOptions<T>] | (Record<never, never> extends T ? [] : never);
-export declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: CreateMiddlewareRest<T>): MiddlewareHandler;
+export declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
 //# sourceMappingURL=middleware.d.ts.map

package/dist/src/adapters/next/serve.d.ts

@@ -1,14 +1,13 @@
+import type { MaybeOptionalOptions, Value } from '@orpc/shared';
 import type { NextRequest } from 'next/server';
 import type { Context } from '../../context';
 import type { FetchHandler } from '../fetch';
 import type { StandardHandleOptions } from '../standard';
-import { type Value } from '@orpc/shared';
 export type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: Value<T, [NextRequest]>;
 } : {
     context: Value<T, [NextRequest]>;
 });
-export type ServeRest<T extends Context> = [options: ServeOptions<T>] | (Record<never, never> extends T ? [] : never);
 export interface ServeResult {
     GET(req: NextRequest): Promise<Response>;
     POST(req: NextRequest): Promise<Response>;
@@ -16,5 +15,5 @@ export interface ServeResult {
     PATCH(req: NextRequest): Promise<Response>;
     DELETE(req: NextRequest): Promise<Response>;
 }
-export declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: ServeRest<T>): ServeResult;
+export declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
 //# sourceMappingURL=serve.d.ts.map

package/dist/src/adapters/node/rpc-handler.d.ts

@@ -1,10 +1,11 @@
+import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { Context } from '../../context';
 import type { Router } from '../../router';
-import type { RPCHandlerOptions, StandardHandleRest } from '../standard';
+import type { RPCHandlerOptions, StandardHandleOptions } from '../standard';
 import type { NodeHttpHandler, NodeHttpHandleResult, NodeHttpRequest, NodeHttpResponse } from './types';
 export declare class RPCHandler<T extends Context> implements NodeHttpHandler<T> {
     private readonly standardHandler;
     constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: StandardHandleRest<T>): Promise<NodeHttpHandleResult>;
+    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<NodeHttpHandleResult>;
 }
 //# sourceMappingURL=rpc-handler.d.ts.map

package/dist/src/adapters/node/types.d.ts

@@ -1,7 +1,8 @@
+import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
 import type { Context } from '../../context';
-import type { StandardHandleRest } from '../standard';
+import type { StandardHandleOptions } from '../standard';
 export type NodeHttpRequest = (IncomingMessage | Http2ServerRequest) & {
     /**
      * Replace `req.url` with `req.originalUrl` when `req.originalUrl` is available.
@@ -16,6 +17,6 @@ export type NodeHttpHandleResult = {
     matched: false;
 };
 export interface NodeHttpHandler<T extends Context> {
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: StandardHandleRest<T>): Promise<NodeHttpHandleResult>;
+    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<NodeHttpHandleResult>;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/src/adapters/standard/handler.d.ts

@@ -1,5 +1,5 @@
 import type { ErrorMap, HTTPPath, Meta, Schema } from '@orpc/contract';
-import type { Interceptor } from '@orpc/shared';
+import type { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
 import type { Context } from '../../context';
 import type { Plugin } from '../../plugins';
 import type { CreateProcedureClientOptions } from '../../procedure-client';
@@ -15,7 +15,6 @@ export type StandardHandleOptions<T extends Context> = {
 export type WellStandardHandleOptions<T extends Context> = StandardHandleOptions<T> & {
     context: T;
 };
-export type StandardHandleRest<T extends Context> = [options: StandardHandleOptions<T>] | (Record<never, never> extends T ? [] : never);
 export type StandardHandleResult = {
     matched: true;
     response: StandardResponse;
@@ -26,7 +25,7 @@ export type StandardHandleResult = {
 export type StandardHandlerInterceptorOptions<TContext extends Context> = WellStandardHandleOptions<TContext> & {
     request: StandardRequest;
 };
-export type WellCreateProcedureClientOptions<TContext extends Context> = CreateProcedureClientOptions<TContext, Schema, Schema, unknown, ErrorMap, Meta, unknown> & {
+export type WellCreateProcedureClientOptions<TContext extends Context> = CreateProcedureClientOptions<TContext, Schema, Schema, unknown, ErrorMap, Meta, Record<never, never>> & {
     context: TContext;
 };
 export interface StandardHandlerOptions<TContext extends Context> {
@@ -40,12 +39,12 @@ export interface StandardHandlerOptions<TContext extends Context> {
      */
     interceptorsRoot?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, unknown>[];
 }
-export declare class StandardHandler<TContext extends Context> {
+export declare class StandardHandler<T extends Context> {
     private readonly matcher;
     private readonly codec;
     private readonly options;
     private readonly plugin;
-    constructor(router: Router<TContext, any>, matcher: StandardMatcher, codec: StandardCodec, options?: NoInfer<StandardHandlerOptions<TContext>>);
-    handle(request: StandardRequest, ...[options]: StandardHandleRest<TContext>): Promise<StandardHandleResult>;
+    constructor(router: Router<T, any>, matcher: StandardMatcher, codec: StandardCodec, options?: NoInfer<StandardHandlerOptions<T>>);
+    handle(request: StandardRequest, ...[options]: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<StandardHandleResult>;
 }
 //# sourceMappingURL=handler.d.ts.map

package/dist/src/adapters/standard/rpc-serializer.d.ts

@@ -3,7 +3,7 @@ export type RPCSerializedJsonMeta = ['bigint' | 'date' | 'nan' | 'undefined' | '
 export type RPCSerialized = {
     json: unknown;
     meta: RPCSerializedJsonMeta;
-} | FormData | Blob;
+} | FormData | Blob | undefined;
 export type RPCSerializedFormDataMaps = Segment[][];
 export declare class RPCSerializer {
     serialize(data: unknown): RPCSerialized;

package/dist/src/adapters/standard/types.d.ts

@@ -1,4 +1,4 @@
-import type { AbortSignal, HTTPPath, ORPCError } from '@orpc/contract';
+import type { HTTPPath, ORPCError } from '@orpc/contract';
 import type { JsonValue } from '@orpc/shared';
 import type { AnyProcedure } from '../../procedure';
 import type { AnyRouter } from '../../router';

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

@@ -1,9 +1,10 @@
-import type { ClientRest, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ClientContext, ClientRest, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { BuilderDef } from './builder';
 import type { ConflictContextGuard, Context, MergedContext } from './context';
 import type { MapInputMiddleware, Middleware } from './middleware';
 import type { Procedure, ProcedureHandler } from './procedure';
-import type { CreateProcedureClientRest, ProcedureClient } from './procedure-client';
+import type { CreateProcedureClientOptions, ProcedureClient } from './procedure-client';
 import type { DecoratedProcedure } from './procedure-decorated';
 /**
  * Like `DecoratedProcedure`, but removed all method that can change the contract.
@@ -13,11 +14,11 @@ export interface ImplementedProcedure<TInitialContext extends Context, TCurrentC
     /**
      * Make this procedure callable (works like a function while still being a procedure).
      */
-    callable<TClientContext>(...rest: CreateProcedureClientRest<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    callable<TClientContext extends ClientContext>(...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
     /**
      * Make this procedure compatible with server action (the same as .callable, but the type is compatible with server action).
      */
-    actionable<TClientContext>(...rest: CreateProcedureClientRest<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ((...rest: ClientRest<TClientContext, SchemaInput<TInputSchema>>) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>);
+    actionable<TClientContext extends ClientContext>(...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ((...rest: ClientRest<TClientContext, SchemaInput<TInputSchema>>) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>);
 }
 /**
  * Like `ProcedureBuilderWithoutHandler`, but removed all method that can change the contract.

package/dist/src/middleware.d.ts

@@ -1,5 +1,5 @@
-import type { AbortSignal, ErrorMap, Meta, ORPCErrorConstructorMap, Schema } from '@orpc/contract';
-import type { Promisable } from '@orpc/shared';
+import type { ErrorMap, Meta, ORPCErrorConstructorMap, Schema } from '@orpc/contract';
+import type { MaybeOptionalOptions, Promisable } from '@orpc/shared';
 import type { Context } from './context';
 import type { Procedure } from './procedure';
 export type MiddlewareResult<TOutContext extends Context, TOutput> = Promisable<{
@@ -11,9 +11,8 @@ export type MiddlewareNextFnOptions<TOutContext extends Context> = Record<never,
 } : {
     context: TOutContext;
 };
-export type MiddlewareNextFnRest<TOutContext extends Context> = [options: MiddlewareNextFnOptions<TOutContext>] | (Record<never, never> extends TOutContext ? [] : never);
 export interface MiddlewareNextFn<TInContext extends Context, TOutput> {
-    <U extends Context & Partial<TInContext> = Record<never, never>>(...rest: MiddlewareNextFnRest<U>): MiddlewareResult<U, TOutput>;
+    <U extends Context & Partial<TInContext> = Record<never, never>>(...rest: MaybeOptionalOptions<MiddlewareNextFnOptions<U>>): MiddlewareResult<U, TOutput>;
 }
 export interface MiddlewareOutputFn<TOutput> {
     (output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;

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

@@ -1,9 +1,9 @@
-import type { Client, ErrorFromErrorMap, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
-import type { Interceptor, Value } from '@orpc/shared';
+import type { Client, ClientContext, ErrorFromErrorMap, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Interceptor, MaybeOptionalOptions, Value } from '@orpc/shared';
 import type { Context } from './context';
 import type { Lazyable } from './lazy';
 import type { Procedure } from './procedure';
-export type ProcedureClient<TClientContext, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> = Client<TClientContext, SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
+export type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> = Client<TClientContext, SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
 export interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TInputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
     context: TInitialContext;
     input: SchemaInput<TInputSchema>;
@@ -15,7 +15,7 @@ export interface ProcedureClientInterceptorOptions<TInitialContext extends Conte
 /**
  * Options for creating a procedure caller with comprehensive type safety
  */
-export type CreateProcedureClientOptions<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext> = {
+export type CreateProcedureClientOptions<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext> = {
     /**
      * This is helpful for logging and analytics.
      */
@@ -26,6 +26,5 @@ export type CreateProcedureClientOptions<TInitialContext extends Context, TInput
 } : {
     context: Value<TInitialContext, [clientContext: TClientContext]>;
 });
-export type CreateProcedureClientRest<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext> = [options: CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>] | (Record<never, never> extends TInitialContext ? [] : never);
-export declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>>, ...[options]: CreateProcedureClientRest<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+export declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>>, ...[options]: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
 //# sourceMappingURL=procedure-client.d.ts.map

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

@@ -1,7 +1,8 @@
-import type { ClientRest, ErrorMap, MergedErrorMap, Meta, ORPCErrorConstructorMap, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ClientContext, ClientRest, ErrorMap, MergedErrorMap, Meta, ORPCErrorConstructorMap, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { ConflictContextGuard, Context, MergedContext } from './context';
 import type { MapInputMiddleware, Middleware } from './middleware';
-import type { CreateProcedureClientRest, ProcedureClient } from './procedure-client';
+import type { CreateProcedureClientOptions, ProcedureClient } from './procedure-client';
 import { Procedure } from './procedure';
 export declare class DecoratedProcedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta> extends Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> {
     errors<U extends ErrorMap>(errors: U): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, MergedErrorMap<TErrorMap, U>, TMeta>;
@@ -12,10 +13,10 @@ export declare class DecoratedProcedure<TInitialContext extends Context, TCurren
     /**
      * Make this procedure callable (works like a function while still being a procedure).
      */
-    callable<TClientContext>(...rest: CreateProcedureClientRest<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    callable<TClientContext extends ClientContext>(...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
     /**
      * Make this procedure compatible with server action (the same as .callable, but the type is compatible with server action).
      */
-    actionable<TClientContext>(...rest: CreateProcedureClientRest<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ((...rest: ClientRest<TClientContext, SchemaInput<TInputSchema>>) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>);
+    actionable<TClientContext extends ClientContext>(...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ((...rest: ClientRest<TClientContext, SchemaInput<TInputSchema>>) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>);
 }
 //# sourceMappingURL=procedure-decorated.d.ts.map

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

@@ -1,8 +1,9 @@
 import type { ClientPromiseResult, ErrorFromErrorMap, ErrorMap, Meta, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { Context } from './context';
 import type { Lazyable } from './lazy';
 import type { Procedure } from './procedure';
-import { type CreateProcedureClientRest } from './procedure-client';
+import type { CreateProcedureClientOptions } from './procedure-client';
 /**
  * Directly call a procedure without creating a client.
  *
@@ -13,5 +14,5 @@ import { type CreateProcedureClientRest } from './procedure-client';
  * ```
  *
  */
-export declare function call<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta>(procedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>>, input: SchemaInput<TInputSchema>, ...rest: CreateProcedureClientRest<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, unknown>): ClientPromiseResult<SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
+export declare function call<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta>(procedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>>, input: SchemaInput<TInputSchema>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, Record<never, never>>>): ClientPromiseResult<SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
 //# sourceMappingURL=procedure-utils.d.ts.map

package/dist/src/procedure.d.ts

@@ -1,4 +1,4 @@
-import type { AbortSignal, ContractProcedureDef, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContractProcedureDef, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
 import type { Context, TypeInitialContext } from './context';
 import type { AnyMiddleware } from './middleware';

package/dist/src/router-client.d.ts

@@ -1,11 +1,11 @@
-import type { ErrorMap, Meta } from '@orpc/contract';
+import type { ClientContext, ErrorMap, Meta } from '@orpc/contract';
+import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { Lazy } from './lazy';
 import type { Procedure } from './procedure';
-import type { CreateProcedureClientRest, ProcedureClient } from './procedure-client';
-import type { AnyRouter, Router } from './router';
-export type RouterClient<TRouter extends AnyRouter, TClientContext> = TRouter extends Lazy<infer U extends AnyRouter> ? RouterClient<U, TClientContext> : TRouter extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap, any> ? ProcedureClient<TClientContext, UInputSchema, UOutputSchema, UFuncOutput, UErrorMap> : {
+import type { CreateProcedureClientOptions, ProcedureClient } from './procedure-client';
+import type { AnyRouter, InferRouterInitialContext } from './router';
+export type RouterClient<TRouter extends AnyRouter, TClientContext extends ClientContext> = TRouter extends Lazy<infer U extends AnyRouter> ? RouterClient<U, TClientContext> : TRouter extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap, any> ? ProcedureClient<TClientContext, UInputSchema, UOutputSchema, UFuncOutput, UErrorMap> : {
     [K in keyof TRouter]: TRouter[K] extends AnyRouter ? RouterClient<TRouter[K], TClientContext> : never;
 };
-export type CreateRouterClientRest<TRouter extends AnyRouter, TClientContext> = CreateProcedureClientRest<TRouter extends Router<infer UContext, any> ? UContext : never, undefined, undefined, unknown, ErrorMap, Meta, TClientContext>;
-export declare function createRouterClient<TRouter extends AnyRouter, TClientContext>(router: TRouter | Lazy<undefined>, ...rest: CreateRouterClientRest<TRouter, TClientContext>): RouterClient<TRouter, TClientContext>;
+export declare function createRouterClient<TRouter extends AnyRouter, TClientContext extends ClientContext>(router: TRouter | Lazy<undefined>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<InferRouterInitialContext<TRouter>, undefined, undefined, unknown, ErrorMap, Meta, TClientContext>>): RouterClient<TRouter, TClientContext>;
 //# sourceMappingURL=router-client.d.ts.map

package/dist/src/router.d.ts

@@ -9,6 +9,7 @@ export type Router<TInitialContext extends Context, TContract extends AnyContrac
     [K in keyof TContract]: TContract[K] extends AnyContractRouter ? Router<TInitialContext, TContract[K]> : never;
 }>;
 export type AnyRouter = Router<any, any>;
+export type InferRouterInitialContext<T extends AnyRouter> = T extends Router<infer UInitialContext, any> ? UInitialContext : never;
 export type InferRouterInputs<T extends AnyRouter> = T extends Lazy<infer U extends AnyRouter> ? InferRouterInputs<U> : T extends Procedure<any, any, infer UInputSchema, any, any, any, any> ? SchemaInput<UInputSchema> : {
     [K in keyof T]: T[K] extends AnyRouter ? InferRouterInputs<T[K]> : never;
 };

package/dist/standard.js

@@ -4,8 +4,8 @@ import {
   RPCSerializer,
   StandardHandler,
   serializeRPCJson
-} from "./chunk-F75AQ6KO.js";
-import "./chunk-SV6DBVXJ.js";
+} from "./chunk-GIXDBJGV.js";
+import "./chunk-XP6YRLY2.js";
 import "./chunk-XFBAK67J.js";
 export {
   RPCCodec,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.36.1",
+  "version": "0.38.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@tinyhttp/content-disposition": "^2.2.2",
-    "@orpc/contract": "0.36.1",
-    "@orpc/shared": "0.36.1"
+    "@orpc/contract": "0.38.0",
+    "@orpc/shared": "0.38.0"
   },
   "devDependencies": {
     "light-my-request": "^6.5.1"