marko 6.0.0-next.3.69 → 6.0.0-next.3.71

package/dist/html.js

@@ -1393,7 +1393,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 {
@@ -1411,6 +1411,7 @@ var State2 = class {
   hasReorderRuntime = !1;
   hasWrittenResume = !1;
   trailerHTML = "";
+  resumes = "";
   nonceAttr = "";
   serializer = new Serializer();
   writeReorders = null;
@@ -1449,7 +1450,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++;
@@ -1524,65 +1525,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;
+    state.resumes = concatEffects(
+      state.resumes,
+      serializer.stringify(serializeData, boundary)
+    ), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null;
   }
-  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;
-  }
-  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;
@@ -1946,14 +1953,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(
@@ -1987,10 +1996,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,
@@ -2026,16 +2032,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) {
@@ -2090,7 +2090,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());
       })();
     });
   }
@@ -2103,18 +2103,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() {

package/dist/html.mjs

@@ -1314,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 {
@@ -1332,6 +1332,7 @@ var State2 = class {
   hasReorderRuntime = !1;
   hasWrittenResume = !1;
   trailerHTML = "";
+  resumes = "";
   nonceAttr = "";
   serializer = new Serializer();
   writeReorders = null;
@@ -1370,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++;
@@ -1445,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;
+    state.resumes = concatEffects(
+      state.resumes,
+      serializer.stringify(serializeData, boundary)
+    ), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null;
   }
-  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;
-  }
-  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;
@@ -1867,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(
@@ -1908,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,
@@ -1947,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) {
@@ -2011,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());
       })();
     });
   }
@@ -2024,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() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.69",
+  "version": "6.0.0-next.3.71",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",