marko 6.0.89 → 6.0.91

package/dist/debug/dom.js

@@ -223,10 +223,24 @@ function createDelegator() {
 }
 function handleDelegated(ev) {
   let target = !rendering && ev.target;
+  if (true) {
+    Object.defineProperty(ev, "currentTarget", {
+      configurable: true,
+      get() {
+        console.error(
+          "Event.currentTarget is not supported in Marko's delegated events. Instead use an element reference or the second parameter of the event handler."
+        );
+        return null;
+      }
+    });
+  }
   while (target) {
     target["$" + ev.type]?.(ev, target);
     target = ev.bubbles && !ev.cancelBubble && target.parentNode;
   }
+  if (true) {
+    delete ev.currentTarget;
+  }
 }
 
 // src/dom/resolve-cursor-position.ts
@@ -1673,6 +1687,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(
@@ -1990,6 +2005,14 @@ function loop(nodeAccessor, renderer, forEach) {
     const newMap = scope["LoopScopeMap:" /* LoopScopeMap */ + nodeAccessor] = /* @__PURE__ */ new Map();
     const newArray = scope["LoopScopeArray:" /* LoopScopeArray */ + nodeAccessor] = [];
     forEach(value, (key, args) => {
+      if (true) {
+        if (newMap.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(scope.$global, renderer, scope, parentNode);
       params?.(branch, args);
       newMap.set(key, branch);

package/dist/debug/dom.mjs

@@ -123,10 +123,24 @@ function createDelegator() {
 }
 function handleDelegated(ev) {
   let target = !rendering && ev.target;
+  if (true) {
+    Object.defineProperty(ev, "currentTarget", {
+      configurable: true,
+      get() {
+        console.error(
+          "Event.currentTarget is not supported in Marko's delegated events. Instead use an element reference or the second parameter of the event handler."
+        );
+        return null;
+      }
+    });
+  }
   while (target) {
     target["$" + ev.type]?.(ev, target);
     target = ev.bubbles && !ev.cancelBubble && target.parentNode;
   }
+  if (true) {
+    delete ev.currentTarget;
+  }
 }
 
 // src/dom/resolve-cursor-position.ts
@@ -1573,6 +1587,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(
@@ -1890,6 +1905,14 @@ function loop(nodeAccessor, renderer, forEach) {
     const newMap = scope["LoopScopeMap:" /* LoopScopeMap */ + nodeAccessor] = /* @__PURE__ */ new Map();
     const newArray = scope["LoopScopeArray:" /* LoopScopeArray */ + nodeAccessor] = [];
     forEach(value, (key, args) => {
+      if (true) {
+        if (newMap.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(scope.$global, renderer, scope, parentNode);
       params?.(branch, args);
       newMap.set(key, branch);

package/dist/debug/html.js

@@ -749,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);
@@ -773,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) {
@@ -1862,6 +1872,15 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
     const loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
       const branchId = _peek_scope_id();
+      const itemKey = forOfBy(by, item, index);
+      if (true) {
+        if (by && loopScopes.has(itemKey)) {
+          console.error(
+            `A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`,
+            itemKey
+          );
+        }
+      }
       if (resumeMarker) {
         if (singleNode) {
           flushBranchIds = " " + branchId + flushBranchIds;
@@ -1874,7 +1893,7 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
       }
       withBranchId(branchId, () => {
         cb(item, index);
-        loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+        loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     });
     if (loopScopes.size) {
@@ -1903,6 +1922,15 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
     const loopScopes = /* @__PURE__ */ new Map();
     forIn(obj, (key, value) => {
       const branchId = _peek_scope_id();
+      const itemKey = forInBy(by, key, value);
+      if (true) {
+        if (by && loopScopes.has(itemKey)) {
+          console.error(
+            `A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`,
+            itemKey
+          );
+        }
+      }
       if (resumeMarker) {
         if (singleNode) {
           flushBranchIds = " " + branchId + flushBranchIds;
@@ -1915,7 +1943,7 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
       }
       withBranchId(branchId, () => {
         cb(key, value);
-        loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+        loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     });
     if (loopScopes.size) {
@@ -1944,6 +1972,15 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
     const loopScopes = /* @__PURE__ */ new Map();
     forTo(to, from, step, (i) => {
       const branchId = _peek_scope_id();
+      const itemKey = forStepBy(by, i);
+      if (true) {
+        if (by && loopScopes.has(itemKey)) {
+          console.error(
+            `A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`,
+            itemKey
+          );
+        }
+      }
       if (resumeMarker) {
         if (singleNode) {
           flushBranchIds = " " + branchId + flushBranchIds;
@@ -1956,7 +1993,7 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
       }
       withBranchId(branchId, () => {
         cb(i);
-        loopScopes.set(forStepBy(by, i), writeScope(branchId, {}));
+        loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     });
     if (loopScopes.size) {
@@ -1985,6 +2022,15 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
     const loopScopes = /* @__PURE__ */ new Map();
     forUntil(to, from, step, (i) => {
       const branchId = _peek_scope_id();
+      const itemKey = forStepBy(by, i);
+      if (true) {
+        if (by && loopScopes.has(itemKey)) {
+          console.error(
+            `A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`,
+            itemKey
+          );
+        }
+      }
       if (resumeMarker) {
         if (singleNode) {
           flushBranchIds = " " + branchId + flushBranchIds;
@@ -1997,7 +2043,7 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
       }
       withBranchId(branchId, () => {
         cb(i);
-        loopScopes.set(forStepBy(by, i), writeScope(branchId, {}));
+        loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     });
     if (loopScopes.size) {

package/dist/debug/html.mjs

@@ -660,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);
@@ -684,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) {
@@ -1773,6 +1783,15 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
     const loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
       const branchId = _peek_scope_id();
+      const itemKey = forOfBy(by, item, index);
+      if (true) {
+        if (by && loopScopes.has(itemKey)) {
+          console.error(
+            `A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`,
+            itemKey
+          );
+        }
+      }
       if (resumeMarker) {
         if (singleNode) {
           flushBranchIds = " " + branchId + flushBranchIds;
@@ -1785,7 +1804,7 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
       }
       withBranchId(branchId, () => {
         cb(item, index);
-        loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+        loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     });
     if (loopScopes.size) {
@@ -1814,6 +1833,15 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
     const loopScopes = /* @__PURE__ */ new Map();
     forIn(obj, (key, value) => {
       const branchId = _peek_scope_id();
+      const itemKey = forInBy(by, key, value);
+      if (true) {
+        if (by && loopScopes.has(itemKey)) {
+          console.error(
+            `A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`,
+            itemKey
+          );
+        }
+      }
       if (resumeMarker) {
         if (singleNode) {
           flushBranchIds = " " + branchId + flushBranchIds;
@@ -1826,7 +1854,7 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
       }
       withBranchId(branchId, () => {
         cb(key, value);
-        loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+        loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     });
     if (loopScopes.size) {
@@ -1855,6 +1883,15 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
     const loopScopes = /* @__PURE__ */ new Map();
     forTo(to, from, step, (i) => {
       const branchId = _peek_scope_id();
+      const itemKey = forStepBy(by, i);
+      if (true) {
+        if (by && loopScopes.has(itemKey)) {
+          console.error(
+            `A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`,
+            itemKey
+          );
+        }
+      }
       if (resumeMarker) {
         if (singleNode) {
           flushBranchIds = " " + branchId + flushBranchIds;
@@ -1867,7 +1904,7 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
       }
       withBranchId(branchId, () => {
         cb(i);
-        loopScopes.set(forStepBy(by, i), writeScope(branchId, {}));
+        loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     });
     if (loopScopes.size) {
@@ -1896,6 +1933,15 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
     const loopScopes = /* @__PURE__ */ new Map();
     forUntil(to, from, step, (i) => {
       const branchId = _peek_scope_id();
+      const itemKey = forStepBy(by, i);
+      if (true) {
+        if (by && loopScopes.has(itemKey)) {
+          console.error(
+            `A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`,
+            itemKey
+          );
+        }
+      }
       if (resumeMarker) {
         if (singleNode) {
           flushBranchIds = " " + branchId + flushBranchIds;
@@ -1908,7 +1954,7 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
       }
       withBranchId(branchId, () => {
         cb(i);
-        loopScopes.set(forStepBy(by, i), writeScope(branchId, {}));
+        loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     });
     if (loopScopes.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

@@ -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);
   }
@@ -1217,11 +1217,11 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
   if (serializeBranch !== 0) {
     let loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
-      let branchId = _peek_scope_id();
+      let branchId = _peek_scope_id(), itemKey = forOfBy(by, item, index);
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+        cb(item, index), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
       ["m" /* LoopScopeMap */ + accessor]: loopScopes
@@ -1243,11 +1243,11 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
   if (serializeBranch !== 0) {
     let loopScopes = /* @__PURE__ */ new Map();
     forIn(obj, (key, value) => {
-      let branchId = _peek_scope_id();
+      let branchId = _peek_scope_id(), itemKey = forInBy(by, key, value);
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+        cb(key, value), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
       ["m" /* LoopScopeMap */ + accessor]: loopScopes
@@ -1269,11 +1269,11 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
   if (serializeBranch !== 0) {
     let loopScopes = /* @__PURE__ */ new Map();
     forTo(to, from, step, (i) => {
-      let branchId = _peek_scope_id();
+      let branchId = _peek_scope_id(), itemKey = forStepBy(by, i);
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(i), loopScopes.set(forStepBy(by, i), writeScope(branchId, {}));
+        cb(i), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
       ["m" /* LoopScopeMap */ + accessor]: loopScopes
@@ -1295,11 +1295,11 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
   if (serializeBranch !== 0) {
     let loopScopes = /* @__PURE__ */ new Map();
     forUntil(to, from, step, (i) => {
-      let branchId = _peek_scope_id();
+      let branchId = _peek_scope_id(), itemKey = forStepBy(by, i);
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(i), loopScopes.set(forStepBy(by, i), writeScope(branchId, {}));
+        cb(i), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
       ["m" /* LoopScopeMap */ + accessor]: loopScopes

package/dist/html.mjs

@@ -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);
   }
@@ -1131,11 +1131,11 @@ function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMark
   if (serializeBranch !== 0) {
     let loopScopes = /* @__PURE__ */ new Map();
     forOf(list, (item, index) => {
-      let branchId = _peek_scope_id();
+      let branchId = _peek_scope_id(), itemKey = forOfBy(by, item, index);
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(item, index), loopScopes.set(forOfBy(by, item, index), writeScope(branchId, {}));
+        cb(item, index), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
       ["m" /* LoopScopeMap */ + accessor]: loopScopes
@@ -1157,11 +1157,11 @@ function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarke
   if (serializeBranch !== 0) {
     let loopScopes = /* @__PURE__ */ new Map();
     forIn(obj, (key, value) => {
-      let branchId = _peek_scope_id();
+      let branchId = _peek_scope_id(), itemKey = forInBy(by, key, value);
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(key, value), loopScopes.set(forInBy(by, key, value), writeScope(branchId, {}));
+        cb(key, value), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
       ["m" /* LoopScopeMap */ + accessor]: loopScopes
@@ -1183,11 +1183,11 @@ function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, ser
   if (serializeBranch !== 0) {
     let loopScopes = /* @__PURE__ */ new Map();
     forTo(to, from, step, (i) => {
-      let branchId = _peek_scope_id();
+      let branchId = _peek_scope_id(), itemKey = forStepBy(by, i);
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(i), loopScopes.set(forStepBy(by, i), writeScope(branchId, {}));
+        cb(i), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
       ["m" /* LoopScopeMap */ + accessor]: loopScopes
@@ -1209,11 +1209,11 @@ function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch,
   if (serializeBranch !== 0) {
     let loopScopes = /* @__PURE__ */ new Map();
     forUntil(to, from, step, (i) => {
-      let branchId = _peek_scope_id();
+      let branchId = _peek_scope_id(), itemKey = forStepBy(by, i);
       resumeMarker && (singleNode ? flushBranchIds = " " + branchId + flushBranchIds : ($chunk.writeHTML(
         state.mark("[" /* BranchStart */, flushBranchIds)
       ), flushBranchIds = branchId + "")), withBranchId(branchId, () => {
-        cb(i), loopScopes.set(forStepBy(by, i), writeScope(branchId, {}));
+        cb(i), loopScopes.set(itemKey, writeScope(branchId, {}));
       });
     }), loopScopes.size && writeScope(scopeId, {
       ["m" /* LoopScopeMap */ + accessor]: loopScopes

package/package.json

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