@orpc/client 0.0.0-next.7b151dd → 0.0.0-next.7b2677a

package/README.md

@@ -31,7 +31,7 @@
 - **📘 First-Class OpenAPI**: Built-in support that fully adheres to the OpenAPI standard.
 - **📝 Contract-First Development**: Optionally define your API contract before implementation.
 - **🔍 First-Class OpenTelemetry**: Seamlessly integrate with OpenTelemetry for observability.
-- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte, Angular), Pinia Colada, and more.
+- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte, Angular), SWR, Pinia Colada, and more.
 - **🚀 Server Actions**: Fully compatible with React Server Actions on Next.js, TanStack Start, and other platforms.
 - **🔠 Standard Schema Support**: Works out of the box with Zod, Valibot, ArkType, and other schema validators.
 - **🗃️ Native Types**: Supports native types like Date, File, Blob, BigInt, URL, and more.
@@ -54,6 +54,7 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with [NestJS](https://nestjs.com/).
 - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): [TanStack Query](https://tanstack.com/query/latest) integration.
+- [@orpc/experimental-react-swr](https://www.npmjs.com/package/@orpc/experimental-react-swr): [SWR](https://swr.vercel.app/) integration.
 - [@orpc/vue-colada](https://www.npmjs.com/package/@orpc/vue-colada): Integration with [Pinia Colada](https://pinia-colada.esm.dev/).
 - [@orpc/hey-api](https://www.npmjs.com/package/@orpc/hey-api): [Hey API](https://heyapi.dev/) integration.
 - [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): More schemas that [Zod](https://zod.dev/) doesn't support yet.

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

@@ -1,23 +1,36 @@
+import { Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.mjs';
-import { f as StandardLinkClient } from '../../shared/client.Bwgm6dgk.mjs';
+import { a as StandardLinkPlugin, f as StandardLinkClient } from '../../shared/client.Bwgm6dgk.mjs';
 import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.Ycwr4Tuo.mjs';
-import '@orpc/shared';
 
-interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
-    fetch?: (request: Request, init: {
+interface LinkFetchPlugin<T extends ClientContext> extends StandardLinkPlugin<T> {
+    initRuntimeAdapter?(options: LinkFetchClientOptions<T>): void;
+}
+
+interface LinkFetchInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
+    request: Request;
+    init: {
         redirect?: Request['redirect'];
-    }, options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    };
+    path: readonly string[];
+    input: unknown;
+}
+interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
+    fetch?: (request: Request, init: LinkFetchInterceptorOptions<T>['init'], options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    adapterInterceptors?: Interceptor<LinkFetchInterceptorOptions<T>, Promise<Response>>[];
+    plugins?: LinkFetchPlugin<T>[];
 }
 declare class LinkFetchClient<T extends ClientContext> implements StandardLinkClient<T> {
     private readonly fetch;
     private readonly toFetchRequestOptions;
+    private readonly adapterInterceptors;
     constructor(options: LinkFetchClientOptions<T>);
-    call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
+    call(standardRequest: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
 }
 
-interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions<T>, LinkFetchClientOptions<T> {
+interface RPCLinkOptions<T extends ClientContext> extends LinkFetchClientOptions<T>, Omit<StandardRPCLinkOptions<T>, 'plugins'> {
 }
 /**
  * The RPC Link communicates with the server using the RPC protocol.
@@ -30,4 +43,4 @@ declare class RPCLink<T extends ClientContext> extends StandardRPCLink<T> {
 }
 
 export { LinkFetchClient, RPCLink };
-export type { LinkFetchClientOptions, RPCLinkOptions };
+export type { LinkFetchClientOptions, LinkFetchInterceptorOptions, RPCLinkOptions };

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

@@ -1,23 +1,36 @@
+import { Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.js';
-import { f as StandardLinkClient } from '../../shared/client.BG98rYdO.js';
+import { a as StandardLinkPlugin, f as StandardLinkClient } from '../../shared/client.BG98rYdO.js';
 import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.C176log5.js';
-import '@orpc/shared';
 
-interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
-    fetch?: (request: Request, init: {
+interface LinkFetchPlugin<T extends ClientContext> extends StandardLinkPlugin<T> {
+    initRuntimeAdapter?(options: LinkFetchClientOptions<T>): void;
+}
+
+interface LinkFetchInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
+    request: Request;
+    init: {
         redirect?: Request['redirect'];
-    }, options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    };
+    path: readonly string[];
+    input: unknown;
+}
+interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
+    fetch?: (request: Request, init: LinkFetchInterceptorOptions<T>['init'], options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    adapterInterceptors?: Interceptor<LinkFetchInterceptorOptions<T>, Promise<Response>>[];
+    plugins?: LinkFetchPlugin<T>[];
 }
 declare class LinkFetchClient<T extends ClientContext> implements StandardLinkClient<T> {
     private readonly fetch;
     private readonly toFetchRequestOptions;
+    private readonly adapterInterceptors;
     constructor(options: LinkFetchClientOptions<T>);
-    call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
+    call(standardRequest: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
 }
 
-interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions<T>, LinkFetchClientOptions<T> {
+interface RPCLinkOptions<T extends ClientContext> extends LinkFetchClientOptions<T>, Omit<StandardRPCLinkOptions<T>, 'plugins'> {
 }
 /**
  * The RPC Link communicates with the server using the RPC protocol.
@@ -30,4 +43,4 @@ declare class RPCLink<T extends ClientContext> extends StandardRPCLink<T> {
 }
 
 export { LinkFetchClient, RPCLink };
-export type { LinkFetchClientOptions, RPCLinkOptions };
+export type { LinkFetchClientOptions, LinkFetchInterceptorOptions, RPCLinkOptions };

package/dist/adapters/fetch/index.mjs

@@ -1,20 +1,36 @@
+import { toArray, intercept } from '@orpc/shared';
 import { toFetchRequest, toStandardLazyResponse } from '@orpc/standard-server-fetch';
-import '@orpc/shared';
-import { c as StandardRPCLink } from '../../shared/client.B7Wgunl_.mjs';
+import { C as CompositeStandardLinkPlugin, c as StandardRPCLink } from '../../shared/client.DKmRtVO2.mjs';
 import '@orpc/standard-server';
-import '../../shared/client.BngOL3Ai.mjs';
+import '../../shared/client.txdq_i5V.mjs';
+
+class CompositeLinkFetchPlugin extends CompositeStandardLinkPlugin {
+  initRuntimeAdapter(options) {
+    for (const plugin of this.plugins) {
+      plugin.initRuntimeAdapter?.(options);
+    }
+  }
+}
 
 class LinkFetchClient {
   fetch;
   toFetchRequestOptions;
+  adapterInterceptors;
   constructor(options) {
-    this.fetch = options?.fetch ?? globalThis.fetch.bind(globalThis);
+    const plugin = new CompositeLinkFetchPlugin(options.plugins);
+    plugin.initRuntimeAdapter(options);
+    this.fetch = options.fetch ?? globalThis.fetch.bind(globalThis);
     this.toFetchRequestOptions = options;
+    this.adapterInterceptors = toArray(options.adapterInterceptors);
   }
-  async call(request, options, path, input) {
-    const fetchRequest = toFetchRequest(request, this.toFetchRequestOptions);
-    const fetchResponse = await this.fetch(fetchRequest, { redirect: "manual" }, options, path, input);
-    const lazyResponse = toStandardLazyResponse(fetchResponse, { signal: fetchRequest.signal });
+  async call(standardRequest, options, path, input) {
+    const request = toFetchRequest(standardRequest, this.toFetchRequestOptions);
+    const fetchResponse = await intercept(
+      this.adapterInterceptors,
+      { ...options, request, path, input, init: { redirect: "manual" } },
+      ({ request: request2, path: path2, input: input2, init, ...options2 }) => this.fetch(request2, init, options2, path2, input2)
+    );
+    const lazyResponse = toStandardLazyResponse(fetchResponse, { signal: request.signal });
     return lazyResponse;
   }
 }

package/dist/adapters/message-port/index.mjs

@@ -1,8 +1,8 @@
 import { ClientPeer } from '@orpc/standard-server-peer';
 import '@orpc/shared';
-import { c as StandardRPCLink } from '../../shared/client.B7Wgunl_.mjs';
+import { c as StandardRPCLink } from '../../shared/client.DKmRtVO2.mjs';
 import '@orpc/standard-server';
-import '../../shared/client.BngOL3Ai.mjs';
+import '../../shared/client.txdq_i5V.mjs';
 
 function postMessagePortMessage(port, data) {
   port.postMessage(data);

package/dist/adapters/standard/index.mjs

@@ -1,4 +1,4 @@
-export { C as CompositeStandardLinkPlugin, a as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLink, d as StandardRPCLinkCodec, e as StandardRPCSerializer, g as getMalformedResponseErrorCode, t as toHttpPath } from '../../shared/client.B7Wgunl_.mjs';
+export { C as CompositeStandardLinkPlugin, a as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLink, d as StandardRPCLinkCodec, e as StandardRPCSerializer, g as getMalformedResponseErrorCode, t as toHttpPath } from '../../shared/client.DKmRtVO2.mjs';
 import '@orpc/shared';
 import '@orpc/standard-server';
-import '../../shared/client.BngOL3Ai.mjs';
+import '../../shared/client.txdq_i5V.mjs';

package/dist/adapters/websocket/index.mjs

@@ -1,8 +1,8 @@
 import { readAsBuffer } from '@orpc/shared';
 import { ClientPeer } from '@orpc/standard-server-peer';
-import { c as StandardRPCLink } from '../../shared/client.B7Wgunl_.mjs';
+import { c as StandardRPCLink } from '../../shared/client.DKmRtVO2.mjs';
 import '@orpc/standard-server';
-import '../../shared/client.BngOL3Ai.mjs';
+import '../../shared/client.txdq_i5V.mjs';
 
 const WEBSOCKET_CONNECTING = 0;
 class LinkWebsocketClient {

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { i as isDefinedError } from './shared/client.BngOL3Ai.mjs';
-export { C as COMMON_ORPC_ERROR_DEFS, O as ORPCError, d as createORPCErrorFromJson, a as fallbackORPCErrorMessage, f as fallbackORPCErrorStatus, c as isORPCErrorJson, b as isORPCErrorStatus, m as mapEventIterator, t as toORPCError } from './shared/client.BngOL3Ai.mjs';
-import { isTypescriptObject } from '@orpc/shared';
+import { preventNativeAwait, isTypescriptObject } from '@orpc/shared';
 export { AsyncIteratorClass, EventPublisher, asyncIteratorToStream as eventIteratorToStream, onError, onFinish, onStart, onSuccess, streamToAsyncIteratorClass as streamToEventIterator } from '@orpc/shared';
+import { i as isDefinedError } from './shared/client.txdq_i5V.mjs';
+export { C as COMMON_ORPC_ERROR_DEFS, O as ORPCError, d as createORPCErrorFromJson, a as fallbackORPCErrorMessage, f as fallbackORPCErrorStatus, c as isORPCErrorJson, b as isORPCErrorStatus, m as mapEventIterator, t as toORPCError } from './shared/client.txdq_i5V.mjs';
 export { ErrorEvent } from '@orpc/standard-server';
 
 async function safe(promise) {
@@ -49,7 +49,7 @@ function createORPCClient(link, options = {}) {
       });
     }
   });
-  return recursive;
+  return preventNativeAwait(recursive);
 }
 
 function createSafeClient(client) {

package/dist/plugins/index.mjs

@@ -330,7 +330,7 @@ class ClientRetryPlugin {
       if (!isAsyncIteratorObject(output)) {
         return output;
       }
-      return async function* () {
+      return (async function* () {
         let current = output;
         try {
           while (true) {
@@ -359,7 +359,7 @@ class ClientRetryPlugin {
         } finally {
           await current.return?.();
         }
-      }();
+      })();
     });
   }
 }

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

@@ -1,6 +1,6 @@
 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.BngOL3Ai.mjs';
+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';
 
 class CompositeStandardLinkPlugin {
   plugins;
@@ -362,6 +362,9 @@ class StandardRPCSerializer {
     return this.#deserialize(data);
   }
   #deserialize(data) {
+    if (data === void 0) {
+      return void 0;
+    }
     if (!(data instanceof FormData)) {
       return this.jsonSerializer.deserialize(data.json, data.meta ?? []);
     }

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

@@ -142,19 +142,22 @@ 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) {
-        let mappedError = await maps.error(error);
-        if (mappedError !== error) {
-          const meta = getEventMeta(error);
-          if (meta && isTypescriptObject(mappedError)) {
-            mappedError = withEventMeta(mappedError, meta);
-          }
-        }
-        throw mappedError;
+        throw await mapError(error);
       }
     })();
     let mappedValue = await maps.value(value, done);
@@ -166,7 +169,11 @@ function mapEventIterator(iterator, maps) {
     }
     return { done, value: mappedValue };
   }, async () => {
-    await iterator.return?.();
+    try {
+      await iterator.return?.();
+    } catch (error) {
+      throw await mapError(error);
+    }
   });
 }
 

package/package.json

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