marko 6.0.60 → 6.0.62

package/dist/debug/html.js

@@ -21,85 +21,85 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var html_exports = {};
 __export(html_exports, {
   $global: () => $global,
-  attr: () => attr,
+  _attr: () => _attr,
+  _attr_class: () => _attr_class,
+  _attr_content: () => _attr_content,
+  _attr_details_open: () => _attr_details_or_dialog_open,
+  _attr_dialog_open: () => _attr_details_or_dialog_open,
+  _attr_input_checked: () => _attr_input_checked,
+  _attr_input_checkedValue: () => _attr_input_checkedValue,
+  _attr_input_value: () => _attr_input_value,
+  _attr_option_value: () => _attr_option_value,
+  _attr_select_value: () => _attr_select_value,
+  _attr_style: () => _attr_style,
+  _attr_textarea_value: () => _attr_textarea_value,
+  _attrs: () => _attrs,
+  _attrs_content: () => _attrs_content,
+  _attrs_partial: () => _attrs_partial,
+  _attrs_partial_content: () => _attrs_partial_content,
+  _await: () => _await,
+  _content: () => _content,
+  _content_resume: () => _content_resume,
+  _dynamic_tag: () => _dynamic_tag,
+  _el: () => _el,
+  _el_resume: () => _el_resume,
+  _escape: () => _escape,
+  _escape_script: () => _escape_script,
+  _escape_style: () => _escape_style,
+  _existing_scope: () => _existing_scope,
+  _for_in: () => _for_in,
+  _for_of: () => _for_of,
+  _for_to: () => _for_to,
+  _hoist: () => _hoist,
+  _html: () => _html,
+  _id: () => _id,
+  _if: () => _if,
+  _peek_scope_id: () => _peek_scope_id,
+  _resume: () => _resume,
+  _resume_branch: () => _resume_branch,
+  _scope: () => writeScope,
+  _scope_id: () => _scope_id,
+  _scope_with_id: () => _scope_with_id,
+  _script: () => _script,
+  _sep: () => _sep,
+  _serialize_guard: () => _serialize_guard,
+  _serialize_if: () => _serialize_if,
+  _subscribe: () => _subscribe,
+  _template: () => _template,
+  _trailers: () => _trailers,
+  _try: () => _try,
+  _unescaped: () => _unescaped,
+  _var: () => _var,
   attrTag: () => attrTag,
   attrTags: () => attrTags,
-  attrs: () => attrs,
-  classAttr: () => classAttr,
-  commentSeparator: () => commentSeparator,
   compat: () => compat,
-  controllable_detailsOrDialog_open: () => controllable_detailsOrDialog_open,
-  controllable_input_checked: () => controllable_input_checked,
-  controllable_input_checkedValue: () => controllable_input_checkedValue,
-  controllable_input_value: () => controllable_input_value,
-  controllable_select_value: () => controllable_select_value,
-  controllable_textarea_value: () => controllable_textarea_value,
-  createContent: () => createContent,
-  createTemplate: () => createTemplate,
-  dynamicTag: () => dynamicTag,
-  ensureScopeWithId: () => ensureScopeWithId,
-  escapeScript: () => escapeScript,
-  escapeStyle: () => escapeStyle,
-  escapeXML: () => escapeXML,
   forIn: () => forIn,
   forInBy: () => forInBy,
   forOf: () => forOf,
   forOfBy: () => forOfBy,
   forTo: () => forTo,
-  forToBy: () => forToBy,
-  fork: () => fork,
-  getScopeById: () => getScopeById,
-  hoist: () => hoist,
-  markResumeNode: () => markResumeNode,
-  nextScopeId: () => nextScopeId,
-  nextTagId: () => nextTagId,
-  nodeRef: () => nodeRef,
-  optionValueAttr: () => optionValueAttr,
-  partialAttrs: () => partialAttrs,
-  peekNextScopeId: () => peekNextScopeId,
-  register: () => register2,
-  registerContent: () => registerContent,
-  resumeClosestBranch: () => resumeClosestBranch,
-  resumeConditional: () => resumeConditional,
-  resumeForIn: () => resumeForIn,
-  resumeForOf: () => resumeForOf,
-  resumeForTo: () => resumeForTo,
-  serializeGuard: () => serializeGuard,
-  serializeIf: () => serializeIf,
-  setTagVar: () => setTagVar,
-  styleAttr: () => styleAttr,
-  toString: () => toString,
-  tryContent: () => tryContent,
-  write: () => write,
-  writeAttrsAndContent: () => writeAttrsAndContent,
-  writeContent: () => writeContent,
-  writeEffect: () => writeEffect,
-  writeExistingScope: () => writeExistingScope,
-  writePartialAttrsAndContent: () => writePartialAttrsAndContent,
-  writeScope: () => writeScope,
-  writeSubscribe: () => writeSubscribe,
-  writeTrailers: () => writeTrailers
+  forToBy: () => forToBy
 });
 module.exports = __toCommonJS(html_exports);
 
 // src/common/attr-tag.ts
 var empty = [];
 var rest = true ? Symbol("Attribute Tag") : Symbol();
