@orpc/server 0.0.0-next.a055cad → 0.0.0-next.a895960

package/dist/{chunk-MZXEMHFS.js → chunk-3JMSDC5L.js}

@@ -108,7 +108,8 @@ function isProcedure(item) {
 
 // src/procedure-caller.ts
 function createProcedureCaller(options) {
-  const caller = async (input) => {
+  const caller = async (...args) => {
+    const [input, callerOptions] = args;
     const path = options.path ?? [];
     const procedure = await loadProcedure(options.procedure);
     const context = await value(options.context);
@@ -128,6 +129,11 @@ function createProcedureCaller(options) {
           });
         }
       })();
+      const meta = {
+        path,
+        procedure,
+        signal: callerOptions?.signal
+      };
       const middlewares = procedure.zz$p.middlewares ?? [];
       let currentMidIndex = 0;
       let currentContext = context;
@@ -137,17 +143,13 @@ function createProcedureCaller(options) {
         currentContext = mergeContext(currentContext, nextOptions.context);
         if (mid) {
           return await mid(validInput, currentContext, {
-            path,
-            procedure,
+            ...meta,
             next,
             output: (output3) => ({ output: output3, context: void 0 })
           });
         } else {
           return {
-            output: await await procedure.zz$p.func(validInput, currentContext, {
-              path,
-              procedure
-            }),
+            output: await await procedure.zz$p.func(validInput, currentContext, meta),
             context: currentContext
           };
         }
@@ -269,4 +271,4 @@ export {
   decorateProcedure,
   isProcedure
 };
-//# sourceMappingURL=chunk-MZXEMHFS.js.map
+//# sourceMappingURL=chunk-3JMSDC5L.js.map

package/dist/fetch.js

@@ -2,7 +2,7 @@ import {
   createProcedureCaller,
   isLazy,
   isProcedure
-} from "./chunk-MZXEMHFS.js";
+} from "./chunk-3JMSDC5L.js";
 
 // src/fetch/handle.ts
 import { ORPCError } from "@orpc/shared/error";
@@ -24,7 +24,7 @@ async function handleFetchRequest(options) {
 
 // src/fetch/handler.ts
 import { ORPC_HEADER, ORPC_HEADER_VALUE } from "@orpc/contract";
-import { trim, value } from "@orpc/shared";
+import { executeWithHooks, trim, value } from "@orpc/shared";
 import { ORPCError as ORPCError2 } from "@orpc/shared/error";
 import { ORPCDeserializer, ORPCSerializer } from "@orpc/transformer";
 var serializer = new ORPCSerializer();
@@ -48,7 +48,7 @@ function createORPCHandler() {
         procedure: match.procedure,
         path: match.path
       });
