marko 6.0.60 → 6.0.62

package/dist/html.js

@@ -18,74 +18,74 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0
 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 = [], rest = Symbol();
-function attrTag(attrs2) {
-  return attrs2[Symbol.iterator] = attrTagIterator, attrs2[rest] = empty, attrs2;
+function attrTag(attrs) {
+  return attrs[Symbol.iterator] = attrTagIterator, attrs[rest] = empty, attrs;
 }
-function attrTags(first, attrs2) {
-  return first ? (first[rest] === empty ? first[rest] = [attrs2] : first[rest].push(attrs2), first) : attrTag(attrs2);
+function attrTags(first, attrs) {
+  return first ? (first[rest] === empty ? first[rest] = [attrs] : first[rest].push(attrs), first) : attrTag(attrs);
 }
 function* attrTagIterator() {
   yield this, yield* this[rest];
@@ -131,22 +131,22 @@ function normalizeDynamicRenderer(value) {
 }
 
 // src/html/content.ts
-function toString(val) {
+function _unescaped(val) {
   return val ? val + "" : val === 0 ? "0" : "";
 }
 var unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", 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) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g, 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, 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" : "";
 }
 
@@ -565,7 +565,7 @@ function writeProp(state, val, parent, accessor) {
       return !1;
   }
 }
-function writeReferenceOr(state, write2, val, parent, accessor) {
+function writeReferenceOr(state, write, val, parent, accessor) {
   let ref = state.refs.get(val);
   if (ref)
     return ref.init ? (addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1) : isCircular(parent, ref) ? (ref.assigns || (ensureId(state, ref), state.assigned.add(ref)), addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1) : (state.buf.push(ensureId(state, ref)), !0);
@@ -573,7 +573,7 @@ function writeReferenceOr(state, write2, val, parent, accessor) {
   return registered ? writeRegistered(state, val, parent, accessor, registered) : (state.refs.set(
     val,
     ref = new Reference(parent, accessor, state.flush, state.buf.length)
-  ), write2(state, val, ref) ? !0 : (state.refs.delete(ref), !1));
+  ), write(state, val, ref) ? !0 : (state.refs.delete(ref), !1));
 }
 function writeRegistered(state, val, parent, accessor, { access, scope, getter }) {
   if (scope) {
@@ -1095,24 +1095,24 @@ 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 = !0, $chunk.writeEffect(scopeId, registryId);
 }
-function writeContent(nodeAccessor, scopeId, content, serializeReason) {
-  let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = peekNextScopeId();
-  render2 && (shouldResume ? withBranchId(branchId, render2) : render2()), peekNextScopeId() !== branchId ? shouldResume && writeScope(scopeId, {
+function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
+  let shouldResume = serializeReason !== 0, render2 = normalizeServerRender(content), branchId = _peek_scope_id();
+  render2 && (shouldResume ? withBranchId(branchId, render2) : render2()), _peek_scope_id() !== branchId ? shouldResume && writeScope(scopeId, {
     ["d" /* ConditionalScope */ + nodeAccessor]: writeScope(
       branchId,
       {}
     ),
     ["c" /* ConditionalRenderer */ + nodeAccessor]: render2?.h
-  }) : nextScopeId();
+  }) : _scope_id();
 }
 function normalizeServerRender(value) {
   let renderer = normalizeDynamicRenderer(value);
@@ -1129,55 +1129,55 @@ function withContext(key, value, cb) {
     ctx[kPendingContexts]--, ctx[key] = prev;
   }
 }
-function setTagVar(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
-  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), ensureScopeWithId(childScopeId).e = register2(
+function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
+  _scope_with_id(parentScopeId)[scopeOffsetAccessor] = _scope_id(), _scope_with_id(childScopeId).e = _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() {
   let state = $chunk.boundary.state, { $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) {
   if (scopeId !== void 0)
     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 "";
   let { state } = $chunk.boundary;
   return state.needsMainRuntime = !0, state.mark("*" /* Node */, scopeId + " " + accessor);
 }
-function commentSeparator(shouldResume) {
+function _sep(shouldResume) {
   return shouldResume === 0 ? "" : "<!>";
 }
-function nodeRef(scopeId, id) {
+function _el(scopeId, id) {
   let getter = () => {
   };
-  return id ? register2(getter, id, scopeId) : getter;
+  return id ? _resume(getter, id, scopeId) : getter;
 }
-function hoist(scopeId, id) {
+function _hoist(scopeId, id) {
   let getter = () => {
   };
-  return getter[Symbol.iterator] = getter, id ? register2(getter, id, scopeId) : getter;
+  return getter[Symbol.iterator] = getter, id ? _resume(getter, id, scopeId) : getter;
 }
-function resumeClosestBranch(scopeId) {
+function _resume_branch(scopeId) {
   let branchId = $chunk.context?.[branchIdKey];
   branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { g: branchId });
 }
@@ -1188,15 +1188,15 @@ function isInResumedBranch() {
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
+function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
   if (resumeBranch) {
     let loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
-      let branchId = peekNextScopeId();
-      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : $chunk.writeHTML(
-        state.mark("[" /* BranchStart */, branchId + (index ? " " : ""))
-      )), withBranchId(branchId, () => {
+      let branchId = _peek_scope_id();
+      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 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) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
+function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  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 = peekNextScopeId();
-      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
-        state.mark("[" /* BranchStart */, branchId + sep)
-      ), sep = " ")), withBranchId(branchId, () => {
+      let branchId = _peek_scope_id();
+      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 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) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
+function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  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 = peekNextScopeId();
-      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
-        state.mark("[" /* BranchStart */, branchId + sep)
-      ), sep = " ")), withBranchId(branchId, () => {
+      let branchId = _peek_scope_id();
+      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 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) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId();
-  resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, branchId + ""));
+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 */, ""));
   let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && writeScope(scopeId, {
     ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
@@ -1279,46 +1276,58 @@ 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) {
   let endTag = parentEndTag || "";
-  resumeMarker ? mark ? $chunk.writeHTML(mark + endTag) : $chunk.writeHTML(endTag + markResumeNode(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) {
   let { scopes } = state, scope = scopes.get(scopeId);
   return state.needsMainRuntime = !0, scope ? Object.assign(scope, partialScope) : (scope = partialScope, scope[K_SCOPE_ID] = scopeId, state.scopes.set(scopeId, scope)), state.writeScopes ? state.writeScopes[scopeId] = scope : state.writeScopes = { [scopeId]: scope }, scope;
 }
-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) {
   let { state } = $chunk.boundary, scope = state.scopes.get(scopeId);
   return scope || (scope = { [K_SCOPE_ID]: scopeId }, state.scopes.set(scopeId, scope)), scope;
 }
 function $global() {
   return $chunk.boundary.state.$global;
 }
-function fork(scopeId, accessor, promise, content, serializeMarker) {
+function _await(scopeId, accessor, promise, content, serializeMarker) {
   let resumeMarker = serializeMarker !== 0;
   if (!isPromise(promise)) {
     if (resumeMarker) {
-      let branchId = peekNextScopeId();
+      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
@@ -1330,20 +1339,17 @@ function fork(scopeId, accessor, promise, content, serializeMarker) {
     (value) => {
       chunk.async && (chunk.async = !1, boundary.signal.aborted || (chunk.render(() => {
         if (resumeMarker) {
-          let branchId = peekNextScopeId();
+          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, {}),
-            ensureScopeWithId(scopeId),
+            _scope_with_id(scopeId),
             "d" /* ConditionalScope */ + accessor
           ), $chunk.writeHTML(
             $chunk.boundary.state.mark(
               "]" /* BranchEnd */,
-              scopeId + " " + accessor
+              scopeId + " " + accessor + " " + branchId
             )
           );
         } else
@@ -1355,11 +1361,9 @@ function fork(scopeId, accessor, promise, content, serializeMarker) {
     }
   );
 }
-function tryContent(scopeId, accessor, content, input) {
-  let branchId = peekNextScopeId();
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  );
+function _try(scopeId, accessor, content, input) {
+  let branchId = _peek_scope_id();
+  $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 tryContent(scopeId, accessor, content, input) {
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
-      scopeId + " " + accessor
+      scopeId + " " + accessor + " " + branchId
     )
   );
 }
@@ -1607,7 +1611,7 @@ function flushSerializer(boundary) {
     ), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null, flushed && (state.walkOnNextFlush = !0);
   }
 }
-function writeTrailers(html) {
+function _trailers(html) {
   $chunk.boundary.state.trailerHTML += html;
 }
 function concatEffects(a, b) {
@@ -1650,23 +1654,23 @@ function getFilteredGlobals($global2) {
       }
   return filtered;
 }
-function writeSubscribe(subscribers, scope) {
+function _subscribe(subscribers, scope) {
   return $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), 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) {
   let 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) {
   valueChange && writeControlledScope(
     3 /* SelectValue */,
     scopeId,
@@ -1675,7 +1679,7 @@ function controllable_select_value(scopeId, nodeAccessor, value, valueChange, co
     valueChange
   ), content && withContext(kSelectedValue, value, content);
 }
-function controllable_textarea_value(scopeId, nodeAccessor, value, valueChange) {
+function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
   return valueChange && writeControlledScope(
     2 /* InputValue */,
     scopeId,
@@ -1684,26 +1688,26 @@ function controllable_textarea_value(scopeId, nodeAccessor, value, valueChange)
     valueChange
   ), escapeTextAreaValue(value);
 }
-function controllable_input_value(scopeId, nodeAccessor, value, valueChange) {
+function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   return valueChange && writeControlledScope(
     2 /* InputValue */,
     scopeId,
     nodeAccessor,
     void 0,
     valueChange
-  ), attr("value", value);
+  ), _attr("value", value);
 }
-function controllable_input_checked(scopeId, nodeAccessor, checked, checkedChange) {
+function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange) {
   return checkedChange && writeControlledScope(
     0 /* InputChecked */,
     scopeId,
     nodeAccessor,
     void 0,
     checkedChange
-  ), attr("checked", checked);
+  ), _attr("checked", checked);
 }
-function controllable_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value) {
-  let multiple = Array.isArray(checkedValue), valueAttr = attr("value", value);
+function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value) {
+  let multiple = Array.isArray(checkedValue), valueAttr = _attr("value", value);
   return checkedValueChange && writeControlledScope(
     1 /* InputCheckedValue */,
     scopeId,
@@ -1712,31 +1716,31 @@ function controllable_input_checkedValue(scopeId, nodeAccessor, checkedValue, ch
     checkedValueChange
   ), (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) {
   return openChange && writeControlledScope(
     4 /* DetailsOrDialogOpen */,
     scopeId,
     nodeAccessor,
     open,
     openChange
-  ), attr("open", open);
+  ), _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 = "", skip = /[\s/>"'=]/, 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,
@@ -1744,7 +1748,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,
@@ -1759,11 +1763,11 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
       (data.value || data.valueChange) && (skip = /^value(?:Change)?$|[\s/>"'=]/);
       break;
     case "option":
-      data.value && (result += optionValueAttr(data.value), skip = /^value$|[\s/>"'=]/);
+      data.value && (result += _attr_option_value(data.value), skip = /^value$|[\s/>"'=]/);
       break;
     case "details":
     case "dialog":
-      data.openChange && (result += controllable_detailsOrDialog_open(
+      data.openChange && (result += _attr_details_or_dialog_open(
         scopeId,
         nodeAccessor,
         data.open,
@@ -1775,10 +1779,10 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
     let 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:
         name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta") && (isEventHandler(name) ? (events || (events = {}, writeScope(scopeId, {
@@ -1789,17 +1793,17 @@ 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) {
   let partial = {};
   for (let key in data)
     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, {
@@ -1853,7 +1857,7 @@ function replaceUnsafeDoubleQuoteAttrChar(match) {
 var RENDERER_REGISTER_ID = "$C_r", SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_ID = "$C_b";
 
 // src/html/template.ts
-var createTemplate = (templateId, renderer) => (renderer.render = render, renderer._ = renderer, registerContent(templateId, renderer));
+var _template = (templateId, renderer) => (renderer.render = render, renderer._ = renderer, _content_resume(templateId, renderer));
 function isTemplate(renderer) {
   return !!renderer._;
 }
@@ -1971,12 +1975,12 @@ var ServerRendered = class {
       onAbort(new Error("Cannot read from a consumed render result"));
       return;
     }
-    let { boundary } = head, onNext = boundary.onNext = (write2) => {
+    let { boundary } = head, onNext = boundary.onNext = (write) => {
       if (boundary.signal.aborted)
         tick2 || offTick(onNext), boundary.onNext = NOOP2, onAbort(boundary.signal.reason);
       else {
         let { done } = boundary;
-        if (done || write2) {
+        if (done || write) {
           let html = (head = head.consume()).flushHTML();
           html && onWrite(html), done ? (tick2 || offTick(onNext), onClose()) : tick2 = !0;
         } else tick2 && (tick2 = !1, queueTick(onNext));
@@ -1998,17 +2002,17 @@ 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)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
-  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
+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(), rendered = !1, result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
-    if (nextScopeId(), write(
-      `<${renderer}${attrs(input, 0, branchId, renderer)}>`
+    if (rendered = !0, _scope_id(), _html(
+      `<${renderer}${_attrs(input, 0, branchId, renderer)}>`
     ), !voidElementsReg.test(renderer)) {
       let renderContent = content || normalizeDynamicRenderer(input.content);
       if (renderer === "textarea")
-        write(
-          controllable_textarea_value(
+        _html(
+          _attr_textarea_value(
             branchId,
             0,
             input.value,
@@ -2020,13 +2024,13 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
           throw new Error(
             `Body content is not supported for the \`<${renderer}>\` tag.`
           );
-        renderer === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+        renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(
           branchId,
           0,
           input.value,
           input.valueChange,
           renderContent
-        ) : dynamicTag(
+        ) : _dynamic_tag(
           branchId,
           0,
           renderContent,
@@ -2036,16 +2040,16 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
           serializeReason
         );
       }
-      write(`</${renderer}>`);
+      _html(`</${renderer}>`);
     }
-    shouldResume && write(
+    shouldResume && _html(
       state.mark(
-        "'" /* BranchNativeTag */,
+        "'" /* BranchEndNativeTag */,
         scopeId + " " + accessor + " " + branchId
       )
     );
   } else {
-    shouldResume && write(state.mark("[" /* BranchStart */, branchId + ""));
+    shouldResume && _html(state.mark("[" /* BranchStart */, ""));
     let render2 = () => {
       if (renderer) {
         if (isTemplate(renderer)) {
@@ -2061,21 +2065,26 @@ 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 && write(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 peekNextScopeId() !== branchId ? shouldResume && writeScope(scopeId, {
+  return rendered ? shouldResume && writeScope(scopeId, {
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
     ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer
-  }) : nextScopeId(), result;
+  }) : _scope_id(), result;
 };
-function createContent(id, fn) {
+function _content(id, fn) {
   return fn.h = id, 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) => {
     let patched = patch(scopeId, accessor, tag);
     return patched !== tag && (patched.h = tag), originalDynamicTag(
       scopeId,
@@ -2086,17 +2095,17 @@ function patchDynamicTag(patch) {
       inputIsArgs,
       resume
     );
-  })(dynamicTag);
+  })(_dynamic_tag);
 }
 
 // src/html/compat.ts
 var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap(), 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;
@@ -2113,7 +2122,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   },
   patchDynamicTag,
   writeSetScopeForComponent(branchId, m5c) {
-    writeScope(branchId, { m5c }), writeEffect(branchId, SET_SCOPE_REGISTER_ID);
+    writeScope(branchId, { m5c }), _script(branchId, SET_SCOPE_REGISTER_ID);
   },
   toJSON(state) {
     return function() {
@@ -2152,8 +2161,8 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     }
     head.render(() => {
       if (willRerender) {
-        let scopeId = peekNextScopeId();
-        writeScope(scopeId, { m5c: component.id }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
+        let scopeId = _peek_scope_id();
+        writeScope(scopeId, { m5c: component.id }), _script(scopeId, SET_SCOPE_REGISTER_ID);
       }
       isTemplate(renderer) && willRerender ? renderer(normalizedInput, 1) : renderer(normalizedInput);
       let asyncOut = classAPIOut.beginAsync();
@@ -2179,62 +2188,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
 });