@orpc/client 0.0.0-next.66774c1 → 0.0.0-next.668d7f1

package/dist/shared/{client.txdq_i5V.mjs → client.CUnQ94Oa.mjs}

@@ -1,5 +1,7 @@
-import { resolveMaybeOptionalOptions, isObject, AsyncIteratorClass, isTypescriptObject } from '@orpc/shared';
-import { getEventMeta, withEventMeta } from '@orpc/standard-server';
+import { resolveMaybeOptionalOptions, getConstructor, isObject } from '@orpc/shared';
+
+const ORPC_CLIENT_PACKAGE_NAME = "@orpc/client";
+const ORPC_CLIENT_PACKAGE_VERSION = "0.0.0-next.668d7f1";
 
 const COMMON_ORPC_ERROR_DEFS = {
   BAD_REQUEST: {
@@ -85,6 +87,9 @@ function fallbackORPCErrorStatus(code, status) {
 function fallbackORPCErrorMessage(code, message) {
   return message || COMMON_ORPC_ERROR_DEFS[code]?.message || code;
 }
+const GLOBAL_ORPC_ERROR_CONSTRUCTORS_SYMBOL = Symbol.for(`__${ORPC_CLIENT_PACKAGE_NAME}@${ORPC_CLIENT_PACKAGE_VERSION}/error/ORPC_ERROR_CONSTRUCTORS__`);
+void (globalThis[GLOBAL_ORPC_ERROR_CONSTRUCTORS_SYMBOL] ??= /* @__PURE__ */ new WeakSet());
+const globalORPCErrorConstructors = globalThis[GLOBAL_ORPC_ERROR_CONSTRUCTORS_SYMBOL];
 class ORPCError extends Error {
   defined;
   code;
@@ -111,7 +116,29 @@ class ORPCError extends Error {
       data: this.data
     };
   }
+  /**
+   * Workaround for Next.js where different contexts use separate
+   * dependency graphs, causing multiple ORPCError constructors existing and breaking
+   * `instanceof` checks across contexts.
+   *
+   * This is particularly problematic with "Optimized SSR", where orpc-client
+   * executes in one context but is invoked from another. When an error is thrown
+   * in the execution context, `instanceof ORPCError` checks fail in the
+   * invocation context due to separate class constructors.
+   *
+   * @todo Remove this and related code if Next.js resolves the multiple dependency graph issue.
+   */
+  static [Symbol.hasInstance](instance) {
+    if (globalORPCErrorConstructors.has(this)) {
+      const constructor = getConstructor(instance);
+      if (constructor && globalORPCErrorConstructors.has(constructor)) {
+        return true;
+      }
+    }
+    return super[Symbol.hasInstance](instance);
+  }
 }
+globalORPCErrorConstructors.add(ORPCError);
 function isDefinedError(error) {
   return error instanceof ORPCError && error.defined;
 }
@@ -141,40 +168,4 @@ function createORPCErrorFromJson(json, options = {}) {
   });
 }
 
-function mapEventIterator(iterator, maps) {
-  const mapError = async (error) => {
-    let mappedError = await maps.error(error);
-    if (mappedError !== error) {
-      const meta = getEventMeta(error);
-      if (meta && isTypescriptObject(mappedError)) {
-        mappedError = withEventMeta(mappedError, meta);
-      }
-    }
-    return mappedError;
-  };
-  return new AsyncIteratorClass(async () => {
-    const { done, value } = await (async () => {
-      try {
-        return await iterator.next();
-      } catch (error) {
-        throw await mapError(error);
-      }
-    })();
-    let mappedValue = await maps.value(value, done);
-    if (mappedValue !== value) {
-      const meta = getEventMeta(value);
-      if (meta && isTypescriptObject(mappedValue)) {
-        mappedValue = withEventMeta(mappedValue, meta);
-      }
-    }
-    return { done, value: mappedValue };
-  }, async () => {
-    try {
-      await iterator.return?.();
-    } catch (error) {
-      throw await mapError(error);
-    }
-  });
-}
-
-export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, isORPCErrorStatus as b, isORPCErrorJson as c, createORPCErrorFromJson as d, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, toORPCError as t };
+export { COMMON_ORPC_ERROR_DEFS as C, ORPC_CLIENT_PACKAGE_NAME as O, ORPC_CLIENT_PACKAGE_VERSION as a, fallbackORPCErrorMessage as b, ORPCError as c, isORPCErrorStatus as d, isORPCErrorJson as e, fallbackORPCErrorStatus as f, createORPCErrorFromJson as g, isDefinedError as i, toORPCError as t };

