@orpc/client 0.0.0-next.8f622a0 → 0.0.0-next.904b0c2

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,30 +1,26 @@
 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 { StandardRPCLinkOptions } from '../standard/index.mjs';
+import { a as ClientContext, b as ClientOptions } from '../../shared/client.87WXDX8t.mjs';
+import { d as StandardLinkClient, b as StandardLink } from '../../shared/client.D9lmRwGB.mjs';
+import { f as StandardRPCLinkOptions } from '../../shared/client.BC0T26HA.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: {
+        redirect?: Request['redirect'];
+    }, 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> {
 }
-declare class RPCLink<T extends ClientContext> implements ClientLink<T> {
-    private readonly standardLink;
+declare class RPCLink<T extends ClientContext> extends StandardLink<T> {
     constructor(options: RPCLinkOptions<T>);
-    call(path: readonly string[], input: unknown, options: ClientOptionsOut<T>): Promise<unknown>;
 }
 
-interface FetchWithContext<TClientContext extends ClientContext> {
-    (url: URL, init: RequestInit, options: ClientOptionsOut<TClientContext>, path: readonly string[], input: unknown): Promise<Response>;
-}
-
-export { type FetchWithContext, LinkFetchClient, type LinkFetchClientOptions, RPCLink, type RPCLinkOptions };
+export { LinkFetchClient, type LinkFetchClientOptions, RPCLink, type RPCLinkOptions };

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

@@ -1,30 +1,26 @@
 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 { StandardRPCLinkOptions } from '../standard/index.js';
+import { a as ClientContext, b as ClientOptions } from '../../shared/client.87WXDX8t.js';
+import { d as StandardLinkClient, b as StandardLink } from '../../shared/client.BaocqKnn.js';
+import { f as StandardRPCLinkOptions } from '../../shared/client.CZFIVTQj.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: {
+        redirect?: Request['redirect'];
+    }, 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> {
 }
