octane 0.10.0 → 0.10.2

package/README.md

@@ -17,6 +17,15 @@ wrapper is narrower: the wrapper must be locally declared in a fully compiled
 parameter to a supported hook. This package ships both the runtime and compiler,
 with the compiler exposed at `octane/compiler`.
 
+To use the compiler in Node, including through the Vite, Rspack, or Rsbuild
+integrations, install its optional parser peer in your project:
+
+```bash
+pnpm add @tsrx/oxc@0.16.0
+```
+
+Applications that use only the Octane runtime do not need this peer.
+
 [Signals](https://octanejs.dev/docs/signals) are stable. Import `createScope` and
 `query` from `octane/signals`, or `useSignal$` from `octane/signals/client`, for
 scoped state, derived values, async resources, and native component reads.

package/dist/cjs/error-codes.client.generated.cjs

@@ -1069,6 +1069,11 @@ function formatClientError(code, ...args) {
           "A descriptor carried a function form action, but no element factory installed form actions. This is a bug in the Octane compiler.",
           args
         );
+      case 343:
+        return (0, import_error_message.formatDevErrorMessage)(
+          "A keyed list rollback record restored a different shape than it recorded. This is a bug in Octane.",
+          args
+        );
       default:
         return (0, import_error_message.formatUnknownDevErrorMessage)(code);
     }

package/dist/cjs/runtime.cjs

@@ -2256,6 +2256,7 @@ const TRANSITION_JOURNAL_BAG_WINDOWS = [];
 let TRANSITION_JOURNAL_DEPTH = 0;
 let TRANSITION_JOURNAL_REPLAYING = false;
 let ROOT_RENDER_TRANSACTION = null;
+let ROOT_DISCARD_STAMP = -1;
 let ROOT_RENDER_TRANSACTIONS = [];
 let ROOT_RENDER_ROLLBACK = false;
 let NEXT_ROOT_RENDER_CREATED_STAMP = 0;
@@ -2301,10 +2302,12 @@ function beginRootRender(owner) {
     bagWindow: TRANSITION_JOURNAL_BAG_WINDOW,
     depth: TRANSITION_JOURNAL_DEPTH,
     parked: PARKED_ITEMS,
-    capture: WIP_CAPTURE
+    capture: WIP_CAPTURE,
+    discardStamp: ROOT_DISCARD_STAMP
   };
   DEFERRED_LAYOUT_DRIVER?.recordRootTransaction(transaction);
   ROOT_RENDER_TRANSACTION = transaction;
+  ROOT_DISCARD_STAMP = transaction.hydrating === true || transaction.retainedCreated !== null ? -1 : transaction.createdStamp;
   TRANSITION_JOURNAL = transaction.log;
   TRANSITION_JOURNAL_BAGS = transaction.bags;
   TRANSITION_JOURNAL_CHECKPOINT = 0;
