marko 6.0.125 → 6.0.127

package/dist/dom.js

@@ -550,7 +550,7 @@ function init(runtimeId = "M") {
   let renders = self[runtimeId], defineRuntime = (desc) => Object.defineProperty(self, runtimeId, desc), resumeRender, initRuntime = (renders2) => {
     defineRuntime({
       value: resumeRender = ((renderId) => {
-        let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, serializeContext = {
+        let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, getScope = (id) => scopeLookup[id] ||= { L: +id }, serializeContext = {
           _: registeredValues
         }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
           for (visitType !== "[" /* BranchStart */ && (visitScope["J" /* Getter */ + nextToken(
@@ -561,9 +561,7 @@ function init(runtimeId = "M") {
             /* read optional first branchId */
           )); branchId = +lastToken; ) {
             if ((endedBranches ||= []).push(
-              branch = scopeLookup[branchId] ||= {
-                L: branchId
-              }
+              branch = getScope(branchId)
             ), setParentBranch(branch, branch.F), (branch.O = render.p?.[branchId]) && (branch.O.m = render.m), singleNode) {
               for (; startVisit.previousSibling && ~visits.indexOf(
                 startVisit = startVisit.previousSibling
@@ -586,21 +584,16 @@ function init(runtimeId = "M") {
           for (let serialized of resumes = render.r || [])
             if (typeof serialized == "string")
               for (lastTokenIndex = 0, visitText = serialized; nextToken(); )
-                /\D/.test(lastToken) ? lastEffect = registeredValues[lastToken] : effects.push(
-                  lastEffect,
-                  scopeLookup[lastToken] ||= {
-                    L: +lastToken
-                  }
-                );
+                /\D/.test(lastToken) ? lastEffect = registeredValues[lastToken] : effects.push(lastEffect, getScope(lastToken));
             else
               for (let scope of serialized(serializeContext))
-                $global ? typeof scope == "number" ? lastScopeId += scope : (scopeLookup[scope.L = ++lastScopeId] = scope, scope.$ = $global, branchesEnabled && (scope.F = scopeLookup[scope.G])) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId);
+                $global ? typeof scope == "number" ? lastScopeId += scope : (scopeLookup[scope.L = ++lastScopeId] = scope, scope.$ = $global, branchesEnabled && (scope.F = getScope(
+                  scope.G
+                ))) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId);
           for (visit of visits = render.v)
-            lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = scopeLookup[+nextToken(
+            lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken(
               /* read scope id */
-            )] ||= {
-              L: +lastToken
-            }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
+            )), visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
           return visits.length = resumes.length = 0, effects;
         }, render.w = () => {
           walk2(), runResumeEffects(render);
@@ -1385,7 +1378,7 @@ function loop(forEach) {
           scope,
           parentNode
         );
-        params?.(branch, args), newScopesByKey.set(key, branch), newScopes.push(branch);
+        branch.M = key, params?.(branch, args), newScopesByKey.set(key, branch), newScopes.push(branch);
       });
       let afterReference = null;
       referenceNode !== parentNode && (oldScopes.length ? (afterReference = oldScopes[oldScopes.length - 1].K.nextSibling, newScopes.length || parentNode.insertBefore(referenceNode, afterReference)) : newScopes.length && (afterReference = referenceNode.nextSibling, referenceNode.remove())), reconcile(parentNode, oldScopes, newScopes, afterReference);

package/dist/dom.mjs

@@ -447,7 +447,7 @@ function init(runtimeId = "M") {
   let renders = self[runtimeId], defineRuntime = (desc) => Object.defineProperty(self, runtimeId, desc), resumeRender, initRuntime = (renders2) => {
     defineRuntime({
       value: resumeRender = ((renderId) => {
-        let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, serializeContext = {
+        let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, scopeLookup = render.s = {}, getScope = (id) => scopeLookup[id] ||= { L: +id }, serializeContext = {
           _: registeredValues
         }, visitBranches = branchesEnabled && /* @__PURE__ */ ((branchScopesStack = [], branchStarts = [], orphanBranches = [], curBranchScopes) => (branchId, branch, endedBranches, accessor, singleNode, parent = visit.parentNode, startVisit = visit, i = orphanBranches.length) => {
           for (visitType !== "[" /* BranchStart */ && (visitScope["J" /* Getter */ + nextToken(
@@ -458,9 +458,7 @@ function init(runtimeId = "M") {
             /* read optional first branchId */
           )); branchId = +lastToken; ) {
             if ((endedBranches ||= []).push(
-              branch = scopeLookup[branchId] ||= {
-                L: branchId
-              }
+              branch = getScope(branchId)
             ), setParentBranch(branch, branch.F), (branch.O = render.p?.[branchId]) && (branch.O.m = render.m), singleNode) {
               for (; startVisit.previousSibling && ~visits.indexOf(
                 startVisit = startVisit.previousSibling
@@ -483,21 +481,16 @@ function init(runtimeId = "M") {
           for (let serialized of resumes = render.r || [])
             if (typeof serialized == "string")
               for (lastTokenIndex = 0, visitText = serialized; nextToken(); )
-                /\D/.test(lastToken) ? lastEffect = registeredValues[lastToken] : effects.push(
-                  lastEffect,
-                  scopeLookup[lastToken] ||= {
-                    L: +lastToken
-                  }
-                );
+                /\D/.test(lastToken) ? lastEffect = registeredValues[lastToken] : effects.push(lastEffect, getScope(lastToken));
             else
               for (let scope of serialized(serializeContext))
-                $global ? typeof scope == "number" ? lastScopeId += scope : (scopeLookup[scope.L = ++lastScopeId] = scope, scope.$ = $global, branchesEnabled && (scope.F = scopeLookup[scope.G])) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId);
+                $global ? typeof scope == "number" ? lastScopeId += scope : (scopeLookup[scope.L = ++lastScopeId] = scope, scope.$ = $global, branchesEnabled && (scope.F = getScope(
+                  scope.G
+                ))) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId);
           for (visit of visits = render.v)
-            lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = scopeLookup[+nextToken(
+            lastTokenIndex = render.i.length, visitText = visit.data, visitType = visitText[lastTokenIndex++], visitScope = getScope(nextToken(
               /* read scope id */
-            )] ||= {
-              L: +lastToken
-            }, visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
+            )), visitType === "*" /* Node */ ? visitScope["J" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling) : branchesEnabled && visitBranches();
           return visits.length = resumes.length = 0, effects;
         }, render.w = () => {
           walk2(), runResumeEffects(render);
@@ -1282,7 +1275,7 @@ function loop(forEach) {
           scope,
           parentNode
         );
-        params?.(branch, args), newScopesByKey.set(key, branch), newScopes.push(branch);
+        branch.M = key, params?.(branch, args), newScopesByKey.set(key, branch), newScopes.push(branch);
       });
       let afterReference = null;
       referenceNode !== parentNode && (oldScopes.length ? (afterReference = oldScopes[oldScopes.length - 1].K.nextSibling, newScopes.length || parentNode.insertBefore(referenceNode, afterReference)) : newScopes.length && (afterReference = referenceNode.nextSibling, referenceNode.remove())), reconcile(parentNode, oldScopes, newScopes, afterReference);

package/dist/html/writer.d.ts

@@ -5,8 +5,10 @@ import type { ServerRenderer } from "./template";
 export type PartialScope = Record<Accessor, unknown>;
 type ScopeInternals = PartialScope & {
     [K_SCOPE_ID]?: number;
+    [K_SCOPE_REFERENCED]?: 1;
 };
 declare const K_SCOPE_ID: unique symbol;
+declare const K_SCOPE_REFERENCED: unique symbol;
 declare enum Mark {
     Placeholder = "!^",
     PlaceholderEnd = "!",
@@ -52,7 +54,7 @@ declare let writeScope: (scopeId: number, partialScope: PartialScope) => ScopeIn
 export declare function writeScopeToState(state: State, scopeId: number, partialScope: PartialScope): ScopeInternals;
 export { writeScope as _scope };
 export declare function _existing_scope(scopeId: number): ScopeInternals;
-export declare function _scope_with_id(scopeId: number): PartialScope;
+export declare function _scope_with_id(scopeId: number): ScopeInternals;
 export declare function $global(): $Global & {
     renderId: string;
     runtimeId: string;
@@ -144,4 +146,4 @@ export declare function _trailers(html: string): void;
 type QueueCallback = (ticked: true) => void;
 export declare function queueTick(cb: QueueCallback): void;
 export declare function offTick(cb: QueueCallback): void;
-export declare function _subscribe(subscribers: Set<ScopeInternals>, scope: ScopeInternals): ScopeInternals;
+export declare function _subscribe(subscribers: Set<ScopeInternals>, scope: ScopeInternals): void;

package/dist/html.js

@@ -1131,7 +1131,7 @@ function compareRegisteredReferences(a, b) {
 
 // src/html/writer.ts
 var $chunk, NOOP = () => {
-}, K_SCOPE_ID = Symbol("Scope ID");
+}, K_SCOPE_ID = Symbol("Scope ID"), K_SCOPE_REFERENCED = Symbol("Scope Referenced");
 function getChunk() {
   return $chunk;
 }
@@ -1246,7 +1246,7 @@ function withIsAsync(cb, value) {
   return withContext(kIsAsync, !0, cb, value);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
+  let { state } = $chunk.boundary, resumeKeys = serializeMarker !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
     if (0)
@@ -1256,9 +1256,9 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(item, index), resumeMarker ? writeScope(branchId, {
-          M: item === index ? void 0 : itemKey
-        }) : loopScopes = push(loopScopes, writeScope(branchId, {}));
+        cb(item, index);
+        let branchScope = writeScope(branchId, {});
+        resumeKeys && itemKey !== index && (branchScope.M = itemKey), resumeMarker || (loopScopes = push(loopScopes, referenceScope(branchScope)));
       });
     }), loopScopes && writeScope(scopeId, {
       ["A" /* BranchScopes */ + accessor]: loopScopes
@@ -1269,14 +1269,14 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
+  let { state } = $chunk.boundary, resumeKeys = serializeMarker !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
     if (0)
@@ -1286,9 +1286,9 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(key, value), resumeMarker ? writeScope(branchId, {
-          M: itemKey
-        }) : loopScopes = push(loopScopes, writeScope(branchId, {}));
+        cb(key, value);
+        let branchScope = writeScope(branchId, {});
+        resumeKeys && (branchScope.M = itemKey), resumeMarker || (loopScopes = push(loopScopes, referenceScope(branchScope)));
       });
     }), loopScopes && writeScope(scopeId, {
       ["A" /* BranchScopes */ + accessor]: loopScopes
@@ -1299,14 +1299,14 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
+  let { state } = $chunk.boundary, resumeKeys = serializeMarker !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
     if (0)
@@ -1316,9 +1316,9 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(i), resumeMarker ? writeScope(branchId, {
-          M: itemKey === i ? void 0 : itemKey
-        }) : loopScopes = push(loopScopes, writeScope(branchId, {}));
+        cb(i);
+        let branchScope = writeScope(branchId, {});
+        resumeKeys && itemKey !== i && (branchScope.M = itemKey), resumeMarker || (loopScopes = push(loopScopes, referenceScope(branchScope)));
       });
     }), loopScopes && writeScope(scopeId, {
       ["A" /* BranchScopes */ + accessor]: loopScopes
@@ -1329,14 +1329,14 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
+  let { state } = $chunk.boundary, resumeKeys = serializeMarker !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
     if (0)
@@ -1346,9 +1346,9 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(i), resumeMarker ? writeScope(branchId, {
-          M: itemKey === i ? void 0 : itemKey
-        }) : loopScopes = push(loopScopes, writeScope(branchId, {}));
+        cb(i);
+        let branchScope = writeScope(branchId, {});
+        resumeKeys && itemKey !== i && (branchScope.M = itemKey), resumeMarker || (loopScopes = push(loopScopes, referenceScope(branchScope)));
       });
     }), loopScopes && writeScope(scopeId, {
       ["A" /* BranchScopes */ + accessor]: loopScopes
@@ -1359,14 +1359,14 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = _peek_scope_id();
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), branchId = _peek_scope_id();
   resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
   let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && (branchIndex || !resumeMarker) && writeScope(scopeId, {
@@ -1375,20 +1375,20 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
     // It may make sense to pass in another arg for this.
     ["D" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
     // we convert 0 to undefined since the runtime defaults branch to 0.
-    ["A" /* BranchScopes */ + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
+    ["A" /* 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) {
   let endTag = parentEndTag || "";
-  if (resumeMarker)
+  if (serializeMarker !== 0)
     if (!parentEndTag || serializeStateful !== 0) {
       let { state } = $chunk.boundary, mark = singleNode ? state.mark(
         parentEndTag ? "}" /* BranchEndSingleNodeOnlyChildInParent */ : "|" /* BranchEndSingleNode */,
@@ -1403,6 +1403,12 @@ function writeBranchEnd(scopeId, accessor, serializeStateful, resumeMarker, pare
   else
     $chunk.writeHTML(endTag);
 }
+function scopeHasReference(scope) {
+  return !!scope[K_SCOPE_REFERENCED];
+}
+function referenceScope(scope) {
+  return scope[K_SCOPE_REFERENCED] = 1, scope;
+}
 var writeScope = (scopeId, partialScope) => writeScopeToState($chunk.boundary.state, scopeId, partialScope);
 function writeScopeToState(state, scopeId, partialScope) {
   let { scopes } = state, scope = scopes.get(scopeId);
@@ -1413,7 +1419,7 @@ function _existing_scope(scopeId) {
 }
 function _scope_with_id(scopeId) {
   let { state } = $chunk.boundary, scope = state.scopes.get(scopeId);
-  return scope || (scope = { [K_SCOPE_ID]: scopeId }, state.scopes.set(scopeId, scope)), scope;
+  return scope || (scope = { [K_SCOPE_ID]: scopeId }, state.scopes.set(scopeId, scope)), referenceScope(scope);
 }
 function $global() {
   return $chunk.boundary.state.$global;
@@ -1696,16 +1702,19 @@ var Boundary = class extends AbortController {
 function flushSerializer(boundary) {
   let { state } = boundary, { writeScopes, serializer } = state, { flushed } = serializer;
   if (writeScopes || flushed) {
-    let serializeData = [], { lastSerializedScopeId } = state;
-    state.hasGlobals || (state.hasGlobals = !0, serializeData.push(getFilteredGlobals(state.$global)));
+    let shouldSerialize = !1, serializeData = [], { lastSerializedScopeId } = state;
+    state.hasGlobals || (state.hasGlobals = !0, serializeData.push(getFilteredGlobals(state.$global)), shouldSerialize = !0);
     for (let key in writeScopes) {
-      let scope = writeScopes[key], scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
-      lastSerializedScopeId = scopeId + 1, scopeIdDelta && serializeData.push(scopeIdDelta), serializeData.push(scope);
+      let scope = writeScopes[key];
+      if (scopeHasReference(scope) || Object.getOwnPropertyNames(scope).length) {
+        let scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
+        lastSerializedScopeId = scopeId + 1, scopeIdDelta && serializeData.push(scopeIdDelta), serializeData.push(scope), shouldSerialize = !0;
+      }
     }
-    state.resumes = concatSequence(
+    shouldSerialize && (state.resumes = concatSequence(
       state.resumes,
       serializer.stringify(serializeData, boundary)
-    ), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null, flushed && (state.walkOnNextFlush = !0);
+    )), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null, flushed && (state.walkOnNextFlush = !0);
   }
 }
 function _trailers(html) {
@@ -1755,7 +1764,7 @@ function getFilteredGlobals($global2) {
   return filtered;
 }
 function _subscribe(subscribers, scope) {
-  return $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), scope;
+  $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
 }
 
 // src/html/attrs.ts

package/dist/html.mjs

@@ -1041,7 +1041,7 @@ function compareRegisteredReferences(a, b) {
 
 // src/html/writer.ts
 var $chunk, NOOP = () => {
-}, K_SCOPE_ID = Symbol("Scope ID");
+}, K_SCOPE_ID = Symbol("Scope ID"), K_SCOPE_REFERENCED = Symbol("Scope Referenced");
 function getChunk() {
   return $chunk;
 }
@@ -1156,7 +1156,7 @@ function withIsAsync(cb, value) {
   return withContext(kIsAsync, !0, cb, value);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
+  let { state } = $chunk.boundary, resumeKeys = serializeMarker !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
     if (0)
@@ -1166,9 +1166,9 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(item, index), resumeMarker ? writeScope(branchId, {
-          M: item === index ? void 0 : itemKey
-        }) : loopScopes = push(loopScopes, writeScope(branchId, {}));
+        cb(item, index);
+        let branchScope = writeScope(branchId, {});
+        resumeKeys && itemKey !== index && (branchScope.M = itemKey), resumeMarker || (loopScopes = push(loopScopes, referenceScope(branchScope)));
       });
     }), loopScopes && writeScope(scopeId, {
       ["A" /* BranchScopes */ + accessor]: loopScopes
@@ -1179,14 +1179,14 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
+  let { state } = $chunk.boundary, resumeKeys = serializeMarker !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
     if (0)
@@ -1196,9 +1196,9 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(key, value), resumeMarker ? writeScope(branchId, {
-          M: itemKey
-        }) : loopScopes = push(loopScopes, writeScope(branchId, {}));
+        cb(key, value);
+        let branchScope = writeScope(branchId, {});
+        resumeKeys && (branchScope.M = itemKey), resumeMarker || (loopScopes = push(loopScopes, referenceScope(branchScope)));
       });
     }), loopScopes && writeScope(scopeId, {
       ["A" /* BranchScopes */ + accessor]: loopScopes
@@ -1209,14 +1209,14 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
+  let { state } = $chunk.boundary, resumeKeys = serializeMarker !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
     if (0)
@@ -1226,9 +1226,9 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(i), resumeMarker ? writeScope(branchId, {
-          M: itemKey === i ? void 0 : itemKey
-        }) : loopScopes = push(loopScopes, writeScope(branchId, {}));
+        cb(i);
+        let branchScope = writeScope(branchId, {});
+        resumeKeys && itemKey !== i && (branchScope.M = itemKey), resumeMarker || (loopScopes = push(loopScopes, referenceScope(branchScope)));
       });
     }), loopScopes && writeScope(scopeId, {
       ["A" /* BranchScopes */ + accessor]: loopScopes
@@ -1239,14 +1239,14 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeMarker = serializeMarker !== 0, flushBranchIds = "";
+  let { state } = $chunk.boundary, resumeKeys = serializeMarker !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), flushBranchIds = "";
   if (serializeBranch !== 0) {
     let loopScopes;
     if (0)
@@ -1256,9 +1256,9 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(i), resumeMarker ? writeScope(branchId, {
-          M: itemKey === i ? void 0 : itemKey
-        }) : loopScopes = push(loopScopes, writeScope(branchId, {}));
+        cb(i);
+        let branchScope = writeScope(branchId, {});
+        resumeKeys && itemKey !== i && (branchScope.M = itemKey), resumeMarker || (loopScopes = push(loopScopes, referenceScope(branchScope)));
       });
     }), loopScopes && writeScope(scopeId, {
       ["A" /* BranchScopes */ + accessor]: loopScopes
@@ -1269,14 +1269,14 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
     scopeId,
     accessor,
     serializeStateful,
-    resumeMarker,
+    serializeMarker,
     parentEndTag,
     singleNode,
     singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : ""
   );
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0, branchId = _peek_scope_id();
+  let { state } = $chunk.boundary, resumeBranch = serializeBranch !== 0, resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0), branchId = _peek_scope_id();
   resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
   let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && (branchIndex || !resumeMarker) && writeScope(scopeId, {
@@ -1285,20 +1285,20 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
     // It may make sense to pass in another arg for this.
     ["D" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
     // we convert 0 to undefined since the runtime defaults branch to 0.
-    ["A" /* BranchScopes */ + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
+    ["A" /* 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) {
   let endTag = parentEndTag || "";
-  if (resumeMarker)
+  if (serializeMarker !== 0)
     if (!parentEndTag || serializeStateful !== 0) {
       let { state } = $chunk.boundary, mark = singleNode ? state.mark(
         parentEndTag ? "}" /* BranchEndSingleNodeOnlyChildInParent */ : "|" /* BranchEndSingleNode */,
@@ -1313,6 +1313,12 @@ function writeBranchEnd(scopeId, accessor, serializeStateful, resumeMarker, pare
   else
     $chunk.writeHTML(endTag);
 }
+function scopeHasReference(scope) {
+  return !!scope[K_SCOPE_REFERENCED];
+}
+function referenceScope(scope) {
+  return scope[K_SCOPE_REFERENCED] = 1, scope;
+}
 var writeScope = (scopeId, partialScope) => writeScopeToState($chunk.boundary.state, scopeId, partialScope);
 function writeScopeToState(state, scopeId, partialScope) {
   let { scopes } = state, scope = scopes.get(scopeId);
@@ -1323,7 +1329,7 @@ function _existing_scope(scopeId) {
 }
 function _scope_with_id(scopeId) {
   let { state } = $chunk.boundary, scope = state.scopes.get(scopeId);
-  return scope || (scope = { [K_SCOPE_ID]: scopeId }, state.scopes.set(scopeId, scope)), scope;
+  return scope || (scope = { [K_SCOPE_ID]: scopeId }, state.scopes.set(scopeId, scope)), referenceScope(scope);
 }
 function $global() {
   return $chunk.boundary.state.$global;
@@ -1606,16 +1612,19 @@ var Boundary = class extends AbortController {
 function flushSerializer(boundary) {
   let { state } = boundary, { writeScopes, serializer } = state, { flushed } = serializer;
   if (writeScopes || flushed) {
-    let serializeData = [], { lastSerializedScopeId } = state;
-    state.hasGlobals || (state.hasGlobals = !0, serializeData.push(getFilteredGlobals(state.$global)));
+    let shouldSerialize = !1, serializeData = [], { lastSerializedScopeId } = state;
+    state.hasGlobals || (state.hasGlobals = !0, serializeData.push(getFilteredGlobals(state.$global)), shouldSerialize = !0);
     for (let key in writeScopes) {
-      let scope = writeScopes[key], scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
-      lastSerializedScopeId = scopeId + 1, scopeIdDelta && serializeData.push(scopeIdDelta), serializeData.push(scope);
+      let scope = writeScopes[key];
+      if (scopeHasReference(scope) || Object.getOwnPropertyNames(scope).length) {
+        let scopeId = getScopeId(scope), scopeIdDelta = scopeId - lastSerializedScopeId;
+        lastSerializedScopeId = scopeId + 1, scopeIdDelta && serializeData.push(scopeIdDelta), serializeData.push(scope), shouldSerialize = !0;
+      }
     }
-    state.resumes = concatSequence(
+    shouldSerialize && (state.resumes = concatSequence(
       state.resumes,
       serializer.stringify(serializeData, boundary)
-    ), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null, flushed && (state.walkOnNextFlush = !0);
+    )), state.lastSerializedScopeId = lastSerializedScopeId, state.writeScopes = null, flushed && (state.walkOnNextFlush = !0);
   }
 }
 function _trailers(html) {
@@ -1665,7 +1674,7 @@ function getFilteredGlobals($global2) {
   return filtered;
 }
 function _subscribe(subscribers, scope) {
-  return $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), scope;
+  $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
 }
 
 // src/html/attrs.ts