@orpc/server 0.0.0-next.316c163 → 0.0.0-next.331b26b

package/dist/node.js

@@ -0,0 +1,87 @@
+import {
+  ORPCHandler
+} from "./chunk-3BAPJGK6.js";
+import "./chunk-E7GUWVR4.js";
+
+// 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]);
+  }
+  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.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
+var ORPCHandler2 = class {
+  orpcFetchHandler;
+  constructor(router, options) {
+    this.orpcFetchHandler = new ORPCHandler(router, options);
+  }
+  async handle(req, res, ...[options]) {
+    const request = createRequest(req, res);
+    const castedOptions = options ?? {};
+    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 {
+  ORPCHandler2 as ORPCHandler,
+  createHeaders,
+  createRequest,
+  sendResponse
+};
+//# sourceMappingURL=node.js.map

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

@@ -0,0 +1,6 @@
+export * from './orpc-handler';
+export * from './orpc-payload-codec';
+export * from './orpc-procedure-matcher';
+export * as SuperJSON from './super-json';
+export * from './types';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,20 @@
+import type { Hooks } from '@orpc/shared';
+import type { Router } from '../../router';
+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, FetchHandleResult, T, {
+    signal?: AbortSignal;
+}> & {
+    procedureMatcher?: PublicORPCProcedureMatcher;
+    payloadCodec?: PublicORPCPayloadCodec;
+};
+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);
+    handle(request: Request, ...[options]: FetchHandleRest<T>): Promise<FetchHandleResult>;
+}
+//# sourceMappingURL=orpc-handler.d.ts.map

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

@@ -0,0 +1,16 @@
+import type { HTTPMethod } from '@orpc/contract';
+export declare class ORPCPayloadCodec {
+    /**
+     * If method is GET, the payload will be encoded as query string.
+     * If method is GET and payload contain file, the method will be fallback to fallbackMethod. (fallbackMethod = GET will force to use GET method)
+     */
+    encode(payload: unknown, method?: HTTPMethod, fallbackMethod?: HTTPMethod): {
+        query?: URLSearchParams;
+        body?: FormData | string;
+        headers?: Headers;
+        method: HTTPMethod;
+    };
+    decode(re: Request | Response): Promise<unknown>;
+}
+export type PublicORPCPayloadCodec = Pick<ORPCPayloadCodec, keyof ORPCPayloadCodec>;
+//# sourceMappingURL=orpc-payload-codec.d.ts.map

package/dist/src/adapters/fetch/orpc-procedure-matcher.d.ts

@@ -0,0 +1,12 @@
+import type { ANY_PROCEDURE } from '../../procedure';
+import { type ANY_ROUTER } from '../../router';
+export declare class ORPCProcedureMatcher {
+    private readonly router;
+    constructor(router: ANY_ROUTER);
+    match(pathname: string): Promise<{
+        path: string[];
+        procedure: ANY_PROCEDURE;
+    } | undefined>;
+}
+export type PublicORPCProcedureMatcher = Pick<ORPCProcedureMatcher, keyof ORPCProcedureMatcher>;
+//# sourceMappingURL=orpc-procedure-matcher.d.ts.map

package/dist/src/adapters/fetch/super-json.d.ts

@@ -0,0 +1,12 @@
+import type { Segment } from '@orpc/shared';
+export type JSONExtraType = 'bigint' | 'date' | 'nan' | 'undefined' | 'set' | 'map' | 'regexp' | 'url';
+export type JSONMeta = [JSONExtraType, Segment[]][];
+export declare function serialize(value: unknown, segments?: Segment[], meta?: JSONMeta): {
+    data: unknown;
+    meta: JSONMeta;
+};
+export declare function deserialize({ data, meta, }: {
+    data: unknown;
+    meta: JSONMeta;
+}): unknown;
+//# sourceMappingURL=super-json.d.ts.map

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

