marko 6.0.0-next.3.52 → 6.0.0-next.3.54

package/dist/debug/dom.js

@@ -245,30 +245,29 @@ var Render = class {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
+    Object.assign(this, renders[renderId]);
     this.___renders = renders;
     this.___runtimeId = runtimeId;
     this.___renderId = renderId;
-    this.___data = renders[renderId];
-    this.___resume();
-  }
-  w() {
-    this.___data.w();
+    this.w = /* @__PURE__ */ ((w) => () => {
+      w();
+      this.___resume();
+    })(this.w);
     this.___resume();
   }
   ___resume() {
-    const data2 = this.___data;
     const serializeContext = this.___serializeContext;
     const scopeLookup = this.___scopeLookup;
-    const visits = data2.v;
+    const visits = this.v;
     const branchIds = /* @__PURE__ */ new Set();
     const parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
-      const commentPrefix = data2.i;
+      const commentPrefix = this.i;
       const commentPrefixLen = commentPrefix.length;
       const closestBranchMarkers = /* @__PURE__ */ new Map();
       const visitNodes = new Set(visits);
       let lastEndNode;
-      data2.v = [];
+      this.v = [];
       const branchEnd = (branchId, visit, reference) => {
         const branch = scopeLookup[branchId] ||= {};
         let endNode = reference;
@@ -296,11 +295,11 @@ var Render = class {
           dataIndex ? dataIndex - 1 : commentText.length
         );
         const scope = scopeLookup[scopeId] ||= { ___id: +scopeId };
-        const data3 = dataIndex ? commentText.slice(dataIndex) : "";
+        const data2 = dataIndex ? commentText.slice(dataIndex) : "";
         const token = commentText[commentPrefixLen];
         if (token === "*" /* Node */) {
-          const node = scope[data3] = visit.previousSibling;
-          scope[data3 + ">" /* Getter */] = () => node;
+          const node = scope[data2] = visit.previousSibling;
+          scope[data2 + ">" /* Getter */] = () => node;
         } else if (token === "$" /* ClosestBranch */) {
           closestBranchMarkers.set(scopeId, visit);
         } else if (token === "[" /* BranchStart */) {
@@ -313,7 +312,7 @@ var Render = class {
           this.___currentScopeId = scopeId;
           scope.___startNode = visit;
         } else if (token === "]" /* BranchEnd */) {
-          scope[data3] = visit;
+          scope[data2] = visit;
           const curParent = visit.parentNode;
           const startNode = branchEnd(
             this.___currentScopeId,
@@ -325,21 +324,21 @@ var Render = class {
           }
           this.___currentScopeId = this.___scopeStack.pop();
         } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-          let next = data3.indexOf(" ");
+          let next = data2.indexOf(" ");
           let curNode = visit;
-          scope[~next ? data3.slice(0, next) : data3] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
+          scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
           while (~next) {
             const start = next + 1;
-            next = data3.indexOf(" ", start);
-            const childScopeId = data3.slice(start, ~next ? next : data3.length);
+            next = data2.indexOf(" ", start);
+            const childScopeId = data2.slice(start, ~next ? next : data2.length);
             curNode = branchEnd(childScopeId, visit, curNode).___endNode;
           }
         }
       }
     }
-    const resumes = data2.r;
+    const resumes = this.r;
     if (resumes) {
-      data2.r = [];
+      this.r = [];
       const len = resumes.length;
       let i = 0;
       try {

package/dist/debug/dom.mjs

@@ -160,30 +160,29 @@ var Render = class {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
+    Object.assign(this, renders[renderId]);
     this.___renders = renders;
     this.___runtimeId = runtimeId;
     this.___renderId = renderId;
-    this.___data = renders[renderId];
-    this.___resume();
-  }
-  w() {
-    this.___data.w();
+    this.w = /* @__PURE__ */ ((w) => () => {
+      w();
+      this.___resume();
+    })(this.w);
     this.___resume();
   }
   ___resume() {
-    const data2 = this.___data;
     const serializeContext = this.___serializeContext;
     const scopeLookup = this.___scopeLookup;
-    const visits = data2.v;
+    const visits = this.v;
     const branchIds = /* @__PURE__ */ new Set();
     const parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
-      const commentPrefix = data2.i;
+      const commentPrefix = this.i;
       const commentPrefixLen = commentPrefix.length;
       const closestBranchMarkers = /* @__PURE__ */ new Map();
       const visitNodes = new Set(visits);
       let lastEndNode;
-      data2.v = [];
+      this.v = [];
       const branchEnd = (branchId, visit, reference) => {
         const branch = scopeLookup[branchId] ||= {};
         let endNode = reference;
@@ -211,11 +210,11 @@ var Render = class {
           dataIndex ? dataIndex - 1 : commentText.length
         );
         const scope = scopeLookup[scopeId] ||= { ___id: +scopeId };
-        const data3 = dataIndex ? commentText.slice(dataIndex) : "";
+        const data2 = dataIndex ? commentText.slice(dataIndex) : "";
         const token = commentText[commentPrefixLen];
         if (token === "*" /* Node */) {
-          const node = scope[data3] = visit.previousSibling;
-          scope[data3 + ">" /* Getter */] = () => node;
+          const node = scope[data2] = visit.previousSibling;
+          scope[data2 + ">" /* Getter */] = () => node;
         } else if (token === "$" /* ClosestBranch */) {
           closestBranchMarkers.set(scopeId, visit);
         } else if (token === "[" /* BranchStart */) {
@@ -228,7 +227,7 @@ var Render = class {
           this.___currentScopeId = scopeId;
           scope.___startNode = visit;
         } else if (token === "]" /* BranchEnd */) {
-          scope[data3] = visit;
+          scope[data2] = visit;
           const curParent = visit.parentNode;
           const startNode = branchEnd(
             this.___currentScopeId,
@@ -240,21 +239,21 @@ var Render = class {
           }
           this.___currentScopeId = this.___scopeStack.pop();
         } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-          let next = data3.indexOf(" ");
+          let next = data2.indexOf(" ");
           let curNode = visit;
-          scope[~next ? data3.slice(0, next) : data3] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
+          scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
           while (~next) {
             const start = next + 1;
-            next = data3.indexOf(" ", start);
-            const childScopeId = data3.slice(start, ~next ? next : data3.length);
+            next = data2.indexOf(" ", start);
+            const childScopeId = data2.slice(start, ~next ? next : data2.length);
             curNode = branchEnd(childScopeId, visit, curNode).___endNode;
           }
         }
       }
     }
-    const resumes = data2.r;
+    const resumes = this.r;
     if (resumes) {
-      data2.r = [];
+      this.r = [];
       const len = resumes.length;
       let i = 0;
       try {

package/dist/dom.js

@@ -201,20 +201,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 var registeredValues = {}, Render = class {
   q = [];
   s = {};
-  F = {
+  E = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.G = renders, this.H = runtimeId, this.t = renderId, this.u = renders[renderId], this.x();
+    Object.assign(this, renders[renderId]), this.F = renders, this.G = runtimeId, this.t = renderId, this.w = /* @__PURE__ */ ((w) => () => {
+      w(), this.u();
+    })(this.w), this.u();
   }
-  w() {
-    this.u.w(), this.x();
-  }
-  x() {
-    let data2 = this.u, serializeContext = this.F, scopeLookup = this.s, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+  u() {
+    let serializeContext = this.E, scopeLookup = this.s, visits = this.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
-      let commentPrefixLen = data2.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
-      data2.v = [];
+      let commentPrefixLen = this.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
+      this.v = [];
       let branchEnd = (branchId, visit, reference) => {
         let branch = scopeLookup[branchId] ||= {}, endNode = reference;
         for (; visitNodes.has(endNode = endNode.previousSibling); ) ;
@@ -227,16 +226,16 @@ var registeredValues = {}, Render = class {
         let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = commentText.slice(
           commentPrefixLen + 1,
           dataIndex ? dataIndex - 1 : commentText.length
-        ), scope = scopeLookup[scopeId] ||= { d: +scopeId }, data3 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
+        ), scope = scopeLookup[scopeId] ||= { d: +scopeId }, data2 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
         if (token === "*" /* Node */) {
-          let node = scope[data3] = visit.previousSibling;
-          scope[data3 + ">" /* Getter */] = () => node;
+          let node = scope[data2] = visit.previousSibling;
+          scope[data2 + ">" /* Getter */] = () => node;
         } else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
           this.f && (dataIndex && branchEnd(this.f, visit, visit), this.q.push(this.f)), this.f = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
-          scope[data3] = visit;
+          scope[data2] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
             this.f,
             visit,
@@ -244,26 +243,26 @@ var registeredValues = {}, Render = class {
           ).a;
           curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.q.pop();
         } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-          let next = data3.indexOf(" "), curNode = visit;
-          for (scope[~next ? data3.slice(0, next) : data3] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
+          let next = data2.indexOf(" "), curNode = visit;
+          for (scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
             let start = next + 1;
-            next = data3.indexOf(" ", start);
-            let childScopeId = data3.slice(start, ~next ? next : data3.length);
+            next = data2.indexOf(" ", start);
+            let childScopeId = data2.slice(start, ~next ? next : data2.length);
             curNode = branchEnd(childScopeId, visit, curNode).b;
           }
         }
       }
     }
-    let resumes = data2.r;
+    let resumes = this.r;
     if (resumes) {
-      data2.r = [];
+      this.r = [];
       let len = resumes.length, i = 0;
       try {
         for (isResuming = !0; i < len; ) {
           let resumeData = resumes[i++];
           if (typeof resumeData == "function") {
             let scopes = resumeData(serializeContext), { $global } = scopeLookup;
-            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.H, $global.renderId = this.t, $global.g = 1e6);
+            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.G, $global.renderId = this.t, $global.g = 1e6);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -274,10 +273,10 @@ var registeredValues = {}, Render = class {
                 let parentBranchId = parentBranchIds.get(scopeId);
                 if (parentBranchId && (scope.c = scopes[parentBranchId]), branchIds.has(scopeId)) {
                   let branch = scope, parentBranch = branch.c;
-                  scope.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
+                  scope.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.G[this.t] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.F[this.t] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -729,10 +728,10 @@ function finishPendingScopes() {
   pendingScopes = [];
 }
 function destroyBranch(branch) {
-  branch.y?.n?.delete(branch), destroyNestedBranches(branch);
+  branch.x?.n?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.z = 1, branch.n?.forEach(destroyNestedBranches), branch.I?.forEach((scope) => {
+  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.H?.forEach((scope) => {
     for (let id in scope.k)
       scope.k[id]?.abort();
   });
@@ -754,13 +753,13 @@ var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), pendi
 function queueRender(scope, signal, signalKey, value2, scopeKey = scope.d) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
-    existingRender.A = value2;
+    existingRender.z = value2;
   else {
     let render = {
       j: key,
-      B: scope,
-      J: signal,
-      A: value2
+      A: scope,
+      I: signal,
+      z: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
@@ -812,7 +811,7 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.B.c?.z || render.J(render.B, render.A);
+    render.A.c?.y || render.I(render.A, render.z);
   }
   finishPendingScopes();
 }
@@ -823,7 +822,7 @@ function resetAbortSignal(scope, id) {
   ctrl && (queueEffect(ctrl, abort), scope.k[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.c && (scope.c.I ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.H ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -949,7 +948,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.c;
-  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
+  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
     branch,
     parentNode.namespaceURI
   ), branch;
@@ -961,10 +960,10 @@ function createAndSetupBranch($global, renderer, parentScope, parentNode) {
   );
 }
 function setupBranch(renderer, branch) {
-  return (renderer.p || renderer.C) && queueRender(
+  return (renderer.p || renderer.B) && queueRender(
     branch,
     (branch2) => {
-      renderer.p?.(branch2), renderer.C?.(branch2);
+      renderer.p?.(branch2), renderer.B?.(branch2);
     },
     -1
   ), branch;
@@ -989,7 +988,7 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
     l: owner,
     p: setup,
     e: params,
-    C: closures,
+    B: closures,
     m: dynamicScopesAccessor
   });
 }
@@ -1074,7 +1073,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.h && !scope.z && childSignal(scope);
+          !scope.h && !scope.y && childSignal(scope);
       },
       -1,
       0,
@@ -1098,9 +1097,9 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
   ));
 }
 function dynamicClosure(...closureSignals) {
-  let [{ D: ___scopeInstancesAccessor, E: ___signalIndexAccessor }] = closureSignals;
+  let [{ C: ___scopeInstancesAccessor, D: ___signalIndexAccessor }] = closureSignals;
   for (let i = closureSignals.length; i--; )
-    closureSignals[i].K = i;
+    closureSignals[i].J = i;
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
@@ -1113,13 +1112,13 @@ function dynamicClosure(...closureSignals) {
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
   let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
-    scope[closureSignal.E] = closureSignal.K, childSignal(scope), subscribeToScopeSet(
+    scope[closureSignal.D] = closureSignal.J, childSignal(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
-      closureSignal.D,
+      closureSignal.C,
       scope
     );
   };
-  return closureSignal.D = valueAccessor + "!" /* ClosureScopes */, closureSignal.E = valueAccessor + "(" /* ClosureSignalIndex */, closureSignal;
+  return closureSignal.C = valueAccessor + "!" /* ClosureScopes */, closureSignal.D = valueAccessor + "(" /* ClosureSignalIndex */, closureSignal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
   return (scope) => {

package/dist/dom.mjs

@@ -119,20 +119,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 var registeredValues = {}, Render = class {
   q = [];
   s = {};
-  F = {
+  E = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.G = renders, this.H = runtimeId, this.t = renderId, this.u = renders[renderId], this.x();
+    Object.assign(this, renders[renderId]), this.F = renders, this.G = runtimeId, this.t = renderId, this.w = /* @__PURE__ */ ((w) => () => {
+      w(), this.u();
+    })(this.w), this.u();
   }
-  w() {
-    this.u.w(), this.x();
-  }
-  x() {
-    let data2 = this.u, serializeContext = this.F, scopeLookup = this.s, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+  u() {
+    let serializeContext = this.E, scopeLookup = this.s, visits = this.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
-      let commentPrefixLen = data2.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
-      data2.v = [];
+      let commentPrefixLen = this.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
+      this.v = [];
       let branchEnd = (branchId, visit, reference) => {
         let branch = scopeLookup[branchId] ||= {}, endNode = reference;
         for (; visitNodes.has(endNode = endNode.previousSibling); ) ;
@@ -145,16 +144,16 @@ var registeredValues = {}, Render = class {
         let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = commentText.slice(
           commentPrefixLen + 1,
           dataIndex ? dataIndex - 1 : commentText.length
-        ), scope = scopeLookup[scopeId] ||= { d: +scopeId }, data3 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
+        ), scope = scopeLookup[scopeId] ||= { d: +scopeId }, data2 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
         if (token === "*" /* Node */) {
-          let node = scope[data3] = visit.previousSibling;
-          scope[data3 + ">" /* Getter */] = () => node;
+          let node = scope[data2] = visit.previousSibling;
+          scope[data2 + ">" /* Getter */] = () => node;
         } else if (token === "$" /* ClosestBranch */)
           closestBranchMarkers.set(scopeId, visit);
         else if (token === "[" /* BranchStart */)
           this.f && (dataIndex && branchEnd(this.f, visit, visit), this.q.push(this.f)), this.f = scopeId, scope.a = visit;
         else if (token === "]" /* BranchEnd */) {
-          scope[data3] = visit;
+          scope[data2] = visit;
           let curParent = visit.parentNode, startNode = branchEnd(
             this.f,
             visit,
@@ -162,26 +161,26 @@ var registeredValues = {}, Render = class {
           ).a;
           curParent !== startNode.parentNode && curParent.prepend(startNode), this.f = this.q.pop();
         } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-          let next = data3.indexOf(" "), curNode = visit;
-          for (scope[~next ? data3.slice(0, next) : data3] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
+          let next = data2.indexOf(" "), curNode = visit;
+          for (scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
             let start = next + 1;
-            next = data3.indexOf(" ", start);
-            let childScopeId = data3.slice(start, ~next ? next : data3.length);
+            next = data2.indexOf(" ", start);
+            let childScopeId = data2.slice(start, ~next ? next : data2.length);
             curNode = branchEnd(childScopeId, visit, curNode).b;
           }
         }
       }
     }
-    let resumes = data2.r;
+    let resumes = this.r;
     if (resumes) {
-      data2.r = [];
+      this.r = [];
       let len = resumes.length, i = 0;
       try {
         for (isResuming = !0; i < len; ) {
           let resumeData = resumes[i++];
           if (typeof resumeData == "function") {
             let scopes = resumeData(serializeContext), { $global } = scopeLookup;
-            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.H, $global.renderId = this.t, $global.g = 1e6);
+            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.G, $global.renderId = this.t, $global.g = 1e6);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -192,10 +191,10 @@ var registeredValues = {}, Render = class {
                 let parentBranchId = parentBranchIds.get(scopeId);
                 if (parentBranchId && (scope.c = scopes[parentBranchId]), branchIds.has(scopeId)) {
                   let branch = scope, parentBranch = branch.c;
-                  scope.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
+                  scope.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.G[this.t] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.F[this.t] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -647,10 +646,10 @@ function finishPendingScopes() {
   pendingScopes = [];
 }
 function destroyBranch(branch) {
-  branch.y?.n?.delete(branch), destroyNestedBranches(branch);
+  branch.x?.n?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.z = 1, branch.n?.forEach(destroyNestedBranches), branch.I?.forEach((scope) => {
+  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.H?.forEach((scope) => {
     for (let id in scope.k)
       scope.k[id]?.abort();
   });
@@ -672,13 +671,13 @@ var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), pendi
 function queueRender(scope, signal, signalKey, value2, scopeKey = scope.d) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
-    existingRender.A = value2;
+    existingRender.z = value2;
   else {
     let render = {
       j: key,
-      B: scope,
-      J: signal,
-      A: value2
+      A: scope,
+      I: signal,
+      z: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
@@ -730,7 +729,7 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.B.c?.z || render.J(render.B, render.A);
+    render.A.c?.y || render.I(render.A, render.z);
   }
   finishPendingScopes();
 }
@@ -741,7 +740,7 @@ function resetAbortSignal(scope, id) {
   ctrl && (queueEffect(ctrl, abort), scope.k[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.c && (scope.c.I ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.H ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -867,7 +866,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.c;
-  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch && (branch.y = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
+  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
     branch,
     parentNode.namespaceURI
   ), branch;
@@ -879,10 +878,10 @@ function createAndSetupBranch($global, renderer, parentScope, parentNode) {
   );
 }
 function setupBranch(renderer, branch) {
-  return (renderer.p || renderer.C) && queueRender(
+  return (renderer.p || renderer.B) && queueRender(
     branch,
     (branch2) => {
-      renderer.p?.(branch2), renderer.C?.(branch2);
+      renderer.p?.(branch2), renderer.B?.(branch2);
     },
     -1
   ), branch;
@@ -907,7 +906,7 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
     l: owner,
     p: setup,
     e: params,
-    C: closures,
+    B: closures,
     m: dynamicScopesAccessor
   });
 }
@@ -992,7 +991,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.h && !scope.z && childSignal(scope);
+          !scope.h && !scope.y && childSignal(scope);
       },
       -1,
       0,
@@ -1016,9 +1015,9 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
   ));
 }
 function dynamicClosure(...closureSignals) {
-  let [{ D: ___scopeInstancesAccessor, E: ___signalIndexAccessor }] = closureSignals;
+  let [{ C: ___scopeInstancesAccessor, D: ___signalIndexAccessor }] = closureSignals;
   for (let i = closureSignals.length; i--; )
-    closureSignals[i].K = i;
+    closureSignals[i].J = i;
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
@@ -1031,13 +1030,13 @@ function dynamicClosure(...closureSignals) {
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
   let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
-    scope[closureSignal.E] = closureSignal.K, childSignal(scope), subscribeToScopeSet(
+    scope[closureSignal.D] = closureSignal.J, childSignal(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
-      closureSignal.D,
+      closureSignal.C,
       scope
     );
   };
-  return closureSignal.D = valueAccessor + "!" /* ClosureScopes */, closureSignal.E = valueAccessor + "(" /* ClosureSignalIndex */, closureSignal;
+  return closureSignal.C = valueAccessor + "!" /* ClosureScopes */, closureSignal.D = valueAccessor + "(" /* ClosureSignalIndex */, closureSignal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
   return (scope) => {

package/dist/translator/index.js

@@ -3567,6 +3567,7 @@ function createBinding(name2, type, section, upstreamAlias, upstreamExpression,
     closureSections: void 0,
     excludeProperties: void 0,
     serialize: false,
+    sources: /* @__PURE__ */ new Set(),
     aliases: /* @__PURE__ */ new Set(),
     hoists: /* @__PURE__ */ new Map(),
     propertyAliases: /* @__PURE__ */ new Map(),
@@ -3955,6 +3956,7 @@ function finalizeReferences() {
   for (const binding of bindings) {
     const { name: name2, section } = binding;
     if (binding.type !== 0 /* dom */) {
+      resolveBindingSources(binding);
       if (find(section.bindings, ({ name: name3 }) => name3 === binding.name)) {
         binding.name = currentProgramPath.scope.generateUid(name2);
       }
@@ -3991,12 +3993,10 @@ function finalizeReferences() {
           for (let j = i + 1; j < numReferences; j++) {
             const binding1 = intersection[i];
             const binding2 = intersection[j];
-            const sources1 = getSourceBindings(binding1);
-            const sources2 = getSourceBindings(binding2);
-            if (!binding1.serialize && !isSuperset(sources1, sources2)) {
+            if (!binding1.serialize && !isSuperset(binding1.sources, binding2.sources)) {
               binding1.serialize = true;
             }
-            if (!binding2.serialize && !isSuperset(sources2, sources1)) {
+            if (!binding2.serialize && !isSuperset(binding2.sources, binding1.sources)) {
               binding2.serialize = true;
             }
           }
@@ -4049,7 +4049,7 @@ function getMaxOwnSourceOffset(intersection, section) {
   let scopeOffset;
   for (const binding of intersection) {
     if (binding.section === section) {
-      for (const sourceBinding of getSourceBindings(binding)) {
+      for (const sourceBinding of binding.sources) {
         if (sourceBinding.scopeOffset && (!scopeOffset || scopeOffset.id < sourceBinding.scopeOffset.id)) {
           scopeOffset = sourceBinding.scopeOffset;
         }
@@ -4067,11 +4067,10 @@ function isSuperset(set, subset) {
   }
   return true;
 }
-function getSourceBindings(binding) {
+function resolveBindingSources(binding) {
   const derived = /* @__PURE__ */ new Set();
-  const sources = /* @__PURE__ */ new Set();
+  const { sources } = binding;
   crawl(binding);
-  return sources;
   function crawl(binding2) {
     if (binding2.type === 4 /* derived */ || binding2.type === 3 /* param */) {
       let alias;
@@ -5288,10 +5287,13 @@ var native_tag_default = {
       } else {
         tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
       }
+      const shouldMark = nodeRef2 && (extra[kSerializeMarker] || extra[kSerializeMarker] === void 0 && (isStatefulReferences(extra.referencedBindings) || tag.node.attributes.some(
+        (attr2) => isStatefulReferences(attr2.value.extra?.referencedBindings)
+      )));
       if (!openTagOnly && !selectArgs) {
         writeTo(
           tag,
-          isHTML && (tagName === "html" || tagName === "body")
+          isHTML && !shouldMark && (tagName === "html" || tagName === "body")
         )`</${tag.node.name}>`;
       }
       if (isHTML && extra.tagNameNullable) {
@@ -5299,9 +5301,7 @@ var native_tag_default = {
           import_compiler29.types.ifStatement(tag.node.name, consumeHTML(tag))
         )[0].skip();
       }
-      if (nodeRef2 && (extra[kSerializeMarker] || extra[kSerializeMarker] === void 0 && (isStatefulReferences(extra.referencedBindings) || tag.node.attributes.some(
-        (attr2) => isStatefulReferences(attr2.value.extra?.referencedBindings)
-      )))) {
+      if (shouldMark) {
         markNode(tag, nodeRef2);
       }
       exit2(tag);

package/dist/translator/util/references.d.ts

@@ -21,6 +21,7 @@ export type Binding = {
     section: Section;
     closureSections: Opt<Section>;
     serialize: boolean;
+    sources: Set<Binding>;
     aliases: Set<Binding>;
     hoists: Map<Section, Binding>;
     property: string | undefined;
@@ -72,7 +73,6 @@ export declare const intersectionMeta: WeakMap<Intersection, {
     id: number;
     scopeOffset: Binding | undefined;
 }>;
-export declare function getSourceBindings(binding: Binding): Set<Binding>;
 export declare const bindingUtil: Sorted<Binding>;
 export declare function addReadToExpression(path: t.NodePath, binding: Binding, node?: t.Identifier | t.MemberExpression): ReferencedExtra;
 export declare function dropReferences(node: t.Node | t.Node[]): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.52",
+  "version": "6.0.0-next.3.54",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",