marko 6.0.50 → 6.0.52

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());
         }
       })();
@@ -3128,48 +3130,51 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
   let result;
   if (typeof renderer === "string") {
     const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
-    const renderContent = content || normalizeDynamicRenderer(input.content);
     nextScopeId();
-    write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`);
+    write(
+      `<${renderer}${attrs(input, true ? `#${renderer}/0` : 0, branchId, renderer)}>`
+    );
     if (!voidElementsReg.test(renderer)) {
-      const renderNativeTag = () => {
-        if (renderer === "textarea") {
-          if (content) {
-            throw new Error(
-              "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
-            );
-          }
-          write(
-            controllable_textarea_value(
-              scopeId,
-              accessor,
-              input.value,
-              input.valueChange
-            )
+      const renderContent = content || normalizeDynamicRenderer(input.content);
+      if (renderer === "textarea") {
+        if (renderContent) {
+          throw new Error(
+            "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
+          );
+        }
+        write(
+          controllable_textarea_value(
+            branchId,
+            true ? `#${renderer}/0` : 0,
+            input.value,
+            input.valueChange
+          )
+        );
+      } else if (renderContent) {
+        if (typeof renderContent !== "function") {
+          throw new Error(
+            `Body content is not supported for the \`<${renderer}>\` tag.`
+          );
+        }
+        if (renderer === "select" && ("value" in input || "valueChange" in input)) {
+          controllable_select_value(
+            branchId,
+            true ? `#${renderer}/0` : 0,
+            input.value,
+            input.valueChange,
+            renderContent
+          );
+        } else {
+          dynamicTag(
+            branchId,
+            true ? `#${renderer}/0` : 0,
+            renderContent,
+            [],
+            0,
+            1,
+            serializeReason
           );
-        } else if (renderContent) {
-          if (typeof renderContent !== "function") {
-            throw new Error(
-              `Body content is not supported for the \`<${renderer}>\` tag.`
-            );
-          }
-          if (renderer === "select" && ("value" in input || "valueChange" in input)) {
-            controllable_select_value(
-              scopeId,
-              accessor,
-              input.value,
-              input.valueChange,
-              renderContent
-            );
-          } else {
-            renderContent();
-          }
         }
-      };
-      if (shouldResume) {
-        withBranchId(branchId, renderNativeTag);
-      } else {
-        renderNativeTag();
       }
       write(`</${renderer}>`);
     } else if (content) {
@@ -3180,7 +3185,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
     if (shouldResume) {
       write(
         state.mark(
-          "|" /* BranchSingleNode */,
+          "'" /* BranchNativeTag */,
           scopeId + " " + accessor + " " + branchId
         )
       );
@@ -3233,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,
@@ -3256,9 +3261,17 @@ var compat = {
   writeScript,
   nextScopeId,
   peekNextScopeId,
+  isInResumedBranch,
   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 });
@@ -3281,7 +3294,7 @@ var compat = {
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input) {
+  render(renderer, willRerender, classAPIOut, component, input, toStringEvent) {
     const $global2 = classAPIOut.global;
     let state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
     if (!state) {
@@ -3290,7 +3303,7 @@ var compat = {
       $global2[K_TAGS_API_STATE] = state = new State2($global2);
     }
     const boundary = new Boundary(state);
-    const head = new Chunk(
+    let head = new Chunk(
       boundary,
       null,
       null
@@ -3313,22 +3326,30 @@ 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) {
+          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();
+          asyncOut.write(head.html);
+          asyncOut.end();
+          head.html = "";
         }
-      }
-    );
+      })();
+    });
   },
   registerRenderer(renderer, id) {
     return register(
@@ -3342,6 +3363,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());
         }
       })();
