@orpc/swr 0.0.0 → 2.0.0-beta.21

package/dist/index.d.mts

@@ -53,13 +53,15 @@ type FetcherOptions<TClientContext extends ClientContext> = object extends TClie
 };
 type SubscriberOptions<TClientContext extends ClientContext> = FetcherOptions<TClientContext> & {
     /**
-     * Determines how data is handled when the subscription refetches.
-     * - `reset`: Replace existing data with new data
-     * - `append`: Add new data to existing data
+     * Determines how data is handled when the subscription is subscribed again
+     *
+     * - `'reset'`: Clears existing data before streaming new data.
+     * - `'append'`: Adds new streamed chunks to the existing data.
+     * - `'replace'`: Buffers streamed data and replaces existing data after the stream completes.
      *
      * @default 'reset'
      */
-    refetchMode?: 'reset' | 'append';
+    refetchMode?: 'append' | 'reset' | 'replace';
     /**
      * Maximum number of chunks to store.
      * When exceeded, the oldest chunks will be removed.

package/dist/index.d.ts

@@ -53,13 +53,15 @@ type FetcherOptions<TClientContext extends ClientContext> = object extends TClie
 };
 type SubscriberOptions<TClientContext extends ClientContext> = FetcherOptions<TClientContext> & {
     /**
-     * Determines how data is handled when the subscription refetches.
-     * - `reset`: Replace existing data with new data
-     * - `append`: Add new data to existing data
+     * Determines how data is handled when the subscription is subscribed again
+     *
+     * - `'reset'`: Clears existing data before streaming new data.
+     * - `'append'`: Adds new streamed chunks to the existing data.
+     * - `'replace'`: Buffers streamed data and replaces existing data after the stream completes.
      *
      * @default 'reset'
      */
-    refetchMode?: 'reset' | 'append';
+    refetchMode?: 'append' | 'reset' | 'replace';
     /**
      * Maximum number of chunks to store.
      * When exceeded, the oldest chunks will be removed.

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { isPlainObject, resolveMaybeOptionalOptions, isAsyncIteratorObject, toArray, bindMethods, getOrBind, get, isTypescriptObject } from '@orpc/shared';
+import { isPlainObject, resolveMaybeOptionalOptions, isAsyncIteratorObject, toArray, bindMethods, getOrBind, isTypescriptObject } from '@orpc/shared';
 import { RECURSIVE_CLIENT_UNWRAP_KEYS } from '@orpc/client';
 
 function generateOperationKey(path, options = {}) {
@@ -101,17 +101,35 @@ class ProcedureUtils extends SharedUtils {
           if (!isAsyncIteratorObject(iterator)) {
             throw new TypeError(".subscriber requires an AsyncIteratorObject output");
           }
+          let hasPreviousData = false;
           if (refetchMode === "reset") {
             next(void 0, void 0);
+          } else if (refetchMode === "replace") {
+            next(void 0, (old) => {
+              hasPreviousData = old !== void 0;
+              return old;
+            });
           }
+          const shouldUpdateDataDuringStream = refetchMode !== "replace" || !hasPreviousData;
+          let buffer = [];
           for await (const event of iterator) {
-            next(void 0, (old) => {
-              const newData = Array.isArray(old) ? [...old, event] : [event];
-              if (typeof maxChunks === "number" && newData.length > maxChunks) {
-                return newData.slice(newData.length - maxChunks);
+            if (shouldUpdateDataDuringStream) {
+              next(void 0, (old) => {
+                const newData = Array.isArray(old) ? [...old, event] : [event];
+                if (typeof maxChunks === "number" && newData.length > maxChunks) {
+                  return newData.slice(newData.length - maxChunks);
+                }
+                return newData;
+              });
+            } else {
+              buffer = [...buffer, event];
+              if (typeof maxChunks === "number" && buffer.length > maxChunks) {
+                buffer = buffer.slice(buffer.length - maxChunks);
               }
-              return newData;
-            });
+            }
+          }
+          if (!shouldUpdateDataDuringStream) {
+            next(void 0, buffer);
           }
         } catch (error) {
           if (!controller.signal.aborted) {
@@ -182,7 +200,7 @@ function createRouterUtils(client, options = {}) {
   const recursive = new Proxy(utils, {
     get(target, prop) {
       const value = getOrBind(target, prop);
-      const nextClient = get(client, [prop]);
+      const nextClient = client[prop];
       if (typeof prop !== "string" || RECURSIVE_CLIENT_UNWRAP_KEYS.has(prop) || !isTypescriptObject(nextClient)) {
         return value;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/swr",
   "type": "module",
-  "version": "0.0.0",
+  "version": "2.0.0-beta.21",
   "license": "MIT",
   "homepage": "https://orpc.dev",
   "repository": {
@@ -30,8 +30,8 @@
     "swr": ">=2.4.2"
   },
   "dependencies": {
-    "@orpc/client": "*",
-    "@orpc/shared": "*"
+    "@orpc/client": "2.0.0-beta.21",
+    "@orpc/shared": "2.0.0-beta.21"
   },
   "devDependencies": {
     "swr": "^2.4.2",