marko 6.0.126 → 6.0.128

package/dist/debug/dom.js

@@ -881,6 +881,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const render = resumeRender[renderId] = renders2[renderId] || renders2(renderId);
         const walk2 = render.w;
         const scopeLookup = render.s = {};
+        const getScope = (id) => scopeLookup[id] ||= { ["#Id" /* Id */]: +id };
         const serializeContext = {
           _: registeredValues
         };
@@ -900,9 +901,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             }
             while (branchId = +lastToken) {
               (endedBranches ||= []).push(
-                branch = scopeLookup[branchId] ||= {
-                  ["#Id" /* Id */]: branchId
-                }
+                branch = getScope(branchId)
               );
               setParentBranch(branch, branch["#ClosestBranch" /* ClosestBranch */]);
               if (branch["#AwaitCounter" /* AwaitCounter */] = render.p?.[branchId]) {
@@ -975,12 +974,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 if (/\D/.test(lastToken)) {
                   lastEffect = registeredValues[lastToken];
                 } else {
-                  effects.push(
-                    lastEffect,
-                    scopeLookup[lastToken] ||= {
-                      ["#Id" /* Id */]: +lastToken
-                    }
-                  );
+                  effects.push(lastEffect, getScope(lastToken));
                 }
               }
             } else {
@@ -995,7 +989,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                   scopeLookup[scope["#Id" /* Id */] = ++lastScopeId] = scope;
                   scope["$global" /* Global */] = $global;
                   if (branchesEnabled) {
-                    scope["#ClosestBranch" /* ClosestBranch */] = scopeLookup[scope["#ClosestBranchId" /* ClosestBranchId */]];
+                    scope["#ClosestBranch" /* ClosestBranch */] = getScope(
+                      scope["#ClosestBranchId" /* ClosestBranchId */]
+                    );
                   }
                 }
               }
@@ -1005,11 +1001,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             lastTokenIndex = render.i.length;
             visitText = visit.data;
             visitType = visitText[lastTokenIndex++];
-            visitScope = scopeLookup[+nextToken(
+            visitScope = getScope(nextToken(
               /* read scope id */
-            )] ||= {
-              ["#Id" /* Id */]: +lastToken
-            };
+            ));
             if (visitType === "*" /* Node */) {
               visitScope["Getter:" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling);
             } else if (branchesEnabled) {
@@ -2204,6 +2198,7 @@ function loop(forEach) {
           scope,
           parentNode
         );
+        branch["#LoopKey" /* LoopKey */] = key;
         params?.(branch, args);
         newScopesByKey.set(key, branch);
         newScopes.push(branch);

package/dist/debug/dom.mjs

@@ -775,6 +775,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const render = resumeRender[renderId] = renders2[renderId] || renders2(renderId);
         const walk2 = render.w;
         const scopeLookup = render.s = {};
+        const getScope = (id) => scopeLookup[id] ||= { ["#Id" /* Id */]: +id };
         const serializeContext = {
           _: registeredValues
         };
@@ -794,9 +795,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             }
             while (branchId = +lastToken) {
               (endedBranches ||= []).push(
-                branch = scopeLookup[branchId] ||= {
-                  ["#Id" /* Id */]: branchId
-                }
+                branch = getScope(branchId)
               );
               setParentBranch(branch, branch["#ClosestBranch" /* ClosestBranch */]);
               if (branch["#AwaitCounter" /* AwaitCounter */] = render.p?.[branchId]) {
@@ -869,12 +868,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 if (/\D/.test(lastToken)) {
                   lastEffect = registeredValues[lastToken];
                 } else {
-                  effects.push(
-                    lastEffect,
-                    scopeLookup[lastToken] ||= {
-                      ["#Id" /* Id */]: +lastToken
-                    }
-                  );
+                  effects.push(lastEffect, getScope(lastToken));
                 }
               }
             } else {
@@ -889,7 +883,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                   scopeLookup[scope["#Id" /* Id */] = ++lastScopeId] = scope;
                   scope["$global" /* Global */] = $global;
                   if (branchesEnabled) {
-                    scope["#ClosestBranch" /* ClosestBranch */] = scopeLookup[scope["#ClosestBranchId" /* ClosestBranchId */]];
+                    scope["#ClosestBranch" /* ClosestBranch */] = getScope(
+                      scope["#ClosestBranchId" /* ClosestBranchId */]
+                    );
                   }
                 }
               }