-function attrTag(attrs2) {
-  attrs2[Symbol.iterator] = attrTagIterator;
-  attrs2[rest] = empty;
-  return attrs2;
+function attrTag(attrs) {
+  attrs[Symbol.iterator] = attrTagIterator;
+  attrs[rest] = empty;
+  return attrs;
 }
-function attrTags(first, attrs2) {
+function attrTags(first, attrs) {
   if (first) {
     if (first[rest] === empty) {
-      first[rest] = [attrs2];
+      first[rest] = [attrs];
     } else {
-      first[rest].push(attrs2);
+      first[rest].push(attrs);
     }
     return first;
   }
-  return attrTag(attrs2);
+  return attrTag(attrs);
 }
 function* attrTagIterator() {
   yield this;
@@ -160,13 +160,13 @@ function normalizeDynamicRenderer(value) {
 }
 
 // src/html/content.ts
-function toString(val) {
+function _unescaped(val) {
   return val ? val + "" : val === 0 ? "0" : "";
 }
 var unsafeXMLReg = /[<&]/g;
 var replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;";
 var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
-function escapeXML(val) {
+function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
 }
 function escapeTextAreaValue(val) {
@@ -174,12 +174,12 @@ function escapeTextAreaValue(val) {
 }
 var unsafeScriptReg = /<\/script/g;
 var escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
-function escapeScript(val) {
+function _escape_script(val) {
   return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeStyleReg = /<\/style/g;
 var escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
-function escapeStyle(val) {
+function _escape_style(val) {
   return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
 
@@ -785,7 +785,7 @@ function writeProp(state, val, parent, accessor) {
       return false;
   }
 }
-function writeReferenceOr(state, write2, val, parent, accessor) {
+function writeReferenceOr(state, write, val, parent, accessor) {
   let ref = state.refs.get(val);
   if (ref) {
     if (ref.init) {
@@ -813,7 +813,7 @@ function writeReferenceOr(state, write2, val, parent, accessor) {
   if (true) {
     ref.debug = DEBUG.get(val);
   }
-  if (write2(state, val, ref)) return true;
+  if (write(state, val, ref)) return true;
   state.refs.delete(ref);
   return false;
 }
@@ -1694,20 +1694,20 @@ function getState() {
 function getScopeId(scope) {
   return scope[K_SCOPE_ID];
 }
-function write(html) {
+function _html(html) {
   $chunk.writeHTML(html);
 }
 function writeScript(script) {
   $chunk.writeScript(script);
 }
-function writeEffect(scopeId, registryId) {
+function _script(scopeId, registryId) {
   $chunk.boundary.state.needsMainRuntime = true;
   $chunk.writeEffect(scopeId, registryId);
 }
-function writeContent(nodeAccessor, scopeId, content, serializeReason) {
+function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
   const shouldResume = serializeReason !== 0;
   const render2 = normalizeServerRender(content);
-  const branchId = peekNextScopeId();
+  const branchId = _peek_scope_id();
   if (render2) {
     if (shouldResume) {
       withBranchId(branchId, render2);
@@ -1715,7 +1715,7 @@ function writeContent(nodeAccessor, scopeId, content, serializeReason) {
       render2();
     }
   }
-  const rendered = peekNextScopeId() !== branchId;
+  const rendered = _peek_scope_id() !== branchId;
   if (rendered) {
     if (shouldResume) {
       writeScope(scopeId, {
@@ -1727,7 +1727,7 @@ function writeContent(nodeAccessor, scopeId, content, serializeReason) {
       });
     }
   } else {
-    nextScopeId();
+    _scope_id();
   }
 }
 function normalizeServerRender(value) {
@@ -1755,26 +1755,26 @@ function withContext(key, value, cb) {
     ctx[key] = prev;
   }
 }
-function setTagVar(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
-  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId();
-  ensureScopeWithId(childScopeId)["#TagVariable" /* TagVariable */] = register2(
+function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
+  _scope_with_id(parentScopeId)[scopeOffsetAccessor] = _scope_id();
+  _scope_with_id(childScopeId)["#TagVariable" /* TagVariable */] = _resume(
     {},
     registryId,
     parentScopeId
   );
 }
-function register2(val, id, scopeId) {
-  return scopeId === void 0 ? register(id, val) : register(id, val, ensureScopeWithId(scopeId));
+function _resume(val, id, scopeId) {
+  return scopeId === void 0 ? register(id, val) : register(id, val, _scope_with_id(scopeId));
 }
-function nextTagId() {
+function _id() {
   const state = $chunk.boundary.state;
   const { $global: $global2 } = state;
   return "s" + $global2.runtimeId + $global2.renderId + (state.tagId++).toString(36);
 }
-function nextScopeId() {
+function _scope_id() {
   return $chunk.boundary.state.scopeId++;
 }
-function peekNextScopeId() {
+function _peek_scope_id() {
   return $chunk.boundary.state.scopeId;
 }
 function getScopeById(scopeId) {
@@ -1782,39 +1782,39 @@ function getScopeById(scopeId) {
     return $chunk.boundary.state.scopes.get(scopeId);
   }
 }
-function serializeIf(condition, key) {
+function _serialize_if(condition, key) {
   return condition && (condition === 1 || condition[key]) ? 1 : void 0;
 }
-function serializeGuard(condition, key) {
+function _serialize_guard(condition, key) {
   return condition && (condition === 1 || condition[key]) ? 1 : 0;
 }
-function markResumeNode(scopeId, accessor, shouldResume) {
+function _el_resume(scopeId, accessor, shouldResume) {
   if (shouldResume === 0) return "";
   const { state } = $chunk.boundary;
   state.needsMainRuntime = true;
   return state.mark("*" /* Node */, scopeId + " " + accessor);
 }
-function commentSeparator(shouldResume) {
+function _sep(shouldResume) {
   return shouldResume === 0 ? "" : "<!>";
 }
-function nodeRef(scopeId, id) {
+function _el(scopeId, id) {
   const getter = () => {
     if (true) {
       throw new Error("Cannot read a node reference on the server.");
     }
   };
-  return id ? register2(getter, id, scopeId) : getter;
+  return id ? _resume(getter, id, scopeId) : getter;
 }
-function hoist(scopeId, id) {
+function _hoist(scopeId, id) {
   const getter = () => {
     if (true) {
       throw new Error("Cannot read a hoisted value on the server.");
     }
   };
   getter[Symbol.iterator] = getter;
-  return id ? register2(getter, id, scopeId) : getter;
+  return id ? _resume(getter, id, scopeId) : getter;
 }
-function resumeClosestBranch(scopeId) {
+function _resume_branch(scopeId) {
   const branchId = $chunk.context?.[branchIdKey];
   if (branchId !== void 0 && branchId !== scopeId) {
     writeScope(scopeId, { ["#ClosestBranchId" /* ClosestBranchId */]: branchId });
@@ -1827,22 +1827,23 @@ function isInResumedBranch() {
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
-  let singleNodeBranchIds = "";
+  let flushBranchIds = "";
   if (resumeBranch) {
     const loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
-      const branchId = peekNextScopeId();
+      const branchId = _peek_scope_id();
       if (resumeMarker) {
         if (singleNode) {
-          singleNodeBranchIds = " " + branchId + singleNodeBranchIds;
+          flushBranchIds = " " + branchId + flushBranchIds;
         } else {
           $chunk.writeHTML(
-            state.mark("[" /* BranchStart */, branchId + (index ? " " : ""))
+            state.mark("[" /* BranchStart */, flushBranchIds)
           );
+          flushBranchIds = branchId + "";
         }
       }
       withBranchId(branchId, () => {
@@ -1861,32 +1862,30 @@ function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serialize
   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 resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
-  let singleNodeBranchIds = "";
+  let flushBranchIds = "";
   if (resumeBranch) {
     const loopScopes = /* @__PURE__ */ new Map();
-    let sep = "";
     forIn(obj, (key, value) => {
-      const branchId = peekNextScopeId();
+      const branchId = _peek_scope_id();
       if (resumeMarker) {
         if (singleNode) {
-          singleNodeBranchIds = " " + branchId + singleNodeBranchIds;
+          flushBranchIds = " " + branchId + flushBranchIds;
         } else {
           $chunk.writeHTML(
-            state.mark("[" /* BranchStart */, branchId + sep)
+            state.mark("[" /* BranchStart */, flushBranchIds)
           );
-          sep = " ";
+          flushBranchIds = branchId + "";
         }
       }
       withBranchId(branchId, () => {
@@ -1905,32 +1904,30 @@ function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeM
   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 resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
-  let singleNodeBranchIds = "";
+  let flushBranchIds = "";
   if (resumeBranch) {
     const loopScopes = /* @__PURE__ */ new Map();
-    let sep = "";
     forTo(to, from, step, (i) => {
-      const branchId = peekNextScopeId();
+      const branchId = _peek_scope_id();
       if (resumeMarker) {
         if (singleNode) {
-          singleNodeBranchIds = " " + branchId + singleNodeBranchIds;
+          flushBranchIds = " " + branchId + flushBranchIds;
         } else {
           $chunk.writeHTML(
-            state.mark("[" /* BranchStart */, branchId + sep)
+            state.mark("[" /* BranchStart */, flushBranchIds)
           );
-          sep = " ";
+          flushBranchIds = branchId + "";
         }
       }
       withBranchId(branchId, () => {
@@ -1949,21 +1946,20 @@ function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch,
   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 resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
-  const branchId = peekNextScopeId();
+  const branchId = _peek_scope_id();
   if (resumeMarker && resumeBranch && !singleNode) {
-    $chunk.writeHTML(state.mark("[" /* BranchStart */, branchId + ""));
+    $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
   }
   const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
   const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
@@ -1976,21 +1972,28 @@ function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMark
   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) {
   const endTag = parentEndTag || "";
   if (resumeMarker) {
-    if (mark) {
+    if (!parentEndTag || resumeBranch) {
+      const { state } = $chunk.boundary;
+      const 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 + markResumeNode(scopeId, accessor));
+      $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
     }
   } else {
     $chunk.writeHTML(endTag);
@@ -2026,10 +2029,10 @@ if (true) {
     return scope;
   })(writeScope);
 }
-function writeExistingScope(scopeId) {
-  return writeScope(scopeId, ensureScopeWithId(scopeId));
+function _existing_scope(scopeId) {
+  return writeScope(scopeId, _scope_with_id(scopeId));
 }
-function ensureScopeWithId(scopeId) {
+function _scope_with_id(scopeId) {
   const { state } = $chunk.boundary;
   let scope = state.scopes.get(scopeId);
   if (!scope) {
@@ -2041,13 +2044,13 @@ function ensureScopeWithId(scopeId) {
 function $global() {
   return $chunk.boundary.state.$global;
 }
-function fork(scopeId, accessor, promise, content, serializeMarker) {
+function _await(scopeId, accessor, promise, content, serializeMarker) {
   const resumeMarker = serializeMarker !== 0;
   if (!isPromise(promise)) {
     if (resumeMarker) {
-      const branchId = peekNextScopeId();
+      const branchId = _peek_scope_id();
       $chunk.writeHTML(
-        $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+        $chunk.boundary.state.mark("[" /* BranchStart */, "")
       );
       content(promise);
       writeScope(scopeId, {
@@ -2056,7 +2059,7 @@ function fork(scopeId, accessor, promise, content, serializeMarker) {
       $chunk.writeHTML(
         $chunk.boundary.state.mark(
           "]" /* BranchEnd */,
-          scopeId + " " + accessor
+          scopeId + " " + accessor + " " + branchId
         )
       );
     } else {
@@ -2079,23 +2082,20 @@ function fork(scopeId, accessor, promise, content, serializeMarker) {
         if (!boundary.signal.aborted) {
           chunk.render(() => {
             if (resumeMarker) {
-              const branchId = peekNextScopeId();
+              const 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, {}),
-                ensureScopeWithId(scopeId),
+                _scope_with_id(scopeId),
                 "ConditionalScope:" /* ConditionalScope */ + accessor
               );
               $chunk.writeHTML(
                 $chunk.boundary.state.mark(
                   "]" /* BranchEnd */,
-                  scopeId + " " + accessor
+                  scopeId + " " + accessor + " " + branchId
                 )
               );
             } else {
@@ -2112,11 +2112,9 @@ function fork(scopeId, accessor, promise, content, serializeMarker) {
     }
   );
 }
-function tryContent(scopeId, accessor, content, input) {
-  const branchId = peekNextScopeId();
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  );
+function _try(scopeId, accessor, content, input) {
+  const branchId = _peek_scope_id();
+  $chunk.writeHTML($chunk.boundary.state.mark("[" /* BranchStart */, ""));
   const catchContent = normalizeDynamicRenderer(input.catch);
   const placeholderContent = normalizeDynamicRenderer(input.placeholder);
   if (catchContent) {
@@ -2140,7 +2138,7 @@ function tryContent(scopeId, accessor, content, input) {
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
-      scopeId + " " + accessor
+      scopeId + " " + accessor + " " + branchId
     )
   );
 }
@@ -2556,7 +2554,7 @@ function flushSerializer(boundary) {
     }
   }
 }
-function writeTrailers(html) {
+function _trailers(html) {
   $chunk.boundary.state.trailerHTML += html;
 }
 function concatEffects(a, b) {
@@ -2620,24 +2618,24 @@ function getFilteredGlobals($global2) {
   }
   return filtered;
 }
-function writeSubscribe(subscribers, scope) {
+function _subscribe(subscribers, scope) {
   $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
   return scope;
 }
 
 // src/html/attrs.ts
-function classAttr(value) {
+function _attr_class(value) {
   return stringAttr("class", classValue(value));
 }
-function styleAttr(value) {
+function _attr_style(value) {
   return stringAttr("style", styleValue(value));
 }
-function optionValueAttr(value) {
+function _attr_option_value(value) {
   const selectedValue = getContext(kSelectedValue);
-  return attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  return _attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
-function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
+function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content) {
   if (valueChange) {
     writeControlledScope(
       3 /* SelectValue */,
@@ -2651,7 +2649,7 @@ function controllable_select_value(scopeId, nodeAccessor, value, valueChange, co
     withContext(kSelectedValue, value, content);
   }
 }
-function controllable_textarea_value(scopeId, nodeAccessor, value, valueChange) {
+function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
   if (valueChange) {
     writeControlledScope(
       2 /* InputValue */,
@@ -2663,7 +2661,7 @@ function controllable_textarea_value(scopeId, nodeAccessor, value, valueChange)
   }
   return escapeTextAreaValue(value);
 }
-function controllable_input_value(scopeId, nodeAccessor, value, valueChange) {
+function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   if (valueChange) {
     writeControlledScope(
       2 /* InputValue */,
@@ -2673,9 +2671,9 @@ function controllable_input_value(scopeId, nodeAccessor, value, valueChange) {
       valueChange
     );
   }
-  return attr("value", value);
+  return _attr("value", value);
 }
-function controllable_input_checked(scopeId, nodeAccessor, checked, checkedChange) {
+function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange) {
   if (checkedChange) {
     writeControlledScope(
       0 /* InputChecked */,
@@ -2685,11 +2683,11 @@ function controllable_input_checked(scopeId, nodeAccessor, checked, checkedChang
       checkedChange
     );
   }
-  return attr("checked", checked);
+  return _attr("checked", checked);
 }
-function controllable_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value) {
+function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value) {
   const multiple = Array.isArray(checkedValue);
-  const valueAttr = attr("value", value);
+  const valueAttr = _attr("value", value);
   if (checkedValueChange) {
     writeControlledScope(
       1 /* InputCheckedValue */,
@@ -2701,7 +2699,7 @@ function controllable_input_checkedValue(scopeId, nodeAccessor, checkedValue, ch
   }
   return (multiple ? checkedValue.includes(value) : checkedValue === value) ? valueAttr + " checked" : valueAttr;
 }
-function controllable_detailsOrDialog_open(scopeId, nodeAccessor, open, openChange) {
+function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
   if (openChange) {
     writeControlledScope(
       4 /* DetailsOrDialogOpen */,
@@ -2711,26 +2709,26 @@ function controllable_detailsOrDialog_open(scopeId, nodeAccessor, open, openChan
       openChange
     );
   }
-  return attr("open", open);
+  return _attr("open", open);
 }
-function attr(name, value) {
+function _attr(name, value) {
   return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
-function attrs(data, nodeAccessor, scopeId, tagName) {
+function _attrs(data, nodeAccessor, scopeId, tagName) {
   let result = "";
   let skip = /[\s/>"'=]/;
   let events;
   switch (tagName) {
     case "input":
       if (data.checkedChange) {
-        result += controllable_input_checked(
+        result += _attr_input_checked(
           scopeId,
           nodeAccessor,
           data.checked,
           data.checkedChange
         );
       } else if (data.checkedValue || data.checkedValueChange) {
-        result += controllable_input_checkedValue(
+        result += _attr_input_checkedValue(
           scopeId,
           nodeAccessor,
           data.checkedValue,
@@ -2738,7 +2736,7 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
           data.value
         );
       } else if (data.valueChange) {
-        result += controllable_input_value(
+        result += _attr_input_value(
           scopeId,
           nodeAccessor,
           data.value,
@@ -2757,14 +2755,14 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
       break;
     case "option":
       if (data.value) {
-        result += optionValueAttr(data.value);
+        result += _attr_option_value(data.value);
         skip = /^value$|[\s/>"'=]/;
       }
       break;
     case "details":
     case "dialog":
       if (data.openChange) {
-        result += controllable_detailsOrDialog_open(
+        result += _attr_details_or_dialog_open(
           scopeId,
           nodeAccessor,
           data.open,
@@ -2778,10 +2776,10 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
     const value = data[name];
     switch (name) {
       case "class":
-        result += classAttr(value);
+        result += _attr_class(value);
         break;
       case "style":
-        result += styleAttr(value);
+        result += _attr_style(value);
         break;
       default:
         if (name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta")) {
@@ -2802,20 +2800,20 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
   }
   return result;
 }
-function writeAttrsAndContent(data, nodeAccessor, scopeId, tagName, serializeReason) {
-  write(`${attrs(data, nodeAccessor, scopeId, tagName)}>`);
-  writeContent(nodeAccessor, scopeId, data?.content, serializeReason);
+function _attrs_content(data, nodeAccessor, scopeId, tagName, serializeReason) {
+  _html(`${_attrs(data, nodeAccessor, scopeId, tagName)}>`);
+  _attr_content(nodeAccessor, scopeId, data?.content, serializeReason);
 }
-function partialAttrs(data, skip, nodeAccessor, scopeId, tagName) {
+function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
   const partial = {};
   for (const key in data) {
     if (!skip[key]) partial[key] = data[key];
   }
-  return attrs(partial, nodeAccessor, scopeId, tagName);
+  return _attrs(partial, nodeAccessor, scopeId, tagName);
 }
-function writePartialAttrsAndContent(data, skip, nodeAccessor, scopeId, tagName, serializeReason) {
-  write(`${partialAttrs(data, skip, nodeAccessor, scopeId, tagName)}>`);
-  writeContent(nodeAccessor, scopeId, data?.content, serializeReason);
+function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, serializeReason) {
+  _html(`${_attrs_partial(data, skip, nodeAccessor, scopeId, tagName)}>`);
+  _attr_content(nodeAccessor, scopeId, data?.content, serializeReason);
 }
 function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
   writeScope(scopeId, {
@@ -2879,7 +2877,7 @@ var DEFAULT_RUNTIME_ID = "M";
 var DEFAULT_RENDER_ID = "_";
 
 // src/html/template.ts
-var createTemplate = (templateId, renderer) => {
+var _template = (templateId, renderer) => {
   renderer.render = render;
   renderer._ = renderer;
   if (true) {
@@ -2889,7 +2887,7 @@ var createTemplate = (templateId, renderer) => {
       );
     };
   }
-  return registerContent(templateId, renderer);
+  return _content_resume(templateId, renderer);
 };
 function isTemplate(renderer) {
   return !!renderer._;
@@ -3077,14 +3075,14 @@ var ServerRendered = class {
       return;
     }
     const { boundary } = head;
-    const onNext = boundary.onNext = (write2) => {
+    const onNext = boundary.onNext = (write) => {
       if (boundary.signal.aborted) {
         if (!tick2) offTick(onNext);
         boundary.onNext = NOOP2;
         onAbort(boundary.signal.reason);
       } else {
         const { done } = boundary;
-        if (done || write2) {
+        if (done || write) {
           const html = (head = head.consume()).flushHTML();
           if (html) onWrite(html);
           if (done) {
@@ -3119,7 +3117,7 @@ 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)$/;
-var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
+var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
   const shouldResume = serializeReason !== 0;
   const renderer = normalizeDynamicRenderer(tag);
   if (true) {
@@ -3128,13 +3126,15 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
     }
   }
   const state = getState();
-  const branchId = peekNextScopeId();
+  const branchId = _peek_scope_id();
+  let rendered = false;
   let result;
   if (typeof renderer === "string") {
     const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
-    nextScopeId();
-    write(
-      `<${renderer}${attrs(input, true ? `#${renderer}/0` : 0, branchId, renderer)}>`
+    rendered = true;
+    _scope_id();
+    _html(
+      `<${renderer}${_attrs(input, true ? `#${renderer}/0` : 0, branchId, renderer)}>`
     );
     if (!voidElementsReg.test(renderer)) {
       const renderContent = content || normalizeDynamicRenderer(input.content);
@@ -3144,8 +3144,8 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
             "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
           );
         }
-        write(
-          controllable_textarea_value(
+        _html(
+          _attr_textarea_value(
             branchId,
             true ? `#${renderer}/0` : 0,
             input.value,
@@ -3159,7 +3159,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
           );
         }
         if (renderer === "select" && ("value" in input || "valueChange" in input)) {
-          controllable_select_value(
+          _attr_select_value(
             branchId,
             true ? `#${renderer}/0` : 0,
             input.value,
@@ -3167,7 +3167,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
             renderContent
           );
         } else {
-          dynamicTag(
+          _dynamic_tag(
             branchId,
             true ? `#${renderer}/0` : 0,
             renderContent,
@@ -3178,23 +3178,23 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
           );
         }
       }
-      write(`</${renderer}>`);
+      _html(`</${renderer}>`);
     } else if (content) {
       throw new Error(
         `Body content is not supported for the \`<${renderer}>\` tag.`
       );
     }
     if (shouldResume) {
-      write(
+      _html(
         state.mark(
-          "'" /* BranchNativeTag */,
+          "'" /* BranchEndNativeTag */,
           scopeId + " " + accessor + " " + branchId
         )
       );
     }
   } else {
     if (shouldResume) {
-      write(state.mark("[" /* BranchStart */, branchId + ""));
+      _html(state.mark("[" /* BranchStart */, ""));
     }
     const render2 = () => {
       if (renderer) {
@@ -3213,11 +3213,16 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
       }
     };
     result = shouldResume ? withBranchId(branchId, render2) : render2();
+    rendered = _peek_scope_id() !== branchId;
     if (shouldResume) {
-      write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
+      _html(
+        state.mark(
+          "]" /* BranchEnd */,
+          scopeId + " " + accessor + (rendered ? " " + branchId : "")
+        )
+      );
     }
   }
-  const rendered = peekNextScopeId() !== branchId;
   if (rendered) {
     if (shouldResume) {
       writeScope(scopeId, {
@@ -3226,19 +3231,19 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
       });
     }
   } else {
-    nextScopeId();
+    _scope_id();
   }
   return result;
 };
-function createContent(id, fn) {
+function _content(id, fn) {
   fn.___id = id;
   return fn;
 }
-function registerContent(id, fn, scopeId) {
-  return register2(createContent(id, fn), id, scopeId);
+function _content_resume(id, fn, scopeId) {
+  return _resume(_content(id, fn), id, scopeId);
 }
 function patchDynamicTag(patch) {
-  dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
+  _dynamic_tag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
     const patched = patch(scopeId, accessor, tag);
     if (patched !== tag) patched.___id = tag;
     return originalDynamicTag(
@@ -3250,7 +3255,7 @@ function patchDynamicTag(patch) {
       inputIsArgs,
       resume
     );
-  })(dynamicTag);
+  })(_dynamic_tag);
 }
 
 // src/html/compat.ts
@@ -3258,11 +3263,11 @@ var K_TAGS_API_STATE = Symbol();
 var COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap();
 var compat = {
   $global,
-  fork,
-  write,
+  fork: _await,
+  write: _html,
   writeScript,
-  nextScopeId,
-  peekNextScopeId,
+  nextScopeId: _scope_id,
+  peekNextScopeId: _peek_scope_id,
   isInResumedBranch,
   ensureState($global2) {
     let state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
@@ -3286,7 +3291,7 @@ var compat = {
   patchDynamicTag,
   writeSetScopeForComponent(branchId, m5c) {
     writeScope(branchId, { m5c });
-    writeEffect(branchId, SET_SCOPE_REGISTER_ID);
+    _script(branchId, SET_SCOPE_REGISTER_ID);
   },
   toJSON(state) {
     return function toJSON() {
@@ -3332,9 +3337,9 @@ var compat = {
     }
     head.render(() => {
       if (willRerender) {
-        const scopeId = peekNextScopeId();
+        const scopeId = _peek_scope_id();
         writeScope(scopeId, { m5c: component.id });
-        writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
+        _script(scopeId, SET_SCOPE_REGISTER_ID);
       }
       if (isTemplate(renderer) && willRerender) {
         renderer(normalizedInput, 1);
@@ -3373,62 +3378,62 @@ function NOOP3() {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $global,
-  attr,
+  _attr,
+  _attr_class,
+  _attr_content,
+  _attr_details_open,
+  _attr_dialog_open,
+  _attr_input_checked,
+  _attr_input_checkedValue,
+  _attr_input_value,
+  _attr_option_value,
+  _attr_select_value,
+  _attr_style,
+  _attr_textarea_value,
+  _attrs,
+  _attrs_content,
+  _attrs_partial,
+  _attrs_partial_content,
+  _await,
+  _content,
+  _content_resume,
+  _dynamic_tag,
+  _el,
+  _el_resume,
+  _escape,
+  _escape_script,
+  _escape_style,
+  _existing_scope,
+  _for_in,
+  _for_of,
+  _for_to,
+  _hoist,
+  _html,
+  _id,
+  _if,
+  _peek_scope_id,
+  _resume,
+  _resume_branch,
+  _scope,
+  _scope_id,
+  _scope_with_id,
+  _script,
+  _sep,
+  _serialize_guard,
+  _serialize_if,
+  _subscribe,
+  _template,
+  _trailers,
+  _try,
+  _unescaped,
+  _var,
   attrTag,
   attrTags,
-  attrs,
-  classAttr,
-  commentSeparator,
   compat,
-  controllable_detailsOrDialog_open,
-  controllable_input_checked,
-  controllable_input_checkedValue,
-  controllable_input_value,
-  controllable_select_value,
-  controllable_textarea_value,
-  createContent,
-  createTemplate,
-  dynamicTag,
-  ensureScopeWithId,
-  escapeScript,
-  escapeStyle,
-  escapeXML,
   forIn,
   forInBy,
   forOf,
   forOfBy,
   forTo,
-  forToBy,
-  fork,
-  getScopeById,
-  hoist,
-  markResumeNode,
-  nextScopeId,
-  nextTagId,
-  nodeRef,
-  optionValueAttr,
-  partialAttrs,
-  peekNextScopeId,
-  register,
-  registerContent,
-  resumeClosestBranch,
-  resumeConditional,
-  resumeForIn,
-  resumeForOf,
-  resumeForTo,
-  serializeGuard,
-  serializeIf,
-  setTagVar,
-  styleAttr,
-  toString,
-  tryContent,
-  write,
-  writeAttrsAndContent,
-  writeContent,
-  writeEffect,
-  writeExistingScope,
-  writePartialAttrsAndContent,
-  writeScope,
-  writeSubscribe,
-  writeTrailers
+  forToBy
 });