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

package/dist/html.mjs

@@ -411,10 +411,7 @@ function register(id, val, scope) {
 function getRegistered(val) {
   let registered = REGISTRY.get(val);
   if (registered)
-    return {
-      id: registered.id,
-      scope: registered.scope
-    };
+    return { id: registered.id, scope: registered.scope };
 }
 function writeRoot(state, root) {
   let { buf, assigned, mutations } = state, hadBuf = buf.length !== 0, result = "";
@@ -510,7 +507,7 @@ function writeRegistered(state, val, parent, accessor, { access, scope, getter }
       return newScopeRef && ensureId(state, newScopeRef), !0;
     }
     if (scopeRef) {
-      if (isCircular(parent, scopeRef))
+      if (parent && (state.assigned.has(scopeRef) || isCircular(parent, scopeRef)))
         return state.assigned.add(parent), state.assigned.add(fnRef), fnRef.init = access + "(" + ensureId(state, scopeRef) + ")", addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor)), !1;
       state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
     } else {
@@ -1012,7 +1009,7 @@ function withContext(key, value, cb) {
   let ctx = $chunk.context ||= { [kPendingContexts]: 0 }, prev = ctx[key];
   ctx[kPendingContexts]++, ctx[key] = value;
   try {
-    cb();
+    return cb();
   } finally {
     ctx[kPendingContexts]--, ctx[key] = prev;
   }
@@ -1060,20 +1057,26 @@ function hoist(scopeId, id) {
 }
 function resumeClosestBranch(scopeId) {
   let branchId = $chunk.context?.[branchIdKey];
-  branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, {
-    g: branchId
-  });
+  branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { g: 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) {
+  let loopScopes = /* @__PURE__ */ new Map();
+  forOf(list, (item, index) => {
     let 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, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1081,11 +1084,15 @@ function resumeForOf(list, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForOf(list, cb, scopeId, accessor, onlyChildInParent) {
-  let branchIds = "";
+function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, onlyChildInParent) {
+  let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
   forOf(list, (item, index) => {
     let branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(item, index));
+    branchIds = " " + branchId + branchIds, withBranchId(branchId, () => {
+      cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1093,13 +1100,20 @@ function resumeSingleNodeForOf(list, cb, scopeId, accessor, onlyChildInParent) {
     )
   );
 }
-function resumeForIn(obj, cb, scopeId, accessor) {
-  let sep = "";
+function forOfBy(by, item, index) {
+  return by ? typeof by == "string" ? item[by] : by(item, index) : index;
+}
+function resumeForIn(obj, cb, by, scopeId, accessor) {
+  let loopScopes = /* @__PURE__ */ new Map(), sep = "";
   forIn(obj, (key, value) => {
     let branchId = peekNextScopeId();
     $chunk.writeHTML(
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
-    ), sep = " ", withContext(branchIdKey, branchId, () => cb(key, value));
+    ), sep = " ", withBranchId(branchId, () => {
+      cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1107,11 +1121,15 @@ function resumeForIn(obj, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForIn(obj, cb, scopeId, accessor, onlyChild) {
-  let branchIds = "";
+function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, onlyChild) {
+  let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
   forIn(obj, (key, value) => {
     let branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(key, value));
+    branchIds = " " + branchId + branchIds, withBranchId(branchId, () => {
+      cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1119,13 +1137,20 @@ function resumeSingleNodeForIn(obj, cb, scopeId, accessor, onlyChild) {
     )
   );
 }
-function resumeForTo(to, from, step, cb, scopeId, accessor) {
-  let sep = "";
+function forInBy(by, name, value) {
+  return by ? by(name, value) : name;
+}
+function resumeForTo(to, from, step, cb, by, scopeId, accessor) {
+  let loopScopes = /* @__PURE__ */ new Map(), sep = "";
   forTo(to, from, step, (index) => {
     let branchId = peekNextScopeId();
     $chunk.writeHTML(
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
-    ), sep = " ", withContext(branchIdKey, branchId, () => cb(index));
+    ), sep = " ", withBranchId(branchId, () => {
+      cb(index), loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1133,11 +1158,15 @@ function resumeForTo(to, from, step, cb, scopeId, accessor) {
     )
   );
 }
-function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor, onlyChild) {
-  let branchIds = "";
+function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, onlyChild) {
+  let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
   forTo(to, from, step, (index) => {
     let branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds, withContext(branchIdKey, branchId, () => cb(index));
+    branchIds = " " + branchId + branchIds, withBranchId(branchId, () => {
+      cb(index), loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+    });
+  }), loopScopes.size && writeScope(scopeId, {
+    ["m" /* LoopScopeMap */ + accessor]: loopScopes
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
@@ -1145,22 +1174,31 @@ function resumeSingleNodeForTo(to, from, step, cb, scopeId, accessor, onlyChild)
     )
   );
 }
-function resumeConditional(cb, scopeId, accessor) {
+function forToBy(by, index) {
+  return by ? by(index) : index;
+}
+function resumeConditional(cb, scopeId, accessor, dynamic) {
   let branchId = peekNextScopeId();
-  $chunk.writeHTML(
+  dynamic && $chunk.writeHTML(
     $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  ), withContext(branchIdKey, branchId, cb), peekNextScopeId() !== branchId ? writeScope(branchId, {}) : nextScopeId(), $chunk.writeHTML(
+  );
+  let branchIndex = withBranchId(branchId, cb);
+  branchIndex !== void 0 ? writeScope(scopeId, {
+    ["c" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+  }) : nextScopeId(), dynamic && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
-  let branchId = peekNextScopeId();
-  withContext(branchIdKey, branchId, cb);
-  let rendered = peekNextScopeId() !== branchId;
-  rendered ? writeScope(branchId, {}) : nextScopeId(), $chunk.writeHTML(
+function resumeSingleNodeConditional(cb, scopeId, accessor, dynamic, onlyChild) {
+  let branchId = peekNextScopeId(), branchIndex = withBranchId(branchId, cb), rendered = branchIndex !== void 0;
+  rendered ? writeScope(scopeId, {
+    ["c" /* ConditionalRenderer */ + accessor]: dynamic ? branchIndex : void 0,
+    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
+  }) : nextScopeId(), dynamic && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + (rendered ? " " + branchId : "")
@@ -1276,7 +1314,7 @@ function tryCatch(content, catchContent) {
         }
         let catchChunk = new Chunk(boundary, null, chunk.context);
         catchChunk.reorderId = reorderId, catchChunk.render(catchContent, catchBoundary.signal.reason), state.reorder(catchChunk), boundary.endAsync();
-      } else catchBoundary.done ? boundary.endAsync() : boundary.onNext();
+      } else catchBoundary.count ? boundary.onNext() : boundary.endAsync();
   };
 }
 var State2 = class {
@@ -1294,6 +1332,7 @@ var State2 = class {
   hasReorderRuntime = !1;
   hasWrittenResume = !1;
   trailerHTML = "";
+  resumes = "";
   nonceAttr = "";
   serializer = new Serializer();
   writeReorders = null;
@@ -1332,7 +1371,7 @@ var State2 = class {
   onNext = NOOP;
   count = 0;
   get done() {
-    return this.count === 0;
+    return flushSerializer(this), !this.count;
   }
   startAsync() {
     this.signal.aborted || this.count++;
@@ -1407,65 +1446,71 @@ var State2 = class {
       $chunk = prev;
     }
   }
+  flushScript() {
+    flushSerializer(this.boundary);
+    let { boundary, effects } = this, { state } = boundary, { $global: $global2, runtimePrefix, nonceAttr } = state, { resumes } = state, { html, scripts } = this, hasWalk = !1;
+    if (state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(
+      scripts,
+      WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
+    )), effects && (hasWalk = !0, resumes = resumes ? resumes + "," + effects : effects), resumes && (state.hasWrittenResume ? scripts = concatScripts(
+      scripts,
+      runtimePrefix + ".r.push(" + resumes + ")"
+    ) : (state.hasWrittenResume = !0, scripts = concatScripts(
+      scripts,
+      runtimePrefix + ".r=[" + resumes + "]"
+    ))), state.writeReorders) {
+      hasWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>", scripts = concatScripts(
+        scripts,
+        REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")"
+      ));
+      for (let reorderedChunk of state.writeReorders) {
+        let { reorderId } = reorderedChunk, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
+        for (reorderedChunk.reorderId = null; ; ) {
+          cur.flushPlaceholder();
+          let { next } = cur;
+          if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
+            "#" /* ReorderMarker */,
+            cur.reorderId = state.nextReorderId()
+          ), cur.html = cur.effects = cur.scripts = "", cur.next = null), next)
+            cur = next;
+          else
+            break;
+        }
+        reorderEffects && (state.hasWrittenResume || (state.hasWrittenResume = !0, scripts = concatScripts(
+          scripts,
+          runtimePrefix + ".r=[]"
+        )), reorderScripts = concatScripts(
+          reorderScripts,
+          "_.push(" + reorderEffects + ")"
+        )), scripts = concatScripts(
+          scripts,
+          reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
+        ), html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
+      }
+      state.writeReorders = null;
+    }
+    return hasWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.effects = state.resumes = "", this.html = html, this.scripts = scripts, this;
+  }
+  flushHTML() {
+    this.flushScript();
+    let { boundary, scripts } = this, { state } = boundary, { $global: $global2, nonceAttr } = state, { __flush__ } = $global2, { html } = this;
+    return this.html = this.scripts = "", scripts && (html += "<script" + nonceAttr + ">" + scripts + "</script>"), __flush__ && ($global2.__flush__ = void 0, html = __flush__($global2, html)), boundary.count || (html += state.trailerHTML), html;
+  }
 };
-function prepareChunk(chunk) {
-  let head = chunk.consume(), { boundary, effects } = head, { state } = boundary, { $global: $global2, runtimePrefix, serializer, nonceAttr } = state, { html, scripts } = head, hasWalk = !1;
-  head.effects = "", state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(
-    scripts,
-    WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
-  ));
-  let resumes = "";
-  if (state.writeScopes || serializer.flushed) {
-    let { lastSerializedScopeId } = state, serializeData = [];
+function flushSerializer(boundary) {
+  let { state } = boundary, { writeScopes, serializer } = state;
+  if (writeScopes || serializer.flushed) {
+    let serializeData = [], { lastSerializedScopeId } = state;
     state.hasGlobals || (state.hasGlobals = !0, serializeData.push(getFilteredGlobals(state.$global)));
-    for (let key in state.writeScopes) {
-      let scope = state.writeScopes[key], scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
+    for (let key in writeScopes) {
+      let scope = writeScopes[key], scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
       lastSerializedScopeId = scopeId + 1, scopeIdDelta && serializeData.push(scopeIdDelta), serializeData.push(scope);
     }
-    resumes = state.serializer.stringify(serializeData, boundary), state.writeScopes = null, state.lastSerializedScopeId = lastSerializedScopeId;
-  }
-  if (effects && (hasWalk = !0, resumes = resumes ? resumes + "," + effects : effects), resumes && (state.hasWrittenResume ? scripts = concatScripts(
-    scripts,
-    runtimePrefix + ".r.push(" + resumes + ")"
-  ) : (state.hasWrittenResume = !0, scripts = concatScripts(
-    scripts,
-    runtimePrefix + ".r=[" + resumes + "]"
-  ))), state.writeReorders) {
-    hasWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>", scripts = concatScripts(
-      scripts,
-      REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")"
-    ));
-    for (let reorderedChunk of state.writeReorders) {
-      let { reorderId } = reorderedChunk, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
-      for (reorderedChunk.reorderId = null; ; ) {
-        cur.flushPlaceholder();
-        let { next } = cur;
-        if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
-          "#" /* ReorderMarker */,
-          cur.reorderId = state.nextReorderId()
-        ), cur.html = cur.effects = cur.scripts = "", cur.next = null), next)
-          cur = next;
-        else
-          break;
-      }
-      reorderEffects && (state.hasWrittenResume || (state.hasWrittenResume = !0, scripts = concatScripts(
-        scripts,
-        runtimePrefix + ".r=[]"
-      )), reorderScripts = concatScripts(
-        reorderScripts,
-        "_.push(" + reorderEffects + ")"
-      )), scripts = concatScripts(
-        scripts,
-        reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
-      ), html += "<t " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
-    }
-    state.writeReorders = null;
+    state.resumes = concatEffects(
+      state.resumes,
+      serializer.stringify(serializeData, boundary)
+    ), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null;
   }
-  return hasWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), head.html = html, head.scripts = scripts, head;
-}
-function flushChunk(head, last) {
-  let { boundary } = head, { state } = boundary, { html, scripts } = head, { $global: $global2 } = state, { __flush__ } = $global2, result = html;
-  return head.html = head.scripts = "", scripts && (result += "<script" + state.nonceAttr + ">" + scripts + "</script>"), __flush__ && ($global2.__flush__ = void 0, result = __flush__($global2, result)), last && state.trailerHTML && (result += state.trailerHTML), result;
 }
 function writeTrailers(html) {
   $chunk.boundary.state.trailerHTML += html;
@@ -1713,80 +1758,51 @@ var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID =
 var DEFAULT_RUNTIME_ID = "M", 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) {
-  let normalizedRenderer = normalizeDynamicRenderer(tagName);
-  return normalizedRenderer?.h || normalizedRenderer;
-}
-var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
-  if (!tag && !content) {
-    nextScopeId();
-    return;
-  }
-  if (!tag) {
-    resumeConditional(content, scopeId, accessor);
-    return;
-  }
-  if (typeof tag == "string") {
-    resumeSingleNodeConditional(
-      () => {
-        nextScopeId(), write(`<${tag}${attrs(input, accessor, scopeId, tag)}>`), voidElementsReg.test(tag) || (tag === "textarea" ? write(
-          controllable_textarea_value(
-            scopeId,
-            accessor,
-            input.value,
-            input.valueChange
-          )
-        ) : content && (tag === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+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, resume) => {
+  let renderer = normalizeDynamicRenderer(tag), chunk = getChunk(), branchId = peekNextScopeId(), result;
+  if (typeof renderer == "string") {
+    let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
+    nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), voidElementsReg.test(renderer) || (withBranchId(branchId, () => {
+      renderer === "textarea" ? write(
+        controllable_textarea_value(
           scopeId,
           accessor,
           input.value,
-          input.valueChange,
-          content
-        ) : content()), write(`</${tag}>`));
-      },
-      scopeId,
-      accessor
+          input.valueChange
+        )
+      ) : content && (renderer === "select" && ("value" in input || "valueChange" in input) ? controllable_select_value(
+        scopeId,
+        accessor,
+        input.value,
+        input.valueChange,
+        content
+      ) : content());
+    }), write(`</${renderer}>`)), resume && chunk.writeHTML(
+      chunk.boundary.state.mark(
+        "|" /* BranchSingleNode */,
+        scopeId + " " + accessor + " " + branchId
+      )
     );
-    return;
-  }
-  let renderer = normalizeDynamicRenderer(
-    tag
-  ), result;
-  return resumeConditional(
-    () => {
-      result = renderer(content ? { ...input, content } : input);
-    },
-    scopeId,
-    accessor
-  ), result;
-}, dynamicTagArgs = (scopeId, accessor, tag, args) => {
-  if (!tag) {
-    nextScopeId();
-    return;
-  }
-  if (typeof tag == "string") {
-    resumeSingleNodeConditional(
-      () => {
-        nextScopeId(), write(
-          `<${tag}${attrs(args[0], accessor, scopeId, tag)}>`
-        ), voidElementsReg.test(tag) || write(`</${tag}>`);
-      },
-      scopeId,
-      accessor
+  } else
+    resume && chunk.writeHTML(
+      chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
+    ), result = withBranchId(branchId, () => {
+      if (renderer)
+        return inputIsArgs ? renderer(...inputOrArgs) : renderer(
+          content ? { ...inputOrArgs, content } : inputOrArgs
+        );
+      if (content)
+        return content();
+    }), resume && chunk.writeHTML(
+      chunk.boundary.state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor
+      )
     );
-    return;
-  }
-  let renderer = normalizeDynamicRenderer(
-    tag
-  ), result;
-  return resumeConditional(
-    () => {
-      result = renderer(...args);
-    },
-    scopeId,
-    accessor
-  ), result;
+  return peekNextScopeId() !== branchId ? resume && writeScope(scopeId, {
+    ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
+    ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer
+  }) : nextScopeId(), result;
 };
 function createContent(id, fn) {
   return fn.h = id, fn;
@@ -1795,18 +1811,18 @@ 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) => {
+    let patched = patch(scopeId, accessor, tag);
+    return patched.h = tag, originalDynamicTag(
+      scopeId,
+      accessor,
+      patched,
+      input,
+      content,
+      inputIsArgs,
+      resume
+    );
+  })(dynamicTag);
 }
 
 // src/html/compat.ts
@@ -1858,14 +1874,16 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
       renderer(normalizedInput);
     });
     let asyncOut = classAPIOut.beginAsync();
-    (boundary.onNext = () => {
-      boundary.done && (boundary.signal.aborted ? asyncOut.error(boundary.signal.reason) : queueMicrotask(() => {
-        if (head = prepareChunk(head), boundary.done) {
-          let { scripts, html } = head;
-          asyncOut.script(scripts), asyncOut.write(html), asyncOut.end(), head.html = head.scripts = "";
+    queueMicrotask(
+      boundary.onNext = () => {
+        if (boundary.signal.aborted)
+          asyncOut.error(boundary.signal.reason);
+        else if (boundary.done) {
+          let { scripts, html } = head.consume().flushScript();
+          asyncOut.script(scripts), asyncOut.write(html), asyncOut.end();
         }
-      }));
-    })();
+      }
+    );
   },
   registerRenderer(renderer, id) {
     return register(
@@ -1881,13 +1899,13 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
 };
 
 // src/html/for.ts
-function forOfBy(by, item, index) {
+function forOfBy2(by, item, index) {
   return by ? typeof by == "string" ? item[by] : by(item, index) : index;
 }
-function forInBy(by, name, value) {
+function forInBy2(by, name, value) {
   return by ? by(name, value) : name;
 }
-function forToBy(by, index) {
+function forToBy2(by, index) {
   return by ? by(index) : index;
 }
 
@@ -1899,10 +1917,7 @@ function render(input = {}) {
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID,
     ...$global2
-  }) : $global2 = {
-    runtimeId: DEFAULT_RUNTIME_ID,
-    renderId: DEFAULT_RENDER_ID
-  };
+  }) : $global2 = { runtimeId: DEFAULT_RUNTIME_ID, renderId: DEFAULT_RENDER_ID };
   let head = new Chunk(
     new Boundary(new State2($global2), $global2.signal),
     null,
@@ -1938,16 +1953,10 @@ var ServerRenderResult = class {
         } else return done ? Promise.resolve({ value: "", done }) : new Promise(exec);
       },
       throw(error) {
-        return done || aborted || boundary?.abort(error), Promise.resolve({
-          value: "",
-          done: !0
-        });
+        return done || aborted || boundary?.abort(error), Promise.resolve({ value: "", done: !0 });
       },
       return(value2) {
-        return done || aborted || boundary?.abort(new Error("Iterator returned before consumed.")), Promise.resolve({
-          value: value2,
-          done: !0
-        });
+        return done || aborted || boundary?.abort(new Error("Iterator returned before consumed.")), Promise.resolve({ value: value2, done: !0 });
       }
     };
     function exec(_resolve, _reject) {
@@ -2002,7 +2011,7 @@ var ServerRenderResult = class {
         return reject(new Error("Cannot read from a consumed render result"));
       let { boundary } = head;
       (boundary.onNext = () => {
-        boundary.signal.aborted ? (boundary.onNext = NOOP2, reject(boundary.signal.reason)) : boundary.done && (head = prepareChunk(head), boundary.done && resolve(flushChunk(head, !0)));
+        boundary.signal.aborted ? (boundary.onNext = NOOP2, reject(boundary.signal.reason)) : boundary.done && resolve(head.consume().flushHTML());
       })();
     });
   }
@@ -2015,18 +2024,21 @@ var ServerRenderResult = class {
     let { boundary } = head, onNext = boundary.onNext = (write2) => {
       if (boundary.signal.aborted)
         tick2 || offTick(onNext), boundary.onNext = NOOP2, onAbort(boundary.signal.reason);
-      else if ((write2 || boundary.done) && (head = prepareChunk(head)), write2 || boundary.done) {
-        let html = flushChunk(head, boundary.done);
-        html && onWrite(html), boundary.done ? (tick2 || offTick(onNext), onClose()) : tick2 = !0;
-      } else tick2 && (tick2 = !1, queueTick(onNext));
+      else {
+        let { done } = boundary;
+        if (done || write2) {
+          let html = (head = head.consume()).flushHTML();
+          html && onWrite(html), done ? (tick2 || offTick(onNext), onClose()) : tick2 = !0;
+        } else tick2 && (tick2 = !1, queueTick(onNext));
+      }
     };
     return onNext(), boundary;
   }
   toString() {
     let 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");
-    return this.#head = null, flushChunk(prepareChunk(head), !0);
+    if (this.#head = null, !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() {
@@ -2047,19 +2059,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,