marko 6.0.0-next.3.26 → 6.0.0-next.3.28

package/dist/dom.mjs

@@ -45,49 +45,6 @@ function triggerMacroTask() {
   port2.postMessage(0);
 }
 
-// src/dom/scope.ts
-var pendingScopes = [];
-function createScope($global) {
-  let scope = {
-    f: 1,
-    $global
-  };
-  return pendingScopes.push(scope), scope;
-}
-function finishPendingScopes() {
-  for (let scope of pendingScopes)
-    scope.f = 0;
-  pendingScopes = [];
-}
-var emptyBranch = createScope({});
-function getEmptyBranch(marker) {
-  return emptyBranch.a = emptyBranch.c = marker, emptyBranch;
-}
-function destroyBranch(branch) {
-  branch.n?.k?.delete(branch), destroyNestedBranches(branch);
-}
-function destroyNestedBranches(branch) {
-  branch.z = 1, branch.k?.forEach(destroyNestedBranches), branch.A?.forEach((scope) => {
-    for (let id in scope.g)
-      scope.g[id]?.abort();
-  });
-}
-function removeAndDestroyBranch(branch) {
-  destroyBranch(branch);
-  let current = branch.a, stop = branch.c.nextSibling;
-  for (; current !== stop; ) {
-    let next = current.nextSibling;
-    current.remove(), current = next;
-  }
-}
-function insertBranchBefore(branch, parent, nextSibling) {
-  let current = branch.a, stop = branch.c.nextSibling;
-  for (; current !== stop; ) {
-    let next = current.nextSibling;
-    parent.insertBefore(current, nextSibling), current = next;
-  }
-}
-
 // src/common/helpers.ts
 function classValue(value2) {
   return toDelimitedString(value2, " ", stringifyClassObject);
@@ -134,83 +91,6 @@ function normalizeDynamicRenderer(value2) {
   if (value2) return value2.content || value2.default || value2;
 }
 
-// src/dom/reconcile.ts
-var WRONG_POS = 2147483647;
-function reconcile(parent, oldBranches, newBranches, afterReference) {
-  let oldStart = 0, newStart = 0, oldEnd = oldBranches.length - 1, newEnd = newBranches.length - 1, oldStartBranch = oldBranches[oldStart], newStartBranch = newBranches[newStart], oldEndBranch = oldBranches[oldEnd], newEndBranch = newBranches[newEnd], i, j, k, nextSibling, oldBranch, newBranch;
-  outer: {
-    for (; oldStartBranch === newStartBranch; ) {
-      if (++oldStart, ++newStart, oldStart > oldEnd || newStart > newEnd)
-        break outer;
-      oldStartBranch = oldBranches[oldStart], newStartBranch = newBranches[newStart];
-    }
-    for (; oldEndBranch === newEndBranch; ) {
-      if (--oldEnd, --newEnd, oldStart > oldEnd || newStart > newEnd)
-        break outer;
-      oldEndBranch = oldBranches[oldEnd], newEndBranch = newBranches[newEnd];
-    }
-  }
-  if (oldStart > oldEnd) {
-    if (newStart <= newEnd) {
-      k = newEnd + 1, nextSibling = k < newBranches.length ? newBranches[k].a : afterReference;
-      do
-        insertBranchBefore(newBranches[newStart++], parent, nextSibling);
-      while (newStart <= newEnd);
-    }
-  } else if (newStart > newEnd)
-    do
-      removeAndDestroyBranch(oldBranches[oldStart++]);
-    while (oldStart <= oldEnd);
-  else {
-    let oldLength = oldEnd - oldStart + 1, newLength = newEnd - newStart + 1, aNullable = oldBranches, sources = new Array(newLength);
-    for (i = 0; i < newLength; ++i)
-      sources[i] = -1;
-    let pos = 0, synced = 0, keyIndex = /* @__PURE__ */ new Map();
-    for (j = newStart; j <= newEnd; ++j)
-      keyIndex.set(newBranches[j], j);
-    for (i = oldStart; i <= oldEnd && synced < newLength; ++i)
-      oldBranch = oldBranches[i], j = keyIndex.get(oldBranch), j !== void 0 && (pos = pos > j ? WRONG_POS : j, ++synced, newBranch = newBranches[j], sources[j - newStart] = i, aNullable[i] = null);
-    if (oldLength === oldBranches.length && synced === 0) {
-      for (; newStart < newLength; ++newStart)
-        insertBranchBefore(newBranches[newStart], parent, afterReference);
-      for (; oldStart < oldLength; ++oldStart)
-        removeAndDestroyBranch(oldBranches[oldStart]);
-    } else {
-      for (i = oldLength - synced; i > 0; )
-        oldBranch = aNullable[oldStart++], oldBranch !== null && (removeAndDestroyBranch(oldBranch), i--);
-      if (pos === WRONG_POS) {
-        let seq = longestIncreasingSubsequence(sources);
-        for (j = seq.length - 1, k = newBranches.length, i = newLength - 1; i >= 0; --i)
-          sources[i] === -1 ? (pos = i + newStart, newBranch = newBranches[pos++], nextSibling = pos < k ? newBranches[pos].a : afterReference, insertBranchBefore(newBranch, parent, nextSibling)) : j < 0 || i !== seq[j] ? (pos = i + newStart, newBranch = newBranches[pos++], nextSibling = pos < k ? newBranches[pos].a : afterReference, insertBranchBefore(newBranch, parent, nextSibling)) : --j;
-      } else if (synced !== newLength)
-        for (k = newBranches.length, i = newLength - 1; i >= 0; --i)
-          sources[i] === -1 && (pos = i + newStart, newBranch = newBranches[pos++], nextSibling = pos < k ? newBranches[pos].a : afterReference, insertBranchBefore(newBranch, parent, nextSibling));
-    }
-  }
-}
-function longestIncreasingSubsequence(a) {
-  let p = a.slice(), result = [];
-  result.push(0);
-  let u, v;
-  for (let i = 0, il = a.length; i < il; ++i) {
-    if (a[i] === -1)
-      continue;
-    let j = result[result.length - 1];
-    if (a[j] < a[i]) {
-      p[i] = j, result.push(i);
-      continue;
-    }
-    for (u = 0, v = result.length - 1; u < v; ) {
-      let c = (u + v) / 2 | 0;
-      a[result[c]] < a[i] ? u = c + 1 : v = c;
-    }
-    a[i] < a[result[u]] && (u > 0 && (p[i] = result[u - 1]), result[u] = i);
-  }
-  for (u = result.length, v = result[u - 1]; u-- > 0; )
-    result[u] = v, v = p[v];
-  return result;
-}
-
 // src/dom/event.ts
 var elementHandlersByEvent = /* @__PURE__ */ new Map(), defaultDelegator = createDelegator();
 function on(element, type, handler) {
@@ -225,7 +105,7 @@ function createDelegator() {
   };
 }
 function handleDelegated(ev) {
-  let target = ev.target;
+  let target = !rendering && ev.target;
   if (target) {
     let handlersByElement = elementHandlersByEvent.get(ev.type);
     if (handlersByElement.get(target)?.(ev, target), ev.bubbles)
@@ -261,28 +141,28 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {}, Render = class {
-  o = [];
-  p = {};
-  B = {
+  n = [];
+  o = {};
+  z = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.C = renders, this.D = runtimeId, this.q = renderId, this.s = renders[renderId], this.t();
+    this.A = renders, this.B = runtimeId, this.p = renderId, this.q = renders[renderId], this.s();
   }
   w() {
-    this.s.w(), this.t();
+    this.q.w(), this.s();
   }
-  t() {
-    let data2 = this.s, serializeContext = this.B, scopeLookup = this.p, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+  s() {
+    let data2 = this.q, serializeContext = this.z, scopeLookup = this.o, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
-      let commentPrefixLen = data2.i.length, closestBranchMarkers = /* @__PURE__ */ new Map();
+      let commentPrefixLen = data2.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
       data2.v = [];
-      let branchEnd = (branchId, visit, curNode) => {
-        let branch = scopeLookup[branchId] ||= {}, endNode = curNode;
-        for (; (endNode = endNode.previousSibling).nodeType === 8; ) ;
-        branch.c = endNode, branch.a ||= endNode;
+      let branchEnd = (branchId, visit, reference) => {
+        let branch = scopeLookup[branchId] ||= {}, endNode = reference;
+        for (; visitNodes.has(endNode = endNode.previousSibling); ) ;
+        endNode === lastEndNode && (endNode = reference.parentNode.insertBefore(new Text(), reference)), branch.b = lastEndNode = endNode, branch.a ||= endNode;
         for (let [markerScopeId, markerNode] of closestBranchMarkers)
-          branch.a.compareDocumentPosition(markerNode) & 4 && curNode.compareDocumentPosition(markerNode) & 2 && (parentBranchIds.set(markerScopeId, branchId), closestBranchMarkers.delete(markerScopeId));
+          branch.a.compareDocumentPosition(markerNode) & 4 && reference.compareDocumentPosition(markerNode) & 2 && (parentBranchIds.set(markerScopeId, branchId), closestBranchMarkers.delete(markerScopeId));
         return branchIds.add(branchId), closestBranchMarkers.set(branchId, visit), branch;
       };
       for (let visit of visits) {
@@ -295,7 +175,7 @@ var registeredValues = {}, Render = class {
         else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
-          this.e && (dataIndex && branchEnd(this.e, visit, visit), this.o.push(this.e)), this.e = scopeId, scope.a = visit;
+          this.e && (dataIndex && branchEnd(this.e, visit, visit), this.n.push(this.e)), this.e = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
@@ -303,14 +183,14 @@ var registeredValues = {}, Render = class {
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.e = this.o.pop();
+          curParent !== startNode.parentNode && curParent.prepend(startNode), this.e = this.n.pop();
         } else if (token === "|" /* BranchSingleNode */) {
           let next = data3.indexOf(" "), curNode = scope[~next ? data3.slice(0, next) : data3] = visit;
           for (; ~next; ) {
             let start = next + 1;
             next = data3.indexOf(" ", start);
             let childScopeId = data3.slice(start, ~next ? next : data3.length);
-            curNode = branchEnd(childScopeId, visit, curNode).c;
+            curNode = branchEnd(childScopeId, visit, curNode).b;
           }
         }
       }
@@ -324,7 +204,7 @@ var registeredValues = {}, Render = class {
           let resumeData = resumes[i++];
           if (typeof resumeData == "function") {
             let scopes = resumeData(serializeContext), { $global } = scopeLookup;
-            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.D, $global.renderId = this.q);
+            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.B, $global.renderId = this.p);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -333,12 +213,12 @@ var registeredValues = {}, Render = class {
                   prevScope
                 ));
                 let parentBranchId = parentBranchIds.get(scopeId);
-                if (parentBranchId && (scope.b = scopes[parentBranchId]), branchIds.has(scopeId)) {
-                  let branch = scope, parentBranch = branch.b;
-                  branch.h = +scopeId, scope.b = branch, parentBranch && (branch.n = parentBranch, (parentBranch.k ||= /* @__PURE__ */ new Set()).add(branch));
+                if (parentBranchId && (scope.c = scopes[parentBranchId]), branchIds.has(scopeId)) {
+                  let branch = scope, parentBranch = branch.c;
+                  branch.f = +scopeId, scope.c = branch, parentBranch && (branch.t = parentBranch, (parentBranch.k ||= /* @__PURE__ */ new Set()).add(branch));
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.C[this.q] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.A[this.p] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -376,7 +256,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   }
 }
 function registerSubscriber(id, signal) {
-  return register(id, signal.E), signal;
+  return register(id, signal.C), signal;
 }
 function nodeRef(id, key) {
   return register(id, (scope) => () => scope[key]);
@@ -555,7 +435,7 @@ function toValueProp(it) {
 }
 
 // src/dom/parse-html.ts
-var fallback = /* @__PURE__ */ new Text(), parser = /* @__PURE__ */ document.createElement("template");
+var parser = /* @__PURE__ */ document.createElement("template");
 function parseHTML(html2) {
   return parser.innerHTML = html2, parser.content;
 }
@@ -570,7 +450,7 @@ function parseHTMLOrSingleNode(html2) {
     let fragment = new DocumentFragment();
     return fragment.appendChild(content), fragment;
   }
-  return fallback;
+  return new Text();
 }
 
 // src/dom/dom.ts
@@ -709,14 +589,12 @@ function attrsEvents(scope, nodeAccessor) {
   for (let name in events)
     on(el, name, events[name]);
 }
-function html(scope, value2, index) {
-  let firstChild = scope[index], lastChild = scope[index + "-"] || firstChild, parentNode = firstChild.parentNode, afterReference = lastChild.nextSibling, newContent = parseHTML(value2 || value2 === 0 ? value2 + "" : "<!>");
-  scope[index] = newContent.firstChild, scope[index + "-" /* DynamicPlaceholderLastChild */] = newContent.lastChild, parentNode.insertBefore(newContent, firstChild);
-  let current = firstChild;
-  for (; current !== afterReference; ) {
-    let next = current.nextSibling;
-    current.remove(), current = next;
-  }
+function html(scope, value2, accessor) {
+  let firstChild = scope[accessor], lastChild = scope[accessor + "-" /* DynamicPlaceholderLastChild */] || firstChild, newContent = parseHTML(
+    value2 || value2 === 0 ? value2 + "" : "<!>"
+    // TODO: is the comment needed
+  );
+  scope[accessor] = newContent.firstChild, scope[accessor + "-" /* DynamicPlaceholderLastChild */] = newContent.lastChild, firstChild.parentNode.insertBefore(newContent, firstChild), removeChildNodes(firstChild, lastChild);
 }
 function props(scope, nodeIndex, index) {
   let nextProps = scope[index], prevProps = scope[index + "-"], node = scope[nodeIndex];
@@ -741,6 +619,128 @@ function lifecycle(scope, index, thisObj) {
     "-" /* LifecycleAbortController */ + index
   ).onabort = () => thisObj.onDestroy?.());
 }
+function removeChildNodes(startNode, endNode) {
+  let stop = endNode.nextSibling, current = startNode;
+  for (; current !== stop; ) {
+    let next = current.nextSibling;
+    current.remove(), current = next;
+  }
+}
+
+// src/dom/scope.ts
+var pendingScopes = [];
+function createScope($global) {
+  let scope = {
+    g: 1,
+    $global
+  };
+  return pendingScopes.push(scope), scope;
+}
+function finishPendingScopes() {
+  for (let scope of pendingScopes)
+    scope.g = 0;
+  pendingScopes = [];
+}
+var emptyBranch = createScope({});
+function getEmptyBranch(marker) {
+  return emptyBranch.a = emptyBranch.b = marker, emptyBranch;
+}
+function destroyBranch(branch) {
+  branch.t?.k?.delete(branch), destroyNestedBranches(branch);
+}
+function destroyNestedBranches(branch) {
+  branch.D = 1, branch.k?.forEach(destroyNestedBranches), branch.E?.forEach((scope) => {
+    for (let id in scope.h)
+      scope.h[id]?.abort();
+  });
+}
+function removeAndDestroyBranch(branch) {
+  destroyBranch(branch), removeChildNodes(branch.a, branch.b);
+}
+function insertBranchBefore(branch, parentNode, nextSibling) {
+  let current = branch.a, stop = branch.b.nextSibling;
+  for (; current !== stop; ) {
+    let next = current.nextSibling;
+    parentNode.insertBefore(current, nextSibling), current = next;
+  }
+}
+
+// src/dom/reconcile.ts
+var WRONG_POS = 2147483647;
+function reconcile(parent, oldBranches, newBranches, afterReference) {
+  let oldStart = 0, newStart = 0, oldEnd = oldBranches.length - 1, newEnd = newBranches.length - 1, oldStartBranch = oldBranches[oldStart], newStartBranch = newBranches[newStart], oldEndBranch = oldBranches[oldEnd], newEndBranch = newBranches[newEnd], i, j, k, nextSibling, oldBranch, newBranch;
+  outer: {
+    for (; oldStartBranch === newStartBranch; ) {
+      if (++oldStart, ++newStart, oldStart > oldEnd || newStart > newEnd)
+        break outer;
+      oldStartBranch = oldBranches[oldStart], newStartBranch = newBranches[newStart];
+    }
+    for (; oldEndBranch === newEndBranch; ) {
+      if (--oldEnd, --newEnd, oldStart > oldEnd || newStart > newEnd)
+        break outer;
+      oldEndBranch = oldBranches[oldEnd], newEndBranch = newBranches[newEnd];
+    }
+  }
+  if (oldStart > oldEnd) {
+    if (newStart <= newEnd) {
+      k = newEnd + 1, nextSibling = k < newBranches.length ? newBranches[k].a : afterReference;
+      do
+        insertBranchBefore(newBranches[newStart++], parent, nextSibling);
+      while (newStart <= newEnd);
+    }
+  } else if (newStart > newEnd)
+    do
+      removeAndDestroyBranch(oldBranches[oldStart++]);
+    while (oldStart <= oldEnd);
+  else {
+    let oldLength = oldEnd - oldStart + 1, newLength = newEnd - newStart + 1, aNullable = oldBranches, sources = new Array(newLength);
+    for (i = 0; i < newLength; ++i)
+      sources[i] = -1;
+    let pos = 0, synced = 0, keyIndex = /* @__PURE__ */ new Map();
+    for (j = newStart; j <= newEnd; ++j)
+      keyIndex.set(newBranches[j], j);
+    for (i = oldStart; i <= oldEnd && synced < newLength; ++i)
+      oldBranch = oldBranches[i], j = keyIndex.get(oldBranch), j !== void 0 && (pos = pos > j ? WRONG_POS : j, ++synced, newBranch = newBranches[j], sources[j - newStart] = i, aNullable[i] = null);
+    if (oldLength === oldBranches.length && synced === 0) {
+      for (; newStart < newLength; ++newStart)
+        insertBranchBefore(newBranches[newStart], parent, afterReference);
+      for (; oldStart < oldLength; ++oldStart)
+        removeAndDestroyBranch(oldBranches[oldStart]);
+    } else {
+      for (i = oldLength - synced; i > 0; )
+        oldBranch = aNullable[oldStart++], oldBranch !== null && (removeAndDestroyBranch(oldBranch), i--);
+      if (pos === WRONG_POS) {
+        let seq = longestIncreasingSubsequence(sources);
+        for (j = seq.length - 1, k = newBranches.length, i = newLength - 1; i >= 0; --i)
+          sources[i] === -1 ? (pos = i + newStart, newBranch = newBranches[pos++], nextSibling = pos < k ? newBranches[pos].a : afterReference, insertBranchBefore(newBranch, parent, nextSibling)) : j < 0 || i !== seq[j] ? (pos = i + newStart, newBranch = newBranches[pos++], nextSibling = pos < k ? newBranches[pos].a : afterReference, insertBranchBefore(newBranch, parent, nextSibling)) : --j;
+      } else if (synced !== newLength)
+        for (k = newBranches.length, i = newLength - 1; i >= 0; --i)
+          sources[i] === -1 && (pos = i + newStart, newBranch = newBranches[pos++], nextSibling = pos < k ? newBranches[pos].a : afterReference, insertBranchBefore(newBranch, parent, nextSibling));
+    }
+  }
+}
+function longestIncreasingSubsequence(a) {
+  let p = a.slice(), result = [];
+  result.push(0);
+  let u, v;
+  for (let i = 0, il = a.length; i < il; ++i) {
+    if (a[i] === -1)
+      continue;
+    let j = result[result.length - 1];
+    if (a[j] < a[i]) {
+      p[i] = j, result.push(i);
+      continue;
+    }
+    for (u = 0, v = result.length - 1; u < v; ) {
+      let c = (u + v) / 2 | 0;
+      a[result[c]] < a[i] ? u = c + 1 : v = c;
+    }
+    a[i] < a[result[u]] && (u > 0 && (p[i] = result[u - 1]), result[u] = i);
+  }
+  for (u = result.length, v = result[u - 1]; u-- > 0; )
+    result[u] = v, v = p[v];
+  return result;
+}
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
@@ -749,8 +749,8 @@ function trimWalkString(walkString) {
   for (; walkString.charCodeAt(--end) > 47 /* BeginChild */; ) ;
   return walkString.slice(0, end + 1);
 }
-function walk(startNode, walkCodes, scope) {
-  walker.currentNode = startNode, walkInternal(walkCodes, scope, 0), walker.currentNode = document;
+function walk(startNode, walkCodes, branch) {
+  walker.currentNode = startNode, walkInternal(walkCodes, branch, 0), walker.currentNode = document;
 }
 function walkInternal(walkCodes, scope, currentWalkIndex) {
   let value2, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
@@ -769,7 +769,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
         walker.nextNode();
     else if (value2 === 47 /* BeginChild */) {
       let childScope = scope[currentScopeIndex++] = createScope(scope.$global);
-      childScope.a = walker.currentNode, childScope.b = scope.b, currentWalkIndex = walkInternal(walkCodes, childScope, currentWalkIndex);
+      childScope.c = scope.c, currentWalkIndex = walkInternal(walkCodes, childScope, currentWalkIndex);
     } else {
       if (value2 === 38 /* EndChild */)
         return currentWalkIndex;
@@ -800,11 +800,11 @@ function createBranchScopeWithTagNameOrRenderer(tagNameOrRenderer, $global, pare
       parentScope
     );
   let branch = createBranch($global, parentScope, parentScope);
-  return branch[0] = branch.a = branch.c = document.createElement(tagNameOrRenderer), branch;
+  return branch[0] = branch.a = branch.b = document.createElement(tagNameOrRenderer), branch;
 }
 function createBranch($global, ownerScope, parentScope) {
-  let branch = createScope($global), parentBranch = parentScope.b;
-  return branch._ = ownerScope, branch.b = branch, parentBranch ? (branch.h = parentBranch.h + 1, branch.n = parentBranch, (parentBranch.k ||= /* @__PURE__ */ new Set()).add(branch)) : branch.h = 1, branch;
+  let branch = createScope($global), parentBranch = parentScope.c;
+  return branch._ = ownerScope, branch.c = branch, parentBranch ? (branch.f = parentBranch.f + 1, branch.t = parentBranch, (parentBranch.k ||= /* @__PURE__ */ new Set()).add(branch)) : branch.f = 1, branch;
 }
 function initBranch(renderer, branch) {
   let dom = renderer.l();
@@ -812,7 +812,7 @@ function initBranch(renderer, branch) {
     dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom,
     renderer.F,
     branch
-  ), branch.a = dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom, branch.c = dom.nodeType === 11 /* DocumentFragment */ ? dom.lastChild : dom, renderer.x && queueRender(branch, renderer.x), dom;
+  ), branch.a = dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom, branch.b = dom.nodeType === 11 /* DocumentFragment */ ? dom.lastChild : dom, renderer.x && queueRender(branch, renderer.x), dom;
 }
 function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
   return (scope, attrsOrOp) => {
@@ -883,8 +883,8 @@ function setConditionalRenderer(scope, nodeAccessor, newRenderer) {
   let prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */] || getEmptyBranch(scope[nodeAccessor]), newBranch = newRenderer ? createBranchScopeWithTagNameOrRenderer(newRenderer, scope.$global, scope) : getEmptyBranch(scope[nodeAccessor]);
   insertBranchBefore(
     newBranch,
-    prevBranch.a.parentNode,
-    prevBranch.a
+    prevBranch.b.parentNode,
+    prevBranch.b.nextSibling
   ), removeAndDestroyBranch(prevBranch), scope[nodeAccessor + "!" /* ConditionalScope */] = newRenderer && newBranch;
 }
 var conditionalOnlyChild = function(nodeAccessor, fn, getIntersection) {
@@ -957,7 +957,7 @@ function loop(nodeAccessor, renderer, forEach) {
       if (referenceIsMarker) {
         oldMap === emptyMarkerMap && getEmptyBranch(referenceNode);
         let oldLastChild = oldArray[oldArray.length - 1];
-        afterReference = oldLastChild.c.nextSibling, parentNode = oldLastChild.a.parentNode;
+        afterReference = oldLastChild.b.nextSibling, parentNode = oldLastChild.a.parentNode;
       } else
         afterReference = null, parentNode = referenceNode;
       reconcile(parentNode, oldArray, newArray, afterReference);
@@ -1013,14 +1013,14 @@ function loopClosure(ownerLoopNodeAccessor, fn, getIntersection) {
     let loopScopes = ownerScope[loopScopeAccessor] ?? ownerScope[loopScopeMapAccessor]?.values() ?? [];
     if (loopScopes !== emptyMarkerArray)
       for (let scope of loopScopes)
-        scope.f || queueSource(scope, signal, value2);
+        scope.g || queueSource(scope, signal, value2);
   };
   return helperSignal._ = signal, helperSignal;
 }
 function conditionalClosure(ownerConditionalNodeAccessor, getRenderer, fn, getIntersection) {
   let signal = closure(fn, getIntersection), scopeAccessor = ownerConditionalNodeAccessor + "!" /* ConditionalScope */, rendererAccessor = ownerConditionalNodeAccessor + "(" /* ConditionalRenderer */, helperSignal = (scope, value2) => {
     let conditionalScope = scope[scopeAccessor];
-    conditionalScope && !conditionalScope.f && scope[rendererAccessor]?.j === getRenderer().j && queueSource(conditionalScope, signal, value2);
+    conditionalScope && !conditionalScope.g && scope[rendererAccessor]?.j === getRenderer().j && queueSource(conditionalScope, signal, value2);
   };
   return helperSignal._ = signal, helperSignal;
 }
@@ -1030,7 +1030,7 @@ function dynamicClosure(fn, getOwnerScope = defaultGetOwnerScope, getIntersectio
     let subscribers = ownerScope[ownerSubscribersAccessor];
     if (subscribers)
       for (let subscriber of subscribers)
-        subscriber.f || queueSource(subscriber, _signal, value2);
+        subscriber.g || queueSource(subscriber, _signal, value2);
   }, setupSignal = (scope, value2) => {
     _signal(scope, value2), subscribe(scope);
   }, subscribe = (scope) => {
@@ -1038,7 +1038,7 @@ function dynamicClosure(fn, getOwnerScope = defaultGetOwnerScope, getIntersectio
       getOwnerScope(scope)[ownerSubscribersAccessor].delete(scope);
     });
   };
-  return helperSignal._ = setupSignal, helperSignal.E = subscribe, helperSignal;
+  return helperSignal._ = setupSignal, helperSignal.C = subscribe, helperSignal;
 }
 function setTagVar(scope, childAccessor, tagVarSignal2) {
   scope[childAccessor]["/" /* TagVariable */] = (valueOrOp) => tagVarSignal2(scope, valueOrOp);
@@ -1135,7 +1135,7 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.m.b?.z || render.I(render.m, render.J);
+    render.m.c?.D || render.I(render.m, render.J);
   }
   finishPendingScopes();
 }
@@ -1143,32 +1143,32 @@ function comparePendingRenders(a, b) {
   return getBranchDepth(a) - getBranchDepth(b) || a.y - b.y;
 }
 function getBranchDepth(render) {
-  return render.m.b?.h || 0;
+  return render.m.c?.f || 0;
 }
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.g?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.g[id] = void 0);
+  let ctrl = scope.h?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.h[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.b && (scope.b.A ||= /* @__PURE__ */ new Set()).add(scope), ((scope.g ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.E ||= /* @__PURE__ */ new Set()).add(scope), ((scope.h ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
 }
 
 // src/common/compat-meta.ts
-var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s";
+var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s", RENDER_BODY_ID = prefix + "b";
 
 // src/dom/compat.ts
-var classIdToScope = /* @__PURE__ */ new Map(), compat = {
+var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   patchConditionals,
   queueEffect,
-  init() {
-    register(SET_SCOPE_REGISTER_ID, (scope) => {
-      classIdToScope.set(scope.m5c, scope);
-    });
+  init(warp10Noop) {
+    register(SET_SCOPE_REGISTER_ID, (branch) => {
+      classIdToBranch.set(branch.m5c, branch);
+    }), register(RENDER_BODY_ID, warp10Noop);
   },
   registerRenderer(fn) {
     register(RENDERER_REGISTER_ID, fn);
@@ -1179,11 +1179,11 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
   isRenderer(renderer) {
     return renderer.l !== void 0;
   },
-  getStartNode(scope) {
-    return scope.a;
+  getStartNode(branch) {
+    return branch.a;
   },
-  setScopeNodes(scope, startNode, endNode) {
-    scope.a = startNode, scope.c = endNode;
+  setScopeNodes(branch, startNode, endNode) {
+    branch.a = startNode, branch.b = endNode;
   },
   runComponentEffects() {
     runEffects(this.effects);
@@ -1197,7 +1197,7 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
   }) {
     return Array.isArray(value2) && typeof value2[0] == "string" ? getRegisteredWithScope(
       value2[0],
-      value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.p[value2[1]]
+      value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.o[value2[1]]
     ) : value2;
   },
   createRenderer(setup, clone, args) {
@@ -1205,8 +1205,8 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
     return renderer.l = clone, renderer;
   },
   render(out, component, renderer, args) {
-    let scope = component.scope;
-    scope || (scope = classIdToScope.get(component.id), scope && (component.scope = scope, classIdToScope.delete(component.id)));
+    let branch = component.scope;
+    branch || (branch = classIdToBranch.get(component.id), branch && (component.scope = branch, classIdToBranch.delete(component.id)));
     let applyArgs = renderer.d || noop, existing = !1;
     if (typeof args[0] == "object" && "renderBody" in args[0]) {
       let input = args[0], normalizedInput = args[0] = {};
@@ -1214,9 +1214,9 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      scope ? (applyArgs(scope, MARK), existing = !0) : (scope = component.scope = createScope(out.global), scope._ = renderer.u, initBranch(renderer, scope)), applyArgs(scope, args);
+      branch ? (applyArgs(branch, MARK), existing = !0) : (branch = component.scope = createScope(out.global), branch._ = renderer.u, initBranch(renderer, branch)), applyArgs(branch, args);
     }), !existing)
-      return scope.a === scope.c ? scope.a : scope.a.parentNode;
+      return branch.a === branch.b ? branch.a : branch.a.parentNode;
   }
 };
 function noop() {

package/dist/html/compat.d.ts

@@ -11,4 +11,5 @@ export declare const compat: {
     toJSON(this: WeakKey): [registryId: string, scopeId: unknown] | undefined;
     render(renderer: ServerRenderer, willRerender: boolean, classAPIOut: any, component: any, input: any): void;
     registerRenderer(renderer: any, id: string): any;
+    registerRenderBody(fn: any): void;
 };

package/dist/html/serializer.d.ts

@@ -1,4 +1,5 @@
 import type { Boundary } from "./writer";
+export declare function debug(obj: WeakKey, file: string, loc: string | 0, vars?: Record<string, string>): WeakKey;
 export declare class Serializer {
     #private;
     get flushed(): boolean;
@@ -12,3 +13,4 @@ export declare function getRegistered(val: WeakKey): {
     scope: unknown;
 } | undefined;
 export declare function stringify(val: unknown): string;
+export declare function toAccess(accessor: string): string;

package/dist/html.d.ts

@@ -5,5 +5,6 @@ export { compat } from "./html/compat";
 export { escapeScript, escapeStyle, escapeXML, toString } from "./html/content";
 export { createRenderer, dynamicTagArgs, dynamicTagInput, } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forTo, forToBy } from "./html/for";
+export { debug } from "./html/serializer";
 export { createTemplate } from "./html/template";
 export { $global, ensureScopeWithId, fork, getScopeById, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScope, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, resumeSingleNodeConditional, resumeSingleNodeForIn, resumeSingleNodeForOf, resumeSingleNodeForTo, tryContent, write, writeEffect, writeExistingScope, writeScope, writeTrailers, } from "./html/writer";