marko 6.0.88 → 6.0.90

package/dist/debug/dom.js

@@ -1673,6 +1673,7 @@ function longestIncreasingSubsequence(a) {
 function _await(nodeAccessor, renderer) {
   const promiseAccessor = "Promise:" /* Promise */ + nodeAccessor;
   const branchAccessor = "ConditionalScope:" /* ConditionalScope */ + nodeAccessor;
+  enableBranches();
   return (scope, promise) => {
     const referenceNode = scope[nodeAccessor];
     const tryWithPlaceholder = findBranchWithKey(

package/dist/debug/dom.mjs

@@ -1573,6 +1573,7 @@ function longestIncreasingSubsequence(a) {
 function _await(nodeAccessor, renderer) {
   const promiseAccessor = "Promise:" /* Promise */ + nodeAccessor;
   const branchAccessor = "ConditionalScope:" /* ConditionalScope */ + nodeAccessor;
+  enableBranches();
   return (scope, promise) => {
     const referenceNode = scope[nodeAccessor];
     const tryWithPlaceholder = findBranchWithKey(

package/dist/debug/html.js

@@ -308,7 +308,8 @@ var REORDER_RUNTIME_CODE = true ? (
       (placeholders[id] = placeholder).i++;
     } else if (op == "!") {
       if (runtime.l[id] && placeholders[id]) {
-        placeholders[id].c();
+        nextSibling = node.nextSibling;
+        onNextSibling = () => placeholders[id].c();
       }
     } else if (node.tagName == "T" && (id = node.getAttribute(runtime.i))) {
       nextSibling = node.nextSibling;
@@ -342,7 +343,7 @@ var REORDER_RUNTIME_CODE = true ? (
     }
   };
 })`
-) : `(e=>{if(e.j)return;let i,r,l,t={},c=(i,r)=>e.l[i].replaceWith(...r.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(a,d,n,o,u)=>{n==l&&i(),"#"==a?(t[d]=r).i++:"!"==a?e.l[d]&&t[d]&&t[d].c():"T"==n.tagName&&(d=n.getAttribute(e.i))&&(l=n.nextSibling,i=()=>{n.remove(),o||c(d,n),r.c()},r=t[d]||(o=t[d]={i:e.l[d]?1:2,c(i=e.l["^"+d]){if(--o.i)return 1;for(;(l=e.l[d].previousSibling||i).remove(),i!=l;);c(d,n)}}),(a=e.j[d])&&(u=r.c,r.c=()=>u()||a(e.r)))}})`;
+) : `(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})`;
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol();
@@ -748,20 +749,28 @@ function writeAssigned(state) {
   }
   if (state.mutations.length) {
     for (const mutation of state.mutations) {
+      const hasSeen = state.refs.get(mutation.object)?.id;
       const objectStartIndex = state.buf.push(
-        state.buf.length === 0 ? "(" : ",("
+        state.buf.length === 0 ? "" : ","
       );
       if (writeProp(state, mutation.object, null, "")) {
         const objectRef = state.refs.get(mutation.object);
-        if (objectRef && !objectRef.id) {
-          objectRef.id = nextRefAccess(state);
-          state.buf[objectStartIndex] = objectRef.id + "=" + state.buf[objectStartIndex];
+        if (objectRef) {
+          if (!objectRef.id) {
+            objectRef.id = nextRefAccess(state);
+            state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex];
+            state.buf.push(")");
+          } else if (!hasSeen) {
+            state.buf[objectStartIndex] = "(" + state.buf[objectStartIndex];
+            state.buf.push(")");
+          }
         }
       } else {
         state.buf.push("void 0");
       }
+      const isCall = mutation.type === 0 /* call */;
       const valueStartIndex = state.buf.push(
-        mutation.type === 0 /* call */ ? ")" + (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
+        isCall ? (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
       );
       if (writeProp(state, mutation.value, null, "")) {
         const valueRef = state.refs.get(mutation.value);
@@ -772,7 +781,9 @@ function writeAssigned(state) {
       } else {
         state.buf.push("void 0");
       }
-      state.buf.push(")");
+      if (isCall) {
+        state.buf.push(")");
+      }
     }
     state.mutations = [];
     if (state.assigned.size) {

package/dist/debug/html.mjs

@@ -219,7 +219,8 @@ var REORDER_RUNTIME_CODE = true ? (
       (placeholders[id] = placeholder).i++;
     } else if (op == "!") {
       if (runtime.l[id] && placeholders[id]) {
-        placeholders[id].c();
+        nextSibling = node.nextSibling;
+        onNextSibling = () => placeholders[id].c();
       }
     } else if (node.tagName == "T" && (id = node.getAttribute(runtime.i))) {
       nextSibling = node.nextSibling;
@@ -253,7 +254,7 @@ var REORDER_RUNTIME_CODE = true ? (
     }
   };
 })`
-) : `(e=>{if(e.j)return;let i,r,l,t={},c=(i,r)=>e.l[i].replaceWith(...r.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(a,d,n,o,u)=>{n==l&&i(),"#"==a?(t[d]=r).i++:"!"==a?e.l[d]&&t[d]&&t[d].c():"T"==n.tagName&&(d=n.getAttribute(e.i))&&(l=n.nextSibling,i=()=>{n.remove(),o||c(d,n),r.c()},r=t[d]||(o=t[d]={i:e.l[d]?1:2,c(i=e.l["^"+d]){if(--o.i)return 1;for(;(l=e.l[d].previousSibling||i).remove(),i!=l;);c(d,n)}}),(a=e.j[d])&&(u=r.c,r.c=()=>u()||a(e.r)))}})`;
+) : `(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})`;
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol();
@@ -659,20 +660,28 @@ function writeAssigned(state) {
   }
   if (state.mutations.length) {
     for (const mutation of state.mutations) {
+      const hasSeen = state.refs.get(mutation.object)?.id;
       const objectStartIndex = state.buf.push(
-        state.buf.length === 0 ? "(" : ",("
+        state.buf.length === 0 ? "" : ","
       );
       if (writeProp(state, mutation.object, null, "")) {
         const objectRef = state.refs.get(mutation.object);
-        if (objectRef && !objectRef.id) {
-          objectRef.id = nextRefAccess(state);
-          state.buf[objectStartIndex] = objectRef.id + "=" + state.buf[objectStartIndex];
+        if (objectRef) {
+          if (!objectRef.id) {
+            objectRef.id = nextRefAccess(state);
+            state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex];
+            state.buf.push(")");
+          } else if (!hasSeen) {
+            state.buf[objectStartIndex] = "(" + state.buf[objectStartIndex];
+            state.buf.push(")");
+          }
         }
       } else {
         state.buf.push("void 0");
       }
+      const isCall = mutation.type === 0 /* call */;
       const valueStartIndex = state.buf.push(
-        mutation.type === 0 /* call */ ? ")" + (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
+        isCall ? (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
       );
       if (writeProp(state, mutation.value, null, "")) {
         const valueRef = state.refs.get(mutation.value);
@@ -683,7 +692,9 @@ function writeAssigned(state) {
       } else {
         state.buf.push("void 0");
       }
-      state.buf.push(")");
+      if (isCall) {
+        state.buf.push(")");
+      }
     }
     state.mutations = [];
     if (state.assigned.size) {

package/dist/dom.js

@@ -1091,7 +1091,7 @@ function longestIncreasingSubsequence(a) {
 // src/dom/control-flow.ts
 function _await(nodeAccessor, renderer) {
   let promiseAccessor = "n" /* Promise */ + nodeAccessor, branchAccessor = "d" /* ConditionalScope */ + nodeAccessor;
-  return (scope, promise) => {
+  return enableBranches(), (scope, promise) => {
     let referenceNode = scope[nodeAccessor], tryWithPlaceholder = findBranchWithKey(
       scope,
       "d" /* PlaceholderContent */

package/dist/dom.mjs

@@ -994,7 +994,7 @@ function longestIncreasingSubsequence(a) {
 // src/dom/control-flow.ts
 function _await(nodeAccessor, renderer) {
   let promiseAccessor = "n" /* Promise */ + nodeAccessor, branchAccessor = "d" /* ConditionalScope */ + nodeAccessor;
-  return (scope, promise) => {
+  return enableBranches(), (scope, promise) => {
     let referenceNode = scope[nodeAccessor], tryWithPlaceholder = findBranchWithKey(
       scope,
       "d" /* PlaceholderContent */

package/dist/html.js

@@ -195,7 +195,7 @@ function forStepBy(by, index) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,r,l,t={},c=(i,r)=>e.l[i].replaceWith(...r.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(a,d,n,o,u)=>{n==l&&i(),"#"==a?(t[d]=r).i++:"!"==a?e.l[d]&&t[d]&&t[d].c():"T"==n.tagName&&(d=n.getAttribute(e.i))&&(l=n.nextSibling,i=()=>{n.remove(),o||c(d,n),r.c()},r=t[d]||(o=t[d]={i:e.l[d]?1:2,c(i=e.l["^"+d]){if(--o.i)return 1;for(;(l=e.l[d].previousSibling||i).remove(),i!=l;);c(d,n)}}),(a=e.j[d])&&(u=r.c,r.c=()=>u()||a(e.r)))}})';
+var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})';
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {
@@ -539,23 +539,23 @@ function writeAssigned(state) {
   }
   if (state.mutations.length) {
     for (let mutation of state.mutations) {
-      let objectStartIndex = state.buf.push(
-        state.buf.length === 0 ? "(" : ",("
+      let hasSeen = state.refs.get(mutation.object)?.id, objectStartIndex = state.buf.push(
+        state.buf.length === 0 ? "" : ","
       );
       if (writeProp(state, mutation.object, null, "")) {
         let objectRef = state.refs.get(mutation.object);
-        objectRef && !objectRef.id && (objectRef.id = nextRefAccess(state), state.buf[objectStartIndex] = objectRef.id + "=" + state.buf[objectStartIndex]);
+        objectRef && (objectRef.id ? hasSeen || (state.buf[objectStartIndex] = "(" + state.buf[objectStartIndex], state.buf.push(")")) : (objectRef.id = nextRefAccess(state), state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex], state.buf.push(")")));
       } else
         state.buf.push("void 0");
-      let valueStartIndex = state.buf.push(
-        mutation.type === 0 /* call */ ? ")" + (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
+      let isCall = mutation.type === 0 /* call */, valueStartIndex = state.buf.push(
+        isCall ? (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
       );
       if (writeProp(state, mutation.value, null, "")) {
         let valueRef = state.refs.get(mutation.value);
         valueRef && !valueRef.id && (valueRef.id = nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
       } else
         state.buf.push("void 0");
-      state.buf.push(")");
+      isCall && state.buf.push(")");
     }
     state.mutations = [], state.assigned.size && writeAssigned(state);
   }

package/dist/html.mjs

@@ -109,7 +109,7 @@ function forStepBy(by, index) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,r,l,t={},c=(i,r)=>e.l[i].replaceWith(...r.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(a,d,n,o,u)=>{n==l&&i(),"#"==a?(t[d]=r).i++:"!"==a?e.l[d]&&t[d]&&t[d].c():"T"==n.tagName&&(d=n.getAttribute(e.i))&&(l=n.nextSibling,i=()=>{n.remove(),o||c(d,n),r.c()},r=t[d]||(o=t[d]={i:e.l[d]?1:2,c(i=e.l["^"+d]){if(--o.i)return 1;for(;(l=e.l[d].previousSibling||i).remove(),i!=l;);c(d,n)}}),(a=e.j[d])&&(u=r.c,r.c=()=>u()||a(e.r)))}})';
+var WALKER_RUNTIME_CODE = '(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>"#"&&d.push(e)}}),self[e]))', REORDER_RUNTIME_CODE = '(e=>{if(e.j)return;let i,l,r,t={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),"#"==n?(t[a]=l).i++:"!"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):"T"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l["^"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})';
 
 // src/html/serializer.ts
 var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {
@@ -453,23 +453,23 @@ function writeAssigned(state) {
   }
   if (state.mutations.length) {
     for (let mutation of state.mutations) {
-      let objectStartIndex = state.buf.push(
-        state.buf.length === 0 ? "(" : ",("
+      let hasSeen = state.refs.get(mutation.object)?.id, objectStartIndex = state.buf.push(
+        state.buf.length === 0 ? "" : ","
       );
       if (writeProp(state, mutation.object, null, "")) {
         let objectRef = state.refs.get(mutation.object);
-        objectRef && !objectRef.id && (objectRef.id = nextRefAccess(state), state.buf[objectStartIndex] = objectRef.id + "=" + state.buf[objectStartIndex]);
+        objectRef && (objectRef.id ? hasSeen || (state.buf[objectStartIndex] = "(" + state.buf[objectStartIndex], state.buf.push(")")) : (objectRef.id = nextRefAccess(state), state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex], state.buf.push(")")));
       } else
         state.buf.push("void 0");
-      let valueStartIndex = state.buf.push(
-        mutation.type === 0 /* call */ ? ")" + (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
+      let isCall = mutation.type === 0 /* call */, valueStartIndex = state.buf.push(
+        isCall ? (mutation.property === void 0 ? "" : toAccess(toObjectKey(mutation.property))) + "(" + (mutation.spread ? "..." : "") : toAccess(toObjectKey(mutation.property)) + "="
       );
       if (writeProp(state, mutation.value, null, "")) {
         let valueRef = state.refs.get(mutation.value);
         valueRef && !valueRef.id && (valueRef.id = nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
       } else
         state.buf.push("void 0");
-      state.buf.push(")");
+      isCall && state.buf.push(")");
     }
     state.mutations = [], state.assigned.size && writeAssigned(state);
   }

package/package.json

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