marko 6.0.2 → 6.0.4

package/dist/html.mjs

@@ -96,6 +96,17 @@ function forTo(to, from, step, cb) {
     cb(start + i * delta);
 }
 
+// src/html/for.ts
+function forOfBy(by, item, index) {
+  return by ? typeof by == "string" ? item[by] : by(item, index) : index;
+}
+function forInBy(by, name, value) {
+  return by ? by(name, value) : name;
+}
+function forToBy(by, index) {
+  return by ? by(index) : index;
+}
+
 // src/html/inlined-runtimes.ts
 var WALKER_RUNTIME_CODE = '(e=>(self[e]=(l,t=e+l,d=t.length,f={},s=[],x=document,a=x.createTreeWalker(x,129))=>self[e][l]={i:t,d:x,l:f,v:s,x(){},w(e,l,x){for(;e=a.nextNode();)this.x(l=(l=e.data)&&!l.indexOf(t)&&(f[x=l.slice(d+1)]=e,l[d]),x,e),l>"#"&&s.push(e)}},self[e]))', REORDER_RUNTIME_CODE = '(e=>{let i,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})';
 
@@ -1088,161 +1099,166 @@ var branchIdKey = Symbol();
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch) {
-  if (serializeBranch === 0)
-    return forOf(list, cb);
-  let loopScopes = /* @__PURE__ */ new Map();
-  forOf(list, (item, index) => {
-    let branchId = peekNextScopeId();
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark(
-        "[" /* BranchStart */,
-        branchId + (index ? " " : "")
-      )
-    ), withBranchId(branchId, () => {
-      cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
+  if (resumeBranch) {
+    let loopScopes = /* @__PURE__ */ new Map();
+    forOf(list, (item, index) => {
+      let branchId = peekNextScopeId();
+      resumeMarker && $chunk.writeHTML(
+        $chunk.boundary.state.mark(
+          "[" /* BranchStart */,
+          branchId + (index ? " " : "")
+        )
+      ), withBranchId(branchId, () => {
+        cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+      });
+    }), loopScopes.size && writeScope(scopeId, {
+      ["m" /* LoopScopeMap */ + accessor]: loopScopes
     });
-  }), loopScopes.size && writeScope(scopeId, {
-    ["m" /* LoopScopeMap */ + accessor]: loopScopes
-  }), $chunk.writeHTML(
+  } else
+    forOf(list, cb);
+  resumeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, onlyChildInParent) {
-  if (serializeBranch === 0)
-    return forOf(list, cb);
-  let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
-  forOf(list, (item, index) => {
-    let branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds, withBranchId(branchId, () => {
-      cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchIds = "";
+  if (resumeBranch) {
+    let loopScopes = /* @__PURE__ */ new Map();
+    forOf(list, (item, index) => {
+      let branchId = peekNextScopeId();
+      resumeMarker && (branchIds = " " + branchId + branchIds), withBranchId(branchId, () => {
+        cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+      });
+    }), loopScopes.size && writeScope(scopeId, {
+      ["m" /* LoopScopeMap */ + accessor]: loopScopes
     });
-  }), loopScopes.size && writeScope(scopeId, {
-    ["m" /* LoopScopeMap */ + accessor]: loopScopes
-  }), $chunk.writeHTML(
+  } else
+    forOf(list, cb);
+  resumeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + branchIds
     )
   );
 }
-function forOfBy(by, item, index) {
-  return by ? typeof by == "string" ? item[by] : by(item, index) : index;
-}
-function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch) {
-  if (serializeBranch === 0)
-    return forIn(obj, cb);
-  let loopScopes = /* @__PURE__ */ new Map(), sep = "";
-  forIn(obj, (key, value) => {
-    let branchId = peekNextScopeId();
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
-    ), sep = " ", withBranchId(branchId, () => {
-      cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
+  if (resumeBranch) {
+    let loopScopes = /* @__PURE__ */ new Map(), sep = "";
+    forIn(obj, (key, value) => {
+      let branchId = peekNextScopeId();
+      resumeMarker && ($chunk.writeHTML(
+        $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+      ), sep = " "), withBranchId(branchId, () => {
+        cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+      });
+    }), loopScopes.size && writeScope(scopeId, {
+      ["m" /* LoopScopeMap */ + accessor]: loopScopes
     });
-  }), loopScopes.size && writeScope(scopeId, {
-    ["m" /* LoopScopeMap */ + accessor]: loopScopes
-  }), $chunk.writeHTML(
+  } else
+    forIn(obj, cb);
+  resumeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, onlyChild) {
-  if (serializeBranch === 0)
-    return forIn(obj, cb);
-  let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
-  forIn(obj, (key, value) => {
-    let branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds, withBranchId(branchId, () => {
-      cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchIds = "";
+  if (resumeBranch) {
+    let loopScopes = /* @__PURE__ */ new Map();
+    forIn(obj, (key, value) => {
+      let branchId = peekNextScopeId();
+      resumeMarker && (branchIds = " " + branchId + branchIds), withBranchId(branchId, () => {
+        cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+      });
+    }), loopScopes.size && writeScope(scopeId, {
+      ["m" /* LoopScopeMap */ + accessor]: loopScopes
     });
-  }), loopScopes.size && writeScope(scopeId, {
-    ["m" /* LoopScopeMap */ + accessor]: loopScopes
-  }), $chunk.writeHTML(
+  } else
+    forIn(obj, cb);
+  resumeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
-      onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+      onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + branchIds
     )
   );
 }
-function forInBy(by, name, value) {
-  return by ? by(name, value) : name;
-}
-function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch) {
-  if (serializeBranch === 0)
-    return forTo(to, from, step, cb);
-  let loopScopes = /* @__PURE__ */ new Map(), sep = "";
-  forTo(to, from, step, (index) => {
-    let branchId = peekNextScopeId();
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
-    ), sep = " ", withBranchId(branchId, () => {
-      cb(index), loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
+  if (resumeBranch) {
+    let loopScopes = /* @__PURE__ */ new Map(), sep = "";
+    forTo(to, from, step, (i) => {
+      let branchId = peekNextScopeId();
+      resumeMarker && ($chunk.writeHTML(
+        $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+      ), sep = " "), withBranchId(branchId, () => {
+        cb(i), loopScopes.set(forToBy(by, i), writeScope(branchId, {}));
+      });
+    }), loopScopes.size && writeScope(scopeId, {
+      ["m" /* LoopScopeMap */ + accessor]: loopScopes
     });
-  }), loopScopes.size && writeScope(scopeId, {
-    ["m" /* LoopScopeMap */ + accessor]: loopScopes
-  }), $chunk.writeHTML(
+  } else
+    forTo(to, from, step, cb);
+  resumeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, onlyChild) {
-  if (serializeBranch === 0)
-    return forTo(to, from, step, cb);
-  let loopScopes = /* @__PURE__ */ new Map(), branchIds = "";
-  forTo(to, from, step, (index) => {
-    let branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds, withBranchId(branchId, () => {
-      cb(index), loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
+function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchIds = "";
+  if (resumeBranch) {
+    let loopScopes = /* @__PURE__ */ new Map();
+    forTo(to, from, step, (i) => {
+      let branchId = peekNextScopeId();
+      resumeMarker && (branchIds = " " + branchId + branchIds), withBranchId(branchId, () => {
+        cb(i), loopScopes.set(forToBy(by, i), writeScope(branchId, {}));
+      });
+    }), loopScopes.size && writeScope(scopeId, {
+      ["m" /* LoopScopeMap */ + accessor]: loopScopes
     });
-  }), loopScopes.size && writeScope(scopeId, {
-    ["m" /* LoopScopeMap */ + accessor]: loopScopes
-  }), $chunk.writeHTML(
+  } else
+    forTo(to, from, step, cb);
+  resumeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
-      onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+      onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + branchIds
     )
   );
 }
-function forToBy(by, index) {
-  return by ? by(index) : index;
-}
 function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker) {
-  if (serializeBranch === 0)
-    return cb();
-  let branchId = peekNextScopeId();
-  serializeMarker && $chunk.writeHTML(
+  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId();
+  resumeMarker && resumeBranch && $chunk.writeHTML(
     $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
   );
-  let branchIndex = withBranchId(branchId, cb);
-  branchIndex !== void 0 ? writeScope(scopeId, {
-    ["c" /* ConditionalRenderer */ + accessor]: serializeMarker ? branchIndex : void 0,
+  let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
+  resumeBranch && branchIndex !== void 0 && writeScope(scopeId, {
+    ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
-  }) : nextScopeId(), serializeMarker && $chunk.writeHTML(
+  }), resumeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
       scopeId + " " + accessor
     )
   );
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, onlyChild) {
-  if (serializeBranch === 0)
-    return cb();
-  let branchId = peekNextScopeId(), branchIndex = withBranchId(branchId, cb), rendered = branchIndex !== void 0;
-  rendered ? writeScope(scopeId, {
-    ["c" /* ConditionalRenderer */ + accessor]: serializeMarker ? branchIndex : void 0,
+function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId(), branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
+  shouldWriteBranch && writeScope(scopeId, {
+    ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
-  }) : nextScopeId(), serializeMarker && $chunk.writeHTML(
+  }), resumeMarker && $chunk.writeHTML(
     $chunk.boundary.state.mark(
-      onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + (rendered ? " " + branchId : "")
+      onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
     )
   );
 }
@@ -1350,7 +1366,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.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.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);
@@ -1431,6 +1447,7 @@ var State2 = class {
   html = "";
   scripts = "";
   effects = "";
+  lastEffect = "";
   async = !1;
   consumed = !1;
   reorderId = null;
@@ -1440,16 +1457,16 @@ var State2 = class {
     this.html += html;
   }
   writeEffect(scopeId, registryId) {
-    this.effects = concatEffects(
+    this.lastEffect === registryId ? this.effects += "," + scopeId : this.effects = concatEffects(
       this.effects,
-      scopeId + ',"' + registryId + '"'
-    );
+      '"' + registryId + '",' + scopeId
+    ), this.lastEffect = registryId;
   }
   writeScript(script) {
     this.scripts = concatScripts(this.scripts, script);
   }
   append(chunk) {
-    this.html += chunk.html, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts);
+    this.html += chunk.html, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts), this.lastEffect = chunk.lastEffect || this.lastEffect;
   }
   flushPlaceholder() {
     if (this.placeholderBody) {
@@ -1469,11 +1486,11 @@ var State2 = class {
   consume() {
     let cur = this;
     if (cur.next && !cur.async) {
-      let html = "", effects = "", scripts = "";
+      let html = "", effects = "", scripts = "", lastEffect = "";
       do
-        cur.flushPlaceholder(), html += cur.html, effects = concatEffects(effects, cur.effects), scripts = concatScripts(scripts, cur.scripts), cur.consumed = !0, cur = cur.next;
+        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;
       while (cur.next && !cur.async);
-      cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts);
+      cur.html = html + cur.html, cur.effects = concatEffects(effects, cur.effects), cur.scripts = concatScripts(scripts, cur.scripts), cur.lastEffect = lastEffect;
     }
     return cur;
   }
@@ -1513,7 +1530,7 @@ var State2 = class {
           if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
             "#" /* ReorderMarker */,
             cur.reorderId = state.nextReorderId()
-          ), cur.html = cur.effects = cur.scripts = "", cur.next = null), next)
+          ), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next)
             cur = next;
           else
             break;
@@ -1942,8 +1959,8 @@ function NOOP2() {
 }
 
 // src/html/dynamic-tag.ts
-var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, shouldResume) => {
-  let renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
+var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
+  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     if (nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), !voidElementsReg.test(renderer)) {
@@ -1979,7 +1996,7 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
           let input = inputIsArgs ? inputOrArgs[0] : inputOrArgs;
           return renderer(
             content ? { ...input, content } : input,
-            shouldResume
+            shouldResume ? 1 : 0
           );
         }
         return inputIsArgs ? renderer(...inputOrArgs) : renderer(
@@ -2088,17 +2105,6 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     register(RENDER_BODY_ID, fn);
   }
 };
-
-// src/html/for.ts
-function forOfBy2(by, item, index) {
-  return by ? typeof by == "string" ? item[by] : by(item, index) : index;
-}
-function forInBy2(by, name, value) {
-  return by ? by(name, value) : name;
-}
-function forToBy2(by, index) {
-  return by ? by(index) : index;
-}
 export {
   $global,
   attr,
@@ -2122,11 +2128,11 @@ export {
   escapeStyle,
   escapeXML,
   forIn,
-  forInBy2 as forInBy,
+  forInBy,
   forOf,
-  forOfBy2 as forOfBy,
+  forOfBy,
   forTo,
-  forToBy2 as forToBy,
+  forToBy,
   fork,
   getScopeById,
   hoist,