@orpc/server 0.0.0-next.7b09958 → 0.0.0-next.7d3bd71

package/dist/chunk-47YYO5JS.js

@@ -0,0 +1,32 @@
+import {
+  RPCCodec,
+  RPCMatcher,
+  StandardHandler
+} from "./chunk-77FU7QSO.js";
+
+// src/adapters/fetch/rpc-handler.ts
+import { toFetchResponse, toStandardRequest } from "@orpc/server-standard-fetch";
+var RPCHandler = class {
+  standardHandler;
+  constructor(router, options) {
+    const matcher = options?.matcher ?? new RPCMatcher();
+    const codec = options?.codec ?? new RPCCodec();
+    this.standardHandler = new StandardHandler(router, matcher, codec, options);
+  }
+  async handle(request, ...rest) {
+    const standardRequest = toStandardRequest(request);
+    const result = await this.standardHandler.handle(standardRequest, ...rest);
+    if (!result.matched) {
+      return result;
+    }
+    return {
+      matched: true,
+      response: toFetchResponse(result.response)
+    };
+  }
+};
+
+export {
+  RPCHandler
+};
+//# sourceMappingURL=chunk-47YYO5JS.js.map

package/dist/{chunk-BFGSRNYZ.js → chunk-77FU7QSO.js}

@@ -6,27 +6,27 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-EDQKEHUX.js";
+} from "./chunk-MHVECKBC.js";
 import {
   CompositePlugin
-} from "./chunk-XFBAK67J.js";
+} from "./chunk-WQNNSBXW.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 = {}) {
     this.matcher = matcher;
     this.codec = codec;
     this.options = options;
-    this.plugin = new CompositePlugin(options?.plugins);
+    this.plugin = new CompositePlugin(options.plugins);
     this.plugin.init(this.options);
     this.matcher.init(router);
   }
   plugin;
   handle(request, ...[options]) {
     return intercept(
-      this.options.interceptorsRoot ?? [],
+      this.options.rootInterceptors ?? [],
       {
         request,
         ...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 ?? [],
@@ -46,14 +47,16 @@ var StandardHandler = class {
               if (!match) {
                 return { matched: false, response: void 0 };
               }
-              const clientOptions = {
+              const client = createProcedureClient(match.procedure, {
                 context: interceptorOptions2.context,
-                path: match.path
-              };
-              this.plugin.beforeCreateProcedureClient(clientOptions, interceptorOptions2);
-              const client = createProcedureClient(match.procedure, clientOptions);
+                path: match.path,
+                interceptors: this.options.clientInterceptors
+              });
+              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 +65,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 +80,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 +175,7 @@ var RPCMatcher = class {
 
 export {
   StandardHandler,
-  RPCSerializer,
-  serializeRPCJson,
   RPCCodec,
   RPCMatcher
 };
-//# sourceMappingURL=chunk-BFGSRNYZ.js.map
+//# sourceMappingURL=chunk-77FU7QSO.js.map

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

@@ -62,13 +62,56 @@ 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 ?? [];
     const { default: procedure } = await unlazy(lazyableProcedure);
-    const context = await value(options?.context ?? {}, callerOptions?.context);
+    const clientContext = callerOptions?.context ?? {};
+    const context = await value(options?.context ?? {}, clientContext);
     const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
     try {
       return await intercept(
@@ -80,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);
@@ -100,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
@@ -117,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 })
     });
@@ -374,4 +418,4 @@ export {
   convertPathToHttpPath,
   createContractedProcedure
 };
-//# sourceMappingURL=chunk-EDQKEHUX.js.map
+//# sourceMappingURL=chunk-MHVECKBC.js.map

package/dist/{chunk-XFBAK67J.js → chunk-WQNNSBXW.js}

@@ -8,11 +8,6 @@ var CompositePlugin = class {
       plugin.init?.(options);
     }
   }
-  beforeCreateProcedureClient(clientOptions, interceptorOptions) {
-    for (const plugin of this.plugins) {
-      plugin.beforeCreateProcedureClient?.(clientOptions, interceptorOptions);
-    }
-  }
 };
 
 // src/plugins/cors.ts