package/dist/shared/{client.Ycwr4Tuo.d.mts → client.D8lMmWVC.d.mts}

@@ -1,5 +1,5 @@
-import { b as ClientContext, c as ClientOptions, f as HTTPMethod } from './client.BOYsZIRq.mjs';
-import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.Bwgm6dgk.mjs';
+import { b as ClientContext, c as ClientOptions, f as HTTPMethod } from './client.BH1AYT_p.mjs';
+import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.CPgZaUox.mjs';
 import { Segment, Value, Promisable } from '@orpc/shared';
 import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 
@@ -67,7 +67,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
     /**
      * Inject headers to the request.
      */
-    headers?: Value<Promisable<StandardHeaders>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
+    headers?: Value<Promisable<StandardHeaders | Headers>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
 }
 declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
     private readonly serializer;

package/dist/shared/{client.BG98rYdO.d.ts → client.De8SW4Kw.d.ts}

@@ -1,6 +1,6 @@
 import { Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
-import { b as ClientContext, c as ClientOptions, C as ClientLink } from './client.BOYsZIRq.js';
+import { b as ClientContext, c as ClientOptions, C as ClientLink } from './client.BH1AYT_p.js';
 
 interface StandardLinkPlugin<T extends ClientContext> {
     order?: number;

package/dist/shared/{client.DKmRtVO2.mjs → client.rTy1NVPV.mjs}

@@ -1,6 +1,8 @@
 import { toArray, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, intercept, getGlobalOtelConfig, isObject, value, stringifyJSON } from '@orpc/shared';
 import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
-import { C as COMMON_ORPC_ERROR_DEFS, b as isORPCErrorStatus, c as isORPCErrorJson, d as createORPCErrorFromJson, O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.txdq_i5V.mjs';
+import { C as COMMON_ORPC_ERROR_DEFS, d as isORPCErrorStatus, e as isORPCErrorJson, g as createORPCErrorFromJson, c as ORPCError, t as toORPCError } from './client.CUnQ94Oa.mjs';
+import { toStandardHeaders as toStandardHeaders$1 } from '@orpc/standard-server-fetch';
+import { m as mapEventIterator } from './client.BLtwTQUg.mjs';
 
 class CompositeStandardLinkPlugin {
   plugins;
@@ -224,6 +226,12 @@ class StandardRPCJsonSerializer {
 function toHttpPath(path) {
   return `/${path.map(encodeURIComponent).join("/")}`;
 }
+function toStandardHeaders(headers) {
+  if (typeof headers.forEach === "function") {
+    return toStandardHeaders$1(headers);
+  }
+  return headers;
+}
 function getMalformedResponseErrorCode(status) {
   return Object.entries(COMMON_ORPC_ERROR_DEFS).find(([, def]) => def.status === status)?.[0] ?? "MALFORMED_ORPC_ERROR_RESPONSE";
 }
@@ -243,14 +251,14 @@ class StandardRPCLinkCodec {
   expectedMethod;
   headers;
   async encode(path, input, options) {
+    let headers = toStandardHeaders(await value(this.headers, options, path, input));
+    if (options.lastEventId !== void 0) {
+      headers = mergeStandardHeaders(headers, { "last-event-id": options.lastEventId });
+    }
     const expectedMethod = await value(this.expectedMethod, options, path, input);
-    let headers = await value(this.headers, options, path, input);
     const baseUrl = await value(this.baseUrl, options, path, input);
     const url = new URL(baseUrl);
     url.pathname = `${url.pathname.replace(/\/$/, "")}${toHttpPath(path)}`;
-    if (options.lastEventId !== void 0) {
-      headers = mergeStandardHeaders(headers, { "last-event-id": options.lastEventId });
-    }
     const serialized = this.serializer.serialize(input);
     if (expectedMethod === "GET" && !(serialized instanceof FormData) && !isAsyncIteratorObject(serialized)) {
       const maxUrlLength = await value(this.maxUrlLength, options, path, input);
@@ -387,4 +395,4 @@ class StandardRPCLink extends StandardLink {
   }
 }
 
-export { CompositeStandardLinkPlugin as C, StandardLink as S, STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as a, StandardRPCJsonSerializer as b, StandardRPCLink as c, StandardRPCLinkCodec as d, StandardRPCSerializer as e, getMalformedResponseErrorCode as g, toHttpPath as t };
+export { CompositeStandardLinkPlugin as C, StandardLink as S, STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as a, StandardRPCJsonSerializer as b, StandardRPCLink as c, StandardRPCLinkCodec as d, StandardRPCSerializer as e, toStandardHeaders as f, getMalformedResponseErrorCode as g, toHttpPath as t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.0.0-next.66774c1",
+  "version": "0.0.0-next.668d7f1",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -49,13 +49,13 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.66774c1",
-    "@orpc/standard-server-peer": "0.0.0-next.66774c1",
-    "@orpc/standard-server": "0.0.0-next.66774c1",
-    "@orpc/standard-server-fetch": "0.0.0-next.66774c1"
+    "@orpc/standard-server": "0.0.0-next.668d7f1",
+    "@orpc/shared": "0.0.0-next.668d7f1",
+    "@orpc/standard-server-fetch": "0.0.0-next.668d7f1",
+    "@orpc/standard-server-peer": "0.0.0-next.668d7f1"
   },
   "devDependencies": {
-    "zod": "^4.0.17"
+    "zod": "^4.1.12"
   },
   "scripts": {
     "build": "unbuild",

package/dist/shared/client.BOYsZIRq.d.mts

@@ -1,29 +0,0 @@
-import { PromiseWithError } from '@orpc/shared';
-
-type HTTPPath = `/${string}`;
-type HTTPMethod = 'HEAD' | 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
-type ClientContext = Record<PropertyKey, any>;
-interface ClientOptions<T extends ClientContext> {
-    signal?: AbortSignal;
-    lastEventId?: string | undefined;
-    context: T;
-}
-type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: T;
-} : {
-    context: T;
-});
-type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
-type ClientPromiseResult<TOutput, TError> = PromiseWithError<TOutput, TError>;
-interface Client<TClientContext extends ClientContext, TInput, TOutput, TError> {
-    (...rest: ClientRest<TClientContext, TInput>): ClientPromiseResult<TOutput, TError>;
-}
-type NestedClient<TClientContext extends ClientContext> = Client<TClientContext, any, any, any> | {
-    [k: string]: NestedClient<TClientContext>;
-};
-type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
-interface ClientLink<TClientContext extends ClientContext> {
-    call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
-}
-
-export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N, ClientPromiseResult as a, ClientContext as b, ClientOptions as c, Client as d, ClientRest as e, HTTPMethod as f };

package/dist/shared/client.BOYsZIRq.d.ts

@@ -1,29 +0,0 @@
-import { PromiseWithError } from '@orpc/shared';
-
-type HTTPPath = `/${string}`;
-type HTTPMethod = 'HEAD' | 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
-type ClientContext = Record<PropertyKey, any>;
-interface ClientOptions<T extends ClientContext> {
-    signal?: AbortSignal;
-    lastEventId?: string | undefined;
-    context: T;
-}
-type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (Record<never, never> extends T ? {
-    context?: T;
-} : {
-    context: T;
-});
-type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
-type ClientPromiseResult<TOutput, TError> = PromiseWithError<TOutput, TError>;
-interface Client<TClientContext extends ClientContext, TInput, TOutput, TError> {
-    (...rest: ClientRest<TClientContext, TInput>): ClientPromiseResult<TOutput, TError>;
-}
-type NestedClient<TClientContext extends ClientContext> = Client<TClientContext, any, any, any> | {
-    [k: string]: NestedClient<TClientContext>;
-};
-type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
-interface ClientLink<TClientContext extends ClientContext> {
-    call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
-}
-
-export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N, ClientPromiseResult as a, ClientContext as b, ClientOptions as c, Client as d, ClientRest as e, HTTPMethod as f };