@@ -899,11 +895,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             lastTokenIndex = render.i.length;
             visitText = visit.data;
             visitType = visitText[lastTokenIndex++];
-            visitScope = scopeLookup[+nextToken(
+            visitScope = getScope(nextToken(
               /* read scope id */
-            )] ||= {
-              ["#Id" /* Id */]: +lastToken
-            };
+            ));
             if (visitType === "*" /* Node */) {
               visitScope["Getter:" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling);
             } else if (branchesEnabled) {
@@ -2098,6 +2092,7 @@ function loop(forEach) {
           scope,
           parentNode
         );
+        branch["#LoopKey" /* LoopKey */] = key;
         params?.(branch, args);
         newScopesByKey.set(key, branch);
         newScopes.push(branch);

package/dist/debug/html.js

@@ -1773,6 +1773,7 @@ var $chunk;
 var NOOP = () => {
 };
 var K_SCOPE_ID = Symbol("Scope ID");
+var K_SCOPE_REFERENCED = Symbol("Scope Referenced");
 function getChunk() {
   return $chunk;
 }
@@ -1927,7 +1928,8 @@ function withIsAsync(cb, value) {
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeKeys = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   let flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
@@ -1960,12 +1962,12 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
       }
       withBranchId(branchId, () => {
         cb(item, index);
-        if (resumeMarker) {
-          writeScope(branchId, {
-            ["#LoopKey" /* LoopKey */]: item === index ? void 0 : itemKey
-          });
-        } else {
-          loopScopes = push(loopScopes, writeScope(branchId, {}));
+        const branchScope = writeScope(branchId, {});
+        if (resumeKeys && itemKey !== index) {
+          branchScope["#LoopKey" /* LoopKey */] = itemKey;
+        }
+        if (!resumeMarker) {
+          loopScopes = push(loopScopes, referenceScope(branchScope));
         }
       });
     });
@@ -1981,7 +1983,7 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
@@ -1989,7 +1991,8 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
 }
 function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeKeys = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   let flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
@@ -2022,12 +2025,12 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
       }
       withBranchId(branchId, () => {
         cb(key, value);
-        if (resumeMarker) {
-          writeScope(branchId, {
-            ["#LoopKey" /* LoopKey */]: itemKey
-          });
-        } else {
-          loopScopes = push(loopScopes, writeScope(branchId, {}));
+        const branchScope = writeScope(branchId, {});
+        if (resumeKeys) {
+          branchScope["#LoopKey" /* LoopKey */] = itemKey;
+        }
+        if (!resumeMarker) {
+          loopScopes = push(loopScopes, referenceScope(branchScope));
         }
       });
     });
@@ -2043,7 +2046,7 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
@@ -2051,7 +2054,8 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
 }
 function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeKeys = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   let flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
@@ -2084,12 +2088,12 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
       }
       withBranchId(branchId, () => {
         cb(i);
-        if (resumeMarker) {
-          writeScope(branchId, {
-            ["#LoopKey" /* LoopKey */]: itemKey === i ? void 0 : itemKey
-          });
-        } else {
-          loopScopes = push(loopScopes, writeScope(branchId, {}));
+        const branchScope = writeScope(branchId, {});
+        if (resumeKeys && itemKey !== i) {
+          branchScope["#LoopKey" /* LoopKey */] = itemKey;
+        }
+        if (!resumeMarker) {
+          loopScopes = push(loopScopes, referenceScope(branchScope));
         }
       });
     });
@@ -2105,7 +2109,7 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
@@ -2113,7 +2117,8 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
 }
 function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeKeys = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   let flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
