marko 6.0.87 → 6.0.89

package/dist/debug/dom.js

@@ -1754,8 +1754,10 @@ function _await(nodeAccessor, renderer) {
                     );
                     removeAndDestroyBranch(placeholderBranch);
                   }
-                  if (tryWithPlaceholder.___effects) {
-                    runEffects(tryWithPlaceholder.___effects, true);
+                  const pendingEffects2 = tryWithPlaceholder.___effects;
+                  if (pendingEffects2) {
+                    tryWithPlaceholder.___effects = [];
+                    runEffects(pendingEffects2, true);
                   }
                 }
               }
@@ -2100,14 +2102,14 @@ function prepareEffects(fn) {
   }
   return preparedEffects;
 }
-var runEffects = (effects) => {
+var runEffects = ((effects) => {
   for (let i = 0, scope; i < effects.length; ) {
     effects[i++](
       scope = effects[i++],
       scope
     );
   }
-};
+});
 function runRenders() {
   while (pendingRenders.length) {
     const render = pendingRenders[0];

package/dist/debug/dom.mjs

@@ -1654,8 +1654,10 @@ function _await(nodeAccessor, renderer) {
                     );
                     removeAndDestroyBranch(placeholderBranch);
                   }
-                  if (tryWithPlaceholder.___effects) {
-                    runEffects(tryWithPlaceholder.___effects, true);
+                  const pendingEffects2 = tryWithPlaceholder.___effects;
+                  if (pendingEffects2) {
+                    tryWithPlaceholder.___effects = [];
+                    runEffects(pendingEffects2, true);
                   }
                 }
               }
@@ -2000,14 +2002,14 @@ function prepareEffects(fn) {
   }
   return preparedEffects;
 }
