marko 6.0.13 → 6.0.15

package/dist/debug/dom.js

@@ -1338,7 +1338,7 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
   setup ||= void 0;
   params ||= void 0;
-  closures ||= void 0;
+  closures = closures ? closures._ || closures : void 0;
   const clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -1507,7 +1507,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
   const loopScopeAccessor = "LoopScopeArray:" /* LoopScopeArray */ + ownerLoopNodeAccessor;
   const loopScopeMapAccessor = "LoopScopeMap:" /* LoopScopeMap */ + ownerLoopNodeAccessor;
   const ownerSignal = (ownerScope) => {
-    const scopes = ownerScope[loopScopeAccessor] || ownerScope[loopScopeMapAccessor]?.values() || [];
+    const scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [];
     const [firstScope] = scopes;
     if (firstScope) {
       queueRender(

package/dist/debug/dom.mjs

@@ -1246,7 +1246,7 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
   walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
   setup ||= void 0;
   params ||= void 0;
-  closures ||= void 0;
+  closures = closures ? closures._ || closures : void 0;
   const clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -1415,7 +1415,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
   const loopScopeAccessor = "LoopScopeArray:" /* LoopScopeArray */ + ownerLoopNodeAccessor;
   const loopScopeMapAccessor = "LoopScopeMap:" /* LoopScopeMap */ + ownerLoopNodeAccessor;
   const ownerSignal = (ownerScope) => {
-    const scopes = ownerScope[loopScopeAccessor] || ownerScope[loopScopeMapAccessor]?.values() || [];
+    const scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [];
     const [firstScope] = scopes;
     if (firstScope) {
       queueRender(

package/dist/debug/html.js

@@ -64,10 +64,6 @@ __export(html_exports, {
   resumeForIn: () => resumeForIn,
   resumeForOf: () => resumeForOf,
   resumeForTo: () => resumeForTo,
-  resumeSingleNodeConditional: () => resumeSingleNodeConditional,
-  resumeSingleNodeForIn: () => resumeSingleNodeForIn,
-  resumeSingleNodeForOf: () => resumeSingleNodeForOf,
-  resumeSingleNodeForTo: () => resumeSingleNodeForTo,
   serializeGuard: () => serializeGuard,
   serializeIf: () => serializeIf,
   setTagVar: () => setTagVar,
@@ -1790,55 +1786,23 @@ var branchIdKey = Symbol();
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  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);
-  }
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
+function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
-  let branchIds = "";
+  let singleNodeBranchIds = "";
   if (resumeBranch) {
     const loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
       const branchId = peekNextScopeId();
       if (resumeMarker) {
-        branchIds = " " + branchId + branchIds;
+        if (singleNode) {
+          singleNodeBranchIds = " " + branchId + singleNodeBranchIds;
+        } else {
+          $chunk.writeHTML(
+            state.mark("[" /* BranchStart */, branchId + (index ? " " : ""))
+          );
+        }
       }
       withBranchId(branchId, () => {
         cb(item, index);
@@ -1858,60 +1822,31 @@ function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch,
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
+  let singleNodeBranchIds = "";
   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);
-  }
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  const resumeBranch = serializeBranch !== 0;
-  const resumeMarker = serializeMarker !== 0;
-  let branchIds = "";
-  if (resumeBranch) {
-    const loopScopes = /* @__PURE__ */ new Map();
-    forIn(obj, (key, value) => {
-      const branchId = peekNextScopeId();
-      if (resumeMarker) {
-        branchIds = " " + branchId + branchIds;
+        if (singleNode) {
+          singleNodeBranchIds = " " + branchId + singleNodeBranchIds;
+        } else {
+          $chunk.writeHTML(
+            state.mark("[" /* BranchStart */, branchId + sep)
+          );
+          sep = " ";
+        }
       }
       withBranchId(branchId, () => {
         cb(key, value);
@@ -1931,60 +1866,31 @@ function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch,
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
+function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
+  let singleNodeBranchIds = "";
   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);
-  }
-  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, parentEndTag) {
-  const resumeBranch = serializeBranch !== 0;
-  const resumeMarker = serializeMarker !== 0;
-  let branchIds = "";
-  if (resumeBranch) {
-    const loopScopes = /* @__PURE__ */ new Map();
-    forTo(to, from, step, (i) => {
-      const branchId = peekNextScopeId();
-      if (resumeMarker) {
-        branchIds = " " + branchId + branchIds;
+        if (singleNode) {
+          singleNodeBranchIds = " " + branchId + singleNodeBranchIds;
+        } else {
+          $chunk.writeHTML(
+            state.mark("[" /* BranchStart */, branchId + sep)
+          );
+          sep = " ";
+        }
       }
       withBranchId(branchId, () => {
         cb(i);
@@ -2004,45 +1910,21 @@ function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serial
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
+function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   const branchId = peekNextScopeId();
-  if (resumeMarker && resumeBranch) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-    );
+  if (resumeMarker && resumeBranch && !singleNode) {
+    $chunk.writeHTML(state.mark("[" /* BranchStart */, branchId + ""));
   }
   const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
-  const rendered = branchIndex !== void 0;
-  if (resumeBranch && rendered) {
-    writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
-      ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
-    });
-  }
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  const resumeBranch = serializeBranch !== 0;
-  const resumeMarker = serializeMarker !== 0;
-  const branchId = peekNextScopeId();
-  const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
   const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   if (shouldWriteBranch) {
     writeScope(scopeId, {
@@ -2055,10 +1937,10 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, ser
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
-    )
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
 function writeBranchEnd(scopeId, accessor, resumeMarker, parentEndTag, mark) {
@@ -3442,10 +3324,6 @@ var compat = {
   resumeForIn,
   resumeForOf,
   resumeForTo,
-  resumeSingleNodeConditional,
-  resumeSingleNodeForIn,
-  resumeSingleNodeForOf,
-  resumeSingleNodeForTo,
   serializeGuard,
   serializeIf,
   setTagVar,

package/dist/debug/html.mjs

@@ -1705,55 +1705,23 @@ var branchIdKey = Symbol();
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  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);
-  }
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
+function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
-  let branchIds = "";
+  let singleNodeBranchIds = "";
   if (resumeBranch) {
     const loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
       const branchId = peekNextScopeId();
       if (resumeMarker) {
-        branchIds = " " + branchId + branchIds;
+        if (singleNode) {
+          singleNodeBranchIds = " " + branchId + singleNodeBranchIds;
+        } else {
+          $chunk.writeHTML(
+            state.mark("[" /* BranchStart */, branchId + (index ? " " : ""))
+          );
+        }
       }
       withBranchId(branchId, () => {
         cb(item, index);
@@ -1773,60 +1741,31 @@ function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch,
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
+  let singleNodeBranchIds = "";
   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);
-  }
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  const resumeBranch = serializeBranch !== 0;
-  const resumeMarker = serializeMarker !== 0;
-  let branchIds = "";
-  if (resumeBranch) {
-    const loopScopes = /* @__PURE__ */ new Map();
-    forIn(obj, (key, value) => {
-      const branchId = peekNextScopeId();
-      if (resumeMarker) {
-        branchIds = " " + branchId + branchIds;
+        if (singleNode) {
+          singleNodeBranchIds = " " + branchId + singleNodeBranchIds;
+        } else {
+          $chunk.writeHTML(
+            state.mark("[" /* BranchStart */, branchId + sep)
+          );
+          sep = " ";
+        }
       }
       withBranchId(branchId, () => {
         cb(key, value);
@@ -1846,60 +1785,31 @@ function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch,
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
+function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
+  let singleNodeBranchIds = "";
   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);
-  }
-  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, parentEndTag) {
-  const resumeBranch = serializeBranch !== 0;
-  const resumeMarker = serializeMarker !== 0;
-  let branchIds = "";
-  if (resumeBranch) {
-    const loopScopes = /* @__PURE__ */ new Map();
-    forTo(to, from, step, (i) => {
-      const branchId = peekNextScopeId();
-      if (resumeMarker) {
-        branchIds = " " + branchId + branchIds;
+        if (singleNode) {
+          singleNodeBranchIds = " " + branchId + singleNodeBranchIds;
+        } else {
+          $chunk.writeHTML(
+            state.mark("[" /* BranchStart */, branchId + sep)
+          );
+          sep = " ";
+        }
       }
       withBranchId(branchId, () => {
         cb(i);
@@ -1919,45 +1829,21 @@ function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serial
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
+function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
   const resumeMarker = serializeMarker !== 0;
   const branchId = peekNextScopeId();
-  if (resumeMarker && resumeBranch) {
-    $chunk.writeHTML(
-      $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-    );
+  if (resumeMarker && resumeBranch && !singleNode) {
+    $chunk.writeHTML(state.mark("[" /* BranchStart */, branchId + ""));
   }
   const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
-  const rendered = branchIndex !== void 0;
-  if (resumeBranch && rendered) {
-    writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
-      ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
-    });
-  }
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  const resumeBranch = serializeBranch !== 0;
-  const resumeMarker = serializeMarker !== 0;
-  const branchId = peekNextScopeId();
-  const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
   const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   if (shouldWriteBranch) {
     writeScope(scopeId, {
@@ -1970,10 +1856,10 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, ser
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
-    )
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
 function writeBranchEnd(scopeId, accessor, resumeMarker, parentEndTag, mark) {
@@ -3356,10 +3242,6 @@ export {
   resumeForIn,
   resumeForOf,
   resumeForTo,
-  resumeSingleNodeConditional,
-  resumeSingleNodeForIn,
-  resumeSingleNodeForOf,
-  resumeSingleNodeForTo,
   serializeGuard,
   serializeIf,
   setTagVar,

package/dist/dom/renderer.d.ts

@@ -13,7 +13,13 @@ type SetupFn = (scope: Scope) => void;
 export declare function createBranch($global: Scope["$global"], renderer: Renderer | string, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function createAndSetupBranch($global: Scope["$global"], renderer: Renderer, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function setupBranch(renderer: Renderer, branch: BranchScope): BranchScope;
-export declare function createContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
-export declare function registerContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
-export declare function createRenderer(template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: Signal<unknown> | 0): Renderer;
+export declare function createContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: {
+    _: Signal<unknown>;
+} | Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
+export declare function registerContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: {
+    _: Signal<unknown>;
+} | Signal<unknown> | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
+export declare function createRenderer(template: string | 0, walks?: string | 0, setup?: SetupFn | 0, params?: Signal<unknown> | 0, closures?: {
+    _: Signal<unknown>;
+} | Signal<unknown> | 0): Renderer;
 export {};

package/dist/dom.js

@@ -884,7 +884,7 @@ function setupBranch(renderer, branch) {
   ), branch;
 }
 function createContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
-  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup ||= void 0, params ||= void 0, closures ||= void 0;
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup ||= void 0, params ||= void 0, closures = closures ? closures._ || closures : void 0;
   let clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -980,7 +980,7 @@ function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
   let childSignal = closure(valueAccessor, fn), loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
-    let scopes = ownerScope[loopScopeAccessor] || ownerScope[loopScopeMapAccessor]?.values() || [], [firstScope] = scopes;
+    let scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [], [firstScope] = scopes;
     firstScope && queueRender(
       ownerScope,
       () => {

package/dist/dom.mjs

@@ -795,7 +795,7 @@ function setupBranch(renderer, branch) {
   ), branch;
 }
 function createContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
-  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup ||= void 0, params ||= void 0, closures ||= void 0;
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "", setup ||= void 0, params ||= void 0, closures = closures ? closures._ || closures : void 0;
   let clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -891,7 +891,7 @@ function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
   let childSignal = closure(valueAccessor, fn), loopScopeAccessor = "l" /* LoopScopeArray */ + ownerLoopNodeAccessor, loopScopeMapAccessor = "m" /* LoopScopeMap */ + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
-    let scopes = ownerScope[loopScopeAccessor] || ownerScope[loopScopeMapAccessor]?.values() || [], [firstScope] = scopes;
+    let scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [], [firstScope] = scopes;
     firstScope && queueRender(
       ownerScope,
       () => {

package/dist/html/writer.d.ts

@@ -35,14 +35,10 @@ export declare function hoist(scopeId: number, id?: string): {
 };
 export declare function resumeClosestBranch(scopeId: number): void;
 export declare function withBranchId<T>(branchId: number, cb: () => T): T;
-export declare function resumeForOf(list: Falsy | Iterable<unknown>, cb: (item: unknown, index: number) => void, by: Falsy | ((item: unknown, index: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string): void;
-export declare function resumeSingleNodeForOf(list: Falsy | Iterable<unknown>, cb: (item: unknown, index: number) => void, by: Falsy | ((item: unknown, index: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string): void;
-export declare function resumeForIn(obj: Falsy | {}, cb: (key: string, value: unknown) => void, by: Falsy | ((key: string, v: unknown) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string): void;
-export declare function resumeSingleNodeForIn(obj: Falsy | {}, cb: (key: string, value: unknown) => void, by: Falsy | ((key: string, v: unknown) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string): void;
-export declare function resumeForTo(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string): void;
-export declare function resumeSingleNodeForTo(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string): void;
-export declare function resumeConditional(cb: () => void | number, scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string): void;
-export declare function resumeSingleNodeConditional(cb: () => void | number, scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string): void;
+export declare function resumeForOf(list: Falsy | Iterable<unknown>, cb: (item: unknown, index: number) => void, by: Falsy | ((item: unknown, index: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string | 0, singleNode?: 1): void;
+export declare function resumeForIn(obj: Falsy | {}, cb: (key: string, value: unknown) => void, by: Falsy | ((key: string, v: unknown) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string | 0, singleNode?: 1): void;
+export declare function resumeForTo(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, by: Falsy | ((v: number) => unknown), scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string | 0, singleNode?: 1): void;
+export declare function resumeConditional(cb: () => void | number, scopeId: number, accessor: Accessor, serializeBranch?: 0 | 1, serializeMarker?: 0 | 1, parentEndTag?: string | 0, singleNode?: 1): void;
 declare let writeScope: (scopeId: number, partialScope: PartialScope) => ScopeInternals;
 export { writeScope };
 export declare function writeExistingScope(scopeId: number): ScopeInternals;

package/dist/html.d.ts

@@ -5,4 +5,4 @@ export { escapeScript, escapeStyle, escapeXML, toString } from "./html/content";
 export { createContent, dynamicTag, registerContent } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forTo, forToBy } from "./html/for";
 export { createTemplate } from "./html/template";
-export { $global, commentSeparator, ensureScopeWithId, fork, getScopeById, hoist, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScopeId, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, resumeSingleNodeConditional, resumeSingleNodeForIn, resumeSingleNodeForOf, resumeSingleNodeForTo, serializeGuard, serializeIf, setTagVar, tryContent, write, writeEffect, writeExistingScope, writeScope, writeSubscribe, writeTrailers, } from "./html/writer";
+export { $global, commentSeparator, ensureScopeWithId, fork, getScopeById, hoist, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScopeId, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, serializeGuard, serializeIf, setTagVar, tryContent, write, writeEffect, writeExistingScope, writeScope, writeSubscribe, writeTrailers, } from "./html/writer";

package/dist/html.js

@@ -61,10 +61,6 @@ __export(html_exports, {
   resumeForIn: () => resumeForIn,
   resumeForOf: () => resumeForOf,
   resumeForTo: () => resumeForTo,
-  resumeSingleNodeConditional: () => resumeSingleNodeConditional,
-  resumeSingleNodeForIn: () => resumeSingleNodeForIn,
-  resumeSingleNodeForOf: () => resumeSingleNodeForOf,
-  resumeSingleNodeForTo: () => resumeSingleNodeForTo,
   serializeGuard: () => serializeGuard,
   serializeIf: () => serializeIf,
   setTagVar: () => setTagVar,
@@ -1172,43 +1168,15 @@ var branchIdKey = Symbol();
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
+function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
   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
-    });
-  } else
-    forOf(list, cb);
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  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, () => {
+      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : $chunk.writeHTML(
+        state.mark("[" /* BranchStart */, branchId + (index ? " " : ""))
+      )), withBranchId(branchId, () => {
         cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1221,21 +1189,21 @@ function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch,
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
   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, () => {
+      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, branchId + sep)
+      ), sep = " ")), withBranchId(branchId, () => {
         cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1248,46 +1216,21 @@ function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeM
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  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
-    });
-  } else
-    forIn(obj, cb);
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
+function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
   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, () => {
+      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, branchId + sep)
+      ), sep = " ")), withBranchId(branchId, () => {
         cb(i), loopScopes.set(forToBy(by, i), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1300,59 +1243,16 @@ function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch,
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  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
-    });
-  } else
-    forTo(to, from, step, cb);
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
-  );
-}
-function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId();
-  resumeMarker && resumeBranch && $chunk.writeHTML(
-    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  );
-  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, {})
-  }), writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId(), branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
+function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId();
+  resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, branchId + ""));
+  let 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, {})
@@ -1361,10 +1261,10 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, ser
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
-    )
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
 function writeBranchEnd(scopeId, accessor, resumeMarker, parentEndTag, mark) {
@@ -2267,10 +2167,6 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   resumeForIn,
   resumeForOf,
   resumeForTo,
-  resumeSingleNodeConditional,
-  resumeSingleNodeForIn,
-  resumeSingleNodeForOf,
-  resumeSingleNodeForTo,
   serializeGuard,
   serializeIf,
   setTagVar,

package/dist/html.mjs

@@ -1090,43 +1090,15 @@ var branchIdKey = Symbol();
 function withBranchId(branchId, cb) {
   return withContext(branchIdKey, branchId, cb);
 }
-function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
+function resumeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
   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
-    });
-  } else
-    forOf(list, cb);
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  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, () => {
+      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : $chunk.writeHTML(
+        state.mark("[" /* BranchStart */, branchId + (index ? " " : ""))
+      )), withBranchId(branchId, () => {
         cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1139,21 +1111,21 @@ function resumeSingleNodeForOf(list, cb, by, scopeId, accessor, serializeBranch,
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
+function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
   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, () => {
+      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, branchId + sep)
+      ), sep = " ")), withBranchId(branchId, () => {
         cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1166,46 +1138,21 @@ function resumeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeM
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForIn(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  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
-    });
-  } else
-    forIn(obj, cb);
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0;
+function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, singleNodeBranchIds = "";
   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, () => {
+      resumeMarker && (singleNode ? singleNodeBranchIds = " " + branchId + singleNodeBranchIds : ($chunk.writeHTML(
+        state.mark("[" /* BranchStart */, branchId + sep)
+      ), sep = " ")), withBranchId(branchId, () => {
         cb(i), loopScopes.set(forToBy(by, i), writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
@@ -1218,59 +1165,16 @@ function resumeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch,
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
-  );
-}
-function resumeSingleNodeForTo(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  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
-    });
-  } else
-    forTo(to, from, step, cb);
-  writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
-      scopeId + " " + accessor + branchIds
-    )
-  );
-}
-function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId();
-  resumeMarker && resumeBranch && $chunk.writeHTML(
-    $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-  );
-  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, {})
-  }), writeBranchEnd(
-    scopeId,
-    accessor,
-    resumeMarker,
-    parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
-      "]" /* BranchEnd */,
-      scopeId + " " + accessor
-    )
+      scopeId + " " + accessor + singleNodeBranchIds
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
-function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag) {
-  let resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId(), branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
+function resumeConditional(cb, scopeId, accessor, serializeBranch, serializeMarker, parentEndTag, singleNode) {
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = peekNextScopeId();
+  resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, branchId + ""));
+  let 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, {})
@@ -1279,10 +1183,10 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, serializeBranch, ser
     accessor,
     resumeMarker,
     parentEndTag,
-    resumeMarker && (!parentEndTag || resumeBranch) && $chunk.boundary.state.mark(
+    resumeMarker && (!parentEndTag || resumeBranch) && (singleNode ? state.mark(
       parentEndTag ? "=" /* BranchSingleNodeOnlyChildInParent */ : "|" /* BranchSingleNode */,
       scopeId + " " + accessor + (shouldWriteBranch ? " " + branchId : "")
-    )
+    ) : state.mark("]" /* BranchEnd */, scopeId + " " + accessor))
   );
 }
 function writeBranchEnd(scopeId, accessor, resumeMarker, parentEndTag, mark) {
@@ -2184,10 +2088,6 @@ export {
   resumeForIn,
   resumeForOf,
   resumeForTo,
-  resumeSingleNodeConditional,
-  resumeSingleNodeForIn,
-  resumeSingleNodeForOf,
-  resumeSingleNodeForTo,
   serializeGuard,
   serializeIf,
   setTagVar,

package/dist/translator/index.js

@@ -2008,7 +2008,7 @@ function getOrCreateSection(path5) {
   let cur = path5;
   while (true) {
     if (cur.type === "Program" || cur.type === "MarkoTagBody" && !cur.node.attributeTags && !isNativeNode(cur.parentPath)) {
-      return startSection(cur);
+      return (path5.node.extra ??= {}).section = startSection(cur);
     }
     cur = cur.parentPath;
   }
@@ -4040,7 +4040,7 @@ var dom_default = {
           const tagParamsSignal = childSection.params && initValue(childSection.params);
           const { walks: walks2, writes: writes2, setup: setup2 } = getSectionMeta(childSection);
           const identifier = import_compiler21.types.identifier(childSection.name);
-          const referencedClosures = childSection.referencedClosures ? import_compiler21.types.arrowFunctionExpression(
+          const referencedClosures = childSection.referencedClosures ? Array.isArray(childSection.referencedClosures) ? import_compiler21.types.arrowFunctionExpression(
             [scopeIdentifier],
             toFirstExpressionOrBlock(
               toArray(childSection.referencedClosures, (closure) => {
@@ -4056,7 +4056,7 @@ var dom_default = {
                 );
               })
             )
-          ) : void 0;
+          ) : getSignal(childSection, childSection.referencedClosures).identifier : void 0;
           const renderer = getSectionParentIsOwner(childSection) ? callRuntime(
             "createRenderer",
             ...replaceNullishAndEmptyFunctionsWith0([
@@ -6708,7 +6708,7 @@ var for_default = {
         flushInto(tag);
         writeHTMLResumeStatements(tagBody);
         const forTagArgs = getBaseArgsInForTag(forType, forAttrs);
-        const forTagHTMLRuntime = branchSerializeReason ? forTypeToHTMLResumeRuntime(forType, singleNodeOptimization) : forTypeToRuntime(forType);
+        const forTagHTMLRuntime = branchSerializeReason ? forTypeToHTMLResumeRuntime(forType) : forTypeToRuntime(forType);
         forTagArgs.push(
           import_compiler33.types.arrowFunctionExpression(params, import_compiler33.types.blockStatement(bodyStatements))
         );
@@ -6716,7 +6716,7 @@ var for_default = {
           const skipParentEnd = onlyChildParentTagName && markerSerializeReason;
           const markerSerializeArg = getSerializeGuard(
             markerSerializeReason,
-            !skipParentEnd
+            !(skipParentEnd || singleNodeOptimization)
           );
           forTagArgs.push(
             forAttrs.by || import_compiler33.types.numericLiteral(0),
@@ -6729,6 +6729,12 @@ var for_default = {
             getParentTag(tag).node.extra[kSkipEndTag] = true;
             forTagArgs.push(import_compiler33.types.stringLiteral(`</${onlyChildParentTagName}>`));
           }
+          if (singleNodeOptimization) {
+            if (!skipParentEnd) {
+              forTagArgs.push(import_compiler33.types.numericLiteral(0));
+            }
+            forTagArgs.push(import_compiler33.types.numericLiteral(1));
+          }
         }
         statements.push(
           import_compiler33.types.expressionStatement(callRuntime(forTagHTMLRuntime, ...forTagArgs))
@@ -6884,25 +6890,14 @@ function forTypeToRuntime(type) {
       return "forTo";
   }
 }
-function forTypeToHTMLResumeRuntime(type, singleNodeOptimization) {
-  if (singleNodeOptimization) {
-    switch (type) {
-      case "of":
-        return "resumeSingleNodeForOf";
-      case "in":
-        return "resumeSingleNodeForIn";
-      case "to":
-        return "resumeSingleNodeForTo";
-    }
-  } else {
-    switch (type) {
-      case "of":
-        return "resumeForOf";
-      case "in":
-        return "resumeForIn";
-      case "to":
-        return "resumeForTo";
-    }
+function forTypeToHTMLResumeRuntime(type) {
+  switch (type) {
+    case "of":
+      return "resumeForOf";
+    case "in":
+      return "resumeForIn";
+    case "to":
+      return "resumeForTo";
   }
 }
 function forTypeToDOMRuntime(type) {
@@ -8601,7 +8596,7 @@ var IfTag = {
             }
             const markerSerializeArg = getSerializeGuard(
               markerSerializeReason,
-              !skipParentEnd
+              !(skipParentEnd || singleNodeOptimization)
             );
             const cbNode = import_compiler42.types.arrowFunctionExpression(
               [],
@@ -8609,7 +8604,7 @@ var IfTag = {
             );
             statement = import_compiler42.types.expressionStatement(
               callRuntime(
-                singleNodeOptimization ? "resumeSingleNodeConditional" : "resumeConditional",
+                "resumeConditional",
                 cbNode,
                 getScopeIdIdentifier(ifTagSection),
                 getScopeAccessorLiteral(nodeBinding),
@@ -8618,7 +8613,8 @@ var IfTag = {
                   !markerSerializeArg
                 ),
                 markerSerializeArg,
-                skipParentEnd && import_compiler42.types.stringLiteral(`</${onlyChildParentTagName}>`)
+                skipParentEnd ? import_compiler42.types.stringLiteral(`</${onlyChildParentTagName}>`) : singleNodeOptimization ? import_compiler42.types.numericLiteral(0) : void 0,
+                singleNodeOptimization ? import_compiler42.types.numericLiteral(1) : void 0
               )
             );
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.13",
+  "version": "6.0.15",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",