marko 6.0.0-next.3.68 → 6.0.0-next.3.70

package/dist/debug/html.mjs

@@ -501,11 +501,7 @@ var Reference = class {
 };
 var DEBUG = /* @__PURE__ */ new WeakMap();
 function setDebugInfo(obj, file, loc, vars) {
-  DEBUG.set(obj, {
-    file,
-    loc,
-    vars
-  });
+  DEBUG.set(obj, { file, loc, vars });
 }
 var Serializer = class {
   #state = new State();
@@ -564,10 +560,7 @@ function register(id, val, scope) {
 function getRegistered(val) {
   const registered = REGISTRY.get(val);
   if (registered) {
-    return {
-      id: registered.id,
-      scope: registered.scope
-    };
+    return { id: registered.id, scope: registered.scope };
   }
 }
 function writeRoot(state, root) {
@@ -737,7 +730,7 @@ function writeRegistered(state, val, parent, accessor, { access, scope, getter }
       return true;
     }
     if (scopeRef) {
-      if (isCircular(parent, scopeRef)) {
+      if (parent && (state.assigned.has(scopeRef) || isCircular(parent, scopeRef))) {
         state.assigned.add(parent);
         state.assigned.add(fnRef);
         fnRef.init = access + "(" + ensureId(state, scopeRef) + ")";
@@ -1593,7 +1586,7 @@ function withContext(key, value, cb) {
   ctx[kPendingContexts]++;
   ctx[key] = value;
   try {
-    cb();
+    return cb();
   } finally {
     ctx[kPendingContexts]--;
     ctx[key] = prev;
@@ -1654,23 +1647,33 @@ function hoist(scopeId, id) {
 function resumeClosestBranch(scopeId) {
   const branchId = $chunk.context?.[branchIdKey];
   if (branchId !== void 0 && branchId !== scopeId) {
-    writeScope(scopeId, {
-      ["#ClosestBranchId" /* ClosestBranchId */]: branchId
-    });
+    writeScope(scopeId, { ["#ClosestBranchId" /* ClosestBranchId */]: branchId });
   }
 }
 var branchIdKey = Symbol();
-function resumeForOf(list, cb, scopeId, accessor) {
-  forOf(list, (item, i) => {
+function withBranchId(branchId, cb) {
+  return withContext(branchIdKey, branchId, cb);
+}
+function resumeForOf(list, cb, by, scopeId, accessor) {
+  const loopScopes = /* @__PURE__ */ new Map();
+  forOf(list, (item, index) => {
     const branchId = peekNextScopeId();
     $chunk.writeHTML(
       $chunk.boundary.state.mark(
         "[" /* BranchStart */,
-        branchId + (i ? " " : "")
+        branchId + (index ? " " : "")
       )
     );
-    withContext(branchIdKey, branchId, () => cb(item, i));
+    withBranchId(branchId, () => {
+      cb(item, index);
+      loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1678,13 +1681,22 @@ function resumeForOf(list, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForOf(list, cb, scopeId, accessor, onlyChildInParent) {
+function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, onlyChildInParent) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let branchIds = "";
   forOf(list, (item, index) => {
     const branchId = peekNextScopeId();
     branchIds = " " + branchId + branchIds;
-    withContext(branchIdKey, branchId, () => cb(item, index));
+    withBranchId(branchId, () => {
+      cb(item, index);
+      loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1692,7 +1704,17 @@ function resumeSingleNodeForOf(list, cb, scopeId, accessor, onlyChildInParent) {
     )
   );
 }
-function resumeForIn(obj, cb, scopeId, accessor) {
+function forOfBy(by, item, index) {
+  if (by) {
+    if (typeof by === "string") {
+      return item[by];
+    }
+    return by(item, index);
+  }
+  return index;
+}
+function resumeForIn(obj, cb, by, scopeId, accessor) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let sep = "";
   forIn(obj, (key, value) => {
     const branchId = peekNextScopeId();
@@ -1700,8 +1722,16 @@ function resumeForIn(obj, cb, scopeId, accessor) {
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
     );
     sep = " ";
-    withContext(branchIdKey, branchId, () => cb(key, value));
+    withBranchId(branchId, () => {
+      cb(key, value);
+      loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1709,13 +1739,22 @@ function resumeForIn(obj, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForIn(obj, cb, scopeId, accessor, onlyChild) {
+function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, onlyChild) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let branchIds = "";
   forIn(obj, (key, value) => {
     const branchId = peekNextScopeId();
     branchIds = " " + branchId + branchIds;
-    withContext(branchIdKey, branchId, () => cb(key, value));
+    withBranchId(branchId, () => {
+      cb(key, value);
+      loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1723,7 +1762,14 @@ function resumeSingleNodeForIn(obj, cb, scopeId, accessor, onlyChild) {
     )
   );
 }
-function resumeForTo(to, from, step, cb, scopeId, accessor) {
+function forInBy(by, name, value) {
+  if (by) {
+    return by(name, value);
+  }
+  return name;
+}
+function resumeForTo(to, from, step, cb, by, scopeId, accessor) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let sep = "";
   forTo(to, from, step, (index) => {
     const branchId = peekNextScopeId();
@@ -1731,8 +1777,16 @@ function resumeForTo(to, from, step, cb, scopeId, accessor) {
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
     );
     sep = " ";
-    withContext(branchIdKey, branchId, () => cb(index));
+    withBranchId(branchId, () => {
+      cb(index);
+      loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1740,13 +1794,22 @@ function resumeForTo(to, from, step, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor, onlyChild) {
+function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, onlyChild) {
+  const loopScopes = /* @__PURE__ */ new Map();
   let branchIds = "";
   forTo(to, from, step, (index) => {
     const branchId = peekNextScopeId();
     branchIds = " " + branchId + branchIds;
-    withContext(branchIdKey, branchId, () => cb(index));
+    withBranchId(branchId, () => {
+      cb(index);
+      loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+    });
   });
+  if (loopScopes.size) {
+    writeScope(scopeId, {
+      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+    });
+  }
   $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1754,40 +1817,57 @@ function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor, onlyChild)
     )
   );
 }
-function resumeConditional(cb, scopeId, accessor) {
+function forToBy(by, index) {
+  if (by) {
+    return by(index);
+  }
+  return index;
+}
+function resumeConditional(cb, scopeId, accessor, dynamic) {
   const branchId = peekNextScopeId();
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  );
-  withContext(branchIdKey, branchId, cb);
-  const rendered = peekNextScopeId() !== branchId;
-  if (rendered) {
-    writeScope(branchId, {});
+  if (dynamic) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+    );
+  }
+  const branchIndex = withBranchId(branchId, cb);
+  if (branchIndex !== void 0) {
+    writeScope(scopeId, {
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+      ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+    });
   } else {
     nextScopeId();
   }
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
+  if (dynamic) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor
+      )
+    );
+  }
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
+function resumeSingleNodeConditional(cb, scopeId, accessor, dynamic, onlyChild) {
   const branchId = peekNextScopeId();
-  withContext(branchIdKey, branchId, cb);
-  const rendered = peekNextScopeId() !== branchId;
+  const branchIndex = withBranchId(branchId, cb);
+  const rendered = branchIndex !== void 0;
   if (rendered) {
-    writeScope(branchId, {});
+    writeScope(scopeId, {
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+      ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+    });
   } else {
     nextScopeId();
   }
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + (rendered ? " " + branchId : "")
-    )
-  );
+  if (dynamic) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+        scopeId + " " + accessor + (rendered ? " " + branchId : "")
+      )
+    );
+  }
 }
 var writeScope = (scopeId, partialScope) => {
   const { state } = $chunk.boundary;
@@ -1987,7 +2067,7 @@ function tryCatch(content, catchContent) {
       catchChunk.render(catchContent, catchBoundary.signal.reason);
       state.reorder(catchChunk);
       boundary.endAsync();
-    } else if (catchBoundary.done) {
+    } else if (!catchBoundary.count) {
       boundary.endAsync();
     } else {
       boundary.onNext();
@@ -2012,6 +2092,7 @@ var State2 = class {
   hasReorderRuntime = false;
   hasWrittenResume = false;
   trailerHTML = "";
+  resumes = "";
   nonceAttr = "";
   serializer = new Serializer();
   writeReorders = null;
@@ -2075,7 +2156,8 @@ var Boundary = class extends AbortController {
   onNext = NOOP;
   count = 0;
   get done() {
-    return this.count === 0;
+    flushSerializer(this);
+    return !this.count;
   }
   startAsync() {
     if (!this.signal.aborted) {
@@ -2181,145 +2263,152 @@ var Chunk = class {
       $chunk = prev;
     }
   }
-};
-function prepareChunk(chunk) {
-  const head = chunk.consume();
-  const { boundary, effects } = head;
-  const { state } = boundary;
-  const { $global: $global2, runtimePrefix, serializer, nonceAttr } = state;
-  let { html, scripts } = head;
-  let hasWalk = false;
-  head.effects = "";
-  if (state.needsMainRuntime && !state.hasMainRuntime) {
-    state.hasMainRuntime = true;
-    scripts = concatScripts(
-      scripts,
-      WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
-    );
-  }
-  let resumes = "";
-  if (state.writeScopes || serializer.flushed) {
-    let { lastSerializedScopeId } = state;
-    const serializeData = [];
-    if (!state.hasGlobals) {
-      state.hasGlobals = true;
-      serializeData.push(getFilteredGlobals(state.$global));
-    }
-    for (const key in state.writeScopes) {
-      const scope = state.writeScopes[key];
-      const scopeId = getScopeId(scope);
-      const scopeIdDelta = scopeId - lastSerializedScopeId;
-      lastSerializedScopeId = scopeId + 1;
-      if (scopeIdDelta) serializeData.push(scopeIdDelta);
-      serializeData.push(scope);
-    }
-    resumes = state.serializer.stringify(serializeData, boundary);
-    state.writeScopes = null;
-    state.lastSerializedScopeId = lastSerializedScopeId;
-  }
-  if (effects) {
-    hasWalk = true;
-    resumes = resumes ? resumes + "," + effects : effects;
-  }
-  if (resumes) {
-    if (state.hasWrittenResume) {
-      scripts = concatScripts(
-        scripts,
-        runtimePrefix + ".r.push(" + resumes + ")"
-      );
-    } else {
-      state.hasWrittenResume = true;
+  flushScript() {
+    flushSerializer(this.boundary);
+    const { boundary, effects } = this;
+    const { state } = boundary;
+    const { $global: $global2, runtimePrefix, nonceAttr } = state;
+    let { resumes } = state;
+    let { html, scripts } = this;
+    let hasWalk = false;
+    if (state.needsMainRuntime && !state.hasMainRuntime) {
+      state.hasMainRuntime = true;
       scripts = concatScripts(
         scripts,
-        runtimePrefix + ".r=[" + resumes + "]"
+        WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
       );
     }
-  }
-  if (state.writeReorders) {
-    hasWalk = true;
-    if (!state.hasReorderRuntime) {
-      state.hasReorderRuntime = true;
-      html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>";
-      scripts = concatScripts(
-        scripts,
-        REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")"
-      );
+    if (effects) {
+      hasWalk = true;
+      resumes = resumes ? resumes + "," + effects : effects;
     }
-    for (const reorderedChunk of state.writeReorders) {
-      const { reorderId } = reorderedChunk;
-      let reorderHTML = "";
-      let reorderEffects = "";
-      let reorderScripts = "";
-      let cur = reorderedChunk;
-      reorderedChunk.reorderId = null;
-      for (; ; ) {
-        cur.flushPlaceholder();
-        const { next } = cur;
-        cur.consumed = true;
-        reorderHTML += cur.html;
-        reorderEffects = concatEffects(reorderEffects, cur.effects);
-        reorderScripts = concatScripts(reorderScripts, cur.scripts);
-        if (cur.async) {
-          reorderHTML += state.mark(
-            "#" /* ReorderMarker */,
-            cur.reorderId = state.nextReorderId()
-          );
-          cur.html = cur.effects = cur.scripts = "";
-          cur.next = null;
-        }
-        if (next) {
-          cur = next;
-        } else {
-          break;
-        }
+    if (resumes) {
+      if (state.hasWrittenResume) {
+        scripts = concatScripts(
+          scripts,
+          runtimePrefix + ".r.push(" + resumes + ")"
+        );
+      } else {
+        state.hasWrittenResume = true;
+        scripts = concatScripts(
+          scripts,
+          runtimePrefix + ".r=[" + resumes + "]"
+        );
+      }
+    }
+    if (state.writeReorders) {
+      hasWalk = true;
+      if (!state.hasReorderRuntime) {
+        state.hasReorderRuntime = true;
+        html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>";
+        scripts = concatScripts(
+          scripts,
+          REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")"
+        );
       }
-      if (reorderEffects) {
-        if (!state.hasWrittenResume) {
-          state.hasWrittenResume = true;
-          scripts = concatScripts(
-            scripts,
-            runtimePrefix + ".r=[]"
+      for (const reorderedChunk of state.writeReorders) {
+        const { reorderId } = reorderedChunk;
+        let reorderHTML = "";
+        let reorderEffects = "";
+        let reorderScripts = "";
+        let cur = reorderedChunk;
+        reorderedChunk.reorderId = null;
+        for (; ; ) {
+          cur.flushPlaceholder();
+          const { next } = cur;
+          cur.consumed = true;
+          reorderHTML += cur.html;
+          reorderEffects = concatEffects(reorderEffects, cur.effects);
+          reorderScripts = concatScripts(reorderScripts, cur.scripts);
+          if (cur.async) {
+            reorderHTML += state.mark(
+              "#" /* ReorderMarker */,
+              cur.reorderId = state.nextReorderId()
+            );
+            cur.html = cur.effects = cur.scripts = "";
+            cur.next = null;
+          }
+          if (next) {
+            cur = next;
+          } else {
+            break;
+          }
+        }
+        if (reorderEffects) {
+          if (!state.hasWrittenResume) {
+            state.hasWrittenResume = true;
+            scripts = concatScripts(
+              scripts,
+              runtimePrefix + ".r=[]"
+            );
+          }
+          reorderScripts = concatScripts(
+            reorderScripts,
+            "_.push(" + reorderEffects + ")"
           );
         }
-        reorderScripts = concatScripts(
-          reorderScripts,
-          "_.push(" + reorderEffects + ")"
+        scripts = concatScripts(
+          scripts,
+          reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
         );
+        html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
       }
-      scripts = concatScripts(
-        scripts,
-        reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
-      );
-      html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
+      state.writeReorders = null;
     }
-    state.writeReorders = null;
+    if (hasWalk) {
+      scripts = concatScripts(scripts, runtimePrefix + ".w()");
+    }
+    this.effects = state.resumes = "";
+    this.html = html;
+    this.scripts = scripts;
+    return this;
   }
-  if (hasWalk) {
-    scripts = concatScripts(scripts, runtimePrefix + ".w()");
+  flushHTML() {
+    this.flushScript();
+    const { boundary, scripts } = this;
+    const { state } = boundary;
+    const { $global: $global2, nonceAttr } = state;
+    const { __flush__ } = $global2;
+    let { html } = this;
+    this.html = this.scripts = "";
+    if (scripts) {
+      html += "<script" + nonceAttr + ">" + scripts + "</script>";
+    }
+    if (__flush__) {
+      $global2.__flush__ = void 0;
+      html = __flush__($global2, html);
+    }
+    if (!boundary.count) {
+      html += state.trailerHTML;
+    }
+    return html;
   }
-  head.html = html;
-  head.scripts = scripts;
-  return head;
-}
-function flushChunk(head, last) {
-  const { boundary } = head;
+};
+function flushSerializer(boundary) {
   const { state } = boundary;
-  const { html, scripts } = head;
-  const { $global: $global2 } = state;
-  const { __flush__ } = $global2;
-  let result = html;
-  head.html = head.scripts = "";
-  if (scripts) {
-    result += "<script" + state.nonceAttr + ">" + scripts + "</script>";
-  }
-  if (__flush__) {
-    $global2.__flush__ = void 0;
-    result = __flush__($global2, result);
-  }
-  if (last && state.trailerHTML) {
-    result += state.trailerHTML;
+  const { writeScopes, serializer } = state;
+  if (writeScopes || serializer.flushed) {
+    const serializeData = [];
+    let { lastSerializedScopeId } = state;
+    if (!state.hasGlobals) {
+      state.hasGlobals = true;
+      serializeData.push(getFilteredGlobals(state.$global));
+    }
+    for (const key in writeScopes) {
+      const scope = writeScopes[key];
+      const scopeId = getScopeId(scope);
+      const scopeIdDelta = scopeId - lastSerializedScopeId;
+      lastSerializedScopeId = scopeId + 1;
+      if (scopeIdDelta) serializeData.push(scopeIdDelta);
+      serializeData.push(scope);
+    }
+    state.resumes = concatEffects(
+      state.resumes,
+      serializer.stringify(serializeData, boundary)
+    );
+    state.lastSerializedScopeId = lastSerializedScopeId;
+    state.writeScopes = null;
   }
-  return result;
 }
 function writeTrailers(html) {
   $chunk.boundary.state.trailerHTML += html;
@@ -2640,117 +2729,97 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagId(tagName) {
-  const normalizedRenderer = normalizeDynamicRenderer(tagName);
-  return normalizedRenderer?.___id || normalizedRenderer;
-}
-var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
-  if (!tag && !content) {
-    nextScopeId();
-    return;
-  }
-  if (!tag) {
-    resumeConditional(content, scopeId, accessor);
-    return;
+var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, resume) => {
+  const renderer = normalizeDynamicRenderer(tag);
+  if (true) {
+    if (renderer && typeof renderer !== "function" && typeof renderer !== "string") {
+      throw new Error(`Invalid renderer passed for dynamic tag: ${renderer}`);
+    }
   }
-  if (typeof tag === "string") {
-    resumeSingleNodeConditional(
-      () => {
-        nextScopeId();
-        write(`<${tag}${attrs(input, accessor, scopeId, tag)}>`);
-        if (!voidElementsReg.test(tag)) {
-          if (tag === "textarea") {
-            if (content) {
-              throw new Error(
-                "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
-              );
-            }
-            write(
-              controllable_textarea_value(
-                scopeId,
-                accessor,
-                input.value,
-                input.valueChange
-              )
+  const chunk = getChunk();
+  const branchId = peekNextScopeId();
+  let result;
+  if (typeof renderer === "string") {
+    const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    nextScopeId();
+    write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`);
+    if (!voidElementsReg.test(renderer)) {
+      withBranchId(branchId, () => {
+        if (renderer === "textarea") {
+          if (content) {
+            throw new Error(
+              "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
             );
-          } else if (content) {
-            if (tag === "select" && ("value" in input || "valueChange" in input)) {
-              controllable_select_value(
-                scopeId,
-                accessor,
-                input.value,
-                input.valueChange,
-                content
-              );
-            } else {
-              content();
-            }
           }
-          write(`</${tag}>`);
+          write(
+            controllable_textarea_value(
+              scopeId,
+              accessor,
+              input.value,
+              input.valueChange
+            )
+          );
         } else if (content) {
-          throw new Error(`Body content is not supported for a "${tag}" tag.`);
+          if (renderer === "select" && ("value" in input || "valueChange" in input)) {
+            controllable_select_value(
+              scopeId,
+              accessor,
+              input.value,
+              input.valueChange,
+              content
+            );
+          } else {
+            content();
+          }
         }
-      },
-      scopeId,
-      accessor
-    );
-    return;
-  }
-  const renderer = normalizeDynamicRenderer(
-    tag
-  );
-  if (true) {
-    if (typeof renderer !== "function") {
-      throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
+      });
+      write(`</${renderer}>`);
+    } else if (content) {
+      throw new Error(`Body content is not supported for a "${renderer}" tag.`);
+    }
+    if (resume) {
+      chunk.writeHTML(
+        chunk.boundary.state.mark(
+          "|" /* BranchSingleNode */,
+          scopeId + " " + accessor + " " + branchId
+        )
+      );
     }
-  }
-  let result;
-  resumeConditional(
-    () => {
-      result = renderer(content ? { ...input, content } : input);
-    },
-    scopeId,
-    accessor
-  );
-  return result;
-};
-var dynamicTagArgs = (scopeId, accessor, tag, args) => {
-  if (!tag) {
-    nextScopeId();
-    return;
-  }
-  if (typeof tag === "string") {
-    resumeSingleNodeConditional(
-      () => {
-        nextScopeId();
-        write(
-          `<${tag}${attrs(args[0], accessor, scopeId, tag)}>`
+  } else {
+    if (resume) {
+      chunk.writeHTML(
+        chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+      );
+    }
+    result = withBranchId(branchId, () => {
+      if (renderer) {
+        return inputIsArgs ? renderer(...inputOrArgs) : renderer(
+          content ? { ...inputOrArgs, content } : inputOrArgs
         );
-        if (!voidElementsReg.test(tag)) {
-          write(`</${tag}>`);
-        }
-      },
-      scopeId,
-      accessor
-    );
-    return;
+      } else if (content) {
+        return content();
+      }
+    });
+    if (resume) {
+      chunk.writeHTML(
+        chunk.boundary.state.mark(
+          "]" /* BranchEnd */,
+          scopeId + " " + accessor
+        )
+      );
+    }
   }
-  const renderer = normalizeDynamicRenderer(
-    tag
-  );
-  if (true) {
-    if (typeof renderer !== "function") {
-      throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
+  const rendered = peekNextScopeId() !== branchId;
+  if (rendered) {
+    if (resume) {
+      writeScope(scopeId, {
+        ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
+        ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: renderer?.___id || renderer
+      });
     }
+  } else {
+    nextScopeId();
   }
-  let result;
-  resumeConditional(
-    () => {
-      result = renderer(...args);
-    },
-    scopeId,
-    accessor
-  );
   return result;
 };
 function createContent(id, fn) {
@@ -2761,19 +2830,19 @@ function registerContent(id, fn, scopeId) {
   return register2(createContent(id, fn), id, scopeId);
 }
 function patchDynamicTag(patch) {
-  dynamicTagInput = /* @__PURE__ */ ((originalDynamicTagInput) => (scopeId, accessor, tag, input, content) => originalDynamicTagInput(
-    scopeId,
-    accessor,
-    patch(scopeId, accessor, tag),
-    input,
-    content
-  ))(dynamicTagInput);
-  dynamicTagArgs = /* @__PURE__ */ ((originalDynamicTagArgs) => (scopeId, accessor, tag, args) => originalDynamicTagArgs(
-    scopeId,
-    accessor,
-    patch(scopeId, accessor, tag),
-    args
-  ))(dynamicTagArgs);
+  dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
+    const patched = patch(scopeId, accessor, tag);
+    patched.___id = tag;
+    return originalDynamicTag(
+      scopeId,
+      accessor,
+      patched,
+      input,
+      content,
+      inputIsArgs,
+      resume
+    );
+  })(dynamicTag);
 }
 
 // src/html/compat.ts
@@ -2819,7 +2888,7 @@ var compat = {
       $global2[K_TAGS_API_STATE] = state = new State2($global2);
     }
     const boundary = new Boundary(state);
-    let head = new Chunk(
+    const head = new Chunk(
       boundary,
       null,
       null
@@ -2840,24 +2909,18 @@ var compat = {
       renderer(normalizedInput);
     });
     const asyncOut = classAPIOut.beginAsync();
-    (boundary.onNext = () => {
-      if (boundary.done) {
+    queueMicrotask(
+      boundary.onNext = () => {
         if (boundary.signal.aborted) {
           asyncOut.error(boundary.signal.reason);
-        } else {
-          queueMicrotask(() => {
-            head = prepareChunk(head);
-            if (boundary.done) {
-              const { scripts, html } = head;
-              asyncOut.script(scripts);
-              asyncOut.write(html);
-              asyncOut.end();
-              head.html = head.scripts = "";
-            }
-          });
+        } else if (boundary.done) {
+          const { scripts, html } = head.consume().flushScript();
+          asyncOut.script(scripts);
+          asyncOut.write(html);
+          asyncOut.end();
         }
       }
-    })();
+    );
   },
   registerRenderer(renderer, id) {
     return register(
@@ -2873,7 +2936,7 @@ var compat = {
 };
 
 // src/html/for.ts
-function forOfBy(by, item, index) {
+function forOfBy2(by, item, index) {
   if (by) {
     if (typeof by === "string") {
       return item[by];
@@ -2882,13 +2945,13 @@ function forOfBy(by, item, index) {
   }
   return index;
 }
-function forInBy(by, name, value) {
+function forInBy2(by, name, value) {
   if (by) {
     return by(name, value);
   }
   return name;
 }
-function forToBy(by, index) {
+function forToBy2(by, index) {
   if (by) {
     return by(index);
   }
@@ -2918,10 +2981,7 @@ function render(input = {}) {
       ...$global2
     };
   } else {
-    $global2 = {
-      runtimeId: DEFAULT_RUNTIME_ID,
-      renderId: DEFAULT_RENDER_ID
-    };
+    $global2 = { runtimeId: DEFAULT_RUNTIME_ID, renderId: DEFAULT_RENDER_ID };
   }
   const head = new Chunk(
     new Boundary(new State2($global2), $global2.signal),
@@ -2985,19 +3045,13 @@ var ServerRenderResult = class {
         if (!(done || aborted)) {
           boundary?.abort(error);
         }
-        return Promise.resolve({
-          value: "",
-          done: true
-        });
+        return Promise.resolve({ value: "", done: true });
       },
       return(value2) {
         if (!(done || aborted)) {
           boundary?.abort(new Error("Iterator returned before consumed."));
         }
-        return Promise.resolve({
-          value: value2,
-          done: true
-        });
+        return Promise.resolve({ value: value2, done: true });
       }
     };
     function exec(_resolve, _reject) {
@@ -3052,7 +3106,7 @@ var ServerRenderResult = class {
   }
   #promise() {
     return this.#cachedPromise ||= new Promise((resolve, reject) => {
-      let head = this.#head;
+      const head = this.#head;
       this.#head = null;
       if (!head) {
         return reject(new Error("Cannot read from a consumed render result"));
@@ -3063,10 +3117,7 @@ var ServerRenderResult = class {
           boundary.onNext = NOOP2;
           reject(boundary.signal.reason);
         } else if (boundary.done) {
-          head = prepareChunk(head);
-          if (boundary.done) {
-            resolve(flushChunk(head, true));
-          }
+          resolve(head.consume().flushHTML());
         }
       })();
     });
@@ -3086,13 +3137,11 @@ var ServerRenderResult = class {
         boundary.onNext = NOOP2;
         onAbort(boundary.signal.reason);
       } else {
-        if (write2 || boundary.done) {
-          head = prepareChunk(head);
-        }
-        if (write2 || boundary.done) {
-          const html = flushChunk(head, boundary.done);
+        const { done } = boundary;
+        if (done || write2) {
+          const html = (head = head.consume()).flushHTML();
           if (html) onWrite(html);
-          if (boundary.done) {
+          if (done) {
             if (!tick2) offTick(onNext);
             onClose();
           } else {
@@ -3109,10 +3158,10 @@ var ServerRenderResult = class {
   }
   toString() {
     const head = this.#head;
-    if (!head) throw new Error("Cannot read from a consumed render result");
-    if (head.next) throw new Error("Cannot fork in sync mode");
     this.#head = null;
-    return flushChunk(prepareChunk(head), true);
+    if (!head) throw new Error("Cannot read from a consumed render result");
+    if (!head.boundary.done) throw new Error("Cannot fork in sync mode");
+    return head.consume().flushHTML();
   }
 };
 function NOOP2() {
@@ -3133,19 +3182,17 @@ export {
   controllable_textarea_value,
   createContent,
   createTemplate,
-  dynamicTagArgs,
-  dynamicTagId,
-  dynamicTagInput,
+  dynamicTag,
   ensureScopeWithId,
   escapeScript,
   escapeStyle,
   escapeXML,
   forIn,
-  forInBy,
+  forInBy2 as forInBy,
   forOf,
-  forOfBy,
+  forOfBy2 as forOfBy,
   forTo,
-  forToBy,
+  forToBy2 as forToBy,
   fork,
   getScopeById,
   hoist,