marko 6.0.51 → 6.0.53

package/dist/debug/dom.js

@@ -2220,7 +2220,9 @@ var compat = {
     branch.___endNode = endNode;
   },
   runComponentEffects() {
-    runEffects(this.effects);
+    if (this.effects) {
+      runEffects(this.effects);
+    }
   },
   runComponentDestroy() {
     if (this.scope) {
@@ -2247,14 +2249,11 @@ var compat = {
   },
   render(out, component, renderer, args) {
     let branch = component.scope;
-    if (!branch) {
-      branch = classIdToBranch.get(component.id);
-      if (branch) {
-        component.scope = branch;
-        classIdToBranch.delete(component.id);
-      }
+    let created = 0;
+    if (!branch && (branch = classIdToBranch.get(component.id))) {
+      component.scope = branch;
+      classIdToBranch.delete(component.id);
     }
-    let existing;
     if (typeof args[0] === "object" && "renderBody" in args[0]) {
       const input = args[0];
       const normalizedInput = args[0] = {};
@@ -2264,6 +2263,7 @@ var compat = {
     }
     component.effects = prepareEffects(() => {
       if (!branch) {
+        created = 1;
         out.global.___nextScopeId ||= 0;
         branch = component.scope = createAndSetupBranch(
           out.global,
@@ -2271,12 +2271,10 @@ var compat = {
           renderer.___owner,
           document.body
         );
-      } else {
-        existing = 1;
       }
       renderer.___params?.(branch, renderer._ ? args[0] : args);
     });
-    if (!existing) {
+    if (created) {
       return toInsertNode(branch.___startNode, branch.___endNode);
     }
   }

package/dist/debug/dom.mjs

@@ -2124,7 +2124,9 @@ var compat = {
     branch.___endNode = endNode;
   },
   runComponentEffects() {
-    runEffects(this.effects);
+    if (this.effects) {
+      runEffects(this.effects);
+    }
   },
   runComponentDestroy() {
     if (this.scope) {
@@ -2151,14 +2153,11 @@ var compat = {
   },
   render(out, component, renderer, args) {
     let branch = component.scope;
-    if (!branch) {
-      branch = classIdToBranch.get(component.id);
-      if (branch) {
-        component.scope = branch;
-        classIdToBranch.delete(component.id);
-      }
+    let created = 0;
+    if (!branch && (branch = classIdToBranch.get(component.id))) {
+      component.scope = branch;
+      classIdToBranch.delete(component.id);
     }
-    let existing;
     if (typeof args[0] === "object" && "renderBody" in args[0]) {
       const input = args[0];
       const normalizedInput = args[0] = {};
@@ -2168,6 +2167,7 @@ var compat = {
     }
     component.effects = prepareEffects(() => {
       if (!branch) {
+        created = 1;
         out.global.___nextScopeId ||= 0;
         branch = component.scope = createAndSetupBranch(
           out.global,
@@ -2175,12 +2175,10 @@ var compat = {
           renderer.___owner,
           document.body
         );
-      } else {
-        existing = 1;
       }
       renderer.___params?.(branch, renderer._ ? args[0] : args);
     });
-    if (!existing) {
+    if (created) {
       return toInsertNode(branch.___startNode, branch.___endNode);
     }
   }

package/dist/debug/html.js

@@ -1821,6 +1821,9 @@ function resumeClosestBranch(scopeId) {
   }
 }
 var branchIdKey = Symbol();
+function isInResumedBranch() {
+  return $chunk?.context?.[branchIdKey] !== void 0;
+}
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
@@ -2402,7 +2405,6 @@ var Chunk = class {
     }
   }
   flushScript() {
-    flushSerializer(this.boundary);
     const { boundary, effects } = this;
     const { state } = boundary;
     const { $global: $global2, runtimePrefix, nonceAttr } = state;
@@ -3058,7 +3060,7 @@ var ServerRendered = class {
         if (boundary.signal.aborted) {
           boundary.onNext = NOOP2;
           reject(boundary.signal.reason);
-        } else if (boundary.done) {
+        } else if (!boundary.count && boundary.done) {
           resolve(head.consume().flushHTML());
         }
       })();
@@ -3236,7 +3238,7 @@ function registerContent(id, fn, scopeId) {
 function patchDynamicTag(patch) {
   dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
     const patched = patch(scopeId, accessor, tag);
-    patched.___id = tag;
+    if (patched !== tag) patched.___id = tag;
     return originalDynamicTag(
       scopeId,
       accessor,
@@ -3259,9 +3261,26 @@ var compat = {
   writeScript,
   nextScopeId,
   peekNextScopeId,
+  isInResumedBranch,
+  ensureState($global2) {
+    let state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
+    if (!state) {
+      $global2.runtimeId ||= DEFAULT_RUNTIME_ID;
+      $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || DEFAULT_RENDER_ID;
+      $global2[K_TAGS_API_STATE] = state = new State2($global2);
+    }
+    return state;
+  },
   isTagsAPI(fn) {
     return !!fn.___id;
   },
+  onFlush(fn) {
+    const { flushHTML } = Chunk.prototype;
+    Chunk.prototype.flushHTML = function() {
+      fn(this);
+      return flushHTML.call(this);
+    };
+  },
   patchDynamicTag,
   writeSetScopeForComponent(branchId, m5c) {
     writeScope(branchId, { m5c });
@@ -3284,16 +3303,9 @@ var compat = {
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input) {
-    const $global2 = classAPIOut.global;
-    let state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
-    if (!state) {
-      $global2.runtimeId ||= DEFAULT_RUNTIME_ID;
-      $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || DEFAULT_RENDER_ID;
-      $global2[K_TAGS_API_STATE] = state = new State2($global2);
-    }
-    const boundary = new Boundary(state);
-    const head = new Chunk(
+  render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+    const boundary = new Boundary(this.ensureState(classAPIOut.global));
+    let head = new Chunk(
       boundary,
       null,
       null
@@ -3316,22 +3328,20 @@ var compat = {
       } else {
         renderer(normalizedInput);
       }
-    });
-    const asyncOut = classAPIOut.beginAsync();
-    queueMicrotask(
-      boundary.onNext = () => {
+      const asyncOut = classAPIOut.beginAsync();
+      (boundary.onNext = () => {
         if (boundary.signal.aborted) {
           asyncOut.error(boundary.signal.reason);
-        } else if (boundary.done) {
-          const { scripts, html } = head.consume().flushScript();
-          asyncOut.script(scripts);
-          asyncOut.write(html);
-          if (boundary.done) {
-            asyncOut.end();
-          }
+          boundary.onNext = NOOP3;
+        } else if (!boundary.count) {
+          completeChunks.push(head = head.consume());
+          asyncOut.write(head.html);
+          asyncOut.script(head.scripts);
+          asyncOut.end();
+          head.html = head.scripts = "";
         }
-      }
-    );
+      })();
+    });
   },
   registerRenderer(renderer, id) {
     return register(
@@ -3345,6 +3355,8 @@ var compat = {
     register(RENDER_BODY_ID, fn);
   }
 };
+function NOOP3() {
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $global,

package/dist/debug/html.mjs

@@ -1737,6 +1737,9 @@ function resumeClosestBranch(scopeId) {
   }
 }
 var branchIdKey = Symbol();
+function isInResumedBranch() {
+  return $chunk?.context?.[branchIdKey] !== void 0;
+}
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
@@ -2318,7 +2321,6 @@ var Chunk = class {
     }
   }
   flushScript() {
-    flushSerializer(this.boundary);
     const { boundary, effects } = this;
     const { state } = boundary;
     const { $global: $global2, runtimePrefix, nonceAttr } = state;
@@ -2974,7 +2976,7 @@ var ServerRendered = class {
         if (boundary.signal.aborted) {
           boundary.onNext = NOOP2;
           reject(boundary.signal.reason);
-        } else if (boundary.done) {
+        } else if (!boundary.count && boundary.done) {
           resolve(head.consume().flushHTML());
         }
       })();
@@ -3152,7 +3154,7 @@ function registerContent(id, fn, scopeId) {
 function patchDynamicTag(patch) {
   dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
     const patched = patch(scopeId, accessor, tag);
-    patched.___id = tag;
+    if (patched !== tag) patched.___id = tag;
     return originalDynamicTag(
       scopeId,
       accessor,
@@ -3175,9 +3177,26 @@ var compat = {
   writeScript,
   nextScopeId,
   peekNextScopeId,
+  isInResumedBranch,
+  ensureState($global2) {
+    let state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
+    if (!state) {
+      $global2.runtimeId ||= DEFAULT_RUNTIME_ID;
+      $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || DEFAULT_RENDER_ID;
+      $global2[K_TAGS_API_STATE] = state = new State2($global2);
+    }
+    return state;
+  },
   isTagsAPI(fn) {
     return !!fn.___id;
   },
+  onFlush(fn) {
+    const { flushHTML } = Chunk.prototype;
+    Chunk.prototype.flushHTML = function() {
+      fn(this);
+      return flushHTML.call(this);
+    };
+  },
   patchDynamicTag,
   writeSetScopeForComponent(branchId, m5c) {
     writeScope(branchId, { m5c });
@@ -3200,16 +3219,9 @@ var compat = {
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input) {
-    const $global2 = classAPIOut.global;
-    let state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
-    if (!state) {
-      $global2.runtimeId ||= DEFAULT_RUNTIME_ID;
-      $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || DEFAULT_RENDER_ID;
-      $global2[K_TAGS_API_STATE] = state = new State2($global2);
-    }
-    const boundary = new Boundary(state);
-    const head = new Chunk(
+  render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+    const boundary = new Boundary(this.ensureState(classAPIOut.global));
+    let head = new Chunk(
       boundary,
       null,
       null
@@ -3232,22 +3244,20 @@ var compat = {
       } else {
         renderer(normalizedInput);
       }
-    });
-    const asyncOut = classAPIOut.beginAsync();
-    queueMicrotask(
-      boundary.onNext = () => {
+      const asyncOut = classAPIOut.beginAsync();
+      (boundary.onNext = () => {
         if (boundary.signal.aborted) {
           asyncOut.error(boundary.signal.reason);
-        } else if (boundary.done) {
-          const { scripts, html } = head.consume().flushScript();
-          asyncOut.script(scripts);
-          asyncOut.write(html);
-          if (boundary.done) {
-            asyncOut.end();
-          }
+          boundary.onNext = NOOP3;
+        } else if (!boundary.count) {
+          completeChunks.push(head = head.consume());
+          asyncOut.write(head.html);
+          asyncOut.script(head.scripts);
+          asyncOut.end();
+          head.html = head.scripts = "";
         }
-      }
-    );
+      })();
+    });
   },
   registerRenderer(renderer, id) {
     return register(
@@ -3261,6 +3271,8 @@ var compat = {
     register(RENDER_BODY_ID, fn);
   }
 };
+function NOOP3() {
+}
 export {
   $global,
   attr,

package/dist/dom.js

@@ -1456,7 +1456,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     branch.h = startNode, branch.j = endNode;
   },
   runComponentEffects() {
-    runEffects(this.effects);
+    this.effects && runEffects(this.effects);
   },
   runComponentDestroy() {
     this.scope && destroyBranch(this.scope);
@@ -1475,22 +1475,20 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     }, renderer;
   },
   render(out, component, renderer, args) {
-    let branch = component.scope;
-    branch || (branch = classIdToBranch.get(component.id), branch && (component.scope = branch, classIdToBranch.delete(component.id)));
-    let existing;
-    if (typeof args[0] == "object" && "renderBody" in args[0]) {
+    let branch = component.scope, created = 0;
+    if (!branch && (branch = classIdToBranch.get(component.id)) && (component.scope = branch, classIdToBranch.delete(component.id)), typeof args[0] == "object" && "renderBody" in args[0]) {
       let input = args[0], normalizedInput = args[0] = {};
       for (let key in input)
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = 1 : (out.global.p ||= 0, branch = component.scope = createAndSetupBranch(
+      branch || (created = 1, out.global.p ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
         renderer.u,
         document.body
       )), renderer.m?.(branch, renderer._ ? args[0] : args);
-    }), !existing)
+    }), created)
       return toInsertNode(branch.h, branch.j);
   }
 };

package/dist/dom.mjs

@@ -1363,7 +1363,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     branch.h = startNode, branch.j = endNode;
   },
   runComponentEffects() {
-    runEffects(this.effects);
+    this.effects && runEffects(this.effects);
   },
   runComponentDestroy() {
     this.scope && destroyBranch(this.scope);
@@ -1382,22 +1382,20 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     }, renderer;
   },
   render(out, component, renderer, args) {
-    let branch = component.scope;
-    branch || (branch = classIdToBranch.get(component.id), branch && (component.scope = branch, classIdToBranch.delete(component.id)));
-    let existing;
-    if (typeof args[0] == "object" && "renderBody" in args[0]) {
+    let branch = component.scope, created = 0;
+    if (!branch && (branch = classIdToBranch.get(component.id)) && (component.scope = branch, classIdToBranch.delete(component.id)), typeof args[0] == "object" && "renderBody" in args[0]) {
       let input = args[0], normalizedInput = args[0] = {};
       for (let key in input)
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = 1 : (out.global.p ||= 0, branch = component.scope = createAndSetupBranch(
+      branch || (created = 1, out.global.p ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
         renderer.u,
         document.body
       )), renderer.m?.(branch, renderer._ ? args[0] : args);
-    }), !existing)
+    }), created)
       return toInsertNode(branch.h, branch.j);
   }
 };

package/dist/html/compat.d.ts

@@ -1,6 +1,6 @@
 import { patchDynamicTag } from "./dynamic-tag";
 import { type ServerRenderer } from "./template";
-import { $global, fork, nextScopeId, peekNextScopeId, write, writeScript } from "./writer";
+import { $global, Chunk, fork, isInResumedBranch, nextScopeId, peekNextScopeId, State, write, writeScript } from "./writer";
 export declare const compat: {
     $global: typeof $global;
     fork: typeof fork;
@@ -8,11 +8,14 @@ export declare const compat: {
     writeScript: typeof writeScript;
     nextScopeId: typeof nextScopeId;
     peekNextScopeId: typeof peekNextScopeId;
+    isInResumedBranch: typeof isInResumedBranch;
+    ensureState($global: any): State;
     isTagsAPI(fn: any): boolean;
+    onFlush(fn: (chunk: Chunk) => void): void;
     patchDynamicTag: typeof patchDynamicTag;
     writeSetScopeForComponent(branchId: number, m5c: string): void;
     toJSON(this: WeakKey): [registryId: string, scopeId: unknown] | undefined;
-    render(renderer: ServerRenderer, willRerender: boolean, classAPIOut: any, component: any, input: any): void;
+    render(renderer: ServerRenderer, willRerender: boolean, classAPIOut: any, component: any, input: any, completeChunks: Chunk[]): void;
     registerRenderer(renderer: any, id: string): any;
     registerRenderBody(fn: any): void;
 };

package/dist/html/writer.d.ts

@@ -37,6 +37,7 @@ export declare function hoist(scopeId: number, id?: string): {
     [Symbol.iterator]: /*elided*/ any;
 };
 export declare function resumeClosestBranch(scopeId: number): void;
+export declare function isInResumedBranch(): boolean;
 export declare function withBranchId<T>(branchId: number, cb: () => T): T;
 export declare function resumeForOf(list: Falsy | Iterable<unknown>, cb: (item: unknown, index: number) => void, by: Falsy | ((item: unknown, index: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string | 0, singleNode?: 1): void;
 export declare function resumeForIn(obj: Falsy | {}, cb: (key: string, value: unknown) => void, by: Falsy | ((key: string, v: unknown) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string | 0, singleNode?: 1): void;

package/dist/html.js

@@ -1182,6 +1182,9 @@ function resumeClosestBranch(scopeId) {
   branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { g: branchId });
 }
 var branchIdKey = Symbol();
+function isInResumedBranch() {
+  return $chunk?.context?.[branchIdKey] !== void 0;
+}
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
@@ -1539,7 +1542,6 @@ var State2 = class {
     }
   }
   flushScript() {
-    flushSerializer(this.boundary);
     let { boundary, effects } = this, { state } = boundary, { $global: $global2, runtimePrefix, nonceAttr } = state, { html, scripts } = this, hasWalk = state.walkOnNextFlush;
     if (hasWalk && (state.walkOnNextFlush = !1), state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(
       scripts,
@@ -1958,7 +1960,7 @@ var ServerRendered = 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 && resolve(head.consume().flushHTML());
+        boundary.signal.aborted ? (boundary.onNext = NOOP2, reject(boundary.signal.reason)) : !boundary.count && boundary.done && resolve(head.consume().flushHTML());
       })();
     });
   }
@@ -2074,7 +2076,7 @@ function registerContent(id, fn, scopeId) {
 function patchDynamicTag(patch) {
   dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
     let patched = patch(scopeId, accessor, tag);
-    return patched.h = tag, originalDynamicTag(
+    return patched !== tag && (patched.h = tag), originalDynamicTag(
       scopeId,
       accessor,
       patched,
@@ -2094,9 +2096,20 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   writeScript,
   nextScopeId,
   peekNextScopeId,
+  isInResumedBranch,
+  ensureState($global2) {
+    let state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
+    return state || ($global2.runtimeId ||= "M", $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || "_", $global2[K_TAGS_API_STATE] = state = new State2($global2)), state;
+  },
   isTagsAPI(fn) {
     return !!fn.h;
   },
+  onFlush(fn) {
+    let { flushHTML } = Chunk.prototype;
+    Chunk.prototype.flushHTML = function() {
+      return fn(this), flushHTML.call(this);
+    };
+  },
   patchDynamicTag,
   writeSetScopeForComponent(branchId, m5c) {
     writeScope(branchId, { m5c }), writeEffect(branchId, SET_SCOPE_REGISTER_ID);
@@ -2115,10 +2128,8 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input) {
-    let $global2 = classAPIOut.global, state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
-    state || ($global2.runtimeId ||= "M", $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || "_", $global2[K_TAGS_API_STATE] = state = new State2($global2));
-    let boundary = new Boundary(state), head = new Chunk(
+  render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+    let boundary = new Boundary(this.ensureState(classAPIOut.global)), head = new Chunk(
       boundary,
       null,
       null
@@ -2134,18 +2145,11 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
         writeScope(scopeId, { m5c: component.id }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
       }
       isTemplate(renderer) && willRerender ? renderer(normalizedInput, 1) : renderer(normalizedInput);
+      let asyncOut = classAPIOut.beginAsync();
+      (boundary.onNext = () => {
+        boundary.signal.aborted ? (asyncOut.error(boundary.signal.reason), boundary.onNext = NOOP3) : boundary.count || (completeChunks.push(head = head.consume()), asyncOut.write(head.html), asyncOut.script(head.scripts), asyncOut.end(), head.html = head.scripts = "");
+      })();
     });
-    let asyncOut = classAPIOut.beginAsync();
-    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), boundary.done && asyncOut.end();
-        }
-      }
-    );
   },
   registerRenderer(renderer, id) {
     return register(
@@ -2159,6 +2163,8 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     register(RENDER_BODY_ID, fn);
   }
 };
+function NOOP3() {
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $global,

package/dist/html.mjs

@@ -1101,6 +1101,9 @@ function resumeClosestBranch(scopeId) {
   branchId !== void 0 && branchId !== scopeId && writeScope(scopeId, { g: branchId });
 }
 var branchIdKey = Symbol();
+function isInResumedBranch() {
+  return $chunk?.context?.[branchIdKey] !== void 0;
+}
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
@@ -1458,7 +1461,6 @@ var State2 = class {
     }
   }
   flushScript() {
-    flushSerializer(this.boundary);
     let { boundary, effects } = this, { state } = boundary, { $global: $global2, runtimePrefix, nonceAttr } = state, { html, scripts } = this, hasWalk = state.walkOnNextFlush;
     if (hasWalk && (state.walkOnNextFlush = !1), state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(
       scripts,
@@ -1877,7 +1879,7 @@ var ServerRendered = 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 && resolve(head.consume().flushHTML());
+        boundary.signal.aborted ? (boundary.onNext = NOOP2, reject(boundary.signal.reason)) : !boundary.count && boundary.done && resolve(head.consume().flushHTML());
       })();
     });
   }
@@ -1993,7 +1995,7 @@ function registerContent(id, fn, scopeId) {
 function patchDynamicTag(patch) {
   dynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
     let patched = patch(scopeId, accessor, tag);
-    return patched.h = tag, originalDynamicTag(
+    return patched !== tag && (patched.h = tag), originalDynamicTag(
       scopeId,
       accessor,
       patched,
@@ -2013,9 +2015,20 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   writeScript,
   nextScopeId,
   peekNextScopeId,
+  isInResumedBranch,
+  ensureState($global2) {
+    let state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
+    return state || ($global2.runtimeId ||= "M", $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || "_", $global2[K_TAGS_API_STATE] = state = new State2($global2)), state;
+  },
   isTagsAPI(fn) {
     return !!fn.h;
   },
+  onFlush(fn) {
+    let { flushHTML } = Chunk.prototype;
+    Chunk.prototype.flushHTML = function() {
+      return fn(this), flushHTML.call(this);
+    };
+  },
   patchDynamicTag,
   writeSetScopeForComponent(branchId, m5c) {
     writeScope(branchId, { m5c }), writeEffect(branchId, SET_SCOPE_REGISTER_ID);
@@ -2034,10 +2047,8 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input) {
-    let $global2 = classAPIOut.global, state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
-    state || ($global2.runtimeId ||= "M", $global2.renderId ||= $global2.componentIdPrefix || $global2.widgetIdPrefix || "_", $global2[K_TAGS_API_STATE] = state = new State2($global2));
-    let boundary = new Boundary(state), head = new Chunk(
+  render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+    let boundary = new Boundary(this.ensureState(classAPIOut.global)), head = new Chunk(
       boundary,
       null,
       null
@@ -2053,18 +2064,11 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
         writeScope(scopeId, { m5c: component.id }), writeEffect(scopeId, SET_SCOPE_REGISTER_ID);
       }
       isTemplate(renderer) && willRerender ? renderer(normalizedInput, 1) : renderer(normalizedInput);
+      let asyncOut = classAPIOut.beginAsync();
+      (boundary.onNext = () => {
+        boundary.signal.aborted ? (asyncOut.error(boundary.signal.reason), boundary.onNext = NOOP3) : boundary.count || (completeChunks.push(head = head.consume()), asyncOut.write(head.html), asyncOut.script(head.scripts), asyncOut.end(), head.html = head.scripts = "");
+      })();
     });
-    let asyncOut = classAPIOut.beginAsync();
-    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), boundary.done && asyncOut.end();
-        }
-      }
-    );
   },
   registerRenderer(renderer, id) {
     return register(
@@ -2078,6 +2082,8 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     register(RENDER_BODY_ID, fn);
   }
 };
+function NOOP3() {
+}
 export {
   $global,
   attr,

package/dist/translator/index.js

@@ -2673,7 +2673,12 @@ var [getWalkComment] = createSectionState(
   "walkComment",
   () => []
 );
-var [getSteps] = createSectionState("steps", () => []);
+var [getSteps] = createSectionState("steps", (section) => {
+  if (section.content?.startType === 1 /* Dynamic */) {
+    return [0 /* Enter */, 1 /* Exit */];
+  }
+  return [];
+});
 var walkCodeToName = {
   [32 /* Get */]: "get",
   [36 /* Inside */]: "inside",
@@ -2692,17 +2697,23 @@ var walkCodeToName = {
   [126 /* MultiplierEnd */]: "multiplierEnd"
 };
 function enter2(path5) {
-  getSteps(getSection(path5)).push(0 /* Enter */);
+  const steps = getSteps(getSection(path5));
+  steps.push(0 /* Enter */);
 }
 function exit2(path5) {
-  getSteps(getSection(path5)).push(1 /* Exit */);
+  const steps = getSteps(getSection(path5));
+  steps.push(1 /* Exit */);
 }
 function enterShallow(path5) {
-  getSteps(getSection(path5)).push(0 /* Enter */, 1 /* Exit */);
+  const section = getSection(path5);
+  const steps = getSteps(section);
+  steps.push(0 /* Enter */, 1 /* Exit */);
 }
 function injectWalks(tag, expr) {
-  const walks = getWalks(getSection(tag));
-  const walkComment = getWalkComment(getSection(tag));
+  const section = getSection(tag);
+  const walks = getWalks(section);
+  const walkComment = getWalkComment(section);
+  visitInternal(section);
   walkComment.push(
     `${walkCodeToName[tag.node.var ? 48 /* BeginChildWithVar */ : 47 /* BeginChild */]}`,
     expr.name,
@@ -2721,52 +2732,54 @@ function visit(path5, code) {
     return;
   }
   const section = getSection(path5);
+  const walks = getWalks(section);
+  const walkComment = getWalkComment(section);
+  visitInternal(section);
+  if (code !== 32 /* Get */) {
+    writeTo(path5)`<!>`;
+  }
+  walkComment.push(`${walkCodeToName[code]}`);
+  appendLiteral(walks, String.fromCharCode(code));
+}
+function visitInternal(section) {
   const steps = getSteps(section);
+  if (!steps.length) return;
   const walks = getWalks(section);
   const walkComment = getWalkComment(section);
+  const walkCodes = [];
   let walkString = "";
-  if (steps.length) {
-    const walkCodes = [];
-    let depth = 0;
-    for (const step of steps) {
-      if (step === 0 /* Enter */) {
-        depth++;
-        walkCodes.push(67 /* Next */);
-      } else {
-        depth--;
-        if (depth >= 0) {
-          walkCodes.length = walkCodes.lastIndexOf(67 /* Next */);
-          walkCodes.push(97 /* Over */);
-        } else {
-          walkCodes.length = walkCodes.lastIndexOf(107 /* Out */) + 1;
-          walkCodes.push(107 /* Out */);
-          depth = 0;
-        }
-      }
-    }
-    let current = walkCodes[0];
-    let count = 0;
-    for (const walk of walkCodes) {
-      if (walk !== current) {
-        walkComment.push(`${walkCodeToName[current]}(${count})`);
-        walkString += nCodeString(current, count);
-        current = walk;
-        count = 1;
+  let depth = 0;
+  for (const step of steps) {
+    if (step === 0 /* Enter */) {
+      depth++;
+      walkCodes.push(67 /* Next */);
+    } else {
+      depth--;
+      if (depth >= 0) {
+        walkCodes.length = walkCodes.lastIndexOf(67 /* Next */);
+        walkCodes.push(97 /* Over */);
       } else {
-        count++;
+        walkCodes.length = walkCodes.lastIndexOf(107 /* Out */) + 1;
+        walkCodes.push(107 /* Out */);
+        depth = 0;
       }
     }
-    walkComment.push(`${walkCodeToName[current]}(${count})`);
-    walkString += nCodeString(current, count);
-    steps.length = 0;
   }
-  if (code !== void 0) {
-    if (code !== 32 /* Get */) {
-      writeTo(path5)`<!>`;
+  let current = walkCodes[0];
+  let count = 0;
+  for (const walk of walkCodes) {
+    if (walk !== current) {
+      walkComment.push(`${walkCodeToName[current]}(${count})`);
+      walkString += nCodeString(current, count);
+      current = walk;
+      count = 1;
+    } else {
+      count++;
     }
-    walkComment.push(`${walkCodeToName[code]}`);
-    walkString += String.fromCharCode(code);
   }
+  walkComment.push(`${walkCodeToName[current]}(${count})`);
+  walkString += nCodeString(current, count);
+  steps.length = 0;
   appendLiteral(walks, walkString);
 }
 function nCodeString(code, number) {
@@ -2796,10 +2809,12 @@ function toCharString(number, startCode, rangeSize) {
   return result;
 }
 function getWalkString(section) {
-  const prefix2 = section.content?.startType === 1 /* Dynamic */ ? String.fromCharCode(67 /* Next */ + 1) : "";
-  const postfix = section.content?.endType === 1 /* Dynamic */ ? String.fromCharCode(67 /* Next */ + 1) : "";
+  if (section.content?.endType === 1 /* Dynamic */) {
+    getSteps(section).push(0 /* Enter */, 1 /* Exit */);
+  }
+  visitInternal(section);
   const walks = getWalks(section);
-  const walkLiteral = normalizeStringExpression([prefix2, ...walks, postfix]);
+  const walkLiteral = normalizeStringExpression(walks);
   if (walkLiteral && walkLiteral.value !== "") {
     withLeadingComment(walkLiteral, getWalkComment(section).join(", "));
   }
@@ -4142,7 +4157,6 @@ function getRegisteredFnExpression2(node) {
 var dom_default = {
   translate: {
     exit(program) {
-      visit(program);
       const section = getSectionForBody(program);
       const { walks, writes, setup } = getSectionMeta(section);
       const domExports = program.node.extra.domExports;
@@ -5072,7 +5086,7 @@ function finalizeReferences() {
         let serializeReason;
         let currentSection = section;
         while (currentSection !== sourceSection) {
-          const upstreamReason = !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
+          const upstreamReason = currentSection.downstreamBinding ? isSerializedSection(currentSection) || void 0 : !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
           if (upstreamReason === true) {
             serializeReason = true;
             break;
@@ -5098,7 +5112,7 @@ function finalizeReferences() {
         let serializeReason;
         let currentSection = section;
         while (currentSection !== sourceSection) {
-          const upstreamReason = !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
+          const upstreamReason = currentSection.downstreamBinding ? isSerializedSection(currentSection) || void 0 : !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
           if (upstreamReason === true) {
             serializeReason = true;
             break;
@@ -10499,7 +10513,6 @@ var custom_tag_default = {
   },
   translate: {
     enter(tag) {
-      visit(tag);
       if (isOutputHTML()) {
         flushBefore(tag);
       }

package/dist/translator/util/walks.d.ts

@@ -10,6 +10,6 @@ export declare function enter(path: t.NodePath<any>): void;
 export declare function exit(path: t.NodePath<any>): void;
 export declare function enterShallow(path: t.NodePath<any>): void;
 export declare function injectWalks(tag: t.NodePath<t.MarkoTag>, expr: t.Expression): void;
-export declare function visit(path: t.NodePath<t.MarkoTag | t.MarkoPlaceholder | t.Program>, code?: VisitCodes): void;
+export declare function visit(path: t.NodePath<t.MarkoTag | t.MarkoPlaceholder | t.Program>, code: VisitCodes): void;
 export declare function getWalkString(section: Section): t.Expression | undefined;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.51",
+  "version": "6.0.53",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",