@orpc/server 0.0.0-next.22ccd98 → 0.0.0-next.23aa4be

package/dist/index.js

@@ -1,6 +1,7 @@
 import {
   LAZY_LOADER_SYMBOL,
   Procedure,
+  createORPCErrorConstructorMap,
   createProcedureClient,
   flatLazy,
   getRouterChild,
@@ -9,31 +10,31 @@ import {
   lazy,
   mergeContext,
   unlazy
-} from "./chunk-6A7XHEBH.js";
+} from "./chunk-ZBJYYEII.js";
 
 // src/builder.ts
 import { ContractProcedure } from "@orpc/contract";
 
 // src/implementer-chainable.ts
 import { isContractProcedure } from "@orpc/contract";
-import { createCallableObject } from "@orpc/shared";
+import { createCallableObject as createCallableObject2 } from "@orpc/shared";
 
 // src/middleware-decorated.ts
 function decorateMiddleware(middleware) {
   const decorated = middleware;
   decorated.mapInput = (mapInput) => {
     const mapped = decorateMiddleware(
-      (input, ...rest) => middleware(mapInput(input), ...rest)
+      (options, input, ...rest) => middleware(options, mapInput(input), ...rest)
     );
     return mapped;
   };
   decorated.concat = (concatMiddleware, mapInput) => {
     const mapped = mapInput ? decorateMiddleware(concatMiddleware).mapInput(mapInput) : concatMiddleware;
-    const concatted = decorateMiddleware((input, context, meta, ...rest) => {
-      const next = async (options) => {
-        return mapped(input, mergeContext(context, options.context), meta, ...rest);
+    const concatted = decorateMiddleware((options, input, output, ...rest) => {
+      const next = async (nextOptions) => {
+        return mapped({ ...options, context: mergeContext(nextOptions.context, options.context) }, input, output, ...rest);
       };
-      const merged = middleware(input, context, { ...meta, next }, ...rest);
+      const merged = middleware({ ...options, next }, input, output, ...rest);
       return merged;
     });
     return concatted;
@@ -43,58 +44,72 @@ function decorateMiddleware(middleware) {
 
 // src/procedure-decorated.ts
 import { DecoratedContractProcedure } from "@orpc/contract";
-function decorateProcedure(procedure) {
-  const caller = createProcedureClient({
-    procedure,
-    context: void 0
-  });
-  const decorated = caller;
-  decorated["~type"] = procedure["~type"];
-  decorated["~orpc"] = procedure["~orpc"];
-  decorated.prefix = (prefix) => {
-    return decorateProcedure(new Procedure({
-      ...procedure["~orpc"],
-      contract: DecoratedContractProcedure.decorate(procedure["~orpc"].contract).prefix(prefix)
-    }));
-  };
-  decorated.route = (route) => {
-    return decorateProcedure(new Procedure({
-      ...procedure["~orpc"],
-      contract: DecoratedContractProcedure.decorate(procedure["~orpc"].contract).route(route)
-    }));
-  };
-  decorated.use = (middleware, mapInput) => {
+import { createCallableObject } from "@orpc/shared";
+var DecoratedProcedure = class _DecoratedProcedure extends Procedure {
+  static decorate(procedure) {
+    if (procedure instanceof _DecoratedProcedure) {
+      return procedure;
+    }
+    return new _DecoratedProcedure(procedure["~orpc"]);
+  }
+  prefix(prefix) {
+    return new _DecoratedProcedure({
+      ...this["~orpc"],
+      contract: DecoratedContractProcedure.decorate(this["~orpc"].contract).prefix(prefix)
+    });
+  }
+  route(route) {
+    return new _DecoratedProcedure({
+      ...this["~orpc"],
+      contract: DecoratedContractProcedure.decorate(this["~orpc"].contract).route(route)
+    });
+  }
+  use(middleware, mapInput) {
     const middleware_ = mapInput ? decorateMiddleware(middleware).mapInput(mapInput) : middleware;
-    return decorateProcedure(new Procedure({
-      ...procedure["~orpc"],
-      middlewares: [...procedure["~orpc"].middlewares ?? [], middleware_]
-    }));
-  };
-  decorated.unshiftTag = (...tags) => {
-    return decorateProcedure(new Procedure({
-      ...procedure["~orpc"],
-      contract: DecoratedContractProcedure.decorate(procedure["~orpc"].contract).unshiftTag(...tags)
-    }));
-  };
-  decorated.unshiftMiddleware = (...middlewares) => {
-    if (procedure["~orpc"].middlewares?.length) {
+    return new _DecoratedProcedure({
+      ...this["~orpc"],
+      middlewares: [...this["~orpc"].middlewares ?? [], middleware_]
+    });
+  }
+  unshiftTag(...tags) {
+    return new _DecoratedProcedure({
+      ...this["~orpc"],
+      contract: DecoratedContractProcedure.decorate(this["~orpc"].contract).unshiftTag(...tags)
+    });
+  }
+  unshiftMiddleware(...middlewares) {
+    const castedMiddlewares = middlewares;
+    if (this["~orpc"].middlewares?.length) {
       let min = 0;
-      for (let i = 0; i < procedure["~orpc"].middlewares.length; i++) {
-        const index = middlewares.indexOf(procedure["~orpc"].middlewares[i], min);
+      for (let i = 0; i < this["~orpc"].middlewares.length; i++) {
+        const index = castedMiddlewares.indexOf(this["~orpc"].middlewares[i], min);
         if (index === -1) {
-          middlewares.push(...procedure["~orpc"].middlewares.slice(i));
+          castedMiddlewares.push(...this["~orpc"].middlewares.slice(i));
           break;
         }
         min = index + 1;
       }
     }
-    return decorateProcedure(new Procedure({
-      ...procedure["~orpc"],
-      middlewares
-    }));
-  };
-  return decorated;
-}
+    return new _DecoratedProcedure({
+      ...this["~orpc"],
+      middlewares: castedMiddlewares
+    });
+  }
+  /**
+   * Make this procedure callable (works like a function while still being a procedure).
+   * **Note**: this only takes effect when this method is called at the end of the chain.
+   */
+  callable(...rest) {
+    return createCallableObject(this, createProcedureClient(this, ...rest));
+  }
+  /**
+   * Make this procedure compatible with server action (the same as .callable, but the type is compatible with server action).
+   * **Note**: this only takes effect when this method is called at the end of the chain.
+   */
+  actionable(...rest) {
+    return this.callable(...rest);
+  }
+};
 
 // src/procedure-implementer.ts
 var ProcedureImplementer = class _ProcedureImplementer {
@@ -111,11 +126,11 @@ var ProcedureImplementer = class _ProcedureImplementer {
     });
   }
   handler(handler) {
-    return decorateProcedure(new Procedure({
+    return new DecoratedProcedure({
       middlewares: this["~orpc"].middlewares,
       contract: this["~orpc"].contract,
       handler
-    }));
+    });
   }
 };
 
@@ -153,31 +168,10 @@ function getLazyRouterPrefix(obj) {
   return obj[LAZY_ROUTER_PREFIX_SYMBOL];
 }
 
-// src/lazy-utils.ts
-function createLazyProcedureFormAnyLazy(lazied) {
-  const lazyProcedure = lazy(async () => {
-    const { default: maybeProcedure } = await unlazy(flatLazy(lazied));
-    if (!isProcedure(maybeProcedure)) {
-      throw new Error(`
-            Expected a lazy<procedure> but got lazy<unknown>.
-            This should be caught by TypeScript compilation.
-            Please report this issue if this makes you feel uncomfortable.
-        `);
-    }
-    return { default: maybeProcedure };
-  });
-  return lazyProcedure;
-}
-
 // src/lazy-decorated.ts
 function decorateLazy(lazied) {
   const flattenLazy = flatLazy(lazied);
-  const procedureProcedureClient = createProcedureClient({
-    procedure: createLazyProcedureFormAnyLazy(flattenLazy),
-    context: void 0
-  });
-  Object.assign(procedureProcedureClient, flattenLazy);
-  const recursive = new Proxy(procedureProcedureClient, {
+  const recursive = new Proxy(flattenLazy, {
     get(target, key) {
       if (typeof key !== "string") {
         return Reflect.get(target, key);
@@ -244,7 +238,7 @@ function adapt(item, options) {
     return adaptedLazy;
   }
   if (isProcedure(item)) {
-    let decorated = decorateProcedure(item);
+    let decorated = DecoratedProcedure.decorate(item);
     if (options.tags?.length) {
       decorated = decorated.unshiftTag(...options.tags);
     }
@@ -312,7 +306,7 @@ function createChainableImplementer(contract, middlewares) {
       if (!next) {
         return method.bind(routerImplementer);
       }
-      return createCallableObject(next, method.bind(routerImplementer));
+      return createCallableObject2(next, method.bind(routerImplementer));
     }
   });
   return merged;
@@ -346,6 +340,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({
@@ -359,11 +359,11 @@ var ProcedureBuilder = class _ProcedureBuilder {
     }).use(middleware, mapInput);
   }
   handler(handler) {
-    return decorateProcedure(new Procedure({
+    return new DecoratedProcedure({
       middlewares: this["~orpc"].middlewares,
       contract: this["~orpc"].contract,
       handler
-    }));
+    });
   }
 };
 
@@ -392,7 +392,8 @@ var Builder = class _Builder {
       contract: new ContractProcedure({
         route,
         InputSchema: void 0,
-        OutputSchema: void 0
+        OutputSchema: void 0,
+        errorMap: void 0
       })
     });
   }
@@ -402,7 +403,8 @@ var Builder = class _Builder {
       contract: new ContractProcedure({
         OutputSchema: void 0,
         InputSchema: schema,
-        inputExample: example
+        inputExample: example,
+        errorMap: void 0
       })
     });
   }
@@ -412,19 +414,31 @@ 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
       })
     });
   }
   handler(handler) {
-    return decorateProcedure(new Procedure({
+    return new DecoratedProcedure({
       middlewares: this["~orpc"].middlewares,
       contract: new ContractProcedure({
         InputSchema: void 0,
-        OutputSchema: void 0
+        OutputSchema: void 0,
+        errorMap: void 0
       }),
       handler
-    }));
+    });
   }
   prefix(prefix) {
     return new RouterBuilder({
@@ -449,36 +463,47 @@ var Builder = class _Builder {
   }
 };
 
+// src/procedure-utils.ts
+function call(procedure, input, ...rest) {
+  return createProcedureClient(procedure, ...rest)(input);
+}
+
+// src/lazy-utils.ts
+function createLazyProcedureFormAnyLazy(lazied) {
+  const lazyProcedure = lazy(async () => {
+    const { default: maybeProcedure } = await unlazy(flatLazy(lazied));
+    if (!isProcedure(maybeProcedure)) {
+      throw new Error(`
+            Expected a lazy<procedure> but got lazy<unknown>.
+            This should be caught by TypeScript compilation.
+            Please report this issue if this makes you feel uncomfortable.
+        `);
+    }
+    return { default: maybeProcedure };
+  });
+  return lazyProcedure;
+}
+
 // src/router-client.ts
-function createRouterClient(options) {
-  if (isProcedure(options.router)) {
-    const caller = createProcedureClient({
-      ...options,
-      procedure: options.router,
-      context: options.context,
-      path: options.path
-    });
+function createRouterClient(router, ...rest) {
+  if (isProcedure(router)) {
+    const caller = createProcedureClient(router, ...rest);
     return caller;
   }
-  const procedureCaller = isLazy(options.router) ? createProcedureClient({
-    ...options,
-    procedure: createLazyProcedureFormAnyLazy(options.router),
-    context: options.context,
-    path: options.path
-  }) : {};
+  const procedureCaller = isLazy(router) ? createProcedureClient(createLazyProcedureFormAnyLazy(router), ...rest) : {};
   const recursive = new Proxy(procedureCaller, {
     get(target, key) {
       if (typeof key !== "string") {
         return Reflect.get(target, key);
       }
-      const next = getRouterChild(options.router, key);
+      const next = getRouterChild(router, key);
       if (!next) {
         return Reflect.get(target, key);
       }
-      return createRouterClient({
+      const [options] = rest;
+      return createRouterClient(next, {
         ...options,
-        router: next,
-        path: [...options.path ?? [], key]
+        path: [...options?.path ?? [], key]
       });
     }
   });
@@ -486,35 +511,39 @@ 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,
+  DecoratedProcedure,
   LAZY_LOADER_SYMBOL,
+  ORPCError,
   Procedure,
   ProcedureBuilder,
   ProcedureImplementer,
   RouterBuilder,
   RouterImplementer,
+  call,
   configGlobal,
   createChainableImplementer,
+  createORPCErrorConstructorMap,
   createProcedureClient,
   createRouterClient,
   decorateLazy,
   decorateMiddleware,
-  decorateProcedure,
   deepSetLazyRouterPrefix,
   fallbackToGlobalConfig,
   flatLazy,
   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-5IM453DN.js";
+import "./chunk-ZBJYYEII.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-B2EZJB7X.js";
-import "./chunk-6A7XHEBH.js";
+} from "./chunk-5IM453DN.js";
+import "./chunk-ZBJYYEII.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