marko 6.0.8 → 6.0.10

package/dist/debug/dom.js

@@ -246,6 +246,10 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {};
+var branchesEnabled;
+function enableBranches() {
+  branchesEnabled = 1;
+}
 function init(runtimeId = DEFAULT_RUNTIME_ID) {
   if (true) {
     if (!runtimeId.match(/^[_$a-z][_$a-z0-9]*$/i)) {
@@ -312,41 +316,43 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               if (token === "*" /* Node */) {
                 const node = scope[data2] = visit.previousSibling;
                 scope["Getter:" /* Getter */ + data2] = () => node;
-              } else if (token === "[" /* BranchStart */) {
-                if (currentBranchId && dataIndex) {
-                  branchEnd(currentBranchId, visit);
+              } else if (branchesEnabled) {
+                if (token === "[" /* BranchStart */) {
+                  if (currentBranchId && dataIndex) {
+                    branchEnd(currentBranchId, visit);
+                    currentBranchId = branchStack.pop();
+                  }
+                  if (currentBranchId) {
+                    branchStack.push(currentBranchId);
+                    parentBranchIds.set(scopeId, currentBranchId);
+                  }
+                  currentBranchId = scopeId;
+                  scope.___startNode = visit;
+                } else if (token === "]" /* BranchEnd */) {
+                  scope[data2] = visit;
+                  const curParent = visit.parentNode;
+                  const startNode = branchEnd(
+                    currentBranchId,
+                    visit
+                  ).___startNode;
+                  if (curParent !== startNode.parentNode) {
+                    curParent.prepend(startNode);
+                  }
                   currentBranchId = branchStack.pop();
-                }
-                if (currentBranchId) {
-                  branchStack.push(currentBranchId);
-                  parentBranchIds.set(scopeId, currentBranchId);
-                }
-                currentBranchId = scopeId;
-                scope.___startNode = visit;
-              } else if (token === "]" /* BranchEnd */) {
-                scope[data2] = visit;
-                const curParent = visit.parentNode;
-                const startNode = branchEnd(
-                  currentBranchId,
-                  visit
-                ).___startNode;
-                if (curParent !== startNode.parentNode) {
-                  curParent.prepend(startNode);
-                }
-                currentBranchId = branchStack.pop();
-              } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-                let next = data2.indexOf(" ");
-                let curNode = visit;
-                scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
-                while (~next) {
-                  const start = next + 1;
-                  next = data2.indexOf(" ", start);
-                  const childScopeId = +data2.slice(
-                    start,
-                    ~next ? next : data2.length
-                  );
-                  curNode = branchEnd(childScopeId, curNode).___endNode;
-                  parentBranchIds.set(childScopeId, scopeId);
+                } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
+                  let next = data2.indexOf(" ");
+                  let curNode = visit;
+                  scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
+                  while (~next) {
+                    const start = next + 1;
+                    next = data2.indexOf(" ", start);
+                    const childScopeId = +data2.slice(
+                      start,
+                      ~next ? next : data2.length
+                    );
+                    curNode = branchEnd(childScopeId, curNode).___endNode;
+                    parentBranchIds.set(childScopeId, scopeId);
+                  }
                 }
               }
             }
@@ -378,19 +384,21 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                         prevScope
                       );
                     }
