@uniflowed/router 0.0.0-alpha.31 → 0.0.0-alpha.32

package/internal/payload-rows.js

@@ -113,7 +113,7 @@ export function createPayloadReader(
 ): PayloadReader {
   const slots: Map<number, Slot> = new Map();
   let disconnect: (() => void) | null = null;
-  let watching = false;
+  let reading = false;
 
   function slotFor(id: number): Slot {
     const existing = slots.get(id);
@@ -192,7 +192,7 @@ export function createPayloadReader(
   }
 
   function stop(): void {
-    watching = false;
+    reading = false;
     const off = disconnect;
     disconnect = null;
     if (off != null) {
@@ -200,28 +200,39 @@ export function createPayloadReader(
     }
   }
 
+  function observeRest(): void {
+    if (!reading || disconnect != null || finished() || observe == null) {
+      return;
+    }
+    disconnect = observe(sweep);
+    if (disconnect == null) {
+      reading = false;
+    }
+  }
+
   return {
     resolve(id: number): Promise<mixed> {
       const slot = slotFor(id);
       // A reference discovered after the watch started — a client navigation
       // decoding a payload of its own — still gets whatever is already in the
       // document, so the order the two calls happen in does not matter.
-      if (watching) {
+      if (reading) {
         sweep();
+        observeRest();
       }
       return slot.promise;
     },
     watch(): void {
-      if (watching || slots.size === 0) {
+      if (reading) {
         return;
       }
-      watching = true;
+      reading = true;
       sweep();
-      if (finished() || observe == null) {
-        watching = false;
+      if (slots.size > 0 && finished()) {
+        reading = false;
         return;
       }
-      disconnect = observe(sweep);
+      observeRest();
     },
     stop,
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniflowed/router",
-  "version": "0.0.0-alpha.31",
+  "version": "0.0.0-alpha.32",
   "description": "The file-system router for Flow React applications: matching, layouts, loaders, navigation, server rendering and hydration.",
   "type": "module",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "react-dom": ">=19"
   },
   "dependencies": {
-    "@uniflowed/hooks": "0.0.0-alpha.31",
-    "@uniflowed/server": "0.0.0-alpha.31"
+    "@uniflowed/hooks": "0.0.0-alpha.32",
+    "@uniflowed/server": "0.0.0-alpha.32"
   }
 }