marko 6.0.0-next.3.24 → 6.0.0-next.3.26

package/dist/dom.mjs

@@ -49,25 +49,28 @@ function triggerMacroTask() {
 var pendingScopes = [];
 function createScope($global) {
   let scope = {
-    g: 1,
+    f: 1,
     $global
   };
   return pendingScopes.push(scope), scope;
 }
 function finishPendingScopes() {
   for (let scope of pendingScopes)
-    scope.g = 0;
+    scope.f = 0;
   pendingScopes = [];
 }
-var emptyScope = createScope({});
-function getEmptyScope(marker) {
-  return emptyScope.a = emptyScope.c = marker, emptyScope;
+var emptyBranch = createScope({});
+function getEmptyBranch(marker) {
+  return emptyBranch.a = emptyBranch.c = marker, emptyBranch;
 }
 function destroyBranch(branch) {
-  if (branch.y = 1, branch.m?.forEach(destroyBranch), branch.n)
-    for (let scope of branch.n)
-      for (let id in scope.h)
-        scope.h[id]?.abort();
+  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);
@@ -77,8 +80,8 @@ function removeAndDestroyBranch(branch) {
     current.remove(), current = next;
   }
 }
-function insertBefore(scope, parent, nextSibling) {
-  let current = scope.a, stop = scope.c.nextSibling;
+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;
@@ -151,7 +154,7 @@ function reconcile(parent, oldBranches, newBranches, afterReference) {
     if (newStart <= newEnd) {
       k = newEnd + 1, nextSibling = k < newBranches.length ? newBranches[k].a : afterReference;
       do
-        insertBefore(newBranches[newStart++], parent, nextSibling);
+        insertBranchBefore(newBranches[newStart++], parent, nextSibling);
       while (newStart <= newEnd);
     }
   } else if (newStart > newEnd)
@@ -169,7 +172,7 @@ function reconcile(parent, oldBranches, newBranches, afterReference) {
       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);
+        insertBranchBefore(newBranches[newStart], parent, afterReference);
       for (; oldStart < oldLength; ++oldStart)
         removeAndDestroyBranch(oldBranches[oldStart]);
     } else {
@@ -178,10 +181,10 @@ function reconcile(parent, oldBranches, newBranches, afterReference) {
       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;
+          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, insertBefore(newBranch, parent, nextSibling));
+          sources[i] === -1 && (pos = i + newStart, newBranch = newBranches[pos++], nextSibling = pos < k ? newBranches[pos].a : afterReference, insertBranchBefore(newBranch, parent, nextSibling));
     }
   }
 }
@@ -260,17 +263,17 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 var registeredValues = {}, Render = class {
   o = [];
   p = {};
-  z = {
+  B = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.A = renders, this.B = runtimeId, this.q = renderId, this.s = renders[renderId], this.t();
+    this.C = renders, this.D = runtimeId, this.q = renderId, this.s = renders[renderId], this.t();
   }
   w() {
     this.s.w(), this.t();
   }
   t() {
-    let data2 = this.s, serializeContext = this.z, scopeLookup = this.p, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+    let data2 = this.s, serializeContext = this.B, scopeLookup = this.p, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
       let commentPrefixLen = data2.i.length, closestBranchMarkers = /* @__PURE__ */ new Map();
       data2.v = [];
@@ -292,15 +295,15 @@ var registeredValues = {}, Render = class {
         else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
-          this.f && (dataIndex && branchEnd(this.f, visit, visit), this.o.push(this.f)), this.f = scopeId, scope.a = visit;
+          this.e && (dataIndex && branchEnd(this.e, visit, visit), this.o.push(this.e)), this.e = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
           scope[data3] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
-            this.f,
+            this.e,
             visit,
             visit
           ).a;
-          curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.o.pop();
+          curParent !== startNode.parentNode && curParent.prepend(startNode), this.e = this.o.pop();
         } else if (token === "|" /* BranchSingleNode */) {
           let next = data3.indexOf(" "), curNode = scope[~next ? data3.slice(0, next) : data3] = visit;
           for (; ~next; ) {
@@ -321,7 +324,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.D, $global.renderId = this.q);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -332,10 +335,10 @@ var registeredValues = {}, Render = class {
                 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));
+                  branch.h = +scopeId, scope.b = branch, parentBranch && (branch.n = 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.C[this.q] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -373,7 +376,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   }
 }
 function registerSubscriber(id, signal) {
-  return register(id, signal.D), signal;
+  return register(id, signal.E), signal;
 }
 function nodeRef(id, key) {
   return register(id, (scope) => () => scope[key]);
@@ -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")
@@ -801,15 +804,15 @@ function createBranchScopeWithTagNameOrRenderer(tagNameOrRenderer, $global, pare
 }
 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;
+  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;
 }