-var runEffects = (effects) => {
+var runEffects = ((effects) => {
   for (let i = 0, scope; i < effects.length; ) {
     effects[i++](
       scope = effects[i++],
       scope
     );
   }
-};
+});
 function runRenders() {
   while (pendingRenders.length) {
     const render = pendingRenders[0];

package/dist/debug/html.js

@@ -285,65 +285,65 @@ var WALKER_RUNTIME_CODE = true ? (
     },
   })
 ), self[runtimeId]))`
-) : `(e=>(self[e]||(self[e]=(l,s=e+l,f=s.length,o={},d=[],n=document,t=n.createTreeWalker(n,129))=>n=self[e][l]={i:s,d:n,l:o,v:d,x(){},w(e,l,a){for(;e=t.nextNode();)n.x(l=(l=e.data)&&!l.indexOf(s)&&(o[a=l.slice(f+1)]=e,l[f]),a,e),l>"#"&&d.push(e)}}),self[e]))`;
+) : `(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))`;
 var REORDER_RUNTIME_CODE = true ? (
   /* js */
   `((runtime) => {
-if (runtime.j) return;
-let onNextSibling,
-  placeholder,
-  nextSibling,
-  placeholders = {},
-  replace = (marker, container) => {
-    marker.replaceWith(...container.childNodes);
-    container.remove();
-  };
-runtime.d.head.append(
-  runtime.d.querySelector("style[" + runtime.i + "]") || "",
-);
-runtime.j = {};
-runtime.x = (op, id, node, start, placeholderCallback) => {
-  if (op == "#") {
-    (placeholders[id] = placeholder).i++;
-  } else if (node == nextSibling) {
-    onNextSibling();
-  }
-
-  if (node.tagName == "T" && (id = node.getAttribute(runtime.i))) {
-    start = runtime.l["^" + id];
-
-    if (start) {
-      placeholders[id] = {
-        i: 1,
-        c(end = runtime.l[id] || node) {
-          for (
-            ;
-            (nextSibling = end.previousSibling || start).remove(),
-            start != nextSibling;
-          );
-          replace(end, node);
-        },
-      };
+  if (runtime.j) return;
+  let onNextSibling,
+    placeholder,
+    nextSibling,
+    placeholders = {},
+    replace = (id, container) => runtime.l[id].replaceWith(...container.childNodes);
+  runtime.d.head.append(
+    runtime.d.querySelector("style[" + runtime.i + "]") || ""
+  );
+  runtime.j = {};
+  runtime.x = (op, id, node, placeholderRoot, placeholderCb) => {
+    if (node == nextSibling) {
+      onNextSibling();
     }
 
-    nextSibling = node.nextSibling;
-    placeholder = placeholders[id];
-    onNextSibling = () => {
-      start || replace(runtime.l[id], node);
-      if (!--placeholder.i) {
-        placeholder.c();
+    if (op == "#") {
+      (placeholders[id] = placeholder).i++;
+    } else if (op == "!") {
+      if (runtime.l[id] && placeholders[id]) {
+        nextSibling = node.nextSibling;
+        onNextSibling = () => placeholders[id].c();
       }
-    };
+    } else if (node.tagName == "T" && (id = node.getAttribute(runtime.i))) {
+      nextSibling = node.nextSibling;
+      onNextSibling = () => {
+        node.remove();
+        placeholderRoot || replace(id, node);
+        placeholder.c();
+      };
+      placeholder =
+        placeholders[id] ||
+        (placeholderRoot = placeholders[id] =
+          {
+            i: runtime.l[id] ? 1 : 2,
+            c(start = runtime.l["^" + id]) {
+              if (--placeholderRoot.i) return 1;
+              for (
+                ;
+                (nextSibling =
+                  runtime.l[id].previousSibling || start).remove(),
+                  start != nextSibling;
 
-    // repurpose "op" for callbacks ...carefully
-    if (op = runtime.j[id]) {
-      placeholderCallback = placeholder.c;
-      placeholder.c = () => placeholderCallback() + op(runtime.r);
+              );
+              replace(id, node);
+            },
+          });
+      // repurpose "op" for callbacks ...carefully
+      if ((op = runtime.j[id])) {
+        placeholderCb = placeholder.c;
+        placeholder.c = () => placeholderCb() || op(runtime.r);
+      }
     }
-  }
-};
+  };
 })`
-) : `(e=>{if(e.j)return;let i,o,l,r={},t=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(c,d,n,a,g)=>{"#"==c?(r[d]=o).i++:n==l&&i(),"T"==n.tagName&&(d=n.getAttribute(e.i))&&((a=e.l["^"+d])&&(r[d]={i:1,c(i=e.l[d]||n){for(;(l=i.previousSibling||a).remove(),a!=l;);t(i,n)}}),l=n.nextSibling,o=r[d],i=()=>{a||t(e.l[d],n),--o.i||o.c()},(c=e.j[d])&&(g=o.c,o.c=()=>g()+c(e.r)))}})`;
+) : `(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})`;
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol();
@@ -2260,6 +2260,7 @@ function tryCatch(content, catchContent) {
             writeMarker = false;
             cur.async = false;
             cur.next = bodyNext;
+            cur.needsWalk = true;
             cur.html = endMarker;
             cur.scripts = cur.effects = cur.lastEffect = "";
             cur.placeholderBody = cur.placeholderRender = cur.reorderId = null;
@@ -2390,6 +2391,7 @@ var Chunk = class {
   lastEffect = "";
   async = false;
   consumed = false;
+  needsWalk = false;
   reorderId = null;
   placeholderBody = null;
   placeholderRender = null;
@@ -2440,6 +2442,7 @@ var Chunk = class {
   }
   consume() {
     let cur = this;
+    let needsWalk = cur.needsWalk;
     if (cur.next && !cur.async) {
       let html = "";
       let effects = "";
@@ -2447,6 +2450,7 @@ var Chunk = class {
       let lastEffect = "";
       do {
         cur.flushPlaceholder();
+        needsWalk ||= cur.needsWalk;
         html += cur.html;
         effects = concatEffects(effects, cur.effects);
         scripts = concatScripts(scripts, cur.scripts);
@@ -2454,6 +2458,7 @@ var Chunk = class {
         cur.consumed = true;
         cur = cur.next;
       } while (cur.next && !cur.async);
+      cur.needsWalk = needsWalk;
       cur.html = html + cur.html;
       cur.effects = concatEffects(effects, cur.effects);
       cur.scripts = concatScripts(scripts, cur.scripts);
@@ -2479,8 +2484,8 @@ var Chunk = class {
     const { state } = boundary;
     const { $global: $global2, runtimePrefix, nonceAttr } = state;
     let { html, scripts } = this;
-    let hasWalk = state.walkOnNextFlush;
-    if (hasWalk) state.walkOnNextFlush = false;
+    let needsWalk = state.walkOnNextFlush;
+    if (needsWalk) state.walkOnNextFlush = false;
     if (state.needsMainRuntime && !state.hasMainRuntime) {
       state.hasMainRuntime = true;
       scripts = concatScripts(
@@ -2489,7 +2494,7 @@ var Chunk = class {
       );
     }
     if (effects) {
-      hasWalk = true;
+      needsWalk = true;
       state.resumes = state.resumes ? state.resumes + "," + effects : effects;
     }
     if (state.resumes) {
@@ -2507,7 +2512,7 @@ var Chunk = class {
       }
     }
     if (state.writeReorders) {
-      hasWalk = true;
+      needsWalk = true;
       if (!state.hasReorderRuntime) {
         state.hasReorderRuntime = true;
         html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>";
@@ -2565,7 +2570,7 @@ var Chunk = class {
       }
       state.writeReorders = null;
     }
-    if (hasWalk) {
+    if (needsWalk) {
       scripts = concatScripts(scripts, runtimePrefix + ".w()");
     }
     this.html = html;
@@ -2574,9 +2579,14 @@ var Chunk = class {
     return this;
   }
   flushHTML() {
-    this.flushScript();
-    const { boundary, scripts } = this;
+    const { boundary } = this;
     const { state } = boundary;
+    if (this.needsWalk) {
+      this.needsWalk = false;
+      state.walkOnNextFlush = true;
+    }
+    this.flushScript();
+    const { scripts } = this;
     const { $global: $global2, nonceAttr } = state;
     const { __flush__ } = $global2;
     let { html } = this;

package/dist/debug/html.mjs

@@ -196,65 +196,65 @@ var WALKER_RUNTIME_CODE = true ? (
     },
   })
 ), self[runtimeId]))`
-) : `(e=>(self[e]||(self[e]=(l,s=e+l,f=s.length,o={},d=[],n=document,t=n.createTreeWalker(n,129))=>n=self[e][l]={i:s,d:n,l:o,v:d,x(){},w(e,l,a){for(;e=t.nextNode();)n.x(l=(l=e.data)&&!l.indexOf(s)&&(o[a=l.slice(f+1)]=e,l[f]),a,e),l>"#"&&d.push(e)}}),self[e]))`;
+) : `(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))`;
 var REORDER_RUNTIME_CODE = true ? (
   /* js */
   `((runtime) => {
-if (runtime.j) return;
-let onNextSibling,
-  placeholder,
-  nextSibling,
-  placeholders = {},
-  replace = (marker, container) => {
-    marker.replaceWith(...container.childNodes);
-    container.remove();
-  };
-runtime.d.head.append(
-  runtime.d.querySelector("style[" + runtime.i + "]") || "",
-);
-runtime.j = {};
-runtime.x = (op, id, node, start, placeholderCallback) => {
-  if (op == "#") {
-    (placeholders[id] = placeholder).i++;
-  } else if (node == nextSibling) {
-    onNextSibling();
-  }
-
-  if (node.tagName == "T" && (id = node.getAttribute(runtime.i))) {
-    start = runtime.l["^" + id];
-
-    if (start) {
-      placeholders[id] = {
-        i: 1,
-        c(end = runtime.l[id] || node) {
-          for (
-            ;
-            (nextSibling = end.previousSibling || start).remove(),
-            start != nextSibling;
-          );
-          replace(end, node);
-        },
-      };
+  if (runtime.j) return;
+  let onNextSibling,
+    placeholder,
+    nextSibling,
+    placeholders = {},
+    replace = (id, container) => runtime.l[id].replaceWith(...container.childNodes);
+  runtime.d.head.append(
+    runtime.d.querySelector("style[" + runtime.i + "]") || ""
+  );
+  runtime.j = {};
+  runtime.x = (op, id, node, placeholderRoot, placeholderCb) => {
+    if (node == nextSibling) {
+      onNextSibling();
     }
 
-    nextSibling = node.nextSibling;
-    placeholder = placeholders[id];
-    onNextSibling = () => {
-      start || replace(runtime.l[id], node);
-      if (!--placeholder.i) {
-        placeholder.c();
+    if (op == "#") {
+      (placeholders[id] = placeholder).i++;
+    } else if (op == "!") {
+      if (runtime.l[id] && placeholders[id]) {
+        nextSibling = node.nextSibling;
+        onNextSibling = () => placeholders[id].c();
       }
-    };
+    } else if (node.tagName == "T" && (id = node.getAttribute(runtime.i))) {
+      nextSibling = node.nextSibling;
+      onNextSibling = () => {
+        node.remove();
+        placeholderRoot || replace(id, node);
+        placeholder.c();
+      };
+      placeholder =
+        placeholders[id] ||
+        (placeholderRoot = placeholders[id] =
+          {
+            i: runtime.l[id] ? 1 : 2,
+            c(start = runtime.l["^" + id]) {
+              if (--placeholderRoot.i) return 1;
+              for (
+                ;
+                (nextSibling =
+                  runtime.l[id].previousSibling || start).remove(),
+                  start != nextSibling;
 
-    // repurpose "op" for callbacks ...carefully
-    if (op = runtime.j[id]) {
-      placeholderCallback = placeholder.c;
-      placeholder.c = () => placeholderCallback() + op(runtime.r);
+              );
+              replace(id, node);
+            },
+          });
+      // repurpose "op" for callbacks ...carefully
+      if ((op = runtime.j[id])) {
+        placeholderCb = placeholder.c;
+        placeholder.c = () => placeholderCb() || op(runtime.r);
+      }
     }
-  }
-};
+  };
 })`
-) : `(e=>{if(e.j)return;let i,o,l,r={},t=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(c,d,n,a,g)=>{"#"==c?(r[d]=o).i++:n==l&&i(),"T"==n.tagName&&(d=n.getAttribute(e.i))&&((a=e.l["^"+d])&&(r[d]={i:1,c(i=e.l[d]||n){for(;(l=i.previousSibling||a).remove(),a!=l;);t(i,n)}}),l=n.nextSibling,o=r[d],i=()=>{a||t(e.l[d],n),--o.i||o.c()},(c=e.j[d])&&(g=o.c,o.c=()=>g()+c(e.r)))}})`;
+) : `(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})`;
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol();
@@ -2171,6 +2171,7 @@ function tryCatch(content, catchContent) {
             writeMarker = false;
             cur.async = false;
             cur.next = bodyNext;
+            cur.needsWalk = true;
             cur.html = endMarker;
             cur.scripts = cur.effects = cur.lastEffect = "";
             cur.placeholderBody = cur.placeholderRender = cur.reorderId = null;
@@ -2301,6 +2302,7 @@ var Chunk = class {
   lastEffect = "";
   async = false;
   consumed = false;
+  needsWalk = false;
   reorderId = null;
   placeholderBody = null;
   placeholderRender = null;
@@ -2351,6 +2353,7 @@ var Chunk = class {
   }
   consume() {
     let cur = this;
+    let needsWalk = cur.needsWalk;
     if (cur.next && !cur.async) {
       let html = "";
       let effects = "";
@@ -2358,6 +2361,7 @@ var Chunk = class {
       let lastEffect = "";
       do {
         cur.flushPlaceholder();
+        needsWalk ||= cur.needsWalk;
         html += cur.html;
         effects = concatEffects(effects, cur.effects);
         scripts = concatScripts(scripts, cur.scripts);
@@ -2365,6 +2369,7 @@ var Chunk = class {
         cur.consumed = true;
         cur = cur.next;
       } while (cur.next && !cur.async);
+      cur.needsWalk = needsWalk;
       cur.html = html + cur.html;
       cur.effects = concatEffects(effects, cur.effects);
       cur.scripts = concatScripts(scripts, cur.scripts);
@@ -2390,8 +2395,8 @@ var Chunk = class {
     const { state } = boundary;
     const { $global: $global2, runtimePrefix, nonceAttr } = state;
     let { html, scripts } = this;
-    let hasWalk = state.walkOnNextFlush;
-    if (hasWalk) state.walkOnNextFlush = false;
+    let needsWalk = state.walkOnNextFlush;
+    if (needsWalk) state.walkOnNextFlush = false;
     if (state.needsMainRuntime && !state.hasMainRuntime) {
       state.hasMainRuntime = true;
       scripts = concatScripts(
@@ -2400,7 +2405,7 @@ var Chunk = class {
       );
     }
     if (effects) {
-      hasWalk = true;
+      needsWalk = true;
       state.resumes = state.resumes ? state.resumes + "," + effects : effects;
     }
     if (state.resumes) {
@@ -2418,7 +2423,7 @@ var Chunk = class {
       }
     }
     if (state.writeReorders) {
-      hasWalk = true;
+      needsWalk = true;
       if (!state.hasReorderRuntime) {
         state.hasReorderRuntime = true;
         html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>";
@@ -2476,7 +2481,7 @@ var Chunk = class {
       }
       state.writeReorders = null;
     }
-    if (hasWalk) {
+    if (needsWalk) {
       scripts = concatScripts(scripts, runtimePrefix + ".w()");
     }
     this.html = html;
@@ -2485,9 +2490,14 @@ var Chunk = class {
     return this;
   }
   flushHTML() {
-    this.flushScript();
-    const { boundary, scripts } = this;
+    const { boundary } = this;
     const { state } = boundary;
+    if (this.needsWalk) {
+      this.needsWalk = false;
+      state.walkOnNextFlush = true;
+    }
+    this.flushScript();
+    const { scripts } = this;
     const { $global: $global2, nonceAttr } = state;
     const { __flush__ } = $global2;
     let { html } = this;

package/dist/dom/queue.d.ts

@@ -10,6 +10,6 @@ export declare function queueRender<T>(scope: Scope, signal: Signal<T>, signalKe
 export declare function queueEffect<S extends Scope, T extends ExecFn<S>>(scope: S, fn: T): void;
 export declare function run(): void;
 export declare function prepareEffects(fn: () => void): unknown[];
-export declare let runEffects: (effects: unknown[]) => void;
+export declare let runEffects: (effects: unknown[], checkPending?: boolean) => void;
 export declare let _enable_catch: () => void;
 export {};

package/dist/dom.js

@@ -1142,7 +1142,9 @@ function _await(nodeAccessor, renderer) {
               tryWithPlaceholder.c = 0, placeholderBranch && (placeholderBranch.h.parentNode.insertBefore(
                 tryWithPlaceholder.h.parentNode,
                 placeholderBranch.h
-              ), removeAndDestroyBranch(placeholderBranch)), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
+              ), removeAndDestroyBranch(placeholderBranch));
+              let pendingEffects2 = tryWithPlaceholder.H;
+              pendingEffects2 && (tryWithPlaceholder.H = [], runEffects(pendingEffects2, !0));
             }
           },
           -1
@@ -1372,13 +1374,13 @@ function prepareEffects(fn) {
   }
   return preparedEffects;
 }
-var runEffects = (effects) => {
+var runEffects = ((effects) => {
   for (let i = 0, scope; i < effects.length; )
     effects[i++](
       scope = effects[i++],
       scope
     );
-};
+});
 function runRenders() {
   for (; pendingRenders.length; ) {
     let render = pendingRenders[0], item = pendingRenders.pop();

package/dist/dom.mjs

@@ -1045,7 +1045,9 @@ function _await(nodeAccessor, renderer) {
               tryWithPlaceholder.c = 0, placeholderBranch && (placeholderBranch.h.parentNode.insertBefore(
                 tryWithPlaceholder.h.parentNode,
                 placeholderBranch.h
-              ), removeAndDestroyBranch(placeholderBranch)), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
+              ), removeAndDestroyBranch(placeholderBranch));
+              let pendingEffects2 = tryWithPlaceholder.H;
+              pendingEffects2 && (tryWithPlaceholder.H = [], runEffects(pendingEffects2, !0));
             }
           },
           -1
@@ -1275,13 +1277,13 @@ function prepareEffects(fn) {
   }
   return preparedEffects;
 }
-var runEffects = (effects) => {
+var runEffects = ((effects) => {
   for (let i = 0, scope; i < effects.length; )
     effects[i++](
       scope = effects[i++],
       scope
     );
-};
+});
 function runRenders() {
   for (; pendingRenders.length; ) {
     let render = pendingRenders[0], item = pendingRenders.pop();

package/dist/html/writer.d.ts

@@ -116,6 +116,7 @@ export declare class Chunk {
     lastEffect: string;
     async: boolean;
     consumed: boolean;
+    needsWalk: boolean;
     reorderId: string | null;
     placeholderBody: Chunk | null;
     placeholderRender: (() => void) | null;

package/dist/html.js

@@ -195,7 +195,7 @@ function forStepBy(by, index) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,s=e+l,f=s.length,o={},d=[],n=document,t=n.createTreeWalker(n,129))=>n=self[e][l]={i:s,d:n,l:o,v:d,x(){},w(e,l,a){for(;e=t.nextNode();)n.x(l=(l=e.data)&&!l.indexOf(s)&&(o[a=l.slice(f+1)]=e,l[f]),a,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,o,l,r={},t=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(c,d,n,a,g)=>{"#"==c?(r[d]=o).i++:n==l&&i(),"T"==n.tagName&&(d=n.getAttribute(e.i))&&((a=e.l["^"+d])&&(r[d]={i:1,c(i=e.l[d]||n){for(;(l=i.previousSibling||a).remove(),a!=l;);t(i,n)}}),l=n.nextSibling,o=r[d],i=()=>{a||t(e.l[d],n),--o.i||o.c()},(c=e.j[d])&&(g=o.c,o.c=()=>g()+c(e.r)))}})';
+var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})';
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {
@@ -1461,7 +1461,7 @@ function tryCatch(content, catchContent) {
           let cur = body, writeMarker = !0;
           do {
             let next = cur.next;
-            cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.html = endMarker, cur.scripts = cur.effects = cur.lastEffect = "", cur.placeholderBody = cur.placeholderRender = cur.reorderId = null), cur = next;
+            cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.needsWalk = !0, cur.html = endMarker, cur.scripts = cur.effects = cur.lastEffect = "", cur.placeholderBody = cur.placeholderRender = cur.reorderId = null), cur = next;
           } while (cur !== bodyNext);
         }
         let catchChunk = new Chunk(boundary, null, chunk.context);
@@ -1546,6 +1546,7 @@ var State2 = class {
   lastEffect = "";
   async = !1;
   consumed = !1;
+  needsWalk = !1;
   reorderId = null;
   placeholderBody = null;
   placeholderRender = null;
@@ -1580,13 +1581,13 @@ var State2 = class {
     }
   }
   consume() {
-    let cur = this;
+    let cur = this, needsWalk = cur.needsWalk;
     if (cur.next && !cur.async) {
       let html = "", effects = "", scripts = "", lastEffect = "";
       do
-        cur.flushPlaceholder(), html += cur.html, effects = concatEffects(effects, cur.effects), scripts = concatScripts(scripts, cur.scripts), lastEffect = cur.lastEffect || lastEffect, cur.consumed = !0, cur = cur.next;
+        cur.flushPlaceholder(), needsWalk ||= cur.needsWalk, html += cur.html, effects = concatEffects(effects, cur.effects), scripts = concatScripts(scripts, cur.scripts), lastEffect = cur.lastEffect || lastEffect, cur.consumed = !0, cur = cur.next;
       while (cur.next && !cur.async);
-      cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts), cur.lastEffect = lastEffect;
+      cur.needsWalk = needsWalk, cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts), cur.lastEffect = lastEffect;
     }
     return cur;
   }
@@ -1602,18 +1603,18 @@ var State2 = class {
     }
   }
   flushScript() {
-    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(
+    let { boundary, effects } = this, { state } = boundary, { $global: $global2, runtimePrefix, nonceAttr } = state, { html, scripts } = this, needsWalk = state.walkOnNextFlush;
+    if (needsWalk && (state.walkOnNextFlush = !1), state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(
       scripts,
       WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
-    )), effects && (hasWalk = !0, state.resumes = state.resumes ? state.resumes + "," + effects : effects), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(
+    )), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + "," + effects : effects), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(
       scripts,
       runtimePrefix + ".r.push(" + state.resumes + ")"
     ) : (state.hasWrittenResume = !0, scripts = concatScripts(
       scripts,
       runtimePrefix + ".r=[" + state.resumes + "]"
     ))), state.writeReorders) {
-      hasWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>", scripts = concatScripts(
+      needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>", scripts = concatScripts(
         scripts,
         REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")"
       ));