-      const output = await caller(input);
+      const output = await caller(input, { signal: options.signal });
       const { body, headers } = serializer.serialize(output);
       return new Response(body, {
         status: 200,
@@ -56,10 +56,15 @@ function createORPCHandler() {
       });
     };
     try {
-      return await options.hooks?.(
+      return await executeWithHooks({
+        hooks: options,
         context,
-        { next: handler, response: (response) => response }
-      ) ?? await handler();
+        execute: handler,
+        input: options.request,
+        meta: {
+          signal: options.signal
+        }
+      });
     } catch (e) {
       const error = e instanceof ORPCError2 ? e : new ORPCError2({
         code: "INTERNAL_SERVER_ERROR",

package/dist/index.js

@@ -12,7 +12,7 @@ import {
   loadLazy,
   loadProcedure,
   mergeContext
-} from "./chunk-MZXEMHFS.js";
+} from "./chunk-3JMSDC5L.js";
 
 // src/builder.ts
 import {

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

@@ -1,9 +1,6 @@
-import type { PartialOnUndefinedDeep, Promisable, Value } from '@orpc/shared';
+import type { Hooks, PartialOnUndefinedDeep, Value } from '@orpc/shared';
 import type { Router } from '../router';
-export interface FetchHandlerHooks {
-    next: () => Promise<Response>;
-    response: (response: Response) => Response;
-}
+import type { CallerOptions } from '../types';
 export type FetchHandlerOptions<TRouter extends Router<any>> = {
     /**
      * The `router` used for handling the request and routing,
@@ -21,15 +18,11 @@ export type FetchHandlerOptions<TRouter extends Router<any>> = {
      * @example /api
      */
     prefix?: string;
-    /**
-     * Hooks for executing logics on lifecycle events.
-     */
-    hooks?: (context: TRouter extends Router<infer UContext> ? UContext : never, hooks: FetchHandlerHooks) => Promisable<Response>;
 } & PartialOnUndefinedDeep<{
     /**
      * The context used to handle the request.
      */
     context: Value<TRouter extends Router<infer UContext> ? UContext : never>;
-}>;
+}> & CallerOptions & Hooks<Request, Response, TRouter extends Router<infer UContext> ? UContext : never, CallerOptions>;
 export type FetchHandler = <TRouter extends Router<any>>(options: FetchHandlerOptions<TRouter>) => Promise<Response | undefined>;
 //# sourceMappingURL=types.d.ts.map

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

@@ -2,6 +2,7 @@ import type { SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Hooks, PartialOnUndefinedDeep, Value } from '@orpc/shared';
 import type { Lazy } from './lazy';
 import type { ANY_LAZY_PROCEDURE, ANY_PROCEDURE, Procedure } from './procedure';
+import type { Caller } from './types';
 export type CreateProcedureCallerOptions<T extends ANY_PROCEDURE | ANY_LAZY_PROCEDURE> = T extends Procedure<infer UContext, any, any, infer UOutputSchema, infer UFuncOutput> | Lazy<Procedure<infer UContext, any, any, infer UOutputSchema, infer UFuncOutput>> ? {
     procedure: T;
     /**
@@ -19,7 +20,7 @@ export type CreateProcedureCallerOptions<T extends ANY_PROCEDURE | ANY_LAZY_PROC
     path: string[];
     procedure: ANY_PROCEDURE;
 }> : never;
-export type ProcedureCaller<TProcedure extends ANY_PROCEDURE | ANY_LAZY_PROCEDURE> = TProcedure extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> | Lazy<Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput>> ? (...input: [input: SchemaInput<UInputSchema>] | (undefined extends SchemaInput<UInputSchema> ? [] : never)) => Promise<SchemaOutput<UOutputSchema, UFuncOutput>> : never;
+export type ProcedureCaller<TProcedure extends ANY_PROCEDURE | ANY_LAZY_PROCEDURE> = TProcedure extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> | Lazy<Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput>> ? Caller<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>> : never;
 export declare function createProcedureCaller<TProcedure extends ANY_PROCEDURE | ANY_LAZY_PROCEDURE>(options: CreateProcedureCallerOptions<TProcedure>): ProcedureCaller<TProcedure>;
 export declare function loadProcedure(procedure: ANY_PROCEDURE | ANY_LAZY_PROCEDURE): Promise<ANY_PROCEDURE>;
 //# sourceMappingURL=procedure-caller.d.ts.map

package/dist/src/router.d.ts

@@ -13,9 +13,9 @@ export type RouterWithContract<TContext extends Context, TContract extends Contr
 };
 export declare function toContractRouter(router: ContractRouter | Router<any>): ContractRouter;
 export type InferRouterInputs<T extends Router<any>> = {
-    [K in keyof T]: T[K] extends Procedure<any, any, infer UInputSchema, any, any> ? SchemaInput<UInputSchema> : T[K] extends Router<any> ? InferRouterInputs<T[K]> : never;
+    [K in keyof T]: T[K] extends Procedure<any, any, infer UInputSchema, any, any> | Lazy<Procedure<any, any, infer UInputSchema, any, any>> ? SchemaInput<UInputSchema> : T[K] extends Router<any> ? InferRouterInputs<T[K]> : never;
 };
 export type InferRouterOutputs<T extends Router<any>> = {
-    [K in keyof T]: T[K] extends Procedure<any, any, any, infer UOutputSchema, infer UFuncOutput> ? SchemaOutput<UOutputSchema, UFuncOutput> : T[K] extends Router<any> ? InferRouterOutputs<T[K]> : never;
+    [K in keyof T]: T[K] extends Procedure<any, any, any, infer UOutputSchema, infer UFuncOutput> | Lazy<Procedure<any, any, any, infer UOutputSchema, infer UFuncOutput>> ? SchemaOutput<UOutputSchema, UFuncOutput> : T[K] extends Router<any> ? InferRouterOutputs<T[K]> : never;
 };
 //# sourceMappingURL=router.d.ts.map

package/dist/src/types.d.ts

@@ -1,7 +1,13 @@
 import type { WELL_DEFINED_PROCEDURE } from './procedure';
 export type 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 interface Meta {
+export interface CallerOptions {
+    signal?: AbortSignal;
+}
+export interface Caller<TInput, TOutput> {
+    (...opts: [input: TInput, options?: CallerOptions] | (undefined extends TInput ? [] : never)): Promise<TOutput>;
+}
+export interface Meta extends CallerOptions {
     path: string[];
     procedure: WELL_DEFINED_PROCEDURE;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.a055cad",
+  "version": "0.0.0-next.a895960",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -35,15 +35,15 @@
   ],
   "peerDependencies": {
     "zod": ">=3.23.0",
-    "@orpc/zod": "0.0.0-next.a055cad"
+    "@orpc/zod": "0.0.0-next.a895960"
   },
   "dependencies": {
-    "@orpc/contract": "0.0.0-next.a055cad",
-    "@orpc/transformer": "0.0.0-next.a055cad",
-    "@orpc/shared": "0.0.0-next.a055cad"
+    "@orpc/contract": "0.0.0-next.a895960",
+    "@orpc/shared": "0.0.0-next.a895960",
+    "@orpc/transformer": "0.0.0-next.a895960"
   },
   "devDependencies": {
-    "@orpc/openapi": "0.0.0-next.a055cad"
+    "@orpc/openapi": "0.0.0-next.a895960"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/fetch/index.ts --format=esm --onSuccess='tsc -b --noCheck'",