@@ -0,0 +1,21 @@
+import type { HTTPPath } from '@orpc/contract';
+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> {
+    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

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

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

@@ -0,0 +1,12 @@
+import type { ServerResponse } from 'node:http';
+import type { Router } from '../../router';
+import type { Context } from '../../types';
+import type { ORPCHandlerOptions } from '../fetch/orpc-handler';
+import type { RequestHandler, RequestHandleRest, RequestHandleResult } from './types';
+import { type ExpressableIncomingMessage } from './request-listener';
+export declare class ORPCHandler<T extends Context> implements RequestHandler<T> {
+    private readonly orpcFetchHandler;
+    constructor(router: Router<T, any>, options?: NoInfer<ORPCHandlerOptions<T>>);
+    handle(req: ExpressableIncomingMessage, res: ServerResponse, ...[options]: RequestHandleRest<T>): Promise<RequestHandleResult>;
+}
+//# sourceMappingURL=orpc-handler.d.ts.map

package/dist/src/adapters/node/request-listener.d.ts

@@ -0,0 +1,28 @@
+import type { IncomingMessage, ServerResponse } from 'node:http';
+export interface ExpressableIncomingMessage extends IncomingMessage {
+    originalUrl?: string;
+}
+/**
+ * Creates a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request) object from a Node.js
+ * [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) and
+ * [`http.ServerResponse`](https://nodejs.org/api/http.html#class-httpserverresponse) pair.
+ *
+ */
+export declare function createRequest(req: ExpressableIncomingMessage, res: ServerResponse): Request;
+/**
+ * Creates a [`Headers`](https://developer.mozilla.org/en-US/docs/Web/API/Headers) object from the headers
+ * in a Node.js [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage).
+ *
+ * @param req The incoming request object.
+ * @returns A headers object.
+ */
+export declare function createHeaders(req: IncomingMessage): Headers;
+/**
+ * Sends a [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response) to the client using the
+ * Node.js [`http.ServerResponse`](https://nodejs.org/api/http.html#class-httpserverresponse) object.
+ *
+ * @param res The server response object.
+ * @param response The response to send.
+ */
+export declare function sendResponse(res: ServerResponse, response: Response): Promise<void>;
+//# sourceMappingURL=request-listener.d.ts.map

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

@@ -0,0 +1,22 @@
+import type { HTTPPath } from '@orpc/contract';
+import type { Promisable } from '@orpc/shared';
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import type { Context } from '../../types';
+export type RequestHandleOptions<T extends Context> = {
+    prefix?: HTTPPath;
+    beforeSend?: (response: Response, context: T) => Promisable<void>;
+} & (undefined extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+export type RequestHandleRest<T extends Context> = [options: RequestHandleOptions<T>] | (undefined extends T ? [] : never);
+export type RequestHandleResult = {
+    matched: true;
+} | {
+    matched: false;
+};
+export interface RequestHandler<T extends Context> {
+    handle: (req: IncomingMessage, res: ServerResponse, ...rest: RequestHandleRest<T>) => Promise<RequestHandleResult>;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/src/builder.d.ts

@@ -6,7 +6,7 @@ import type { Router } from './router';
 import type { AdaptedRouter } from './router-builder';
 import type { Context, MergeContext, WELL_CONTEXT } from './types';
 import { type ChainableImplementer } from './implementer-chainable';
-import { type ProcedureFunc } from './procedure';
+import { type ProcedureHandler } from './procedure';
 import { ProcedureBuilder } from './procedure-builder';
 import { type DecoratedProcedure } from './procedure-decorated';
 import { RouterBuilder } from './router-builder';
@@ -23,7 +23,7 @@ export declare class Builder<TContext extends Context, TExtraContext extends Con
     route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, undefined, undefined>;
     input<USchema extends Schema = undefined>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilder<TContext, TExtraContext, USchema, undefined>;
     output<USchema extends Schema = undefined>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilder<TContext, TExtraContext, undefined, USchema>;
-    func<UFuncOutput = undefined>(func: ProcedureFunc<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
+    handler<UFuncOutput = undefined>(handler: ProcedureHandler<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
     prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext>;
     tag(...tags: string[]): RouterBuilder<TContext, TExtraContext>;
     router<U extends Router<MergeContext<TContext, TExtraContext>, any>>(router: U): AdaptedRouter<TContext, U>;

package/dist/src/index.d.ts

@@ -18,6 +18,7 @@ export * from './router-client';
 export * from './router-implementer';
 export * from './types';
 export * from './utils';
+export { configGlobal, fallbackToGlobalConfig } from '@orpc/contract';
 export * from '@orpc/shared/error';
 export declare const os: Builder<WELL_CONTEXT, undefined>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -3,7 +3,7 @@ import type { Lazy } from './lazy';
 import type { Procedure } from './procedure';
 import type { ProcedureClient } from './procedure-client';
 import { type ANY_ROUTER } from './router';
-export type DecoratedLazy<T> = T extends Lazy<infer U> ? DecoratedLazy<U> : Lazy<T> & (T extends Procedure<infer UContext, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? undefined extends UContext ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>> : unknown : {
+export type DecoratedLazy<T> = T extends Lazy<infer U> ? DecoratedLazy<U> : Lazy<T> & (T extends Procedure<infer UContext, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? undefined extends UContext ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>, unknown> : unknown : {
     [K in keyof T]: T[K] extends object ? DecoratedLazy<T[K]> : never;
 });
 export declare function decorateLazy<T extends Lazy<ANY_ROUTER | undefined>>(lazied: T): DecoratedLazy<T>;

package/dist/src/middleware.d.ts

@@ -1,19 +1,29 @@
 import type { Promisable } from '@orpc/shared';
-import type { Context, Meta } from './types';
+import type { ANY_PROCEDURE } from './procedure';
+import type { Context } from './types';
 export type MiddlewareResult<TExtraContext extends Context, TOutput> = Promisable<{
     output: TOutput;
     context: TExtraContext;
 }>;
-export interface MiddlewareMeta<TOutput> extends Meta {
-    next: <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
+export interface MiddlewareNextFn<TOutput> {
+    <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
         context?: UExtraContext;
     } : {
         context: UExtraContext;
-    }) => MiddlewareResult<UExtraContext, TOutput>;
-    output: <UOutput>(output: UOutput) => MiddlewareResult<undefined, UOutput>;
+    }): MiddlewareResult<UExtraContext, TOutput>;
+}
+export interface MiddlewareOutputFn<TOutput> {
+    (output: TOutput): MiddlewareResult<undefined, TOutput>;
+}
+export interface MiddlewareOptions<TContext extends Context, TOutput> {
+    context: TContext;
+    path: string[];
+    procedure: ANY_PROCEDURE;
+    signal?: AbortSignal;
+    next: MiddlewareNextFn<TOutput>;
 }
 export interface Middleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput> {
-    (input: TInput, context: TContext, meta: MiddlewareMeta<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
+    (options: MiddlewareOptions<TContext, TOutput>, input: TInput, output: MiddlewareOutputFn<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
 }
 export type ANY_MIDDLEWARE = Middleware<any, any, any, any>;
 export interface MapInputMiddleware<TInput, TMappedInput> {

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

@@ -2,7 +2,7 @@ import type { MapInputMiddleware, Middleware } from './middleware';
 import type { DecoratedProcedure } from './procedure-decorated';
 import type { Context, MergeContext } from './types';
 import { type ContractProcedure, type RouteOptions, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-import { type ProcedureFunc } from './procedure';
+import { type ProcedureHandler } from './procedure';
 import { ProcedureImplementer } from './procedure-implementer';
 export interface ProcedureBuilderDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> {
     contract: ContractProcedure<TInputSchema, TOutputSchema>;
@@ -17,6 +17,6 @@ export declare class ProcedureBuilder<TContext extends Context, TExtraContext ex
     output<U extends Schema = undefined>(schema: U, example?: SchemaOutput<U>): ProcedureBuilder<TContext, TExtraContext, TInputSchema, U>;
     use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
     use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
-    func<UFuncOutput extends SchemaInput<TOutputSchema>>(func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
 }
 //# sourceMappingURL=procedure-builder.d.ts.map

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

@@ -3,14 +3,19 @@ import type { Hooks, Value } from '@orpc/shared';
 import type { Lazyable } from './lazy';
 import type { Procedure } from './procedure';
 import type { Context, Meta, WELL_CONTEXT, WithSignal } from './types';
-export interface ProcedureClient<TInput, TOutput> {
-    (...opts: [input: TInput, options?: WithSignal] | (undefined extends TInput ? [] : never)): Promise<TOutput>;
+export type ProcedureClientOptions<TClientContext> = WithSignal & (undefined extends TClientContext ? {
+    context?: TClientContext;
+} : {
+    context: TClientContext;
+});
+export interface ProcedureClient<TInput, TOutput, TClientContext> {
+    (...opts: [input: TInput, options: ProcedureClientOptions<TClientContext>] | (undefined extends TInput & TClientContext ? [] : never) | (undefined extends TClientContext ? [input: TInput] : never)): Promise<TOutput>;
 }
 /**
  * Options for creating a procedure caller with comprehensive type safety
  */
-export type CreateProcedureClientOptions<TContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> = {
-    procedure: Lazyable<Procedure<TContext, any, TInputSchema, TOutputSchema, TFuncOutput>>;
+export type CreateProcedureClientOptions<TContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> = {
+    procedure: Lazyable<Procedure<TContext, any, TInputSchema, TOutputSchema, THandlerOutput>>;
     /**
      * This is helpful for logging and analytics.
      *
@@ -24,6 +29,6 @@ export type CreateProcedureClientOptions<TContext extends Context, TInputSchema
     context: Value<TContext>;
 } | (undefined extends TContext ? {
     context?: undefined;
-} : never)) & Hooks<unknown, SchemaOutput<TOutputSchema, TFuncOutput>, TContext, Meta>;
-export declare function createProcedureClient<TContext extends Context = WELL_CONTEXT, TInputSchema extends Schema = undefined, TOutputSchema extends Schema = undefined, TFuncOutput extends SchemaInput<TOutputSchema> = SchemaInput<TOutputSchema>>(options: CreateProcedureClientOptions<TContext, TInputSchema, TOutputSchema, TFuncOutput>): ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, TFuncOutput>>;
+} : never)) & Hooks<unknown, SchemaOutput<TOutputSchema, THandlerOutput>, TContext, Meta>;
+export declare function createProcedureClient<TContext extends Context = WELL_CONTEXT, TInputSchema extends Schema = undefined, TOutputSchema extends Schema = undefined, THandlerOutput extends SchemaInput<TOutputSchema> = SchemaInput<TOutputSchema>>(options: CreateProcedureClientOptions<TContext, TInputSchema, TOutputSchema, THandlerOutput>): ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, unknown>;
 //# sourceMappingURL=procedure-client.d.ts.map

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

@@ -3,12 +3,12 @@ import type { MapInputMiddleware, Middleware } from './middleware';
 import type { ProcedureClient } from './procedure-client';
 import type { Context, MergeContext } from './types';
 import { Procedure } from './procedure';
-export type DecoratedProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> = Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput> & {
-    prefix: (prefix: HTTPPath) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    route: (route: RouteOptions) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    use: (<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, TFuncOutput>>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema, TFuncOutput>) & (<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema, TFuncOutput>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, TFuncOutput>, UInput>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema, TFuncOutput>);
-    unshiftTag: (...tags: string[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    unshiftMiddleware: <U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(...middlewares: Middleware<TContext, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, TFuncOutput>>[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-} & (undefined extends TContext ? ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, TFuncOutput>> : unknown);
-export declare function decorateProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>>(procedure: Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+export type DecoratedProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> = Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput> & {
+    prefix: (prefix: HTTPPath) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    route: (route: RouteOptions) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    use: (<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, THandlerOutput>>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema, THandlerOutput>) & (<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema, THandlerOutput>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, THandlerOutput>, UInput>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema, THandlerOutput>);
+    unshiftTag: (...tags: string[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    unshiftMiddleware: <U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(...middlewares: Middleware<TContext, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, THandlerOutput>>[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+} & (undefined extends TContext ? ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, unknown> : unknown);
+export declare function decorateProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>>(procedure: Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
 //# sourceMappingURL=procedure-decorated.d.ts.map

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

@@ -1,6 +1,6 @@
 import type { ContractProcedure, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { MapInputMiddleware, Middleware } from './middleware';
-import type { ProcedureFunc } from './procedure';
+import type { ProcedureHandler } from './procedure';
 import type { DecoratedProcedure } from './procedure-decorated';
 import type { Context, MergeContext } from './types';
 export type ProcedureImplementerDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> = {
@@ -13,6 +13,6 @@ export declare class ProcedureImplementer<TContext extends Context, TExtraContex
     constructor(def: ProcedureImplementerDef<TContext, TExtraContext, TInputSchema, TOutputSchema>);
     use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
     use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
-    func<UFuncOutput extends SchemaInput<TOutputSchema>>(func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
 }
 //# sourceMappingURL=procedure-implementer.d.ts.map

package/dist/src/procedure.d.ts

@@ -1,20 +1,27 @@
 import type { Promisable } from '@orpc/shared';
 import type { Lazy } from './lazy';
 import type { Middleware } from './middleware';
-import type { Context, MergeContext, Meta } from './types';
+import type { AbortSignal, Context, MergeContext } from './types';
 import { type ContractProcedure, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-export interface ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
-    (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, TFuncOutput>>;
+export interface ProcedureHandlerOptions<TContext extends Context, TInput> {
+    context: TContext;
+    input: TInput;
+    path: string[];
+    procedure: ANY_PROCEDURE;
+    signal?: AbortSignal;
 }
-export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
+export interface ProcedureHandler<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
+    (opt: ProcedureHandlerOptions<MergeContext<TContext, TExtraContext>, SchemaOutput<TInputSchema>>): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
+}
+export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
     middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, SchemaOutput<TInputSchema>, any>[];
     contract: ContractProcedure<TInputSchema, TOutputSchema>;
-    func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+    handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
 }
-export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
+export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
     '~type': "Procedure";
-    '~orpc': ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    constructor(def: ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>);
+    '~orpc': ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    constructor(def: ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>);
 }
 export type ANY_PROCEDURE = Procedure<any, any, any, any, any>;
 export type WELL_PROCEDURE = Procedure<Context, Context, Schema, Schema, unknown>;

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

@@ -5,8 +5,8 @@ import type { Procedure } from './procedure';
 import type { ProcedureClient } from './procedure-client';
 import type { Meta } from './types';
 import { type ANY_ROUTER, type Router } from './router';
-export type RouterClient<T extends ANY_ROUTER | ContractRouter> = T extends Lazy<infer U extends ANY_ROUTER | ContractRouter> ? RouterClient<U> : T extends ContractProcedure<infer UInputSchema, infer UOutputSchema> | Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>> : {
-    [K in keyof T]: T[K] extends ANY_ROUTER | ContractRouter ? RouterClient<T[K]> : never;
+export type RouterClient<TRouter extends ANY_ROUTER | ContractRouter, TClientContext> = TRouter extends Lazy<infer U extends ANY_ROUTER | ContractRouter> ? RouterClient<U, TClientContext> : TRouter extends ContractProcedure<infer UInputSchema, infer UOutputSchema> | Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>, TClientContext> : {
+    [K in keyof TRouter]: TRouter[K] extends ANY_ROUTER | ContractRouter ? RouterClient<TRouter[K], TClientContext> : never;
 };
 export type CreateRouterClientOptions<TRouter extends ANY_ROUTER> = {
     router: TRouter | Lazy<undefined>;
@@ -21,5 +21,5 @@ export type CreateRouterClientOptions<TRouter extends ANY_ROUTER> = {
 } : {
     context: Value<UContext>;
 } : never) & Hooks<unknown, unknown, TRouter extends Router<infer UContext, any> ? UContext : never, Meta>;
-export declare function createRouterClient<TRouter extends ANY_ROUTER>(options: CreateRouterClientOptions<TRouter>): RouterClient<TRouter>;
+export declare function createRouterClient<TRouter extends ANY_ROUTER>(options: CreateRouterClientOptions<TRouter>): RouterClient<TRouter, unknown>;
 //# sourceMappingURL=router-client.d.ts.map

package/dist/src/types.d.ts

@@ -1,7 +1,9 @@
+import type { FindGlobalInstanceType } from '@orpc/shared';
 import type { ANY_PROCEDURE } from './procedure';
 export type Context = Record<string, any> | undefined;
 export type WELL_CONTEXT = Record<string, unknown> | undefined;
 export type MergeContext<TA extends Context, TB extends Context> = TA extends undefined ? TB : TB extends undefined ? TA : TA & TB;
+export type AbortSignal = FindGlobalInstanceType<'AbortSignal'>;
 export interface WithSignal {
     signal?: AbortSignal;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.316c163",
+  "version": "0.0.0-next.331b26b",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -20,10 +20,25 @@
       "default": "./dist/index.js"
     },
     "./fetch": {
-      "types": "./dist/src/fetch/index.d.ts",
+      "types": "./dist/src/adapters/fetch/index.d.ts",
       "import": "./dist/fetch.js",
       "default": "./dist/fetch.js"
     },
+    "./hono": {
+      "types": "./dist/src/adapters/hono/index.d.ts",
+      "import": "./dist/hono.js",
+      "default": "./dist/hono.js"
+    },
+    "./next": {
+      "types": "./dist/src/adapters/next/index.d.ts",
+      "import": "./dist/next.js",
+      "default": "./dist/next.js"
+    },
+    "./node": {
+      "types": "./dist/src/adapters/node/index.d.ts",
+      "import": "./dist/node.js",
+      "default": "./dist/node.js"
+    },
     "./🔒/*": {
       "types": "./dist/src/*.d.ts"
     }
@@ -34,18 +49,15 @@
     "dist"
   ],
   "peerDependencies": {
-    "@orpc/zod": "0.0.0-next.316c163"
+    "hono": ">=4.6.0",
+    "next": ">=14.0.0"
   },
   "dependencies": {
-    "@orpc/contract": "0.0.0-next.316c163",
-    "@orpc/transformer": "0.0.0-next.316c163",
-    "@orpc/shared": "0.0.0-next.316c163"
-  },
-  "devDependencies": {
-    "zod": "^3.24.1"
+    "@orpc/contract": "0.0.0-next.331b26b",
+    "@orpc/shared": "0.0.0-next.331b26b"
   },
   "scripts": {
-    "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/fetch/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
+    "build": "tsup --onSuccess='tsc -b --noCheck'",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/src/fetch/handle-request.d.ts

@@ -1,7 +0,0 @@
-import type { Context } from '../types';
-import type { FetchHandler, FetchHandlerOptions } from './types';
-export type HandleFetchRequestOptions<T extends Context> = FetchHandlerOptions<T> & {
-    handlers: readonly [FetchHandler, ...FetchHandler[]];
-};
-export declare function handleFetchRequest<T extends Context>(options: HandleFetchRequestOptions<T>): Promise<Response>;
-//# sourceMappingURL=handle-request.d.ts.map

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

@@ -1,4 +0,0 @@
-export * from './handle-request';
-export * from './orpc-handler';
-export * from './types';
-//# sourceMappingURL=index.d.ts.map