marko 6.0.0-next.3.61 → 6.0.0-next.3.63

package/dist/html.js

@@ -424,6 +424,7 @@ var REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
   ids = 0;
   flush = 0;
   flushed = !1;
+  wroteUndefined = !1;
   buf = [];
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
@@ -511,7 +512,7 @@ function writeRoot(state, root) {
     hadBuf && (buf.pop(), writeAssigned(state)), result = "{", buf.push("}");
   for (let chunk of buf)
     result += chunk;
-  return "_=>" + result;
+  return state.wroteUndefined ? (state.wroteUndefined = !1, "(_,$)=>" + result) : "_=>" + result;
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
@@ -711,10 +712,12 @@ function writePlainObject(state, val, ref) {
   return state.buf.push("{"), writeObjectProps(state, val, ref), state.buf.push("}"), !0;
 }
 function writeArray(state, val, ref) {
-  state.buf.push("["), writeProp(state, val[0], ref, "0");
-  for (let i = 1; i < val.length; i++)
-    state.buf.push(","), writeProp(state, val[i], ref, "" + i);
-  return state.buf.push("]"), !0;
+  let sep = "[";
+  for (let i = 0; i < val.length; i++) {
+    let item = val[i];
+    state.buf.push(sep), sep = ",", item === void 0 ? (state.wroteUndefined = !0, state.buf.push("$")) : writeProp(state, item, ref, "" + i);
+  }
+  return sep === "[" ? state.buf.push("[]") : state.buf.push("]"), !0;
 }
 function writeDate(state, val) {
   return state.buf.push('new Date("' + val.toISOString() + '")'), !0;
@@ -734,26 +737,38 @@ function writePromise(state, val, ref) {
 function writeMap(state, val, ref) {
   if (!val.size)
     return state.buf.push("new Map"), !0;
-  let items = [], assigns;
-  for (let [itemKey, itemValue] of val)
-    itemKey === val && (itemKey = void 0, (assigns ||= []).push("i[" + items.length + "][0]")), itemValue === val && (itemValue = void 0, (assigns ||= []).push("i[" + items.length + "][1]")), itemValue === void 0 ? items.push([itemKey]) : items.push([itemKey, itemValue]);
   let arrayRef = new Reference(
     ref,
     null,
     state.flush,
     null,
     nextRefAccess(state)
-  );
-  return state.buf.push(
-    (assigns ? "((m,i)=>(" + assignsToString(assigns, "m") + ",i.forEach(i=>m.set(i[0],i[1])),m))(new Map," : "new Map(") + arrayRef.id + "="
-  ), writeArray(state, items, arrayRef), state.buf.push(")"), !0;
+  ), items = [], assigns, i = 0;
+  if (val.size < 25) {
+    for (let [itemKey, itemValue] of val)
+      itemKey === val && (itemKey = void 0, (assigns ||= []).push("a[" + i + "][0]")), itemValue === val && (itemValue = void 0, (assigns ||= []).push("a[" + i + "][1]")), i = items.push(
+        itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]
+      );
+    assigns ? state.buf.push(
+      "((m,a)=>(" + assignsToString(assigns, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map," + arrayRef.id + "="
+    ) : state.buf.push("new Map(" + arrayRef.id + "="), writeArray(state, items, arrayRef), state.buf.push(")");
+  } else {
+    for (let [itemKey, itemValue] of val)
+      itemKey === val && (itemKey = 0, (assigns ||= []).push("a[" + i + "]")), itemValue === val && (itemValue = 0, (assigns ||= []).push("a[" + (i + 1) + "]")), i = items.push(itemKey, itemValue);
+    assigns ? state.buf.push(
+      "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1])," + assignsToString(assigns, "new Map") + "))(" + arrayRef.id + "="
+    ) : state.buf.push(
+      "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1]),new Map))(" + arrayRef.id + "="
+    ), writeArray(state, items, arrayRef), state.buf.push(")");
+  }
+  return !0;
 }
 function writeSet(state, val, ref) {
   if (!val.size)
     return state.buf.push("new Set"), !0;
-  let items = [], assigns;
+  let items = [], assigns, i = 0;
   for (let item of val)
-    item === val && (item = void 0, (assigns ||= []).push("i[" + items.length + "]")), items.push(item);
+    item === val && (item = 0, (assigns ||= []).push("i[" + i + "]")), i = items.push(item);
   let arrayRef = new Reference(
     ref,
     null,
@@ -806,9 +821,9 @@ function writeHeaders(state, val) {
 function writeFormData(state, val) {
   let sep = "[", valStr = "";
   for (let [key, value] of val)
-    typeof value == "string" && (valStr += sep + "[" + quote(key, 0) + "," + quote(value, 0) + "]", sep = ",");
+    typeof value == "string" && (valStr += sep + quote(key, 0) + "," + quote(value, 0), sep = ",");
   return sep === "[" ? state.buf.push("new FormData") : state.buf.push(
-    "((f,i)=>(f,i.forEach(i=>f.append(i[0],i[1])),f))(new FormData," + valStr + "])"
+    valStr + "].reduce((f,v,i,a)=>i%2&&f.append(v,a[i+1])||f,new FormData)"
   ), !0;
 }
 function writeRequest(state, val, ref) {
@@ -1084,7 +1099,7 @@ function withContext(key, value, cb) {
   }
 }
 function setTagVar(parentScopeId, scopeOffsetAccessor, childScope, registryId) {
-  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), childScope["/" /* TagVariable */] = register2(
+  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), childScope.e = register2(
     {},
     registryId,
     parentScopeId
@@ -1302,9 +1317,9 @@ function tryContent(scopeId, accessor, content, input) {
     placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
     catchContent
   ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content(), writeScope(branchId, {
-    "*": accessor,
-    "^": catchContent,
-    "%": placeholderContent
+    a: accessor,
+    b: catchContent,
+    d: placeholderContent
   }), writeScope(scopeId, {
     ["d" /* ConditionalScope */ + accessor]: getScopeById(branchId)
   }), $chunk.writeHTML(
@@ -1774,7 +1789,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
 function dynamicTagId(tagName) {
   let normalizedRenderer = normalizeDynamicRenderer(tagName);
-  return normalizedRenderer?.a || normalizedRenderer;
+  return normalizedRenderer?.g || normalizedRenderer;
 }
 var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   if (!tag && !content) {
@@ -1847,7 +1862,7 @@ var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   ), result;
 };
 function createContent(id, fn) {
-  return fn.a = id, fn;
+  return fn.g = id, fn;
 }
 function registerContent(id, fn, scopeId) {
   return register2(createContent(id, fn), id, scopeId);
@@ -1874,7 +1889,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   writeScript,
   nextScopeId,
   isTagsAPI(fn) {
-    return !!fn.a;
+    return !!fn.g;
   },
   patchDynamicTag,
   writeSetScopeForComponent(m5c) {

package/dist/html.mjs

@@ -343,6 +343,7 @@ var REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
   ids = 0;
   flush = 0;
   flushed = !1;
+  wroteUndefined = !1;
   buf = [];
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
@@ -430,7 +431,7 @@ function writeRoot(state, root) {
     hadBuf && (buf.pop(), writeAssigned(state)), result = "{", buf.push("}");
   for (let chunk of buf)
     result += chunk;
-  return "_=>" + result;
+  return state.wroteUndefined ? (state.wroteUndefined = !1, "(_,$)=>" + result) : "_=>" + result;
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
@@ -630,10 +631,12 @@ function writePlainObject(state, val, ref) {
   return state.buf.push("{"), writeObjectProps(state, val, ref), state.buf.push("}"), !0;
 }
 function writeArray(state, val, ref) {
-  state.buf.push("["), writeProp(state, val[0], ref, "0");
-  for (let i = 1; i < val.length; i++)
-    state.buf.push(","), writeProp(state, val[i], ref, "" + i);
-  return state.buf.push("]"), !0;
+  let sep = "[";
+  for (let i = 0; i < val.length; i++) {
+    let item = val[i];
+    state.buf.push(sep), sep = ",", item === void 0 ? (state.wroteUndefined = !0, state.buf.push("$")) : writeProp(state, item, ref, "" + i);
+  }
+  return sep === "[" ? state.buf.push("[]") : state.buf.push("]"), !0;
 }
 function writeDate(state, val) {
   return state.buf.push('new Date("' + val.toISOString() + '")'), !0;
@@ -653,26 +656,38 @@ function writePromise(state, val, ref) {
 function writeMap(state, val, ref) {
   if (!val.size)
     return state.buf.push("new Map"), !0;
-  let items = [], assigns;
-  for (let [itemKey, itemValue] of val)
-    itemKey === val && (itemKey = void 0, (assigns ||= []).push("i[" + items.length + "][0]")), itemValue === val && (itemValue = void 0, (assigns ||= []).push("i[" + items.length + "][1]")), itemValue === void 0 ? items.push([itemKey]) : items.push([itemKey, itemValue]);
   let arrayRef = new Reference(
     ref,
     null,
     state.flush,
     null,
     nextRefAccess(state)
-  );
-  return state.buf.push(
-    (assigns ? "((m,i)=>(" + assignsToString(assigns, "m") + ",i.forEach(i=>m.set(i[0],i[1])),m))(new Map," : "new Map(") + arrayRef.id + "="
-  ), writeArray(state, items, arrayRef), state.buf.push(")"), !0;
+  ), items = [], assigns, i = 0;
+  if (val.size < 25) {
+    for (let [itemKey, itemValue] of val)
+      itemKey === val && (itemKey = void 0, (assigns ||= []).push("a[" + i + "][0]")), itemValue === val && (itemValue = void 0, (assigns ||= []).push("a[" + i + "][1]")), i = items.push(
+        itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]
+      );
+    assigns ? state.buf.push(
+      "((m,a)=>(" + assignsToString(assigns, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map," + arrayRef.id + "="
+    ) : state.buf.push("new Map(" + arrayRef.id + "="), writeArray(state, items, arrayRef), state.buf.push(")");
+  } else {
+    for (let [itemKey, itemValue] of val)
+      itemKey === val && (itemKey = 0, (assigns ||= []).push("a[" + i + "]")), itemValue === val && (itemValue = 0, (assigns ||= []).push("a[" + (i + 1) + "]")), i = items.push(itemKey, itemValue);
+    assigns ? state.buf.push(
+      "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1])," + assignsToString(assigns, "new Map") + "))(" + arrayRef.id + "="
+    ) : state.buf.push(
+      "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1]),new Map))(" + arrayRef.id + "="
+    ), writeArray(state, items, arrayRef), state.buf.push(")");
+  }
+  return !0;
 }
 function writeSet(state, val, ref) {
   if (!val.size)
     return state.buf.push("new Set"), !0;
-  let items = [], assigns;
+  let items = [], assigns, i = 0;
   for (let item of val)
-    item === val && (item = void 0, (assigns ||= []).push("i[" + items.length + "]")), items.push(item);
+    item === val && (item = 0, (assigns ||= []).push("i[" + i + "]")), i = items.push(item);
   let arrayRef = new Reference(
     ref,
     null,
@@ -725,9 +740,9 @@ function writeHeaders(state, val) {
 function writeFormData(state, val) {
   let sep = "[", valStr = "";
   for (let [key, value] of val)
-    typeof value == "string" && (valStr += sep + "[" + quote(key, 0) + "," + quote(value, 0) + "]", sep = ",");
+    typeof value == "string" && (valStr += sep + quote(key, 0) + "," + quote(value, 0), sep = ",");
   return sep === "[" ? state.buf.push("new FormData") : state.buf.push(
-    "((f,i)=>(f,i.forEach(i=>f.append(i[0],i[1])),f))(new FormData," + valStr + "])"
+    valStr + "].reduce((f,v,i,a)=>i%2&&f.append(v,a[i+1])||f,new FormData)"
   ), !0;
 }
 function writeRequest(state, val, ref) {
@@ -1003,7 +1018,7 @@ function withContext(key, value, cb) {
   }
 }
 function setTagVar(parentScopeId, scopeOffsetAccessor, childScope, registryId) {
-  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), childScope["/" /* TagVariable */] = register2(
+  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), childScope.e = register2(
     {},
     registryId,
     parentScopeId
@@ -1221,9 +1236,9 @@ function tryContent(scopeId, accessor, content, input) {
     placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
     catchContent
   ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content(), writeScope(branchId, {
-    "*": accessor,
-    "^": catchContent,
-    "%": placeholderContent
+    a: accessor,
+    b: catchContent,
+    d: placeholderContent
   }), writeScope(scopeId, {
     ["d" /* ConditionalScope */ + accessor]: getScopeById(branchId)
   }), $chunk.writeHTML(
@@ -1693,7 +1708,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
 function dynamicTagId(tagName) {
   let normalizedRenderer = normalizeDynamicRenderer(tagName);
-  return normalizedRenderer?.a || normalizedRenderer;
+  return normalizedRenderer?.g || normalizedRenderer;
 }
 var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   if (!tag && !content) {
@@ -1766,7 +1781,7 @@ var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   ), result;
 };
 function createContent(id, fn) {
-  return fn.a = id, fn;
+  return fn.g = id, fn;
 }
 function registerContent(id, fn, scopeId) {
   return register2(createContent(id, fn), id, scopeId);
@@ -1793,7 +1808,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   writeScript,
   nextScopeId,
   isTagsAPI(fn) {
-    return !!fn.a;
+    return !!fn.g;
   },
   patchDynamicTag,
   writeSetScopeForComponent(m5c) {

package/dist/translator/index.js

@@ -128,15 +128,16 @@ var AccessorPrefix = /* @__PURE__ */ ((AccessorPrefix3) => {
   AccessorPrefix3["LoopScopeArray"] = "LoopScopeArray:";
   AccessorPrefix3["LoopScopeMap"] = "LoopScopeMap:";
   AccessorPrefix3["Promise"] = "Promise:";
+  AccessorPrefix3["TagVariableChange"] = "TagVariableChange:";
   return AccessorPrefix3;
 })(AccessorPrefix || {});
 var AccessorProp = /* @__PURE__ */ ((AccessorProp3) => {
-  AccessorProp3["BranchAccessor"] = "*BranchAccessor";
-  AccessorProp3["CatchContent"] = "^CatchContent";
+  AccessorProp3["BranchAccessor"] = "#BranchAccessor";
+  AccessorProp3["CatchContent"] = "#CatchContent";
   AccessorProp3["PlaceholderBranch"] = "#PlaceholderBranch";
-  AccessorProp3["PlaceholderContent"] = "%PlaceholderContent";
-  AccessorProp3["TagVariable"] = "/TagVariable";
-  AccessorProp3["TagVariableChange"] = "@TagVariableChange";
+  AccessorProp3["PlaceholderContent"] = "#PlaceholderContent";
+  AccessorProp3["TagVariable"] = "#TagVariable";
+  AccessorProp3["TagVariableChange"] = "#TagVariableChange";
   return AccessorProp3;
 })(AccessorProp || {});
 
@@ -1441,15 +1442,16 @@ var AccessorPrefix2 = /* @__PURE__ */ ((AccessorPrefix3) => {
   AccessorPrefix3["LoopScopeArray"] = "l";
   AccessorPrefix3["LoopScopeMap"] = "m";
   AccessorPrefix3["Promise"] = "n";
+  AccessorPrefix3["TagVariableChange"] = "o";
   return AccessorPrefix3;
 })(AccessorPrefix2 || {});
 var AccessorProp2 = /* @__PURE__ */ ((AccessorProp3) => {
-  AccessorProp3["BranchAccessor"] = "*";
-  AccessorProp3["CatchContent"] = "^";
-  AccessorProp3["PlaceholderBranch"] = "#";
-  AccessorProp3["PlaceholderContent"] = "%";
-  AccessorProp3["TagVariable"] = "/";
-  AccessorProp3["TagVariableChange"] = "@";
+  AccessorProp3["BranchAccessor"] = "a";
+  AccessorProp3["CatchContent"] = "b";
+  AccessorProp3["PlaceholderBranch"] = "c";
+  AccessorProp3["PlaceholderContent"] = "d";
+  AccessorProp3["TagVariable"] = "e";
+  AccessorProp3["TagVariableChange"] = "f";
   return AccessorProp3;
 })(AccessorProp2 || {});
 
@@ -7873,7 +7875,7 @@ var let_default = {
         if (valueChangeAttr) {
           setSerializedProperty(
             section,
-            getAccessorProp().TagVariableChange + getScopeAccessor(binding),
+            getAccessorPrefix().TagVariableChange + getScopeAccessor(binding),
             valueChangeAttr.value
           );
         }

package/package.json

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