-                    const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
-                    if (parentBranchId) {
-                      scope.___closestBranch = scopeLookup[parentBranchId];
-                    }
-                    if (branchIds.has(scopeId)) {
-                      const branch = scope;
-                      const parentBranch = branch.___closestBranch;
-                      scope.___closestBranch = branch;
-                      if (parentBranch) {
-                        branch.___parentBranch = parentBranch;
-                        (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(
-                          branch
-                        );
+                    if (branchesEnabled) {
+                      const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
+                      if (parentBranchId) {
+                        scope.___closestBranch = scopeLookup[parentBranchId];
+                      }
+                      if (branchIds.has(scopeId)) {
+                        const branch = scope;
+                        const parentBranch = branch.___closestBranch;
+                        scope.___closestBranch = branch;
+                        if (parentBranch) {
+                          branch.___parentBranch = parentBranch;
+                          (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(
+                            branch
+                          );
+                        }
                       }
                     }
                     if (true) {
@@ -1767,6 +1775,7 @@ function renderCatch(scope, error) {
 }
 function conditional(nodeAccessor, ...branches) {
   const branchAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor;
+  enableBranches();
   return (scope, newBranch) => {
     if (newBranch !== scope[branchAccessor]) {
       setConditionalRenderer(
@@ -1784,6 +1793,7 @@ function patchDynamicTag(fn) {
 var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, inputIsArgs) {
   const childScopeAccessor = "ConditionalScope:" /* ConditionalScope */ + nodeAccessor;
   const rendererAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor;
+  enableBranches();
   return (scope, newRenderer, getInput) => {
     const normalizedRenderer = normalizeDynamicRenderer(newRenderer);
     if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.___id || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) {
@@ -1903,6 +1913,7 @@ function loopTo(nodeAccessor, renderer) {
 }
 function loop(nodeAccessor, renderer, forEach) {
   const params = renderer.___params;
+  enableBranches();
   return (scope, value2) => {
     const referenceNode = scope[nodeAccessor];
     const oldMap = scope["LoopScopeMap:" /* LoopScopeMap */ + nodeAccessor];
@@ -2069,6 +2080,7 @@ var runRender = (render) => render.___signal(render.___scope, render.___value);
 var enableCatch = () => {
   enableCatch = () => {
   };
+  enableBranches();
   const handlePendingTry = (fn, scope, branch) => {
     while (branch) {
       if (branch.___pendingAsyncCount) {

package/dist/debug/dom.mjs

@@ -154,6 +154,10 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {};
+var branchesEnabled;
+function enableBranches() {
+  branchesEnabled = 1;
+}
 function init(runtimeId = DEFAULT_RUNTIME_ID) {
   if (true) {
     if (!runtimeId.match(/^[_$a-z][_$a-z0-9]*$/i)) {
@@ -220,41 +224,43 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
               if (token === "*" /* Node */) {
                 const node = scope[data2] = visit.previousSibling;
                 scope["Getter:" /* Getter */ + data2] = () => node;
-              } else if (token === "[" /* BranchStart */) {
-                if (currentBranchId && dataIndex) {
-                  branchEnd(currentBranchId, visit);
+              } else if (branchesEnabled) {
+                if (token === "[" /* BranchStart */) {
+                  if (currentBranchId && dataIndex) {
+                    branchEnd(currentBranchId, visit);
+                    currentBranchId = branchStack.pop();
+                  }
+                  if (currentBranchId) {
+                    branchStack.push(currentBranchId);
+                    parentBranchIds.set(scopeId, currentBranchId);
+                  }
+                  currentBranchId = scopeId;
+                  scope.___startNode = visit;
+                } else if (token === "]" /* BranchEnd */) {
+                  scope[data2] = visit;
+                  const curParent = visit.parentNode;
+                  const startNode = branchEnd(
+                    currentBranchId,
+                    visit
+                  ).___startNode;
+                  if (curParent !== startNode.parentNode) {
+                    curParent.prepend(startNode);
+                  }
                   currentBranchId = branchStack.pop();
-                }
-                if (currentBranchId) {
-                  branchStack.push(currentBranchId);
-                  parentBranchIds.set(scopeId, currentBranchId);
-                }
-                currentBranchId = scopeId;
-                scope.___startNode = visit;
-              } else if (token === "]" /* BranchEnd */) {
-                scope[data2] = visit;
-                const curParent = visit.parentNode;
-                const startNode = branchEnd(
-                  currentBranchId,
-                  visit
-                ).___startNode;
-                if (curParent !== startNode.parentNode) {
-                  curParent.prepend(startNode);
-                }
-                currentBranchId = branchStack.pop();
-              } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-                let next = data2.indexOf(" ");
-                let curNode = visit;
-                scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
-                while (~next) {
-                  const start = next + 1;
-                  next = data2.indexOf(" ", start);
-                  const childScopeId = +data2.slice(
-                    start,
-                    ~next ? next : data2.length
-                  );
-                  curNode = branchEnd(childScopeId, curNode).___endNode;
-                  parentBranchIds.set(childScopeId, scopeId);
+                } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
+                  let next = data2.indexOf(" ");
+                  let curNode = visit;
+                  scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
+                  while (~next) {
+                    const start = next + 1;
+                    next = data2.indexOf(" ", start);
+                    const childScopeId = +data2.slice(
+                      start,
+                      ~next ? next : data2.length
+                    );
+                    curNode = branchEnd(childScopeId, curNode).___endNode;
+                    parentBranchIds.set(childScopeId, scopeId);
+                  }
                 }
               }
             }
@@ -286,19 +292,21 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                         prevScope
                       );
                     }
-                    const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
-                    if (parentBranchId) {
-                      scope.___closestBranch = scopeLookup[parentBranchId];
-                    }
-                    if (branchIds.has(scopeId)) {
-                      const branch = scope;
-                      const parentBranch = branch.___closestBranch;
-                      scope.___closestBranch = branch;
-                      if (parentBranch) {
-                        branch.___parentBranch = parentBranch;
-                        (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(
-                          branch
-                        );
+                    if (branchesEnabled) {
+                      const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
+                      if (parentBranchId) {
+                        scope.___closestBranch = scopeLookup[parentBranchId];
+                      }
+                      if (branchIds.has(scopeId)) {
+                        const branch = scope;
+                        const parentBranch = branch.___closestBranch;
+                        scope.___closestBranch = branch;
+                        if (parentBranch) {
+                          branch.___parentBranch = parentBranch;
+                          (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(
+                            branch
+                          );
+                        }
                       }
                     }
                     if (true) {
@@ -1675,6 +1683,7 @@ function renderCatch(scope, error) {
 }
 function conditional(nodeAccessor, ...branches) {
   const branchAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor;
+  enableBranches();
   return (scope, newBranch) => {
     if (newBranch !== scope[branchAccessor]) {
       setConditionalRenderer(
@@ -1692,6 +1701,7 @@ function patchDynamicTag(fn) {
 var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, inputIsArgs) {
   const childScopeAccessor = "ConditionalScope:" /* ConditionalScope */ + nodeAccessor;
   const rendererAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor;
+  enableBranches();
   return (scope, newRenderer, getInput) => {
     const normalizedRenderer = normalizeDynamicRenderer(newRenderer);
     if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.___id || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) {
@@ -1811,6 +1821,7 @@ function loopTo(nodeAccessor, renderer) {
 }
 function loop(nodeAccessor, renderer, forEach) {
   const params = renderer.___params;
+  enableBranches();
   return (scope, value2) => {
     const referenceNode = scope[nodeAccessor];
     const oldMap = scope["LoopScopeMap:" /* LoopScopeMap */ + nodeAccessor];
@@ -1977,6 +1988,7 @@ var runRender = (render) => render.___signal(render.___scope, render.___value);
 var enableCatch = () => {
   enableCatch = () => {
   };
+  enableBranches();
   const handlePendingTry = (fn, scope, branch) => {
     while (branch) {
       if (branch.___pendingAsyncCount) {

package/dist/debug/html.js

@@ -1790,7 +1790,7 @@ var branchIdKey = Symbol();
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   if (resumeBranch) {
@@ -1818,16 +1818,18 @@ function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serialize
   } else {
     forOf(list, cb);
   }
-  if (resumeMarker) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark(
-        "]" /* BranchEnd */,
-        scopeId + " " + accessor
-      )
-    );
-  }
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
 }
-function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   let branchIds = "";
@@ -1851,16 +1853,18 @@ function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch,
   } else {
     forOf(list, cb);
   }
-  if (resumeMarker) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark(
-        onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-        scopeId + " " + accessor + branchIds
-      )
-    );
-  }
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
 }
-function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   if (resumeBranch) {
@@ -1887,16 +1891,18 @@ function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeM
   } else {
     forIn(obj, cb);
   }
-  if (resumeMarker) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark(
-        "]" /* BranchEnd */,
-        scopeId + " " + accessor
-      )
-    );
-  }
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
 }
-function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   let branchIds = "";
@@ -1920,16 +1926,18 @@ function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch,
   } else {
     forIn(obj, cb);
   }
-  if (resumeMarker) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark(
-        onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-        scopeId + " " + accessor + branchIds
-      )
-    );
-  }
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
 }
-function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker) {
+function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   if (resumeBranch) {
@@ -1956,16 +1964,18 @@ function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch,
   } else {
     forTo(to, from, step, cb);
   }
-  if (resumeMarker) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark(
-        "]" /* BranchEnd */,
-        scopeId + " " + accessor
-      )
-    );
-  }
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
 }
-function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   let branchIds = "";
@@ -1989,16 +1999,18 @@ function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serial
   } else {
     forTo(to, from, step, cb);
   }
-  if (resumeMarker) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark(
-        onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-        scopeId + " " + accessor + branchIds
-      )
-    );
-  }
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + branchIds
+    )
+  );
 }
-function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker) {
+function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   const branchId = peekNextScopeId();
@@ -2015,16 +2027,18 @@ function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMark
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
   }
-  if (resumeMarker) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark(
-        "]" /* BranchEnd */,
-        scopeId + " " + accessor
-      )
-    );
-  }
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      "]" /* BranchEnd */,
+      scopeId + " " + accessor
+    )
+  );
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, onlyChildInParent) {
+function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   const branchId = peekNextScopeId();
@@ -2036,13 +2050,27 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, ser
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
   }
+  writeBranchEnd(
+    scopeId,
+    accessor,
+    resumeMarker,
+    parentEndTag,
+    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+      parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
+      scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
+    )
+  );
+}
+function writeBranchEnd(scopeId, accessor, resumeMarker, parentEndTag, mark) {
+  const endTag = parentEndTag || "";
   if (resumeMarker) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark(
-        onlyChildInParent ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-        scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
-      )
-    );
+    if (mark) {
+      $chunk.writeHTML(mark + endTag);
+    } else {
+      $chunk.writeHTML(endTag + markResumeNode(scopeId, accessor));
+    }
+  } else {
+    $chunk.writeHTML(endTag);
   }
 }
 var writeScope = (scopeId, partialScope) => {