marko 6.0.9 → 6.0.11

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) => {

package/dist/debug/html.mjs

@@ -1705,7 +1705,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) {
@@ -1733,16 +1733,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 = "";
@@ -1766,16 +1768,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) {
@@ -1802,16 +1806,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 = "";
@@ -1835,16 +1841,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) {
@@ -1871,16 +1879,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 = "";
@@ -1904,16 +1914,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();
@@ -1930,16 +1942,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();
@@ -1951,13 +1965,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) => {

package/dist/dom/resume.d.ts

@@ -1,6 +1,5 @@
 import { type Scope } from "../common/types";
 import type { Signal } from "./signals";
-export declare let branchesEnabled: undefined | 1;
 export declare function enableBranches(): void;
 export declare function init(runtimeId?: string): void;
 export declare let isResuming: undefined | 0 | 1;