-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.c = 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.e?.(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.e) {
+    else if (renderer.d) {
       let attributes = attrsOrOp();
-      renderer.e(
+      renderer.d(
         childScope,
         inputIsArgs ? attributes : [
           content ? {
@@ -840,13 +843,13 @@ function createRendererWithOwner(template, rawWalks, setup, getArgs) {
   let args, id = {}, walks = rawWalks ? /* @__PURE__ */ trimWalkString(rawWalks) : " ";
   return (owner) => ({
     j: id,
-    F: template,
-    E: walks,
+    G: template,
+    F: walks,
     x: setup,
     l: _clone,
     u: owner,
-    G: void 0,
-    get e() {
+    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]),
+  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
-  ), removeAndDestroyBranch(prevBranch), scope[nodeAccessor + "(" /* ConditionalRenderer */] = newRenderer, scope[nodeAccessor + "!" /* ConditionalScope */] = newBranch;
+  ), 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.e;
+  let loopScopeAccessor = nodeAccessor + "!" /* LoopScopeArray */, params = renderer.d;
   return (scope, valueOrOp) => {
     if (valueOrOp === DIRTY) return;
     if (valueOrOp === MARK || valueOrOp === CLEAN) {
@@ -950,9 +953,9 @@ 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;
       } else
@@ -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.g || queueSource(scope, signal, value2);
+        scope.f || 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.g && scope[rendererAccessor]?.j === getRenderer().j && queueSource(conditionalScope, signal, value2);
+    conditionalScope && !conditionalScope.f && 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.g || queueSource(subscriber, _signal, value2);
+        subscriber.f || 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.E = 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 = {
-    k: 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,25 +1120,39 @@ function runEffects(effects = pendingEffects) {
   }
 }
 function runRenders() {
-  for (; pendingRender; )
-    pendingRender.k.b?.y || pendingRender.H(pendingRender.k, 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.b?.z || render.I(render.m, render.J);
+  }
   finishPendingScopes();
 }
 function comparePendingRenders(a, b) {
-  let aStart = ownerStartNode(a.k), bStart = ownerStartNode(b.k);
-  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.b?.h || 0;
 }
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.h?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.h[id] = void 0);
+  let ctrl = scope.g?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.g[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.b && (scope.b.n ||= /* @__PURE__ */ new Set()).add(scope), ((scope.h ||= {})[id] ||= new AbortController()).signal;
+  return scope.b && (scope.b.A ||= /* @__PURE__ */ new Set()).add(scope), ((scope.g ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1194,14 +1207,14 @@ var classIdToScope = /* @__PURE__ */ new Map(), compat = {
   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.e || noop, existing = !1;
+    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);
+      scope ? (applyArgs(scope, MARK), existing = !0) : (scope = component.scope = createScope(out.global), scope._ = renderer.u, initBranch(renderer, scope)), applyArgs(scope, args);
     }), !existing)
       return scope.a === scope.c ? scope.a : scope.a.parentNode;
   }
@@ -1215,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.e, 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(() => {

package/dist/html/writer.d.ts

@@ -55,9 +55,9 @@ export declare class State {
         renderId: string;
         runtimeId: string;
     };
-    tagIndex: number;
-    scopeIndex: number;
-    reorderIndex: number;
+    tagId: number;
+    scopeId: number;
+    reorderId: number;
     hasGlobals: boolean;
     needsMainRuntime: boolean;
     hasMainRuntime: boolean;

package/dist/html.js

@@ -1006,13 +1006,13 @@ function register2(val, id, scopeId) {
 }
 function nextTagId() {
   let state = $chunk.boundary.state, { $global: $global2 } = state;
-  return "s" + $global2.runtimeId + $global2.renderId + (state.tagIndex++).toString(36);
+  return "s" + $global2.runtimeId + $global2.renderId + (state.tagId++).toString(36);
 }
 function nextScopeId() {
-  return $chunk.boundary.state.scopeIndex++;
+  return $chunk.boundary.state.scopeId++;
 }
 function peekNextScopeId() {
-  return $chunk.boundary.state.scopeIndex;
+  return $chunk.boundary.state.scopeId;
 }
 function peekNextScope() {
   return ensureScopeWithId(peekNextScopeId());
@@ -1220,9 +1220,9 @@ var State2 = class {
     this.$global = $global2;
     this.$global = $global2, $global2.cspNonce && (this.nonceAttr = " " + escapeAttrValue($global2.cspNonce + ""));
   }
-  tagIndex = 0;
-  scopeIndex = 0;
-  reorderIndex = 0;
+  tagId = 1;
+  scopeId = 1;
+  reorderId = 1;
   hasGlobals = !1;
   needsMainRuntime = !1;
   hasMainRuntime = !1;
@@ -1246,7 +1246,7 @@ var State2 = class {
     this.writeReorders ? this.writeReorders.push(chunk) : (this.needsMainRuntime = !0, this.writeReorders = [chunk]);
   }
   nextReorderId() {
-    let encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", encodeLen = encodeChars.length, encodeStartLen = encodeLen - 10, index = this.reorderIndex++, mod = index % encodeStartLen, id = encodeChars[mod];
+    let encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", encodeLen = encodeChars.length, encodeStartLen = encodeLen - 10, index = this.reorderId++, mod = index % encodeStartLen, id = encodeChars[mod];
     for (index = (index - mod) / encodeStartLen; index > 0; )
       mod = index % encodeLen, id += encodeChars[mod], index = (index - mod) / encodeLen;
     return id;

package/dist/html.mjs

@@ -929,13 +929,13 @@ function register2(val, id, scopeId) {
 }
 function nextTagId() {
   let state = $chunk.boundary.state, { $global: $global2 } = state;
-  return "s" + $global2.runtimeId + $global2.renderId + (state.tagIndex++).toString(36);
+  return "s" + $global2.runtimeId + $global2.renderId + (state.tagId++).toString(36);
 }
 function nextScopeId() {
-  return $chunk.boundary.state.scopeIndex++;
+  return $chunk.boundary.state.scopeId++;
 }
 function peekNextScopeId() {
-  return $chunk.boundary.state.scopeIndex;
+  return $chunk.boundary.state.scopeId;
 }
 function peekNextScope() {
   return ensureScopeWithId(peekNextScopeId());
@@ -1143,9 +1143,9 @@ var State2 = class {
     this.$global = $global2;
     this.$global = $global2, $global2.cspNonce && (this.nonceAttr = " " + escapeAttrValue($global2.cspNonce + ""));
   }
-  tagIndex = 0;
-  scopeIndex = 0;
-  reorderIndex = 0;
+  tagId = 1;
+  scopeId = 1;
+  reorderId = 1;
   hasGlobals = !1;
   needsMainRuntime = !1;
   hasMainRuntime = !1;
@@ -1169,7 +1169,7 @@ var State2 = class {
     this.writeReorders ? this.writeReorders.push(chunk) : (this.needsMainRuntime = !0, this.writeReorders = [chunk]);
   }
   nextReorderId() {
-    let encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", encodeLen = encodeChars.length, encodeStartLen = encodeLen - 10, index = this.reorderIndex++, mod = index % encodeStartLen, id = encodeChars[mod];
+    let encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", encodeLen = encodeChars.length, encodeStartLen = encodeLen - 10, index = this.reorderId++, mod = index % encodeStartLen, id = encodeChars[mod];
     for (index = (index - mod) / encodeStartLen; index > 0; )
       mod = index % encodeLen, id += encodeChars[mod], index = (index - mod) / encodeLen;
     return id;