octane 0.2.6 → 0.2.7

package/dist/runtime.js

@@ -888,7 +888,9 @@ function beginTransitionAttempt(block) {
   TRANSITION_JOURNAL ??= [];
   TRANSITION_JOURNAL_BAGS ??= /* @__PURE__ */ new Map();
   TRANSITION_JOURNAL_WINDOWS.push(TRANSITION_JOURNAL_CHECKPOINT);
+  TRANSITION_JOURNAL_BAG_WINDOWS.push(TRANSITION_JOURNAL_BAG_WINDOW);
   TRANSITION_JOURNAL_CHECKPOINT = TRANSITION_JOURNAL.length;
+  TRANSITION_JOURNAL_BAG_WINDOW = ++NEXT_TRANSITION_JOURNAL_BAG_WINDOW;
   TRANSITION_JOURNAL_DEPTH++;
   const capture = WIP_CAPTURE;
   const effects = capture?.effects ?? effectQueues;
@@ -964,6 +966,7 @@ function endTransitionAttempt(attempt) {
     if (!continuing) scheduleRender(attempt.origin);
   }
   TRANSITION_JOURNAL_CHECKPOINT = TRANSITION_JOURNAL_WINDOWS.pop();
+  TRANSITION_JOURNAL_BAG_WINDOW = TRANSITION_JOURNAL_BAG_WINDOWS.pop();
   if (--TRANSITION_JOURNAL_DEPTH === 0) {
     TRANSITION_JOURNAL = null;
     TRANSITION_JOURNAL_BAGS = null;
@@ -1059,7 +1062,7 @@ function keepsRootTransition(owner, includePromoted = false) {
 }
 function holdRootTransition(owner, transaction, attempt) {
   const previous = owner.transition;
-  if (attempt === null || !attempt.origin.mounted || attempt.origin.disposed || transaction.created?.has(attempt.origin) || attempt.heldSlots !== null && attempt.heldSlots.size !== 0) {
+  if (attempt === null || !attempt.origin.mounted || attempt.origin.disposed || isCreatedInRootRender(transaction, attempt.origin) || attempt.heldSlots !== null && attempt.heldSlots.size !== 0) {
     if (previous !== void 0 && !rootTransitionCellsIntact(previous))
       discardRootTransition(owner);
     return false;
@@ -1161,16 +1164,21 @@ const JOURNAL_TEXT = 0;
 const JOURNAL_ATTR = 1;
 const JOURNAL_BAG = 2;
 const JOURNAL_PROP = 3;
+const JOURNAL_CREATED = 4;
 const JOURNAL_RENDER = 5;
 const JOURNAL_UNDO = 6;
 let TRANSITION_JOURNAL = null;
 let TRANSITION_JOURNAL_BAGS = null;
 let TRANSITION_JOURNAL_CHECKPOINT = 0;
 const TRANSITION_JOURNAL_WINDOWS = [];
+let TRANSITION_JOURNAL_BAG_WINDOW = 0;
+let NEXT_TRANSITION_JOURNAL_BAG_WINDOW = 0;
+const TRANSITION_JOURNAL_BAG_WINDOWS = [];
 let TRANSITION_JOURNAL_DEPTH = 0;
 let ROOT_RENDER_TRANSACTION = null;
 let ROOT_RENDER_TRANSACTIONS = [];
 let ROOT_RENDER_ROLLBACK = false;
+let NEXT_ROOT_RENDER_CREATED_STAMP = 0;
 function getRootRenderRetryKey(scope, retryOnly = false) {
   const owner = scope.block.idState.renderOwner;
   if (owner === void 0 || owner.disposed || retryOnly && !owner.transaction?.rootRequest)
@@ -1191,6 +1199,8 @@ function beginRootRender(owner) {
       bags: /* @__PURE__ */ new Map(),
       capture,
       created: null,
+      createdStamp: ++NEXT_ROOT_RENDER_CREATED_STAMP,
+      bagWindow: ++NEXT_TRANSITION_JOURNAL_BAG_WINDOW,
       retainedCreated: null,
       retired: null,
       structures: null,
@@ -1208,6 +1218,7 @@ function beginRootRender(owner) {
     log: TRANSITION_JOURNAL,
     bags: TRANSITION_JOURNAL_BAGS,
     checkpoint: TRANSITION_JOURNAL_CHECKPOINT,
+    bagWindow: TRANSITION_JOURNAL_BAG_WINDOW,
     depth: TRANSITION_JOURNAL_DEPTH,
     parked: PARKED_ITEMS,
     capture: WIP_CAPTURE
@@ -1216,6 +1227,7 @@ function beginRootRender(owner) {
   TRANSITION_JOURNAL = transaction.log;
   TRANSITION_JOURNAL_BAGS = transaction.bags;
   TRANSITION_JOURNAL_CHECKPOINT = 0;
+  TRANSITION_JOURNAL_BAG_WINDOW = transaction.bagWindow;
   TRANSITION_JOURNAL_DEPTH = 1;
   PARKED_ITEMS = transaction.parked;
   WIP_CAPTURE = transaction.capture;
@@ -1228,6 +1240,7 @@ function endRootRender(frame) {
   TRANSITION_JOURNAL = frame.log;
   TRANSITION_JOURNAL_BAGS = frame.bags;
   TRANSITION_JOURNAL_CHECKPOINT = frame.checkpoint;
+  TRANSITION_JOURNAL_BAG_WINDOW = frame.bagWindow;
   TRANSITION_JOURNAL_DEPTH = frame.depth;
   PARKED_ITEMS = frame.parked;
   WIP_CAPTURE = frame.capture;
@@ -1235,9 +1248,9 @@ function endRootRender(frame) {
 function journalUndo(undo) {
   TRANSITION_JOURNAL.push(JOURNAL_UNDO, undo, null, null);
 }
-function journalRootProperty(target, key) {
+function journalRootProperty(target, key, oldValue) {
   if (ROOT_RENDER_TRANSACTION === null || ROOT_RENDER_ROLLBACK) return;
-  TRANSITION_JOURNAL.push(JOURNAL_PROP, target, key, target[key]);
+  TRANSITION_JOURNAL.push(JOURNAL_PROP, target, key, oldValue);
 }
 function journalRootSlot(state, parent, before, after) {
   const transaction = ROOT_RENDER_TRANSACTION;
@@ -1305,7 +1318,7 @@ function retireRootBlock(block) {
     });
   }
   if (block.pending) {
-    journalRootProperty(block, "pending");
+    journalRootProperty(block, "pending", block.pending);
     block.pending = false;
   }
 }
@@ -1342,7 +1355,7 @@ function deferRootRange(parent, first, last, cleanup, finalize) {
 }
 function deferRootUnmount(block, detachDom) {
   const transaction = ROOT_RENDER_TRANSACTION;
-  if (transaction === null || transaction.aborted || ROOT_RENDER_ROLLBACK || block.idState.renderOwner !== transaction.owner || !block.mounted || transaction.created?.has(block))
+  if (transaction === null || transaction.aborted || ROOT_RENDER_ROLLBACK || block.idState.renderOwner !== transaction.owner || !block.mounted || isCreatedInRootRender(transaction, block))
     return false;
   retireRootBlock(block);
   const start = block.startMarker;
@@ -1389,18 +1402,24 @@ function deferRootUnmount(block, detachDom) {
   if (detachDom && parent !== null) for (const node of nodes) parent.removeChild(node);
   return true;
 }
+function isCreatedInRootRender(transaction, block) {
+  return block.createdStamp === transaction.createdStamp;
+}
+function undoCreatedInRootRender(block, transaction) {
+  const refCheckpoint = refDetachQueue.length;
+  unmountBlock(
+    block,
+    (!transaction.hydrating || block.kind === "portal") && !transaction.retainedCreated?.has(block)
+  );
+  refDetachQueue.length = refCheckpoint;
+}
 function createdInRootRender(block) {
   const transaction = ROOT_RENDER_TRANSACTION;
-  if (transaction === null || ROOT_RENDER_ROLLBACK || transaction.created?.has(block)) return;
-  (transaction.created ??= /* @__PURE__ */ new Set()).add(block);
-  journalUndo(() => {
-    const checkpoint = refDetachQueue.length;
-    unmountBlock(
-      block,
-      (!transaction.hydrating || block.kind === "portal") && !transaction.retainedCreated?.has(block)
-    );
-    refDetachQueue.length = checkpoint;
-  });
+  if (transaction === null || ROOT_RENDER_ROLLBACK || isCreatedInRootRender(transaction, block))
+    return;
+  block.createdStamp = transaction.createdStamp;
+  (transaction.created ??= []).push(block);
+  TRANSITION_JOURNAL.push(JOURNAL_CREATED, block, transaction, null);
 }
 function preserveRootCreatedDom(block) {
   if (ROOT_RENDER_TRANSACTION !== null)
@@ -1418,6 +1437,8 @@ function rollbackRootRender(transaction) {
     else {
       for (let i = transaction.log.length - 4; i >= 0; i -= 4) {
         if (transaction.log[i] === JOURNAL_UNDO) transaction.log[i + 1]();
+        else if (transaction.log[i] === JOURNAL_CREATED)
+          undoCreatedInRootRender(transaction.log[i + 1], transaction.log[i + 2]);
       }
       transaction.log.length = 0;
     }
@@ -1494,7 +1515,7 @@ function suspendRootRender(block, wakeable, attempt) {
   if (TRANSITION_SWAP_DRIVER === null || !TRANSITION_SWAP_DRIVER.holdRoot(owner, transaction, attempt)) {
     if (WARM_EVER && transaction.created !== null) {
       for (const created of transaction.created) {
-        if (created.parentBlock === null || !transaction.created.has(created.parentBlock))
+        if (created.parentBlock === null || !isCreatedInRootRender(transaction, created.parentBlock))
           retainDiscardedWarmMemos(created);
       }
     }
@@ -1516,11 +1537,116 @@ function suspendRootRender(block, wakeable, attempt) {
   wakeable.then(ping, ping);
   return true;
 }
+const BINDING_BAG_ARITY = /* @__PURE__ */ Symbol();
+function cloneBag0(bag) {
+  return { ...bag };
+}
+function cloneBag1(bag) {
+  return { ...bag };
+}
+function cloneBag2(bag) {
+  return { ...bag };
+}
+function cloneBag3(bag) {
+  return { ...bag };
+}
+function cloneBag4(bag) {
+  return { ...bag };
+}
+function cloneBag5(bag) {
+  return { ...bag };
+}
+function cloneBag6(bag) {
+  return { ...bag };
+}
+function cloneBag7(bag) {
+  return { ...bag };
+}
+function cloneBag8(bag) {
+  return { ...bag };
+}
+function cloneBag9(bag) {
+  return { ...bag };
+}
+function cloneBag10(bag) {
+  return { ...bag };
+}
+function cloneBag11(bag) {
+  return { ...bag };
+}
+function cloneBag12(bag) {
+  return { ...bag };
+}
+function cloneBag13(bag) {
+  return { ...bag };
+}
+function cloneBag14(bag) {
+  return { ...bag };
+}
+function cloneBag15(bag) {
+  return { ...bag };
+}
+function cloneBag16(bag) {
+  return { ...bag };
+}
+function cloneBindingBag(bag, arity) {
+  switch (arity) {
+    case 0:
+      return cloneBag0(bag);
+    case 1:
+      return cloneBag1(bag);
+    case 2:
+      return cloneBag2(bag);
+    case 3:
+      return cloneBag3(bag);
+    case 4:
+      return cloneBag4(bag);
+    case 5:
+      return cloneBag5(bag);
+    case 6:
+      return cloneBag6(bag);
+    case 7:
+      return cloneBag7(bag);
+    case 8:
+      return cloneBag8(bag);
+    case 9:
+      return cloneBag9(bag);
+    case 10:
+      return cloneBag10(bag);
+    case 11:
+      return cloneBag11(bag);
+    case 12:
+      return cloneBag12(bag);
+    case 13:
+      return cloneBag13(bag);
+    case 14:
+      return cloneBag14(bag);
+    case 15:
+      return cloneBag15(bag);
+    case 16:
+      return cloneBag16(bag);
+    default:
+      return { ...bag };
+  }
+}
 function journalBag() {
   const scope = CURRENT_SCOPE;
   if (scope === null) return;
+  const transaction = ROOT_RENDER_TRANSACTION;
+  if (transaction !== null && !transaction.hydrating && transaction.retainedCreated === null && TRANSITION_JOURNAL_DEPTH === 1 && scope.block.createdStamp === transaction.createdStamp)
+    return;
   const bag = scope.slots[0];
-  if (bag === null || typeof bag !== "object" || bag.__kind !== void 0) return;
+  if (bag === null || typeof bag !== "object") return;
+  const arity = bag[BINDING_BAG_ARITY];
+  if (arity !== void 0) {
+    const window2 = TRANSITION_JOURNAL_BAG_WINDOW;
+    if (bag.__journalWindow === window2) return;
+    const snapshot = cloneBindingBag(bag, arity);
+    TRANSITION_JOURNAL.push(JOURNAL_BAG, bag, snapshot, null);
+    bag.__journalWindow = window2;
+    return;
+  }
+  if (bag.__kind !== void 0) return;
   journalObjectOnce(bag);
 }
 function journalObjectOnce(obj) {
@@ -1581,10 +1707,31 @@ function journalControlledOption(option, withDefault) {
     TRANSITION_JOURNAL.push(JOURNAL_PROP, option, "defaultSelected", option.defaultSelected);
 }
 let PARKED_ITEMS = null;
-function parkItemForHold(block) {
-  const nodes = [];
+function retainedForSlotNodes(state, retained) {
+  const parked = PARKED_ITEMS;
+  if (parked !== null) {
+    for (const item of parked) {
+      const previous = item.block;
+      if (previous.forSlot !== state && !(previous.exclusiveMarkers && previous.startMarker === state.start && previous.endMarker === state.end))
+        continue;
+      for (const node of item.nodes) (retained ??= /* @__PURE__ */ new Set()).add(node);
+    }
+  }
+  const retired = ROOT_RENDER_TRANSACTION.retired;
+  if (retired !== null) {
+    for (const row of retired) {
+      if (row.forSlot !== state) continue;
+      const start = row.startMarker;
+      if (start !== null && start === row.endMarker) (retained ??= /* @__PURE__ */ new Set()).add(start);
+    }
+  }
+  return retained;
+}
+function parkItemForHold(block, owningList) {
   const retainConnected = ROOT_RENDER_TRANSACTION !== null && !ROOT_RENDER_ROLLBACK;
   if (retainConnected) retireRootBlock(block);
+  const excluded = owningList !== void 0 && retainConnected ? retainedForSlotNodes(owningList, null) : null;
+  const nodes = [];
   const start = block.startMarker;
   const end = block.endMarker;
   if (start && end) {
@@ -1593,11 +1740,22 @@ function parkItemForHold(block) {
       const exclusive = block.exclusiveMarkers;
       let n = exclusive ? start.nextSibling : start;
       const stop = exclusive ? end : end.nextSibling;
-      while (n !== null && n !== stop) {
-        const next = getNextSibling(n);
-        if (!retainConnected) parent.removeChild(n);
-        nodes.push(n);
-        n = next;
+      if (excluded === null) {
+        while (n !== null && n !== stop) {
+          const next = getNextSibling(n);
+          if (!retainConnected) parent.removeChild(n);
+          nodes.push(n);
+          n = next;
+        }
+      } else {
+        while (n !== null && n !== stop) {
+          const next = getNextSibling(n);
+          if (!excluded.has(n)) {
+            if (!retainConnected) parent.removeChild(n);
+            nodes.push(n);
+          }
+          n = next;
+        }
       }
     }
   }
@@ -1622,14 +1780,19 @@ function journalForSlot(state) {
   }
   const chain = [];
   for (let b = state.head; b !== null; b = b.nextSibling) {
-    chain.push([b, b.nextSibling, b.prevSibling]);
+    chain.push(b);
+  }
+  let mapOrder = null;
+  let index = 0;
+  for (const block of state.items.values()) {
+    if (mapOrder === null && chain[index] !== block) mapOrder = chain.slice(0, index);
+    mapOrder?.push(block);
+    index++;
   }
+  if (mapOrder === null && index !== chain.length) mapOrder = chain.slice(0, index);
   const snapshot = {
-    head: state.head,
-    tail: state.tail,
-    size: state.size,
     empty: state.emptyBlock,
-    entries: [...state.items]
+    mapOrder
   };
   journalUndo(() => {
     restoreForSlot(state, snapshot, chain);
@@ -1655,31 +1818,36 @@ function journalForOwnedListClear(state) {
 }
 function restoreForSlot(state, snapshot, chain) {
   const preservedMap = chain === null ? snapshot.entries : null;
-  const kept = chain === null ? null : /* @__PURE__ */ new Set();
-  if (chain !== null) for (let i = 0; i < chain.length; i++) kept.add(chain[i][0]);
+  const kept = chain === null ? null : new Set(chain);
   for (let b = state.head; b !== null; b = b.nextSibling) {
     if (preservedMap !== null || !kept.has(b)) unmountBlock(b, false);
   }
   if (state.end.parentNode === null) return;
-  state.head = snapshot.head;
-  state.tail = snapshot.tail;
-  state.size = snapshot.size;
+  state.head = chain === null ? snapshot.head : chain[0] ?? null;
+  state.tail = chain === null ? snapshot.tail : chain[chain.length - 1] ?? null;
+  state.size = chain === null ? snapshot.size : chain.length;
   if (preservedMap !== null) state.items = preservedMap;
   else {
     const originalChain = chain;
     state.items.clear();
-    for (let i = 0; i < snapshot.entries.length; i++) {
-      state.items.set(snapshot.entries[i][0], snapshot.entries[i][1]);
-    }
     for (let i = 0; i < originalChain.length; i++) {
-      originalChain[i][0].nextSibling = originalChain[i][1];
-      originalChain[i][0].prevSibling = originalChain[i][2];
+      const block = originalChain[i];
+      block.nextSibling = originalChain[i + 1] ?? null;
+      block.prevSibling = originalChain[i - 1] ?? null;
+    }
+    const keyOrder = snapshot.mapOrder ?? originalChain;
+    for (let i = 0; i < keyOrder.length; i++) {
+      const block = keyOrder[i];
+      state.items.set(block.key, block);
     }
   }
   const nodes = [];
   for (let b = state.head; b !== null; b = b.nextSibling) {
-    const range = takeParkedItem(b) ?? collectBlockRange(b);
-    for (const node of range) nodes.push(node);
+    const parked = takeParkedItem(b);
+    if (parked !== null) for (const node of parked) nodes.push(node);
+    else if (b.startMarker !== null && b.startMarker === b.endMarker) {
+      nodes.push(b.startMarker);
+    } else for (const node of collectBlockRange(b)) nodes.push(node);
   }
   if (state.emptyBlock !== snapshot.empty) {
     if (state.emptyBlock !== null) unmountBlock(state.emptyBlock, false);
@@ -1692,6 +1860,7 @@ function restoreForSlot(state, snapshot, chain) {
   }
   const parent = state.end.parentNode;
   const keptNodes = new Set(nodes);
+  if (ROOT_RENDER_TRANSACTION !== null) retainedForSlotNodes(state, keptNodes);
   let current = state.start.nextSibling;
   while (current !== null && current !== state.end) {
     const next = current.nextSibling;
@@ -1748,13 +1917,16 @@ function armTransitionJournal(state) {
   TRANSITION_JOURNAL ??= [];
   TRANSITION_JOURNAL_BAGS ??= /* @__PURE__ */ new Map();
   TRANSITION_JOURNAL_WINDOWS.push(TRANSITION_JOURNAL_CHECKPOINT);
+  TRANSITION_JOURNAL_BAG_WINDOWS.push(TRANSITION_JOURNAL_BAG_WINDOW);
   TRANSITION_JOURNAL_CHECKPOINT = TRANSITION_JOURNAL.length;
+  TRANSITION_JOURNAL_BAG_WINDOW = ++NEXT_TRANSITION_JOURNAL_BAG_WINDOW;
   TRANSITION_JOURNAL_DEPTH++;
   return TRANSITION_JOURNAL.length;
 }
 function disarmTransitionJournal(checkpoint) {
   if (checkpoint < 0) return;
   TRANSITION_JOURNAL_CHECKPOINT = TRANSITION_JOURNAL_WINDOWS.pop();
+  TRANSITION_JOURNAL_BAG_WINDOW = TRANSITION_JOURNAL_BAG_WINDOWS.pop();
   if (--TRANSITION_JOURNAL_DEPTH === 0) {
     TRANSITION_JOURNAL = null;
     TRANSITION_JOURNAL_BAGS = null;
@@ -1793,6 +1965,9 @@ function rollbackTransitionJournal(checkpoint, owner) {
       case JOURNAL_PROP:
         target[a] = b;
         break;
+      case JOURNAL_CREATED:
+        undoCreatedInRootRender(target, a);
+        break;
       case JOURNAL_RENDER:
         if (!target.disposed && (target === owner || blockIsAncestorOf(owner, target))) {
           invalidateRender(target, owner);
@@ -3056,7 +3231,7 @@ function replaceRef(scope, previous, next, target) {
   if (TRANSITION_JOURNAL !== null) {
     journalBag();
     if (Object.prototype.hasOwnProperty.call(target, "_currentRef"))
-      journalRootProperty(target, "_currentRef");
+      journalRootProperty(target, "_currentRef", target._currentRef);
   }
   if (previous != null) queueRefDetach(previous, target);
   if (next != null) queueRefAttach(scope, next, target);
@@ -3376,8 +3551,17 @@ function blockIsAncestorOf(anc, node) {
 }
 function comparePostOrder(aBlock, aSeq, bBlock, bSeq) {
   if (aBlock !== bBlock && aBlock !== null && bBlock !== null) {
-    if (blockIsAncestorOf(aBlock, bBlock)) return 1;
-    if (blockIsAncestorOf(bBlock, aBlock)) return -1;
+    const aParent = aBlock.parentBlock;
+    const bParent = bBlock.parentBlock;
+    if (aParent === bBlock) return -1;
+    if (bParent === aBlock) return 1;
+    if (aParent === bParent) return aSeq - bSeq;
+    for (let b = bParent; b !== null; b = b.parentBlock) {
+      if (b === aBlock) return 1;
+    }
+    for (let a = aParent; a !== null; a = a.parentBlock) {
+      if (a === bBlock) return -1;
+    }
   }
   return aSeq - bSeq;
 }
@@ -3467,6 +3651,7 @@ function runEffectBody(e) {
 }
 function nativeEffectPublicationCurrent(entry, slot) {
   if (NATIVE_READ_DRIVER?.publicationCurrent(entry) !== false) return true;
+  if (ROOT_RENDER_TRANSACTION !== null) journalObjectOnce(slot);
   slot.deps = void 0;
   slot.active = slot.connectedFn !== null;
   invalidateRender(entry.scope.block, entry.scope.block);
@@ -3633,86 +3818,6 @@ function schedulePostPaint(cb) {
   }
 }
 class BlockImpl {
-  // Hot fields first (touched by every renderBlock / reconcile iteration).
-  body;
-  props;
-  extra;
-  outputHandler;
-  memoInChain;
-  parentNode;
-  parentBlock;
-  idState;
-  startMarker;
-  endMarker;
-  exclusiveMarkers;
-  itemIndex;
-  // Scheduler / lifecycle.
-  pending;
-  disposed;
-  mounted;
-  renderStatus;
-  pendingMode;
-  currentRenderMode;
-  pendingDeferred;
-  currentRenderDeferred;
-  inactive;
-  // Hooks + cleanups (per-block state).
-  hooks;
-  cleanups;
-  effectSlots;
-  children;
-  _slots;
-  refFields;
-  $$ctxValues;
-  // Contexts whose value this block's subtree consumes — stamped on this block
-  // AND its memo ancestors by useContextInternal. The TRANSITIVE signal: a
-  // changed version here means "a consumer somewhere at/below me needs the new
-  // value", so the memo bailout descends rather than skipping.
-  $$ctxReads;
-  // Contexts this block's OWN render directly read (its own body, or an inline
-  // lite descendant that shares this block). The DIRECT signal: a changed
-  // version here means THIS block must re-run; if only $$ctxReads changed, the
-  // block can bail its body and refresh just its consuming child blocks.
-  $$ctxDirect;
-  // Resolved-provider cache for `use(ctx)` — see Scope.$$ctxCache.
-  $$ctxCache;
-  // Armed for React's IMPLICIT same-element bailout (beginWork's
-  // oldProps === newProps skip). Set at value-position component mounts
-  // (childSlot) — the only sites that can receive a cached descriptor back.
-  // Arming makes the block a stamping target (like __memo) so the bail's lazy
-  // consumer refresh has the context deps it needs.
-  $$implicitBail;
-  // __thenableIdx is reset every renderBlock so pre-init costs nothing.
-  __thenableIdx;
-  // Render-loop guard bookkeeping (see the Block interface).
-  drainStamp;
-  drainRenders;
-  crossRenderUpdate;
-  nestedUpdateChain;
-  nestedUpdateCount;
-  nestedUpdateError;
-  effectEventRenderVersion;
-  effectEventCompletedVersion;
-  // De-opt host node managed by this Block (deoptItemBody / hostElementBody), reused
-  // across renders. Null for all other blocks; declared so the shape stays monomorphic.
-  deoptNode;
-  // A de-opt descriptor with a `ref` was stamped in this subtree (see Block).
-  deoptRefs;
-  // Per-scope dense slot array (binding bag + control-flow/component/child slots),
-  // indexed by compile-time slot index. Keeps the scope shape monomorphic.
-  slots;
-  // For-block item bookkeeping.
-  forSlot;
-  prevSibling;
-  nextSibling;
-  key;
-  // ViewTransition boundary props (null on every other block — see Block).
-  vt;
-  // Scope contract: a Block is its own scope.
-  parent;
-  block;
-  // Metadata.
-  kind;
   constructor(kind, parentBlock, parentNode, startMarker, endMarker, body, props, extra, outputHandler) {
     this.body = body;
     this.props = props;
@@ -3766,24 +3871,19 @@ class BlockImpl {
     this.parent = null;
     this.block = this;
     this.kind = kind;
+    this.createdStamp = 0;
+    this.__warmEpisode = void 0;
+    this.__thenableDone = void 0;
+    this.__thenables = void 0;
+    this.$$tryHandler = void 0;
+    this.__suspenseHandler = void 0;
+    this.__trySlot = void 0;
+    this.__activitySlot = void 0;
+    this.__warmCache = void 0;
+    this.__warmCacheEpisode = void 0;
   }
 }
 class ScopeImpl {
-  block;
-  parent;
-  hooks;
-  cleanups;
-  effectSlots;
-  children;
-  _slots;
-  refFields;
-  $$ctxValues;
-  $$ctxReads;
-  $$ctxCache;
-  mounted;
-  // Per-scope dense slot array (binding bag + control-flow/component/child slots),
-  // indexed by compile-time slot index. Keeps the scope shape monomorphic.
-  slots;
   constructor(parent, block) {
     this.block = block;
     this.parent = parent;
@@ -3793,11 +3893,11 @@ class ScopeImpl {
     this.children = null;
     this._slots = null;
     this.refFields = null;
-    this.slots = [];
     this.$$ctxValues = null;
     this.$$ctxReads = null;
     this.$$ctxCache = null;
     this.mounted = false;
+    this.slots = [];
   }
 }
 function createBlock(kind, parentBlock, parentNode, startMarker, endMarker, body, props, extra, outputHandler = null) {
@@ -4202,7 +4302,7 @@ function disposeReturnSlot(block, state) {
       if (state.forSlot.emptyBlock !== null) retireRootBlock(state.forSlot.emptyBlock);
     }
     deferRootRange(parent, first, last, () => unmountSlot(state, false));
-    journalRootProperty(block.slots, "0");
+    journalRootProperty(block.slots, 0, block.slots[0]);
     const registry = block._slots;
     if (registry !== null) {
       const index = registry.indexOf(state);
@@ -4245,11 +4345,6 @@ function disposeReturnSlot(block, state) {
   block.slots[0] = void 0;
 }
 class LiteBlockImpl {
-  parentNode;
-  endMarker;
-  parentBlock;
-  $$ctxValues;
-  idState;
   constructor(parentNode, endMarker, parentBlock) {
     this.parentNode = parentNode;
     this.endMarker = endMarker;
@@ -4394,7 +4489,7 @@ function unmountBlockInner(block, detachDom) {
 function registerSlot(scope, slot) {
   const slots = scope._slots;
   const transaction = ROOT_RENDER_TRANSACTION;
-  if (transaction !== null && scope.mounted && !transaction.created?.has(scope.block)) {
+  if (transaction !== null && scope.mounted && !isCreatedInRootRender(transaction, scope.block)) {
     journalUndo(() => {
       unmountSlot(slot, true);
       const index = scope.slots.indexOf(slot);
@@ -5105,9 +5200,9 @@ function finishEffectRender(scope) {
   for (let i = 0; i < effects.length; i++) {
     const effect = effects[i];
     if (effect.renderVersion === CURRENT_EFFECT_RENDER_VERSION) continue;
-    if (ROOT_RENDER_TRANSACTION !== null) journalObjectOnce(effect);
     if (effect.phase === INSERTION) invalidateInsertionReplay(effect);
     if (!effect.active) continue;
+    if (ROOT_RENDER_TRANSACTION !== null) journalObjectOnce(effect);
     effect.deps = void 0;
     effect.active = false;
     const revision = ++effect.revision;
@@ -8572,55 +8667,55 @@ function commitBag(scope, root, bag) {
   return bag;
 }
 function bag0(s, r) {
-  return commitBag(s, r, {});
+  return commitBag(s, r, { __journalWindow: 0, [BINDING_BAG_ARITY]: 0 });
 }
 function bag1(s, r, a) {
-  return commitBag(s, r, { a });
+  return commitBag(s, r, { a, __journalWindow: 0, [BINDING_BAG_ARITY]: 1 });
 }
 function bag2(s, r, a, b) {
-  return commitBag(s, r, { a, b });
+  return commitBag(s, r, { a, b, __journalWindow: 0, [BINDING_BAG_ARITY]: 2 });
 }
 function bag3(s, r, a, b, c) {
-  return commitBag(s, r, { a, b, c });
+  return commitBag(s, r, { a, b, c, __journalWindow: 0, [BINDING_BAG_ARITY]: 3 });
 }
 function bag4(s, r, a, b, c, d) {
-  return commitBag(s, r, { a, b, c, d });
+  return commitBag(s, r, { a, b, c, d, __journalWindow: 0, [BINDING_BAG_ARITY]: 4 });
 }
 function bag5(s, r, a, b, c, d, e) {
-  return commitBag(s, r, { a, b, c, d, e });
+  return commitBag(s, r, { a, b, c, d, e, __journalWindow: 0, [BINDING_BAG_ARITY]: 5 });
 }
 function bag6(s, r, a, b, c, d, e, f) {
-  return commitBag(s, r, { a, b, c, d, e, f });
+  return commitBag(s, r, { a, b, c, d, e, f, __journalWindow: 0, [BINDING_BAG_ARITY]: 6 });
 }
 function bag7(s, r, a, b, c, d, e, f, g) {
-  return commitBag(s, r, { a, b, c, d, e, f, g });
+  return commitBag(s, r, { a, b, c, d, e, f, g, __journalWindow: 0, [BINDING_BAG_ARITY]: 7 });
 }
 function bag8(s, r, a, b, c, d, e, f, g, h) {
-  return commitBag(s, r, { a, b, c, d, e, f, g, h });
+  return commitBag(s, r, { a, b, c, d, e, f, g, h, __journalWindow: 0, [BINDING_BAG_ARITY]: 8 });
 }
 function bag9(s, r, a, b, c, d, e, f, g, h, i) {
-  return commitBag(s, r, { a, b, c, d, e, f, g, h, i });
+  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, __journalWindow: 0, [BINDING_BAG_ARITY]: 9 });
 }
 function bag10(s, r, a, b, c, d, e, f, g, h, i, j) {
-  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j });
+  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, __journalWindow: 0, [BINDING_BAG_ARITY]: 10 });
 }
 function bag11(s, r, a, b, c, d, e, f, g, h, i, j, k) {
-  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k });
+  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, __journalWindow: 0, [BINDING_BAG_ARITY]: 11 });
 }
 function bag12(s, r, a, b, c, d, e, f, g, h, i, j, k, l) {
-  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l });
+  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, __journalWindow: 0, [BINDING_BAG_ARITY]: 12 });
 }
 function bag13(s, r, a, b, c, d, e, f, g, h, i, j, k, l, m) {
-  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m });
+  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, __journalWindow: 0, [BINDING_BAG_ARITY]: 13 });
 }
 function bag14(s, r, a, b, c, d, e, f, g, h, i, j, k, l, m, n) {
-  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, n });
+  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, n, __journalWindow: 0, [BINDING_BAG_ARITY]: 14 });
 }
 function bag15(s, r, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) {
-  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, n, o });
+  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, __journalWindow: 0, [BINDING_BAG_ARITY]: 15 });
 }
 function bag16(s, r, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) {
-  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p });
+  return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, __journalWindow: 0, [BINDING_BAG_ARITY]: 16 });
 }
 function bagOf(s, r, bag) {
   return commitBag(s, r, bag);
@@ -8779,6 +8874,16 @@ function setClassAttrIfChanged(value, previous, el) {
   setClassAttr(el, value);
   return value;
 }
+function updateFreshClassName(value, previous, el) {
+  const next = normalizeClass(value);
+  if (previous !== next) setClassName(el, next);
+  return next;
+}
+function updateFreshClassAttr(value, previous, el) {
+  const next = normalizeClass(value);
+  if (previous !== next) setClassAttr(el, next);
+  return next;
+}
 function setScriptText(el, value) {
   const text = value == null ? "" : String(value);
   const first = el.firstChild;
@@ -8854,7 +8959,7 @@ function validateDangerouslySetInnerHTMLValue(value) {
 }
 function setDangerouslySetInnerHTML(el, value) {
   validateDangerouslySetInnerHTMLValue(value);
-  journalRootProperty(el, DANGER_HTML_ACTIVE);
+  journalRootProperty(el, DANGER_HTML_ACTIVE, el[DANGER_HTML_ACTIVE]);
   const wasActive = el[DANGER_HTML_ACTIVE] === true;
   if (value == null) {
     el[DANGER_HTML_ACTIVE] = false;
@@ -8913,9 +9018,9 @@ function setDangerouslySetInnerHTMLSources(el, sources, ignoreSourceChildren = f
   if (hasOwnProp.call(el, DANGER_HTML_RESOLVED_VALUE) && Object.is(el[DANGER_HTML_RESOLVED_VALUE], resolved) && Object.is(el[DANGER_HTML_RESOLVED_CHILD], resolvedChild)) {
     return;
   }
-  journalRootProperty(el, DANGER_HTML_SPREAD_CHILD);
-  journalRootProperty(el, DANGER_HTML_RESOLVED_VALUE);
-  journalRootProperty(el, DANGER_HTML_RESOLVED_CHILD);
+  journalRootProperty(el, DANGER_HTML_SPREAD_CHILD, el[DANGER_HTML_SPREAD_CHILD]);
+  journalRootProperty(el, DANGER_HTML_RESOLVED_VALUE, el[DANGER_HTML_RESOLVED_VALUE]);
+  journalRootProperty(el, DANGER_HTML_RESOLVED_CHILD, el[DANGER_HTML_RESOLVED_CHILD]);
   el[DANGER_HTML_SPREAD_CHILD] = resolvedChild;
   setDangerouslySetInnerHTML(el, resolved);
   el[DANGER_HTML_RESOLVED_VALUE] = resolved;
@@ -10240,15 +10345,42 @@ function setSpread(el, value, prev, mountScope, skipDangerouslySetInnerHTML = fa
   if (process.env.NODE_ENV !== "production") queueDevFormDiagnostic(el, mountScope);
 }
 const _injectedStyles = /* @__PURE__ */ new Set();
-function removeHeadEventListeners(state, attrs) {
+function journalHeadEventListeners(state) {
+  const before = state.handlers === void 0 ? null : new Map(state.handlers);
+  journalUndo(() => {
+    const handlers = state.handlers;
+    if (handlers !== void 0) {
+      for (const [name, listener] of handlers) {
+        const event = eventSlot(name);
+        state.el.removeEventListener(event.type, listener, event.capture);
+      }
+      handlers.clear();
+    }
+    if (before !== null) {
+      const restored = handlers ?? (state.handlers = /* @__PURE__ */ new Map());
+      for (const [name, listener] of before) {
+        const event = eventSlot(name);
+        state.el.addEventListener(event.type, listener, event.capture);
+        restored.set(name, listener);
+      }
+    }
+  });
+}
+function removeHeadEventListeners(state, attrs, journalChanges = false) {
   const handlers = state.handlers;
-  if (handlers === void 0) return;
+  if (handlers === void 0) return false;
+  let journaled = false;
   for (const [name, listener] of handlers) {
     if (attrs !== null && name in attrs) continue;
+    if (journalChanges && !journaled) {
+      journalHeadEventListeners(state);
+      journaled = true;
+    }
     const event = eventSlot(name);
     state.el.removeEventListener(event.type, listener, event.capture);
     handlers.delete(name);
   }
+  return journaled;
 }
 function adoptServerHeadEl(head, key, tag) {
   const closeKey = "/" + key;
@@ -10310,7 +10442,7 @@ function headBlock(scope, slot, key, tag, attrs, text) {
     journalObjectOnce(state);
     journalBag();
   }
-  if (state.handlers !== void 0) removeHeadEventListeners(state, attrs);
+  let journaledHandlers = state.handlers !== void 0 && removeHeadEventListeners(state, attrs, TRANSITION_JOURNAL !== null);
   const previousNames = state.attrNames;
   if (previousNames !== void 0) {
     for (let i = 0; i < previousNames.length; i++) {
@@ -10328,13 +10460,15 @@ function headBlock(scope, slot, key, tag, attrs, text) {
         const hs = state.handlers;
         const prevH = hs?.get(k);
         if (prevH === listener) continue;
+        const nextH = typeof listener === "function" ? listener : void 0;
+        if (TRANSITION_JOURNAL !== null && !journaledHandlers && (prevH !== void 0 || nextH !== void 0)) {
+          journalHeadEventListeners(state);
+          journaledHandlers = true;
+        }
         if (prevH !== void 0) el.removeEventListener(ev.type, prevH, ev.capture);
-        if (typeof listener === "function") {
-          el.addEventListener(ev.type, listener, ev.capture);
-          (hs ?? (state.handlers = /* @__PURE__ */ new Map())).set(
-            k,
-            listener
-          );
+        if (nextH !== void 0) {
+          el.addEventListener(ev.type, nextH, ev.capture);
+          (hs ?? (state.handlers = /* @__PURE__ */ new Map())).set(k, nextH);
         } else {
           hs?.delete(k);
         }
@@ -10447,7 +10581,7 @@ function setEventHandler(el, key, handler) {
   el[key] = handler;
 }
 function evt0(el, key, fn) {
-  const d = { [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND, fn, args: EMPTY_ARGS };
+  const d = { fn, args: EMPTY_ARGS, [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND };
   setEventHandler(el, key, d);
   return d;
 }
@@ -10457,37 +10591,30 @@ function evt0u(d, fn) {
   d.fn = fn;
 }
 function evt1(el, key, fn, a0) {
-  const d = { [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND, fn, args: [a0] };
+  const d = { fn, args: 1, a0, [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND };
   setEventHandler(el, key, d);
   return d;
 }
 function evt1u(d, fn, a0) {
   if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
-  if (TRANSITION_JOURNAL !== null) {
-    journalObjectOnce(d);
-    journalObjectOnce(d.args);
-  }
+  if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
   d.fn = fn;
-  d.args[0] = a0;
+  d.a0 = a0;
 }
 function evt2(el, key, fn, a0, a1) {
-  const d = { [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND, fn, args: [a0, a1] };
+  const d = { fn, args: 2, a0, a1, [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND };
   setEventHandler(el, key, d);
   return d;
 }
 function evt2u(d, fn, a0, a1) {
   if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
-  if (TRANSITION_JOURNAL !== null) {
-    journalObjectOnce(d);
-    journalObjectOnce(d.args);
-  }
+  if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
   d.fn = fn;
-  const a = d.args;
-  a[0] = a0;
-  a[1] = a1;
+  d.a0 = a0;
+  d.a1 = a1;
 }
 function evtN(el, key, fn, args) {
-  const d = { [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND, fn, args };
+  const d = { fn, args, [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND };
   setEventHandler(el, key, d);
   return d;
 }
@@ -10847,11 +10974,17 @@ function preserveDispatchedBundle(bundle) {
   let snapshot;
   for (let index = 0; index < CAPTURE_SLOTS.length; index++) {
     if (CAPTURE_SLOTS[index] === bundle) {
-      CAPTURE_SLOTS[index] = snapshot ??= {
-        [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND,
-        fn: bundle.fn,
-        args: bundle.args.slice()
-      };
+      if (snapshot === void 0) {
+        const args = bundle.args;
+        snapshot = typeof args !== "number" ? { fn: bundle.fn, args: args.slice(), [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND } : args === 1 ? { fn: bundle.fn, args: 1, a0: bundle.a0, [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND } : {
+          fn: bundle.fn,
+          args: 2,
+          a0: bundle.a0,
+          a1: bundle.a1,
+          [EVENT_SLOT_KIND]: HANDLER_BUNDLE_KIND
+        };
+      }
+      CAPTURE_SLOTS[index] = snapshot;
     }
   }
 }
@@ -10881,8 +11014,8 @@ function resolvePortalEventOwner(node) {
   }
   if (owner === void 0) return;
   if (ROOT_RENDER_TRANSACTION !== null) {
-    journalRootProperty(node, "$$portalParent");
-    journalRootProperty(node, "$$portalContainer");
+    journalRootProperty(node, "$$portalParent", node.$$portalParent);
+    journalRootProperty(node, "$$portalContainer", node.$$portalContainer);
   }
   node.$$portalParent = owner.host;
   node.$$portalContainer = target;
@@ -10995,18 +11128,24 @@ function fireEventSlot(slot, event) {
     if (isHandlerBundle(slot)) {
       const bundle = slot;
       const a = bundle.args;
-      switch (a.length) {
-        case 0:
-          bundle.fn();
-          break;
-        case 1:
-          bundle.fn(a[0]);
-          break;
-        case 2:
-          bundle.fn(a[0], a[1]);
-          break;
-        default:
-          bundle.fn.apply(null, a);
+      if (typeof a !== "number") {
+        switch (a.length) {
+          case 0:
+            bundle.fn();
+            break;
+          case 1:
+            bundle.fn(a[0]);
+            break;
+          case 2:
+            bundle.fn(a[0], a[1]);
+            break;
+          default:
+            bundle.fn.apply(null, a);
+        }
+      } else if (a === 1) {
+        bundle.fn(bundle.a0);
+      } else {
+        bundle.fn(bundle.a0, bundle.a1);
       }
       return;
     }
@@ -12240,7 +12379,7 @@ function portal(parentScope, slotKey, target, body, props, host, env, fragmentOw
     key
   );
   if (prev !== state) {
-    journalRootProperty(parentScope.slots, String(slotKey));
+    journalRootProperty(parentScope.slots, slotKey, parentScope.slots[slotKey]);
     parentScope.slots[slotKey] = state;
     registerSlot(parentScope, state);
   }
@@ -12441,11 +12580,13 @@ function renderPortalState(prev, parentBlock, target, rawBody, rawProps, host, e
     }
     renderBlock(block);
   } else {
-    if (state.host !== host) journalRootProperty(state, "host");
+    if (state.host !== host) journalRootProperty(state, "host", state.host);
     state.host = host;
-    if (state.block.body !== norm.body) journalRootProperty(state.block, "body");
-    if (state.block.props !== norm.props) journalRootProperty(state.block, "props");
-    if (state.block.extra !== env) journalRootProperty(state.block, "extra");
+    if (state.block.body !== norm.body)
+      journalRootProperty(state.block, "body", state.block.body);
+    if (state.block.props !== norm.props)
+      journalRootProperty(state.block, "props", state.block.props);
+    if (state.block.extra !== env) journalRootProperty(state.block, "extra", state.block.extra);
     state.block.body = norm.body;
     state.block.props = norm.props;
     state.block.extra = env;
@@ -12477,7 +12618,7 @@ function renderPortalState(prev, parentBlock, target, rawBody, rawProps, host, e
 }
 function teardownPortalState(state) {
   const transaction = ROOT_RENDER_TRANSACTION;
-  if (transaction !== null && !transaction.aborted && !ROOT_RENDER_ROLLBACK && state.block?.mounted && !transaction.created?.has(state.block) && state.target !== null) {
+  if (transaction !== null && !transaction.aborted && !ROOT_RENDER_ROLLBACK && state.block?.mounted && !isCreatedInRootRender(transaction, state.block) && state.target !== null) {
     deferRootRange(state.target, state.start, state.end, () => teardownPortalState(state));
     return;
   }
@@ -13069,13 +13210,14 @@ function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body,
     }
   }
   if ((hasKey === true || key !== void 0) && !state.keyed) {
-    if (!journaledSlot) journalRootProperty(state, "keyed");
+    if (!journaledSlot) journalRootProperty(state, "keyed", state.keyed);
     state.keyed = true;
   }
   if (keyChanged) {
     state.currentComp = null;
   }
-  if (!journaledSlot && !Object.is(state.prevKey, nextKey)) journalRootProperty(state, "prevKey");
+  if (!journaledSlot && !Object.is(state.prevKey, nextKey))
+    journalRootProperty(state, "prevKey", state.prevKey);
   state.prevKey = nextKey;
   if (replacing) {
     const swapDriver = TRANSITION_SWAP_DRIVER;
@@ -13086,7 +13228,7 @@ function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body,
     const suspenseSwap = canSwapOffscreen && !transitionMode && committedSuspense;
     const probeOnly = suspenseSwap && !transitionMode;
     const rootTransaction = ROOT_RENDER_TRANSACTION;
-    if (rootTransaction !== null && !committedSuspense && hydration === null && state.block !== null && state.block.mounted && !rootTransaction.created?.has(state.block)) {
+    if (rootTransaction !== null && !committedSuspense && hydration === null && state.block !== null && state.block.mounted && !isCreatedInRootRender(rootTransaction, state.block)) {
       const oldBlock = state.block;
       const oldStart = oldBlock.startMarker;
       const oldEnd = oldBlock.endMarker;
@@ -13240,7 +13382,8 @@ function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body,
     }
   } else if (state.block) {
     if (tryMemoBail(state.block, identity, props)) return;
-    if (state.block.props !== renderProps) journalRootProperty(state.block, "props");
+    if (state.block.props !== renderProps)
+      journalRootProperty(state.block, "props", state.block.props);
     state.block.props = renderProps;
     renderBlock(state.block);
   }
@@ -13803,7 +13946,7 @@ function renderFragmentRefDescriptor(descriptor, scope) {
     block.slots[1] = instance;
     block.refFields = ["f", "a", ""];
   } else if (instance._currentRef !== descriptor.ref) {
-    journalRootProperty(instance, "_currentRef");
+    journalRootProperty(instance, "_currentRef", instance._currentRef);
     if (instance._currentRef != null) queueRefDetach(instance._currentRef, instance);
     if (descriptor.ref != null) queueRefAttach(scope, descriptor.ref, instance);
     instance._currentRef = descriptor.ref;
@@ -14109,8 +14252,8 @@ function deoptItemBody(item, scope) {
     const p = sm.parentNode;
     if (ROOT_RENDER_TRANSACTION !== null) {
       journalRootRange(p, sm.previousSibling, sm.nextSibling);
-      journalRootProperty(block, "startMarker");
-      journalRootProperty(block, "endMarker");
+      journalRootProperty(block, "startMarker", block.startMarker);
+      journalRootProperty(block, "endMarker", block.endMarker);
     }
     const s = document.createComment("it");
     const e = document.createComment("/it");
@@ -14123,7 +14266,7 @@ function deoptItemBody(item, scope) {
     const stale = block.deoptNode;
     let transfer = null;
     if (stale != null) {
-      journalRootProperty(block, "deoptNode");
+      journalRootProperty(block, "deoptNode", block.deoptNode);
       if (scope.slots[0] === void 0 && stale.nodeType === 1 && isHostDescriptor(item) && stale.localName === item.type && stale.parentNode === block.parentNode) {
         transfer = stale;
       } else if (stale.parentNode === block.parentNode) {
@@ -14205,7 +14348,7 @@ function deoptItemBody(item, scope) {
   }
   const node = reconcileDeoptNode(prev, item, block, deoptChildNamespace(block.parentNode));
   if (node !== prev) {
-    journalRootProperty(block, "deoptNode");
+    journalRootProperty(block, "deoptNode", block.deoptNode);
     if (prev != null && prev !== node && prev.parentNode === block.parentNode) {
       if (ROOT_RENDER_TRANSACTION !== null)
         journalRootRange(block.parentNode, prev.previousSibling, prev.nextSibling);
@@ -14233,8 +14376,8 @@ function deoptItemBody(item, scope) {
       block.parentNode.insertBefore(node, endM);
     }
     if (prev !== null && block.startMarker === prev) {
-      journalRootProperty(block, "startMarker");
-      journalRootProperty(block, "endMarker");
+      journalRootProperty(block, "startMarker", block.startMarker);
+      journalRootProperty(block, "endMarker", block.endMarker);
       block.startMarker = node;
       block.endMarker = node;
     }
@@ -14347,7 +14490,7 @@ function hostElementBody(d, block) {
       const retired = el;
       if (ROOT_RENDER_TRANSACTION !== null) {
         journalRootRange(block.parentNode, retired.previousSibling, retired.nextSibling);
-        journalRootProperty(block, "deoptNode");
+        journalRootProperty(block, "deoptNode", block.deoptNode);
       }
       const childState = block.slots[0];
       if (childState !== void 0) {
@@ -14969,7 +15112,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
   }
   if (state === void 0) {
     const transaction = ROOT_RENDER_TRANSACTION;
-    if (transaction !== null && !transaction.aborted && !ROOT_RENDER_ROLLBACK && parentScope.mounted && !transaction.created?.has(parentBlock)) {
+    if (transaction !== null && !transaction.aborted && !ROOT_RENDER_ROLLBACK && parentScope.mounted && !isCreatedInRootRender(transaction, parentBlock)) {
       journalBag();
       const after = ownsHost === void 0 ? anchor ?? null : null;
       const before = ownsHost === void 0 ? after === null ? domParent.lastChild : after.previousSibling : null;
@@ -15201,8 +15344,8 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
       }
       if (wasImplicitlyArmed && taggedChildren && comp === state.currentComp && tryImplicitBail(state.block))
         return;
-      if (state.block.body !== comp) journalRootProperty(state.block, "body");
-      if (state.currentComp !== comp) journalRootProperty(state, "currentComp");
+      if (state.block.body !== comp) journalRootProperty(state.block, "body", state.block.body);
+      if (state.currentComp !== comp) journalRootProperty(state, "currentComp", state.currentComp);
       state.block.body = comp;
       renderBlock(state.block);
       state.currentComp = comp;
@@ -15211,7 +15354,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
     if (state.block !== null && comp === state.currentComp) {
       if (tryMemoBail(state.block, comp, props)) return;
       if (props === state.block.props && tryImplicitBail(state.block)) return;
-      if (state.block.props !== props) journalRootProperty(state.block, "props");
+      if (state.block.props !== props) journalRootProperty(state.block, "props", state.block.props);
       state.block.props = props;
       renderBlock(state.block);
       return;
@@ -15332,7 +15475,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
           const oldEnd = state.end;
           state.start = r.wip.start;
           state.end = r.wip.end;
-          journalRootProperty(r.wip.block, "exclusiveMarkers");
+          journalRootProperty(r.wip.block, "exclusiveMarkers", r.wip.block.exclusiveMarkers);
           r.wip.block.exclusiveMarkers = true;
           replaceSharedBlockBoundary(parentBlock, oldStart, oldEnd, state.start, state.end);
           deferRootRange(domParent, oldStart, oldStart);
@@ -15473,7 +15616,7 @@ function childTextHole(parentScope, slotKey, domParent, value, cachedNode) {
   if (ROOT_RENDER_TRANSACTION !== null && state === void 0 && parentScope.mounted) {
     journalBag();
     journalRootRange(domParent, null, null);
-    journalRootProperty(parentScope.slots, String(slotKey));
+    journalRootProperty(parentScope.slots, slotKey, parentScope.slots[slotKey]);
   }
   if (state === void 0 && vt !== "object" && vt !== "function") {
     const str = value == null || value === false || value === true ? "" : vt === "string" ? value : String(value);
@@ -16565,7 +16708,7 @@ function renderVisibleTry(state, source) {
   const journalCheckpoint = armTransitionJournal(state);
   const previousCapture = WIP_CAPTURE;
   const capture = journalCheckpoint < 0 ? null : createOffscreenCapture();
-  const effectDeps = capture === null ? null : snapshotSubtreeEffectDeps(block);
+  const effectDeps = capture !== null && (ROOT_RENDER_TRANSACTION === null || state.propagateSuspense || (block.pendingMode ?? CURRENT_BLOCK?.currentRenderMode) !== "transition" || block.pending && block.pendingMode === "transition" && CURRENT_BLOCK !== null && CURRENT_BLOCK.currentRenderMode === "urgent" && blockIsAncestor(CURRENT_BLOCK, block) && TRANSITION_SWAP_DRIVER !== null) ? snapshotSubtreeEffectDeps(block) : null;
   const refDetachCheckpoint = refDetachQueue.length;
   let didThrow = false;
   let renderError;
@@ -16582,7 +16725,7 @@ function renderVisibleTry(state, source) {
     if (didThrow) {
       if (capture !== null) {
         refDetachQueue.splice(refDetachCheckpoint);
-        restoreSubtreeEffectDeps(block, effectDeps);
+        if (effectDeps !== null) restoreSubtreeEffectDeps(block, effectDeps);
         discardOffscreenCapture(capture);
       }
       if (isHostContextRequest(renderError) || renderError instanceof NativeAdoptionMiss)
@@ -17102,6 +17245,7 @@ function invalidatePendingSuspenseEffects(owner) {
       if (block.disposed || block !== owner && !blockIsAncestorOf(owner, block)) continue;
       const effect = pending.scope.hooks?.get(pending.slot);
       if (effect === void 0 || effect.revision !== pending.revision) continue;
+      if (ROOT_RENDER_TRANSACTION !== null) journalObjectOnce(effect);
       effect.revision++;
       effect.active = effect.connectedFn !== null;
       effect.deps = effect.connectedFn === null ? void 0 : effect.connectedArgs;
@@ -17143,7 +17287,7 @@ function hideTryContentAndMountPendingInner(state, resumeThenable) {
     const persistent = state.tryBlock;
     const uncommittedRefs = discardSubtreeRefAttaches(persistent);
     invalidatePendingSuspenseEffects(persistent);
-    journalRootProperty(persistent, "inactive");
+    journalRootProperty(persistent, "inactive", persistent.inactive);
     persistent.inactive = true;
     const action = () => deactivateSuspensePrimary(state, persistent, uncommittedRefs);
     if (WIP_CAPTURE === null) effectEventCommitActions.push(action);
@@ -17514,6 +17658,7 @@ function reconnectBailedEffects(block) {
     const queue = context.queues[effect.phase];
     if (replay !== null) {
       const last = replay[replay.length - 1];
+      if (ROOT_RENDER_TRANSACTION !== null) journalObjectOnce(effect);
       effect.active = last.fn !== null;
       effect.deps = last.fn === null ? void 0 : last.args;
       const revision = ++effect.revision;
@@ -18462,8 +18607,8 @@ function replaceSharedBlockBoundary(parent, oldStart, oldEnd, newStart, newEnd)
   if (oldStart === null || oldEnd === null) return;
   let block = parent;
   while (block !== null && block.startMarker === oldStart && block.endMarker === oldEnd) {
-    journalRootProperty(block, "startMarker");
-    journalRootProperty(block, "endMarker");
+    journalRootProperty(block, "startMarker", block.startMarker);
+    journalRootProperty(block, "endMarker", block.endMarker);
     block.startMarker = newStart;
     block.endMarker = newEnd;
     block = block.parentBlock;
@@ -18529,7 +18674,7 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
     }
     const liveEnd = provisionalAfter === null && state.start === null && state.block !== null && state.block.endMarker !== null ? state.block.endMarker : state.end;
     const rootTransaction = ROOT_RENDER_TRANSACTION;
-    if (rootTransaction !== null && !committedSuspense && hydration === null && state.block !== null && state.block.mounted && !rootTransaction.created?.has(state.block)) {
+    if (rootTransaction !== null && !committedSuspense && hydration === null && state.block !== null && state.block.mounted && !isCreatedInRootRender(rootTransaction, state.block)) {
       const oldBlock2 = state.block;
       const oldStart = oldBlock2.startMarker;
       const oldEnd = oldBlock2.endMarker;
@@ -18590,7 +18735,7 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
         if (!borrowed) {
           replaceSharedBlockBoundary(parentBlock, oldStart, oldEnd, r.wip.start, r.wip.end);
         }
-        journalRootProperty(r.wip.block, "exclusiveMarkers");
+        journalRootProperty(r.wip.block, "exclusiveMarkers", r.wip.block.exclusiveMarkers);
         r.wip.block.exclusiveMarkers = true;
         spliceWipCapture(r.wip);
         deferRootReplacement(oldBlock2, domParent, first, last);
@@ -18770,8 +18915,8 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
       replaceSharedBlockBoundary(parentBlock, oldBlockStart, oldBlockEnd, s, e);
     }
   } else if (state.block) {
-    if (state.block.body !== body) journalRootProperty(state.block, "body");
-    if (state.block.extra !== env) journalRootProperty(state.block, "extra");
+    if (state.block.body !== body) journalRootProperty(state.block, "body", state.block.body);
+    if (state.block.extra !== env) journalRootProperty(state.block, "extra", state.block.extra);
     state.block.body = body;
     state.block.extra = env;
     renderBlock(state.block);
@@ -19477,7 +19622,8 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
     registerSlot(parentScope, state);
   }
   const serverMarkerState = hydration?.markerState(state.start) ?? -1;
-  if (state.env !== deps) journalRootProperty(state, "env");
+  if (ROOT_RENDER_TRANSACTION !== null && state.env !== deps)
+    journalRootProperty(state, "env", state.env);
   state.env = deps;
   const isEmpty = items.length === 0;
   if (isEmpty && emptyBody) {
@@ -19485,8 +19631,10 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
       reconcileKeyed(parentBlock, state, items, getKey, itemBody, false, false);
     }
     if (state.emptyBlock) {
-      if (state.emptyBlock.body !== emptyBody) journalRootProperty(state.emptyBlock, "body");
-      if (state.emptyBlock.extra !== state.env) journalRootProperty(state.emptyBlock, "extra");
+      if (state.emptyBlock.body !== emptyBody)
+        journalRootProperty(state.emptyBlock, "body", state.emptyBlock.body);
+      if (state.emptyBlock.extra !== state.env)
+        journalRootProperty(state.emptyBlock, "extra", state.emptyBlock.extra);
       state.emptyBlock.body = emptyBody;
       state.emptyBlock.extra = state.env;
       renderBlock(state.emptyBlock);
@@ -19525,7 +19673,7 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
   if (state.emptyBlock) {
     if (itemRemovalDefers()) {
       journalForSlot(state);
-      parkItemForHold(state.emptyBlock);
+      parkItemForHold(state.emptyBlock, state);
     } else unmountBlock(state.emptyBlock);
     state.emptyBlock = null;
   }
@@ -19551,7 +19699,8 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
       } else {
         lite = !requiresScope;
       }
-      if (state.cachedDeps !== deps) journalRootProperty(state, "cachedDeps");
+      if (ROOT_RENDER_TRANSACTION !== null && state.cachedDeps !== deps)
+        journalRootProperty(state, "cachedDeps", state.cachedDeps);
       state.cachedDeps = deps;
     }
   }
@@ -19619,7 +19768,8 @@ function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody,
   );
   if (TRANSITION_JOURNAL === null || ROOT_RENDER_TRANSACTION !== null) {
     const rendered = parentScope.slots[slotKey];
-    if (rendered.selectionItems !== items) journalRootProperty(rendered, "selectionItems");
+    if (rendered.selectionItems !== items)
+      journalRootProperty(rendered, "selectionItems", rendered.selectionItems);
     rendered.selectionItems = items;
   }
 }
@@ -19639,14 +19789,16 @@ function mountFastHostItems(parentScope, state, parentNode, items, getKey, itemB
   let previous = null;
   let current = null;
   if (TRANSITION_JOURNAL !== null) journalForSlot(state);
-  if (state.env !== deps) journalRootProperty(state, "env");
+  if (ROOT_RENDER_TRANSACTION !== null && state.env !== deps)
+    journalRootProperty(state, "env", state.env);
   state.env = deps;
   if (((flags || 0) & 4) !== 0 && deps !== void 0) {
-    if (state.cachedDeps !== deps) journalRootProperty(state, "cachedDeps");
+    if (ROOT_RENDER_TRANSACTION !== null && state.cachedDeps !== deps)
+      journalRootProperty(state, "cachedDeps", state.cachedDeps);
     state.cachedDeps = deps;
   }
   if (mapped) {
-    if (state.mappedNative !== true) journalRootProperty(state, "mappedNative");
+    if (state.mappedNative !== true) journalRootProperty(state, "mappedNative", state.mappedNative);
     state.mappedNative = true;
   }
   try {
@@ -19756,7 +19908,8 @@ function fastKeyedForBlock(parentScope, slotKey, domParent, items, getKey, itemB
     return;
   }
   mountFastHostItems(parentScope, state, parent, items, getKey, itemBody, flags, deps, false);
-  if (state.selectionItems !== items) journalRootProperty(state, "selectionItems");
+  if (state.selectionItems !== items)
+    journalRootProperty(state, "selectionItems", state.selectionItems);
   state.selectionItems = items;
 }
 function fastMapSlot(scopeOrItems, slotOrMethod, domParent, items, method, native, callback, getKey, itemBody, flags, deps, anchor, ownEnd) {
@@ -19833,8 +19986,10 @@ function tryUpdateKeyedSelection(state, items, itemBody, previousDeps, deps, sel
   }
   const previous = previousDeps[selectionIndex];
   const next = deps[selectionIndex];
-  if (state.cachedDeps !== deps) journalRootProperty(state, "cachedDeps");
-  if (state.env !== deps) journalRootProperty(state, "env");
+  if (ROOT_RENDER_TRANSACTION !== null && state.cachedDeps !== deps)
+    journalRootProperty(state, "cachedDeps", state.cachedDeps);
+  if (ROOT_RENDER_TRANSACTION !== null && state.env !== deps)
+    journalRootProperty(state, "env", state.env);
   state.cachedDeps = deps;
   state.env = deps;
   if (Object.is(previous, next)) return true;
@@ -19847,8 +20002,8 @@ function tryUpdateKeyedSelection(state, items, itemBody, previousDeps, deps, sel
     second = swap;
   }
   if (first !== void 0) {
-    if (first.body !== itemBody) journalRootProperty(first, "body");
-    if (first.extra !== deps) journalRootProperty(first, "extra");
+    if (first.body !== itemBody) journalRootProperty(first, "body", first.body);
+    if (first.extra !== deps) journalRootProperty(first, "extra", first.extra);
     first.body = itemBody;
     first.extra = deps;
     if (selectionBody !== void 0 && first._slots === null) {
@@ -19858,8 +20013,8 @@ function tryUpdateKeyedSelection(state, items, itemBody, previousDeps, deps, sel
     }
   }
   if (second !== void 0) {
-    if (second.body !== itemBody) journalRootProperty(second, "body");
-    if (second.extra !== deps) journalRootProperty(second, "extra");
+    if (second.body !== itemBody) journalRootProperty(second, "body", second.body);
+    if (second.extra !== deps) journalRootProperty(second, "extra", second.extra);
     second.body = itemBody;
     second.extra = deps;
     if (selectionBody !== void 0 && second._slots === null) {
@@ -19891,14 +20046,16 @@ const MAX_KEYED_REORDER_SCRATCH = 16384;
 let keyedReorderSources = null;
 let keyedLisPredecessors = null;
 function updateSurvivor(block, newItem, newIdx, itemBody, pure, lite, indexIndependent, env) {
-  if (block.itemIndex !== newIdx) journalRootProperty(block, "itemIndex");
-  if (block.body !== itemBody) journalRootProperty(block, "body");
+  const journal = ROOT_RENDER_TRANSACTION !== null && !ROOT_RENDER_ROLLBACK;
+  if (journal && block.itemIndex !== newIdx)
+    journalRootProperty(block, "itemIndex", block.itemIndex);
+  if (journal && block.body !== itemBody) journalRootProperty(block, "body", block.body);
   if (pure && block.props === newItem && (indexIndependent || block.itemIndex === newIdx)) {
     block.itemIndex = newIdx;
     block.body = itemBody;
   } else {
-    if (block.props !== newItem) journalRootProperty(block, "props");
-    if (block.extra !== env) journalRootProperty(block, "extra");
+    if (journal && block.props !== newItem) journalRootProperty(block, "props", block.props);
+    if (journal && block.extra !== env) journalRootProperty(block, "extra", block.extra);
     block.props = newItem;
     block.body = itemBody;
     block.itemIndex = newIdx;
@@ -19939,7 +20096,6 @@ function mountItemsLinear(parentBlock, state, items, getKey, itemBody, singleRoo
   const adopt = state.adopt;
   let adoptIndex = 0;
   let prev = null;
-  const mounted = [];
   try {
     for (let i = 0; i < newLen; i++) {
       const item = items[i];
@@ -19967,7 +20123,6 @@ function mountItemsLinear(parentBlock, state, items, getKey, itemBody, singleRoo
         ssrMarkerless,
         adoptNode
       );
-      mounted.push(block);
       oldItems.set(key, block);
       block.key = key;
       block.prevSibling = prev;
@@ -19979,8 +20134,9 @@ function mountItemsLinear(parentBlock, state, items, getKey, itemBody, singleRoo
     state.tail = prev;
     state.size = newLen;
   } catch (error) {
-    for (let i = mounted.length - 1; i >= 0; i--) {
-      const block = mounted[i];
+    while (prev !== null) {
+      const block = prev;
+      prev = block.prevSibling;
       oldItems.delete(block.key);
       if (isSuspenseException(error)) retainDiscardedWarmMemos(block);
       unmountBlock(block, !ROOT_RENDER_TRANSACTION?.retainedCreated?.has(block));
@@ -20362,7 +20518,7 @@ function deferRootOwnedListClear(state, certified = false) {
       newlyRetired.push(block);
     }
     if (block.pending) {
-      journalRootProperty(block, "pending");
+      journalRootProperty(block, "pending", block.pending);
       block.pending = false;
     }
   }
@@ -21281,7 +21437,8 @@ function makeRoot(container, rootBlock, currentBody, currentKey, idState, output
       const block = rootBlock;
       renderOwner.request = (renderMode) => {
         renderOwner.transaction.rootRequest = true;
-        if (block.props !== props) journalRootProperty(block, "props");
+        const previousProps = block.props;
+        if (previousProps !== props) journalRootProperty(block, "props", previousProps);
         block.props = props;
         block.pendingMode = renderMode;
         renderBlock(block);
@@ -21301,7 +21458,7 @@ function makeRoot(container, rootBlock, currentBody, currentKey, idState, output
     const previousRoot = rootBlock;
     const previousBody = currentBody;
     const previousKey = currentKey;
-    const staged = container.nodeType !== 9 && previousRoot !== null && previousRoot.mounted && !previousRoot.disposed && !renderOwner.transaction.created?.has(previousRoot);
+    const staged = container.nodeType !== 9 && previousRoot !== null && previousRoot.mounted && !previousRoot.disposed && !isCreatedInRootRender(renderOwner.transaction, previousRoot);
     const oldFirst = staged ? container.firstChild : null;
     const oldLast = staged ? container.lastChild : null;
     journalUndo(() => {
@@ -21645,7 +21802,7 @@ function hydrateRoot(container, bodyOrElement, propsOrOptions, rootOptions) {
     owner.transaction.rootRequest = true;
     owner.transaction.hydrating = true;
     createdInRootRender(rootBlock);
-    journalRootProperty(idState, "next");
+    journalRootProperty(idState, "next", idState.next);
     idState.next = 0;
     let firstNode = container.firstChild;
     while (firstNode !== null && (firstNode.nodeType === 10 || isRendererHydrationStyle(firstNode)))
@@ -22290,6 +22447,8 @@ export {
   textHoleUpdate,
   textSlot,
   tryBlock,
+  updateFreshClassAttr,
+  updateFreshClassName,
   use,
   useActionState,
   useBatch,