@@ -2318,6 +2321,7 @@ function endRootRender(frame) {
   if (frame === null) return;
   frame.transaction.parked = PARKED_ITEMS;
   ROOT_RENDER_TRANSACTION = frame.previous;
+  ROOT_DISCARD_STAMP = frame.discardStamp;
   TRANSITION_JOURNAL = frame.log;
   TRANSITION_JOURNAL_BAGS = frame.bags;
   TRANSITION_JOURNAL_CHECKPOINT = frame.checkpoint;
@@ -2544,8 +2548,10 @@ function createdInRootRender(block) {
   TRANSITION_JOURNAL.push(JOURNAL_CREATED, block, transaction, null);
 }
 function preserveRootCreatedDom(block) {
-  if (ROOT_RENDER_TRANSACTION !== null)
+  if (ROOT_RENDER_TRANSACTION !== null) {
     (ROOT_RENDER_TRANSACTION.retainedCreated ??= /* @__PURE__ */ new Set()).add(block);
+    ROOT_DISCARD_STAMP = -1;
+  }
 }
 function rollbackRootRender(transaction) {
   if (transaction.aborted) return;
@@ -2839,9 +2845,7 @@ function cloneBindingBag(bag, arity) {
 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;
+  if (TRANSITION_JOURNAL_DEPTH === 1 && scope.block.createdStamp === ROOT_DISCARD_STAMP) return;
   const bag = scope.slots[0];
   if (bag === null || typeof bag !== "object") return;
   const arity = bag[BINDING_BAG_ARITY];
@@ -3002,9 +3006,20 @@ function itemRemovalDefers() {
 function forSlotParkable(state) {
   return TRANSITION_JOURNAL !== null && TRANSITION_JOURNAL_BAGS.has(state);
 }
-function journalForSlot(state) {
+const SLOT_RECORDS = /* @__PURE__ */ new WeakMap();
+function journalForSlot(state, link) {
   const seen = TRANSITION_JOURNAL_BAGS;
-  if ((seen.get(state) ?? -1) >= TRANSITION_JOURNAL_CHECKPOINT) return false;
+  let records = SLOT_RECORDS.get(TRANSITION_JOURNAL);
+  const current = records?.get(state) ?? null;
+  if ((seen.get(state) ?? -1) >= TRANSITION_JOURNAL_CHECKPOINT) {
+    if (link) return current;
+    if (current !== null && current.links !== null) fullForSlotRecord(state, current);
+    return null;
+  }
+  if (current !== null) {
+    if (current.links !== null) fullForSlotRecord(state, current);
+    records.delete(state);
+  }
   seen.set(state, TRANSITION_JOURNAL.length);
   if (ROOT_RENDER_TRANSACTION !== null && (ROOT_RENDER_TRANSACTION.hydrating === true && import_hydration_flag.hydrating && activeHydration() !== null || state.adopt !== null)) {
     journalUndo(() => {
@@ -3013,28 +3028,76 @@ function journalForSlot(state) {
     journalRootRange(domNode(state.start).parentNode, state.start, state.end);
     for (let b = state.head; b !== null; b = b.nextSibling)
       TRANSITION_JOURNAL.push(JOURNAL_PROP, b, "itemIndex", b.itemIndex);
-    return false;
-  }
-  const chain = [];
-  for (let b = state.head; b !== null; b = b.nextSibling) {
-    chain.push(b);
+    return null;
   }
-  const keyOrder = [...state.items.values()];
-  let mapOrder = keyOrder.length === chain.length ? null : keyOrder;
-  for (let i = 0; mapOrder === null && i < keyOrder.length; i++)
-    if (keyOrder[i] !== chain[i]) mapOrder = keyOrder;
-  const snapshot = {
+  let chain = null;
+  let mapOrder = null;
+  if (!link) {
+    chain = [];
+    for (let b = state.head; b !== null; b = b.nextSibling) chain.push(b);
+    const keyOrder = [...state.items.values()];
+    if (keyOrder.length !== chain.length) mapOrder = keyOrder;
+    for (let i = 0; mapOrder === null && i < keyOrder.length; i++)
+      if (keyOrder[i] !== chain[i]) mapOrder = keyOrder;
+  }
+  const record = {
     empty: state.emptyBlock,
-    mapOrder
+    chain,
+    mapOrder,
+    head: state.head,
+    links: link ? /* @__PURE__ */ new Map() : null,
+    inOrder: state.inOrder,
+    prior: null
   };
+  if (link) {
+    if (__octaneDev) record.check = forSlotShape(state);
+    if (records === void 0) SLOT_RECORDS.set(TRANSITION_JOURNAL, records = /* @__PURE__ */ new Map());
+    records.set(state, record);
+  }
+  const owner = records;
   journalUndo(() => {
-    restoreForSlot(state, snapshot, chain);
-    TRANSITION_JOURNAL_BAGS.delete(state);
+    if (record.links !== null) fullForSlotRecord(state, record);
+    restoreForSlot(state, record, record.chain);
+    seen.delete(state);
+    if (owner?.get(state) === record) owner.delete(state);
   });
-  return false;
+  return link ? record : null;
+}
+function forSlotShape(state) {
+  const chain = [];
+  for (let b = state.head; b !== null; b = b.nextSibling) chain.push(b);
+  const keyOrder = [...state.items.values()];
+  return keyOrder.length === chain.length && keyOrder.every((block, i) => block === chain[i]) ? [chain] : [chain, keyOrder];
+}
+function fullForSlotRecord(state, record) {
+  const links = record.links;
+  record.links = null;
+  const chain = [];
+  for (let b = record.head; b !== null; b = links.has(b) ? links.get(b) : b.nextSibling)
+    chain.push(b);
+  record.chain = chain;
+  if (!record.inOrder) {
+    const kept = new Set(chain);
+    const mapOrder = [];
+    for (const block of record.prior ?? state.items.values())
+      if (kept.has(block)) mapOrder.push(block);
+    record.mapOrder = mapOrder;
+  }
+  if (__octaneDev) {
+    const [expectedChain, expectedMap = expectedChain] = record.check;
+    const restoredMap = record.mapOrder ?? chain;
+    if (expectedChain.length !== chain.length || expectedChain.some((block, i) => block !== chain[i]) || expectedMap.length !== restoredMap.length || expectedMap.some((block, i) => block !== restoredMap[i]))
+      throw new Error((0, import_error_codes_client_generated.formatClientError)(343));
+  }
 }
 function journalForOwnedListClear(state) {
   const seen = TRANSITION_JOURNAL_BAGS;
+  const records = SLOT_RECORDS.get(TRANSITION_JOURNAL);
+  const current = records?.get(state);
+  if (current !== void 0) {
+    if (current.links !== null) fullForSlotRecord(state, current);
+    records.delete(state);
+  }
   const oldItems = state.items;
   seen.set(state, TRANSITION_JOURNAL.length);
   const snapshot = {
@@ -3049,6 +3112,7 @@ function journalForOwnedListClear(state) {
     seen.delete(state);
   });
   state.items = /* @__PURE__ */ new Map();
+  state.inOrder = true;
 }
 function restoreForSlot(state, snapshot, chain) {
   const preservedMap = chain === null ? snapshot.entries : null;
@@ -3060,8 +3124,10 @@ function restoreForSlot(state, snapshot, chain) {
   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 {
+  if (preservedMap !== null) {
+    state.items = preservedMap;
+    state.inOrder = false;
+  } else {
     const originalChain = chain;
     state.items.clear();
     for (let i = 0; i < originalChain.length; i++) {
@@ -3075,6 +3141,7 @@ function restoreForSlot(state, snapshot, chain) {
       const block = keyOrder[i];
       state.items.set(block.key, block);
     }
+    state.inOrder = keyOrder === originalChain;
   }
   const nodes = [];
   for (let b = state.head; b !== null; b = b.nextSibling) {
@@ -15356,7 +15423,7 @@ function writeDirectSignalText(target, value, kind, previous) {
 function writeDirectSignalAttribute(target, value, _kind, _previous, name, attributeKind) {
   const element = target;
   if (attributeKind === "class") {
-    if (element.namespaceURI === HTML_NS) setClassName(element, value);
+    if (element.namespaceURI === HTML_NS) setClassName(element, value, true);
     else setClassAttr(element, value);
   } else attributeKind(element, name, value);
   return value;
@@ -16898,11 +16965,12 @@ function coerceAttrValue(el, name, value) {
   }
   return v;
 }
-function setClassName(el, value) {
+function setClassName(el, value, foreign) {
   const cls = (0, import_css.normalizeClass)(value);
   const hydration = import_hydration_flag.hydrating ? activeHydration() : null;
   if (hydration !== null && hydration.keepsClass(el, cls, true)) return;
-  if (TRANSITION_JOURNAL !== null) journalAttr(el, "class");
+  if (TRANSITION_JOURNAL !== null && (foreign === true || TRANSITION_JOURNAL_DEPTH !== 1 || CURRENT_SCOPE?.block.createdStamp !== ROOT_DISCARD_STAMP))
+    journalAttr(el, "class");
   if (value == null || value === false) (STAGED_DOM?.view(el) ?? el).removeAttribute("class");
   else (STAGED_DOM?.view(el) ?? el).className = cls;
 }
@@ -16918,7 +16986,7 @@ function setDeoptClass(el, value) {
   if (el.namespaceURI === SVG_NS) {
     setClassAttr(el, value);
   } else {
-    setClassName(el, value);
+    setClassName(el, value, true);
   }
 }
 const IMPORTANT_SUFFIX = "!important";
@@ -17081,7 +17149,7 @@ function removeHostProp(el, name, prevValue) {
       return;
     }
     const ev = eventSlot(name, el);
-    if (ev) setEventHandler(el, ev.key, null);
+    if (ev) setEventHandler(el, ev.key, null, true);
     else setAttribute(el, name, null);
   }
 }
@@ -17680,7 +17748,8 @@ function setSpread(el, value, prev, mountScope, skipDangerouslySetInnerHTML = fa
       setEventHandler(
         el,
         ev.key,
-        __octaneDev ? devEventListener(k, v) : v
+        __octaneDev ? devEventListener(k, v) : v,
+        true
       );
       continue;
     }
@@ -17966,9 +18035,9 @@ function retireHostRange(node, last) {
     if (node === last) return;
   }
 }
-function setEventHandler(el, key, handler) {
+function setEventHandler(el, key, handler, foreign) {
   if (key !== void 0) {
-    if (TRANSITION_JOURNAL !== null) {
+    if (TRANSITION_JOURNAL !== null && (foreign === true || TRANSITION_JOURNAL_DEPTH !== 1 || CURRENT_SCOPE?.block.createdStamp !== ROOT_DISCARD_STAMP)) {
       TRANSITION_JOURNAL.push(
         JOURNAL_PROP,
         el,
@@ -23033,6 +23102,7 @@ function renderPreparedChildList(state, parentBlock, domParent, preparedList, hy
       // Non-null: an anchorless slot was promoted to markers above.
       end: state.end,
       items: /* @__PURE__ */ new Map(),
+      inOrder: true,
       head: null,
       tail: null,
       size: 0,
@@ -28526,6 +28596,7 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
       start,
       end,
       items: /* @__PURE__ */ new Map(),
+      inOrder: true,
       head: null,
       tail: null,
       size: 0,
@@ -29171,6 +29242,7 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
   const newLen = items.length;
   const parentNode = domNode(state.end).parentNode;
   let journalShape = TRANSITION_JOURNAL !== null;
+  let record = null;
   if (oldSize === 0) {
     mountItemsLinear(
       parentBlock,
@@ -29198,6 +29270,7 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
     state.head = null;
     state.tail = null;
     state.size = 0;
+    state.inOrder = true;
     return;
   }
   let oldFirst = state.head;
@@ -29209,7 +29282,10 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
     if (observeKey !== void 0) observeKey(prefixLen, newKey);
     const block = oldFirst;
     if (!pure || block.props !== newItem || block.body !== itemBody || block.itemIndex !== prefixLen) {
-      if (journalShape && block.itemIndex !== prefixLen) journalShape = journalForSlot(state);
+      if (journalShape && block.itemIndex !== prefixLen) {
+        record = journalForSlot(state, true);
+        journalShape = false;
+      }
       updateSurvivor(block, newItem, prefixLen, itemBody, pure, lite, indexIndependent, state.env);
     }
     oldFirst = block.nextSibling;
@@ -29226,7 +29302,10 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
     if (observeKey !== void 0) observeKey(newEnd, newKey);
     const block = oldLast;
     if (!pure || block.props !== newItem || block.body !== itemBody || block.itemIndex !== newEnd) {
-      if (journalShape && block.itemIndex !== newEnd) journalShape = journalForSlot(state);
+      if (journalShape && block.itemIndex !== newEnd) {
+        record = journalForSlot(state, true);
+        journalShape = false;
+      }
       updateSurvivor(block, newItem, newEnd, itemBody, pure, lite, indexIndependent, state.env);
     }
     oldLast = block.prevSibling;
@@ -29243,7 +29322,11 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
     afterMiddle = oldLast.nextSibling;
   }
   if (oldRemain === 0) {
-    if (journalShape) journalForSlot(state);
+    if (journalShape) record = journalForSlot(state, true);
+    const links = record !== null ? record.links : null;
+    if (links !== null && beforeMiddle !== null && !links.has(beforeMiddle))
+      links.set(beforeMiddle, beforeMiddle.nextSibling);
+    if (afterMiddle !== null) state.inOrder = false;
     const anchor = afterMiddle ? afterMiddle.startMarker : state.end;
     let prev = beforeMiddle;
     for (let i = prefixLen; i <= newEnd; i++) {
@@ -29277,7 +29360,13 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
     return;
   }
   if (prefixLen > newEnd) {
-    if (journalShape) journalForSlot(state);
+    if (journalShape) record = journalForSlot(state, true);
+    const links = record !== null ? record.links : null;
+    if (links !== null) {
+      if (!record.inOrder) record.prior ??= [...oldItems.values()];
+      if (beforeMiddle !== null && !links.has(beforeMiddle))
+        links.set(beforeMiddle, beforeMiddle.nextSibling);
+    }
     let cur = oldFirst;
     let removed = 0;
     while (cur !== afterMiddle) {
@@ -29315,8 +29404,9 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
       cur = cur.nextSibling;
     }
     if (!anySurvivors) {
-      if (journalShape) journalForSlot(state);
+      if (journalShape || record !== null && record.links !== null) journalForSlot(state);
       batchClearItems(state, oldItems);
+      state.inOrder = true;
       state.head = null;
       state.tail = null;
       state.size = 0;
@@ -29369,7 +29459,11 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
       const next = cur.nextSibling;
       const newRelIdx = newKeysToIdx.get(cur.key);
       if (newRelIdx === void 0) {
-        if (journalShape) journalShape = journalForSlot(state);
+        if (journalShape || record !== null && record.links !== null) {
+          journalForSlot(state);
+          journalShape = false;
+          record = null;
+        }
         if (itemRemovalDefers()) parkItemForHold(cur);
         else unmountBlock(cur);
         oldItems.delete(cur.key);
@@ -29382,7 +29476,10 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
         const newIdx = prefixLen + newRelIdx;
         const newItem = items[newIdx];
         if (!pure || cur.props !== newItem || cur.body !== itemBody || cur.itemIndex !== newIdx) {
-          if (journalShape && cur.itemIndex !== newIdx) journalShape = journalForSlot(state);
+          if (journalShape && cur.itemIndex !== newIdx) {
+            record = journalForSlot(state, true);
+            journalShape = false;
+          }
           updateSurvivor(cur, newItem, newIdx, itemBody, pure, lite, indexIndependent, state.env);
         }
       }
@@ -29405,7 +29502,7 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
       }
       return;
     }
-    if (journalShape) journalForSlot(state);
+    state.inOrder = false;
     if (moved && patched === newMidLen) {
       let dCount = 0;
       for (let i = 0; i < newMidLen; i++) {
@@ -29418,6 +29515,16 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
         }
       }
       if (dCount <= K_DISP) {
+        if (journalShape) record = journalForSlot(state, true);
+        const links = record !== null ? record.links : null;
+        if (links !== null) {
+          const touched = [beforeMiddle, oldItems.get(newKeys[newMidLen - 1])];
+          for (let j = 0; j < dCount; j++) {
+            const i = _disp[j];
+            touched.push(oldItems.get(newKeys[i]), i > 0 ? oldItems.get(newKeys[i - 1]) : null);
+          }
+          for (const b of touched) if (b !== null && !links.has(b)) links.set(b, b.nextSibling);
+        }
         const endAnchor = afterMiddle ? afterMiddle.startMarker : state.end;
         for (let j = dCount - 1; j >= 0; j--) {
           const i = _disp[j];
@@ -29448,6 +29555,7 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
         return;
       }
     }
+    if (journalShape || record !== null && record.links !== null) journalForSlot(state);
     const middleEndAnchor = afterMiddle ? afterMiddle.startMarker : state.end;
     if (patched === newMidLen) {
       const seq = lis(sources, newMidLen);
@@ -29564,13 +29672,14 @@ function deferRootOwnedListClear(state, certified = false) {
     if (cancelled) return;
     let wholeParent = state.size === 0 && (STAGED_DOM?.view(start) ?? start).parentNode === parent && (STAGED_DOM?.view(end) ?? end).parentNode === parent && (STAGED_DOM?.view(start) ?? start).previousSibling === null && getNextSibling(end) === null;
     if (wholeParent) {
+      const read = STAGED_DOM === null ? nextSiblingGetter : void 0;
       let node = getNextSibling(start);
       for (let block = oldHead; block !== null; block = block.nextSibling) {
-        if (node !== block.startMarker) {
+        if (node === null || node !== block.startMarker) {
           wholeParent = false;
           break;
         }
-        node = getNextSibling(node);
+        node = read !== void 0 ? read.call(node) : getNextSibling(node);
       }
       if (node !== end) wholeParent = false;
     }
@@ -31058,6 +31167,7 @@ function hydrateRootWithOutputHandler(container, bodyOrElement, propsOrOptions,
     const frame = beginRootRender(owner);
     owner.transaction.rootRequest = true;
     owner.transaction.hydrating = true;
+    ROOT_DISCARD_STAMP = -1;
     createdInRootRender(rootBlock);
     journalRootProperty(idState, "next", idState.next);
     idState.next = rootOptions?.identifierSeed ?? 0;

package/dist/cjs/version.cjs

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