@@ -1643,11 +1644,12 @@ var State2 = class {
       }
       state.writeReorders = null;
     }
-    return hasWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.effects = this.lastEffect = state.resumes = "", this;
+    return needsWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.effects = this.lastEffect = state.resumes = "", this;
   }
   flushHTML() {
-    this.flushScript();
-    let { boundary, scripts } = this, { state } = boundary, { $global: $global2, nonceAttr } = state, { __flush__ } = $global2, { html } = this;
+    let { boundary } = this, { state } = boundary;
+    this.needsWalk && (this.needsWalk = !1, state.walkOnNextFlush = !0), this.flushScript();
+    let { scripts } = this, { $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;
   }
 };

package/dist/html.mjs

@@ -109,7 +109,7 @@ function forStepBy(by, index) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,s=e+l,f=s.length,o={},d=[],n=document,t=n.createTreeWalker(n,129))=>n=self[e][l]={i:s,d:n,l:o,v:d,x(){},w(e,l,a){for(;e=t.nextNode();)n.x(l=(l=e.data)&&!l.indexOf(s)&&(o[a=l.slice(f+1)]=e,l[f]),a,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,o,l,r={},t=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(c,d,n,a,g)=>{"#"==c?(r[d]=o).i++:n==l&&i(),"T"==n.tagName&&(d=n.getAttribute(e.i))&&((a=e.l["^"+d])&&(r[d]={i:1,c(i=e.l[d]||n){for(;(l=i.previousSibling||a).remove(),a!=l;);t(i,n)}}),l=n.nextSibling,o=r[d],i=()=>{a||t(e.l[d],n),--o.i||o.c()},(c=e.j[d])&&(g=o.c,o.c=()=>g()+c(e.r)))}})';
+var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})';
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {
@@ -1375,7 +1375,7 @@ function tryCatch(content, catchContent) {
           let cur = body, writeMarker = !0;
           do {
             let next = cur.next;
-            cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.html = endMarker, cur.scripts = cur.effects = cur.lastEffect = "", cur.placeholderBody = cur.placeholderRender = cur.reorderId = null), cur = next;
+            cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.needsWalk = !0, cur.html = endMarker, cur.scripts = cur.effects = cur.lastEffect = "", cur.placeholderBody = cur.placeholderRender = cur.reorderId = null), cur = next;
           } while (cur !== bodyNext);
         }
         let catchChunk = new Chunk(boundary, null, chunk.context);
