marko 6.0.3 → 6.0.5

package/dist/debug/html.js

@@ -42,11 +42,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,
@@ -108,48 +108,44 @@ 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 = "";
-        let curDelimiter = "";
-        if (Array.isArray(val)) {
-          for (const v of val) {
-            const part = toDelimitedString(v, delimiter, stringify);
-            if (part !== "") {
-              result += curDelimiter + part;
-              curDelimiter = delimiter;
-            }
-          }
-        } else {
-          for (const name in val) {
-            const v = val[name];
-            const part = stringify(name, v);
-            if (part !== "") {
-              result += curDelimiter + part;
-              curDelimiter = delimiter;
-            }
-          }
+  let str = "";
+  let sep = "";
+  let part;
+  if (val) {
+    if (typeof val !== "object") {
+      str += val;
+    } else if (Array.isArray(val)) {
+      for (const v of val) {
+        part = toDelimitedString(v, delimiter, stringify);
+        if (part) {
+          str += sep + part;
+          sep = delimiter;
         }
-        return result;
       }
+    } else {
+      for (const name in val) {
+        part = stringify(name, val[name]);
+        if (part) {
+          str += sep + part;
+          sep = delimiter;
+        }
+      }
+    }
   }
-  return "";
+  return str;
 }
 function isEventHandler(name) {
   return /^on[A-Z-]/.test(name);
@@ -210,6 +206,29 @@ function forTo(to, from, step, cb) {
   }
 }
 
+// src/html/for.ts
+function forOfBy(by, item, index) {
+  if (by) {
+    if (typeof by === "string") {
+      return item[by];
+    }
+    return by(item, index);
+  }
+  return index;
+}
+function forInBy(by, name, value) {
+  if (by) {
+    return by(name, value);
+  }
+  return name;
+}
+function forToBy(by, index) {
+  if (by) {
+    return by(index);
+  }
+  return index;
+}
+
 // src/html/inlined-runtimes.ts
 var WALKER_RUNTIME_CODE = true ? (
   /* js */
@@ -1771,213 +1790,232 @@ 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);
+function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+  const resumeBranch = serializeBranch !== 0;
+  const resumeMarker = serializeMarker !== 0;
+  if (resumeBranch) {
+    const loopScopes = /* @__PURE__ */ new Map();
+    forOf(list, (item, index) => {
+      const branchId = peekNextScopeId();
+      if (resumeMarker) {
+        $chunk.writeHTML(
+          $chunk.boundary.state.mark(
+            "[" /* BranchStart */,
+            branchId + (index ? " " : "")
+          )
+        );
+      }
+      withBranchId(branchId, () => {
+        cb(item, index);
+        loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+      });
+    });
+    if (loopScopes.size) {
+      writeScope(scopeId, {
+        ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+      });
+    }
+  } else {
+    forOf(list, cb);
   }
-  const loopScopes = /* @__PURE__ */ new Map();
-  forOf(list, (item, index) => {
-    const branchId = peekNextScopeId();
+  if (resumeMarker) {
     $chunk.writeHTML(
       $chunk.boundary.state.mark(
-        "[" /* BranchStart */,
-        branchId + (index ? " " : "")
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor
       )
     );
-    withBranchId(branchId, () => {
-      cb(item, index);
-      loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
-    });
-  });
-  if (loopScopes.size) {
-    writeScope(scopeId, {
-      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
-    });
   }
-  $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);
-  }
-  const loopScopes = /* @__PURE__ */ new Map();
+function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+  const resumeBranch = serializeBranch !== 0;
+  const resumeMarker = serializeMarker !== 0;
   let branchIds = "";
-  forOf(list, (item, index) => {
-    const branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds;
-    withBranchId(branchId, () => {
-      cb(item, index);
-      loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
-    });
-  });
-  if (loopScopes.size) {
-    writeScope(scopeId, {
-      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+  if (resumeBranch) {
+    const loopScopes = /* @__PURE__ */ new Map();
+    forOf(list, (item, index) => {
+      const branchId = peekNextScopeId();
+      if (resumeMarker) {
+        branchIds = " " + branchId + branchIds;
+      }
+      withBranchId(branchId, () => {
+        cb(item, index);
+        loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+      });
     });
-  }
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
-  );
-}
-function forOfBy(by, item, index) {
-  if (by) {
-    if (typeof by === "string") {
-      return item[by];
+    if (loopScopes.size) {
+      writeScope(scopeId, {
+        ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+      });
     }
-    return by(item, index);
+  } else {
+    forOf(list, cb);
+  }
+  if (resumeMarker) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+        scopeId + " " + accessor + branchIds
+      )
+    );
   }
