refactor: improve naming and avoid closest branch calls

marko-js · Jan 25, 2025 · 218c436 · 218c436
1 parent 5ad50c7
commit 218c436
Show file tree

Hide file tree

Showing 191 changed files with 355 additions and 468 deletions.
diff --git a/.changeset/flat-gifts-pretend.md b/.changeset/flat-gifts-pretend.md
@@ -0,0 +1,6 @@
+---
+"@marko/translator-interop-class-tags": patch
+"@marko/runtime-tags": patch
+---
+
+Fix issue where code within a control flow could execute after the control flow was removed.
diff --git a/.changeset/weak-ducks-begin.md b/.changeset/weak-ducks-begin.md
@@ -0,0 +1,8 @@
+---
+"@marko/translator-interop-class-tags": patch
+"marko": patch
+"@marko/runtime-tags": patch
+"@marko/compiler": patch
+---
+
+Improve tags / class api interop layer for destroyed tags.
diff --git a/.sizes.json b/.sizes.json
@@ -7,8 +7,8 @@
     {
       "name": "*",
       "total": {
-        "min": 17938,
-        "brotli": 6553
+        "min": 17899,
+        "brotli": 6554
       }
     },
     {
@@ -33,12 +33,12 @@
         "brotli": 100
       },
       "runtime": {
-        "min": 3545,
-        "brotli": 1609
+        "min": 3506,
+        "brotli": 1584
       },
       "total": {
-        "min": 3656,
-        "brotli": 1709
+        "min": 3617,
+        "brotli": 1684
       }
     },
     {
@@ -63,12 +63,12 @@
         "brotli": 478
       },
       "runtime": {
-        "min": 8721,
-        "brotli": 3559
+        "min": 8682,
+        "brotli": 3538
       },
       "total": {
-        "min": 9669,
-        "brotli": 4037
+        "min": 9630,
+        "brotli": 4016
       }
     }
   ]