@@ -2146,12 +2151,12 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
       }
       withBranchId(branchId, () => {
         cb(i);
-        if (resumeMarker) {
-          writeScope(branchId, {
-            ["#LoopKey" /* LoopKey */]: itemKey === i ? void 0 : itemKey
-          });
-        } else {
-          loopScopes = push(loopScopes, writeScope(branchId, {}));
+        const branchScope = writeScope(branchId, {});
+        if (resumeKeys && itemKey !== i) {
+          branchScope["#LoopKey" /* LoopKey */] = itemKey;
+        }
+        if (!resumeMarker) {
+          loopScopes = push(loopScopes, referenceScope(branchScope));
         }
       });
     });
@@ -2167,7 +2172,7 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
@@ -2176,7 +2181,7 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   const branchId = _peek_scope_id();
   if (resumeMarker && resumeBranch && !singleNode) {
     $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
@@ -2190,22 +2195,22 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
       // It may make sense to pass in another arg for this.
       ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
       // we convert 0 to undefined since the runtime defaults branch to 0.
-      ["BranchScopes:" /* BranchScopes */ + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
+      ["BranchScopes:" /* BranchScopes */ + accessor]: resumeMarker ? void 0 : referenceScope(writeScope(branchId, {}))
     });
   }
   writeBranchEnd(
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     shouldWriteBranch ? " " + branchId : ""
   );
 }
