@orpc/server 0.39.0 → 0.41.0

package/dist/{chunk-N2FJGXSJ.js → chunk-KPT6FDBK.js}

@@ -2,7 +2,7 @@ import {
   RPCCodec,
   RPCMatcher,
   StandardHandler
-} from "./chunk-DAUWED3D.js";
+} from "./chunk-LXOL226G.js";
 
 // src/adapters/fetch/rpc-handler.ts
 import { toFetchResponse, toStandardRequest } from "@orpc/server-standard-fetch";
@@ -29,4 +29,4 @@ var RPCHandler = class {
 export {
   RPCHandler
 };
-//# sourceMappingURL=chunk-N2FJGXSJ.js.map
+//# sourceMappingURL=chunk-KPT6FDBK.js.map

package/dist/{chunk-DAUWED3D.js → chunk-LXOL226G.js}

@@ -6,13 +6,13 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-XP6YRLY2.js";
+} from "./chunk-MHVECKBC.js";
 import {
   CompositePlugin
 } from "./chunk-XI6WGCB3.js";
 
 // src/adapters/standard/handler.ts
-import { toORPCError } from "@orpc/contract";
+import { ORPCError, toORPCError } from "@orpc/client";
 import { intercept, trim } from "@orpc/shared";
 var StandardHandler = class {
   constructor(router, matcher, codec, options = {}) {
@@ -34,6 +34,7 @@ var StandardHandler = class {
         // context is optional only when all fields are optional so we can safely force it to have a context
       },
       async (interceptorOptions) => {
+        let isDecoding = false;
         try {
           return await intercept(
             this.options.interceptors ?? [],
@@ -52,8 +53,11 @@ var StandardHandler = class {
               };
               this.plugin.beforeCreateProcedureClient(clientOptions, interceptorOptions2);
               const client = createProcedureClient(match.procedure, clientOptions);
+              isDecoding = true;
               const input = await this.codec.decode(request, match.params, match.procedure);
-              const output = await client(input, { signal: request.signal });
+              isDecoding = false;
+              const lastEventId = Array.isArray(request.headers["last-event-id"]) ? request.headers["last-event-id"].at(-1) : request.headers["last-event-id"];
+              const output = await client(input, { signal: request.signal, lastEventId });
               const response = this.codec.encode(output, match.procedure);
               return {
                 matched: true,
@@ -62,7 +66,10 @@ var StandardHandler = class {
             }
           );
         } catch (e) {
-          const error = toORPCError(e);
+          const error = isDecoding ? new ORPCError("BAD_REQUEST", {
+            message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
+            cause: e
+          }) : toORPCError(e);
           const response = this.codec.encodeError(error);
           return {
             matched: true,
@@ -74,150 +81,8 @@ var StandardHandler = class {
   }
 };
 
-// src/adapters/standard/rpc-serializer.ts
-import { findDeepMatches, isObject, set } from "@orpc/shared";
-var RPCSerializer = class {
-  serialize(data) {
-    if (data === void 0) {
-      return void 0;
-    }
-    if (data instanceof Blob) {
-      return data;
-    }
-    const serializedJSON = serializeRPCJson(data);
-    const { maps, values: blobs } = findDeepMatches((v) => v instanceof Blob, serializedJSON.json);
-    if (blobs.length === 0) {
-      return serializedJSON;
-    }
-    const form = new FormData();
-    form.set("data", JSON.stringify(serializedJSON));
-    form.set("maps", JSON.stringify(maps));
-    for (const i in blobs) {
-      form.set(i, blobs[i]);
-    }
-    return form;
-  }
-  deserialize(serialized) {
-    if (serialized === void 0) {
-      return void 0;
-    }
-    if (serialized instanceof Blob) {
-      return serialized;
-    }
-    if (!(serialized instanceof FormData)) {
-      return deserializeRPCJson(serialized);
-    }
-    const data = JSON.parse(serialized.get("data"));
-    const maps = JSON.parse(serialized.get("maps"));
-    for (const i in maps) {
-      data.json = set(data.json, maps[i], serialized.get(i));
-    }
-    return deserializeRPCJson(data);
-  }
-};
-function serializeRPCJson(value, segments = [], meta = []) {
-  if (typeof value === "bigint") {
-    meta.push(["bigint", segments]);
-    return { json: value.toString(), meta };
-  }
-  if (value instanceof Date) {
-    meta.push(["date", segments]);
-    const data = Number.isNaN(value.getTime()) ? "Invalid Date" : value.toISOString();
-    return { json: data, meta };
-  }
-  if (Number.isNaN(value)) {
-    meta.push(["nan", segments]);
-    return { json: "NaN", meta };
-  }
-  if (value instanceof RegExp) {
-    meta.push(["regexp", segments]);
-    return { json: value.toString(), meta };
-  }
-  if (value instanceof URL) {
-    meta.push(["url", segments]);
-    return { json: value.toString(), meta };
-  }
-  if (isObject(value)) {
-    const json = {};
-    for (const k in value) {
-      json[k] = serializeRPCJson(value[k], [...segments, k], meta).json;
-    }
-    return { json, meta };
-  }
-  if (Array.isArray(value)) {
-    const json = value.map((v, i) => {
-      if (v === void 0) {
-        meta.push(["undefined", [...segments, i]]);
-        return null;
-      }
-      return serializeRPCJson(v, [...segments, i], meta).json;
-    });
-    return { json, meta };
-  }
-  if (value instanceof Set) {
-    const result = serializeRPCJson(Array.from(value), segments, meta);
-    meta.push(["set", segments]);
-    return result;
-  }
-  if (value instanceof Map) {
-    const result = serializeRPCJson(Array.from(value.entries()), segments, meta);
-    meta.push(["map", segments]);
-    return result;
-  }
-  return { json: value, meta };
-}
-function deserializeRPCJson({
-  json,
-  meta
-}) {
-  if (meta.length === 0) {
-    return json;
-  }
-  const ref = { data: json };
-  for (const [type, segments] of meta) {
-    let currentRef = ref;
-    let preSegment = "data";
-    for (let i = 0; i < segments.length; i++) {
-      currentRef = currentRef[preSegment];
-      preSegment = segments[i];
-    }
-    switch (type) {
-      case "nan":
-        currentRef[preSegment] = Number.NaN;
-        break;
-      case "bigint":
-        currentRef[preSegment] = BigInt(currentRef[preSegment]);
-        break;
-      case "date":
-        currentRef[preSegment] = new Date(currentRef[preSegment]);
-        break;
-      case "regexp": {
-        const [, pattern, flags] = currentRef[preSegment].match(/^\/(.*)\/([a-z]*)$/);
-        currentRef[preSegment] = new RegExp(pattern, flags);
-        break;
-      }
-      case "url":
-        currentRef[preSegment] = new URL(currentRef[preSegment]);
-        break;
-      case "undefined":
-        currentRef[preSegment] = void 0;
-        break;
-      case "map":
-        currentRef[preSegment] = new Map(currentRef[preSegment]);
-        break;
-      case "set":
-        currentRef[preSegment] = new Set(currentRef[preSegment]);
-        break;
-      /* v8 ignore next 3 */
-      default: {
-        const _expected = type;
-      }
-    }
-  }
-  return ref.data;
-}
-
 // src/adapters/standard/rpc-codec.ts
+import { RPCSerializer } from "@orpc/client/rpc";
 var RPCCodec = class {
   serializer;
   constructor(options = {}) {
@@ -311,9 +176,7 @@ var RPCMatcher = class {
 
 export {
   StandardHandler,
-  RPCSerializer,
-  serializeRPCJson,
   RPCCodec,
   RPCMatcher
 };
-//# sourceMappingURL=chunk-DAUWED3D.js.map
+//# sourceMappingURL=chunk-LXOL226G.js.map

package/dist/{chunk-XP6YRLY2.js → chunk-MHVECKBC.js}

@@ -62,8 +62,50 @@ function middlewareOutputFn(output) {
 }
 
 // src/procedure-client.ts
-import { createORPCErrorConstructorMap, ORPCError, validateORPCError, ValidationError } from "@orpc/contract";
+import { ORPCError as ORPCError2 } from "@orpc/client";
+import { ValidationError } from "@orpc/contract";
 import { intercept, toError, value } from "@orpc/shared";
+
+// src/error.ts
+import { fallbackORPCErrorStatus, ORPCError } from "@orpc/client";
+function createORPCErrorConstructorMap(errors) {
+  const proxy = new Proxy(errors, {
+    get(target, code) {
+      if (typeof code !== "string") {
+        return Reflect.get(target, code);
+      }
+      const item = (...[options]) => {
+        const config = errors[code];
+        return new ORPCError(code, {
+          defined: Boolean(config),
+          status: config?.status,
+          message: options?.message ?? config?.message,
+          data: options?.data,
+          cause: options?.cause
+        });
+      };
+      return item;
+    }
+  });
+  return proxy;
+}
+async function validateORPCError(map, error) {
+  const { code, status, message, data, cause, defined } = error;
+  const config = map?.[error.code];
+  if (!config || fallbackORPCErrorStatus(error.code, config.status) !== error.status) {
+    return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
+  }
+  if (!config.data) {
+    return defined ? error : new ORPCError(code, { defined: true, status, message, data, cause });
+  }
+  const validated = await config.data["~standard"].validate(error.data);
+  if (validated.issues) {
+    return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
+  }
+  return new ORPCError(code, { defined: true, status, message, data: validated.value, cause });
+}
+
+// src/procedure-client.ts
 function createProcedureClient(lazyableProcedure, ...[options]) {
   return async (...[input, callerOptions]) => {
     const path = options?.path ?? [];
@@ -81,12 +123,13 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
           errors,
           path,
           procedure,
-          signal: callerOptions?.signal
+          signal: callerOptions?.signal,
+          lastEventId: callerOptions?.lastEventId
         },
         (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
       );
     } catch (e) {
-      if (!(e instanceof ORPCError)) {
+      if (!(e instanceof ORPCError2)) {
         throw toError(e);
       }
       const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
@@ -101,7 +144,7 @@ async function validateInput(procedure, input) {
   }
   const result = await schema["~standard"].validate(input);
   if (result.issues) {
-    throw new ORPCError("BAD_REQUEST", {
+    throw new ORPCError2("BAD_REQUEST", {
       message: "Input validation failed",
       data: {
         issues: result.issues
@@ -118,7 +161,7 @@ async function validateOutput(procedure, output) {
   }
   const result = await schema["~standard"].validate(output);
   if (result.issues) {
-    throw new ORPCError("INTERNAL_SERVER_ERROR", {
+    throw new ORPCError2("INTERNAL_SERVER_ERROR", {
       message: "Output validation failed",
       cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
     });
@@ -375,4 +418,4 @@ export {
   convertPathToHttpPath,
   createContractedProcedure
 };
-//# sourceMappingURL=chunk-XP6YRLY2.js.map
+//# sourceMappingURL=chunk-MHVECKBC.js.map

package/dist/fetch.js

@@ -1,8 +1,8 @@
 import {
   RPCHandler
-} from "./chunk-N2FJGXSJ.js";
-import "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+} from "./chunk-KPT6FDBK.js";
+import "./chunk-LXOL226G.js";
+import "./chunk-MHVECKBC.js";
 import "./chunk-XI6WGCB3.js";
 export {
   RPCHandler

package/dist/hono.js

@@ -1,8 +1,8 @@
 import {
   RPCHandler
-} from "./chunk-N2FJGXSJ.js";
-import "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+} from "./chunk-KPT6FDBK.js";
+import "./chunk-LXOL226G.js";
+import "./chunk-MHVECKBC.js";
 import "./chunk-XI6WGCB3.js";
 
 // src/adapters/hono/middleware.ts

package/dist/index.js

@@ -21,7 +21,7 @@ import {
   middlewareOutputFn,
   setRouterContract,
   unlazy
-} from "./chunk-XP6YRLY2.js";
+} from "./chunk-MHVECKBC.js";
 
 // src/builder.ts
 import { mergeErrorMap as mergeErrorMap2, mergeMeta as mergeMeta2, mergePrefix, mergeRoute as mergeRoute2, mergeTags } from "@orpc/contract";
@@ -50,10 +50,14 @@ function decorateMiddleware(middleware) {
   decorated.concat = (concatMiddleware, mapInput) => {
     const mapped = mapInput ? decorateMiddleware(concatMiddleware).mapInput(mapInput) : concatMiddleware;
     const concatted = decorateMiddleware((options, input, output, ...rest) => {
-      const next = async (...[nextOptions]) => {
-        return mapped({ ...options, context: { ...nextOptions?.context, ...options.context } }, input, output, ...rest);
-      };
-      const merged = middleware({ ...options, next }, input, output, ...rest);
+      const merged = middleware({
+        ...options,
+        next: (...[nextOptions1]) => mapped({
+          ...options,
+          context: { ...options.context, ...nextOptions1?.context },
+          next: (...[nextOptions2]) => options.next({ context: { ...nextOptions1?.context, ...nextOptions2?.context } })
+        }, input, output, ...rest)
+      }, input, output, ...rest);
       return merged;
     });
     return concatted;
@@ -357,7 +361,9 @@ function createRouterClient(router, ...rest) {
 }
 
 // src/index.ts
-import { isDefinedError, ORPCError, safe, type, ValidationError } from "@orpc/contract";
+import { isDefinedError, ORPCError, safe } from "@orpc/client";
+import { eventIterator, type, ValidationError } from "@orpc/contract";
+import { getEventMeta, withEventMeta } from "@orpc/server-standard";
 import { onError, onFinish, onStart, onSuccess } from "@orpc/shared";
 export {
   Builder,
@@ -378,8 +384,10 @@ export {
   deepSetLazyRouterPrefix,
   eachAllContractProcedure,
   eachContractProcedure,
+  eventIterator,
   fallbackConfig,
   flatLazy,
+  getEventMeta,
   getLazyRouterPrefix,
   getRouterChild,
   getRouterContract,
@@ -399,6 +407,7 @@ export {
   safe,
   setRouterContract,
   type,
-  unlazy
+  unlazy,
+  withEventMeta
 };
 //# sourceMappingURL=index.js.map

package/dist/next.js

@@ -1,8 +1,8 @@
 import {
   RPCHandler
-} from "./chunk-N2FJGXSJ.js";
-import "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+} from "./chunk-KPT6FDBK.js";
+import "./chunk-LXOL226G.js";
+import "./chunk-MHVECKBC.js";
 import "./chunk-XI6WGCB3.js";
 
 // src/adapters/next/serve.ts

package/dist/node.js

@@ -2,8 +2,8 @@ import {
   RPCCodec,
   RPCMatcher,
   StandardHandler
-} from "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+} from "./chunk-LXOL226G.js";
+import "./chunk-MHVECKBC.js";
 import "./chunk-XI6WGCB3.js";
 
 // src/adapters/node/rpc-handler.ts

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

@@ -2,6 +2,5 @@ export * from './handler';
 export * from './rpc-codec';
 export * from './rpc-handler';
 export * from './rpc-matcher';
-export * from './rpc-serializer';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/standard/rpc-codec.d.ts

@@ -1,8 +1,8 @@
-import type { ORPCError } from '@orpc/contract';
+import type { ORPCError } from '@orpc/client';
 import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
 import type { AnyProcedure } from '../../procedure';
 import type { StandardCodec, StandardParams } from './types';
-import { RPCSerializer } from './rpc-serializer';
+import { RPCSerializer } from '@orpc/client/rpc';
 export interface StandardCodecOptions {
     serializer?: RPCSerializer;
 }

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

@@ -1,4 +1,5 @@
-import type { HTTPPath, ORPCError } from '@orpc/contract';
+import type { ORPCError } from '@orpc/client';
+import type { HTTPPath } from '@orpc/contract';
 import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
 import type { AnyProcedure } from '../../procedure';
 import type { AnyRouter } from '../../router';

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

@@ -1,6 +1,7 @@
-import type { ContractRouter, ErrorMap, HTTPPath, MergedErrorMap, Meta, ORPCErrorConstructorMap, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContractRouter, ErrorMap, HTTPPath, MergedErrorMap, Meta, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { BuilderDef } from './builder';
 import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { FlattenLazy } from './lazy-utils';
 import type { MapInputMiddleware, Middleware } from './middleware';
 import type { ProcedureHandler } from './procedure';

package/dist/src/builder.d.ts

@@ -1,6 +1,7 @@
-import type { ContractProcedureDef, ContractRouter, ErrorMap, HTTPPath, MergedErrorMap, Meta, ORPCErrorConstructorMap, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContractProcedureDef, ContractRouter, ErrorMap, HTTPPath, MergedErrorMap, Meta, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { BuilderWithMiddlewares, ProcedureBuilder, ProcedureBuilderWithInput, ProcedureBuilderWithOutput, RouterBuilder } from './builder-variants';
 import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { FlattenLazy } from './lazy-utils';
 import type { AnyMiddleware, MapInputMiddleware, Middleware } from './middleware';
 import type { DecoratedMiddleware } from './middleware-decorated';

package/dist/src/context.d.ts

@@ -1,6 +1,5 @@
 import type { IsNever } from '@orpc/shared';
 export type Context = Record<string, any>;
-export type TypeInitialContext<T extends Context> = (type: T) => unknown;
 export type MergedContext<T extends Context, U extends Context> = T & U;
 export declare function mergeContext<T extends Context, U extends Context>(context: T, other: U): MergedContext<T, U>;
 export type ConflictContextGuard<T extends Context> = true extends IsNever<T> | {

package/dist/src/error.d.ts

@@ -0,0 +1,12 @@
+import type { ORPCErrorCode, ORPCErrorOptions } from '@orpc/client';
+import type { ErrorMap, ErrorMapItem, SchemaInput } from '@orpc/contract';
+import type { MaybeOptionalOptions } from '@orpc/shared';
+import { ORPCError } from '@orpc/client';
+export type ORPCErrorConstructorMapItemOptions<TData> = Omit<ORPCErrorOptions<TData>, 'defined' | 'status'>;
+export type ORPCErrorConstructorMapItem<TCode extends ORPCErrorCode, TInData> = (...rest: MaybeOptionalOptions<ORPCErrorConstructorMapItemOptions<TInData>>) => ORPCError<TCode, TInData>;
+export type ORPCErrorConstructorMap<T extends ErrorMap> = {
+    [K in keyof T]: K extends ORPCErrorCode ? T[K] extends ErrorMapItem<infer UInputSchema> ? ORPCErrorConstructorMapItem<K, SchemaInput<UInputSchema>> : never : never;
+};
+export declare function createORPCErrorConstructorMap<T extends ErrorMap>(errors: T): ORPCErrorConstructorMap<T>;
+export declare function validateORPCError(map: ErrorMap, error: ORPCError<any, any>): Promise<ORPCError<string, unknown>>;
+//# sourceMappingURL=error.d.ts.map

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

@@ -1,7 +1,9 @@
-import type { ClientContext, ClientRest, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ClientContext, ClientRest } from '@orpc/client';
+import type { ErrorMap, Meta, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { BuilderDef } from './builder';
 import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { MapInputMiddleware, Middleware } from './middleware';
 import type { Procedure, ProcedureHandler } from './procedure';
 import type { CreateProcedureClientOptions, ProcedureClient } from './procedure-client';

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

@@ -1,5 +1,6 @@
-import type { AnyContractRouter, ContractProcedure, ContractRouterToErrorMap, ContractRouterToMeta, ORPCErrorConstructorMap } from '@orpc/contract';
+import type { AnyContractRouter, ContractProcedure, ContractRouterToErrorMap, ContractRouterToMeta } from '@orpc/contract';
 import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { ProcedureImplementer } from './implementer-procedure';
 import type { FlattenLazy } from './lazy-utils';
 import type { Middleware } from './middleware';

package/dist/src/implementer.d.ts

@@ -1,5 +1,6 @@
-import type { AnyContractRouter, ContractProcedure, ContractRouterToErrorMap, ContractRouterToMeta, ORPCErrorConstructorMap } from '@orpc/contract';
+import type { AnyContractRouter, ContractProcedure, ContractRouterToErrorMap, ContractRouterToMeta } from '@orpc/contract';
 import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { ProcedureImplementer } from './implementer-procedure';
 import type { ImplementerInternalWithMiddlewares } from './implementer-variants';
 import type { AnyMiddleware, Middleware } from './middleware';

package/dist/src/index.d.ts

@@ -18,6 +18,8 @@ export * from './router';
 export * from './router-accessible-lazy';
 export * from './router-client';
 export * from './utils';
-export { isDefinedError, ORPCError, safe, type, ValidationError } from '@orpc/contract';
+export { isDefinedError, ORPCError, safe } from '@orpc/client';
+export { eventIterator, type, ValidationError } from '@orpc/contract';
+export { getEventMeta, withEventMeta } from '@orpc/server-standard';
 export { onError, onFinish, onStart, onSuccess } from '@orpc/shared';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,5 +1,6 @@
-import type { Meta, ORPCErrorConstructorMap } from '@orpc/contract';
+import type { Meta } from '@orpc/contract';
 import type { Context, MergedContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { MapInputMiddleware, Middleware } from './middleware';
 export interface DecoratedMiddleware<TInContext extends Context, TOutContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> extends Middleware<TInContext, TOutContext, TInput, TOutput, TErrorConstructorMap, TMeta> {
     concat<UOutContext extends Context, UInput>(middleware: Middleware<TInContext & TOutContext, UOutContext, UInput & TInput, TOutput, TErrorConstructorMap, TMeta>): DecoratedMiddleware<TInContext, MergedContext<TOutContext, UOutContext>, UInput & TInput, TOutput, TErrorConstructorMap, TMeta>;

package/dist/src/middleware.d.ts

@@ -1,6 +1,7 @@
-import type { ErrorMap, Meta, ORPCErrorConstructorMap, Schema } from '@orpc/contract';
+import type { ErrorMap, Meta, Schema } from '@orpc/contract';
 import type { MaybeOptionalOptions, Promisable } from '@orpc/shared';
 import type { Context } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { Procedure } from './procedure';
 export type MiddlewareResult<TOutContext extends Context, TOutput> = Promisable<{
     output: TOutput;
@@ -22,6 +23,7 @@ export interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorCo
     path: string[];
     procedure: Procedure<Context, Context, Schema, Schema, unknown, ErrorMap, TMeta>;
     signal?: AbortSignal;
+    lastEventId: string | undefined;
     next: MiddlewareNextFn<TInContext, TOutput>;
     errors: TErrorConstructorMap;
 }

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

@@ -1,8 +1,10 @@
-import type { Client, ClientContext, ErrorFromErrorMap, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Client, ClientContext } from '@orpc/client';
 import type { Interceptor, MaybeOptionalOptions, Value } from '@orpc/shared';
 import type { Context } from './context';
 import type { Lazyable } from './lazy';
 import type { Procedure } from './procedure';
+import { type ErrorFromErrorMap, type ErrorMap, type Meta, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
+import { type ORPCErrorConstructorMap } from './error';
 export type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> = Client<TClientContext, SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
 export interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TInputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
     context: TInitialContext;
@@ -11,6 +13,7 @@ export interface ProcedureClientInterceptorOptions<TInitialContext extends Conte
     path: string[];
     procedure: Procedure<Context, Context, Schema, Schema, unknown, ErrorMap, TMeta>;
     signal?: AbortSignal;
+    lastEventId: string | undefined;
 }
 /**
  * Options for creating a procedure caller with comprehensive type safety

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

@@ -1,6 +1,8 @@
-import type { ClientContext, ClientRest, ErrorMap, MergedErrorMap, Meta, ORPCErrorConstructorMap, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ClientContext, ClientRest } from '@orpc/client';
+import type { ErrorMap, MergedErrorMap, Meta, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { MapInputMiddleware, Middleware } from './middleware';
 import type { CreateProcedureClientOptions, ProcedureClient } from './procedure-client';
 import { Procedure } from './procedure';

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

@@ -1,4 +1,5 @@
-import type { ClientPromiseResult, ErrorFromErrorMap, ErrorMap, Meta, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ClientPromiseResult } from '@orpc/client';
+import type { ErrorFromErrorMap, ErrorMap, Meta, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { Context } from './context';
 import type { Lazyable } from './lazy';

package/dist/src/procedure.d.ts

@@ -1,6 +1,7 @@
-import type { ContractProcedureDef, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContractProcedureDef, ErrorMap, Meta, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
-import type { Context, TypeInitialContext } from './context';
+import type { Context } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { AnyMiddleware } from './middleware';
 export interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
     context: TCurrentContext;
@@ -8,13 +9,14 @@ export interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput
     path: string[];
     procedure: Procedure<Context, Context, Schema, Schema, unknown, ErrorMap, TMeta>;
     signal?: AbortSignal;
+    lastEventId: string | undefined;
     errors: TErrorConstructorMap;
 }
 export interface ProcedureHandler<TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta> {
     (opt: ProcedureHandlerOptions<TCurrentContext, SchemaOutput<TInputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
 }
 export interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TInputSchema, TOutputSchema, TErrorMap, TMeta> {
-    __initialContext?: TypeInitialContext<TInitialContext>;
+    __initialContext?: (type: TInitialContext) => unknown;
     middlewares: AnyMiddleware[];
     inputValidationIndex: number;
     outputValidationIndex: number;

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

@@ -1,10 +1,11 @@
-import type { ClientContext, ErrorMap, Meta } from '@orpc/contract';
+import type { ClientContext } from '@orpc/client';
+import type { ErrorMap, Meta } from '@orpc/contract';
 import type { MaybeOptionalOptions } from '@orpc/shared';
 import type { Lazy } from './lazy';
 import type { Procedure } from './procedure';
 import type { CreateProcedureClientOptions, ProcedureClient } from './procedure-client';
 import type { AnyRouter, InferRouterInitialContext } from './router';
-export type RouterClient<TRouter extends AnyRouter, TClientContext extends ClientContext> = TRouter extends Lazy<infer U extends AnyRouter> ? RouterClient<U, TClientContext> : TRouter extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap, any> ? ProcedureClient<TClientContext, UInputSchema, UOutputSchema, UFuncOutput, UErrorMap> : {
+export type RouterClient<TRouter extends AnyRouter, TClientContext extends ClientContext = Record<never, never>> = TRouter extends Lazy<infer U extends AnyRouter> ? RouterClient<U, TClientContext> : TRouter extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap, any> ? ProcedureClient<TClientContext, UInputSchema, UOutputSchema, UFuncOutput, UErrorMap> : {
     [K in keyof TRouter]: TRouter[K] extends AnyRouter ? RouterClient<TRouter[K], TClientContext> : never;
 };
 export declare function createRouterClient<TRouter extends AnyRouter, TClientContext extends ClientContext>(router: TRouter | Lazy<undefined>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<InferRouterInitialContext<TRouter>, undefined, undefined, unknown, ErrorMap, Meta, TClientContext>>): RouterClient<TRouter, TClientContext>;

package/dist/standard.js

@@ -1,17 +1,13 @@
 import {
   RPCCodec,
   RPCMatcher,
-  RPCSerializer,
-  StandardHandler,
-  serializeRPCJson
-} from "./chunk-DAUWED3D.js";
-import "./chunk-XP6YRLY2.js";
+  StandardHandler
+} from "./chunk-LXOL226G.js";
+import "./chunk-MHVECKBC.js";
 import "./chunk-XI6WGCB3.js";
 export {
   RPCCodec,
   RPCMatcher,
-  RPCSerializer,
-  StandardHandler,
-  serializeRPCJson
+  StandardHandler
 };
 //# sourceMappingURL=standard.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.39.0",
+  "version": "0.41.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -63,12 +63,12 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@orpc/server-standard": "^0.0.0",
-    "@orpc/server-standard-fetch": "^0.0.0",
-    "@orpc/server-standard-node": "^0.0.0",
-    "@tinyhttp/content-disposition": "^2.2.2",
-    "@orpc/contract": "0.39.0",
-    "@orpc/shared": "0.39.0"
+    "@orpc/server-standard": "^0.4.0",
+    "@orpc/server-standard-fetch": "^0.4.0",
+    "@orpc/server-standard-node": "^0.4.0",
+    "@orpc/client": "0.41.0",
+    "@orpc/shared": "0.41.0",
+    "@orpc/contract": "0.41.0"
   },
   "devDependencies": {
     "light-my-request": "^6.5.1"

package/dist/src/adapters/standard/rpc-serializer.d.ts

@@ -1,16 +0,0 @@
-import type { Segment } from '@orpc/shared';
-export type RPCSerializedJsonMeta = ['bigint' | 'date' | 'nan' | 'undefined' | 'set' | 'map' | 'regexp' | 'url', Segment[]][];
-export type RPCSerialized = {
-    json: unknown;
-    meta: RPCSerializedJsonMeta;
-} | FormData | Blob | undefined;
-export type RPCSerializedFormDataMaps = Segment[][];
-export declare class RPCSerializer {
-    serialize(data: unknown): RPCSerialized;
-    deserialize(serialized: RPCSerialized): unknown;
-}
-export declare function serializeRPCJson(value: unknown, segments?: Segment[], meta?: RPCSerializedJsonMeta): {
-    json: unknown;
-    meta: RPCSerializedJsonMeta;
-};
-//# sourceMappingURL=rpc-serializer.d.ts.map