@@ -21,20 +16,17 @@ var CORSPlugin = class {
   options;
   constructor(options) {
     const defaults = {
-      origin: "*",
+      origin: (origin) => origin,
       allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH"]
     };
-    if (options?.credentials) {
-      defaults.origin = (origin) => origin;
-    }
     this.options = {
       ...defaults,
       ...options
     };
   }
   init(options) {
-    options.interceptorsRoot ??= [];
-    options.interceptorsRoot.unshift(async (interceptorOptions) => {
+    options.rootInterceptors ??= [];
+    options.rootInterceptors.unshift(async (interceptorOptions) => {
       if (interceptorOptions.request.method === "OPTIONS") {
         const resHeaders = {};
         if (this.options.maxAge !== void 0) {
@@ -60,7 +52,7 @@ var CORSPlugin = class {
       }
       return interceptorOptions.next();
     });
-    options.interceptorsRoot.unshift(async (interceptorOptions) => {
+    options.rootInterceptors.unshift(async (interceptorOptions) => {
       const result = await interceptorOptions.next();
       if (!result.matched) {
         return result;
@@ -97,8 +89,8 @@ var CORSPlugin = class {
 // src/plugins/response-headers.ts
 var ResponseHeadersPlugin = class {
   init(options) {
-    options.interceptorsRoot ??= [];
-    options.interceptorsRoot.push(async (interceptorOptions) => {
+    options.rootInterceptors ??= [];
+    options.rootInterceptors.push(async (interceptorOptions) => {
       const headers = new Headers();
       interceptorOptions.context.resHeaders = headers;
       const result = await interceptorOptions.next();
@@ -125,4 +117,4 @@ export {
   CORSPlugin,
   ResponseHeadersPlugin
 };
-//# sourceMappingURL=chunk-XFBAK67J.js.map
+//# sourceMappingURL=chunk-WQNNSBXW.js.map

package/dist/fetch.js

@@ -1,16 +1,10 @@
 import {
-  RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
-} from "./chunk-2OH4QMZ4.js";
-import "./chunk-BFGSRNYZ.js";
-import "./chunk-EDQKEHUX.js";
-import "./chunk-XFBAK67J.js";
+  RPCHandler
+} from "./chunk-47YYO5JS.js";
+import "./chunk-77FU7QSO.js";
+import "./chunk-MHVECKBC.js";
+import "./chunk-WQNNSBXW.js";
 export {
-  RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
+  RPCHandler
 };
 //# sourceMappingURL=fetch.js.map

package/dist/hono.js

@@ -1,12 +1,9 @@
 import {
-  RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
-} from "./chunk-2OH4QMZ4.js";
-import "./chunk-BFGSRNYZ.js";
-import "./chunk-EDQKEHUX.js";
-import "./chunk-XFBAK67J.js";
+  RPCHandler
+} from "./chunk-47YYO5JS.js";
+import "./chunk-77FU7QSO.js";
+import "./chunk-MHVECKBC.js";
+import "./chunk-WQNNSBXW.js";
 
 // src/adapters/hono/middleware.ts
 import { value } from "@orpc/shared";
@@ -32,9 +29,6 @@ function createMiddleware(handler, ...[options]) {
 }
 export {
   RPCHandler,
-  createMiddleware,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
+  createMiddleware
 };
 //# sourceMappingURL=hono.js.map

package/dist/index.js

@@ -21,7 +21,7 @@ import {
   middlewareOutputFn,
   setRouterContract,
   unlazy
-} from "./chunk-EDQKEHUX.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,12 +1,9 @@
 import {
-  RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
-} from "./chunk-2OH4QMZ4.js";
-import "./chunk-BFGSRNYZ.js";
-import "./chunk-EDQKEHUX.js";
-import "./chunk-XFBAK67J.js";
+  RPCHandler
+} from "./chunk-47YYO5JS.js";
+import "./chunk-77FU7QSO.js";
+import "./chunk-MHVECKBC.js";
+import "./chunk-WQNNSBXW.js";
 
 // src/adapters/next/serve.ts
 import { value } from "@orpc/shared";
@@ -29,9 +26,6 @@ function serve(handler, ...[options]) {
 }
 export {
   RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  serve,
-  standardResponseToFetchResponse
+  serve
 };
 //# sourceMappingURL=next.js.map