fix: resume branch end node shared, insert after previous branch

marko-js · Jan 31, 2025 · 5a36940 · 5a36940
1 parent 622d328
commit 5a36940
Show file tree

Hide file tree

Showing 88 changed files with 1,662 additions and 1,170 deletions.
diff --git a/.changeset/giant-adults-tell.md b/.changeset/giant-adults-tell.md
@@ -0,0 +1,5 @@
+---
+"@marko/runtime-tags": patch
+---
+
+Branch end nodes could end up being shared in resume, insert new branch after previous end node
diff --git a/.sizes.json b/.sizes.json
@@ -7,8 +7,8 @@
     {
       "name": "*",
       "total": {
-        "min": 17998,
-        "brotli": 6598
+        "min": 18068,
+        "brotli": 6616
       }
     },
     {
@@ -19,11 +19,11 @@
       },
       "runtime": {
         "min": 4174,
-        "brotli": 1799
+        "brotli": 1800
       },
       "total": {
         "min": 4363,
-        "brotli": 1943
+        "brotli": 1944
       }
     },
     {
@@ -33,12 +33,12 @@
         "brotli": 100
       },
       "runtime": {
-        "min": 3626,
-        "brotli": 1631
+        "min": 3684,
+        "brotli": 1646
       },
       "total": {
-        "min": 3737,
-        "brotli": 1731
+        "min": 3795,
+        "brotli": 1746
       }
     },
     {
@@ -48,12 +48,12 @@
         "brotli": 541
       },
       "runtime": {
-        "min": 7863,
-        "brotli": 3245
+        "min": 7875,
+        "brotli": 3251
       },
       "total": {
-        "min": 9003,
-        "brotli": 3786
+        "min": 9015,
+        "brotli": 3792
       }
     },
     {
@@ -63,12 +63,12 @@
         "brotli": 478
       },
       "runtime": {
-        "min": 8898,
-        "brotli": 3619
+        "min": 8968,
+        "brotli": 3637
       },
       "total": {
-        "min": 9846,
-        "brotli": 4097
+        "min": 9916,
+        "brotli": 4115
       }
     }
   ]

diff --git a/.sizes/dom.js b/.sizes/dom.js
@@ -1,4 +1,4 @@
-// size: 17998 (min) 6598 (brotli)
+// size: 18068 (min) 6616 (brotli)
 var empty = [],
   rest = Symbol();
 function attrTag(attrs2) {
@@ -147,17 +147,25 @@ var registeredValues = {},
         branchIds = new Set(),
         parentBranchIds = new Map();
       if (visits.length) {
-        let commentPrefixLen = data2.i.length,
-          closestBranchMarkers = new Map();
+        let lastEndNode,
+          commentPrefixLen = data2.i.length,
+          closestBranchMarkers = new Map(),
+          visitNodes = new Set(visits);
         data2.v = [];
-        let branchEnd = (branchId, visit, curNode) => {
+        let branchEnd = (branchId, visit, reference) => {
           let branch = (scopeLookup[branchId] ||= {}),
-            endNode = curNode;
-          for (; 8 === (endNode = endNode.previousSibling).nodeType; );
-          (branch.c = endNode), (branch.a ||= endNode);
+            endNode = reference;
+          for (; visitNodes.has((endNode = endNode.previousSibling)); );
+          endNode === lastEndNode &&
+            (endNode = reference.parentNode.insertBefore(
+              new Text(),
+              reference,
+            )),
+            (branch.b = lastEndNode = endNode),
+            (branch.a ||= endNode);
           for (let [markerScopeId, markerNode] of closestBranchMarkers)
             4 & branch.a.compareDocumentPosition(markerNode) &&
-              2 & curNode.compareDocumentPosition(markerNode) &&
+              2 & reference.compareDocumentPosition(markerNode) &&
               (parentBranchIds.set(markerScopeId, branchId),
               closestBranchMarkers.delete(markerScopeId));
           return (
@@ -200,7 +208,7 @@ var registeredValues = {},
                   data3.slice(start, ~next ? next : data3.length),
                   visit,
                   curNode,
-                ).c);
+                ).b);
             }
           }
         }