@@ -1460,6 +1460,7 @@ var State2 = class {
   lastEffect = "";
   async = !1;
   consumed = !1;
+  needsWalk = !1;
   reorderId = null;
   placeholderBody = null;
   placeholderRender = null;
@@ -1494,13 +1495,13 @@ var State2 = class {
     }
   }
   consume() {
-    let cur = this;
+    let cur = this, needsWalk = cur.needsWalk;
     if (cur.next && !cur.async) {
       let html = "", effects = "", scripts = "", lastEffect = "";
       do
-        cur.flushPlaceholder(), html += cur.html, effects = concatEffects(effects, cur.effects), scripts = concatScripts(scripts, cur.scripts), lastEffect = cur.lastEffect || lastEffect, cur.consumed = !0, cur = cur.next;
+        cur.flushPlaceholder(), needsWalk ||= cur.needsWalk, html += cur.html, effects = concatEffects(effects, cur.effects), scripts = concatScripts(scripts, cur.scripts), lastEffect = cur.lastEffect || lastEffect, cur.consumed = !0, cur = cur.next;
       while (cur.next && !cur.async);
-      cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts), cur.lastEffect = lastEffect;
+      cur.needsWalk = needsWalk, cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts), cur.lastEffect = lastEffect;
     }
     return cur;
   }
