marko 6.0.0-next.3.62 → 6.0.0-next.3.63

package/dist/debug/html.js

@@ -564,6 +564,7 @@ var State = class {
   ids = 0;
   flush = 0;
   flushed = false;
+  wroteUndefined = false;
   buf = [];
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
@@ -689,7 +690,12 @@ function writeRoot(state, root) {
   for (const chunk of buf) {
     result += chunk;
   }
-  return "_=>" + result;
+  if (state.wroteUndefined) {
+    state.wroteUndefined = false;
+    return "(_,$)=>" + result;
+  } else {
+    return "_=>" + result;
+  }
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
@@ -981,13 +987,23 @@ function writePlainObject(state, val, ref) {
   return true;
 }
 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);
+  let sep = "[";
+  for (let i = 0; i < val.length; i++) {
+    const item = val[i];
+    state.buf.push(sep);
+    sep = ",";
+    if (item === void 0) {
+      state.wroteUndefined = true;
+      state.buf.push("$");
+    } else {
+      writeProp(state, item, ref, "" + i);
+    }
+  }
+  if (sep === "[") {
+    state.buf.push("[]");
+  } else {
+    state.buf.push("]");
   }
-  state.buf.push("]");
   return true;
 }
 function writeDate(state, val) {
@@ -1016,23 +1032,6 @@ function writeMap(state, val, ref) {
     state.buf.push("new Map");
     return true;
   }
-  const items = [];
-  let assigns;
-  for (let [itemKey, itemValue] of val) {
-    if (itemKey === val) {
-      itemKey = void 0;
-      (assigns ||= []).push("i[" + items.length + "][0]");
-    }
-    if (itemValue === val) {
-      itemValue = void 0;
-      (assigns ||= []).push("i[" + items.length + "][1]");
-    }
-    if (itemValue === void 0) {
-      items.push([itemKey]);
-    } else {
-      items.push([itemKey, itemValue]);
-    }
-  }
   const arrayRef = new Reference(
     ref,
     null,
@@ -1040,11 +1039,56 @@ function writeMap(state, val, ref) {
     null,
     nextRefAccess(state)
   );
-  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(")");
+  const items = [];
+  let assigns;
+  let i = 0;
+  if (val.size < 25) {
+    for (let [itemKey, itemValue] of val) {
+      if (itemKey === val) {
+        itemKey = void 0;
+        (assigns ||= []).push("a[" + i + "][0]");
+      }
+      if (itemValue === val) {
+        itemValue = void 0;
+        (assigns ||= []).push("a[" + i + "][1]");
+      }
+      i = items.push(
+        itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]
+      );
+    }
+    if (assigns) {
+      state.buf.push(
+        "((m,a)=>(" + assignsToString(assigns, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map," + arrayRef.id + "="
+      );
+    } else {
+      state.buf.push("new Map(" + arrayRef.id + "=");
+    }
+    writeArray(state, items, arrayRef);
+    state.buf.push(")");
+  } else {
+    for (let [itemKey, itemValue] of val) {
+      if (itemKey === val) {
+        itemKey = 0;
+        (assigns ||= []).push("a[" + i + "]");
+      }
+      if (itemValue === val) {
+        itemValue = 0;
+        (assigns ||= []).push("a[" + (i + 1) + "]");
+      }
+      i = items.push(itemKey, itemValue);
+    }
+    if (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 + "="
+      );
+    } else {
+      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 true;
 }
 function writeSet(state, val, ref) {
@@ -1054,12 +1098,13 @@ function writeSet(state, val, ref) {
   }
   const items = [];
   let assigns;
+  let i = 0;
   for (let item of val) {
     if (item === val) {
-      item = void 0;
-      (assigns ||= []).push("i[" + items.length + "]");
+      item = 0;
+      (assigns ||= []).push("i[" + i + "]");
     }
-    items.push(item);
+    i = items.push(item);
   }
   const arrayRef = new Reference(
     ref,
@@ -1151,7 +1196,7 @@ function writeFormData(state, val) {
   let valStr = "";
   for (const [key, value] of val) {
     if (typeof value === "string") {
-      valStr += sep + "[" + quote(key, 0) + "," + quote(value, 0) + "]";
+      valStr += sep + quote(key, 0) + "," + quote(value, 0);
       sep = ",";
     }
   }
@@ -1159,7 +1204,7 @@ function writeFormData(state, val) {
     state.buf.push("new FormData");
   } else {
     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)"
     );
   }
   return true;

package/dist/debug/html.mjs

@@ -480,6 +480,7 @@ var State = class {
   ids = 0;
   flush = 0;
   flushed = false;
+  wroteUndefined = false;
   buf = [];
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
@@ -605,7 +606,12 @@ function writeRoot(state, root) {
   for (const chunk of buf) {
     result += chunk;
   }
-  return "_=>" + result;
+  if (state.wroteUndefined) {
+    state.wroteUndefined = false;
+    return "(_,$)=>" + result;
+  } else {
+    return "_=>" + result;
+  }
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
@@ -897,13 +903,23 @@ function writePlainObject(state, val, ref) {
   return true;
 }
 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);
+  let sep = "[";
+  for (let i = 0; i < val.length; i++) {
+    const item = val[i];
+    state.buf.push(sep);
+    sep = ",";
+    if (item === void 0) {
+      state.wroteUndefined = true;
+      state.buf.push("$");
+    } else {
+      writeProp(state, item, ref, "" + i);
+    }
+  }
+  if (sep === "[") {
+    state.buf.push("[]");
+  } else {
+    state.buf.push("]");
   }
-  state.buf.push("]");
   return true;
 }
 function writeDate(state, val) {
@@ -932,23 +948,6 @@ function writeMap(state, val, ref) {
     state.buf.push("new Map");
     return true;
   }
-  const items = [];
-  let assigns;
-  for (let [itemKey, itemValue] of val) {
-    if (itemKey === val) {
-      itemKey = void 0;
-      (assigns ||= []).push("i[" + items.length + "][0]");
-    }
-    if (itemValue === val) {
-      itemValue = void 0;
-      (assigns ||= []).push("i[" + items.length + "][1]");
-    }
-    if (itemValue === void 0) {
-      items.push([itemKey]);
-    } else {
-      items.push([itemKey, itemValue]);
-    }
-  }
   const arrayRef = new Reference(
     ref,
     null,
@@ -956,11 +955,56 @@ function writeMap(state, val, ref) {
     null,
     nextRefAccess(state)
   );
-  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(")");
+  const items = [];
+  let assigns;
+  let i = 0;
+  if (val.size < 25) {
+    for (let [itemKey, itemValue] of val) {
+      if (itemKey === val) {
+        itemKey = void 0;
+        (assigns ||= []).push("a[" + i + "][0]");
+      }
+      if (itemValue === val) {
+        itemValue = void 0;
+        (assigns ||= []).push("a[" + i + "][1]");
+      }
+      i = items.push(
+        itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]
+      );
+    }
+    if (assigns) {
+      state.buf.push(
+        "((m,a)=>(" + assignsToString(assigns, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map," + arrayRef.id + "="
+      );
+    } else {
+      state.buf.push("new Map(" + arrayRef.id + "=");
+    }
+    writeArray(state, items, arrayRef);
+    state.buf.push(")");
+  } else {
+    for (let [itemKey, itemValue] of val) {
+      if (itemKey === val) {
+        itemKey = 0;
+        (assigns ||= []).push("a[" + i + "]");
+      }
+      if (itemValue === val) {
+        itemValue = 0;
+        (assigns ||= []).push("a[" + (i + 1) + "]");
+      }
+      i = items.push(itemKey, itemValue);
+    }
+    if (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 + "="
+      );
+    } else {
+      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 true;
 }
 function writeSet(state, val, ref) {
@@ -970,12 +1014,13 @@ function writeSet(state, val, ref) {
   }
   const items = [];
   let assigns;
+  let i = 0;
   for (let item of val) {
     if (item === val) {
-      item = void 0;
-      (assigns ||= []).push("i[" + items.length + "]");
+      item = 0;
+      (assigns ||= []).push("i[" + i + "]");
     }
-    items.push(item);
+    i = items.push(item);
   }
   const arrayRef = new Reference(
     ref,
@@ -1067,7 +1112,7 @@ function writeFormData(state, val) {
   let valStr = "";
   for (const [key, value] of val) {
     if (typeof value === "string") {
-      valStr += sep + "[" + quote(key, 0) + "," + quote(value, 0) + "]";
+      valStr += sep + quote(key, 0) + "," + quote(value, 0);
       sep = ",";
     }
   }
@@ -1075,7 +1120,7 @@ function writeFormData(state, val) {
     state.buf.push("new FormData");
   } else {
     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)"
     );
   }
   return true;

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) {

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) {

package/package.json

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