-declare class RPCLink<T extends ClientContext> implements ClientLink<T> {
-    private readonly standardLink;
+declare class RPCLink<T extends ClientContext> extends StandardLink<T> {
     constructor(options: RPCLinkOptions<T>);
-    call(path: readonly string[], input: unknown, options: ClientOptionsOut<T>): Promise<unknown>;
 }
 
-interface FetchWithContext<TClientContext extends ClientContext> {
-    (url: URL, init: RequestInit, options: ClientOptionsOut<TClientContext>, path: readonly string[], input: unknown): Promise<Response>;
-}
-
-export { type FetchWithContext, LinkFetchClient, type LinkFetchClientOptions, RPCLink, type RPCLinkOptions };
+export { 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 { S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer } from '../../shared/client.D77bw0hs.mjs';
 import '@orpc/shared';
-import '../../shared/client.CvnV7_uV.mjs';
 import '@orpc/standard-server';
-import '../../shared/client.BacCdg3F.mjs';
+import '../../shared/client.jKEwIsRd.mjs';
 
 class LinkFetchClient {
   fetch;
@@ -14,23 +13,19 @@ class LinkFetchClient {
   }
   async call(request, options, path, input) {
     const fetchRequest = toFetchRequest(request, this.toFetchRequestOptions);
-    const fetchResponse = await this.fetch(fetchRequest, {}, options, path, input);
+    const fetchResponse = await this.fetch(fetchRequest, { redirect: "manual" }, options, path, input);
     const lazyResponse = toStandardLazyResponse(fetchResponse);
     return lazyResponse;
   }
 }
 
-class RPCLink {
-  standardLink;
+class RPCLink extends StandardLink {
   constructor(options) {
     const jsonSerializer = new StandardRPCJsonSerializer(options);
     const serializer = new StandardRPCSerializer(jsonSerializer);
     const linkCodec = new StandardRPCLinkCodec(serializer, options);
     const linkClient = new LinkFetchClient(options);
-    this.standardLink = new StandardLink(linkCodec, linkClient, options);
-  }
-  async call(path, input, options) {
-    return this.standardLink.call(path, input, options);
+    super(linkCodec, linkClient, options);
   }
 }
 

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

@@ -1,105 +1,9 @@
-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 { Segment, Value } from '@orpc/shared';
-import { a as ClientContext, C as ClientOptionsOut } from '../../shared/client.CupM8eRP.mjs';
-import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
+export { I as InvalidEventIteratorRetryResponse, b as StandardLink, d as StandardLinkClient, c as StandardLinkCodec, a as StandardLinkOptions, S as StandardLinkPlugin } from '../../shared/client.D9lmRwGB.mjs';
+export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions, h as StandardRPCLinkCodec, g as StandardRPCLinkCodecOptions, f as StandardRPCLinkOptions, i as StandardRPCSerializer } from '../../shared/client.BC0T26HA.mjs';
+import { H as HTTPPath } from '../../shared/client.87WXDX8t.mjs';
+import '@orpc/shared';
+import '@orpc/standard-server';
 
-declare const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES: {
-    readonly BIGINT: 0;
-    readonly DATE: 1;
-    readonly NAN: 2;
-    readonly UNDEFINED: 3;
-    readonly URL: 4;
-    readonly REGEXP: 5;
-    readonly SET: 6;
-    readonly MAP: 7;
-};
-type StandardRPCJsonSerializedMetaItem = readonly [type: number, ...path: Segment[]];
-type StandardRPCJsonSerialized = [json: unknown, meta: StandardRPCJsonSerializedMetaItem[], maps: Segment[][], blobs: Blob[]];
-interface StandardRPCCustomJsonSerializer {
-    type: number;
-    condition(data: unknown): boolean;
-    serialize(data: any): unknown;
-    deserialize(serialized: any): unknown;
-}
-interface StandardRPCJsonSerializerOptions {
-    customJsonSerializers?: readonly StandardRPCCustomJsonSerializer[];
-}
-declare class StandardRPCJsonSerializer {
-    private readonly customSerializers;
-    constructor(options?: StandardRPCJsonSerializerOptions);
-    serialize(data: unknown, segments?: Segment[], meta?: StandardRPCJsonSerializedMetaItem[], maps?: Segment[][], blobs?: Blob[]): StandardRPCJsonSerialized;
-    deserialize(json: unknown, meta: readonly StandardRPCJsonSerializedMetaItem[]): unknown;
-    deserialize(json: unknown, meta: readonly StandardRPCJsonSerializedMetaItem[], maps: readonly Segment[][], getBlob: (index: number) => Blob): unknown;
-}
+declare function toHttpPath(path: readonly string[]): HTTPPath;
 
-declare class StandardRPCSerializer {
-    #private;
-    private readonly jsonSerializer;
-    constructor(jsonSerializer: StandardRPCJsonSerializer);
-    serialize(data: unknown): object;
-    deserialize(data: unknown): unknown;
-}
-
-type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
-interface StandardRPCLinkCodecOptions<T extends ClientContext> {
-    /**
-     * Base url for all requests.
-     */
-    url: Value<string | URL, [
-        options: ClientOptionsOut<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
-    /**
-     * The maximum length of the URL.
-     *
-     * @default 2083
-     */
-    maxUrlLength?: Value<number, [
-        options: ClientOptionsOut<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
-    /**
-     * The method used to make the request.
-     *
-     * @default 'POST'
-     */
-    method?: Value<HTTPMethod, [
-        options: ClientOptionsOut<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
-    /**
-     * The method to use when the payload cannot safely pass to the server with method return from method function.
-     * GET is not allowed, it's very dangerous.
-     *
-     * @default 'POST'
-     */
-    fallbackMethod?: Exclude<HTTPMethod, 'GET'>;
-    /**
-     * Inject headers to the request.
-     */
-    headers?: Value<StandardHeaders, [
-        options: ClientOptionsOut<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
-}
-declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
-    private readonly serializer;
-    private readonly baseUrl;
-    private readonly maxUrlLength;
-    private readonly fallbackMethod;
-    private readonly expectedMethod;
-    private readonly headers;
-    constructor(serializer: StandardRPCSerializer, options: StandardRPCLinkCodecOptions<T>);
-    encode(path: readonly string[], input: unknown, options: ClientOptionsOut<any>): Promise<StandardRequest>;
-    decode(response: StandardLazyResponse): Promise<unknown>;
-}
-
-interface StandardRPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardRPCLinkCodecOptions<T>, StandardRPCJsonSerializerOptions {
-}
-
-export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, StandardLinkCodec, StandardLinkOptions, type StandardRPCCustomJsonSerializer, type StandardRPCJsonSerialized, type StandardRPCJsonSerializedMetaItem, StandardRPCJsonSerializer, type StandardRPCJsonSerializerOptions, StandardRPCLinkCodec, type StandardRPCLinkCodecOptions, type StandardRPCLinkOptions, StandardRPCSerializer };
+export { toHttpPath };

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

@@ -1,105 +1,9 @@
-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 { Segment, Value } from '@orpc/shared';
-import { a as ClientContext, C as ClientOptionsOut } from '../../shared/client.CupM8eRP.js';
-import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
+export { I as InvalidEventIteratorRetryResponse, b as StandardLink, d as StandardLinkClient, c as StandardLinkCodec, a as StandardLinkOptions, S as StandardLinkPlugin } from '../../shared/client.BaocqKnn.js';
+export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions, h as StandardRPCLinkCodec, g as StandardRPCLinkCodecOptions, f as StandardRPCLinkOptions, i as StandardRPCSerializer } from '../../shared/client.CZFIVTQj.js';
+import { H as HTTPPath } from '../../shared/client.87WXDX8t.js';
+import '@orpc/shared';
+import '@orpc/standard-server';
 
-declare const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES: {
-    readonly BIGINT: 0;
-    readonly DATE: 1;
-    readonly NAN: 2;
-    readonly UNDEFINED: 3;
-    readonly URL: 4;
-    readonly REGEXP: 5;
-    readonly SET: 6;
-    readonly MAP: 7;
-};
-type StandardRPCJsonSerializedMetaItem = readonly [type: number, ...path: Segment[]];
-type StandardRPCJsonSerialized = [json: unknown, meta: StandardRPCJsonSerializedMetaItem[], maps: Segment[][], blobs: Blob[]];
-interface StandardRPCCustomJsonSerializer {
-    type: number;
-    condition(data: unknown): boolean;
-    serialize(data: any): unknown;
-    deserialize(serialized: any): unknown;
-}
-interface StandardRPCJsonSerializerOptions {
-    customJsonSerializers?: readonly StandardRPCCustomJsonSerializer[];
-}
-declare class StandardRPCJsonSerializer {
-    private readonly customSerializers;
-    constructor(options?: StandardRPCJsonSerializerOptions);
-    serialize(data: unknown, segments?: Segment[], meta?: StandardRPCJsonSerializedMetaItem[], maps?: Segment[][], blobs?: Blob[]): StandardRPCJsonSerialized;
-    deserialize(json: unknown, meta: readonly StandardRPCJsonSerializedMetaItem[]): unknown;
-    deserialize(json: unknown, meta: readonly StandardRPCJsonSerializedMetaItem[], maps: readonly Segment[][], getBlob: (index: number) => Blob): unknown;
-}
+declare function toHttpPath(path: readonly string[]): HTTPPath;
 
-declare class StandardRPCSerializer {
-    #private;
-    private readonly jsonSerializer;
-    constructor(jsonSerializer: StandardRPCJsonSerializer);
-    serialize(data: unknown): object;
-    deserialize(data: unknown): unknown;
-}
-
-type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
-interface StandardRPCLinkCodecOptions<T extends ClientContext> {
-    /**
-     * Base url for all requests.
-     */
-    url: Value<string | URL, [
-        options: ClientOptionsOut<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
-    /**
-     * The maximum length of the URL.
-     *
-     * @default 2083
-     */
-    maxUrlLength?: Value<number, [
-        options: ClientOptionsOut<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
-    /**
-     * The method used to make the request.
-     *
-     * @default 'POST'
-     */
-    method?: Value<HTTPMethod, [
-        options: ClientOptionsOut<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
-    /**
-     * The method to use when the payload cannot safely pass to the server with method return from method function.
-     * GET is not allowed, it's very dangerous.
-     *
-     * @default 'POST'
-     */
-    fallbackMethod?: Exclude<HTTPMethod, 'GET'>;
-    /**
-     * Inject headers to the request.
-     */
-    headers?: Value<StandardHeaders, [
-        options: ClientOptionsOut<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
-}
-declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
-    private readonly serializer;
-    private readonly baseUrl;
-    private readonly maxUrlLength;
-    private readonly fallbackMethod;
-    private readonly expectedMethod;
-    private readonly headers;
-    constructor(serializer: StandardRPCSerializer, options: StandardRPCLinkCodecOptions<T>);
-    encode(path: readonly string[], input: unknown, options: ClientOptionsOut<any>): Promise<StandardRequest>;
-    decode(response: StandardLazyResponse): Promise<unknown>;
-}
-
-interface StandardRPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardRPCLinkCodecOptions<T>, StandardRPCJsonSerializerOptions {
-}
-
-export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, StandardLinkCodec, StandardLinkOptions, type StandardRPCCustomJsonSerializer, type StandardRPCJsonSerialized, type StandardRPCJsonSerializedMetaItem, StandardRPCJsonSerializer, type StandardRPCJsonSerializerOptions, StandardRPCLinkCodec, type StandardRPCLinkCodecOptions, type StandardRPCLinkOptions, StandardRPCSerializer };
+export { toHttpPath };

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, t as toHttpPath } from '../../shared/client.D77bw0hs.mjs';
 import '@orpc/shared';
-import '../../shared/client.CvnV7_uV.mjs';
 import '@orpc/standard-server';
-import '../../shared/client.BacCdg3F.mjs';
+import '../../shared/client.jKEwIsRd.mjs';

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, C as ClientLink, I as InferClientContext, a as ClientContext, b as ClientOptions, c as ClientPromiseResult, F as FriendlyClientOptions } from './shared/client.87WXDX8t.mjs';
+export { f as Client, e as ClientRest, d as HTTPMethod, H as HTTPPath } from './shared/client.87WXDX8t.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: {
@@ -126,6 +126,7 @@ declare class ORPCError<TCode extends ORPCErrorCode, TData> extends Error {
 type ORPCErrorJSON<TCode extends string, TData> = Pick<ORPCError<TCode, TData>, 'defined' | 'code' | 'status' | 'message' | 'data'>;
 declare function isDefinedError<T>(error: T): error is Extract<T, ORPCError<any, any>>;
 declare function toORPCError(error: unknown): ORPCError<any, any>;
+declare function isORPCErrorStatus(status: number): boolean;
 
 declare function mapEventIterator<TYield, TReturn, TNext, TMap = TYield | TReturn>(iterator: AsyncIterator<TYield, TReturn, TNext>, maps: {
     value: (value: NoInfer<TYield | TReturn>, done: boolean | undefined) => Promise<TMap>;
@@ -146,5 +147,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, isORPCErrorStatus, 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, C as ClientLink, I as InferClientContext, a as ClientContext, b as ClientOptions, c as ClientPromiseResult, F as FriendlyClientOptions } from './shared/client.87WXDX8t.js';
+export { f as Client, e as ClientRest, d as HTTPMethod, H as HTTPPath } from './shared/client.87WXDX8t.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: {
@@ -126,6 +126,7 @@ declare class ORPCError<TCode extends ORPCErrorCode, TData> extends Error {
 type ORPCErrorJSON<TCode extends string, TData> = Pick<ORPCError<TCode, TData>, 'defined' | 'code' | 'status' | 'message' | 'data'>;
 declare function isDefinedError<T>(error: T): error is Extract<T, ORPCError<any, any>>;
 declare function toORPCError(error: unknown): ORPCError<any, any>;
+declare function isORPCErrorStatus(status: number): boolean;
 
 declare function mapEventIterator<TYield, TReturn, TNext, TMap = TYield | TReturn>(iterator: AsyncIterator<TYield, TReturn, TNext>, maps: {
     value: (value: NoInfer<TYield | TReturn>, done: boolean | undefined) => Promise<TMap>;
@@ -146,5 +147,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, isORPCErrorStatus, mapEventIterator, resolveFriendlyClientOptions, safe, toORPCError };

package/dist/index.mjs

@@ -1,17 +1,41 @@
-import { i as isDefinedError } from './shared/client.BacCdg3F.mjs';
-export { C as COMMON_ORPC_ERROR_DEFS, O as ORPCError, a as fallbackORPCErrorMessage, f as fallbackORPCErrorStatus, m as mapEventIterator, t as toORPCError } from './shared/client.BacCdg3F.mjs';
+import { i as isDefinedError } from './shared/client.jKEwIsRd.mjs';
+export { C as COMMON_ORPC_ERROR_DEFS, O as ORPCError, a as fallbackORPCErrorMessage, f as fallbackORPCErrorStatus, b as isORPCErrorStatus, m as mapEventIterator, t as toORPCError } from './shared/client.jKEwIsRd.mjs';
 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.D9lmRwGB.mjs';
+import { b as ClientOptions } from '../shared/client.87WXDX8t.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.BaocqKnn.js';
+import { b as ClientOptions } from '../shared/client.87WXDX8t.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 };