@orpc/server 0.0.0-next.b825e0c → 0.0.0-next.bc9d3dd

package/dist/{chunk-IWQZNJGN.js → chunk-4IQKTPXM.js}

@@ -2,11 +2,11 @@ import {
   RPCCodec,
   RPCMatcher,
   StandardHandler
-} from "./chunk-PYUF3JOC.js";
+} from "./chunk-SD2T3J2Z.js";
 
 // src/adapters/fetch/utils.ts
 import { once } from "@orpc/shared";
-import cd from "content-disposition";
+import { contentDisposition, parse as parseContentDisposition } from "@tinyhttp/content-disposition";
 function fetchHeadersToStandardHeaders(headers) {
   const standardHeaders = {};
   for (const [key, value] of headers) {
@@ -24,13 +24,15 @@ async function fetchReToStandardBody(re) {
   if (!re.body) {
     return void 0;
   }
-  const contentDisposition = re.headers.get("content-disposition");
-  const fileName = contentDisposition ? cd.parse(contentDisposition).parameters.filename : void 0;
-  if (fileName) {
-    const blob2 = await re.blob();
-    return new File([blob2], fileName, {
-      type: blob2.type
-    });
+  const contentDisposition2 = re.headers.get("content-disposition");
+  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", cd(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-IWQZNJGN.js.map
+//# sourceMappingURL=chunk-4IQKTPXM.js.map

package/dist/{chunk-PYUF3JOC.js → chunk-SD2T3J2Z.js}

@@ -6,10 +6,10 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-OEPDHGQ4.js";
+} from "./chunk-SV6DBVXJ.js";
 import {
   CompositePlugin
-} from "./chunk-Q2XV45Q4.js";
+} from "./chunk-XFBAK67J.js";
 
 // src/adapters/standard/handler.ts
 import { toORPCError } from "@orpc/contract";
@@ -25,30 +25,35 @@ var StandardHandler = class {
   }
   plugin;
   handle(request, ...[options]) {
-    const handleOptions = options ?? {};
-    handleOptions.context ??= {};
     return intercept(
       this.options.interceptorsRoot ?? [],
-      { request, ...handleOptions },
-      async (interceptorRootOptions) => {
+      {
+        request,
+        ...options,
+        context: options?.context ?? {}
+        // context is optional only when all fields are optional so we can safely force it to have a context
+      },
+      async (interceptorOptions) => {
         try {
           return await intercept(
             this.options.interceptors ?? [],
-            interceptorRootOptions,
-            async ({ request: request2, context }) => {
-              const method = request2.method;
-              const url = request2.url;
-              const pathname = `/${trim(url.pathname.replace(options?.prefix ?? "", ""), "/")}`;
+            interceptorOptions,
+            async (interceptorOptions2) => {
+              const method = interceptorOptions2.request.method;
+              const url = interceptorOptions2.request.url;
+              const pathname = `/${trim(url.pathname.replace(interceptorOptions2.prefix ?? "", ""), "/")}`;
               const match = await this.matcher.match(method, pathname);
               if (!match) {
                 return { matched: false, response: void 0 };
               }
-              const client = createProcedureClient(match.procedure, {
-                context,
+              const clientOptions = {
+                context: interceptorOptions2.context,
                 path: match.path
-              });
-              const input = await this.codec.decode(request2, match.params, match.procedure);
-              const output = await client(input, { signal: request2.signal });
+              };
+              this.plugin.beforeCreateProcedureClient(clientOptions, interceptorOptions2);
+              const client = createProcedureClient(match.procedure, clientOptions);
+              const input = await this.codec.decode(request, match.params, match.procedure);
+              const output = await client(input, { signal: request.signal });
               const response = this.codec.encode(output, match.procedure);
               return {
                 matched: true,
@@ -73,6 +78,9 @@ var StandardHandler = class {
 import { findDeepMatches, isPlainObject, set } from "@orpc/shared";
 var RPCSerializer = class {
   serialize(data) {
+    if (data === void 0) {
+      return void 0;
+    }
     if (data instanceof Blob) {
       return data;
     }
@@ -90,6 +98,9 @@ var RPCSerializer = class {
     return form;
   }
   deserialize(serialized) {
+    if (serialized === void 0) {
+      return void 0;
+    }
     if (serialized instanceof Blob) {
       return serialized;
     }
@@ -305,4 +316,4 @@ export {
   RPCCodec,
   RPCMatcher
 };
-//# sourceMappingURL=chunk-PYUF3JOC.js.map
+//# sourceMappingURL=chunk-SD2T3J2Z.js.map

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

@@ -70,20 +70,19 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
     const { default: procedure } = await unlazy(lazyableProcedure);
     const context = await value(options?.context ?? {}, callerOptions?.context);
     const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
-    const interceptorOptions = {
-      context,
-      input,
-      // input only optional when it undefinable so we can safely cast it
-      errors,
-      path,
-      procedure,
-      signal: callerOptions?.signal
-    };
     try {
       return await intercept(
         options?.interceptors ?? [],
-        interceptorOptions,
-        (interceptorOptions2) => executeProcedureInternal(interceptorOptions2.procedure, interceptorOptions2)
+        {
+          context,
+          input,
+          // input only optional when it undefinable so we can safely cast it
+          errors,
+          path,
+          procedure,
+          signal: callerOptions?.signal
+        },
+        (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
       );
     } catch (e) {
       if (!(e instanceof ORPCError)) {
@@ -375,4 +374,4 @@ export {
   convertPathToHttpPath,
   createContractedProcedure
 };
-//# sourceMappingURL=chunk-OEPDHGQ4.js.map
+//# sourceMappingURL=chunk-SV6DBVXJ.js.map

package/dist/{chunk-Q2XV45Q4.js → chunk-XFBAK67J.js}

@@ -8,6 +8,11 @@ var CompositePlugin = class {
       plugin.init?.(options);
     }
   }
+  beforeCreateProcedureClient(clientOptions, interceptorOptions) {
+    for (const plugin of this.plugins) {
+      plugin.beforeCreateProcedureClient?.(clientOptions, interceptorOptions);
+    }
+  }
 };
 
 // src/plugins/cors.ts
@@ -120,4 +125,4 @@ export {
   CORSPlugin,
   ResponseHeadersPlugin
 };
-//# sourceMappingURL=chunk-Q2XV45Q4.js.map
+//# sourceMappingURL=chunk-XFBAK67J.js.map

package/dist/fetch.js

@@ -2,17 +2,15 @@ import {
   RPCHandler,
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
-} from "./chunk-IWQZNJGN.js";
-import "./chunk-PYUF3JOC.js";
-import "./chunk-OEPDHGQ4.js";
-import "./chunk-Q2XV45Q4.js";
+} from "./chunk-4IQKTPXM.js";
+import "./chunk-SD2T3J2Z.js";
+import "./chunk-SV6DBVXJ.js";
+import "./chunk-XFBAK67J.js";
 export {
   RPCHandler,
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
 };
 //# sourceMappingURL=fetch.js.map

package/dist/hono.js

@@ -2,12 +2,11 @@ import {
   RPCHandler,
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
-} from "./chunk-IWQZNJGN.js";
-import "./chunk-PYUF3JOC.js";
-import "./chunk-OEPDHGQ4.js";
-import "./chunk-Q2XV45Q4.js";
+} from "./chunk-4IQKTPXM.js";
+import "./chunk-SD2T3J2Z.js";
+import "./chunk-SV6DBVXJ.js";
+import "./chunk-XFBAK67J.js";
 
 // src/adapters/hono/middleware.ts
 import { value } from "@orpc/shared";
@@ -26,7 +25,7 @@ function createMiddleware(handler, ...[options]) {
     const context = await value(options?.context ?? {}, c);
     const { matched, response } = await handler.handle(request, { ...options, context });
     if (matched) {
-      return c.body(response.body, response);
+      return c.newResponse(response.body, response);
     }
     await next();
   };
@@ -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-OEPDHGQ4.js";
+} from "./chunk-SV6DBVXJ.js";
 
 // src/builder.ts
 import { mergeErrorMap as mergeErrorMap2, mergeMeta as mergeMeta2, mergePrefix, mergeRoute as mergeRoute2, mergeTags } from "@orpc/contract";

package/dist/next.js

@@ -2,12 +2,11 @@ import {
   RPCHandler,
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
-} from "./chunk-IWQZNJGN.js";
-import "./chunk-PYUF3JOC.js";
-import "./chunk-OEPDHGQ4.js";
-import "./chunk-Q2XV45Q4.js";
+} from "./chunk-4IQKTPXM.js";
+import "./chunk-SD2T3J2Z.js";
+import "./chunk-SV6DBVXJ.js";
+import "./chunk-XFBAK67J.js";
 
 // src/adapters/next/serve.ts
 import { value } from "@orpc/shared";
@@ -33,7 +32,6 @@ export {
   fetchReToStandardBody,
   fetchRequestToStandardRequest,
   serve,
-  standardBodyToFetchBody,
   standardResponseToFetchResponse
 };
 //# sourceMappingURL=next.js.map

package/dist/node.js

@@ -2,15 +2,15 @@ import {
   RPCCodec,
   RPCMatcher,
   StandardHandler
-} from "./chunk-PYUF3JOC.js";
-import "./chunk-OEPDHGQ4.js";
-import "./chunk-Q2XV45Q4.js";
+} from "./chunk-SD2T3J2Z.js";
+import "./chunk-SV6DBVXJ.js";
+import "./chunk-XFBAK67J.js";
 
 // src/adapters/node/utils.ts
 import { Buffer, File } from "node:buffer";
 import { Readable } from "node:stream";
 import { once } from "@orpc/shared";
-import cd from "content-disposition";
+import { contentDisposition, parse as parseContentDisposition } from "@tinyhttp/content-disposition";
 function nodeHttpToStandardRequest(req, res) {
   const method = req.method ?? "GET";
   const protocol = "encrypted" in req.socket && req.socket.encrypted ? "https:" : "http:";
@@ -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"] = cd(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) {
@@ -93,11 +86,13 @@ async function nodeHttpRequestToStandardBody(req) {
   if (method === "GET" || method === "HEAD") {
     return void 0;
   }
-  const contentDisposition = req.headers["content-disposition"];
-  const fileName = contentDisposition ? cd.parse(contentDisposition).parameters.filename : void 0;
+  const contentDisposition2 = req.headers["content-disposition"];
   const contentType = req.headers["content-type"];
-  if (fileName) {
-    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/plugins.js

@@ -2,7 +2,7 @@ import {
   CORSPlugin,
   CompositePlugin,
   ResponseHeadersPlugin
-} from "./chunk-Q2XV45Q4.js";
+} from "./chunk-XFBAK67J.js";
 export {
   CORSPlugin,
   CompositePlugin,

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/standard/handler.d.ts

@@ -1,7 +1,8 @@
-import type { HTTPPath } from '@orpc/contract';
+import type { ErrorMap, HTTPPath, Meta, Schema } from '@orpc/contract';
 import type { Interceptor } from '@orpc/shared';
 import type { Context } from '../../context';
 import type { Plugin } from '../../plugins';
+import type { CreateProcedureClientOptions } from '../../procedure-client';
 import type { Router } from '../../router';
 import type { StandardCodec, StandardMatcher, StandardRequest, StandardResponse } from './types';
 export type StandardHandleOptions<T extends Context> = {
@@ -25,6 +26,9 @@ 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> & {
+    context: TContext;
+};
 export interface StandardHandlerOptions<TContext extends Context> {
     plugins?: Plugin<TContext>[];
     /**

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/plugins/base.d.ts

@@ -1,11 +1,13 @@
-import type { StandardHandlerOptions } from '../adapters/standard';
+import type { StandardHandlerInterceptorOptions, StandardHandlerOptions, WellCreateProcedureClientOptions } from '../adapters/standard';
 import type { Context } from '../context';
 export interface Plugin<TContext extends Context> {
     init?(options: StandardHandlerOptions<TContext>): void;
+    beforeCreateProcedureClient?(clientOptions: WellCreateProcedureClientOptions<TContext>, interceptorOptions: StandardHandlerInterceptorOptions<TContext>): void;
 }
 export declare class CompositePlugin<TContext extends Context> implements Plugin<TContext> {
     private readonly plugins;
     constructor(plugins?: Plugin<TContext>[]);
     init(options: StandardHandlerOptions<TContext>): void;
+    beforeCreateProcedureClient(clientOptions: WellCreateProcedureClientOptions<TContext>, interceptorOptions: StandardHandlerInterceptorOptions<TContext>): void;
 }
 //# sourceMappingURL=base.d.ts.map

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

@@ -6,5 +6,6 @@ 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> : {
     [K in keyof TRouter]: TRouter[K] extends AnyRouter ? RouterClient<TRouter[K], TClientContext> : never;
 };
-export declare function createRouterClient<TRouter extends AnyRouter, TClientContext>(router: TRouter | Lazy<undefined>, ...rest: CreateProcedureClientRest<TRouter extends Router<infer UContext, any> ? UContext : never, undefined, undefined, unknown, ErrorMap, Meta, TClientContext>): RouterClient<TRouter, TClientContext>;
+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>;
 //# sourceMappingURL=router-client.d.ts.map

package/dist/standard.js

@@ -4,9 +4,9 @@ import {
   RPCSerializer,
   StandardHandler,
   serializeRPCJson
-} from "./chunk-PYUF3JOC.js";
-import "./chunk-OEPDHGQ4.js";
-import "./chunk-Q2XV45Q4.js";
+} from "./chunk-SD2T3J2Z.js";
+import "./chunk-SV6DBVXJ.js";
+import "./chunk-XFBAK67J.js";
 export {
   RPCCodec,
   RPCMatcher,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.b825e0c",
+  "version": "0.0.0-next.bc9d3dd",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -63,9 +63,9 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "content-disposition": "^0.5.4",
-    "@orpc/contract": "0.0.0-next.b825e0c",
-    "@orpc/shared": "0.0.0-next.b825e0c"
+    "@tinyhttp/content-disposition": "^2.2.2",
+    "@orpc/contract": "0.0.0-next.bc9d3dd",
+    "@orpc/shared": "0.0.0-next.bc9d3dd"
   },
   "devDependencies": {
     "light-my-request": "^6.5.1"