marko 6.0.52 → 6.0.53

package/dist/debug/html.js

@@ -3262,6 +3262,15 @@ var compat = {
   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;
   },
@@ -3294,15 +3303,8 @@ var compat = {
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input, toStringEvent) {
-    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);
+  render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+    const boundary = new Boundary(this.ensureState(classAPIOut.global));
     let head = new Chunk(
       boundary,
       null,
@@ -3332,21 +3334,11 @@ var compat = {
           asyncOut.error(boundary.signal.reason);
           boundary.onNext = NOOP3;
         } else if (!boundary.count) {
-          asyncOut.once(toStringEvent, (writer) => {
-            if (boundary.done) {
-              const { html, scripts } = head.flushScript();
-              writer.script(scripts);
-              writer.write(html);
-            } else {
-              asyncOut.error(
-                new Error("Cannot serialize promises with class/tags interop.")
-              );
-            }
-          });
-          head = head.consume();
+          completeChunks.push(head = head.consume());
           asyncOut.write(head.html);
+          asyncOut.script(head.scripts);
           asyncOut.end();
-          head.html = "";
+          head.html = head.scripts = "";
         }
       })();
     });

package/dist/debug/html.mjs

@@ -3178,6 +3178,15 @@ var compat = {
   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;
   },
@@ -3210,15 +3219,8 @@ var compat = {
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input, toStringEvent) {
-    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);
+  render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+    const boundary = new Boundary(this.ensureState(classAPIOut.global));
     let head = new Chunk(
       boundary,
       null,
@@ -3248,21 +3250,11 @@ var compat = {
           asyncOut.error(boundary.signal.reason);
           boundary.onNext = NOOP3;
         } else if (!boundary.count) {
-          asyncOut.once(toStringEvent, (writer) => {
-            if (boundary.done) {
-              const { html, scripts } = head.flushScript();
-              writer.script(scripts);
-              writer.write(html);
-            } else {
-              asyncOut.error(
-                new Error("Cannot serialize promises with class/tags interop.")
-              );
-            }
-          });
-          head = head.consume();
+          completeChunks.push(head = head.consume());
           asyncOut.write(head.html);
+          asyncOut.script(head.scripts);
           asyncOut.end();
-          head.html = "";
+          head.html = head.scripts = "";
         }
       })();
     });

package/dist/html/compat.d.ts

@@ -1,6 +1,6 @@
 import { patchDynamicTag } from "./dynamic-tag";
 import { type ServerRenderer } from "./template";
-import { $global, Chunk, fork, isInResumedBranch, 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;
@@ -9,12 +9,13 @@ export declare const compat: {
     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, toStringEvent: string): 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.js

@@ -2097,6 +2097,10 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   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;
   },
@@ -2124,10 +2128,8 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input, toStringEvent) {
-    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
@@ -2145,15 +2147,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
       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 || (asyncOut.once(toStringEvent, (writer) => {
-          if (boundary.done) {
-            let { html, scripts } = head.flushScript();
-            writer.script(scripts), writer.write(html);
-          } else
-            asyncOut.error(
-              new Error("Cannot serialize promises with class/tags interop.")
-            );
-        }), head = head.consume(), asyncOut.write(head.html), asyncOut.end(), head.html = "");
+        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 = "");
       })();
     });
   },

package/dist/html.mjs

@@ -2016,6 +2016,10 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   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;
   },
@@ -2043,10 +2047,8 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input, toStringEvent) {
-    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
@@ -2064,15 +2066,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
       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 || (asyncOut.once(toStringEvent, (writer) => {
-          if (boundary.done) {
-            let { html, scripts } = head.flushScript();
-            writer.script(scripts), writer.write(html);
-          } else
-            asyncOut.error(
-              new Error("Cannot serialize promises with class/tags interop.")
-            );
-        }), head = head.consume(), asyncOut.write(head.html), asyncOut.end(), head.html = "");
+        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 = "");
       })();
     });
   },

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;
@@ -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.52",
+  "version": "6.0.53",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",