marko 6.0.0-next.3.67 → 6.0.0-next.3.68

package/dist/debug/dom.js

@@ -1654,7 +1654,6 @@ function awaitTag(nodeAccessor, renderer) {
         })
       );
       if (tryWithPlaceholder) {
-        tryWithPlaceholder;
         if (!--tryWithPlaceholder.___pendingAsyncCount) {
           const placeholderBranch = tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */];
           tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */] = void 0;
@@ -1665,12 +1664,6 @@ function awaitTag(nodeAccessor, renderer) {
               placeholderBranch.___startNode
             );
             removeAndDestroyBranch(placeholderBranch);
-          } else {
-            insertBranchBefore(
-              tryWithPlaceholder,
-              referenceNode.parentNode,
-              referenceNode
-            );
           }
           if (tryWithPlaceholder.___effects) {
             runEffects(tryWithPlaceholder.___effects, true);

package/dist/debug/dom.mjs

@@ -1566,7 +1566,6 @@ function awaitTag(nodeAccessor, renderer) {
         })
       );
       if (tryWithPlaceholder) {
-        tryWithPlaceholder;
         if (!--tryWithPlaceholder.___pendingAsyncCount) {
           const placeholderBranch = tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */];
           tryWithPlaceholder["#PlaceholderBranch" /* PlaceholderBranch */] = void 0;
@@ -1577,12 +1576,6 @@ function awaitTag(nodeAccessor, renderer) {
               placeholderBranch.___startNode
             );
             removeAndDestroyBranch(placeholderBranch);
-          } else {
-            insertBranchBefore(
-              tryWithPlaceholder,
-              referenceNode.parentNode,
-              referenceNode
-            );
           }
           if (tryWithPlaceholder.___effects) {
             runEffects(tryWithPlaceholder.___effects, true);

package/dist/debug/html.js

@@ -279,16 +279,12 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
       placeholders[id] = {
         i: 1,
         c(end = runtime.l[id] || node) {
-          while (end.parentNode !== start.parentNode) {
-            end = end.parentNode;
-          }
-
           for (
             ;
-            end != nextSibling;
-            (nextSibling = start.nextSibling).remove()
+            (nextSibling = end.previousSibling || start).remove(),
+            start != nextSibling;
           );
-          replace(start, node);
+          replace(end, node);
         },
       };
     }
@@ -310,7 +306,7 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
   }
 };
 })`
-) : `(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e.r)))}})`;
+) : `(e=>{let i,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})`;
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {};
@@ -2341,8 +2337,8 @@ function prepareChunk(chunk) {
       let cur = reorderedChunk;
       reorderedChunk.reorderId = null;
       for (; ; ) {
-        const { next } = cur;
         cur.flushPlaceholder();
+        const { next } = cur;
         cur.consumed = true;
         reorderHTML += cur.html;
         reorderEffects = concatEffects(reorderEffects, cur.effects);

package/dist/debug/html.mjs

@@ -195,16 +195,12 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
       placeholders[id] = {
         i: 1,
         c(end = runtime.l[id] || node) {
-          while (end.parentNode !== start.parentNode) {
-            end = end.parentNode;
-          }
-
           for (
             ;
-            end != nextSibling;
-            (nextSibling = start.nextSibling).remove()
+            (nextSibling = end.previousSibling || start).remove(),
+            start != nextSibling;
           );
-          replace(start, node);
+          replace(end, node);
         },
       };
     }
@@ -226,7 +222,7 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
   }
 };
 })`
-) : `(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e.r)))}})`;
+) : `(e=>{let i,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})`;
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {};
@@ -2257,8 +2253,8 @@ function prepareChunk(chunk) {
       let cur = reorderedChunk;
       reorderedChunk.reorderId = null;
       for (; ; ) {
-        const { next } = cur;
         cur.flushPlaceholder();
+        const { next } = cur;
         cur.consumed = true;
         reorderHTML += cur.html;
         reorderEffects = concatEffects(reorderEffects, cur.effects);

package/dist/dom.js

@@ -1112,15 +1112,11 @@ function awaitTag(nodeAccessor, renderer) {
         })
       ), tryWithPlaceholder && !--tryWithPlaceholder.q)) {
         let placeholderBranch = tryWithPlaceholder.c;
-        tryWithPlaceholder.c = void 0, placeholderBranch ? (insertBranchBefore(
+        tryWithPlaceholder.c = void 0, placeholderBranch && (insertBranchBefore(
           tryWithPlaceholder,
           placeholderBranch.h.parentNode,
           placeholderBranch.h
-        ), removeAndDestroyBranch(placeholderBranch)) : insertBranchBefore(
-          tryWithPlaceholder,
-          referenceNode.parentNode,
-          referenceNode
-        ), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
+        ), removeAndDestroyBranch(placeholderBranch)), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
       }
     }).catch((error) => {
       renderCatch(scope, error, !0);

package/dist/dom.mjs

@@ -1027,15 +1027,11 @@ function awaitTag(nodeAccessor, renderer) {
         })
       ), tryWithPlaceholder && !--tryWithPlaceholder.q)) {
         let placeholderBranch = tryWithPlaceholder.c;
-        tryWithPlaceholder.c = void 0, placeholderBranch ? (insertBranchBefore(
+        tryWithPlaceholder.c = void 0, placeholderBranch && (insertBranchBefore(
           tryWithPlaceholder,
           placeholderBranch.h.parentNode,
           placeholderBranch.h
-        ), removeAndDestroyBranch(placeholderBranch)) : insertBranchBefore(
-          tryWithPlaceholder,
-          referenceNode.parentNode,
-          referenceNode
-        ), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
+        ), removeAndDestroyBranch(placeholderBranch)), tryWithPlaceholder.H && runEffects(tryWithPlaceholder.H, !0);
       }
     }).catch((error) => {
       renderCatch(scope, error, !0);

package/dist/html.js

@@ -178,7 +178,7 @@ function forTo(to, from, step, cb) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e.r)))}})';
+var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})';
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {}, Generator = function* () {
@@ -1519,8 +1519,9 @@ function prepareChunk(chunk) {
     for (let reorderedChunk of state.writeReorders) {
       let { reorderId } = reorderedChunk, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
       for (reorderedChunk.reorderId = null; ; ) {
+        cur.flushPlaceholder();
         let { next } = cur;
-        if (cur.flushPlaceholder(), cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
+        if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
           "#" /* ReorderMarker */,
           cur.reorderId = state.nextReorderId()
         ), cur.html = cur.effects = cur.scripts = "", cur.next = null), next)

package/dist/html.mjs

@@ -97,7 +97,7 @@ function forTo(to, from, step, cb) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e.r)))}})';
+var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})';
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {}, Generator = function* () {
@@ -1438,8 +1438,9 @@ function prepareChunk(chunk) {
     for (let reorderedChunk of state.writeReorders) {
       let { reorderId } = reorderedChunk, reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
       for (reorderedChunk.reorderId = null; ; ) {
+        cur.flushPlaceholder();
         let { next } = cur;
-        if (cur.flushPlaceholder(), cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
+        if (cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, cur.scripts), cur.async && (reorderHTML += state.mark(
           "#" /* ReorderMarker */,
           cur.reorderId = state.nextReorderId()
         ), cur.html = cur.effects = cur.scripts = "", cur.next = null), next)

package/package.json

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