@marko/runtime-tags 6.0.103 → 6.0.105

package/dist/common/accessor.d.ts

@@ -1,36 +1,34 @@
 export declare enum AccessorPrefix {
-    ClosureScopes = "A",
-    ClosureSignalIndex = "B",
-    ConditionalRenderer = "C",
-    ConditionalScope = "D",
+    BranchScopes = "A",
+    ClosureScopes = "B",
+    ClosureSignalIndex = "C",
+    ConditionalRenderer = "D",
     ControlledHandler = "E",
     ControlledType = "F",
     ControlledValue = "G",
-    DynamicPlaceholderLastChild = "H",
+    DynamicHTMLLastChild = "H",
     EventAttributes = "I",
     Getter = "J",
     LifecycleAbortController = "K",
-    LoopScopeArray = "L",
-    LoopScopeMap = "M",
-    Promise = "N",
-    TagVariableChange = "O"
+    Promise = "L",
+    TagVariableChange = "M"
 }
 export declare enum AccessorProp {
     Global = "$",
     Owner = "_",
     AbortControllers = "A",
     AbortScopes = "B",
-    Args = "C",
-    BranchAccessor = "D",
-    BranchScopes = "E",
-    CatchContent = "F",
-    ClosestBranch = "G",
-    ClosestBranchId = "H",
-    Creating = "I",
-    Destroyed = "J",
-    Effects = "K",
-    EndNode = "L",
-    Id = "M",
+    BranchAccessor = "C",
+    BranchScopes = "D",
+    CatchContent = "E",
+    ClosestBranch = "F",
+    ClosestBranchId = "G",
+    Creating = "H",
+    Destroyed = "I",
+    PendingEffects = "J",
+    EndNode = "K",
+    Id = "L",
+    LoopKey = "M",
     ParentBranch = "N",
     PendingAsyncCount = "O",
     PlaceholderBranch = "P",

package/dist/common/accessor.debug.d.ts

@@ -1,17 +1,15 @@
 export declare enum AccessorPrefix {
+    BranchScopes = "BranchScopes:",
     ClosureScopes = "ClosureScopes:",
     ClosureSignalIndex = "ClosureSignalIndex:",
     ConditionalRenderer = "ConditionalRenderer:",
-    ConditionalScope = "ConditionalScope:",
     ControlledHandler = "ControlledHandler:",
     ControlledType = "ControlledType:",
     ControlledValue = "ControlledValue:",
-    DynamicPlaceholderLastChild = "DynamicPlaceholderLastChild:",
+    DynamicHTMLLastChild = "DynamicHTMLLastChild:",
     EventAttributes = "EventAttributes:",
     Getter = "Getter:",
     LifecycleAbortController = "LifecycleAbortController:",
-    LoopScopeArray = "LoopScopeArray:",
-    LoopScopeMap = "LoopScopeMap:",
     Promise = "Promise:",
     TagVariableChange = "TagVariableChange:"
 }
@@ -20,7 +18,6 @@ export declare enum AccessorProp {
     Owner = "_",
     AbortControllers = "#AbortControllers",
     AbortScopes = "#AbortScopes",
-    Args = "#Args",
     BranchAccessor = "#BranchAccessor",
     BranchScopes = "#BranchScopes",
     CatchContent = "#CatchContent",
@@ -28,9 +25,10 @@ export declare enum AccessorProp {
     ClosestBranchId = "#ClosestBranchId",
     Creating = "#Creating",
     Destroyed = "#Destroyed",
-    Effects = "#Effects",
+    PendingEffects = "#PendingEffects",
     EndNode = "#EndNode",
     Id = "#Id",
+    LoopKey = "#LoopKey",
     ParentBranch = "#ParentBranch",
     PendingAsyncCount = "#PendingAsyncCount",
     PlaceholderBranch = "#PlaceholderBranch",

package/dist/common/opt.d.ts

@@ -0,0 +1,6 @@
+export type OneMany<T> = T[] | T;
+export type Opt<T> = OneMany<T> | undefined;
+export declare function toArray<T>(oneMany: OneMany<T>): [T, ...T[]];
+export declare function toArray<T>(opt: Opt<T>): T[];
+export declare function push<T>(opt: Opt<T>, item: T): OneMany<T>;
+export declare function push<T>(oneMany: OneMany<T>, item: T): T[];

package/dist/common/types.d.ts

@@ -11,16 +11,16 @@ export interface BranchScope extends Scope {
     [AccessorProp.BranchScopes]: Set<BranchScope> | undefined;
     [AccessorProp.Renderer]: ClientRenderer | string;
     [AccessorProp.PendingAsyncCount]: number | undefined;
-    [AccessorProp.Effects]: unknown[] | undefined;
+    [AccessorProp.PendingEffects]: unknown[] | undefined;
 }
 export interface Scope {
     [AccessorProp.Owner]: Scope | undefined;
     [AccessorProp.Global]: Record<string, unknown>;
     [AccessorProp.Id]: number;
-    [AccessorProp.Args]: unknown;
     [AccessorProp.Creating]: 1 | 0 | undefined;
     [AccessorProp.AbortControllers]: Record<string | number, AbortController | void> | undefined;
     [AccessorProp.ClosestBranch]: BranchScope | undefined;
+    [AccessorProp.ClosestBranchId]: number | undefined;
     [x: `___${string}`]: never;
     [x: string | number]: any;
 }

package/dist/debug/dom.js

@@ -292,6 +292,14 @@ var DEFAULT_RUNTIME_ID = "M";
 var DEFAULT_RENDER_ID = "_";
 var DYNAMIC_TAG_SCRIPT_REGISTER_ID = true ? "_dynamicTagScript" : "d";
 
+// src/common/opt.ts
+function toArray(opt) {
+  return opt ? Array.isArray(opt) ? opt : [opt] : [];
+}
+function push(opt, item) {
+  return opt ? Array.isArray(opt) ? (opt.push(item), opt) : [opt, item] : item;
+}
+
 // src/dom/event.ts
 var defaultDelegator = createDelegator();
 function _on(element, type, handler) {
@@ -528,19 +536,26 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         const serializeContext = {
           _: registeredValues
         };
-        const branches = branchesEnabled && /* @__PURE__ */ (() => {
-          const branchParents = /* @__PURE__ */ new Map();
+        const visitBranches = branchesEnabled && /* @__PURE__ */ (() => {
+          let curBranchScopes;
+          const branchScopesStack = [];
           const branchStarts = [];
           const orphanBranches = [];
-          const endBranch = (singleNode) => {
+          const endBranch = (accessor, singleNode) => {
             const parent = visit.parentNode;
             let startVisit = visit;
             let i = orphanBranches.length;
-            let claimed = 0;
             let branchId;
             let branch;
+            let childBranch;
+            let endedBranches;
             while (branchId = +lastToken) {
-              branch = scopeLookup[branchId] ||= {};
+              (endedBranches ||= []).push(
+                branch = scopeLookup[branchId] ||= {
+                  ["#Id" /* Id */]: branchId
+                }
+              );
+              branch["#ClosestBranch" /* ClosestBranch */] = branch;
               if (singleNode) {
                 while (startVisit.previousSibling && ~visits.indexOf(
                   startVisit = startVisit.previousSibling
@@ -550,6 +565,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                   branch[true ? getDebugKey(0, startVisit) : "a"] = startVisit;
                 }
               } else {
+                curBranchScopes = push(curBranchScopes, branch);
+                if (accessor) {
+                  visitScope[accessor] = curBranchScopes;
+                  curBranchScopes = branchScopesStack.pop();
+                }
                 startVisit = branchStarts.pop();
                 if (parent !== startVisit.parentNode) {
                   parent.prepend(startVisit);
@@ -557,42 +577,44 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 branch["#StartNode" /* StartNode */] = startVisit;
                 branch["#EndNode" /* EndNode */] = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
               }
-              while (i-- && orphanBranches[i] > branchId) {
-                branchParents.set(orphanBranches[i], branchId);
-                claimed++;
+              while (i && orphanBranches[--i]["#Id" /* Id */] > branchId) {
+                (childBranch = orphanBranches.pop())["#ParentBranch" /* ParentBranch */] = branch;
+                (branch["#BranchScopes" /* BranchScopes */] ||= /* @__PURE__ */ new Set()).add(
+                  childBranch
+                );
+              }
+              nextToken(
+                /* read optional next branchId */
+              );
+            }
+            if (endedBranches) {
+              orphanBranches.push(...endedBranches);
+              if (singleNode) {
+                visitScope[accessor] = endedBranches.length > 1 ? endedBranches.reverse() : endedBranches[0];
               }
-              orphanBranches.push(branchId);
-              branchParents.set(branchId, 0);
-              nextToken();
             }
-            orphanBranches.splice(i, claimed);
           };
-          return {
-            ___visit() {
-              if (visitType === "[" /* BranchStart */) {
+          return () => {
+            if (visitType === "[" /* BranchStart */) {
+              if (lastToken) {
                 endBranch();
-                branchStarts.push(visit);
               } else {
-                visitScope[
-                  "Getter:" /* Getter */ + nextToken()
-                  /* read accessor */
-                ] = /* @__PURE__ */ ((node) => () => node)(
-                  visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
-                );
-                nextToken();
-                endBranch(
-                  visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */
-                );
-              }
-            },
-            ___scope(scope) {
-              scope["#ClosestBranch" /* ClosestBranch */] = scopeLookup[scope["#ClosestBranchId" /* ClosestBranchId */] || branchParents.get(scopeId)];
-              if (branchParents.has(scopeId)) {
-                if (scope["#ClosestBranch" /* ClosestBranch */]) {
-                  ((scope["#ParentBranch" /* ParentBranch */] = scope["#ClosestBranch" /* ClosestBranch */])["#BranchScopes" /* BranchScopes */] ||= /* @__PURE__ */ new Set()).add(scope);
-                }
-                scope["#ClosestBranch" /* ClosestBranch */] = scope;
+                branchScopesStack.push(curBranchScopes);
+                curBranchScopes = void 0;
               }
+              branchStarts.push(visit);
+            } else {
+              visitScope["Getter:" /* Getter */ + nextToken(
+                /* read accessor */
+              )] = /* @__PURE__ */ ((node) => () => node)(
+                visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
+              );
+              endBranch(
+                "BranchScopes:" /* BranchScopes */ + lastToken,
+                (nextToken(
+                  /* read optional first branchId */
+                ), visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */)
+              );
             }
           };
         })();
@@ -601,7 +623,6 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         let lastEffect;
         let visits;
         let resumes;
-        let scopeId;
         let visit;
         let visitText;
         let visitType;
@@ -617,29 +638,15 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
           try {
             walk2();
             isResuming = 1;
-            for (visit of visits = render.v) {
-              lastTokenIndex = render.i.length;
-              visitText = visit.data;
-              visitType = visitText[lastTokenIndex++];
-              if (scopeId = +nextToken()) {
-                visitScope = scopeLookup[scopeId] ||= {
-                  ["#Id" /* Id */]: scopeId
-                };
-              }
-              if (visitType === "*" /* Node */) {
-                visitScope["Getter:" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling);
-              } else if (branchesEnabled) {
-                branches.___visit();
-              }
-            }
             for (const serialized of resumes = render.r || []) {
               if (typeof serialized === "string") {
                 lastEffect = serialized;
               } else if (typeof serialized === "number") {
-                registeredValues[lastEffect](
+                queueEffect(
                   scopeLookup[serialized] ||= {
-                    ["#Id" /* Id */]: scopeId
-                  }
+                    ["#Id" /* Id */]: serialized
+                  },
+                  registeredValues[lastEffect]
                 );
               } else {
                 for (const scope of serialized(serializeContext)) {
@@ -650,22 +657,31 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                   } else if (typeof scope === "number") {
                     lastScopeId += scope;
                   } else {
-                    scopeId = ++lastScopeId;
+                    scopeLookup[scope["#Id" /* Id */] = ++lastScopeId] = scope;
                     scope["$global" /* Global */] = $global;
-                    scope["#Id" /* Id */] = scopeId;
-                    if (scopeLookup[scopeId] !== scope) {
-                      scopeLookup[scopeId] = Object.assign(
-                        scope,
-                        scopeLookup[scopeId]
-                      );
-                    }
                     if (branchesEnabled) {
-                      branches.___scope(scope);
+                      scope["#ClosestBranch" /* ClosestBranch */] = scopeLookup[scope["#ClosestBranchId" /* ClosestBranchId */]];
                     }
                   }
                 }
               }
             }
+            for (visit of visits = render.v) {
+              lastTokenIndex = render.i.length;
+              visitText = visit.data;
+              visitType = visitText[lastTokenIndex++];
+              visitScope = scopeLookup[+nextToken(
+                /* read scope id */
+              )] ||= {
+                ["#Id" /* Id */]: +lastToken
+              };
+              if (visitType === "*" /* Node */) {
+                visitScope["Getter:" /* Getter */ + nextToken()] = /* @__PURE__ */ ((node) => () => node)(visitScope[lastToken] = visit.previousSibling);
+              } else if (branchesEnabled) {
+                visitBranches();
+              }
+            }
+            run();
           } finally {
             isResuming = visits.length = resumes.length = 0;
           }
@@ -969,9 +985,9 @@ function normalizeStrProp(value) {
 function normalizeBoolProp(value) {
   return value != null && value !== false;
 }
-function updateList(arr, val, push) {
+function updateList(arr, val, push2) {
   const index = arr.indexOf(val);
-  return (push ? !~index && [...arr, val] : ~index && arr.slice(0, index).concat(arr.slice(index + 1))) || arr;
+  return (push2 ? !~index && [...arr, val] : ~index && arr.slice(0, index).concat(arr.slice(index + 1))) || arr;
 }
 function toValueProp(it) {
   return it.value;
@@ -1033,7 +1049,7 @@ function _let(id, fn) {
   const valueAccessor = true ? id.slice(0, id.lastIndexOf("/")) : decodeAccessor3(id);
   const valueChangeAccessor = "TagVariableChange:" /* TagVariableChange */ + valueAccessor;
   if (true) {
-    id = +valueAccessor.slice(valueAccessor.lastIndexOf("/") + 1);
+    id = +id.slice(id.lastIndexOf("/") + 1);
   }
   return (scope, value, valueChange) => {
     if (rendering) {
@@ -1077,12 +1093,10 @@ function _or(id, fn, defaultPending = 1, scopeIdAccessor = "#Id" /* Id */) {
 function _for_closure(ownerLoopNodeAccessor, fn) {
   if (false)
     ownerLoopNodeAccessor = decodeAccessor3(ownerLoopNodeAccessor);
-  const loopScopeAccessor = "LoopScopeArray:" /* LoopScopeArray */ + ownerLoopNodeAccessor;
-  const loopScopeMapAccessor = "LoopScopeMap:" /* LoopScopeMap */ + ownerLoopNodeAccessor;
+  const scopeAccessor = "BranchScopes:" /* BranchScopes */ + ownerLoopNodeAccessor;
   const ownerSignal = (ownerScope) => {
-    const scopes = ownerScope[loopScopeAccessor] ||= ownerScope[loopScopeMapAccessor] ? [...ownerScope[loopScopeMapAccessor].values()] : [];
-    const [firstScope] = scopes;
-    if (firstScope) {
+    let scopes = ownerScope[scopeAccessor];
+    if (scopes) {
       queueRender(
         ownerScope,
         () => {
@@ -1094,7 +1108,7 @@ function _for_closure(ownerLoopNodeAccessor, fn) {
         },
         -1,
         0,
-        firstScope["#Id" /* Id */]
+        (scopes = toArray(scopes))[0]["#Id" /* Id */]
       );
     }
   };
@@ -1106,7 +1120,7 @@ function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
     ownerConditionalNodeAccessor = decodeAccessor3(
       ownerConditionalNodeAccessor
     );
-  const scopeAccessor = "ConditionalScope:" /* ConditionalScope */ + ownerConditionalNodeAccessor;
+  const scopeAccessor = "BranchScopes:" /* BranchScopes */ + ownerConditionalNodeAccessor;
   const branchAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + ownerConditionalNodeAccessor;
   const ownerSignal = (scope) => {
     const ifScope = scope[scopeAccessor];
@@ -1510,7 +1524,7 @@ function _attr_content(scope, nodeAccessor, value) {
       subscribeToScopeSet(
         content.___owner,
         content.___accessor,
-        scope["ConditionalScope:" /* ConditionalScope */ + nodeAccessor]
+        scope["BranchScopes:" /* BranchScopes */ + nodeAccessor]
       );
     }
   }
@@ -1542,7 +1556,7 @@ function _attrs_script(scope, nodeAccessor) {
 function _html(scope, value, accessor) {
   const firstChild = scope[accessor];
   const parentNode = firstChild.parentNode;
-  const lastChild = scope["DynamicPlaceholderLastChild:" /* DynamicPlaceholderLastChild */ + accessor] || firstChild;
+  const lastChild = scope["DynamicHTMLLastChild:" /* DynamicHTMLLastChild */ + accessor] || firstChild;
   const newContent = parseHTML(
     value || value === 0 ? value + "" : "",
     parentNode.namespaceURI
@@ -1551,7 +1565,7 @@ function _html(scope, value, accessor) {
     parentNode,
     firstChild,
     scope[accessor] = newContent.firstChild || newContent.appendChild(new Text()),
-    scope["DynamicPlaceholderLastChild:" /* DynamicPlaceholderLastChild */ + accessor] = newContent.lastChild
+    scope["DynamicHTMLLastChild:" /* DynamicHTMLLastChild */ + accessor] = newContent.lastChild
   );
   removeChildNodes(firstChild, lastChild);
 }
@@ -1781,7 +1795,7 @@ function longestIncreasingSubsequence(a) {
 function _await(nodeAccessor, renderer) {
   if (false) nodeAccessor = decodeAccessor4(nodeAccessor);
   const promiseAccessor = "Promise:" /* Promise */ + nodeAccessor;
-  const branchAccessor = "ConditionalScope:" /* ConditionalScope */ + nodeAccessor;
+  const branchAccessor = "BranchScopes:" /* BranchScopes */ + nodeAccessor;
   enableBranches();
   return (scope, promise) => {
     const referenceNode = scope[nodeAccessor];
@@ -1865,9 +1879,9 @@ function _await(nodeAccessor, renderer) {
                     removeAndDestroyBranch(placeholderBranch);
                   }
                   queueEffect(tryWithPlaceholder, (scope2) => {
-                    const pendingEffects2 = scope2["#Effects" /* Effects */];
+                    const pendingEffects2 = scope2["#PendingEffects" /* PendingEffects */];
                     if (pendingEffects2) {
-                      scope2["#Effects" /* Effects */] = [];
+                      scope2["#PendingEffects" /* PendingEffects */] = [];
                       runEffects(pendingEffects2, true);
                     }
                   });
@@ -1892,7 +1906,7 @@ function _await(nodeAccessor, renderer) {
 }
 function _try(nodeAccessor, content) {
   if (false) nodeAccessor = decodeAccessor4(nodeAccessor);
-  const branchAccessor = "ConditionalScope:" /* ConditionalScope */ + nodeAccessor;
+  const branchAccessor = "BranchScopes:" /* BranchScopes */ + nodeAccessor;
   return (scope, input) => {
     if (!scope[branchAccessor]) {
       setConditionalRenderer(
@@ -1921,7 +1935,7 @@ function renderCatch(scope, error) {
     const placeholderBranch = tryWithCatch["#PlaceholderBranch" /* PlaceholderBranch */];
     if (placeholderBranch) {
       tryWithCatch["#PendingAsyncCount" /* PendingAsyncCount */] = 0;
-      owner["ConditionalScope:" /* ConditionalScope */ + tryWithCatch["#BranchAccessor" /* BranchAccessor */]] = placeholderBranch;
+      owner["BranchScopes:" /* BranchScopes */ + tryWithCatch["#BranchAccessor" /* BranchAccessor */]] = placeholderBranch;
       destroyBranch(tryWithCatch);
     }
     caughtError.add(pendingEffects);
@@ -1932,7 +1946,7 @@ function renderCatch(scope, error) {
       createAndSetupBranch
     );
     tryWithCatch["#CatchContent" /* CatchContent */].___params?.(
-      owner["ConditionalScope:" /* ConditionalScope */ + tryWithCatch["#BranchAccessor" /* BranchAccessor */]],
+      owner["BranchScopes:" /* BranchScopes */ + tryWithCatch["#BranchAccessor" /* BranchAccessor */]],
       [error]
     );
   }
@@ -1957,7 +1971,7 @@ function patchDynamicTag(fn) {
 }
 var _dynamic_tag = function dynamicTag(nodeAccessor, getContent, getTagVar, inputIsArgs) {
   if (false) nodeAccessor = decodeAccessor4(nodeAccessor);
-  const childScopeAccessor = "ConditionalScope:" /* ConditionalScope */ + nodeAccessor;
+  const childScopeAccessor = "BranchScopes:" /* BranchScopes */ + nodeAccessor;
   const rendererAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + nodeAccessor;
   enableBranches();
   return (scope, newRenderer, getInput) => {
@@ -1985,7 +1999,7 @@ var _dynamic_tag = function dynamicTag(nodeAccessor, getContent, getTagVar, inpu
             subscribeToScopeSet(
               content.___owner,
               content.___accessor,
-              scope[childScopeAccessor]["ConditionalScope:" /* ConditionalScope */ + (true ? `#${normalizedRenderer}/0` : "a")]
+              scope[childScopeAccessor]["BranchScopes:" /* BranchScopes */ + (true ? `#${normalizedRenderer}/0` : "a")]
             );
           }
         }
@@ -2045,9 +2059,9 @@ function dynamicTagScript(branch) {
 }
 function setConditionalRenderer(scope, nodeAccessor, newRenderer, createBranch2) {
   const referenceNode = scope[nodeAccessor];
-  const prevBranch = scope["ConditionalScope:" /* ConditionalScope */ + nodeAccessor];
+  const prevBranch = scope["BranchScopes:" /* BranchScopes */ + nodeAccessor];
   const parentNode = referenceNode.nodeType > 1 /* Element */ ? (prevBranch?.["#StartNode" /* StartNode */] || referenceNode).parentNode : referenceNode;
-  const newBranch = scope["ConditionalScope:" /* ConditionalScope */ + nodeAccessor] = newRenderer && createBranch2(scope["$global" /* Global */], newRenderer, scope, parentNode);
+  const newBranch = scope["BranchScopes:" /* BranchScopes */ + nodeAccessor] = newRenderer && createBranch2(scope["$global" /* Global */], newRenderer, scope, parentNode);
   if (referenceNode === parentNode) {
     if (prevBranch) {
       destroyBranch(prevBranch);
@@ -2114,49 +2128,52 @@ function _for_until(nodeAccessor, renderer) {
 }
 function loop(nodeAccessor, renderer, forEach) {
   const params = renderer.___params;
+  const scopesAccessor = "BranchScopes:" /* BranchScopes */ + nodeAccessor;
+  const scopesByKeyAccessor = "BranchScopes:" /* BranchScopes */ + scopesAccessor;
   if (false) nodeAccessor = decodeAccessor4(nodeAccessor);
   enableBranches();
   return (scope, value) => {
     const referenceNode = scope[nodeAccessor];
-    const oldMap = scope["LoopScopeMap:" /* LoopScopeMap */ + nodeAccessor];
-    const oldArray = oldMap ? scope["LoopScopeArray:" /* LoopScopeArray */ + nodeAccessor] || [
-      ...oldMap.values()
-    ] : [];
-    const parentNode = referenceNode.nodeType > 1 /* Element */ ? referenceNode.parentNode || oldArray[0]["#StartNode" /* StartNode */].parentNode : referenceNode;
-    const newMap = scope["LoopScopeMap:" /* LoopScopeMap */ + nodeAccessor] = /* @__PURE__ */ new Map();
-    const newArray = scope["LoopScopeArray:" /* LoopScopeArray */ + nodeAccessor] = [];
+    const oldScopes = toArray(scope[scopesAccessor]);
+    const oldScopesByKey = scope[scopesByKeyAccessor] || oldScopes.reduce(
+      (map, scope2, i) => map.set(scope2["#LoopKey" /* LoopKey */] ?? i, scope2),
+      /* @__PURE__ */ new Map()
+    );
+    const newScopes = scope[scopesAccessor] = [];
+    const newScopesByKey = scope[scopesByKeyAccessor] = /* @__PURE__ */ new Map();
+    const parentNode = referenceNode.nodeType > 1 /* Element */ ? referenceNode.parentNode || oldScopes[0]?.["#StartNode" /* StartNode */].parentNode : referenceNode;
     forEach(value, (key, args) => {
       if (true) {
-        if (newMap.has(key)) {
+        if (newScopesByKey.has(key)) {
           console.error(
             `A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`,
             key
           );
         }
       }
-      const branch = oldMap?.get(key) || createAndSetupBranch(
+      const branch = oldScopesByKey.get(key) || createAndSetupBranch(
         scope["$global" /* Global */],
         renderer,
         scope,
         parentNode
       );
       params?.(branch, args);
-      newMap.set(key, branch);
-      newArray.push(branch);
+      newScopesByKey.set(key, branch);
+      newScopes.push(branch);
     });
     let afterReference = null;
     if (referenceNode !== parentNode) {
-      if (oldArray.length) {
-        afterReference = oldArray[oldArray.length - 1]["#EndNode" /* EndNode */].nextSibling;
-        if (!newArray.length) {
+      if (oldScopes.length) {
+        afterReference = oldScopes[oldScopes.length - 1]["#EndNode" /* EndNode */].nextSibling;
+        if (!newScopes.length) {
           parentNode.insertBefore(referenceNode, afterReference);
         }
-      } else if (newArray.length) {
+      } else if (newScopes.length) {
         afterReference = referenceNode.nextSibling;
         referenceNode.remove();
       }
     }
-    reconcile(parentNode, oldArray, newArray, afterReference);
+    reconcile(parentNode, oldScopes, newScopes, afterReference);
   };
 }
 function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
@@ -2299,7 +2316,7 @@ var _enable_catch = () => {
   const handlePendingTry = (fn, scope, branch) => {
     while (branch) {
       if (branch["#PendingAsyncCount" /* PendingAsyncCount */]) {
-        return (branch["#Effects" /* Effects */] ||= []).push(fn, scope);
+        return (branch["#PendingEffects" /* PendingEffects */] ||= []).push(fn, scope);
       }
       branch = branch["#ParentBranch" /* ParentBranch */];
     }