@orpc/client 1.0.0-beta.2 → 1.0.0-beta.4

package/README.md

@@ -87,6 +87,14 @@ const client: RouterClient<typeof router> = createORPCClient(link)
 const client: ContractRouterClient<typeof contract> = createORPCClient(link)
 ```
 
+## Sponsors
+
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg'/>
+  </a>
+</p>
+
 ## License
 
 Distributed under the MIT License. See [LICENSE](https://github.com/unnoq/orpc/blob/main/LICENSE) for more information.

package/dist/adapters/fetch/index.d.mts

@@ -1,18 +1,18 @@
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
-import { a as ClientContext, C as ClientOptionsOut, b as ClientLink } from '../../shared/client.CupM8eRP.mjs';
-import { b as StandardLinkClient } from '../../shared/client.DrOAzyMB.mjs';
+import { a as ClientContext, C as ClientOptions, b as ClientLink } from '../../shared/client.RZs5Myak.mjs';
+import { b as StandardLinkClient } from '../../shared/client.CKw2tbcl.mjs';
 import { StandardRPCLinkOptions } from '../standard/index.mjs';
 import '@orpc/shared';
 
 interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
-    fetch?: (request: Request, init: Record<never, never>, options: ClientOptionsOut<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    fetch?: (request: Request, init: Record<never, never>, options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
 }
 declare class LinkFetchClient<T extends ClientContext> implements StandardLinkClient<T> {
     private readonly fetch;
     private readonly toFetchRequestOptions;
     constructor(options: LinkFetchClientOptions<T>);
-    call(request: StandardRequest, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
+    call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
 }
 
 interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions<T>, LinkFetchClientOptions<T> {
@@ -20,11 +20,11 @@ interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions
 declare class RPCLink<T extends ClientContext> implements ClientLink<T> {
     private readonly standardLink;
     constructor(options: RPCLinkOptions<T>);
-    call(path: readonly string[], input: unknown, options: ClientOptionsOut<T>): Promise<unknown>;
+    call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
 }
 
 interface FetchWithContext<TClientContext extends ClientContext> {
-    (url: URL, init: RequestInit, options: ClientOptionsOut<TClientContext>, path: readonly string[], input: unknown): Promise<Response>;
+    (url: URL, init: RequestInit, options: ClientOptions<TClientContext>, path: readonly string[], input: unknown): Promise<Response>;
 }
 
 export { type FetchWithContext, LinkFetchClient, type LinkFetchClientOptions, RPCLink, type RPCLinkOptions };

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

@@ -1,18 +1,18 @@
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
-import { a as ClientContext, C as ClientOptionsOut, b as ClientLink } from '../../shared/client.CupM8eRP.js';
-import { b as StandardLinkClient } from '../../shared/client.aGal-uGY.js';
+import { a as ClientContext, C as ClientOptions, b as ClientLink } from '../../shared/client.RZs5Myak.js';
+import { b as StandardLinkClient } from '../../shared/client.Bt40CWA-.js';
 import { StandardRPCLinkOptions } from '../standard/index.js';
 import '@orpc/shared';
 
 interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
-    fetch?: (request: Request, init: Record<never, never>, options: ClientOptionsOut<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    fetch?: (request: Request, init: Record<never, never>, options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
 }
 declare class LinkFetchClient<T extends ClientContext> implements StandardLinkClient<T> {
     private readonly fetch;
     private readonly toFetchRequestOptions;
     constructor(options: LinkFetchClientOptions<T>);
-    call(request: StandardRequest, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
+    call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
 }
 
 interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions<T>, LinkFetchClientOptions<T> {
@@ -20,11 +20,11 @@ interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions
 declare class RPCLink<T extends ClientContext> implements ClientLink<T> {
     private readonly standardLink;
     constructor(options: RPCLinkOptions<T>);
-    call(path: readonly string[], input: unknown, options: ClientOptionsOut<T>): Promise<unknown>;
+    call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
 }
 
 interface FetchWithContext<TClientContext extends ClientContext> {
-    (url: URL, init: RequestInit, options: ClientOptionsOut<TClientContext>, path: readonly string[], input: unknown): Promise<Response>;
+    (url: URL, init: RequestInit, options: ClientOptions<TClientContext>, path: readonly string[], input: unknown): Promise<Response>;
 }
 
 export { type FetchWithContext, LinkFetchClient, type LinkFetchClientOptions, RPCLink, type RPCLinkOptions };

package/dist/adapters/fetch/index.mjs

@@ -1,9 +1,8 @@
 import { toFetchRequest, toStandardLazyResponse } from '@orpc/standard-server-fetch';
-import { b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer, S as StandardLink } from '../../shared/client.Be-O_tdu.mjs';
+import { b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer, S as StandardLink } from '../../shared/client.CAwgYDwB.mjs';
 import '@orpc/shared';
-import '../../shared/client.CvnV7_uV.mjs';
-import '@orpc/standard-server';
 import '../../shared/client.BacCdg3F.mjs';
+import '@orpc/standard-server';
 
 class LinkFetchClient {
   fetch;

package/dist/adapters/standard/index.d.mts

@@ -1,7 +1,7 @@
-import { c as StandardLinkCodec, S as StandardLinkOptions } from '../../shared/client.DrOAzyMB.mjs';
-export { I as InvalidEventIteratorRetryResponse, d as StandardLink, b as StandardLinkClient } from '../../shared/client.DrOAzyMB.mjs';
+import { c as StandardLinkCodec, a as StandardLinkOptions } from '../../shared/client.CKw2tbcl.mjs';
+export { I as InvalidEventIteratorRetryResponse, d as StandardLink, b as StandardLinkClient, S as StandardLinkPlugin } from '../../shared/client.CKw2tbcl.mjs';
 import { Segment, Value } from '@orpc/shared';
-import { a as ClientContext, C as ClientOptionsOut } from '../../shared/client.CupM8eRP.mjs';
+import { a as ClientContext, C as ClientOptions } from '../../shared/client.RZs5Myak.mjs';
 import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 
 declare const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES: {
@@ -47,7 +47,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
      * Base url for all requests.
      */
     url: Value<string | URL, [
-        options: ClientOptionsOut<T>,
+        options: ClientOptions<T>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -57,7 +57,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
      * @default 2083
      */
     maxUrlLength?: Value<number, [
-        options: ClientOptionsOut<T>,
+        options: ClientOptions<T>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -67,7 +67,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
      * @default 'POST'
      */
     method?: Value<HTTPMethod, [
-        options: ClientOptionsOut<T>,
+        options: ClientOptions<T>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -82,7 +82,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
      * Inject headers to the request.
      */
     headers?: Value<StandardHeaders, [
-        options: ClientOptionsOut<T>,
+        options: ClientOptions<T>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -95,7 +95,7 @@ declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardL
     private readonly expectedMethod;
     private readonly headers;
     constructor(serializer: StandardRPCSerializer, options: StandardRPCLinkCodecOptions<T>);
-    encode(path: readonly string[], input: unknown, options: ClientOptionsOut<any>): Promise<StandardRequest>;
+    encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
     decode(response: StandardLazyResponse): Promise<unknown>;
 }
 

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

@@ -1,7 +1,7 @@
-import { c as StandardLinkCodec, S as StandardLinkOptions } from '../../shared/client.aGal-uGY.js';
-export { I as InvalidEventIteratorRetryResponse, d as StandardLink, b as StandardLinkClient } from '../../shared/client.aGal-uGY.js';
+import { c as StandardLinkCodec, a as StandardLinkOptions } from '../../shared/client.Bt40CWA-.js';
+export { I as InvalidEventIteratorRetryResponse, d as StandardLink, b as StandardLinkClient, S as StandardLinkPlugin } from '../../shared/client.Bt40CWA-.js';
 import { Segment, Value } from '@orpc/shared';
-import { a as ClientContext, C as ClientOptionsOut } from '../../shared/client.CupM8eRP.js';
+import { a as ClientContext, C as ClientOptions } from '../../shared/client.RZs5Myak.js';
 import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 
 declare const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES: {
@@ -47,7 +47,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
      * Base url for all requests.
      */
     url: Value<string | URL, [
-        options: ClientOptionsOut<T>,
+        options: ClientOptions<T>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -57,7 +57,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
      * @default 2083
      */
     maxUrlLength?: Value<number, [
-        options: ClientOptionsOut<T>,
+        options: ClientOptions<T>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -67,7 +67,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
      * @default 'POST'
      */
     method?: Value<HTTPMethod, [
-        options: ClientOptionsOut<T>,
+        options: ClientOptions<T>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -82,7 +82,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
      * Inject headers to the request.
      */
     headers?: Value<StandardHeaders, [
-        options: ClientOptionsOut<T>,
+        options: ClientOptions<T>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -95,7 +95,7 @@ declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardL
     private readonly expectedMethod;
     private readonly headers;
     constructor(serializer: StandardRPCSerializer, options: StandardRPCLinkCodecOptions<T>);
-    encode(path: readonly string[], input: unknown, options: ClientOptionsOut<any>): Promise<StandardRequest>;
+    encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
     decode(response: StandardLazyResponse): Promise<unknown>;
 }
 

package/dist/adapters/standard/index.mjs

@@ -1,5 +1,4 @@
-export { I as InvalidEventIteratorRetryResponse, a as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer } from '../../shared/client.Be-O_tdu.mjs';
+export { I as InvalidEventIteratorRetryResponse, a as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer } from '../../shared/client.CAwgYDwB.mjs';
 import '@orpc/shared';
-import '../../shared/client.CvnV7_uV.mjs';
-import '@orpc/standard-server';
 import '../../shared/client.BacCdg3F.mjs';
+import '@orpc/standard-server';

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { N as NestedClient, b as ClientLink, I as InferClientContext, a as ClientContext, C as ClientOptionsOut, c as ClientPromiseResult } from './shared/client.CupM8eRP.mjs';
-export { f as Client, d as ClientOptions, e as ClientRest } from './shared/client.CupM8eRP.mjs';
+import { N as NestedClient, b as ClientLink, I as InferClientContext, a as ClientContext, C as ClientOptions, c as ClientPromiseResult, F as FriendlyClientOptions } from './shared/client.RZs5Myak.mjs';
+export { e as Client, d as ClientRest } from './shared/client.RZs5Myak.mjs';
 import { Promisable, MaybeOptionalOptions } from '@orpc/shared';
 export { onError, onFinish, onStart, onSuccess } from '@orpc/shared';
 export { ErrorEvent } from '@orpc/standard-server';
@@ -18,8 +18,8 @@ declare function createORPCClient<T extends NestedClient<any>>(link: ClientLink<
  */
 declare class DynamicLink<TClientContext extends ClientContext> implements ClientLink<TClientContext> {
     private readonly linkResolver;
-    constructor(linkResolver: (options: ClientOptionsOut<TClientContext>, path: readonly string[], input: unknown) => Promisable<ClientLink<TClientContext>>);
-    call(path: readonly string[], input: unknown, options: ClientOptionsOut<TClientContext>): Promise<unknown>;
+    constructor(linkResolver: (options: ClientOptions<TClientContext>, path: readonly string[], input: unknown) => Promisable<ClientLink<TClientContext>>);
+    call(path: readonly string[], input: unknown, options: ClientOptions<TClientContext>): Promise<unknown>;
 }
 
 declare const COMMON_ORPC_ERROR_DEFS: {
@@ -146,5 +146,6 @@ type SafeResult<TOutput, TError extends Error> = [error: null, data: TOutput, is
     isDefined: true;
 };
 declare function safe<TOutput, TError extends Error>(promise: ClientPromiseResult<TOutput, TError>): Promise<SafeResult<TOutput, TError>>;
+declare function resolveFriendlyClientOptions<T extends ClientContext>(options: FriendlyClientOptions<T>): ClientOptions<T>;
 
-export { COMMON_ORPC_ERROR_DEFS, ClientContext, ClientLink, ClientOptionsOut, ClientPromiseResult, type CommonORPCErrorCode, DynamicLink, InferClientContext, NestedClient, ORPCError, type ORPCErrorCode, type ORPCErrorJSON, type ORPCErrorOptions, type SafeResult, createORPCClient, type createORPCClientOptions, fallbackORPCErrorMessage, fallbackORPCErrorStatus, isDefinedError, mapEventIterator, safe, toORPCError };
+export { COMMON_ORPC_ERROR_DEFS, ClientContext, ClientLink, ClientOptions, ClientPromiseResult, type CommonORPCErrorCode, DynamicLink, FriendlyClientOptions, InferClientContext, NestedClient, ORPCError, type ORPCErrorCode, type ORPCErrorJSON, type ORPCErrorOptions, type SafeResult, createORPCClient, type createORPCClientOptions, fallbackORPCErrorMessage, fallbackORPCErrorStatus, isDefinedError, mapEventIterator, resolveFriendlyClientOptions, safe, toORPCError };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { N as NestedClient, b as ClientLink, I as InferClientContext, a as ClientContext, C as ClientOptionsOut, c as ClientPromiseResult } from './shared/client.CupM8eRP.js';
-export { f as Client, d as ClientOptions, e as ClientRest } from './shared/client.CupM8eRP.js';
+import { N as NestedClient, b as ClientLink, I as InferClientContext, a as ClientContext, C as ClientOptions, c as ClientPromiseResult, F as FriendlyClientOptions } from './shared/client.RZs5Myak.js';
+export { e as Client, d as ClientRest } from './shared/client.RZs5Myak.js';
 import { Promisable, MaybeOptionalOptions } from '@orpc/shared';
 export { onError, onFinish, onStart, onSuccess } from '@orpc/shared';
 export { ErrorEvent } from '@orpc/standard-server';
@@ -18,8 +18,8 @@ declare function createORPCClient<T extends NestedClient<any>>(link: ClientLink<
  */
 declare class DynamicLink<TClientContext extends ClientContext> implements ClientLink<TClientContext> {
     private readonly linkResolver;
-    constructor(linkResolver: (options: ClientOptionsOut<TClientContext>, path: readonly string[], input: unknown) => Promisable<ClientLink<TClientContext>>);
-    call(path: readonly string[], input: unknown, options: ClientOptionsOut<TClientContext>): Promise<unknown>;
+    constructor(linkResolver: (options: ClientOptions<TClientContext>, path: readonly string[], input: unknown) => Promisable<ClientLink<TClientContext>>);
+    call(path: readonly string[], input: unknown, options: ClientOptions<TClientContext>): Promise<unknown>;
 }
 
 declare const COMMON_ORPC_ERROR_DEFS: {
@@ -146,5 +146,6 @@ type SafeResult<TOutput, TError extends Error> = [error: null, data: TOutput, is
     isDefined: true;
 };
 declare function safe<TOutput, TError extends Error>(promise: ClientPromiseResult<TOutput, TError>): Promise<SafeResult<TOutput, TError>>;
+declare function resolveFriendlyClientOptions<T extends ClientContext>(options: FriendlyClientOptions<T>): ClientOptions<T>;
 
-export { COMMON_ORPC_ERROR_DEFS, ClientContext, ClientLink, ClientOptionsOut, ClientPromiseResult, type CommonORPCErrorCode, DynamicLink, InferClientContext, NestedClient, ORPCError, type ORPCErrorCode, type ORPCErrorJSON, type ORPCErrorOptions, type SafeResult, createORPCClient, type createORPCClientOptions, fallbackORPCErrorMessage, fallbackORPCErrorStatus, isDefinedError, mapEventIterator, safe, toORPCError };
+export { COMMON_ORPC_ERROR_DEFS, ClientContext, ClientLink, ClientOptions, ClientPromiseResult, type CommonORPCErrorCode, DynamicLink, FriendlyClientOptions, InferClientContext, NestedClient, ORPCError, type ORPCErrorCode, type ORPCErrorJSON, type ORPCErrorOptions, type SafeResult, createORPCClient, type createORPCClientOptions, fallbackORPCErrorMessage, fallbackORPCErrorStatus, isDefinedError, mapEventIterator, resolveFriendlyClientOptions, safe, toORPCError };

package/dist/index.mjs

@@ -3,15 +3,39 @@ export { C as COMMON_ORPC_ERROR_DEFS, O as ORPCError, a as fallbackORPCErrorMess
 export { onError, onFinish, onStart, onSuccess } from '@orpc/shared';
 export { ErrorEvent } from '@orpc/standard-server';
 
+async function safe(promise) {
+  try {
+    const output = await promise;
+    return Object.assign(
+      [null, output, false],
+      { error: null, data: output, isDefined: false }
+    );
+  } catch (e) {
+    const error = e;
+    if (isDefinedError(error)) {
+      return Object.assign(
+        [error, void 0, true],
+        { error, data: void 0, isDefined: true }
+      );
+    }
+    return Object.assign(
+      [error, void 0, false],
+      { error, data: void 0, isDefined: false }
+    );
+  }
+}
+function resolveFriendlyClientOptions(options) {
+  return {
+    ...options,
+    context: options?.context ?? {}
+    // Context only optional if all fields are optional
+  };
+}
+
 function createORPCClient(link, options) {
   const path = options?.path ?? [];
-  const procedureClient = async (...[input, options2]) => {
-    const optionsOut = {
-      ...options2,
-      context: options2?.context ?? {}
-      // options.context can be undefined when all field is optional
-    };
-    return await link.call(path, input, optionsOut);
+  const procedureClient = async (...[input, options2 = {}]) => {
+    return await link.call(path, input, resolveFriendlyClientOptions(options2));
   };
   const recursive = new Proxy(procedureClient, {
     get(target, key) {
@@ -38,26 +62,4 @@ class DynamicLink {
   }
 }
 
-async function safe(promise) {
-  try {
-    const output = await promise;
-    return Object.assign(
-      [null, output, false],
-      { error: null, data: output, isDefined: false }
-    );
-  } catch (e) {
-    const error = e;
-    if (isDefinedError(error)) {
-      return Object.assign(
-        [error, void 0, true],
-        { error, data: void 0, isDefined: true }
-      );
-    }
-    return Object.assign(
-      [error, void 0, false],
-      { error, data: void 0, isDefined: false }
-    );
-  }
-}
-
-export { DynamicLink, createORPCClient, isDefinedError, safe };
+export { DynamicLink, createORPCClient, isDefinedError, resolveFriendlyClientOptions, safe };

package/dist/plugins/index.d.mts

@@ -1,12 +1,11 @@
-import { C as ClientPlugin, S as StandardLinkOptions } from '../shared/client.DrOAzyMB.mjs';
-export { a as CompositeClientPlugin } from '../shared/client.DrOAzyMB.mjs';
 import { Value } from '@orpc/shared';
-import { C as ClientOptionsOut, a as ClientContext } from '../shared/client.CupM8eRP.mjs';
+import { S as StandardLinkPlugin, a as StandardLinkOptions } from '../shared/client.CKw2tbcl.mjs';
+import { C as ClientOptions } from '../shared/client.RZs5Myak.mjs';
 import '@orpc/standard-server';
 
 interface ClientRetryPluginAttemptOptions {
-    eventIteratorLastRetry: number | undefined;
-    eventIteratorLastEventId: string | undefined;
+    lastEventRetry: number | undefined;
+    lastEventId: string | undefined;
     attemptIndex: number;
     error: unknown;
 }
@@ -21,11 +20,11 @@ interface ClientRetryPluginContext {
     /**
      * Delay (in ms) before retrying.
      *
-     * @default (o) => o.eventIteratorLastRetry ?? 2000
+     * @default (o) => o.lastEventRetry ?? 2000
      */
     retryDelay?: Value<number, [
         attemptOptions: ClientRetryPluginAttemptOptions,
-        clientOptions: ClientOptionsOut<ClientRetryPluginContext>,
+        clientOptions: ClientOptions<ClientRetryPluginContext>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -36,21 +35,21 @@ interface ClientRetryPluginContext {
      */
     shouldRetry?: Value<boolean, [
         attemptOptions: ClientRetryPluginAttemptOptions,
-        clientOptions: ClientOptionsOut<ClientRetryPluginContext>,
+        clientOptions: ClientOptions<ClientRetryPluginContext>,
         path: readonly string[],
         input: unknown
     ]>;
     /**
      * The hook called when retrying, and return the unsubscribe function.
      */
-    onRetry?: (options: ClientRetryPluginAttemptOptions, clientOptions: ClientOptionsOut<ClientRetryPluginContext>, path: readonly string[], input: unknown) => void | (() => void);
+    onRetry?: (options: ClientRetryPluginAttemptOptions, clientOptions: ClientOptions<ClientRetryPluginContext>, path: readonly string[], input: unknown) => void | (() => void);
 }
 declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
 }
 interface ClientRetryPluginOptions {
     default?: ClientRetryPluginContext;
 }
-declare class ClientRetryPlugin<T extends ClientContext & ClientRetryPluginContext> implements ClientPlugin<T> {
+declare class ClientRetryPlugin<T extends ClientRetryPluginContext> implements StandardLinkPlugin<T> {
     private readonly defaultRetry;
     private readonly defaultRetryDelay;
     private readonly defaultShouldRetry;
@@ -59,4 +58,4 @@ declare class ClientRetryPlugin<T extends ClientContext & ClientRetryPluginConte
     init(options: StandardLinkOptions<T>): void;
 }
 
-export { ClientPlugin, ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions };
+export { ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions };

package/dist/plugins/index.d.ts

@@ -1,12 +1,11 @@
-import { C as ClientPlugin, S as StandardLinkOptions } from '../shared/client.aGal-uGY.js';
-export { a as CompositeClientPlugin } from '../shared/client.aGal-uGY.js';
 import { Value } from '@orpc/shared';
-import { C as ClientOptionsOut, a as ClientContext } from '../shared/client.CupM8eRP.js';
+import { S as StandardLinkPlugin, a as StandardLinkOptions } from '../shared/client.Bt40CWA-.js';
+import { C as ClientOptions } from '../shared/client.RZs5Myak.js';
 import '@orpc/standard-server';
 
 interface ClientRetryPluginAttemptOptions {
-    eventIteratorLastRetry: number | undefined;
-    eventIteratorLastEventId: string | undefined;
+    lastEventRetry: number | undefined;
+    lastEventId: string | undefined;
     attemptIndex: number;
     error: unknown;
 }
@@ -21,11 +20,11 @@ interface ClientRetryPluginContext {
     /**
      * Delay (in ms) before retrying.
      *
-     * @default (o) => o.eventIteratorLastRetry ?? 2000
+     * @default (o) => o.lastEventRetry ?? 2000
      */
     retryDelay?: Value<number, [
         attemptOptions: ClientRetryPluginAttemptOptions,
-        clientOptions: ClientOptionsOut<ClientRetryPluginContext>,
+        clientOptions: ClientOptions<ClientRetryPluginContext>,
         path: readonly string[],
         input: unknown
     ]>;
@@ -36,21 +35,21 @@ interface ClientRetryPluginContext {
      */
     shouldRetry?: Value<boolean, [
         attemptOptions: ClientRetryPluginAttemptOptions,
-        clientOptions: ClientOptionsOut<ClientRetryPluginContext>,
+        clientOptions: ClientOptions<ClientRetryPluginContext>,
         path: readonly string[],
         input: unknown
     ]>;
     /**
      * The hook called when retrying, and return the unsubscribe function.
      */
-    onRetry?: (options: ClientRetryPluginAttemptOptions, clientOptions: ClientOptionsOut<ClientRetryPluginContext>, path: readonly string[], input: unknown) => void | (() => void);
+    onRetry?: (options: ClientRetryPluginAttemptOptions, clientOptions: ClientOptions<ClientRetryPluginContext>, path: readonly string[], input: unknown) => void | (() => void);
 }
 declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
 }
 interface ClientRetryPluginOptions {
     default?: ClientRetryPluginContext;
 }
-declare class ClientRetryPlugin<T extends ClientContext & ClientRetryPluginContext> implements ClientPlugin<T> {
+declare class ClientRetryPlugin<T extends ClientRetryPluginContext> implements StandardLinkPlugin<T> {
     private readonly defaultRetry;
     private readonly defaultRetryDelay;
     private readonly defaultShouldRetry;
@@ -59,4 +58,4 @@ declare class ClientRetryPlugin<T extends ClientContext & ClientRetryPluginConte
     init(options: StandardLinkOptions<T>): void;
 }
 
-export { ClientPlugin, ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions };
+export { ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions };

package/dist/plugins/index.mjs

@@ -1,4 +1,3 @@
-export { C as CompositeClientPlugin } from '../shared/client.CvnV7_uV.mjs';
 import { isAsyncIteratorObject, value } from '@orpc/shared';
 import { getEventMeta } from '@orpc/standard-server';
 
@@ -11,7 +10,7 @@ class ClientRetryPlugin {
   defaultOnRetry;
   constructor(options = {}) {
     this.defaultRetry = options.default?.retry ?? 0;
-    this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.eventIteratorLastRetry ?? 2e3);
+    this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.lastEventRetry ?? 2e3);
     this.defaultShouldRetry = options.default?.shouldRetry ?? true;
     this.defaultOnRetry = options.default?.onRetry;
   }
@@ -25,13 +24,14 @@ class ClientRetryPlugin {
       if (maxAttempts <= 0) {
         return interceptorOptions.next();
       }
-      let eventIteratorLastEventId = interceptorOptions.options.lastEventId;
-      let eventIteratorLastRetry;
+      let lastEventId = interceptorOptions.options.lastEventId;
+      let lastEventRetry;
       let unsubscribe;
       let attemptIndex = 0;
       const next = async (initial) => {
         let current = initial;
         while (true) {
+          const newClientOptions = { ...interceptorOptions.options, lastEventId };
           if (current) {
             if (attemptIndex >= maxAttempts) {
               throw current.error;
@@ -39,13 +39,13 @@ class ClientRetryPlugin {
             const attemptOptions = {
               attemptIndex,
               error: current.error,
-              eventIteratorLastEventId,
-              eventIteratorLastRetry
+              lastEventId,
+              lastEventRetry
             };
             const shouldRetryBool = await value(
               shouldRetry,
               attemptOptions,
-              interceptorOptions.options,
+              newClientOptions,
               interceptorOptions.path,
               interceptorOptions.input
             );
@@ -54,14 +54,14 @@ class ClientRetryPlugin {
             }
             unsubscribe = onRetry?.(
               attemptOptions,
-              interceptorOptions.options,
+              newClientOptions,
               interceptorOptions.path,
               interceptorOptions.input
             );
             const retryDelayMs = await value(
               retryDelay,
               attemptOptions,
-              interceptorOptions.options,
+              newClientOptions,
               interceptorOptions.path,
               interceptorOptions.input
             );
@@ -69,14 +69,13 @@ class ClientRetryPlugin {
             attemptIndex++;
           }
           try {
-            const newClientOptions = { ...interceptorOptions.options, lastEventId: eventIteratorLastEventId };
             const output2 = await interceptorOptions.next({
               ...interceptorOptions,
               options: newClientOptions
             });
             return output2;
           } catch (error) {
-            if (interceptorOptions.options.signal?.aborted === true) {
+            if (newClientOptions.signal?.aborted === true) {
               throw error;
             }
             current = { error };
@@ -97,16 +96,16 @@ class ClientRetryPlugin {
             try {
               const item = await current.next();
               const meta = getEventMeta(item.value);
-              eventIteratorLastEventId = meta?.id ?? eventIteratorLastEventId;
-              eventIteratorLastRetry = meta?.retry ?? eventIteratorLastRetry;
+              lastEventId = meta?.id ?? lastEventId;
+              lastEventRetry = meta?.retry ?? lastEventRetry;
               if (item.done) {
                 return item.value;
               }
               yield item.value;
             } catch (error) {
               const meta = getEventMeta(error);
-              eventIteratorLastEventId = meta?.id ?? eventIteratorLastEventId;
-              eventIteratorLastRetry = meta?.retry ?? eventIteratorLastRetry;
+              lastEventId = meta?.id ?? lastEventId;
+              lastEventRetry = meta?.retry ?? lastEventRetry;
               const maybeEventIterator = await next({ error });
               if (!isAsyncIteratorObject(maybeEventIterator)) {
                 throw new ClientRetryPluginInvalidEventIteratorRetryResponse(

package/dist/shared/{client.aGal-uGY.d.ts → client.Bt40CWA-.d.ts}

@@ -1,27 +1,30 @@
 import { Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
-import { a as ClientContext, C as ClientOptionsOut, b as ClientLink } from './client.CupM8eRP.js';
+import { a as ClientContext, C as ClientOptions, b as ClientLink } from './client.RZs5Myak.js';
 
 interface StandardLinkCodec<T extends ClientContext> {
-    encode(path: readonly string[], input: unknown, options: ClientOptionsOut<any>): Promise<StandardRequest>;
-    decode(response: StandardLazyResponse, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<unknown>;
+    encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
+    decode(response: StandardLazyResponse, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<unknown>;
 }
 interface StandardLinkClient<T extends ClientContext> {
-    call(request: StandardRequest, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
+    call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
 }
 
 declare class InvalidEventIteratorRetryResponse extends Error {
 }
+interface StandardLinkPlugin<T extends ClientContext> {
+    init?(options: StandardLinkOptions<T>): void;
+}
 interface StandardLinkOptions<T extends ClientContext> {
     interceptors?: Interceptor<{
         path: readonly string[];
         input: unknown;
-        options: ClientOptionsOut<T>;
+        options: ClientOptions<T>;
     }, unknown, unknown>[];
     clientInterceptors?: Interceptor<{
         request: StandardRequest;
     }, StandardLazyResponse, unknown>[];
-    plugins?: ClientPlugin<T>[];
+    plugins?: StandardLinkPlugin<T>[];
 }
 declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
     #private;
@@ -30,16 +33,7 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
     private readonly interceptors;
     private readonly clientInterceptors;
     constructor(codec: StandardLinkCodec<T>, sender: StandardLinkClient<T>, options?: StandardLinkOptions<T>);
-    call(path: readonly string[], input: unknown, options: ClientOptionsOut<T>): Promise<unknown>;
-}
-
-interface ClientPlugin<T extends ClientContext> {
-    init?(options: StandardLinkOptions<T>): void;
-}
-declare class CompositeClientPlugin<T extends ClientContext> implements ClientPlugin<T> {
-    private readonly plugins;
-    constructor(plugins?: ClientPlugin<T>[]);
-    init(options: StandardLinkOptions<T>): void;
+    call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
 }
 
-export { type ClientPlugin as C, InvalidEventIteratorRetryResponse as I, type StandardLinkOptions as S, CompositeClientPlugin as a, type StandardLinkClient as b, type StandardLinkCodec as c, StandardLink as d };
+export { InvalidEventIteratorRetryResponse as I, type StandardLinkPlugin as S, type StandardLinkOptions as a, type StandardLinkClient as b, type StandardLinkCodec as c, StandardLink as d };

package/dist/shared/{client.Be-O_tdu.mjs → client.CAwgYDwB.mjs}

@@ -1,7 +1,6 @@
-import { intercept, isObject, value, trim, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
-import { C as CompositeClientPlugin } from './client.CvnV7_uV.mjs';
-import { ErrorEvent } from '@orpc/standard-server';
+import { toArray, intercept, isObject, value, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
 import { O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.BacCdg3F.mjs';
+import { ErrorEvent } from '@orpc/standard-server';
 
 class InvalidEventIteratorRetryResponse extends Error {
 }
@@ -9,10 +8,11 @@ class StandardLink {
   constructor(codec, sender, options = {}) {
     this.codec = codec;
     this.sender = sender;
-    const plugin = new CompositeClientPlugin(options.plugins);
-    plugin.init(options);
-    this.interceptors = options.interceptors ?? [];
-    this.clientInterceptors = options.clientInterceptors ?? [];
+    for (const plugin of toArray(options.plugins)) {
+      plugin.init?.(options);
+    }
+    this.interceptors = toArray(options.interceptors);
+    this.clientInterceptors = toArray(options.clientInterceptors);
   }
   interceptors;
   clientInterceptors;
@@ -111,6 +111,9 @@ class StandardRPCJsonSerializer {
     if (isObject(data)) {
       const json = {};
       for (const k in data) {
+        if (k === "toJSON" && typeof data[k] === "function") {
+          continue;
+        }
         json[k] = this.serialize(data[k], [...segments, k], meta, maps, blobs)[0];
       }
       return [json, meta, maps, blobs];
@@ -195,7 +198,7 @@ class StandardRPCLinkCodec {
     const expectedMethod = await value(this.expectedMethod, options, path, input);
     const headers = { ...await value(this.headers, options, path, input) };
     const baseUrl = await value(this.baseUrl, options, path, input);
-    const url = new URL(`${trim(baseUrl.toString(), "/")}/${path.map(encodeURIComponent).join("/")}`);
+    const url = new URL(`${baseUrl.toString().replace(/\/$/, "")}/${path.map(encodeURIComponent).join("/")}`);
     if (options.lastEventId !== void 0) {
       if (Array.isArray(headers["last-event-id"])) {
         headers["last-event-id"] = [...headers["last-event-id"], options.lastEventId];

package/dist/shared/{client.DrOAzyMB.d.mts → client.CKw2tbcl.d.mts}

@@ -1,27 +1,30 @@
 import { Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
-import { a as ClientContext, C as ClientOptionsOut, b as ClientLink } from './client.CupM8eRP.mjs';
+import { a as ClientContext, C as ClientOptions, b as ClientLink } from './client.RZs5Myak.mjs';
 
 interface StandardLinkCodec<T extends ClientContext> {
-    encode(path: readonly string[], input: unknown, options: ClientOptionsOut<any>): Promise<StandardRequest>;
-    decode(response: StandardLazyResponse, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<unknown>;
+    encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
+    decode(response: StandardLazyResponse, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<unknown>;
 }
 interface StandardLinkClient<T extends ClientContext> {
-    call(request: StandardRequest, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
+    call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
 }
 
 declare class InvalidEventIteratorRetryResponse extends Error {
 }
+interface StandardLinkPlugin<T extends ClientContext> {
+    init?(options: StandardLinkOptions<T>): void;
+}
 interface StandardLinkOptions<T extends ClientContext> {
     interceptors?: Interceptor<{
         path: readonly string[];
         input: unknown;
-        options: ClientOptionsOut<T>;
+        options: ClientOptions<T>;
     }, unknown, unknown>[];
     clientInterceptors?: Interceptor<{
         request: StandardRequest;
     }, StandardLazyResponse, unknown>[];
-    plugins?: ClientPlugin<T>[];
+    plugins?: StandardLinkPlugin<T>[];
 }
 declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
     #private;
@@ -30,16 +33,7 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
     private readonly interceptors;
     private readonly clientInterceptors;
     constructor(codec: StandardLinkCodec<T>, sender: StandardLinkClient<T>, options?: StandardLinkOptions<T>);
-    call(path: readonly string[], input: unknown, options: ClientOptionsOut<T>): Promise<unknown>;
-}
-
-interface ClientPlugin<T extends ClientContext> {
-    init?(options: StandardLinkOptions<T>): void;
-}
-declare class CompositeClientPlugin<T extends ClientContext> implements ClientPlugin<T> {
-    private readonly plugins;
-    constructor(plugins?: ClientPlugin<T>[]);
-    init(options: StandardLinkOptions<T>): void;
+    call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
 }
 
-export { type ClientPlugin as C, InvalidEventIteratorRetryResponse as I, type StandardLinkOptions as S, CompositeClientPlugin as a, type StandardLinkClient as b, type StandardLinkCodec as c, StandardLink as d };
+export { InvalidEventIteratorRetryResponse as I, type StandardLinkPlugin as S, type StandardLinkOptions as a, type StandardLinkClient as b, type StandardLinkCodec as c, StandardLink as d };

package/dist/shared/{client.CupM8eRP.d.mts → client.RZs5Myak.d.mts}

@@ -1,5 +1,5 @@
 type ClientContext = Record<string, any>;
-type ClientOptions<TClientContext extends ClientContext> = {
+type FriendlyClientOptions<TClientContext extends ClientContext> = {
     signal?: AbortSignal;
     lastEventId?: string | undefined;
 } & (Record<never, never> extends TClientContext ? {
@@ -7,7 +7,7 @@ type ClientOptions<TClientContext extends ClientContext> = {
 } : {
     context: TClientContext;
 });
-type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: ClientOptions<TClientContext>] : [input: TInput, options?: ClientOptions<TClientContext>] : [input: TInput, options: ClientOptions<TClientContext>];
+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 extends Error> = Promise<TOutput> & {
     __error?: {
         type: TError;
@@ -20,11 +20,11 @@ type NestedClient<TClientContext extends ClientContext> = Client<TClientContext,
     [k: string]: NestedClient<TClientContext>;
 };
 type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
-type ClientOptionsOut<TClientContext extends ClientContext> = ClientOptions<TClientContext> & {
+type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
     context: TClientContext;
 };
 interface ClientLink<TClientContext extends ClientContext> {
-    call: (path: readonly string[], input: unknown, options: ClientOptionsOut<TClientContext>) => Promise<unknown>;
+    call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
 }
 
-export type { ClientOptionsOut as C, InferClientContext as I, NestedClient as N, ClientContext as a, ClientLink as b, ClientPromiseResult as c, ClientOptions as d, ClientRest as e, Client as f };
+export type { ClientOptions as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ClientContext as a, ClientLink as b, ClientPromiseResult as c, ClientRest as d, Client as e };

package/dist/shared/{client.CupM8eRP.d.ts → client.RZs5Myak.d.ts}

@@ -1,5 +1,5 @@
 type ClientContext = Record<string, any>;
-type ClientOptions<TClientContext extends ClientContext> = {
+type FriendlyClientOptions<TClientContext extends ClientContext> = {
     signal?: AbortSignal;
     lastEventId?: string | undefined;
 } & (Record<never, never> extends TClientContext ? {
@@ -7,7 +7,7 @@ type ClientOptions<TClientContext extends ClientContext> = {
 } : {
     context: TClientContext;
 });
-type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: ClientOptions<TClientContext>] : [input: TInput, options?: ClientOptions<TClientContext>] : [input: TInput, options: ClientOptions<TClientContext>];
+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 extends Error> = Promise<TOutput> & {
     __error?: {
         type: TError;
@@ -20,11 +20,11 @@ type NestedClient<TClientContext extends ClientContext> = Client<TClientContext,
     [k: string]: NestedClient<TClientContext>;
 };
 type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
-type ClientOptionsOut<TClientContext extends ClientContext> = ClientOptions<TClientContext> & {
+type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
     context: TClientContext;
 };
 interface ClientLink<TClientContext extends ClientContext> {
-    call: (path: readonly string[], input: unknown, options: ClientOptionsOut<TClientContext>) => Promise<unknown>;
+    call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
 }
 
-export type { ClientOptionsOut as C, InferClientContext as I, NestedClient as N, ClientContext as a, ClientLink as b, ClientPromiseResult as c, ClientOptions as d, ClientRest as e, Client as f };
+export type { ClientOptions as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ClientContext as a, ClientLink as b, ClientPromiseResult as c, ClientRest as d, Client as e };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -39,9 +39,9 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "1.0.0-beta.2",
-    "@orpc/standard-server-fetch": "1.0.0-beta.2",
-    "@orpc/standard-server": "1.0.0-beta.2"
+    "@orpc/shared": "1.0.0-beta.4",
+    "@orpc/standard-server": "1.0.0-beta.4",
+    "@orpc/standard-server-fetch": "1.0.0-beta.4"
   },
   "devDependencies": {
     "zod": "^3.24.2"

package/dist/shared/client.CvnV7_uV.mjs

@@ -1,12 +0,0 @@
-class CompositeClientPlugin {
-  constructor(plugins = []) {
-    this.plugins = plugins;
-  }
-  init(options) {
-    for (const plugin of this.plugins) {
-      plugin.init?.(options);
-    }
-  }
-}
-
-export { CompositeClientPlugin as C };