@@ -3044,48 +3046,51 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
   let result;
   if (typeof renderer === "string") {
     const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
-    const renderContent = content || normalizeDynamicRenderer(input.content);
     nextScopeId();
-    write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`);
+    write(
+      `<${renderer}${attrs(input, true ? `#${renderer}/0` : 0, branchId, renderer)}>`
+    );
     if (!voidElementsReg.test(renderer)) {
-      const renderNativeTag = () => {
-        if (renderer === "textarea") {
-          if (content) {
-            throw new Error(
-              "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
-            );
-          }
-          write(
-            controllable_textarea_value(
-              scopeId,
-              accessor,
-              input.value,
-              input.valueChange
-            )
+      const renderContent = content || normalizeDynamicRenderer(input.content);
+      if (renderer === "textarea") {
+        if (renderContent) {
+          throw new Error(
+            "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
+          );
+        }
+        write(
+          controllable_textarea_value(
+            branchId,
+            true ? `#${renderer}/0` : 0,
+            input.value,
+            input.valueChange
+          )
+        );
+      } else if (renderContent) {
+        if (typeof renderContent !== "function") {
+          throw new Error(
+            `Body content is not supported for the \`<${renderer}>\` tag.`
+          );
+        }
+        if (renderer === "select" && ("value" in input || "valueChange" in input)) {
+          controllable_select_value(
+            branchId,
+            true ? `#${renderer}/0` : 0,
+            input.value,
+            input.valueChange,
+            renderContent
+          );
+        } else {
+          dynamicTag(
+            branchId,
+            true ? `#${renderer}/0` : 0,
+            renderContent,
+            [],
+            0,
+            1,
+            serializeReason
           );
-        } else if (renderContent) {
-          if (typeof renderContent !== "function") {
-            throw new Error(
-              `Body content is not supported for the \`<${renderer}>\` tag.`
-            );
-          }
-          if (renderer === "select" && ("value" in input || "valueChange" in input)) {
-            controllable_select_value(
-              scopeId,
-              accessor,
-              input.value,
-              input.valueChange,
-              renderContent
-            );
-          } else {
-            renderContent();
-          }
         }
-      };
-      if (shouldResume) {
-        withBranchId(branchId, renderNativeTag);
-      } else {
-        renderNativeTag();
       }
       write(`</${renderer}>`);
     } else if (content) {
@@ -3096,7 +3101,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, ser
     if (shouldResume) {
       write(
         state.mark(
-          "|" /* BranchSingleNode */,
+          "'" /* BranchNativeTag */,
           scopeId + " " + accessor + " " + branchId
         )
       );
@@ -3149,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,
@@ -3172,9 +3177,17 @@ var compat = {
   writeScript,
   nextScopeId,
   peekNextScopeId,
+  isInResumedBranch,
   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 });
@@ -3197,7 +3210,7 @@ var compat = {
     }
     return compatRegistered;
   },
-  render(renderer, willRerender, classAPIOut, component, input) {
+  render(renderer, willRerender, classAPIOut, component, input, toStringEvent) {
     const $global2 = classAPIOut.global;
     let state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
     if (!state) {
@@ -3206,7 +3219,7 @@ var compat = {
       $global2[K_TAGS_API_STATE] = state = new State2($global2);
     }
     const boundary = new Boundary(state);
-    const head = new Chunk(
+    let head = new Chunk(
       boundary,
       null,
       null
@@ -3229,22 +3242,30 @@ 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) {
+          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();
+          asyncOut.write(head.html);
+          asyncOut.end();
+          head.html = "";
         }
-      }
-    );
+      })();
+    });
   },
   registerRenderer(renderer, id) {
     return register(
@@ -3258,6 +3279,8 @@ var compat = {
     register(RENDER_BODY_ID, fn);
   }
 };
+function NOOP3() {
+}
 export {
   $global,
   attr,

package/dist/dom/walker.d.ts

@@ -1,3 +1,4 @@
 import { type BranchScope } from "../common/types";
 export declare const walker: TreeWalker;
 export declare function walk(startNode: Node, walkCodes: string, branch: BranchScope): void;
+export declare function getDebugKey(index: number, node: Node | string): string | number;