-  return index;
 }
-function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch) {
-  if (serializeBranch === 0) {
-    return forIn(obj, cb);
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+  const resumeBranch = serializeBranch !== 0;
+  const resumeMarker = serializeMarker !== 0;
+  if (resumeBranch) {
+    const loopScopes = /* @__PURE__ */ new Map();
+    let sep = "";
+    forIn(obj, (key, value) => {
+      const branchId = peekNextScopeId();
+      if (resumeMarker) {
+        $chunk.writeHTML(
+          $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+        );
+        sep = " ";
+      }
+      withBranchId(branchId, () => {
+        cb(key, value);
+        loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+      });
+    });
+    if (loopScopes.size) {
+      writeScope(scopeId, {
+        ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+      });
+    }
+  } else {
+    forIn(obj, cb);
   }
-  const loopScopes = /* @__PURE__ */ new Map();
-  let sep = "";
-  forIn(obj, (key, value) => {
-    const branchId = peekNextScopeId();
+  if (resumeMarker) {
     $chunk.writeHTML(
-      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+      $chunk.boundary.state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor
+      )
     );
-    sep = " ";
-    withBranchId(branchId, () => {
-      cb(key, value);
-      loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
-    });
-  });
-  if (loopScopes.size) {
-    writeScope(scopeId, {
-      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
-    });
   }
-  $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);
-  }
-  const loopScopes = /* @__PURE__ */ new Map();
+function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+  const resumeBranch = serializeBranch !== 0;
+  const resumeMarker = serializeMarker !== 0;
   let branchIds = "";
-  forIn(obj, (key, value) => {
-    const branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds;
-    withBranchId(branchId, () => {
-      cb(key, value);
-      loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
-    });
-  });
-  if (loopScopes.size) {
-    writeScope(scopeId, {
-      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+  if (resumeBranch) {
+    const loopScopes = /* @__PURE__ */ new Map();
+    forIn(obj, (key, value) => {
+      const branchId = peekNextScopeId();
+      if (resumeMarker) {
+        branchIds = " " + branchId + branchIds;
+      }
+      withBranchId(branchId, () => {
+        cb(key, value);
+        loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+      });
     });
+    if (loopScopes.size) {
+      writeScope(scopeId, {
+        ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+      });
+    }
+  } else {
+    forIn(obj, cb);
   }
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
-  );
-}
-function forInBy(by, name, value) {
-  if (by) {
-    return by(name, value);
+  if (resumeMarker) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+        scopeId + " " + accessor + branchIds
+      )
+    );
   }
-  return name;
 }
-function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch) {
-  if (serializeBranch === 0) {
-    return forTo(to, from, step, cb);
+function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+  const resumeBranch = serializeBranch !== 0;
+  const resumeMarker = serializeMarker !== 0;
+  if (resumeBranch) {
+    const loopScopes = /* @__PURE__ */ new Map();
+    let sep = "";
+    forTo(to, from, step, (i) => {
+      const branchId = peekNextScopeId();
+      if (resumeMarker) {
+        $chunk.writeHTML(
+          $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+        );
+        sep = " ";
+      }
+      withBranchId(branchId, () => {
+        cb(i);
+        loopScopes.set(forToBy(by, i), writeScope(branchId, {}));
+      });
+    });
+    if (loopScopes.size) {
+      writeScope(scopeId, {
+        ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+      });
+    }
+  } else {
+    forTo(to, from, step, cb);
   }
-  const loopScopes = /* @__PURE__ */ new Map();
-  let sep = "";
-  forTo(to, from, step, (index) => {
-    const branchId = peekNextScopeId();
+  if (resumeMarker) {
     $chunk.writeHTML(
-      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + sep)
+      $chunk.boundary.state.mark(
+        "]" /* BranchEnd */,
+        scopeId + " " + accessor
+      )
     );
-    sep = " ";
-    withBranchId(branchId, () => {
-      cb(index);
-      loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
-    });
-  });
-  if (loopScopes.size) {
-    writeScope(scopeId, {
-      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
-    });
   }
-  $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);
-  }
-  const loopScopes = /* @__PURE__ */ new Map();
+function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+  const resumeBranch = serializeBranch !== 0;
+  const resumeMarker = serializeMarker !== 0;
   let branchIds = "";
