marko 6.0.0-next.3.25 → 6.0.0-next.3.27

package/dist/dom.mjs

@@ -45,46 +45,6 @@ function triggerMacroTask() {
   port2.postMessage(0);
 }
 
-// src/dom/scope.ts
-var pendingScopes = [];
-function createScope($global) {
-  let scope = {
-    e: 1,
-    $global
-  };
-  return pendingScopes.push(scope), scope;
-}
-function finishPendingScopes() {
-  for (let scope of pendingScopes)
-    scope.e = 0;
-  pendingScopes = [];
-}
-var emptyScope = createScope({});
-function getEmptyScope(marker) {
-  return emptyScope.a = emptyScope.c = marker, emptyScope;
-}
-function destroyBranch(branch) {
-  if (branch.y = 1, branch.m?.forEach(destroyBranch), branch.n)
-    for (let scope of branch.n)
-      for (let id in scope.j)
-        scope.j[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 insertBefore(scope, parent, nextSibling) {
-  let current = scope.a, stop = scope.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);
@@ -131,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
-        insertBefore(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)
-        insertBefore(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, insertBefore(newBranch, parent, nextSibling)) : j < 0 || i !== seq[j] ? (pos = i + newStart, newBranch = newBranches[pos++], nextSibling = pos < k ? newBranches[pos].a : afterReference, insertBefore(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, insertBefore(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) {
@@ -222,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)
@@ -258,28 +141,28 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {}, Render = class {
-  o = [];
-  p = {};
+  n = [];
+  o = {};
   z = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.A = renders, this.B = 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.z, 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) {
@@ -292,22 +175,22 @@ var registeredValues = {}, Render = class {
         else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
-          this.h && (dataIndex && branchEnd(this.h, visit, visit), this.o.push(this.h)), this.h = 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(
-            this.h,
+            this.e,
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.h = 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;
           }
         }
       }
@@ -321,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.B, $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];
@@ -330,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;
-                  scope.b = branch, parentBranch && (branch.C = parentBranch, (parentBranch.m ||= /* @__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.A[this.q] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.A[this.p] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -373,7 +256,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   }
 }
 function registerSubscriber(id, signal) {
-  return register(id, signal.D), signal;
+  return register(id, signal.C), signal;
 }
 function nodeRef(id, key) {
   return register(id, (scope) => () => scope[key]);
@@ -552,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;
 }
@@ -567,7 +450,7 @@ function parseHTMLOrSingleNode(html2) {
     let fragment = new DocumentFragment();
     return fragment.appendChild(content), fragment;
   }
-  return fallback;
+  return new Text();
 }
 
 // src/dom/dom.ts
@@ -706,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];
@@ -738,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);
@@ -746,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;
@@ -766,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;
@@ -787,7 +790,7 @@ function createBranchScopeWithRenderer(renderer, $global, parentScope) {
     renderer.u || parentScope,
     parentScope
   );
-  return initRenderer(renderer, branch), branch;
+  return initBranch(renderer, branch), branch;
 }
 function createBranchScopeWithTagNameOrRenderer(tagNameOrRenderer, $global, parentScope) {
   if (typeof tagNameOrRenderer != "string")
@@ -797,19 +800,19 @@ 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.C = parentBranch, (parentBranch.m ||= /* @__PURE__ */ new Set()).add(branch)), 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 initRenderer(renderer, scope) {
+function initBranch(renderer, branch) {
   let dom = renderer.l();
   return walk(
     dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom,
-    renderer.E,
-    scope
-  ), scope.a = dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom, scope.c = dom.nodeType === 11 /* DocumentFragment */ ? dom.lastChild : dom, renderer.x && queueRender(scope, renderer.x), dom;
+    renderer.F,
+    branch
+  ), 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) => {
@@ -818,13 +821,13 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
       return;
     let childScope = scope[nodeAccessor + "!" /* ConditionalScope */];
     if (attrsOrOp === MARK || attrsOrOp === CLEAN)
-      return renderer.f?.(childScope, attrsOrOp);
+      return renderer.d?.(childScope, attrsOrOp);
     let content = getContent?.(scope);
     if (typeof renderer == "string")
       setConditionalRendererOnlyChild(childScope, 0, content), attrs(childScope, 0, attrsOrOp());
-    else if (renderer.f) {
+    else if (renderer.d) {
       let attributes = attrsOrOp();
-      renderer.f(
+      renderer.d(
         childScope,
         inputIsArgs ? attributes : [
           content ? {
@@ -839,14 +842,14 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
 function createRendererWithOwner(template, rawWalks, setup, getArgs) {
   let args, id = {}, walks = rawWalks ? /* @__PURE__ */ trimWalkString(rawWalks) : " ";
   return (owner) => ({
-    k: id,
-    F: template,
-    E: walks,
+    j: id,
+    G: template,
+    F: walks,
     x: setup,
     l: _clone,
     u: owner,
-    G: void 0,
-    get f() {
+    H: void 0,
+    get d() {
       return args ||= getArgs?.();
     }
   });
@@ -855,8 +858,8 @@ function createRenderer(template, walks, setup, getArgs) {
   return createRendererWithOwner(template, walks, setup, getArgs)();
 }
 function _clone() {
-  return (this.G ||= parseHTMLOrSingleNode(
-    this.F
+  return (this.H ||= parseHTMLOrSingleNode(
+    this.G
   )).cloneNode(!0);
 }
 
@@ -871,18 +874,18 @@ var conditional = function(nodeAccessor, fn, getIntersection) {
     let currentRenderer = scope[rendererAccessor], op = newRendererOrOp;
     if (newRendererOrOp !== MARK && newRendererOrOp !== CLEAN) {
       let normalizedRenderer = normalizeDynamicRenderer(newRendererOrOp);
-      isDifferentRenderer(normalizedRenderer, currentRenderer) ? (setConditionalRenderer(scope, nodeAccessor, normalizedRenderer), fn && fn(scope), op = DIRTY) : op = CLEAN;
+      isDifferentRenderer(normalizedRenderer, currentRenderer) ? (scope[rendererAccessor] = normalizedRenderer, setConditionalRenderer(scope, nodeAccessor, normalizedRenderer), fn && fn(scope), op = DIRTY) : op = CLEAN;
     }
     intersection2?.(scope, op);
   };
 };
 function setConditionalRenderer(scope, nodeAccessor, newRenderer) {
-  let newBranch = newRenderer ? createBranchScopeWithTagNameOrRenderer(newRenderer, scope.$global, scope) : void 0, prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */] || getEmptyScope(scope[nodeAccessor]);
-  insertBefore(
-    newBranch || getEmptyScope(scope[nodeAccessor]),
-    prevBranch.a.parentNode,
-    prevBranch.a
-  ), removeAndDestroyBranch(prevBranch), scope[nodeAccessor + "(" /* ConditionalRenderer */] = newRenderer, scope[nodeAccessor + "!" /* ConditionalScope */] = newBranch;
+  let prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */] || getEmptyBranch(scope[nodeAccessor]), newBranch = newRenderer ? createBranchScopeWithTagNameOrRenderer(newRenderer, scope.$global, scope) : getEmptyBranch(scope[nodeAccessor]);
+  insertBranchBefore(
+    newBranch,
+    prevBranch.b.parentNode,
+    prevBranch.b.nextSibling
+  ), removeAndDestroyBranch(prevBranch), scope[nodeAccessor + "!" /* ConditionalScope */] = newRenderer && newBranch;
 }
 var conditionalOnlyChild = function(nodeAccessor, fn, getIntersection) {
   let rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */, intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
@@ -902,12 +905,12 @@ var conditionalOnlyChild = function(nodeAccessor, fn, getIntersection) {
 };
 function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer) {
   let prevBranch = scope[nodeAccessor + "!" /* ConditionalScope */], referenceNode = scope[nodeAccessor], newBranch = newRenderer ? createBranchScopeWithTagNameOrRenderer(newRenderer, scope.$global, scope) : void 0;
-  referenceNode.textContent = "", newBranch && insertBefore(newBranch, referenceNode, null), prevBranch && destroyBranch(prevBranch), scope[nodeAccessor + "!" /* ConditionalScope */] = newBranch;
+  referenceNode.textContent = "", newBranch && insertBranchBefore(newBranch, referenceNode, null), prevBranch && destroyBranch(prevBranch), scope[nodeAccessor + "!" /* ConditionalScope */] = newBranch;
 }
 var emptyMarkerMap = /* @__PURE__ */ new Map([
-  [Symbol(), getEmptyScope(void 0)]
+  [Symbol(), getEmptyBranch(void 0)]
 ]), emptyMarkerArray = [
-  /* @__PURE__ */ getEmptyScope(void 0)
+  /* @__PURE__ */ getEmptyBranch(void 0)
 ], emptyMap = /* @__PURE__ */ new Map(), emptyArray = [];
 function loopOf(nodeAccessor, renderer) {
   return loop(
@@ -936,7 +939,7 @@ function loopTo(nodeAccessor, renderer) {
   );
 }
 function loop(nodeAccessor, renderer, forEach) {
-  let loopScopeAccessor = nodeAccessor + "!" /* LoopScopeArray */, params = renderer.f;
+  let loopScopeAccessor = nodeAccessor + "!" /* LoopScopeArray */, params = renderer.d;
   return (scope, valueOrOp) => {
     if (valueOrOp === DIRTY) return;
     if (valueOrOp === MARK || valueOrOp === CLEAN) {
@@ -950,11 +953,11 @@ function loop(nodeAccessor, renderer, forEach) {
     if (forEach(valueOrOp, (key, args) => {
       let branch = oldMap.get(key);
       branch || (branch = createBranchScopeWithRenderer(renderer, scope.$global, scope)), params && params(branch, args), newMap ? (newMap.set(key, branch), newArray.push(branch)) : (newMap = /* @__PURE__ */ new Map([[key, branch]]), newArray = [branch]);
-    }), newMap || (referenceIsMarker ? (newMap = emptyMarkerMap, newArray = emptyMarkerArray, getEmptyScope(referenceNode)) : (oldArray.forEach(destroyBranch), referenceNode.textContent = "", newMap = emptyMap, newArray = emptyArray, needsReconciliation = !1)), needsReconciliation) {
+    }), newMap || (referenceIsMarker ? (newMap = emptyMarkerMap, newArray = emptyMarkerArray, getEmptyBranch(referenceNode)) : (oldArray.forEach(destroyBranch), referenceNode.textContent = "", newMap = emptyMap, newArray = emptyArray, needsReconciliation = !1)), needsReconciliation) {
       if (referenceIsMarker) {
-        oldMap === emptyMarkerMap && getEmptyScope(referenceNode);
+        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);
@@ -969,7 +972,7 @@ function byFirstArg(name) {
   return name;
 }
 function isDifferentRenderer(a, b) {
-  return a !== b && (a?.k || 0) !== b?.k;
+  return a !== b && (a?.j || 0) !== b?.j;
 }
 
 // src/dom/signals.ts
@@ -1010,24 +1013,24 @@ function loopClosure(ownerLoopNodeAccessor, fn, getIntersection) {
     let loopScopes = ownerScope[loopScopeAccessor] ?? ownerScope[loopScopeMapAccessor]?.values() ?? [];
     if (loopScopes !== emptyMarkerArray)
       for (let scope of loopScopes)
-        scope.e || 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.e && scope[rendererAccessor]?.k === getRenderer().k && queueSource(conditionalScope, signal, value2);
+    conditionalScope && !conditionalScope.g && scope[rendererAccessor]?.j === getRenderer().j && queueSource(conditionalScope, signal, value2);
   };
   return helperSignal._ = signal, helperSignal;
 }
 var defaultGetOwnerScope = (scope) => scope._;
-function dynamicClosure(ownerValueAccessor, fn, getOwnerScope = defaultGetOwnerScope, getIntersection) {
-  let ownerSubscribersAccessor = ownerValueAccessor + "*" /* Subscribers */, _signal = closure(fn, getIntersection), helperSignal = (ownerScope, value2) => {
+function dynamicClosure(fn, getOwnerScope = defaultGetOwnerScope, getIntersection) {
+  let ownerSubscribersAccessor = "?" /* Dynamic */ + accessorId++, _signal = closure(fn, getIntersection), helperSignal = (ownerScope, value2) => {
     let subscribers = ownerScope[ownerSubscribersAccessor];
     if (subscribers)
       for (let subscriber of subscribers)
-        subscriber.e || queueSource(subscriber, _signal, value2);
+        subscriber.g || queueSource(subscriber, _signal, value2);
   }, setupSignal = (scope, value2) => {
     _signal(scope, value2), subscribe(scope);
   }, subscribe = (scope) => {
@@ -1035,7 +1038,7 @@ function dynamicClosure(ownerValueAccessor, fn, getOwnerScope = defaultGetOwnerS
       getOwnerScope(scope)[ownerSubscribersAccessor].delete(scope);
     });
   };
-  return helperSignal._ = setupSignal, helperSignal.D = subscribe, helperSignal;
+  return helperSignal._ = setupSignal, helperSignal.C = subscribe, helperSignal;
 }
 function setTagVar(scope, childAccessor, tagVarSignal2) {
   scope[childAccessor]["/" /* TagVariable */] = (valueOrOp) => tagVarSignal2(scope, valueOrOp);
@@ -1068,29 +1071,25 @@ function effect(id, fn) {
 }
 
 // src/dom/queue.ts
-var pendingRender, pendingEffects = [], rendering = !1;
+var pendingRenders = [], pendingEffects = [], rendering = !1;
 function queueSource(scope, signal, value2) {
   schedule();
   let prevRendering = rendering;
   return rendering = !0, signal(scope, MARK), rendering = prevRendering, queueRender(scope, signal, value2), value2;
 }
 function queueRender(scope, signal, value2) {
-  let nextRender = {
-    g: scope,
-    H: signal,
-    I: value2,
-    d: void 0
+  let i = pendingRenders.length, render = {
+    m: scope,
+    I: signal,
+    J: value2,
+    y: i
   };
-  if (!pendingRender)
-    pendingRender = nextRender;
-  else if (comparePendingRenders(pendingRender, nextRender) < 0)
-    nextRender.d = pendingRender, pendingRender = nextRender;
-  else {
-    let curRender = pendingRender;
-    for (; curRender.d && comparePendingRenders(curRender.d, nextRender) >= 0; )
-      curRender = curRender.d;
-    nextRender.d = curRender.d, curRender.d = nextRender;
+  for (pendingRenders.push(render); i; ) {
+    let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
+    if (comparePendingRenders(render, parent) >= 0) break;
+    pendingRenders[i] = parent, i = parentIndex;
   }
+  pendingRenders[i] = render;
 }
 function queueEffect(scope, fn) {
   pendingEffects.push(scope, fn);
@@ -1100,17 +1099,17 @@ function run() {
   try {
     rendering = !0, runRenders();
   } finally {
-    pendingRender = void 0, rendering = !1;
+    pendingRenders = [], pendingEffects = [], rendering = !1;
   }
-  pendingEffects = [], runEffects(effects);
+  runEffects(effects);
 }
 function prepareEffects(fn) {
-  let prevRender = pendingRender, prevEffects = pendingEffects, preparedEffects = pendingEffects = [];
-  pendingRender = void 0;
+  let prevRenders = pendingRenders, prevEffects = pendingEffects, preparedEffects = pendingEffects = [];
+  pendingRenders = [];
   try {
     rendering = !0, fn(), runRenders();
   } finally {
-    rendering = !1, pendingRender = prevRender, pendingEffects = prevEffects;
+    rendering = !1, pendingRenders = prevRenders, pendingEffects = prevEffects;
   }
   return preparedEffects;
 }
@@ -1121,26 +1120,39 @@ function runEffects(effects = pendingEffects) {
   }
 }
 function runRenders() {
-  for (; pendingRender; )
-    pendingRender.g.b?.y || pendingRender.H(pendingRender.g, pendingRender.I), pendingRender = pendingRender.d;
+  for (; pendingRenders.length; ) {
+    let render = pendingRenders[0], next = pendingRenders.pop();
+    if (render !== next) {
+      let i = 0, mid = pendingRenders.length >> 1, item = pendingRenders[0] = next;
+      for (; i < mid; ) {
+        let bestChild = (i << 1) + 1, right = bestChild + 1;
+        if (right < pendingRenders.length && comparePendingRenders(
+          pendingRenders[right],
+          pendingRenders[bestChild]
+        ) < 0 && (bestChild = right), comparePendingRenders(pendingRenders[bestChild], item) >= 0)
+          break;
+        pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
+      }
+      pendingRenders[i] = item;
+    }
+    render.m.c?.D || render.I(render.m, render.J);
+  }
   finishPendingScopes();
 }
 function comparePendingRenders(a, b) {
-  if (a.g.e || b.g.e) return 0;
-  let aStart = ownerStartNode(a.g), bStart = ownerStartNode(b.g);
-  return aStart === bStart ? 0 : aStart ? bStart ? aStart.compareDocumentPosition(bStart) & 2 ? -1 : 1 : -1 : 1;
+  return getBranchDepth(a) - getBranchDepth(b) || a.y - b.y;
 }
-function ownerStartNode(scope) {
-  return (scope.b || scope).a;
+function getBranchDepth(render) {
+  return render.m.c?.f || 0;
 }
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.j?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.j[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.n ||= /* @__PURE__ */ new Set()).add(scope), ((scope.j ||= {})[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();
@@ -1150,12 +1162,12 @@ function abort(ctrl) {
 var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s";
 
 // 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);
+    register(SET_SCOPE_REGISTER_ID, (branch) => {
+      classIdToBranch.set(branch.m5c, branch);
     });
   },
   registerRenderer(fn) {
@@ -1167,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);
@@ -1185,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) {
@@ -1193,18 +1205,18 @@ 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 applyArgs = renderer.f || noop, existing = !1;
+    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] = {};
       for (let key in input)
         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, initRenderer(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() {
@@ -1216,33 +1228,29 @@ var createTemplate = (templateId, ...rendererArgs) => {
   return renderer.mount = mount, renderer._ = renderer, register(templateId, renderer);
 };
 function mount(input = {}, reference, position) {
-  let branch, dom, { $global } = input;
-  $global ? ({ $global, ...input } = input, $global = {
+  let branch, dom, parentNode = reference, nextSibling = null, { $global } = input;
+  switch ($global ? ({ $global, ...input } = input, $global = {
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID,
     ...$global
   }) : $global = {
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
-  };
-  let args = this.f, effects = prepareEffects(() => {
-    branch = createScope($global), dom = initRenderer(this, branch), args && args(branch, [input]);
-  });
-  switch (position) {
+  }, position) {
     case "beforebegin":
-      reference.parentNode.insertBefore(dom, reference);
+      parentNode = reference.parentNode, nextSibling = reference;
       break;
     case "afterbegin":
-      reference.insertBefore(dom, reference.firstChild);
+      nextSibling = reference.firstChild;
       break;
     case "afterend":
-      reference.parentNode.insertBefore(dom, reference.nextSibling);
-      break;
-    default:
-      reference.appendChild(dom);
+      parentNode = reference.parentNode, nextSibling = reference.nextSibling;
       break;
   }
-  return runEffects(effects), {
+  let args = this.d, effects = prepareEffects(() => {
+    branch = createScope($global), dom = initBranch(this, branch), args?.(branch, [input]);
+  });
+  return parentNode.insertBefore(dom, nextSibling), runEffects(effects), {
     update: (newInput) => {
       args && runEffects(
         prepareEffects(() => {