diff --git a/.sizes/dom.js b/.sizes/dom.js
@@ -1,4 +1,4 @@
-// size: 17938 (min) 6553 (brotli)
+// size: 17899 (min) 6554 (brotli)
 var empty = [],
   rest = Symbol();
 function attrTag(attrs2) {
@@ -178,25 +178,23 @@ var registeredValues = {},
         parentBranchIds = new Map();
       if (visits.length) {
         let commentPrefixLen = data2.i.length,
-          parentBranchMarkers = new Map();
+          closestBranchMarkers = new Map();
         data2.v = [];
-        let sectionEnd = (scopeId, visit, curNode) => {
-          let scope = (scopeLookup[scopeId] ||= {});
-          branchIds.add(scopeId);
-          let endNode = curNode;
+        let branchEnd = (branchId, visit, curNode) => {
+          let branch = (scopeLookup[branchId] ||= {}),
+            endNode = curNode;
           for (; 8 === (endNode = endNode.previousSibling).nodeType; );
-          scope.c = endNode;
-          let startNode = (scope.a ||= endNode),
-            len = parentBranchMarkers.size;
-          for (let [markerScopeId, markerNode] of parentBranchMarkers) {
-            if (!len--) break;
-            markerScopeId !== scopeId &&
-              4 & startNode.compareDocumentPosition(markerNode) &&
+          (branch.c = endNode), (branch.a ||= endNode);
+          for (let [markerScopeId, markerNode] of closestBranchMarkers)
+            4 & branch.a.compareDocumentPosition(markerNode) &&
               2 & curNode.compareDocumentPosition(markerNode) &&
-              (parentBranchIds.set(markerScopeId, scopeId),
-              parentBranchMarkers.delete(markerScopeId));
-          }
-          return parentBranchMarkers.set(scopeId, visit), scope;
+              (parentBranchIds.set(markerScopeId, branchId),
+              closestBranchMarkers.delete(markerScopeId));
+          return (
+            branchIds.add(branchId),
+            closestBranchMarkers.set(branchId, visit),
+            branch
+          );
         };
         for (let visit of visits) {
           let commentText = visit.data,
@@ -209,17 +207,17 @@ var registeredValues = {},
             data3 = dataIndex ? commentText.slice(dataIndex) : "",
             token = commentText[commentPrefixLen];
           if ("*" === token) scope[data3] = visit.previousSibling;
-          else if ("$" === token) parentBranchMarkers.set(scopeId, visit);
+          else if ("$" === token) closestBranchMarkers.set(scopeId, visit);
           else if ("[" === token)
             this.g &&
-              (dataIndex && sectionEnd(this.g, visit, visit),
+              (dataIndex && branchEnd(this.g, visit, visit),
               this.o.push(this.g)),
               (this.g = scopeId),
               (scope.a = visit);
           else if ("]" === token) {
             scope[data3] = visit;
             let curParent = visit.parentNode,
-              startNode = sectionEnd(this.g, visit, visit).a;
+              startNode = branchEnd(this.g, visit, visit).a;
             curParent !== startNode.parentNode && curParent.prepend(startNode),
               (this.g = this.o.pop());
           } else if ("|" === token) {
@@ -228,7 +226,7 @@ var registeredValues = {},
             for (; ~next; ) {
               let start = next + 1;
               (next = data3.indexOf(" ", start)),
-                (curNode = sectionEnd(
+                (curNode = branchEnd(
                   data3.slice(start, ~next ? next : data3.length),
                   visit,
                   curNode,

diff --git a/..._tests__/fixtures/abort-signal-render-phase-error/__snapshots__/html.expected/template.js b/..._tests__/fixtures/abort-signal-render-phase-error/__snapshots__/html.expected/template.js
@@ -4,6 +4,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   _$.write(`<div>${_$.escapeXML((() => {
     throw new Error("Cannot use $signal in a server render.");
   })().onabort = () => {})}</div>`);
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/.../src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/html.expected/template.js b/.../src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/html.expected/template.js
@@ -8,6 +8,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   _$.writeScope(_scope0_id, {
     "clickCount": clickCount
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/html.expected/template.js b/...-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/html.expected/template.js
@@ -7,6 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   _$.writeScope(_scope0_id, {
     "disabled": disabled
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...ges/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/html.expected/template.js b/...ges/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/html.expected/template.js
@@ -11,7 +11,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     _$.writeScope(_scope1_id, {
       "_": _$.ensureScopeWithId(_scope0_id)
     });
-    _$.markResumeParentBranch(_scope1_id);
+    _$.resumeClosestBranch(_scope1_id);
   });
   _$.fork(resolveAfter("b", 2), value => {
     const _scope2_id = _$.nextScopeId();
@@ -20,7 +20,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     _$.writeScope(_scope2_id, {
       "_": _$.ensureScopeWithId(_scope0_id)
     });
-    _$.markResumeParentBranch(_scope2_id);
+    _$.resumeClosestBranch(_scope2_id);
   });
   _$.fork(resolveAfter("c", 1), value => {
     const _scope3_id = _$.nextScopeId();
@@ -29,13 +29,13 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     _$.writeScope(_scope3_id, {
       "_": _$.ensureScopeWithId(_scope0_id)
     });
-    _$.markResumeParentBranch(_scope3_id);
+    _$.resumeClosestBranch(_scope3_id);
   });
   _$.write(`<button>Inc</button>${_$.markResumeNode(_scope0_id, "#button/0")}</div>`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0_count");
   _$.writeScope(_scope0_id, {
     "count": count
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...s/runtime-tags/src/__tests__/fixtures/basic-chain/__snapshots__/html.expected/template.js b/...s/runtime-tags/src/__tests__/fixtures/basic-chain/__snapshots__/html.expected/template.js
@@ -5,6 +5,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const y = x * 2;
   const z = y * 3;
   _$.write(`<div>${_$.escapeXML(z)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js b/...tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js
@@ -14,6 +14,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "clickCount": clickCount,
     "#childScope/0": _$.writeExistingScope(_childScope)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...rc/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js b/...rc/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js
@@ -14,6 +14,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "clickCount": clickCount,
     "#childScope/0": _$.writeExistingScope(_childScope)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js b/...-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js
@@ -26,6 +26,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "#childScope/0": _$.writeExistingScope(_childScope),
     "#childScope/1": _$.writeExistingScope(_childScope2)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/.../fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js b/.../fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js
@@ -14,6 +14,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "clickCount": clickCount,
     "#childScope/0": _$.writeExistingScope(_childScope)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js b/...tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js
@@ -14,6 +14,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "clickCount": clickCount,
     "#childScope/0": _$.writeExistingScope(_childScope)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js b/...src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js
@@ -15,13 +15,13 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
       _$.writeScope(_scope1_id, {
         "_": _$.ensureScopeWithId(_scope0_id)
       });
-      _$.markResumeParentBranch(_scope1_id);
+      _$.resumeClosestBranch(_scope1_id);
     }), "__tests__/template.marko_1_renderer", _scope0_id)
   });
   _$.writeScope(_scope0_id, {
     "clickCount": clickCount,
     "#childScope/0": _$.writeExistingScope(_childScope)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...e-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/tags/counter.js b/...e-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/tags/counter.js
@@ -7,6 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   _$.writeScope(_scope0_id, {
     "clickCount": clickCount
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
diff --git a/...fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js b/...fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js
@@ -12,7 +12,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
       _$.writeScope(_scope1_id, {
         "_": _$.ensureScopeWithId(_scope0_id)
       });
-      _$.markResumeParentBranch(_scope1_id);
       _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/template.marko_1_renderer");
       _ifScopeId = _scope1_id;
     }
@@ -25,6 +24,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "#text/2(": _ifRenderer,
     "#text/2!": _$.getScopeById(_ifScopeId)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/.../src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js b/.../src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js
@@ -12,7 +12,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
       _$.writeScope(_scope1_id, {
         "_": _$.ensureScopeWithId(_scope0_id)
       });
-      _$.markResumeParentBranch(_scope1_id);
       _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/template.marko_1_renderer");
       _ifScopeId = _scope1_id;
     }
@@ -25,6 +24,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "#text/2(": _ifRenderer,
     "#text/2!": _$.getScopeById(_ifScopeId)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/html.expected/template.js b/...-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/html.expected/template.js
@@ -10,14 +10,13 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     _$.writeScope(_scope1_id, {
       "_": _$.ensureScopeWithId(_scope0_id)
     });
-    _$.markResumeParentBranch(_scope1_id);
     _ifScopeId = _scope1_id;
   }
   _$.writeScope(_scope0_id, {
     "a": a,
     "b": b,
     "#text/0!": _$.getScopeById(_ifScopeId)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...ests__/fixtures/basic-counter-const-event-handler/__snapshots__/html.expected/template.js b/...ests__/fixtures/basic-counter-const-event-handler/__snapshots__/html.expected/template.js
@@ -11,6 +11,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "clickCount": clickCount,
     "increment": increment
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...s/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/html.expected/template.js b/...s/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/html.expected/template.js
@@ -11,6 +11,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "count": count,
     "multiplier": multiplier
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/html.expected/template.js b/...runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/html.expected/template.js
@@ -7,6 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   _$.writeScope(_scope0_id, {
     "clickCount": clickCount
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js b/...tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js
@@ -14,7 +14,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
       _$.writeScope(_scope1_id, {
         "_": _$.ensureScopeWithId(_scope0_id)
       });
-      _$.markResumeParentBranch(_scope1_id);
       _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/template.marko_1_renderer");
       _ifScopeId = _scope1_id;
     }
@@ -25,6 +24,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "#text/1(": _ifRenderer,
     "#text/1!": _$.getScopeById(_ifScopeId)
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...e-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/html.expected/template.js b/...e-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/html.expected/template.js
@@ -7,6 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   _$.writeScope(_scope0_id, {
     "count": count
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
diff --git a/...__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/html.expected/template.js b/...__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/html.expected/template.js
@@ -9,6 +9,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "a": a,
     "b": b
   });
-  _$.markResumeParentBranch(_scope0_id);
+  _$.resumeClosestBranch(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);