@orpc/server 0.26.0 → 0.28.0

package/dist/{chunk-E7GUWVR4.js → chunk-DNG2IB3R.js}

@@ -32,6 +32,33 @@ function isProcedure(item) {
   return (typeof item === "object" || typeof item === "function") && item !== null && "~type" in item && item["~type"] === "Procedure" && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "contract" in item["~orpc"] && isContractProcedure(item["~orpc"].contract) && "handler" in item["~orpc"] && typeof item["~orpc"].handler === "function";
 }
 
+// src/error.ts
+import { ORPCError } from "@orpc/contract";
+function createORPCErrorConstructorMap(errors) {
+  const constructors = {};
+  if (!errors) {
+    return constructors;
+  }
+  for (const code in errors) {
+    const config = errors[code];
+    if (!config) {
+      continue;
+    }
+    const constructor = (...[options]) => {
+      return new ORPCError({
+        code,
+        defined: true,
+        status: config.status,
+        message: options?.message ?? config.message,
+        data: options?.data,
+        cause: options?.cause
+      });
+    };
+    constructors[code] = constructor;
+  }
+  return constructors;
+}
+
 // src/lazy.ts
 var LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
 function lazy(loader) {
@@ -60,8 +87,8 @@ function flatLazy(lazied) {
 }
 
 // src/procedure-client.ts
-import { executeWithHooks, value } from "@orpc/shared";
-import { ORPCError } from "@orpc/shared/error";
+import { ORPCError as ORPCError2, validateORPCError, ValidationError } from "@orpc/contract";
+import { executeWithHooks, toError, value } from "@orpc/shared";
 function createProcedureClient(options) {
   return async (...[input, callerOptions]) => {
     const path = options.path ?? [];
@@ -79,17 +106,27 @@ function createProcedureClient(options) {
         input: validInput,
         path,
         procedure,
-        signal: callerOptions?.signal
+        signal: callerOptions?.signal,
+        errors: createORPCErrorConstructorMap(procedure["~orpc"].contract["~orpc"].errorMap)
       });
       return validateOutput(procedure, output);
     };
-    return executeWithHooks({
-      hooks: options,
-      input,
-      context,
-      meta,
-      execute: executeWithValidation
-    });
+    try {
+      const output = await executeWithHooks({
+        hooks: options,
+        input,
+        context,
+        meta,
+        execute: executeWithValidation
+      });
+      return output;
+    } catch (e) {
+      if (!(e instanceof ORPCError2)) {
+        throw toError(e);
+      }
+      const validated = await validateORPCError(procedure["~orpc"].contract["~orpc"].errorMap, e);
+      throw validated;
+    }
   };
 }
 async function validateInput(procedure, input) {
@@ -98,10 +135,13 @@ async function validateInput(procedure, input) {
     return input;
   const result = await schema["~standard"].validate(input);
   if (result.issues) {
-    throw new ORPCError({
+    throw new ORPCError2({
       message: "Input validation failed",
       code: "BAD_REQUEST",
-      issues: result.issues
+      data: {
+        issues: result.issues
+      },
+      cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
     });
   }
   return result.value;
@@ -112,10 +152,10 @@ async function validateOutput(procedure, output) {
     return output;
   const result = await schema["~standard"].validate(output);
   if (result.issues) {
-    throw new ORPCError({
+    throw new ORPCError2({
       message: "Output validation failed",
       code: "INTERNAL_SERVER_ERROR",
-      issues: result.issues
+      cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
     });
   }
   return result.value;
@@ -175,6 +215,7 @@ export {
   mergeContext,
   Procedure,
   isProcedure,
+  createORPCErrorConstructorMap,
   LAZY_LOADER_SYMBOL,
   lazy,
   isLazy,
@@ -183,4 +224,4 @@ export {
   createProcedureClient,
   getRouterChild
 };
-//# sourceMappingURL=chunk-E7GUWVR4.js.map
+//# sourceMappingURL=chunk-DNG2IB3R.js.map

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

@@ -4,7 +4,7 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-E7GUWVR4.js";
+} from "./chunk-DNG2IB3R.js";
 
 // src/adapters/fetch/super-json.ts
 var super_json_exports = {};
@@ -130,8 +130,8 @@ function deserialize({
 }
 
 // src/adapters/fetch/orpc-payload-codec.ts
+import { ORPCError } from "@orpc/contract";
 import { findDeepMatches, set } from "@orpc/shared";
-import { ORPCError } from "@orpc/shared/error";
 var ORPCPayloadCodec = class {
   /**
    * If method is GET, the payload will be encoded as query string.
@@ -236,28 +236,24 @@ var ORPCProcedureMatcher = class {
 };
 
 // src/adapters/fetch/orpc-handler.ts
-import { executeWithHooks, ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim as trim2 } from "@orpc/shared";
-import { ORPCError as ORPCError2 } from "@orpc/shared/error";
+import { ORPCError as ORPCError2 } from "@orpc/contract";
+import { executeWithHooks, trim as trim2 } from "@orpc/shared";
 var ORPCHandler = class {
   constructor(router, options) {
-    this.router = router;
     this.options = options;
     this.procedureMatcher = options?.procedureMatcher ?? new ORPCProcedureMatcher(router);
     this.payloadCodec = options?.payloadCodec ?? new ORPCPayloadCodec();
   }
   procedureMatcher;
   payloadCodec;
-  condition(request) {
-    return Boolean(request.headers.get(ORPC_HANDLER_HEADER)?.includes(ORPC_HANDLER_VALUE));
-  }
-  async fetch(request, ...[options]) {
+  async handle(request, ...[options]) {
     const context = options?.context;
     const execute = async () => {
       const url = new URL(request.url);
       const pathname = `/${trim2(url.pathname.replace(options?.prefix ?? "", ""), "/")}`;
       const match = await this.procedureMatcher.match(pathname);
       if (!match) {
-        throw new ORPCError2({ code: "NOT_FOUND", message: "Not found" });
+        return { matched: false, response: void 0 };
       }
       const input = await this.payloadCodec.decode(request);
       const client = createProcedureClient({
@@ -265,20 +261,22 @@ var ORPCHandler = class {
         procedure: match.procedure,
         path: match.path
       });
-      const output = await client(input, { signal: options?.signal });
+      const output = await client(input, { signal: request.signal });
       const { body, headers } = this.payloadCodec.encode(output);
-      return new Response(body, { headers });
+      const response = new Response(body, { headers });
+      return { matched: true, response };
     };
     try {
-      return await executeWithHooks({
+      const result = await executeWithHooks({
         context,
         execute,
         input: request,
         hooks: this.options,
         meta: {
-          signal: options?.signal
+          signal: request.signal
         }
       });
+      return result;
     } catch (e) {
       const error = e instanceof ORPCError2 ? e : new ORPCError2({
         code: "INTERNAL_SERVER_ERROR",
@@ -286,10 +284,11 @@ var ORPCHandler = class {
         cause: e
       });
       const { body, headers } = this.payloadCodec.encode(error.toJSON());
-      return new Response(body, {
+      const response = new Response(body, {
         headers,
         status: error.status
       });
+      return { matched: true, response };
     }
   }
 };
@@ -300,4 +299,4 @@ export {
   ORPCProcedureMatcher,
   ORPCHandler
 };
-//# sourceMappingURL=chunk-6BY63WA5.js.map
+//# sourceMappingURL=chunk-V3I7RIRY.js.map

package/dist/chunk-WUOGVGWG.js

@@ -0,0 +1 @@
+//# sourceMappingURL=chunk-WUOGVGWG.js.map

package/dist/fetch.js

@@ -1,29 +1,12 @@
+import "./chunk-WUOGVGWG.js";
 import {
   ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
   super_json_exports
-} from "./chunk-6BY63WA5.js";
-import "./chunk-E7GUWVR4.js";
-
-// src/adapters/fetch/composite-handler.ts
-var CompositeHandler = class {
-  constructor(handlers) {
-    this.handlers = handlers;
-  }
-  async fetch(request, ...opt) {
-    for (const handler of this.handlers) {
-      if (handler.condition(request)) {
-        return handler.fetch(request, ...opt);
-      }
-    }
-    return new Response("None of the handlers can handle the request.", {
-      status: 404
-    });
-  }
-};
+} from "./chunk-V3I7RIRY.js";
+import "./chunk-DNG2IB3R.js";
 export {
-  CompositeHandler,
   ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,

package/dist/hono.js

@@ -0,0 +1,30 @@
+import "./chunk-WUOGVGWG.js";
+import {
+  ORPCHandler,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  super_json_exports
+} from "./chunk-V3I7RIRY.js";
+import "./chunk-DNG2IB3R.js";
+
+// src/adapters/hono/middleware.ts
+import { value } from "@orpc/shared";
+function createMiddleware(handler, ...[options]) {
+  return async (c, next) => {
+    const context = await value(options?.context, c);
+    const { matched, response } = await handler.handle(c.req.raw, { ...options, context });
+    if (matched) {
+      c.res = response;
+      return;
+    }
+    await next();
+  };
+}
+export {
+  ORPCHandler,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  super_json_exports as SuperJSON,
+  createMiddleware
+};
+//# sourceMappingURL=hono.js.map

package/dist/index.js

@@ -1,6 +1,7 @@
 import {
   LAZY_LOADER_SYMBOL,
   Procedure,
+  createORPCErrorConstructorMap,
   createProcedureClient,
   flatLazy,
   getRouterChild,
@@ -9,7 +10,7 @@ import {
   lazy,
   mergeContext,
   unlazy
-} from "./chunk-E7GUWVR4.js";
+} from "./chunk-DNG2IB3R.js";
 
 // src/builder.ts
 import { ContractProcedure } from "@orpc/contract";
@@ -346,6 +347,12 @@ var ProcedureBuilder = class _ProcedureBuilder {
       contract: DecoratedContractProcedure2.decorate(this["~orpc"].contract).output(schema, example)
     });
   }
+  errors(errors) {
+    return new _ProcedureBuilder({
+      ...this["~orpc"],
+      contract: DecoratedContractProcedure2.decorate(this["~orpc"].contract).errors(errors)
+    });
+  }
   use(middleware, mapInput) {
     if (!mapInput) {
       return new ProcedureImplementer({
@@ -392,7 +399,8 @@ var Builder = class _Builder {
       contract: new ContractProcedure({
         route,
         InputSchema: void 0,
-        OutputSchema: void 0
+        OutputSchema: void 0,
+        errorMap: void 0
       })
     });
   }
@@ -402,7 +410,8 @@ var Builder = class _Builder {
       contract: new ContractProcedure({
         OutputSchema: void 0,
         InputSchema: schema,
-        inputExample: example
+        inputExample: example,
+        errorMap: void 0
       })
     });
   }
@@ -412,7 +421,18 @@ var Builder = class _Builder {
       contract: new ContractProcedure({
         InputSchema: void 0,
         OutputSchema: schema,
-        outputExample: example
+        outputExample: example,
+        errorMap: void 0
+      })
+    });
+  }
+  errors(errors) {
+    return new ProcedureBuilder({
+      middlewares: this["~orpc"].middlewares,
+      contract: new ContractProcedure({
+        InputSchema: void 0,
+        OutputSchema: void 0,
+        errorMap: errors
       })
     });
   }
@@ -421,7 +441,8 @@ var Builder = class _Builder {
       middlewares: this["~orpc"].middlewares,
       contract: new ContractProcedure({
         InputSchema: void 0,
-        OutputSchema: void 0
+        OutputSchema: void 0,
+        errorMap: void 0
       }),
       handler
     }));
@@ -486,12 +507,12 @@ function createRouterClient(options) {
 }
 
 // src/index.ts
-import { configGlobal, fallbackToGlobalConfig } from "@orpc/contract";
-export * from "@orpc/shared/error";
+import { configGlobal, fallbackToGlobalConfig, isDefinedError, ORPCError, safe } from "@orpc/contract";
 var os = new Builder({});
 export {
   Builder,
   LAZY_LOADER_SYMBOL,
+  ORPCError,
   Procedure,
   ProcedureBuilder,
   ProcedureImplementer,
@@ -499,6 +520,7 @@ export {
   RouterImplementer,
   configGlobal,
   createChainableImplementer,
+  createORPCErrorConstructorMap,
   createProcedureClient,
   createRouterClient,
   decorateLazy,
@@ -510,11 +532,13 @@ export {
   getLazyRouterPrefix,
   getRouterChild,
   getRouterContract,
+  isDefinedError,
   isLazy,
   isProcedure,
   lazy,
   mergeContext,
   os,
+  safe,
   setRouterContract,
   unlazy
 };

package/dist/next.js

@@ -0,0 +1,36 @@
+import "./chunk-WUOGVGWG.js";
+import {
+  ORPCHandler,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  super_json_exports
+} from "./chunk-V3I7RIRY.js";
+import "./chunk-DNG2IB3R.js";
+
+// src/adapters/next/serve.ts
+import { value } from "@orpc/shared";
+function serve(handler, ...[options]) {
+  const main = async (req) => {
+    const context = await value(options?.context, req);
+    const { matched, response } = await handler.handle(req, { ...options, context });
+    if (matched) {
+      return response;
+    }
+    return new Response(`Cannot find a matching procedure for ${req.url}`, { status: 404 });
+  };
+  return {
+    GET: main,
+    POST: main,
+    PUT: main,
+    PATCH: main,
+    DELETE: main
+  };
+}
+export {
+  ORPCHandler,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  super_json_exports as SuperJSON,
+  serve
+};
+//# sourceMappingURL=next.js.map

package/dist/node.js

@@ -1,45 +1,87 @@
 import {
   ORPCHandler
-} from "./chunk-6BY63WA5.js";
-import "./chunk-E7GUWVR4.js";
+} from "./chunk-V3I7RIRY.js";
+import "./chunk-DNG2IB3R.js";
 
-// src/adapters/node/composite-handler.ts
-var CompositeHandler = class {
-  constructor(handlers) {
-    this.handlers = handlers;
+// src/adapters/node/request-listener.ts
+function createRequest(req, res) {
+  const controller = new AbortController();
+  res.on("close", () => {
+    controller.abort();
+  });
+  const method = req.method ?? "GET";
+  const headers = createHeaders(req);
+  const protocol = "encrypted" in req.socket && req.socket.encrypted ? "https:" : "http:";
+  const host = headers.get("Host") ?? "localhost";
+  const url = new URL(req.originalUrl ?? req.url ?? "/", `${protocol}//${host}`);
+  const init = { method, headers, signal: controller.signal };
+  if (method !== "GET" && method !== "HEAD") {
+    init.body = new ReadableStream({
+      start(controller2) {
+        req.on("data", (chunk) => {
+          controller2.enqueue(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
+        });
+        req.on("end", () => {
+          controller2.close();
+        });
+      }
+    });
+    init.duplex = "half";
+  }
+  return new Request(url, init);
+}
+function createHeaders(req) {
+  const headers = new Headers();
+  const rawHeaders = req.rawHeaders;
+  for (let i = 0; i < rawHeaders.length; i += 2) {
+    headers.append(rawHeaders[i], rawHeaders[i + 1]);
   }
-  async handle(req, res, ...opt) {
-    for (const handler of this.handlers) {
-      if (handler.condition(req)) {
-        return handler.handle(req, res, ...opt);
+  return headers;
+}
+async function sendResponse(res, response) {
+  const headers = {};
+  for (const [key, value] of response.headers) {
+    if (key in headers) {
+      if (Array.isArray(headers[key])) {
+        headers[key].push(value);
+      } else {
+        headers[key] = [headers[key], value];
       }
+    } else {
+      headers[key] = value;
     }
-    res.statusCode = 404;
-    res.end("None of the handlers can handle the request.");
   }
-};
+  res.writeHead(response.status, headers);
+  if (response.body != null && res.req.method !== "HEAD") {
+    for await (const chunk of response.body) {
+      res.write(chunk);
+    }
+  }
+  res.end();
+}
 
 // src/adapters/node/orpc-handler.ts
-import { createRequest, sendResponse } from "@mjackson/node-fetch-server";
-import { ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE } from "@orpc/shared";
 var ORPCHandler2 = class {
   orpcFetchHandler;
   constructor(router, options) {
     this.orpcFetchHandler = new ORPCHandler(router, options);
   }
-  condition(request) {
-    return Boolean(request.headers[ORPC_HANDLER_HEADER]?.includes(ORPC_HANDLER_VALUE));
-  }
   async handle(req, res, ...[options]) {
-    const request = createRequest(req, res, options);
+    const request = createRequest(req, res);
     const castedOptions = options ?? {};
-    const response = await this.orpcFetchHandler.fetch(request, castedOptions);
-    await options?.beforeSend?.(response, castedOptions.context);
-    return await sendResponse(res, response);
+    const result = await this.orpcFetchHandler.handle(request, castedOptions);
+    if (result.matched === false) {
+      return { matched: false };
+    }
+    await options?.beforeSend?.(result.response, castedOptions.context);
+    await sendResponse(res, result.response);
+    return { matched: true };
   }
 };
 export {
-  CompositeHandler,
-  ORPCHandler2 as ORPCHandler
+  ORPCHandler2 as ORPCHandler,
+  createHeaders,
+  createRequest,
+  sendResponse
 };
 //# sourceMappingURL=node.js.map

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

@@ -1,4 +1,3 @@
-export * from './composite-handler';
 export * from './orpc-handler';
 export * from './orpc-payload-codec';
 export * from './orpc-procedure-matcher';

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

@@ -1,20 +1,20 @@
 import type { Hooks } from '@orpc/shared';
 import type { Router } from '../../router';
-import type { Context, WithSignal } from '../../types';
-import type { ConditionalFetchHandler, FetchOptions } from './types';
+import type { Context } from '../../types';
+import type { FetchHandler, FetchHandleRest, FetchHandleResult } from './types';
 import { type PublicORPCPayloadCodec } from './orpc-payload-codec';
 import { type PublicORPCProcedureMatcher } from './orpc-procedure-matcher';
-export type ORPCHandlerOptions<T extends Context> = Hooks<Request, Response, T, WithSignal> & {
+export type ORPCHandlerOptions<T extends Context> = Hooks<Request, FetchHandleResult, T, {
+    signal?: AbortSignal;
+}> & {
     procedureMatcher?: PublicORPCProcedureMatcher;
     payloadCodec?: PublicORPCPayloadCodec;
 };
-export declare class ORPCHandler<T extends Context> implements ConditionalFetchHandler<T> {
-    readonly router: Router<T, any>;
-    readonly options?: NoInfer<ORPCHandlerOptions<T>> | undefined;
+export declare class ORPCHandler<T extends Context> implements FetchHandler<T> {
+    private readonly options?;
     private readonly procedureMatcher;
     private readonly payloadCodec;
     constructor(router: Router<T, any>, options?: NoInfer<ORPCHandlerOptions<T>> | undefined);
-    condition(request: Request): boolean;
-    fetch(request: Request, ...[options]: [options: FetchOptions<T>] | (undefined extends T ? [] : never)): Promise<Response>;
+    handle(request: Request, ...[options]: FetchHandleRest<T>): Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=orpc-handler.d.ts.map

package/dist/src/adapters/fetch/orpc-payload-codec.d.ts

@@ -1,4 +1,4 @@
-import type { HTTPMethod } from '@orpc/contract';
+import { type HTTPMethod } from '@orpc/contract';
 export declare class ORPCPayloadCodec {
     /**
      * If method is GET, the payload will be encoded as query string.

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

@@ -1,16 +1,21 @@
 import type { HTTPPath } from '@orpc/contract';
-import type { Context, WithSignal } from '../../types';
-export type FetchOptions<T extends Context> = WithSignal & {
+import type { Context } from '../../types';
+export type FetchHandleOptions<T extends Context> = {
     prefix?: HTTPPath;
 } & (undefined extends T ? {
     context?: T;
 } : {
     context: T;
 });
+export type FetchHandleRest<T extends Context> = [options: FetchHandleOptions<T>] | (undefined extends T ? [] : never);
+export type FetchHandleResult = {
+    matched: true;
+    response: Response;
+} | {
+    matched: false;
+    response: undefined;
+};
 export interface FetchHandler<T extends Context> {
-    fetch: (request: Request, ...opt: [options: FetchOptions<T>] | (undefined extends T ? [] : never)) => Promise<Response>;
-}
-export interface ConditionalFetchHandler<T extends Context> extends FetchHandler<T> {
-    condition: (request: Request) => boolean;
+    handle: (request: Request, ...rest: FetchHandleRest<T>) => Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1,3 @@
+export * from '../fetch';
+export * from './middleware';
+//# sourceMappingURL=index.d.ts.map

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

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

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

@@ -0,0 +1,3 @@
+export * from '../fetch';
+export * from './serve';
+//# sourceMappingURL=index.d.ts.map

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

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

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

@@ -1,5 +1,5 @@
-export * from './composite-handler';
 export * from './orpc-handler';
 export * from './orpc-handler';
+export * from './request-listener';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map