marko 6.0.90 → 6.0.92

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
@@ -1991,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
@@ -1891,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

@@ -1872,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;
@@ -1884,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) {
@@ -1913,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;
@@ -1925,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) {
@@ -1954,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;
@@ -1966,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) {
@@ -1995,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;
@@ -2007,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

@@ -1783,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;
@@ -1795,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) {
@@ -1824,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;
@@ -1836,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) {
@@ -1865,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;
@@ -1877,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) {
@@ -1906,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;
@@ -1918,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/html.js

@@ -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

@@ -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/dist/translator/index.js

@@ -2591,8 +2591,8 @@ var import_compiler13 = require("@marko/compiler");
 function normalizeStringExpression(parts) {
   const strs = [];
   const exprs = [];
-  let curStr = parts[0];
-  for (let i = 1; i < parts.length; i++) {
+  let curStr = "";
+  for (let i = 0; i < parts.length; i++) {
     let content = parts[i];
     if (typeof content === "object") {
       if (import_compiler13.types.isStringLiteral(content)) {
@@ -4166,7 +4166,8 @@ function replaceEffectNode(node) {
 function replaceBindingReadNode(node) {
   switch (node.type) {
     case "Identifier":
-    case "MemberExpression": {
+    case "MemberExpression":
+    case "OptionalMemberExpression": {
       return getReadReplacement(node);
     }
   }
@@ -4576,7 +4577,8 @@ function replaceNode(node, container) {
 function replaceBindingReadNode2(node) {
   switch (node.type) {
     case "Identifier":
-    case "MemberExpression": {
+    case "MemberExpression":
+    case "OptionalMemberExpression": {
       const { extra } = node;
       if (extra && !(extra.read && !extra.read.binding.declared || extra.binding && !extra.binding.declared)) {
         return getReadReplacement(node);
@@ -4781,20 +4783,19 @@ function getChangeHandler(tag, attr) {
       changeAttrName,
       withPreviousLocation(import_compiler25.types.identifier(changeHandlerId), attr.value)
     );
-  } else if (import_compiler25.types.isMemberExpression(attr.value)) {
+  } else if (import_compiler25.types.isMemberExpression(attr.value) || import_compiler25.types.isOptionalMemberExpression(attr.value)) {
     const prop = attr.value.property;
     if (!import_compiler25.types.isPrivateName(attr.value.property)) {
+      const memberObj = import_compiler25.types.cloneNode(attr.value.object);
+      const memberProp = prop.type === "Identifier" ? withPreviousLocation(import_compiler25.types.identifier(prop.name + "Change"), prop) : import_compiler25.types.binaryExpression(
+        "+",
+        import_compiler25.types.cloneNode(prop),
+        import_compiler25.types.stringLiteral("Change")
+      );
+      const computed = memberProp.type !== "Identifier";
       return import_compiler25.types.markoAttribute(
         changeAttrName,
-        import_compiler25.types.memberExpression(
-          import_compiler25.types.cloneNode(attr.value.object),
-          prop.type === "Identifier" ? withPreviousLocation(import_compiler25.types.identifier(prop.name + "Change"), prop) : import_compiler25.types.binaryExpression(
-            "+",
-            import_compiler25.types.cloneNode(prop),
-            import_compiler25.types.stringLiteral("Change")
-          ),
-          prop.type !== "Identifier"
-        )
+        attr.value.optional ? import_compiler25.types.optionalMemberExpression(memberObj, memberProp, computed, true) : import_compiler25.types.memberExpression(memberObj, memberProp, computed)
       );
     }
   }
@@ -8077,7 +8078,8 @@ function trackReference(referencePath, binding) {
   let propPath = binding.name;
   while (true) {
     const { parent } = root;
-    if (!import_compiler35.types.isMemberExpression(parent)) break;
+    if (!import_compiler35.types.isMemberExpression(parent) && !import_compiler35.types.isOptionalMemberExpression(parent))
+      break;
     const prop = getMemberExpressionPropString(parent);
     if (prop === void 0) break;
     if (reference.upstreamAlias && reference.excludeProperties !== void 0 && !propsUtil.has(reference.excludeProperties, prop)) {

package/dist/translator/util/get-defined-binding-expression.d.ts

@@ -1,3 +1,3 @@
 import { types as t } from "@marko/compiler";
 import { type Binding } from "./references";
-export declare function getDeclaredBindingExpression(binding: Binding): t.Identifier | t.OptionalMemberExpression | t.MemberExpression;
+export declare function getDeclaredBindingExpression(binding: Binding): t.Identifier | t.MemberExpression | t.OptionalMemberExpression;

package/dist/translator/util/references.d.ts

@@ -108,7 +108,7 @@ export declare function getDebugName(binding: Binding): string;
 export declare function getDebugNames(refs: ReferencedBindings): string;
 export declare function getSectionInstancesAccessor(section: Section): string;
 export declare function getSectionInstancesAccessorLiteral(section: Section): t.StringLiteral | t.NumericLiteral | undefined;
-export declare function getReadReplacement(node: t.Identifier | t.MemberExpression): t.Node | undefined;
+export declare function getReadReplacement(node: t.Identifier | t.MemberExpression | t.OptionalMemberExpression): t.Node | undefined;
 export interface ReferencedExtra extends t.NodeExtra {
     section: Section;
     fnExtra?: FnExtra;

package/package.json

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