marko 6.0.10 → 6.0.11

package/dist/debug/dom.js

@@ -273,87 +273,115 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const render = resumeRender[renderId] = renders2[renderId] || renders2(renderId);
         const walk2 = render.w;
         const commentPrefixLen = render.i.length;
-        const branchStack = [];
         const scopeLookup = render.s = {};
         const serializeContext = {
           _: registeredValues
         };
-        const branchIds = /* @__PURE__ */ new Set();
-        const parentBranchIds = /* @__PURE__ */ new Map();
-        const branchEnd = (branchId, reference) => {
-          const branch = scopeLookup[branchId] ||= {};
-          let endNode = reference;
-          let prevNode;
-          while ((prevNode = endNode.previousSibling) !== branch.___startNode && ~visits.indexOf(endNode = prevNode)) ;
-          branch.___endNode = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode;
-          branch.___startNode ||= lastEndNode;
-          branchIds.add(branchId);
-          return branch;
-        };
-        let currentBranchId;
+        const branches = branchesEnabled && /* @__PURE__ */ (() => {
+          const branchStack = [];
+          const branchIds = /* @__PURE__ */ new Set();
+          const parentBranchIds = /* @__PURE__ */ new Map();
+          let lastEndNode;
+          let currentBranchId;
+          const endBranch = (branchId, reference) => {
+            const branch = scopeLookup[branchId] ||= {};
+            let endNode = reference;
+            let prevNode;
+            while ((prevNode = endNode.previousSibling) !== branch.___startNode && ~visits.indexOf(endNode = prevNode)) ;
+            branch.___endNode = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode;
+            branch.___startNode ||= lastEndNode;
+            branchIds.add(branchId);
+            return branch;
+          };
+          return {
+            ___visit() {
+              if (visitToken === "[" /* BranchStart */) {
+                if (currentBranchId && visitDataIndex) {
+                  endBranch(currentBranchId, visit);
+                  currentBranchId = branchStack.pop();
+                }
+                if (currentBranchId) {
+                  branchStack.push(currentBranchId);
+                  parentBranchIds.set(scopeId, currentBranchId);
+                }
+                currentBranchId = scopeId;
+                visitScope.___startNode = visit;
+              } else if (visitToken === "]" /* BranchEnd */) {
+                const curParent = visit.parentNode;
+                const startNode = endBranch(
+                  currentBranchId,
+                  visit
+                ).___startNode;
+                visitScope[visitData] = visit;
+                if (curParent !== startNode.parentNode) {
+                  curParent.prepend(startNode);
+                }
+                currentBranchId = branchStack.pop();
+              } else {
+                let next = visitData.indexOf(" ");
+                let curNode = visit;
+                visitScope[~next ? visitData.slice(0, next) : visitData] = visitToken === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
+                while (~next) {
+                  const start = next + 1;
+                  next = visitData.indexOf(" ", start);
+                  const childScopeId = +visitData.slice(
+                    start,
+                    ~next ? next : visitData.length
+                  );
+                  curNode = endBranch(childScopeId, curNode).___endNode;
+                  parentBranchIds.set(childScopeId, scopeId);
+                }
+              }
+            },
+            ___scope(scope) {
+              const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
+              if (parentBranchId) {
+                scope.___closestBranch = scopeLookup[parentBranchId];
+              }
+              if (branchIds.has(scopeId)) {
+                const branch = scope;
+                const parentBranch = branch.___closestBranch;
+                scope.___closestBranch = branch;
+                if (parentBranch) {
+                  branch.___parentBranch = parentBranch;
+                  (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(branch);
+                }
+              }
+            }
+          };
+        })();
         let $global;
         let lastScopeId = 0;
         let lastEffect;
-        let lastEndNode;
         let visits;
         let resumes;
+        let scopeId;
+        let visit;
+        let visitText;
+        let visitData;
+        let visitDataIndex;
+        let visitToken;
+        let visitScope;
         render.w = () => {
           try {
             walk2();
             isResuming = 1;
-            for (const visit of visits = render.v) {
-              const commentText = visit.data;
-              const dataIndex = commentText.indexOf(" ") + 1;
-              const scopeId = +commentText.slice(
+            for (visit of visits = render.v) {
+              visitText = visit.data;
+              visitDataIndex = visitText.indexOf(" ") + 1;
+              scopeId = +visitText.slice(
                 commentPrefixLen + 1,
-                dataIndex ? dataIndex - 1 : commentText.length
+                visitDataIndex ? visitDataIndex - 1 : visitText.length
               );
-              const scope = scopeLookup[scopeId] ||= {
+              visitData = visitDataIndex ? visitText.slice(visitDataIndex) : "";
+              visitToken = visitText[commentPrefixLen];
+              visitScope = scopeLookup[scopeId] ||= {
                 ___id: scopeId
               };
-              const data2 = dataIndex ? commentText.slice(dataIndex) : "";
-              const token = commentText[commentPrefixLen];
-              if (token === "*" /* Node */) {
-                const node = scope[data2] = visit.previousSibling;
-                scope["Getter:" /* Getter */ + data2] = () => node;
-              } else if (branchesEnabled) {
-                if (token === "[" /* BranchStart */) {
-                  if (currentBranchId && dataIndex) {
-                    branchEnd(currentBranchId, visit);
-                    currentBranchId = branchStack.pop();
-                  }
-                  if (currentBranchId) {
-                    branchStack.push(currentBranchId);
-                    parentBranchIds.set(scopeId, currentBranchId);
-                  }
-                  currentBranchId = scopeId;
-                  scope.___startNode = visit;
-                } else if (token === "]" /* BranchEnd */) {
-                  scope[data2] = visit;
-                  const curParent = visit.parentNode;
-                  const startNode = branchEnd(
-                    currentBranchId,
-                    visit
-                  ).___startNode;
-                  if (curParent !== startNode.parentNode) {
-                    curParent.prepend(startNode);
-                  }
-                  currentBranchId = branchStack.pop();
-                } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-                  let next = data2.indexOf(" ");
-                  let curNode = visit;
-                  scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
-                  while (~next) {
-                    const start = next + 1;
-                    next = data2.indexOf(" ", start);
-                    const childScopeId = +data2.slice(
-                      start,
-                      ~next ? next : data2.length
-                    );
-                    curNode = branchEnd(childScopeId, curNode).___endNode;
-                    parentBranchIds.set(childScopeId, scopeId);
-                  }
-                }
+              if (visitToken === "*" /* Node */) {
+                visitScope["Getter:" /* Getter */ + visitData] = /* @__PURE__ */ ((node) => () => node)(visitScope[visitData] = visit.previousSibling);
+              } else if (branches) {
+                branches.___visit();
               }
             }
             for (const serialized of resumes = render.r || []) {
@@ -374,32 +402,17 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                   } else if (typeof scope === "number") {
                     lastScopeId += scope;
                   } else {
-                    const scopeId = ++lastScopeId;
-                    const prevScope = scopeLookup[scopeId];
+                    scopeId = ++lastScopeId;
                     scope.$global = $global;
                     scope.___id = scopeId;
-                    if (prevScope !== scope) {
+                    if (scopeLookup[scopeId] !== scope) {
                       scopeLookup[scopeId] = Object.assign(
                         scope,
-                        prevScope
+                        scopeLookup[scopeId]
                       );
                     }
-                    if (branchesEnabled) {
-                      const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
-                      if (parentBranchId) {
-                        scope.___closestBranch = scopeLookup[parentBranchId];
-                      }
-                      if (branchIds.has(scopeId)) {
-                        const branch = scope;
-                        const parentBranch = branch.___closestBranch;
-                        scope.___closestBranch = branch;
-                        if (parentBranch) {
-                          branch.___parentBranch = parentBranch;
-                          (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(
-                            branch
-                          );
-                        }
-                      }
+                    if (branches) {
+                      branches.___scope(scope);
                     }
                     if (true) {
                       scope.___debugId = "server-" + scopeId;

package/dist/debug/dom.mjs

@@ -181,87 +181,115 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const render = resumeRender[renderId] = renders2[renderId] || renders2(renderId);
         const walk2 = render.w;
         const commentPrefixLen = render.i.length;
-        const branchStack = [];
         const scopeLookup = render.s = {};
         const serializeContext = {
           _: registeredValues
         };
-        const branchIds = /* @__PURE__ */ new Set();
-        const parentBranchIds = /* @__PURE__ */ new Map();
-        const branchEnd = (branchId, reference) => {
-          const branch = scopeLookup[branchId] ||= {};
-          let endNode = reference;
-          let prevNode;
-          while ((prevNode = endNode.previousSibling) !== branch.___startNode && ~visits.indexOf(endNode = prevNode)) ;
-          branch.___endNode = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode;
-          branch.___startNode ||= lastEndNode;
-          branchIds.add(branchId);
-          return branch;
-        };
-        let currentBranchId;
+        const branches = branchesEnabled && /* @__PURE__ */ (() => {
+          const branchStack = [];
+          const branchIds = /* @__PURE__ */ new Set();
+          const parentBranchIds = /* @__PURE__ */ new Map();
+          let lastEndNode;
+          let currentBranchId;
+          const endBranch = (branchId, reference) => {
+            const branch = scopeLookup[branchId] ||= {};
+            let endNode = reference;
+            let prevNode;
+            while ((prevNode = endNode.previousSibling) !== branch.___startNode && ~visits.indexOf(endNode = prevNode)) ;
+            branch.___endNode = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode;
+            branch.___startNode ||= lastEndNode;
+            branchIds.add(branchId);
+            return branch;
+          };
+          return {
+            ___visit() {
+              if (visitToken === "[" /* BranchStart */) {
+                if (currentBranchId && visitDataIndex) {
+                  endBranch(currentBranchId, visit);
+                  currentBranchId = branchStack.pop();
+                }
+                if (currentBranchId) {
+                  branchStack.push(currentBranchId);
+                  parentBranchIds.set(scopeId, currentBranchId);
+                }
+                currentBranchId = scopeId;
+                visitScope.___startNode = visit;
+              } else if (visitToken === "]" /* BranchEnd */) {
+                const curParent = visit.parentNode;
+                const startNode = endBranch(
+                  currentBranchId,
+                  visit
+                ).___startNode;
+                visitScope[visitData] = visit;
+                if (curParent !== startNode.parentNode) {
+                  curParent.prepend(startNode);
+                }
+                currentBranchId = branchStack.pop();
+              } else {
+                let next = visitData.indexOf(" ");
+                let curNode = visit;
+                visitScope[~next ? visitData.slice(0, next) : visitData] = visitToken === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
+                while (~next) {
+                  const start = next + 1;
+                  next = visitData.indexOf(" ", start);
+                  const childScopeId = +visitData.slice(
+                    start,
+                    ~next ? next : visitData.length
+                  );
+                  curNode = endBranch(childScopeId, curNode).___endNode;
+                  parentBranchIds.set(childScopeId, scopeId);
+                }
+              }
+            },
+            ___scope(scope) {
+              const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
+              if (parentBranchId) {
+                scope.___closestBranch = scopeLookup[parentBranchId];
+              }
+              if (branchIds.has(scopeId)) {
+                const branch = scope;
+                const parentBranch = branch.___closestBranch;
+                scope.___closestBranch = branch;
+                if (parentBranch) {
+                  branch.___parentBranch = parentBranch;
+                  (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(branch);
+                }
+              }
+            }
+          };
+        })();
         let $global;
         let lastScopeId = 0;
         let lastEffect;
-        let lastEndNode;
         let visits;
         let resumes;
+        let scopeId;
+        let visit;
+        let visitText;
+        let visitData;
+        let visitDataIndex;
+        let visitToken;
+        let visitScope;
         render.w = () => {
           try {
             walk2();
             isResuming = 1;
-            for (const visit of visits = render.v) {
-              const commentText = visit.data;
-              const dataIndex = commentText.indexOf(" ") + 1;
-              const scopeId = +commentText.slice(
+            for (visit of visits = render.v) {
+              visitText = visit.data;
+              visitDataIndex = visitText.indexOf(" ") + 1;
+              scopeId = +visitText.slice(
                 commentPrefixLen + 1,
-                dataIndex ? dataIndex - 1 : commentText.length
+                visitDataIndex ? visitDataIndex - 1 : visitText.length
               );
-              const scope = scopeLookup[scopeId] ||= {
+              visitData = visitDataIndex ? visitText.slice(visitDataIndex) : "";
+              visitToken = visitText[commentPrefixLen];
+              visitScope = scopeLookup[scopeId] ||= {
                 ___id: scopeId
               };
-              const data2 = dataIndex ? commentText.slice(dataIndex) : "";
-              const token = commentText[commentPrefixLen];
-              if (token === "*" /* Node */) {
-                const node = scope[data2] = visit.previousSibling;
-                scope["Getter:" /* Getter */ + data2] = () => node;
-              } else if (branchesEnabled) {
-                if (token === "[" /* BranchStart */) {
-                  if (currentBranchId && dataIndex) {
-                    branchEnd(currentBranchId, visit);
-                    currentBranchId = branchStack.pop();
-                  }
-                  if (currentBranchId) {
-                    branchStack.push(currentBranchId);
-                    parentBranchIds.set(scopeId, currentBranchId);
-                  }
-                  currentBranchId = scopeId;
-                  scope.___startNode = visit;
-                } else if (token === "]" /* BranchEnd */) {
-                  scope[data2] = visit;
-                  const curParent = visit.parentNode;
-                  const startNode = branchEnd(
-                    currentBranchId,
-                    visit
-                  ).___startNode;
-                  if (curParent !== startNode.parentNode) {
-                    curParent.prepend(startNode);
-                  }
-                  currentBranchId = branchStack.pop();
-                } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-                  let next = data2.indexOf(" ");
-                  let curNode = visit;
-                  scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
-                  while (~next) {
-                    const start = next + 1;
-                    next = data2.indexOf(" ", start);
-                    const childScopeId = +data2.slice(
-                      start,
-                      ~next ? next : data2.length
-                    );
-                    curNode = branchEnd(childScopeId, curNode).___endNode;
-                    parentBranchIds.set(childScopeId, scopeId);
-                  }
-                }
+              if (visitToken === "*" /* Node */) {
+                visitScope["Getter:" /* Getter */ + visitData] = /* @__PURE__ */ ((node) => () => node)(visitScope[visitData] = visit.previousSibling);
+              } else if (branches) {
+                branches.___visit();
               }
             }
             for (const serialized of resumes = render.r || []) {
@@ -282,32 +310,17 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                   } else if (typeof scope === "number") {
                     lastScopeId += scope;
                   } else {
-                    const scopeId = ++lastScopeId;
-                    const prevScope = scopeLookup[scopeId];
+                    scopeId = ++lastScopeId;
                     scope.$global = $global;
                     scope.___id = scopeId;
-                    if (prevScope !== scope) {
+                    if (scopeLookup[scopeId] !== scope) {
                       scopeLookup[scopeId] = Object.assign(
                         scope,
-                        prevScope
+                        scopeLookup[scopeId]
                       );
                     }
-                    if (branchesEnabled) {
-                      const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
-                      if (parentBranchId) {
-                        scope.___closestBranch = scopeLookup[parentBranchId];
-                      }
-                      if (branchIds.has(scopeId)) {
-                        const branch = scope;
-                        const parentBranch = branch.___closestBranch;
-                        scope.___closestBranch = branch;
-                        if (parentBranch) {
-                          branch.___parentBranch = parentBranch;
-                          (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(
-                            branch
-                          );
-                        }
-                      }
+                    if (branches) {
+                      branches.___scope(scope);
                     }
                     if (true) {
                       scope.___debugId = "server-" + scopeId;

package/dist/dom/resume.d.ts

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

package/dist/dom.js

@@ -209,50 +209,56 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   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, commentPrefixLen = render.i.length, branchStack = [], scopeLookup = render.s = {}, serializeContext = {
+        let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), branchEnd = (branchId, reference) => {
-          let branch = scopeLookup[branchId] ||= {}, endNode = reference, prevNode;
-          for (; (prevNode = endNode.previousSibling) !== branch.h && ~visits.indexOf(endNode = prevNode); ) ;
-          return branch.j = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode, branch.h ||= lastEndNode, branchIds.add(branchId), branch;
-        }, currentBranchId, $global, lastScopeId = 0, lastEffect, lastEndNode, visits, resumes;
+        }, branches = branchesEnabled && /* @__PURE__ */ (() => {
+          let branchStack = [], branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), lastEndNode, currentBranchId, endBranch = (branchId, reference) => {
+            let branch = scopeLookup[branchId] ||= {}, endNode = reference, prevNode;
+            for (; (prevNode = endNode.previousSibling) !== branch.h && ~visits.indexOf(endNode = prevNode); ) ;
+            return branch.j = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode, branch.h ||= lastEndNode, branchIds.add(branchId), branch;
+          };
+          return {
+            J() {
+              if (visitToken === "[" /* BranchStart */)
+                currentBranchId && visitDataIndex && (endBranch(currentBranchId, visit), currentBranchId = branchStack.pop()), currentBranchId && (branchStack.push(currentBranchId), parentBranchIds.set(scopeId, currentBranchId)), currentBranchId = scopeId, visitScope.h = visit;
+              else if (visitToken === "]" /* BranchEnd */) {
+                let curParent = visit.parentNode, startNode = endBranch(
+                  currentBranchId,
+                  visit
+                ).h;
+                visitScope[visitData] = visit, curParent !== startNode.parentNode && curParent.prepend(startNode), currentBranchId = branchStack.pop();
+              } else {
+                let next = visitData.indexOf(" "), curNode = visit;
+                for (visitScope[~next ? visitData.slice(0, next) : visitData] = visitToken === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
+                  let start = next + 1;
+                  next = visitData.indexOf(" ", start);
+                  let childScopeId = +visitData.slice(
+                    start,
+                    ~next ? next : visitData.length
+                  );
+                  curNode = endBranch(childScopeId, curNode).j, parentBranchIds.set(childScopeId, scopeId);
+                }
+              }
+            },
+            o(scope) {
+              let parentBranchId = scope.g || parentBranchIds.get(scopeId);
+              if (parentBranchId && (scope.k = scopeLookup[parentBranchId]), branchIds.has(scopeId)) {
+                let branch = scope, parentBranch = branch.k;
+                scope.k = branch, parentBranch && (branch.u = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch));
+              }
+            }
+          };
+        })(), $global, lastScopeId = 0, lastEffect, visits, resumes, scopeId, visit, visitText, visitData, visitDataIndex, visitToken, visitScope;
         return render.w = () => {
           try {
             walk2(), isResuming = 1;
-            for (let visit of visits = render.v) {
-              let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = +commentText.slice(
+            for (visit of visits = render.v)
+              visitText = visit.data, visitDataIndex = visitText.indexOf(" ") + 1, scopeId = +visitText.slice(
                 commentPrefixLen + 1,
-                dataIndex ? dataIndex - 1 : commentText.length
-              ), scope = scopeLookup[scopeId] ||= {
+                visitDataIndex ? visitDataIndex - 1 : visitText.length
+              ), visitData = visitDataIndex ? visitText.slice(visitDataIndex) : "", visitToken = visitText[commentPrefixLen], visitScope = scopeLookup[scopeId] ||= {
                 m: scopeId
-              }, data2 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
-              if (token === "*" /* Node */) {
-                let node = scope[data2] = visit.previousSibling;
-                scope["j" /* Getter */ + data2] = () => node;
-              } else if (branchesEnabled) {
-                if (token === "[" /* BranchStart */)
-                  currentBranchId && dataIndex && (branchEnd(currentBranchId, visit), currentBranchId = branchStack.pop()), currentBranchId && (branchStack.push(currentBranchId), parentBranchIds.set(scopeId, currentBranchId)), currentBranchId = scopeId, scope.h = visit;
-                else if (token === "]" /* BranchEnd */) {
-                  scope[data2] = visit;
-                  let curParent = visit.parentNode, startNode = branchEnd(
-                    currentBranchId,
-                    visit
-                  ).h;
-                  curParent !== startNode.parentNode && curParent.prepend(startNode), currentBranchId = branchStack.pop();
-                } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-                  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 = data2.indexOf(" ", start);
-                    let childScopeId = +data2.slice(
-                      start,
-                      ~next ? next : data2.length
-                    );
-                    curNode = branchEnd(childScopeId, curNode).j, parentBranchIds.set(childScopeId, scopeId);
-                  }
-                }
-              }
-            }
+              }, visitToken === "*" /* Node */ ? visitScope["j" /* Getter */ + visitData] = /* @__PURE__ */ ((node) => () => node)(visitScope[visitData] = visit.previousSibling) : branches && branches.J();
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
@@ -263,25 +269,10 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 );
               else
                 for (let scope of serialized(serializeContext))
-                  if (!$global)
-                    $global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.o = 1e6;
-                  else if (typeof scope == "number")
-                    lastScopeId += scope;
-                  else {
-                    let scopeId = ++lastScopeId, prevScope = scopeLookup[scopeId];
-                    if (scope.$global = $global, scope.m = scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
-                      scope,
-                      prevScope
-                    )), branchesEnabled) {
-                      let parentBranchId = scope.g || parentBranchIds.get(scopeId);
-                      if (parentBranchId && (scope.k = scopeLookup[parentBranchId]), branchIds.has(scopeId)) {
-                        let branch = scope, parentBranch = branch.k;
-                        scope.k = branch, parentBranch && (branch.t = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(
-                          branch
-                        ));
-                      }
-                    }
-                  }
+                  $global ? typeof scope == "number" ? lastScopeId += scope : (scopeId = ++lastScopeId, scope.$global = $global, scope.m = scopeId, scopeLookup[scopeId] !== scope && (scopeLookup[scopeId] = Object.assign(
+                    scope,
+                    scopeLookup[scopeId]
+                  )), branches && branches.o(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.p = 1e6);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }
@@ -714,29 +705,29 @@ function toInsertNode(startNode, endNode) {
 // src/dom/scope.ts
 function createScope($global, closestBranch) {
   let scope = {
-    m: $global.o++,
-    p: 1,
+    m: $global.p++,
+    q: 1,
     k: closestBranch,
     $global
   };
   return pendingScopes.push(scope), scope;
 }
 function skipScope(scope) {
-  return scope.$global.o++;
+  return scope.$global.p++;
 }
 function findBranchWithKey(scope, key) {
   let branch = scope.k;
   for (; branch && !branch[key]; )
-    branch = branch.t;
+    branch = branch.u;
   return branch;
 }
 function destroyBranch(branch) {
-  branch.t?.z?.delete(branch), destroyNestedBranches(branch);
+  branch.u?.A?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.A = 1, branch.z?.forEach(destroyNestedBranches), branch.J?.forEach((scope) => {
-    for (let id in scope.u)
-      scope.u[id]?.abort();
+  branch.B = 1, branch.A?.forEach(destroyNestedBranches), branch.K?.forEach((scope) => {
+    for (let id in scope.x)
+      scope.x[id]?.abort();
   });
 }
 function removeAndDestroyBranch(branch) {
@@ -872,7 +863,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.k;
-  return branch._ = renderer.x || parentScope, branch.k = branch, parentBranch && (branch.t = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(branch)), renderer.B?.(
+  return branch._ = renderer.y || parentScope, branch.k = branch, parentBranch && (branch.u = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch)), renderer.C?.(
     branch,
     parentNode.namespaceURI
   ), branch;
@@ -884,10 +875,10 @@ function createAndSetupBranch($global, renderer, parentScope, parentNode) {
   );
 }
 function setupBranch(renderer, branch) {
-  return (renderer.C || renderer.E) && queueRender(
+  return (renderer.D || renderer.E) && queueRender(
     branch,
     (branch2) => {
-      renderer.C?.(branch2), renderer.E?.(branch2);
+      renderer.D?.(branch2), renderer.E?.(branch2);
     },
     -1
   ), branch;
@@ -908,12 +899,12 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
   };
   return (owner) => ({
     m: id,
-    B: clone,
-    x: owner,
-    C: setup,
+    C: clone,
+    y: owner,
+    D: setup,
     l: params,
     E: closures,
-    y: dynamicScopesAccessor
+    z: dynamicScopesAccessor
   });
 }
 function registerContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
@@ -984,7 +975,7 @@ function value(valueAccessor, fn = () => {
 }
 function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "m") {
   return (scope) => {
-    scope.p ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+    scope.q ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
@@ -994,7 +985,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.p && !scope.A && childSignal(scope);
+          !scope.q && !scope.B && childSignal(scope);
       },
       -1,
       0,
@@ -1006,7 +997,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.p && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.q && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }
@@ -1020,11 +1011,11 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
 function dynamicClosure(...closureSignals) {
   let [{ F: ___scopeInstancesAccessor, G: ___signalIndexAccessor }] = closureSignals;
   for (let i = closureSignals.length; i--; )
-    closureSignals[i].K = i;
+    closureSignals[i].L = i;
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
-        childScope.p || queueRender(
+        childScope.q || queueRender(
           childScope,
           closureSignals[childScope[___signalIndexAccessor]],
           -1
@@ -1033,7 +1024,7 @@ function dynamicClosure(...closureSignals) {
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
   let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
-    scope[closureSignal.G] = closureSignal.K, childSignal(scope), subscribeToScopeSet(
+    scope[closureSignal.G] = closureSignal.L, childSignal(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
       closureSignal.F,
       scope
@@ -1209,15 +1200,15 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             0,
             content,
             createAndSetupBranch
-          ), content.y && subscribeToScopeSet(
-            content.x,
+          ), content.z && subscribeToScopeSet(
             content.y,
+            content.z,
             scope[childScopeAccessor]["d" /* ConditionalScope */ + 0]
           );
         }
-      } else normalizedRenderer?.y && subscribeToScopeSet(
-        normalizedRenderer.x,
+      } else normalizedRenderer?.z && subscribeToScopeSet(
         normalizedRenderer.y,
+        normalizedRenderer.z,
         scope[childScopeAccessor]
       );
     if (normalizedRenderer) {
@@ -1315,14 +1306,14 @@ function queueRender(scope, signal, signalKey, value2, scopeKey = scope.m) {
     existingRender.I = value2;
   else {
     let render = {
-      q: key,
-      D: scope,
-      L: signal,
+      t: key,
+      o: scope,
+      M: signal,
       I: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
-      if (key - parent.q >= 0) break;
+      if (key - parent.t >= 0) break;
       pendingRenders[i] = parent, i = parentIndex;
     }
     signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
@@ -1361,54 +1352,54 @@ function runRenders() {
   for (; pendingRenders.length; ) {
     let render = pendingRenders[0], item = pendingRenders.pop();
     if (render !== item) {
-      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).q;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).t;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].q - pendingRenders[bestChild].q < 0 && (bestChild = right), pendingRenders[bestChild].q - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].t - pendingRenders[bestChild].t < 0 && (bestChild = right), pendingRenders[bestChild].t - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.D.k?.A || runRender(render);
+    render.o.k?.B || runRender(render);
   }
   for (let scope of pendingScopes)
-    scope.p = 0;
+    scope.q = 0;
   pendingScopes = [];
 }
-var runRender = (render) => render.L(render.D, render.I), enableCatch = () => {
+var runRender = (render) => render.M(render.o, render.I), enableCatch = () => {
   enableCatch = () => {
   }, enableBranches();
   let handlePendingTry = (fn, scope, branch) => {
     for (; branch; ) {
       if (branch.n)
         return (branch.H ||= []).push(fn, scope);
-      branch = branch.t;
+      branch = branch.u;
     }
   };
   runEffects = /* @__PURE__ */ ((runEffects2) => (effects, checkPending = placeholderShown.has(effects)) => {
     if (checkPending || caughtError.has(effects)) {
       let i = 0, fn, scope, branch;
       for (; i < effects.length; )
-        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.A && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope, scope);
+        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.B && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope, scope);
     } else
       runEffects2(effects);
   })(runEffects), runRender = /* @__PURE__ */ ((runRender2) => (render) => {
     try {
       runRender2(render);
     } catch (error) {
-      renderCatch(render.D, error);
+      renderCatch(render.o, error);
     }
   })(runRender);
 };
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.u?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.u[id] = void 0);
+  let ctrl = scope.x?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.x[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.k && (scope.k.J ||= /* @__PURE__ */ new Set()).add(scope), ((scope.u ||= {})[id] ||= new AbortController()).signal;
+  return scope.k && (scope.k.K ||= /* @__PURE__ */ new Set()).add(scope), ((scope.x ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1430,7 +1421,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.B;
+    return renderer.C;
   },
   getStartNode(branch) {
     return branch.h;
@@ -1455,7 +1446,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   },
   createRenderer(params, clone) {
     let renderer = createRenderer(0, 0, 0, params);
-    return renderer.B = (branch) => {
+    return renderer.C = (branch) => {
       let cloned = clone();
       branch.h = cloned.startNode, branch.j = cloned.endNode;
     }, renderer;
@@ -1470,10 +1461,10 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = 1 : (out.global.o ||= 0, branch = component.scope = createAndSetupBranch(
+      branch ? existing = 1 : (out.global.p ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
-        renderer.x,
+        renderer.y,
         document.body
       )), renderer.l?.(branch, renderer._ ? args[0] : args);
     }), !existing)
@@ -1495,12 +1486,12 @@ var createTemplate = (id, template, walks, setup, inputSignal) => {
 function mount(input = {}, reference, position) {
   let branch, parentNode = reference, nextSibling = null, { $global } = input;
   switch ($global ? ({ $global, ...input } = input, $global = {
-    o: 0,
+    p: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID,
     ...$global
   }) : $global = {
-    o: 0,
+    p: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
   }, position) {
@@ -1520,7 +1511,7 @@ function mount(input = {}, reference, position) {
       this,
       void 0,
       parentNode
-    ), this.C?.(branch), args?.(branch, input);
+    ), this.D?.(branch), args?.(branch, input);
   });
   return insertChildNodes(
     parentNode,

package/dist/dom.mjs

@@ -120,50 +120,56 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   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, commentPrefixLen = render.i.length, branchStack = [], scopeLookup = render.s = {}, serializeContext = {
+        let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
-        }, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), branchEnd = (branchId, reference) => {
-          let branch = scopeLookup[branchId] ||= {}, endNode = reference, prevNode;
-          for (; (prevNode = endNode.previousSibling) !== branch.h && ~visits.indexOf(endNode = prevNode); ) ;
-          return branch.j = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode, branch.h ||= lastEndNode, branchIds.add(branchId), branch;
-        }, currentBranchId, $global, lastScopeId = 0, lastEffect, lastEndNode, visits, resumes;
+        }, branches = branchesEnabled && /* @__PURE__ */ (() => {
+          let branchStack = [], branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map(), lastEndNode, currentBranchId, endBranch = (branchId, reference) => {
+            let branch = scopeLookup[branchId] ||= {}, endNode = reference, prevNode;
+            for (; (prevNode = endNode.previousSibling) !== branch.h && ~visits.indexOf(endNode = prevNode); ) ;
+            return branch.j = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode, branch.h ||= lastEndNode, branchIds.add(branchId), branch;
+          };
+          return {
+            J() {
+              if (visitToken === "[" /* BranchStart */)
+                currentBranchId && visitDataIndex && (endBranch(currentBranchId, visit), currentBranchId = branchStack.pop()), currentBranchId && (branchStack.push(currentBranchId), parentBranchIds.set(scopeId, currentBranchId)), currentBranchId = scopeId, visitScope.h = visit;
+              else if (visitToken === "]" /* BranchEnd */) {
+                let curParent = visit.parentNode, startNode = endBranch(
+                  currentBranchId,
+                  visit
+                ).h;
+                visitScope[visitData] = visit, curParent !== startNode.parentNode && curParent.prepend(startNode), currentBranchId = branchStack.pop();
+              } else {
+                let next = visitData.indexOf(" "), curNode = visit;
+                for (visitScope[~next ? visitData.slice(0, next) : visitData] = visitToken === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit; ~next; ) {
+                  let start = next + 1;
+                  next = visitData.indexOf(" ", start);
+                  let childScopeId = +visitData.slice(
+                    start,
+                    ~next ? next : visitData.length
+                  );
+                  curNode = endBranch(childScopeId, curNode).j, parentBranchIds.set(childScopeId, scopeId);
+                }
+              }
+            },
+            o(scope) {
+              let parentBranchId = scope.g || parentBranchIds.get(scopeId);
+              if (parentBranchId && (scope.k = scopeLookup[parentBranchId]), branchIds.has(scopeId)) {
+                let branch = scope, parentBranch = branch.k;
+                scope.k = branch, parentBranch && (branch.u = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch));
+              }
+            }
+          };
+        })(), $global, lastScopeId = 0, lastEffect, visits, resumes, scopeId, visit, visitText, visitData, visitDataIndex, visitToken, visitScope;
         return render.w = () => {
           try {
             walk2(), isResuming = 1;
-            for (let visit of visits = render.v) {
-              let commentText = visit.data, dataIndex = commentText.indexOf(" ") + 1, scopeId = +commentText.slice(
+            for (visit of visits = render.v)
+              visitText = visit.data, visitDataIndex = visitText.indexOf(" ") + 1, scopeId = +visitText.slice(
                 commentPrefixLen + 1,
-                dataIndex ? dataIndex - 1 : commentText.length
-              ), scope = scopeLookup[scopeId] ||= {
+                visitDataIndex ? visitDataIndex - 1 : visitText.length
+              ), visitData = visitDataIndex ? visitText.slice(visitDataIndex) : "", visitToken = visitText[commentPrefixLen], visitScope = scopeLookup[scopeId] ||= {
                 m: scopeId
-              }, data2 = dataIndex ? commentText.slice(dataIndex) : "", token = commentText[commentPrefixLen];
-              if (token === "*" /* Node */) {
-                let node = scope[data2] = visit.previousSibling;
-                scope["j" /* Getter */ + data2] = () => node;
-              } else if (branchesEnabled) {
-                if (token === "[" /* BranchStart */)
-                  currentBranchId && dataIndex && (branchEnd(currentBranchId, visit), currentBranchId = branchStack.pop()), currentBranchId && (branchStack.push(currentBranchId), parentBranchIds.set(scopeId, currentBranchId)), currentBranchId = scopeId, scope.h = visit;
-                else if (token === "]" /* BranchEnd */) {
-                  scope[data2] = visit;
-                  let curParent = visit.parentNode, startNode = branchEnd(
-                    currentBranchId,
-                    visit
-                  ).h;
-                  curParent !== startNode.parentNode && curParent.prepend(startNode), currentBranchId = branchStack.pop();
-                } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-                  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 = data2.indexOf(" ", start);
-                    let childScopeId = +data2.slice(
-                      start,
-                      ~next ? next : data2.length
-                    );
-                    curNode = branchEnd(childScopeId, curNode).j, parentBranchIds.set(childScopeId, scopeId);
-                  }
-                }
-              }
-            }
+              }, visitToken === "*" /* Node */ ? visitScope["j" /* Getter */ + visitData] = /* @__PURE__ */ ((node) => () => node)(visitScope[visitData] = visit.previousSibling) : branches && branches.J();
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
@@ -174,25 +180,10 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 );
               else
                 for (let scope of serialized(serializeContext))
-                  if (!$global)
-                    $global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.o = 1e6;
-                  else if (typeof scope == "number")
-                    lastScopeId += scope;
-                  else {
-                    let scopeId = ++lastScopeId, prevScope = scopeLookup[scopeId];
-                    if (scope.$global = $global, scope.m = scopeId, prevScope !== scope && (scopeLookup[scopeId] = Object.assign(
-                      scope,
-                      prevScope
-                    )), branchesEnabled) {
-                      let parentBranchId = scope.g || parentBranchIds.get(scopeId);
-                      if (parentBranchId && (scope.k = scopeLookup[parentBranchId]), branchIds.has(scopeId)) {
-                        let branch = scope, parentBranch = branch.k;
-                        scope.k = branch, parentBranch && (branch.t = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(
-                          branch
-                        ));
-                      }
-                    }
-                  }
+                  $global ? typeof scope == "number" ? lastScopeId += scope : (scopeId = ++lastScopeId, scope.$global = $global, scope.m = scopeId, scopeLookup[scopeId] !== scope && (scopeLookup[scopeId] = Object.assign(
+                    scope,
+                    scopeLookup[scopeId]
+                  )), branches && branches.o(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.p = 1e6);
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }
@@ -625,29 +616,29 @@ function toInsertNode(startNode, endNode) {
 // src/dom/scope.ts
 function createScope($global, closestBranch) {
   let scope = {
-    m: $global.o++,
-    p: 1,
+    m: $global.p++,
+    q: 1,
     k: closestBranch,
     $global
   };
   return pendingScopes.push(scope), scope;
 }
 function skipScope(scope) {
-  return scope.$global.o++;
+  return scope.$global.p++;
 }
 function findBranchWithKey(scope, key) {
   let branch = scope.k;
   for (; branch && !branch[key]; )
-    branch = branch.t;
+    branch = branch.u;
   return branch;
 }
 function destroyBranch(branch) {
-  branch.t?.z?.delete(branch), destroyNestedBranches(branch);
+  branch.u?.A?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.A = 1, branch.z?.forEach(destroyNestedBranches), branch.J?.forEach((scope) => {
-    for (let id in scope.u)
-      scope.u[id]?.abort();
+  branch.B = 1, branch.A?.forEach(destroyNestedBranches), branch.K?.forEach((scope) => {
+    for (let id in scope.x)
+      scope.x[id]?.abort();
   });
 }
 function removeAndDestroyBranch(branch) {
@@ -783,7 +774,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.k;
-  return branch._ = renderer.x || parentScope, branch.k = branch, parentBranch && (branch.t = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(branch)), renderer.B?.(
+  return branch._ = renderer.y || parentScope, branch.k = branch, parentBranch && (branch.u = parentBranch, (parentBranch.A ||= /* @__PURE__ */ new Set()).add(branch)), renderer.C?.(
     branch,
     parentNode.namespaceURI
   ), branch;
@@ -795,10 +786,10 @@ function createAndSetupBranch($global, renderer, parentScope, parentNode) {
   );
 }
 function setupBranch(renderer, branch) {
-  return (renderer.C || renderer.E) && queueRender(
+  return (renderer.D || renderer.E) && queueRender(
     branch,
     (branch2) => {
-      renderer.C?.(branch2), renderer.E?.(branch2);
+      renderer.D?.(branch2), renderer.E?.(branch2);
     },
     -1
   ), branch;
@@ -819,12 +810,12 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
   };
   return (owner) => ({
     m: id,
-    B: clone,
-    x: owner,
-    C: setup,
+    C: clone,
+    y: owner,
+    D: setup,
     l: params,
     E: closures,
-    y: dynamicScopesAccessor
+    z: dynamicScopesAccessor
   });
 }
 function registerContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
@@ -895,7 +886,7 @@ function value(valueAccessor, fn = () => {
 }
 function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "m") {
   return (scope) => {
-    scope.p ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+    scope.q ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
@@ -905,7 +896,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.p && !scope.A && childSignal(scope);
+          !scope.q && !scope.B && childSignal(scope);
       },
       -1,
       0,
@@ -917,7 +908,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.p && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.q && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }
@@ -931,11 +922,11 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
 function dynamicClosure(...closureSignals) {
   let [{ F: ___scopeInstancesAccessor, G: ___signalIndexAccessor }] = closureSignals;
   for (let i = closureSignals.length; i--; )
-    closureSignals[i].K = i;
+    closureSignals[i].L = i;
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
-        childScope.p || queueRender(
+        childScope.q || queueRender(
           childScope,
           closureSignals[childScope[___signalIndexAccessor]],
           -1
@@ -944,7 +935,7 @@ function dynamicClosure(...closureSignals) {
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
   let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
-    scope[closureSignal.G] = closureSignal.K, childSignal(scope), subscribeToScopeSet(
+    scope[closureSignal.G] = closureSignal.L, childSignal(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
       closureSignal.F,
       scope
@@ -1120,15 +1111,15 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             0,
             content,
             createAndSetupBranch
-          ), content.y && subscribeToScopeSet(
-            content.x,
+          ), content.z && subscribeToScopeSet(
             content.y,
+            content.z,
             scope[childScopeAccessor]["d" /* ConditionalScope */ + 0]
           );
         }
-      } else normalizedRenderer?.y && subscribeToScopeSet(
-        normalizedRenderer.x,
+      } else normalizedRenderer?.z && subscribeToScopeSet(
         normalizedRenderer.y,
+        normalizedRenderer.z,
         scope[childScopeAccessor]
       );
     if (normalizedRenderer) {
@@ -1226,14 +1217,14 @@ function queueRender(scope, signal, signalKey, value2, scopeKey = scope.m) {
     existingRender.I = value2;
   else {
     let render = {
-      q: key,
-      D: scope,
-      L: signal,
+      t: key,
+      o: scope,
+      M: signal,
       I: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
-      if (key - parent.q >= 0) break;
+      if (key - parent.t >= 0) break;
       pendingRenders[i] = parent, i = parentIndex;
     }
     signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
@@ -1272,54 +1263,54 @@ function runRenders() {
   for (; pendingRenders.length; ) {
     let render = pendingRenders[0], item = pendingRenders.pop();
     if (render !== item) {
-      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).q;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).t;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].q - pendingRenders[bestChild].q < 0 && (bestChild = right), pendingRenders[bestChild].q - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].t - pendingRenders[bestChild].t < 0 && (bestChild = right), pendingRenders[bestChild].t - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.D.k?.A || runRender(render);
+    render.o.k?.B || runRender(render);
   }
   for (let scope of pendingScopes)
-    scope.p = 0;
+    scope.q = 0;
   pendingScopes = [];
 }
-var runRender = (render) => render.L(render.D, render.I), enableCatch = () => {
+var runRender = (render) => render.M(render.o, render.I), enableCatch = () => {
   enableCatch = () => {
   }, enableBranches();
   let handlePendingTry = (fn, scope, branch) => {
     for (; branch; ) {
       if (branch.n)
         return (branch.H ||= []).push(fn, scope);
-      branch = branch.t;
+      branch = branch.u;
     }
   };
   runEffects = /* @__PURE__ */ ((runEffects2) => (effects, checkPending = placeholderShown.has(effects)) => {
     if (checkPending || caughtError.has(effects)) {
       let i = 0, fn, scope, branch;
       for (; i < effects.length; )
-        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.A && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope, scope);
+        fn = effects[i++], scope = effects[i++], branch = scope.k, !branch?.B && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope, scope);
     } else
       runEffects2(effects);
   })(runEffects), runRender = /* @__PURE__ */ ((runRender2) => (render) => {
     try {
       runRender2(render);
     } catch (error) {
-      renderCatch(render.D, error);
+      renderCatch(render.o, error);
     }
   })(runRender);
 };
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.u?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.u[id] = void 0);
+  let ctrl = scope.x?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.x[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.k && (scope.k.J ||= /* @__PURE__ */ new Set()).add(scope), ((scope.u ||= {})[id] ||= new AbortController()).signal;
+  return scope.k && (scope.k.K ||= /* @__PURE__ */ new Set()).add(scope), ((scope.x ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1341,7 +1332,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.B;
+    return renderer.C;
   },
   getStartNode(branch) {
     return branch.h;
@@ -1366,7 +1357,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
   },
   createRenderer(params, clone) {
     let renderer = createRenderer(0, 0, 0, params);
-    return renderer.B = (branch) => {
+    return renderer.C = (branch) => {
       let cloned = clone();
       branch.h = cloned.startNode, branch.j = cloned.endNode;
     }, renderer;
@@ -1381,10 +1372,10 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         normalizedInput[key === "renderBody" ? "content" : key] = input[key];
     }
     if (component.effects = prepareEffects(() => {
-      branch ? existing = 1 : (out.global.o ||= 0, branch = component.scope = createAndSetupBranch(
+      branch ? existing = 1 : (out.global.p ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
-        renderer.x,
+        renderer.y,
         document.body
       )), renderer.l?.(branch, renderer._ ? args[0] : args);
     }), !existing)
@@ -1406,12 +1397,12 @@ var createTemplate = (id, template, walks, setup, inputSignal) => {
 function mount(input = {}, reference, position) {
   let branch, parentNode = reference, nextSibling = null, { $global } = input;
   switch ($global ? ({ $global, ...input } = input, $global = {
-    o: 0,
+    p: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID,
     ...$global
   }) : $global = {
-    o: 0,
+    p: 0,
     runtimeId: DEFAULT_RUNTIME_ID,
     renderId: DEFAULT_RENDER_ID
   }, position) {
@@ -1431,7 +1422,7 @@ function mount(input = {}, reference, position) {
       this,
       void 0,
       parentNode
-    ), this.C?.(branch), args?.(branch, input);
+    ), this.D?.(branch), args?.(branch, input);
   });
   return insertChildNodes(
     parentNode,

package/package.json

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