-function writeBranchEnd(scopeId, accessor, serializeStateful, resumeMarker, parentEndTag, singleNode, branchIds) {
+function writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, branchIds) {
   const endTag = parentEndTag || "";
-  if (resumeMarker) {
+  if (serializeMarker !== 0) {
     if (!parentEndTag || serializeStateful !== 0) {
       const { state } = $chunk.boundary;
       const mark = singleNode ? state.mark(
@@ -2223,6 +2228,13 @@ function writeBranchEnd(scopeId, accessor, serializeStateful, resumeMarker, pare
     $chunk.writeHTML(endTag);
   }
 }
+function scopeHasReference(scope) {
+  return !!scope[K_SCOPE_REFERENCED];
+}
+function referenceScope(scope) {
+  scope[K_SCOPE_REFERENCED] = 1;
+  return scope;
+}
 var writeScope = (scopeId, partialScope) => {
   return writeScopeToState($chunk.boundary.state, scopeId, partialScope);
 };
@@ -2263,7 +2275,7 @@ function _scope_with_id(scopeId) {
     scope = { [K_SCOPE_ID]: scopeId };
     state.scopes.set(scopeId, scope);
   }
-  return scope;
+  return referenceScope(scope);
 }
 function $global() {
   return $chunk.boundary.state.$global;
@@ -2755,24 +2767,31 @@ function flushSerializer(boundary) {
   const { writeScopes, serializer } = state;
   const { flushed } = serializer;
   if (writeScopes || flushed) {
+    let shouldSerialize = false;
     const serializeData = [];
     let { lastSerializedScopeId } = state;
     if (!state.hasGlobals) {
       state.hasGlobals = true;
       serializeData.push(getFilteredGlobals(state.$global));
+      shouldSerialize = true;
     }
     for (const key in writeScopes) {
       const scope = writeScopes[key];
-      const scopeId = getScopeId(scope);
-      const scopeIdDelta = scopeId - lastSerializedScopeId;
-      lastSerializedScopeId = scopeId + 1;
-      if (scopeIdDelta) serializeData.push(scopeIdDelta);
-      serializeData.push(scope);
-    }
-    state.resumes = concatSequence(
-      state.resumes,
-      serializer.stringify(serializeData, boundary)
-    );
+      if (scopeHasReference(scope) || Object.getOwnPropertyNames(scope).length) {
+        const scopeId = getScopeId(scope);
+        const scopeIdDelta = scopeId - lastSerializedScopeId;
+        lastSerializedScopeId = scopeId + 1;
+        if (scopeIdDelta) serializeData.push(scopeIdDelta);
+        serializeData.push(scope);
+        shouldSerialize = true;
+      }
+    }
+    if (shouldSerialize) {
+      state.resumes = concatSequence(
+        state.resumes,
+        serializer.stringify(serializeData, boundary)
+      );
+    }
     state.lastSerializedScopeId = lastSerializedScopeId;
     state.writeScopes = null;
     if (flushed) {
@@ -2849,7 +2868,7 @@ function getFilteredGlobals($global2) {
 }
 function _subscribe(subscribers, scope) {
   $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
-  return scope;
+  return referenceScope(scope);
 }
 
 // src/html/attrs.ts

package/dist/debug/html.mjs

@@ -1680,6 +1680,7 @@ var $chunk;
 var NOOP = () => {
 };
 var K_SCOPE_ID = Symbol("Scope ID");
+var K_SCOPE_REFERENCED = Symbol("Scope Referenced");
 function getChunk() {
   return $chunk;
 }
@@ -1834,7 +1835,8 @@ function withIsAsync(cb, value) {
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeKeys = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   let flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
@@ -1867,12 +1869,12 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
       }
       withBranchId(branchId, () => {
         cb(item, index);
-        if (resumeMarker) {
-          writeScope(branchId, {
-            ["#LoopKey" /* LoopKey */]: item === index ? void 0 : itemKey
-          });
-        } else {
-          loopScopes = push(loopScopes, writeScope(branchId, {}));
+        const branchScope = writeScope(branchId, {});
+        if (resumeKeys && itemKey !== index) {
+          branchScope["#LoopKey" /* LoopKey */] = itemKey;
+        }
+        if (!resumeMarker) {
+          loopScopes = push(loopScopes, referenceScope(branchScope));
         }
       });
     });
@@ -1888,7 +1890,7 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
@@ -1896,7 +1898,8 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
 }
 function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeKeys = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   let flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
@@ -1929,12 +1932,12 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
       }
       withBranchId(branchId, () => {
         cb(key, value);
-        if (resumeMarker) {
-          writeScope(branchId, {
-            ["#LoopKey" /* LoopKey */]: itemKey
-          });
-        } else {
-          loopScopes = push(loopScopes, writeScope(branchId, {}));
+        const branchScope = writeScope(branchId, {});
+        if (resumeKeys) {
+          branchScope["#LoopKey" /* LoopKey */] = itemKey;
+        }
+        if (!resumeMarker) {
+          loopScopes = push(loopScopes, referenceScope(branchScope));
         }
       });
     });
@@ -1950,7 +1953,7 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
@@ -1958,7 +1961,8 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
 }
 function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeKeys = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   let flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
@@ -1991,12 +1995,12 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
       }
       withBranchId(branchId, () => {
         cb(i);
-        if (resumeMarker) {
-          writeScope(branchId, {
-            ["#LoopKey" /* LoopKey */]: itemKey === i ? void 0 : itemKey
-          });
-        } else {
-          loopScopes = push(loopScopes, writeScope(branchId, {}));
+        const branchScope = writeScope(branchId, {});
+        if (resumeKeys && itemKey !== i) {
+          branchScope["#LoopKey" /* LoopKey */] = itemKey;
+        }
+        if (!resumeMarker) {
+          loopScopes = push(loopScopes, referenceScope(branchScope));
         }
       });
     });
@@ -2012,7 +2016,7 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
@@ -2020,7 +2024,8 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
 }
 function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeKeys = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   let flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
@@ -2053,12 +2058,12 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
       }
       withBranchId(branchId, () => {
         cb(i);
-        if (resumeMarker) {
-          writeScope(branchId, {
-            ["#LoopKey" /* LoopKey */]: itemKey === i ? void 0 : itemKey
-          });
-        } else {
-          loopScopes = push(loopScopes, writeScope(branchId, {}));
+        const branchScope = writeScope(branchId, {});
+        if (resumeKeys && itemKey !== i) {
+          branchScope["#LoopKey" /* LoopKey */] = itemKey;
+        }
+        if (!resumeMarker) {
+          loopScopes = push(loopScopes, referenceScope(branchScope));
         }
       });
     });