@@ -229,13 +237,13 @@ var registeredValues = {},
                       (scopeLookup[scopeId] = Object.assign(scope, prevScope));
                   let parentBranchId = parentBranchIds.get(scopeId);
                   if (
-                    (parentBranchId && (scope.b = scopes[parentBranchId]),
+                    (parentBranchId && (scope.c = scopes[parentBranchId]),
                     branchIds.has(scopeId))
                   ) {
                     let branch = scope,
-                      parentBranch = branch.b;
+                      parentBranch = branch.c;
                     (branch.f = +scopeId),
-                      (scope.b = branch),
+                      (scope.c = branch),
                       parentBranch &&
                         ((branch.t = parentBranch),
                         (parentBranch.k ||= new Set()).add(branch));
@@ -765,7 +773,7 @@ function createScope($global) {
 }
 var emptyBranch = createScope({});
 function getEmptyBranch(marker) {
-  return (emptyBranch.a = emptyBranch.c = marker), emptyBranch;
+  return (emptyBranch.a = emptyBranch.b = marker), emptyBranch;
 }
 function destroyBranch(branch) {
   branch.t?.k?.delete(branch), destroyNestedBranches(branch);
@@ -778,11 +786,11 @@ function destroyNestedBranches(branch) {
     });
 }
 function removeAndDestroyBranch(branch) {
-  destroyBranch(branch), removeChildNodes(branch.a, branch.c);
+  destroyBranch(branch), removeChildNodes(branch.a, branch.b);
 }
 function insertBranchBefore(branch, parentNode, nextSibling) {
   let current = branch.a,
-    stop = branch.c.nextSibling;
+    stop = branch.b.nextSibling;
   for (; current !== stop; ) {
     let next = current.nextSibling;
     parentNode.insertBefore(current, nextSibling), (current = next);
@@ -825,7 +833,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
       let childScope = (scope[currentScopeIndex++] = createScope(
         scope.$global,
       ));
-      (childScope.b = scope.b),
+      (childScope.c = scope.c),
         (currentWalkIndex = walkInternal(
           walkCodes,
           childScope,
@@ -862,17 +870,17 @@ function createBranchScopeWithTagNameOrRenderer(
   return (
     (branch[0] =
       branch.a =
-      branch.c =
+      branch.b =
         document.createElement(tagNameOrRenderer)),
     branch
   );
 }
 function createBranch($global, ownerScope, parentScope) {
   let branch = createScope($global),
-    parentBranch = parentScope.b;
+    parentBranch = parentScope.c;
   return (
     (branch._ = ownerScope),
-    (branch.b = branch),
+    (branch.c = branch),
     parentBranch
       ? ((branch.f = parentBranch.f + 1),
         (branch.t = parentBranch),
@@ -886,7 +894,7 @@ function initBranch(renderer, branch) {
   return (
     walk(11 === dom.nodeType ? dom.firstChild : dom, renderer.F, branch),
     (branch.a = 11 === dom.nodeType ? dom.firstChild : dom),
-    (branch.c = 11 === dom.nodeType ? dom.lastChild : dom),
+    (branch.b = 11 === dom.nodeType ? dom.lastChild : dom),
     renderer.x && queueRender(branch, renderer.x),
     dom
   );
@@ -974,8 +982,8 @@ var conditional = function (nodeAccessor, fn, getIntersection) {
                 : getEmptyBranch(scope[nodeAccessor]);
             insertBranchBefore(
               newBranch,
-              prevBranch.a.parentNode,
-              prevBranch.a,
+              prevBranch.b.parentNode,
+              prevBranch.b.nextSibling,
             ),
               removeAndDestroyBranch(prevBranch),
               (scope[nodeAccessor + "!"] = newRenderer && newBranch);
@@ -1104,7 +1112,7 @@ function loop(nodeAccessor, renderer, forEach) {
       if (referenceIsMarker) {
         oldMap === emptyMarkerMap && getEmptyBranch(referenceNode);
         let oldLastChild = oldArray[oldArray.length - 1];
-        (afterReference = oldLastChild.c.nextSibling),
+        (afterReference = oldLastChild.b.nextSibling),
           (parentNode = oldLastChild.a.parentNode);
       } else (afterReference = null), (parentNode = referenceNode);
       !(function (parent, oldBranches, newBranches, afterReference) {
@@ -1494,7 +1502,7 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.m.b?.D || render.I(render.m, render.J);
+    render.m.c?.D || render.I(render.m, render.J);
   }
   !(function () {
     for (let scope of pendingScopes) scope.g = 0;
@@ -1505,15 +1513,15 @@ function comparePendingRenders(a, b) {
   return getBranchDepth(a) - getBranchDepth(b) || a.y - b.y;
 }
 function getBranchDepth(render) {
-  return render.m.b?.f || 0;
+  return render.m.c?.f || 0;
 }
 function resetAbortSignal(scope, id) {
   let ctrl = scope.h?.[id];
   ctrl && (queueEffect(ctrl, abort), (scope.h[id] = void 0));
 }
 function getAbortSignal(scope, id) {
   return (
-    scope.b && (scope.b.E ||= new Set()).add(scope),
+    scope.c && (scope.c.E ||= new Set()).add(scope),
     ((scope.h ||= {})[id] ||= new AbortController()).signal
   );
 }
@@ -1539,7 +1547,7 @@ var classIdToBranch = new Map(),
     isRenderer: (renderer) => void 0 !== renderer.l,
     getStartNode: (branch) => branch.a,
     setScopeNodes(branch, startNode, endNode) {
-      (branch.a = startNode), (branch.c = endNode);
+      (branch.a = startNode), (branch.b = endNode);
     },
     runComponentEffects() {
       runEffects(this.effects);
@@ -1592,7 +1600,7 @@ var classIdToBranch = new Map(),
         })),
         !existing)
       )
-        return branch.a === branch.c ? branch.a : branch.a.parentNode;
+        return branch.a === branch.b ? branch.a : branch.a.parentNode;
     },
   };
 function noop() {}

diff --git a/...-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/csr.expected.md b/...-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/csr.expected.md
@@ -29,7 +29,7 @@ Goodbye
 ```
 UPDATE div/#text "1" => "2"
 INSERT #text
-REMOVE #text after #text
+REMOVE #text after #comment1
 ```
 
 # Render `{"x":true}`
@@ -47,5 +47,5 @@ Hello
 ```
 UPDATE div/#text "2" => "1"
 INSERT #text
-REMOVE #text after #text
+REMOVE #text after #comment1
 ```
diff --git a/...fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/csr.expected.md b/...fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/csr.expected.md
@@ -52,8 +52,8 @@ container.querySelector("button.toggle").click();
 # Mutations
 ```
 INSERT #text
-REMOVE #text after #text
-REMOVE #text after #text
+REMOVE #text after button1
+REMOVE #text after button1
 ```
 
 # Render
@@ -90,7 +90,7 @@ The count is 2
 ```
 INSERT #text0
 INSERT #text1
-REMOVE #text after #text1
+REMOVE #text after button1
 UPDATE #text1 "" => "2"
 ```
 

diff --git a/...tures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md b/...tures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md
@@ -88,10 +88,10 @@ container.querySelector("button.toggle").click();
 ```
 REMOVE html/body/#comment2 after html/body/#comment3
 INSERT html/body/#comment2
-REMOVE #comment after html/body/#comment2
-REMOVE #text after html/body/#comment2
-REMOVE #comment after html/body/#comment2
-REMOVE #text after html/body/#comment2
+REMOVE #comment after html/body/#comment1
+REMOVE #text after html/body/#comment1
+REMOVE #comment after html/body/#comment1
+REMOVE #text after html/body/#comment1
 ```
 
 # Render
@@ -149,7 +149,7 @@ container.querySelector("button.toggle").click();
 ```
 INSERT html/body/#text0
 INSERT html/body/#text1
-REMOVE #comment after html/body/#text1
+REMOVE #comment after html/body/#comment1
 UPDATE html/body/#text1 "" => "2"
 ```
 

diff --git a/.../src/__tests__/fixtures/basic-conditional-counter/__snapshots__/csr.expected.md b/.../src/__tests__/fixtures/basic-conditional-counter/__snapshots__/csr.expected.md
@@ -56,7 +56,7 @@ container.querySelector("button.toggle").click();
 # Mutations
 ```
 INSERT #text
-REMOVE span after #text
+REMOVE span after button1
 ```
 
 # Render
@@ -94,7 +94,7 @@ container.querySelector("button.toggle").click();
 # Mutations
 ```
 INSERT span
-REMOVE #text after span
+REMOVE #text after button1
 UPDATE span/#text " " => "2"
 ```
 

diff --git a/...c/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md b/...c/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md
@@ -85,7 +85,7 @@ container.querySelector("button.toggle").click();
 ```
 REMOVE html/body/#comment2 after span
 INSERT html/body/#comment2
-REMOVE span after html/body/#comment2
+REMOVE span after html/body/#comment1
 ```
 
 # Render
@@ -142,7 +142,7 @@ container.querySelector("button.toggle").click();
 # Mutations
 ```
 INSERT html/body/span
-REMOVE #comment after html/body/span
+REMOVE #comment after html/body/#comment1
 UPDATE html/body/span/#text " " => "2"
 ```
 

diff --git a/...tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/csr.expected.md b/...tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/csr.expected.md
@@ -26,5 +26,5 @@ container.querySelector("button").click();
 # Mutations
 ```
 INSERT #text
-REMOVE #text after #text
+REMOVE #text after button
 ```
diff --git a/...s/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md b/...s/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md
@@ -43,5 +43,5 @@ container.querySelector("button").click();
 ```
 REMOVE html/body/#comment1 after html/body/#comment2
 INSERT html/body/#comment1
-REMOVE #text after html/body/#comment1
+REMOVE #text after html/body/#comment0
 ```
diff --git a/...ests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md b/...ests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
@@ -23,6 +23,7 @@
 ```
 REMOVE html/body/#comment1 after html/body/#comment0
 INSERT html/body/#comment1
+INSERT html/body/#text
 REMOVE html/body/#comment0 before html
 INSERT html/body/#comment0
 ```