marko 6.0.61 → 6.0.62

package/dist/dom.mjs

@@ -200,59 +200,50 @@ function init(runtimeId = "M") {
   let renders = self[runtimeId], defineRuntime = (desc) => Object.defineProperty(self, runtimeId, desc), resumeRender, initRuntime = (renders2) => {
     defineRuntime({
       value: resumeRender = ((renderId) => {
-        let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, scopeLookup = render.s = {}, serializeContext = {
+        let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
         }, branches = branchesEnabled && /* @__PURE__ */ (() => {
-          let branchStack = [], branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), lastEndNode, currentBranchId, endBranch = (branchId, reference) => {
-            let branch = scopeLookup[branchId] ||= {}, endNode = reference, prevNode;
-            for (; (prevNode = endNode.previousSibling) !== branch.h && ~visits.indexOf(endNode = prevNode); ) ;
-            return branch.j = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode, branch.h ||= lastEndNode, branchIds.add(branchId), branch;
+          let branchParents = /* @__PURE__ */ new Map(), branchStarts = [], orphanBranches = [], endBranch = (singleNode) => {
+            let parent = visit.parentNode, startVisit = visit, i = orphanBranches.length, claimed = 0, branchId, branch;
+            for (; branchId = +lastToken; ) {
+              if (branch = scopeLookup[branchId] ||= {}, singleNode) {
+                for (; startVisit.previousSibling && ~visits.indexOf(
+                  startVisit = startVisit.previousSibling
+                ); ) ;
+                branch.j = branch.h = startVisit, visitType === "'" /* BranchEndNativeTag */ && (branch[0] = startVisit);
+              } else
+                startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.h = startVisit, branch.j = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
+              for (; i-- && orphanBranches[i] > branchId; )
+                branchParents.set(orphanBranches[i], branchId), claimed++;
+              orphanBranches.push(branchId), branchParents.set(branchId, 0), nextToken();
+            }
+            orphanBranches.splice(i, claimed);
           };
           return {
             K() {
-              if (visitToken === "[" /* BranchStart */)
-                currentBranchId && visitDataIndex && (endBranch(currentBranchId, visit), currentBranchId = branchStack.pop()), currentBranchId && (branchStack.push(currentBranchId), parentBranchIds.set(scopeId, currentBranchId)), currentBranchId = scopeId, visitScope.h = visit;
-              else if (visitToken === "]" /* BranchEnd */) {
-                let curParent = visit.parentNode, startNode = endBranch(
-                  currentBranchId,
-                  visit
-                ).h;
-                visitScope[visitData] = visit, curParent !== startNode.parentNode && curParent.prepend(startNode), currentBranchId = branchStack.pop();
-              } else {
-                let next = visitData.indexOf(" "), curNode = visit;
-                for (visitScope[~next ? visitData.slice(0, next) : visitData] = visitToken === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
-                  let start = next + 1;
-                  next = visitData.indexOf(" ", start);
-                  let childScopeId = +visitData.slice(
-                    start,
-                    ~next ? next : visitData.length
-                  );
-                  if (curNode = endBranch(childScopeId, curNode).j, parentBranchIds.set(childScopeId, scopeId), visitToken === "'" /* BranchNativeTag */) {
-                    let childBranch = scopeLookup[childScopeId];
-                    childBranch[0] = childBranch.h = childBranch.j = curNode;
-                  }
-                }
-              }
+              visitType === "[" /* BranchStart */ ? (endBranch(), branchStarts.push(visit)) : (visitScope[
+                nextToken()
+                /* read accessor */
+              ] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit, nextToken(), endBranch(
+                visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */
+              ));
             },
             t(scope) {
-              let parentBranchId = scope.g || parentBranchIds.get(scopeId);
-              if (parentBranchId && (scope.k = scopeLookup[parentBranchId]), branchIds.has(scopeId)) {
-                let branch = scope, parentBranch = branch.k;
-                scope.k = branch, parentBranch && (branch.y = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch));
-              }
+              scope.k = scopeLookup[scope.g || branchParents.get(scopeId)], branchParents.has(scopeId) && (scope.k && ((scope.y = scope.k).A ||= /* @__PURE__ */ new Set()).add(scope), scope.k = scope);
             }
           };
-        })(), $global, lastScopeId = 0, lastEffect, visits, resumes, scopeId, visit, visitText, visitData, visitDataIndex, visitToken, visitScope;
+        })(), $global, lastScopeId = 0, lastEffect, visits, resumes, scopeId, visit, visitText, visitType, visitScope, lastToken, lastTokenIndex, nextToken = () => lastToken = visitText.slice(
+          lastTokenIndex,
+          // eslint-disable-next-line no-cond-assign
+          (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1) ? lastTokenIndex - 1 : visitText.length
+        );
         return render.w = () => {
           try {
             walk2(), isResuming = 1;
             for (visit of visits = render.v)
-              visitText = visit.data, visitDataIndex = visitText.indexOf(" ") + 1, scopeId = +visitText.slice(
-                commentPrefixLen + 1,
-                visitDataIndex ? visitDataIndex - 1 : visitText.length
-              ), visitData = visitDataIndex ? visitText.slice(visitDataIndex) : "", visitToken = visitText[commentPrefixLen], visitScope = scopeLookup[scopeId] ||= {
+              lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], (scopeId = +nextToken()) && (visitScope = scopeLookup[scopeId] ||= {
                 l: scopeId
-              }, visitToken === "*" /* Node */ ? visitScope["j" /* Getter */ + visitData] = /* @__PURE__ */ ((node) => () => node)(visitScope[visitData] = visit.previousSibling) : branches && branches.K();
+              }), visitType === "*" /* Node */ ? visitScope["j" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && branches.K();
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
@@ -268,7 +259,7 @@ function init(runtimeId = "M") {
                   $global ? typeof scope == "number" ? lastScopeId += scope : (scopeId = ++lastScopeId, scope.$global = $global, scope.l = scopeId, scopeLookup[scopeId] !== scope && (scopeLookup[scopeId] = Object.assign(
                     scope,
                     scopeLookup[scopeId]
-                  )), branches && branches.t(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.p = 1e6);
+                  )), branchesEnabled && branches.t(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.p = 1e6);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }

package/dist/html.js

@@ -1189,14 +1189,14 @@ function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
   if (resumeBranch) {
     let loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
       let branchId = _peek_scope_id();
-      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : $chunk.writeHTML(
-        state.mark("[" /* BranchStart */, branchId + (index ? " " : ""))
-      )), withBranchId(branchId, () => {
+      resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, flushBranchIds)
+      ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
         cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1207,23 +1207,22 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
   writeBranchEnd(
     scopeId,
     accessor,
+    resumeBranch,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
-      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + singleNodeBranchIds
-    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
+    singleNode,
+    singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
   if (resumeBranch) {
-    let loopScopes = /* @__PURE__ */ new Map(), sep = "";
+    let loopScopes = /* @__PURE__ */ new Map();
     forIn(obj, (key, value) => {
       let branchId = _peek_scope_id();
-      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
-        state.mark("[" /* BranchStart */, branchId + sep)
-      ), sep = " ")), withBranchId(branchId, () => {
+      resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, flushBranchIds)
+      ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
         cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1234,23 +1233,22 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
   writeBranchEnd(
     scopeId,
     accessor,
+    resumeBranch,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
-      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + singleNodeBranchIds
-    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
+    singleNode,
+    singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
   if (resumeBranch) {
-    let loopScopes = /* @__PURE__ */ new Map(), sep = "";
+    let loopScopes = /* @__PURE__ */ new Map();
     forTo(to, from, step, (i) => {
       let branchId = _peek_scope_id();
-      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
-        state.mark("[" /* BranchStart */, branchId + sep)
-      ), sep = " ")), withBranchId(branchId, () => {
+      resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, flushBranchIds)
+      ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
         cb(i), loopScopes.set(forToBy(by, i), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1261,17 +1259,16 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
   writeBranchEnd(
     scopeId,
     accessor,
+    resumeBranch,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
-      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + singleNodeBranchIds
-    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
+    singleNode,
+    singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
   let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = _peek_scope_id();
-  resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, branchId + ""));
+  resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
   let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && writeScope(scopeId, {
     ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
@@ -1279,17 +1276,29 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndT
   }), writeBranchEnd(
     scopeId,
     accessor,
+    resumeBranch,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
-      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
-    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
+    singleNode,
+    shouldWriteBranch ? " " + branchId : ""
   );
 }
-function writeBranchEnd(scopeId, accessor, resumeMarker, parentEndTag, mark) {
+function writeBranchEnd(scopeId, accessor, resumeBranch, resumeMarker, parentEndTag, singleNode, branchIds) {
   let endTag = parentEndTag || "";
-  resumeMarker ? mark ? $chunk.writeHTML(mark + endTag) : $chunk.writeHTML(endTag + _el_resume(scopeId, accessor)) : $chunk.writeHTML(endTag);
+  if (resumeMarker)
+    if (!parentEndTag || resumeBranch) {
+      let { state } = $chunk.boundary, mark = singleNode ? state.mark(
+        parentEndTag ? "}" /* BranchEndSingleNodeOnlyChildInParent */ : "|" /* BranchEndSingleNode */,
+        scopeId + " " + accessor + (branchIds || "")
+      ) : state.mark(
+        parentEndTag ? ")" /* BranchEndOnlyChildInParent */ : "]" /* BranchEnd */,
+        scopeId + " " + accessor + (branchIds || "")
+      );
+      $chunk.writeHTML(mark + endTag);
+    } else
+      $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
+  else
+    $chunk.writeHTML(endTag);
 }
 var writeScope = (scopeId, partialScope) => writeScopeToState($chunk.boundary.state, scopeId, partialScope);
 function writeScopeToState(state, scopeId, partialScope) {
@@ -1312,13 +1321,13 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
     if (resumeMarker) {
       let branchId = _peek_scope_id();
       $chunk.writeHTML(
-        $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+        $chunk.boundary.state.mark("[" /* BranchStart */, "")
       ), content(promise), writeScope(scopeId, {
         ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
       }), $chunk.writeHTML(
         $chunk.boundary.state.mark(
           "]" /* BranchEnd */,
-          scopeId + " " + accessor
+          scopeId + " " + accessor + " " + branchId
         )
       );
     } else
@@ -1332,10 +1341,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
         if (resumeMarker) {
           let branchId = _peek_scope_id();
           $chunk.writeHTML(
-            $chunk.boundary.state.mark(
-              "[" /* BranchStart */,
-              branchId + ""
-            )
+            $chunk.boundary.state.mark("[" /* BranchStart */, "")
           ), content(value), boundary.state.serializer.writeAssign(
             writeScope(branchId, {}),
             _scope_with_id(scopeId),
@@ -1343,7 +1349,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
           ), $chunk.writeHTML(
             $chunk.boundary.state.mark(
               "]" /* BranchEnd */,
-              scopeId + " " + accessor
+              scopeId + " " + accessor + " " + branchId
             )
           );
         } else
@@ -1357,9 +1363,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 }
 function _try(scopeId, accessor, content, input) {
   let branchId = _peek_scope_id();
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  );
+  $chunk.writeHTML($chunk.boundary.state.mark("[" /* BranchStart */, ""));
   let catchContent = normalizeDynamicRenderer(input.catch), placeholderContent = normalizeDynamicRenderer(input.placeholder);
   catchContent ? tryCatch(
     placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
@@ -1373,7 +1377,7 @@ function _try(scopeId, accessor, content, input) {
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
-      scopeId + " " + accessor
+      scopeId + " " + accessor + " " + branchId
     )
   );
 }
@@ -1999,10 +2003,10 @@ function NOOP2() {
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
-  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), result;
+  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered = !1, result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
-    if (_scope_id(), _html(
+    if (rendered = !0, _scope_id(), _html(
       `<${renderer}${_attrs(input, 0, branchId, renderer)}>`
     ), !voidElementsReg.test(renderer)) {
       let renderContent = content || normalizeDynamicRenderer(input.content);
@@ -2040,12 +2044,12 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
     }
     shouldResume && _html(
       state.mark(
-        "'" /* BranchNativeTag */,
+        "'" /* BranchEndNativeTag */,
         scopeId + " " + accessor + " " + branchId
       )
     );
   } else {
-    shouldResume && _html(state.mark("[" /* BranchStart */, branchId + ""));
+    shouldResume && _html(state.mark("[" /* BranchStart */, ""));
     let render2 = () => {
       if (renderer) {
         if (isTemplate(renderer)) {
@@ -2061,9 +2065,14 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
       } else if (content)
         return content();
     };
-    result = shouldResume ? withBranchId(branchId, render2) : render2(), shouldResume && _html(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
+    result = shouldResume ? withBranchId(branchId, render2) : render2(), rendered = _peek_scope_id() !== branchId, shouldResume && _html(
+      state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor + (rendered ? " " + branchId : "")
+      )
+    );
   }
-  return _peek_scope_id() !== branchId ? shouldResume && writeScope(scopeId, {
+  return rendered ? shouldResume && writeScope(scopeId, {
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
     ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer
   }) : _scope_id(), result;

package/dist/html.mjs

@@ -1108,14 +1108,14 @@ function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
   if (resumeBranch) {
     let loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
       let branchId = _peek_scope_id();
-      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : $chunk.writeHTML(
-        state.mark("[" /* BranchStart */, branchId + (index ? " " : ""))
-      )), withBranchId(branchId, () => {
+      resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, flushBranchIds)
+      ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
         cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1126,23 +1126,22 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
   writeBranchEnd(
     scopeId,
     accessor,
+    resumeBranch,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
-      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + singleNodeBranchIds
-    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
+    singleNode,
+    singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
   if (resumeBranch) {
-    let loopScopes = /* @__PURE__ */ new Map(), sep = "";
+    let loopScopes = /* @__PURE__ */ new Map();
     forIn(obj, (key, value) => {
       let branchId = _peek_scope_id();
-      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
-        state.mark("[" /* BranchStart */, branchId + sep)
-      ), sep = " ")), withBranchId(branchId, () => {
+      resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, flushBranchIds)
+      ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
         cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1153,23 +1152,22 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
   writeBranchEnd(
     scopeId,
     accessor,
+    resumeBranch,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
-      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + singleNodeBranchIds
-    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
+    singleNode,
+    singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
   if (resumeBranch) {
-    let loopScopes = /* @__PURE__ */ new Map(), sep = "";
+    let loopScopes = /* @__PURE__ */ new Map();
     forTo(to, from, step, (i) => {
       let branchId = _peek_scope_id();
-      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
-        state.mark("[" /* BranchStart */, branchId + sep)
-      ), sep = " ")), withBranchId(branchId, () => {
+      resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, flushBranchIds)
+      ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
         cb(i), loopScopes.set(forToBy(by, i), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1180,17 +1178,16 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
   writeBranchEnd(
     scopeId,
     accessor,
+    resumeBranch,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
-      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + singleNodeBranchIds
-    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
+    singleNode,
+    singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
   let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = _peek_scope_id();
-  resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, branchId + ""));
+  resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
   let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && writeScope(scopeId, {
     ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
@@ -1198,17 +1195,29 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndT
   }), writeBranchEnd(
     scopeId,
     accessor,
+    resumeBranch,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
-      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
-    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
+    singleNode,
+    shouldWriteBranch ? " " + branchId : ""
   );
 }
-function writeBranchEnd(scopeId, accessor, resumeMarker, parentEndTag, mark) {
+function writeBranchEnd(scopeId, accessor, resumeBranch, resumeMarker, parentEndTag, singleNode, branchIds) {
   let endTag = parentEndTag || "";
-  resumeMarker ? mark ? $chunk.writeHTML(mark + endTag) : $chunk.writeHTML(endTag + _el_resume(scopeId, accessor)) : $chunk.writeHTML(endTag);
+  if (resumeMarker)
+    if (!parentEndTag || resumeBranch) {
+      let { state } = $chunk.boundary, mark = singleNode ? state.mark(
+        parentEndTag ? "}" /* BranchEndSingleNodeOnlyChildInParent */ : "|" /* BranchEndSingleNode */,
+        scopeId + " " + accessor + (branchIds || "")
+      ) : state.mark(
+        parentEndTag ? ")" /* BranchEndOnlyChildInParent */ : "]" /* BranchEnd */,
+        scopeId + " " + accessor + (branchIds || "")
+      );
+      $chunk.writeHTML(mark + endTag);
+    } else
+      $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
+  else
+    $chunk.writeHTML(endTag);
 }
 var writeScope = (scopeId, partialScope) => writeScopeToState($chunk.boundary.state, scopeId, partialScope);
 function writeScopeToState(state, scopeId, partialScope) {
@@ -1231,13 +1240,13 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
     if (resumeMarker) {
       let branchId = _peek_scope_id();
       $chunk.writeHTML(
-        $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+        $chunk.boundary.state.mark("[" /* BranchStart */, "")
       ), content(promise), writeScope(scopeId, {
         ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
       }), $chunk.writeHTML(
         $chunk.boundary.state.mark(
           "]" /* BranchEnd */,
-          scopeId + " " + accessor
+          scopeId + " " + accessor + " " + branchId
         )
       );
     } else
@@ -1251,10 +1260,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
         if (resumeMarker) {
           let branchId = _peek_scope_id();
           $chunk.writeHTML(
-            $chunk.boundary.state.mark(
-              "[" /* BranchStart */,
-              branchId + ""
-            )
+            $chunk.boundary.state.mark("[" /* BranchStart */, "")
           ), content(value), boundary.state.serializer.writeAssign(
             writeScope(branchId, {}),
             _scope_with_id(scopeId),
@@ -1262,7 +1268,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
           ), $chunk.writeHTML(
             $chunk.boundary.state.mark(
               "]" /* BranchEnd */,
-              scopeId + " " + accessor
+              scopeId + " " + accessor + " " + branchId
             )
           );
         } else
@@ -1276,9 +1282,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 }
 function _try(scopeId, accessor, content, input) {
   let branchId = _peek_scope_id();
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  );
+  $chunk.writeHTML($chunk.boundary.state.mark("[" /* BranchStart */, ""));
   let catchContent = normalizeDynamicRenderer(input.catch), placeholderContent = normalizeDynamicRenderer(input.placeholder);
   catchContent ? tryCatch(
     placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
@@ -1292,7 +1296,7 @@ function _try(scopeId, accessor, content, input) {
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
-      scopeId + " " + accessor
+      scopeId + " " + accessor + " " + branchId
     )
   );
 }
@@ -1918,10 +1922,10 @@ function NOOP2() {
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
-  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), result;
+  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered = !1, result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
-    if (_scope_id(), _html(
+    if (rendered = !0, _scope_id(), _html(
       `<${renderer}${_attrs(input, 0, branchId, renderer)}>`
     ), !voidElementsReg.test(renderer)) {
       let renderContent = content || normalizeDynamicRenderer(input.content);
@@ -1959,12 +1963,12 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
     }
     shouldResume && _html(
       state.mark(
-        "'" /* BranchNativeTag */,
+        "'" /* BranchEndNativeTag */,
         scopeId + " " + accessor + " " + branchId
       )
     );
   } else {
-    shouldResume && _html(state.mark("[" /* BranchStart */, branchId + ""));
+    shouldResume && _html(state.mark("[" /* BranchStart */, ""));
     let render2 = () => {
       if (renderer) {
         if (isTemplate(renderer)) {
@@ -1980,9 +1984,14 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
       } else if (content)
         return content();
     };
-    result = shouldResume ? withBranchId(branchId, render2) : render2(), shouldResume && _html(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
+    result = shouldResume ? withBranchId(branchId, render2) : render2(), rendered = _peek_scope_id() !== branchId, shouldResume && _html(
+      state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor + (rendered ? " " + branchId : "")
+      )
+    );
   }
-  return _peek_scope_id() !== branchId ? shouldResume && writeScope(scopeId, {
+  return rendered ? shouldResume && writeScope(scopeId, {
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
     ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer
   }) : _scope_id(), result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.61",
+  "version": "6.0.62",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",