@@ -2074,7 +2079,7 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
@@ -2083,7 +2088,7 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
   const { state } = $chunk.boundary;
   const resumeBranch = serializeBranch !== 0;
-  const resumeMarker = serializeMarker !== 0;
+  const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
   const branchId = _peek_scope_id();
   if (resumeMarker && resumeBranch && !singleNode) {
     $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
@@ -2097,22 +2102,22 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
       // It may make sense to pass in another arg for this.
       ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
       // we convert 0 to undefined since the runtime defaults branch to 0.
-      ["BranchScopes:" /* BranchScopes */ + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
+      ["BranchScopes:" /* BranchScopes */ + accessor]: resumeMarker ? void 0 : referenceScope(writeScope(branchId, {}))
     });
   }
   writeBranchEnd(
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     shouldWriteBranch ? " " + branchId : ""
   );
 }
-function writeBranchEnd(scopeId, accessor, serializeStateful, resumeMarker, parentEndTag, singleNode, branchIds) {
+function writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, branchIds) {
   const endTag = parentEndTag || "";
-  if (resumeMarker) {
+  if (serializeMarker !== 0) {
     if (!parentEndTag || serializeStateful !== 0) {
       const { state } = $chunk.boundary;
       const mark = singleNode ? state.mark(
@@ -2130,6 +2135,13 @@ function writeBranchEnd(scopeId, accessor, serializeStateful, resumeMarker, pare
     $chunk.writeHTML(endTag);
   }
 }
+function scopeHasReference(scope) {
+  return !!scope[K_SCOPE_REFERENCED];
+}
+function referenceScope(scope) {
+  scope[K_SCOPE_REFERENCED] = 1;
+  return scope;
+}
 var writeScope = (scopeId, partialScope) => {
   return writeScopeToState($chunk.boundary.state, scopeId, partialScope);
 };
@@ -2170,7 +2182,7 @@ function _scope_with_id(scopeId) {
     scope = { [K_SCOPE_ID]: scopeId };
     state.scopes.set(scopeId, scope);
   }
-  return scope;
+  return referenceScope(scope);
 }
 function $global() {
   return $chunk.boundary.state.$global;
@@ -2662,24 +2674,31 @@ function flushSerializer(boundary) {
   const { writeScopes, serializer } = state;
   const { flushed } = serializer;
   if (writeScopes || flushed) {
+    let shouldSerialize = false;
     const serializeData = [];
     let { lastSerializedScopeId } = state;
     if (!state.hasGlobals) {
       state.hasGlobals = true;
       serializeData.push(getFilteredGlobals(state.$global));
+      shouldSerialize = true;
     }
     for (const key in writeScopes) {
       const scope = writeScopes[key];
-      const scopeId = getScopeId(scope);
-      const scopeIdDelta = scopeId - lastSerializedScopeId;
-      lastSerializedScopeId = scopeId + 1;
-      if (scopeIdDelta) serializeData.push(scopeIdDelta);
-      serializeData.push(scope);
-    }
-    state.resumes = concatSequence(
-      state.resumes,
-      serializer.stringify(serializeData, boundary)
-    );
+      if (scopeHasReference(scope) || Object.getOwnPropertyNames(scope).length) {
+        const scopeId = getScopeId(scope);
+        const scopeIdDelta = scopeId - lastSerializedScopeId;
+        lastSerializedScopeId = scopeId + 1;
+        if (scopeIdDelta) serializeData.push(scopeIdDelta);
+        serializeData.push(scope);
+        shouldSerialize = true;
+      }
+    }
+    if (shouldSerialize) {
+      state.resumes = concatSequence(
+        state.resumes,
+        serializer.stringify(serializeData, boundary)
+      );
+    }
     state.lastSerializedScopeId = lastSerializedScopeId;
     state.writeScopes = null;
     if (flushed) {
@@ -2756,7 +2775,7 @@ function getFilteredGlobals($global2) {
 }
 function _subscribe(subscribers, scope) {
   $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
-  return scope;
+  return referenceScope(scope);
 }
 
 // src/html/attrs.ts