@@ -1516,18 +1517,18 @@ var State2 = class {
     }
   }
   flushScript() {
-    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(
+    let { boundary, effects } = this, { state } = boundary, { $global: $global2, runtimePrefix, nonceAttr } = state, { html, scripts } = this, needsWalk = state.walkOnNextFlush;
+    if (needsWalk && (state.walkOnNextFlush = !1), state.needsMainRuntime && !state.hasMainRuntime && (state.hasMainRuntime = !0, scripts = concatScripts(
       scripts,
       WALKER_RUNTIME_CODE + '("' + $global2.runtimeId + '")("' + $global2.renderId + '")'
-    )), effects && (hasWalk = !0, state.resumes = state.resumes ? state.resumes + "," + effects : effects), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(
+    )), effects && (needsWalk = !0, state.resumes = state.resumes ? state.resumes + "," + effects : effects), state.resumes && (state.hasWrittenResume ? scripts = concatScripts(
       scripts,
       runtimePrefix + ".r.push(" + state.resumes + ")"
     ) : (state.hasWrittenResume = !0, scripts = concatScripts(
       scripts,
       runtimePrefix + ".r=[" + state.resumes + "]"
     ))), state.writeReorders) {
-      hasWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>", scripts = concatScripts(
+      needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, html += "<style " + state.commentPrefix + nonceAttr + ">t{display:none}</style>", scripts = concatScripts(
         scripts,
         REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")"
       ));
@@ -1557,11 +1558,12 @@ var State2 = class {
       }
       state.writeReorders = null;
     }