-  forTo(to, from, step, (index) => {
-    const branchId = peekNextScopeId();
-    branchIds = " " + branchId + branchIds;
-    withBranchId(branchId, () => {
-      cb(index);
-      loopScopes.set(forToBy(by, index), writeScope(branchId, {}));
-    });
-  });
-  if (loopScopes.size) {
-    writeScope(scopeId, {
-      ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+  if (resumeBranch) {
+    const loopScopes = /* @__PURE__ */ new Map();
+    forTo(to, from, step, (i) => {
+      const branchId = peekNextScopeId();
+      if (resumeMarker) {
+        branchIds = " " + branchId + branchIds;
+      }
+      withBranchId(branchId, () => {
+        cb(i);
+        loopScopes.set(forToBy(by, i), writeScope(branchId, {}));
+      });
     });
+    if (loopScopes.size) {
+      writeScope(scopeId, {
+        ["LoopScopeMap:" /* LoopScopeMap */ + accessor]: loopScopes
+      });
+    }
+  } else {
+    forTo(to, from, step, cb);
   }
-  $chunk.writeHTML(
-    $chunk.boundary.state.mark(
-      onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
-  );
-}
-function forToBy(by, index) {
-  if (by) {
-    return by(index);
+  if (resumeMarker) {
+    $chunk.writeHTML(
+      $chunk.boundary.state.mark(
+        onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+        scopeId + " " + accessor + branchIds
+      )
+    );
   }
-  return index;
 }
 function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker) {
-  if (serializeBranch === 0) {
-    return cb();
-  }
+  const resumeBranch = serializeBranch !== 0;
+  const resumeMarker = serializeMarker !== 0;
   const branchId = peekNextScopeId();
-  if (serializeMarker) {
+  if (resumeMarker && resumeBranch) {
     $chunk.writeHTML(
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
     );
   }
-  const branchIndex = withBranchId(branchId, cb);
-  if (branchIndex !== void 0) {
+  const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
+  const rendered = branchIndex !== void 0;
+  if (resumeBranch && rendered) {
     writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: serializeMarker ? branchIndex : void 0,
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
-  } else {
-    nextScopeId();
   }
-  if (serializeMarker) {
+  if (resumeMarker) {
     $chunk.writeHTML(
       $chunk.boundary.state.mark(
         "]" /* BranchEnd */,
@@ -1986,26 +2024,23 @@ function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMark
     );
   }
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, onlyChild) {
-  if (serializeBranch === 0) {
-    return cb();
-  }
+function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+  const resumeBranch = serializeBranch !== 0;
+  const resumeMarker = serializeMarker !== 0;
   const branchId = peekNextScopeId();
-  const branchIndex = withBranchId(branchId, cb);
-  const rendered = branchIndex !== void 0;
-  if (rendered) {
+  const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
+  const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
+  if (shouldWriteBranch) {
     writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: serializeMarker ? branchIndex : void 0,
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
-  } else {
-    nextScopeId();
   }
-  if (serializeMarker) {
+  if (resumeMarker) {
     $chunk.writeHTML(
       $chunk.boundary.state.mark(
-        onlyChild ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-        scopeId + " " + accessor + (rendered ? " " + branchId : "")
+        onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+        scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
       )
     );
   }
@@ -3108,7 +3143,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)$/;
-var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, shouldResume) => {
+var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
+  const shouldResume = serializeReason !== 0;
   const renderer = normalizeDynamicRenderer(tag);
   if (true) {
     if (renderer && typeof renderer !== "function" && typeof renderer !== "string") {
@@ -3179,7 +3215,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, sho
           const input = inputIsArgs ? inputOrArgs[0] : inputOrArgs;
           return renderer(
             content ? { ...input, content } : input,
-            shouldResume
+            shouldResume ? 1 : 0
           );
         }
         return inputIsArgs ? renderer(...inputOrArgs) : renderer(
@@ -3323,29 +3359,6 @@ var compat = {
     register(RENDER_BODY_ID, fn);
   }
 };
-
-// src/html/for.ts
-function forOfBy2(by, item, index) {
-  if (by) {
-    if (typeof by === "string") {
-      return item[by];
-    }
-    return by(item, index);
-  }
-  return index;
-}
-function forInBy2(by, name, value) {
-  if (by) {
-    return by(name, value);
-  }
-  return name;
-}
-function forToBy2(by, index) {
-  if (by) {
-    return by(index);
-  }
-  return index;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $global,