octane 0.1.45 → 0.1.47

package/README.md

@@ -25,6 +25,11 @@ Vite builds can fold proven immutable CSS-module class strings into templates.
 See the [CSS-module constants guide](https://github.com/octanejs/octane/blob/main/docs/compiler-css-module-constants.md)
 for the provider contract and stylesheet-loading guarantees.
 
+Custom native integrations can opt into the experimental
+[Valdi writer compiler](https://github.com/octanejs/octane/blob/main/docs/valdi-compiler.md).
+It requires an application-provided adapter; Octane does not bundle a Valdi
+runtime or native build integration.
+
 Direct Node or Bun server scripts can preload `octane/compiler/register` to
 compile imported Octane components without going through Vite. See the
 [SSR guide](https://github.com/octanejs/octane/blob/main/docs/ssr.md#run-an-ssg-script-directly).

package/dist/behavior-root.js

@@ -131,9 +131,15 @@ function adoptionContext(adoption, event) {
   };
   return context;
 }
+function finishPendingAdoption(adoption) {
+  if (!adoption.pending) return;
+  adoption.pending = false;
+  adoption.entry.pendingAdoptionCount--;
+}
 function disposeAdoption(adoption) {
   if (adoption.disposed) return;
   adoption.disposed = true;
+  finishPendingAdoption(adoption);
   adoption.entry.adoptions.delete(adoption.element);
   adoption.controller.abort();
   for (const unlink of adoption.unlinks) unlink();
@@ -144,29 +150,47 @@ function disposeAdoption(adoption) {
 }
 function flushQueuedEvents(record) {
   if (record.status !== "active") return;
-  while (record.queuedEvents.length !== 0) {
-    const queued = record.queuedEvents[0];
-    if (!contains(record.root, queued.element)) {
-      record.queuedEvents.shift();
-      continue;
-    }
-    const range = nearestRange(record.root, queued.element);
-    if (range !== queued.range || !rangeMatches(record, range)) {
-      record.queuedEvents.shift();
-      continue;
+  const queue = record.queuedEvents;
+  record.queuedEventFlushDepth++;
+  try {
+    while (record.queuedEventHead < queue.length) {
+      const index = record.queuedEventHead;
+      const queued = queue[index];
+      if (!contains(record.root, queued.element)) {
+        record.queuedEventHead = index + 1;
+        continue;
+      }
+      const range = nearestRange(record.root, queued.element);
+      if (range !== queued.range || !rangeMatches(record, range)) {
+        record.queuedEventHead = index + 1;
+        continue;
+      }
+      if (range?.status === "pending") return;
+      let adoption = record.adoptions.get(queued.element);
+      if (adoption === void 0) {
+        adoption = adoptElement(record, queued.element, range, queued.event);
+      }
+      if (adoption === void 0 || adoption.pending) return;
+      if (record.queuedEventHead !== index || queue[index] !== queued) continue;
+      record.queuedEventHead = index + 1;
+      record.entry.handleEvent?.(
+        queued.event,
+        queued.element,
+        adoptionContext(adoption, queued.event)
+      );
     }
-    if (range?.status === "pending") return;
-    let adoption = record.adoptions.get(queued.element);
-    if (adoption === void 0) {
-      adoption = adoptElement(record, queued.element, range, queued.event);
+  } finally {
+    record.queuedEventFlushDepth--;
+    if (record.queuedEventFlushDepth === 0 && record.queuedEventHead !== 0) {
+      const consumed = record.queuedEventHead;
+      if (consumed >= queue.length) {
+        queue.length = 0;
+        record.queuedEventHead = 0;
+      } else if (consumed >= queue.length - consumed) {
+        queue.splice(0, consumed);
+        record.queuedEventHead = 0;
+      }
     }
-    if (adoption === void 0 || adoption.pending) return;
-    record.queuedEvents.shift();
-    record.entry.handleEvent?.(
-      queued.event,
-      queued.element,
-      adoptionContext(adoption, queued.event)
-    );
   }
 }
 function completeBehavior(record) {
@@ -175,9 +199,7 @@ function completeBehavior(record) {
     if (range.status === "pending") return;
     record.waitingRanges.delete(range);
   }
-  for (const adoption of record.adoptions.values()) {
-    if (adoption.pending) return;
-  }
+  if (record.pendingAdoptionCount !== 0) return;
   flushQueuedEvents(record);
   if (record.queuedEvents.length !== 0) return;
   record.readiness.resolve();
@@ -227,9 +249,10 @@ function adoptElement(record, element, range, event) {
   }
   if (typeof result === "object" && result !== null && typeof result.then === "function") {
     adoption.pending = true;
+    record.pendingAdoptionCount++;
     const settled = Promise.resolve(result).then(
       (cleanup) => {
-        adoption.pending = false;
+        finishPendingAdoption(adoption);
         if (typeof cleanup === "function") {
           if (adoption.disposed || adoption.controller.signal.aborted) cleanup();
           else adoption.cleanup = cleanup;
@@ -240,7 +263,7 @@ function adoptElement(record, element, range, event) {
         }
       },
       (error) => {
-        adoption.pending = false;
+        finishPendingAdoption(adoption);
         if (adoption.disposed || record.controller.signal.aborted) return;
         disposeAdoption(adoption);
         failBehavior(record, error);
@@ -375,6 +398,7 @@ function disposeBehavior(record) {
     record.root.behaviorsById.delete(record.entry.id);
   }
   record.queuedEvents.length = 0;
+  record.queuedEventHead = 0;
   record.waitingRanges.clear();
   let firstError;
   for (const adoption of [...record.adoptions.values()]) {
@@ -428,8 +452,11 @@ function registerBehavior(root, entry) {
     readiness,
     status: "pending",
     adoptions: /* @__PURE__ */ new Map(),
+    pendingAdoptionCount: 0,
     waitingRanges: /* @__PURE__ */ new Set(),
     queuedEvents: [],
+    queuedEventHead: 0,
+    queuedEventFlushDepth: 0,
     unlinks: [linkSignal(root.controller.signal, controller)],
     initialScanComplete: false
   };

package/dist/cjs/behavior-root.cjs

@@ -154,9 +154,15 @@ function adoptionContext(adoption, event) {
   };
   return context;
 }
+function finishPendingAdoption(adoption) {
+  if (!adoption.pending) return;
+  adoption.pending = false;
+  adoption.entry.pendingAdoptionCount--;
+}
 function disposeAdoption(adoption) {
   if (adoption.disposed) return;
   adoption.disposed = true;
+  finishPendingAdoption(adoption);
   adoption.entry.adoptions.delete(adoption.element);
   adoption.controller.abort();
   for (const unlink of adoption.unlinks) unlink();
@@ -167,29 +173,47 @@ function disposeAdoption(adoption) {
 }
 function flushQueuedEvents(record) {
   if (record.status !== "active") return;
-  while (record.queuedEvents.length !== 0) {
-    const queued = record.queuedEvents[0];
-    if (!contains(record.root, queued.element)) {
-      record.queuedEvents.shift();
-      continue;
-    }
-    const range = nearestRange(record.root, queued.element);
-    if (range !== queued.range || !rangeMatches(record, range)) {
-      record.queuedEvents.shift();
-      continue;
+  const queue = record.queuedEvents;
+  record.queuedEventFlushDepth++;
+  try {
+    while (record.queuedEventHead < queue.length) {
+      const index = record.queuedEventHead;
+      const queued = queue[index];
+      if (!contains(record.root, queued.element)) {
+        record.queuedEventHead = index + 1;
+        continue;
+      }
+      const range = nearestRange(record.root, queued.element);
+      if (range !== queued.range || !rangeMatches(record, range)) {
+        record.queuedEventHead = index + 1;
+        continue;
+      }
+      if (range?.status === "pending") return;
+      let adoption = record.adoptions.get(queued.element);
+      if (adoption === void 0) {
+        adoption = adoptElement(record, queued.element, range, queued.event);
+      }
+      if (adoption === void 0 || adoption.pending) return;
+      if (record.queuedEventHead !== index || queue[index] !== queued) continue;
+      record.queuedEventHead = index + 1;
+      record.entry.handleEvent?.(
+        queued.event,
+        queued.element,
+        adoptionContext(adoption, queued.event)
+      );
     }
-    if (range?.status === "pending") return;
-    let adoption = record.adoptions.get(queued.element);
-    if (adoption === void 0) {
-      adoption = adoptElement(record, queued.element, range, queued.event);
+  } finally {
+    record.queuedEventFlushDepth--;
+    if (record.queuedEventFlushDepth === 0 && record.queuedEventHead !== 0) {
+      const consumed = record.queuedEventHead;
+      if (consumed >= queue.length) {
+        queue.length = 0;
+        record.queuedEventHead = 0;
+      } else if (consumed >= queue.length - consumed) {
+        queue.splice(0, consumed);
+        record.queuedEventHead = 0;
+      }
     }
-    if (adoption === void 0 || adoption.pending) return;
-    record.queuedEvents.shift();
-    record.entry.handleEvent?.(
-      queued.event,
-      queued.element,
-      adoptionContext(adoption, queued.event)
-    );
   }
 }
 function completeBehavior(record) {
@@ -198,9 +222,7 @@ function completeBehavior(record) {
     if (range.status === "pending") return;
     record.waitingRanges.delete(range);
   }
-  for (const adoption of record.adoptions.values()) {
-    if (adoption.pending) return;
-  }
+  if (record.pendingAdoptionCount !== 0) return;
   flushQueuedEvents(record);
   if (record.queuedEvents.length !== 0) return;
   record.readiness.resolve();
@@ -250,9 +272,10 @@ function adoptElement(record, element, range, event) {
   }
   if (typeof result === "object" && result !== null && typeof result.then === "function") {
     adoption.pending = true;
+    record.pendingAdoptionCount++;
     const settled = Promise.resolve(result).then(
       (cleanup) => {
-        adoption.pending = false;
+        finishPendingAdoption(adoption);
         if (typeof cleanup === "function") {
           if (adoption.disposed || adoption.controller.signal.aborted) cleanup();
           else adoption.cleanup = cleanup;
@@ -263,7 +286,7 @@ function adoptElement(record, element, range, event) {
         }
       },
       (error) => {
-        adoption.pending = false;
+        finishPendingAdoption(adoption);
         if (adoption.disposed || record.controller.signal.aborted) return;
         disposeAdoption(adoption);
         failBehavior(record, error);
@@ -398,6 +421,7 @@ function disposeBehavior(record) {
     record.root.behaviorsById.delete(record.entry.id);
   }
   record.queuedEvents.length = 0;
+  record.queuedEventHead = 0;
   record.waitingRanges.clear();
   let firstError;
   for (const adoption of [...record.adoptions.values()]) {
@@ -451,8 +475,11 @@ function registerBehavior(root, entry) {
     readiness,
     status: "pending",
     adoptions: /* @__PURE__ */ new Map(),
+    pendingAdoptionCount: 0,
     waitingRanges: /* @__PURE__ */ new Set(),
     queuedEvents: [],
+    queuedEventHead: 0,
+    queuedEventFlushDepth: 0,
     unlinks: [linkSignal(root.controller.signal, controller)],
     initialScanComplete: false
   };

package/dist/cjs/runtime.cjs

@@ -8727,21 +8727,25 @@ function setHostPropSources(el, sources, prev, scope, hasNestedChildren = false)
     }
   }
   const values = /* @__PURE__ */ new Map();
+  let needsWinningOrderSort = false;
   for (const writer of props.values()) {
     if (writer.rawName === "key") continue;
     const [identity, name] = normalizedHostProp(el, writer.rawName);
     const previous = values.get(identity);
-    if (previous === void 0 || previous[3] < writer.lastOrder) {
-      values.set(identity, [
-        process.env.NODE_ENV !== "production" && (writer.rawName === "tabIndex" || writer.rawName === "htmlFor") ? writer.rawName : name,
-        writer.value,
-        writer.firstOrder,
-        writer.lastOrder
-      ]);
+    if (previous !== void 0) {
+      if (previous[3] >= writer.lastOrder) continue;
+      needsWinningOrderSort = true;
     }
+    values.set(identity, [
+      process.env.NODE_ENV !== "production" && (writer.rawName === "tabIndex" || writer.rawName === "htmlFor") ? writer.rawName : name,
+      writer.value,
+      writer.firstOrder,
+      writer.lastOrder
+    ]);
   }
   const resolved = /* @__PURE__ */ Object.create(null);
-  const ordered = [...values.values()].sort((a, b) => a[2] - b[2]);
+  const ordered = [...values.values()];
+  if (needsWinningOrderSort) ordered.sort((a, b) => a[2] - b[2]);
   for (const [name, value] of ordered) resolved[name] = value;
   const formHost = el.localName === "input" || el.localName === "textarea" || el.localName === "select";
   setSpread(el, resolved, prev, scope, true, formHost);
@@ -9593,6 +9597,9 @@ let CHECKED_RESTORE = null;
 let SELECT_SYNCS = [];
 let SELECT_DEFAULT_SYNCS = [];
 let DEV_FORM_CHECKS = process.env.NODE_ENV === "production" ? null : [];
+const DEV_FORM_CHECK_MARK = /* @__PURE__ */ Symbol("octane.devFormCheck");
+const DEV_FORM_CHECK_LINEAR_LIMIT = 8;
+let DEV_FORM_CHECK_GENERATION = 1;
 let AUTOFOCUS_QUEUE = [];
 function queueControlledCommit(queue, item) {
   queue.push(item);
@@ -9602,6 +9609,18 @@ function queueControlledCommit(queue, item) {
       if (index !== -1) queue.splice(index, 1);
     });
 }
+function queueDevFormCheck(queue, el) {
+  queue.push(el);
+  if (ROOT_RENDER_TRANSACTION !== null) {
+    const host = el;
+    const generation = DEV_FORM_CHECK_GENERATION;
+    journalUndo(() => {
+      const index = queue.lastIndexOf(el);
+      if (index !== -1) queue.splice(index, 1);
+      if (host[DEV_FORM_CHECK_MARK] === generation) delete host[DEV_FORM_CHECK_MARK];
+    });
+  }
+}
 function hasControlledSyncs() {
   return SELECT_SYNCS.length > 0 || SELECT_DEFAULT_SYNCS.length > 0 || DEV_FORM_CHECKS !== null && DEV_FORM_CHECKS.length > 0 || AUTOFOCUS_QUEUE.length > 0;
 }
@@ -9755,7 +9774,19 @@ function queueDevFormDiagnostic(el, scope, force = false) {
   const q = DEV_FORM_CHECKS;
   if (q === null || !force && !hasDevFormDiagnosticContext(el, scope)) return;
   if (!force && !hasPotentialFormDiagnostic(el)) return;
-  if (q.indexOf(el) === -1) queueControlledCommit(q, el);
+  if (q.length < DEV_FORM_CHECK_LINEAR_LIMIT) {
+    if (q.indexOf(el) !== -1) return;
+    queueDevFormCheck(q, el);
+    if (q.length < DEV_FORM_CHECK_LINEAR_LIMIT) return;
+    for (let i = 0; i < q.length; i++) {
+      q[i][DEV_FORM_CHECK_MARK] = DEV_FORM_CHECK_GENERATION;
+    }
+    return;
+  }
+  const host = el;
+  if (host[DEV_FORM_CHECK_MARK] === DEV_FORM_CHECK_GENERATION) return;
+  queueDevFormCheck(q, el);
+  host[DEV_FORM_CHECK_MARK] = DEV_FORM_CHECK_GENERATION;
 }
 function queueFormAuthoringDiagnostic(el, kind, selected) {
   if (process.env.NODE_ENV === "production") return;
@@ -10170,6 +10201,7 @@ function drainDevFormDiagnostics() {
   const q = DEV_FORM_CHECKS;
   if (q === null || q.length === 0) return;
   DEV_FORM_CHECKS = [];
+  DEV_FORM_CHECK_GENERATION++;
   for (let i = 0; i < q.length; i++) {
     const el = q[i];
     const authoring = getDevFormDiagnosticState(el);
@@ -12041,6 +12073,14 @@ function reconcileDeoptNode(prev, value, ownerBlock, ns) {
   return null;
 }
 function reconcileDeoptChildren(el, children, ownerBlock) {
+  const type = typeof children;
+  if (type === "string" && children !== "" || type === "number" || type === "bigint") {
+    const first = getFirstChild(el);
+    if (first !== null && first.nodeType === 3 && getNextSibling(first) === null && first.$$deoptKey === 0 && first.$$portalEnd == null) {
+      updateTextValue(first, String(children));
+      return;
+    }
+  }
   const childNs = deoptChildNamespace(el);
   const next = [];
   const nextKeys = [];
@@ -12165,7 +12205,7 @@ function deoptItemBody(item, scope) {
   const block = scope.block;
   const hydration = activeHydration();
   const existingChild = scope.slots[0];
-  const needsBlocks = descNeedsBlocks(item) || isHostDescriptor(item) && existingChild?.__kind === "childSlot" && existingChild.currentComp === hostElementBody;
+  const needsBlocks = isHostDescriptor(item) && existingChild?.__kind === "childSlot" && existingChild.currentComp === hostElementBody || descNeedsBlocks(item);
   const sm = block.startMarker;
   if (sm !== null && sm === block.endMarker && sm.nodeType !== 8 && sm.parentNode !== null && (needsBlocks || !isHostDescriptor(item))) {
     const p = sm.parentNode;
@@ -12981,7 +13021,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
   if (iterable !== null) value = iterable;
   const preparedList = compiledMapBody !== void 0 ? { items: value, keys: null } : prepareDeoptList(value, false, includeKeyedSingle);
   let state = parentScope.slots[slotKey];
-  const pureHost = preparedList === null && isHostDescriptor(value) && !descNeedsBlocks(value) && state?.currentComp !== hostElementBody;
+  const pureHost = preparedList === null && isHostDescriptor(value) && state?.currentComp !== hostElementBody && !descNeedsBlocks(value);
   let rootShapeChanged = false;
   if (state !== void 0 && ROOT_RENDER_TRANSACTION !== null) {
     const component = pureHost || preparedList !== null ? null : isHostDescriptor(value) ? hostElementBody : valueComponent;
@@ -17461,6 +17501,10 @@ function updateSurvivor(block, newItem, newIdx, itemBody, pure, lite, indexIndep
     }
   }
 }
+function consumeAdoptQueuePrefix(adopt, count) {
+  if (count < adopt.length) adopt.copyWithin(0, count);
+  adopt.length -= count;
+}
 function mountItemsLinear(parentBlock, state, items, getKey, itemBody, singleRoot, ssrMarkerless) {
   const newLen = items.length;
   if (newLen === 0) return;
@@ -17468,6 +17512,7 @@ function mountItemsLinear(parentBlock, state, items, getKey, itemBody, singleRoo
   const oldItems = state.items;
   const parentNode = state.end.parentNode;
   const adopt = state.adopt;
+  let adoptIndex = 0;
   let prev = null;
   const mounted = [];
   try {
@@ -17476,9 +17521,14 @@ function mountItemsLinear(parentBlock, state, items, getKey, itemBody, singleRoo
       const key = getKey(item, i);
       let adoptNode = null;
       let anchor = state.end;
-      if (adopt !== null && adopt.length !== 0) {
-        if (adopt[0].key === key) adoptNode = adopt.shift().node;
-        else anchor = adopt[0].node;
+      if (adopt !== null && adoptIndex < adopt.length) {
+        const candidate = adopt[adoptIndex];
+        if (candidate.key === key) {
+          adoptNode = candidate.node;
+          adoptIndex++;
+        } else {
+          anchor = candidate.node;
+        }
       }
       const block = mountItem(
         parentBlock,
@@ -17514,6 +17564,7 @@ function mountItemsLinear(parentBlock, state, items, getKey, itemBody, singleRoo
     state.size = 0;
     throw error;
   }
+  if (adoptIndex !== 0) consumeAdoptQueuePrefix(adopt, adoptIndex);
 }
 function reconcileKeyed(parentBlock, state, items, getKey, itemBody, pure, singleRoot, lite = false, indexIndependent = false, ssrMarkerless = false) {
   const oldItems = state.items;

package/dist/cjs/runtime.server.cjs

@@ -1421,6 +1421,7 @@ function ssrAttrs(sources, tag, namespace = "html", skipFormControls = false) {
     }
   }
   const resolved = /* @__PURE__ */ new Map();
+  let needsWinningOrderSort = false;
   for (const writer of props.values()) {
     const { rawName, value, firstOrder, lastOrder } = writer;
     if (rawName === "key" || rawName === "ref" || rawName === "children" || rawName === "dangerouslySetInnerHTML" || rawName === "suppressHydrationWarning" || rawName === "suppressContentEditableWarning" || rawName === "suppressNativeChangeWarning" || rawName === "__octaneNativeChangeDiagnostic")
@@ -1434,17 +1435,20 @@ function ssrAttrs(sources, tag, namespace = "html", skipFormControls = false) {
     if (!import_constants.VALID_ATTR_NAME.test(name)) continue;
     const identity = namespace === "html" ? name.toLowerCase() : name;
     const previous = resolved.get(identity);
-    if (previous === void 0 || previous[3] < lastOrder) {
-      resolved.set(identity, [
-        process.env.NODE_ENV !== "production" && (rawName === "tabIndex" || rawName === "htmlFor") ? rawName : name,
-        value,
-        firstOrder,
-        lastOrder
-      ]);
+    if (previous !== void 0) {
+      if (previous[3] >= lastOrder) continue;
+      needsWinningOrderSort = true;
     }
+    resolved.set(identity, [
+      process.env.NODE_ENV !== "production" && (rawName === "tabIndex" || rawName === "htmlFor") ? rawName : name,
+      value,
+      firstOrder,
+      lastOrder
+    ]);
   }
   let out = "";
-  const ordered = [...resolved.values()].sort((a, b) => a[2] - b[2]);
+  const ordered = [...resolved.values()];
+  if (needsWinningOrderSort) ordered.sort((a, b) => a[2] - b[2]);
   if (process.env.NODE_ENV !== "production") {
     devValidateSsrAriaProps(
       ordered.map(([name]) => name),
@@ -1932,21 +1936,9 @@ function captureComponentReplayState(scope, frame) {
     streamNextId: stream?.nextId ?? 0,
     streamActiveTryKeys: stream?.activeTryKeys.slice() ?? [],
     streamActiveOwnerKeys: stream?.activeOwnerKeys.slice() ?? [],
-    streamPassBoundaryKeys: stream?.activePassBoundaryKeys === null || stream?.activePassBoundaryKeys === void 0 ? null : new Set(stream.activePassBoundaryKeys),
+    streamPassBoundaryCount: stream?.activePassBoundaryKeys?.size ?? 0,
     asyncScope: ASYNC_SCOPE,
-    streamBoundaries: stream === null ? null : Array.from(stream.boundaries, ([key, entry]) => ({
-      key,
-      entry,
-      id: entry.id,
-      order: entry.order,
-      state: entry.state,
-      html: entry.html,
-      seeds: entry.seeds.slice(),
-      pendingIdOffset: entry.pendingIdOffset,
-      ancestors: entry.ancestors.slice(),
-      owners: entry.owners.slice(),
-      namespace: entry.namespace
-    })),
+    streamReplayCheckpoint: stream?.replay?.length ?? 0,
     frameDeferred: frame?.deferred ?? false,
     frameNextChild: frame?.nextChild ?? 0,
     frameScopedChildren: frame?.scopedChildren === null || frame?.scopedChildren === void 0 ? null : new Map(frame.scopedChildren),
@@ -1996,30 +1988,19 @@ function rewindComponentReplayState(snapshot, scope, frame) {
     VT_SSR_STACK.push(entry.candidate);
   }
   const stream = snapshot.stream;
-  if (stream !== null && snapshot.streamBoundaries !== null) {
+  if (stream !== null) {
     stream.nextId = snapshot.streamNextId;
-    if (stream.activePassBoundaryKeys !== null && snapshot.streamPassBoundaryKeys !== null) {
-      stream.activePassBoundaryKeys.clear();
-      for (const key of snapshot.streamPassBoundaryKeys) stream.activePassBoundaryKeys.add(key);
+    if (stream.activePassBoundaryKeys !== null) {
+      let index = 0;
+      for (const key of stream.activePassBoundaryKeys) {
+        if (index++ >= snapshot.streamPassBoundaryCount) stream.activePassBoundaryKeys.delete(key);
+      }
     }
     stream.activeTryKeys.length = 0;
     stream.activeTryKeys.push(...snapshot.streamActiveTryKeys);
     stream.activeOwnerKeys.length = 0;
     stream.activeOwnerKeys.push(...snapshot.streamActiveOwnerKeys);
-    stream.boundaries.clear();
-    for (const saved of snapshot.streamBoundaries) {
-      const entry = saved.entry;
-      entry.id = saved.id;
-      entry.order = saved.order;
-      entry.state = saved.state;
-      entry.html = saved.html;
-      entry.seeds = saved.seeds.slice();
-      entry.pendingIdOffset = saved.pendingIdOffset;
-      entry.ancestors = saved.ancestors.slice();
-      entry.owners = saved.owners.slice();
-      entry.namespace = saved.namespace;
-      stream.boundaries.set(saved.key, entry);
-    }
+    rewindStreamBoundaryReplay(stream, snapshot.streamReplayCheckpoint);
   }
   scope.$$ctxValues = snapshot.context;
   if (frame !== null) {
@@ -3920,6 +3901,43 @@ function renderToStaticMarkup(entryComponent, props, options) {
   const html = spliceHead(pass.body, pass.head);
   return { html: pass.vtCandidates ? vtSsrStrip(html) : html, css: pass.css };
 }
+function recordStreamBoundaryMutation(stream, key) {
+  if (stream.replay === null) return;
+  const boundary = stream.boundaries.get(key);
+  stream.replay.push({
+    key,
+    boundary,
+    value: boundary === void 0 ? void 0 : { ...boundary }
+  });
+}
+function rewindStreamBoundaryReplay(stream, checkpoint) {
+  const replay = stream.replay;
+  if (replay === null) return;
+  let restoredDeletion = false;
+  while (replay.length > checkpoint) {
+    const saved = replay.pop();
+    if (saved.boundary === void 0) {
+      stream.boundaries.delete(saved.key);
+    } else {
+      const boundary = saved.boundary;
+      const value = saved.value;
+      Object.assign(boundary, value);
+      boundary.error = value.error;
+      boundary.errorReported = value.errorReported;
+      boundary.errorFlushed = value.errorFlushed;
+      if (!stream.boundaries.has(saved.key)) restoredDeletion = true;
+      stream.boundaries.set(saved.key, boundary);
+    }
+  }
+  if (restoredDeletion) {
+    const ordered = [...stream.boundaries].sort((a, b) => a[1].order - b[1].order);
+    stream.boundaries.clear();
+    for (const [key, boundary] of ordered) stream.boundaries.set(key, boundary);
+  }
+}
+function recordStreamBoundaryOwners(stream, owners) {
+  for (const owner of owners) stream.boundaryOwnerKeys.add(owner);
+}
 let STREAM_REALM_SALT = null;
 function streamRealmSalt() {
   if (STREAM_REALM_SALT !== null) return STREAM_REALM_SALT;
@@ -3933,6 +3951,7 @@ function createStreamToken() {
 }
 let STREAM = null;
 function pruneUnrepresentedStreamDescendants(stream, ownerKey, ownerHtml) {
+  if (!stream.boundaryOwnerKeys.has(ownerKey)) return;
   let removed = true;
   while (removed) {
     removed = false;
@@ -3948,6 +3967,7 @@ function pruneUnrepresentedStreamDescendants(stream, ownerKey, ownerHtml) {
       }
       if (nearestOwner !== ownerKey) continue;
       if (ownerHtml.includes(import_constants.STREAM_BOUNDARY_ATTR + '="' + child.id + '"')) continue;
+      recordStreamBoundaryMutation(stream, childKey);
       stream.boundaries.delete(childKey);
       removed = true;
     }
@@ -3987,7 +4007,11 @@ function ssrTry(scope, siteKey, tryFn, pendFn, catchFn, namespace = FRAME?.names
     ancestorKeys = stream.activeTryKeys.slice();
     ownerKeys = stream.activeOwnerKeys.slice();
     entry = stream.boundaries.get(key);
-    if (entry !== void 0) entry.namespace = namespace;
+    if (entry !== void 0) {
+      recordStreamBoundaryMutation(stream, key);
+      if (ownerKeys.length !== 0) recordStreamBoundaryOwners(stream, ownerKeys);
+      entry.namespace = namespace;
+    }
     if (entry !== void 0 && entry.state === "pending") {
       entry.ancestors = ancestorKeys;
       entry.owners = ownerKeys;
@@ -4183,7 +4207,9 @@ function ssrTry(scope, siteKey, tryFn, pendFn, catchFn, namespace = FRAME?.names
               ancestors: ancestorKeys,
               owners: ownerKeys
             };
+            recordStreamBoundaryMutation(stream, key);
             stream.boundaries.set(key, entry);
+            if (ownerKeys.length !== 0) recordStreamBoundaryOwners(stream, ownerKeys);
             enterBoundaryIds(pendingIdOffset);
           } else {
             ID_COUNTER = entry.pendingIdOffset;
@@ -4235,7 +4261,9 @@ function ssrTry(scope, siteKey, tryFn, pendFn, catchFn, namespace = FRAME?.names
             ancestors: ancestorKeys,
             owners: ownerKeys
           };
+          recordStreamBoundaryMutation(stream, key);
           stream.boundaries.set(key, entry);
+          if (ownerKeys.length !== 0) recordStreamBoundaryOwners(stream, ownerKeys);
           enterBoundaryIds(pendingIdOffset);
         } else if (entry.state === "pending") {
           entry.state = "errored";
@@ -4333,16 +4361,20 @@ async function runStream(component, props, options, sink) {
   const resolved = newResolvedMap();
   const stream = {
     boundaries: /* @__PURE__ */ new Map(),
+    boundaryOwnerKeys: /* @__PURE__ */ new Set(),
     nextId: 0,
     token: createStreamToken(),
     activePassBoundaryKeys: null,
     activeTryKeys: [],
-    activeOwnerKeys: []
+    activeOwnerKeys: [],
+    replay: null
   };
   const renderFullPass = () => {
     const boundaryKeys = /* @__PURE__ */ new Set();
     const previousBoundaryKeys = stream.activePassBoundaryKeys;
+    const previousReplay = stream.replay;
     stream.activePassBoundaryKeys = boundaryKeys;
+    stream.replay = [];
     try {
       return {
         pass: withStream(
@@ -4353,6 +4385,7 @@ async function runStream(component, props, options, sink) {
       };
     } finally {
       stream.activePassBoundaryKeys = previousBoundaryKeys;
+      stream.replay = previousReplay;
     }
   };
   const injection = options?.injection;

package/dist/cjs/version.cjs

@@ -21,7 +21,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-const version = "0.1.45";
+const version = "0.1.47";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version