-    return hasWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.effects = this.lastEffect = state.resumes = "", this;
+    return needsWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.effects = this.lastEffect = state.resumes = "", this;
   }
   flushHTML() {
-    this.flushScript();
-    let { boundary, scripts } = this, { state } = boundary, { $global: $global2, nonceAttr } = state, { __flush__ } = $global2, { html } = this;
+    let { boundary } = this, { state } = boundary;
+    this.needsWalk && (this.needsWalk = !1, state.walkOnNextFlush = !0), this.flushScript();
+    let { scripts } = this, { $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;
   }
 };

package/dist/translator/index.js

@@ -4674,9 +4674,11 @@ function preAnalyze(program) {
   }
 }
 function normalizeBody(state, body) {
-  for (const child of body) {
-    if (child.isMarkoTag()) {
-      normalizeTag(state, child);
+  if (body?.length) {
+    for (const child of body) {
+      if (child.isMarkoTag()) {
+        normalizeTag(state, child);
+      }
     }
   }
 }
@@ -4684,6 +4686,7 @@ function normalizeTag(state, tag) {
   const { node } = tag;
   const { name: name2, attributes } = node;
   normalizeBody(state, tag.get("body").get("body"));
+  normalizeBody(state, tag.get("attributeTags"));
   if (node.var) {
     const insertions = getAssignmentInsertions(node.var);
     if (insertions) {

package/package.json

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