marko 6.0.3 → 6.0.5

package/dist/html.js

@@ -39,11 +39,11 @@ __export(html_exports, {
   escapeStyle: () => escapeStyle,
   escapeXML: () => escapeXML,
   forIn: () => forIn,
-  forInBy: () => forInBy2,
+  forInBy: () => forInBy,
   forOf: () => forOf,
-  forOfBy: () => forOfBy2,
+  forOfBy: () => forOfBy,
   forTo: () => forTo,
-  forToBy: () => forToBy2,
+  forToBy: () => forToBy,
   fork: () => fork,
   getScopeById: () => getScopeById,
   hoist: () => hoist,
@@ -93,39 +93,30 @@ function* attrTagIterator() {
 }
 
 // src/common/helpers.ts
-function classValue(value) {
-  return toDelimitedString(value, " ", stringifyClassObject);
+function classValue(classValue2) {
+  return toDelimitedString(classValue2, " ", stringifyClassObject);
 }
 function stringifyClassObject(name, value) {
   return value ? name : "";
 }
-function styleValue(value) {
-  return toDelimitedString(value, ";", stringifyStyleObject);
+function styleValue(styleValue2) {
+  return toDelimitedString(styleValue2, ";", stringifyStyleObject);
 }
 function stringifyStyleObject(name, value) {
-  return value || value === 0 ? `${name}:${typeof value == "number" && value && !/^(--|ta|or|li|z)|cou|nk|it|ag|we|do|w$/.test(name) ? value + "px" : value}` : "";
+  return value || value === 0 ? `${name}:${value && typeof value == "number" && !/^(--|ta|or|li|z)|cou|nk|it|ag|we|do|w$/.test(name) ? value + "px" : value}` : "";
 }
 function toDelimitedString(val, delimiter, stringify) {
-  switch (typeof val) {
-    case "string":
-      return val;
-    case "object":
-      if (val !== null) {
-        let result = "", curDelimiter = "";
-        if (Array.isArray(val))
-          for (let v of val) {
-            let part = toDelimitedString(v, delimiter, stringify);
-            part !== "" && (result += curDelimiter + part, curDelimiter = delimiter);
-          }
-        else
-          for (let name in val) {
-            let v = val[name], part = stringify(name, v);
-            part !== "" && (result += curDelimiter + part, curDelimiter = delimiter);
-          }
-        return result;
-      }
-  }
-  return "";
+  let str = "", sep = "", part;
+  if (val)
+    if (typeof val != "object")
+      str += val;
+    else if (Array.isArray(val))
+      for (let v of val)
+        part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
+    else
+      for (let name in val)
+        part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
+  return str;
 }
 function isEventHandler(name) {
   return /^on[A-Z-]/.test(name);
@@ -178,6 +169,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)))}})';
 
@@ -1170,161 +1172,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 : "")
     )
   );
 }
@@ -2025,8 +2032,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)) {
@@ -2062,7 +2069,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(
@@ -2171,17 +2178,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;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $global,