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

package/dist/common/accessor.d.ts

@@ -12,13 +12,14 @@ export declare enum AccessorPrefix {
     LifecycleAbortController = "k",
     LoopScopeArray = "l",
     LoopScopeMap = "m",
-    Promise = "n"
+    Promise = "n",
+    TagVariableChange = "o"
 }
 export declare enum AccessorProp {
-    BranchAccessor = "*",
-    CatchContent = "^",
-    PlaceholderBranch = "#",
-    PlaceholderContent = "%",
-    TagVariable = "/",
-    TagVariableChange = "@"
+    BranchAccessor = "a",
+    CatchContent = "b",
+    PlaceholderBranch = "c",
+    PlaceholderContent = "d",
+    TagVariable = "e",
+    TagVariableChange = "f"
 }

package/dist/common/accessor.debug.d.ts

@@ -12,13 +12,14 @@ export declare enum AccessorPrefix {
     LifecycleAbortController = "LifecycleAbortController:",
     LoopScopeArray = "LoopScopeArray:",
     LoopScopeMap = "LoopScopeMap:",
-    Promise = "Promise:"
+    Promise = "Promise:",
+    TagVariableChange = "TagVariableChange:"
 }
 export declare enum AccessorProp {
-    BranchAccessor = "*BranchAccessor",
-    CatchContent = "^CatchContent",
+    BranchAccessor = "#BranchAccessor",
+    CatchContent = "#CatchContent",
     PlaceholderBranch = "#PlaceholderBranch",
-    PlaceholderContent = "%PlaceholderContent",
-    TagVariable = "/TagVariable",
-    TagVariableChange = "@TagVariableChange"
+    PlaceholderContent = "#PlaceholderContent",
+    TagVariable = "#TagVariable",
+    TagVariableChange = "#TagVariableChange"
 }

package/dist/debug/dom.js

@@ -1437,7 +1437,7 @@ function state(valueAccessor, fn) {
       valueAccessor.lastIndexOf("/")
     );
   }
-  const valueChangeAccessor = "@TagVariableChange" /* TagVariableChange */ + valueAccessor;
+  const valueChangeAccessor = "TagVariableChange:" /* TagVariableChange */ + valueAccessor;
   const update = (scope, value2) => {
     if (scope[valueAccessor] !== value2) {
       scope[valueAccessor] = value2;
@@ -1575,13 +1575,13 @@ function closure(valueAccessor, fn, getOwnerScope) {
   };
 }
 function setTagVar(scope, childAccessor, tagVarSignal2) {
-  scope[childAccessor]["/TagVariable" /* TagVariable */] = (value2) => tagVarSignal2(scope, value2);
+  scope[childAccessor]["#TagVariable" /* TagVariable */] = (value2) => tagVarSignal2(scope, value2);
 }
-var tagVarSignal = (scope, value2) => scope["/TagVariable" /* TagVariable */]?.(value2);
+var tagVarSignal = (scope, value2) => scope["#TagVariable" /* TagVariable */]?.(value2);
 function setTagVarChange(scope, changeHandler) {
-  scope["@TagVariableChange" /* TagVariableChange */] = changeHandler;
+  scope["#TagVariableChange" /* TagVariableChange */] = changeHandler;
 }
-var tagVarSignalChange = (scope, value2) => scope["@TagVariableChange" /* TagVariableChange */]?.(value2);
+var tagVarSignalChange = (scope, value2) => scope["#TagVariableChange" /* TagVariableChange */]?.(value2);
 var tagIdsByGlobal = /* @__PURE__ */ new WeakMap();
 function nextTagId({ $global }) {
   const id = tagIdsByGlobal.get($global) || 0;
@@ -1624,7 +1624,7 @@ function awaitTag(nodeAccessor, renderer) {
     let awaitBranch = scope[branchAccessor];
     const referenceNode = scope[nodeAccessor];
     const namespaceNode = (awaitBranch?.___startNode ?? referenceNode).parentNode;
-    while (tryBranch && !tryBranch["%PlaceholderContent" /* PlaceholderContent */]) {
+    while (tryBranch && !tryBranch["#PlaceholderContent" /* PlaceholderContent */]) {
       tryBranch = tryBranch.___parentBranch;
     }
     const thisPromise = scope[promiseAccessor] = promise.then((data2) => {
@@ -1671,7 +1671,7 @@ function awaitTag(nodeAccessor, renderer) {
       }
     }).catch((error) => {
       let tryBranch2 = scope.___closestBranch;
-      while (tryBranch2 && !tryBranch2["^CatchContent" /* CatchContent */]) {
+      while (tryBranch2 && !tryBranch2["#CatchContent" /* CatchContent */]) {
         tryBranch2 = tryBranch2.___parentBranch;
       }
       if (!tryBranch2) {
@@ -1681,12 +1681,12 @@ function awaitTag(nodeAccessor, renderer) {
       } else {
         setConditionalRenderer(
           tryBranch2._,
-          tryBranch2["*BranchAccessor" /* BranchAccessor */],
-          tryBranch2["^CatchContent" /* CatchContent */],
+          tryBranch2["#BranchAccessor" /* BranchAccessor */],
+          tryBranch2["#CatchContent" /* CatchContent */],
           createAndSetupBranch
         );
-        tryBranch2["^CatchContent" /* CatchContent */].___params?.(
-          tryBranch2._["ConditionalScope:" /* ConditionalScope */ + tryBranch2["*BranchAccessor" /* BranchAccessor */]],
+        tryBranch2["#CatchContent" /* CatchContent */].___params?.(
+          tryBranch2._["ConditionalScope:" /* ConditionalScope */ + tryBranch2["#BranchAccessor" /* BranchAccessor */]],
           [error]
         );
       }
@@ -1698,7 +1698,7 @@ function awaitTag(nodeAccessor, renderer) {
           if (tryBranch.___pendingAsyncCount && !tryBranch.___destroyed) {
             const placeholderBranch = tryBranch["#PlaceholderBranch" /* PlaceholderBranch */] = createAndSetupBranch(
               scope.$global,
-              tryBranch["%PlaceholderContent" /* PlaceholderContent */],
+              tryBranch["#PlaceholderContent" /* PlaceholderContent */],
               tryBranch._,
               tryBranch.___startNode.parentNode
             );
@@ -1734,9 +1734,9 @@ function createTry(nodeAccessor, tryContent) {
     }
     const branch = scope[branchAccessor];
     if (branch) {
-      branch["*BranchAccessor" /* BranchAccessor */] = nodeAccessor;
-      branch["^CatchContent" /* CatchContent */] = normalizeDynamicRenderer(input.catch);
-      branch["%PlaceholderContent" /* PlaceholderContent */] = normalizeDynamicRenderer(
+      branch["#BranchAccessor" /* BranchAccessor */] = nodeAccessor;
+      branch["#CatchContent" /* CatchContent */] = normalizeDynamicRenderer(input.catch);
+      branch["#PlaceholderContent" /* PlaceholderContent */] = normalizeDynamicRenderer(
         input.placeholder
       );
     }
@@ -2048,19 +2048,19 @@ var enableCatch = () => {
       runRender2(render);
     } catch (error) {
       let branch = render.___scope.___closestBranch;
-      while (branch && !branch["^CatchContent" /* CatchContent */])
+      while (branch && !branch["#CatchContent" /* CatchContent */])
         branch = branch.___parentBranch;
       if (!branch) {
         throw error;
       } else {
         setConditionalRenderer(
           branch._,
-          branch["*BranchAccessor" /* BranchAccessor */],
-          branch["^CatchContent" /* CatchContent */],
+          branch["#BranchAccessor" /* BranchAccessor */],
+          branch["#CatchContent" /* CatchContent */],
           createAndSetupBranch
         );
-        branch["^CatchContent" /* CatchContent */].___params?.(
-          branch._["ConditionalScope:" /* ConditionalScope */ + branch["*BranchAccessor" /* BranchAccessor */]],
+        branch["#CatchContent" /* CatchContent */].___params?.(
+          branch._["ConditionalScope:" /* ConditionalScope */ + branch["#BranchAccessor" /* BranchAccessor */]],
           [error]
         );
       }

package/dist/debug/dom.mjs

@@ -1349,7 +1349,7 @@ function state(valueAccessor, fn) {
       valueAccessor.lastIndexOf("/")
     );
   }
-  const valueChangeAccessor = "@TagVariableChange" /* TagVariableChange */ + valueAccessor;
+  const valueChangeAccessor = "TagVariableChange:" /* TagVariableChange */ + valueAccessor;
   const update = (scope, value2) => {
     if (scope[valueAccessor] !== value2) {
       scope[valueAccessor] = value2;
@@ -1487,13 +1487,13 @@ function closure(valueAccessor, fn, getOwnerScope) {
   };
 }
 function setTagVar(scope, childAccessor, tagVarSignal2) {
-  scope[childAccessor]["/TagVariable" /* TagVariable */] = (value2) => tagVarSignal2(scope, value2);
+  scope[childAccessor]["#TagVariable" /* TagVariable */] = (value2) => tagVarSignal2(scope, value2);
 }
-var tagVarSignal = (scope, value2) => scope["/TagVariable" /* TagVariable */]?.(value2);
+var tagVarSignal = (scope, value2) => scope["#TagVariable" /* TagVariable */]?.(value2);
 function setTagVarChange(scope, changeHandler) {
-  scope["@TagVariableChange" /* TagVariableChange */] = changeHandler;
+  scope["#TagVariableChange" /* TagVariableChange */] = changeHandler;
 }
-var tagVarSignalChange = (scope, value2) => scope["@TagVariableChange" /* TagVariableChange */]?.(value2);
+var tagVarSignalChange = (scope, value2) => scope["#TagVariableChange" /* TagVariableChange */]?.(value2);
 var tagIdsByGlobal = /* @__PURE__ */ new WeakMap();
 function nextTagId({ $global }) {
   const id = tagIdsByGlobal.get($global) || 0;
@@ -1536,7 +1536,7 @@ function awaitTag(nodeAccessor, renderer) {
     let awaitBranch = scope[branchAccessor];
     const referenceNode = scope[nodeAccessor];
     const namespaceNode = (awaitBranch?.___startNode ?? referenceNode).parentNode;
-    while (tryBranch && !tryBranch["%PlaceholderContent" /* PlaceholderContent */]) {
+    while (tryBranch && !tryBranch["#PlaceholderContent" /* PlaceholderContent */]) {
       tryBranch = tryBranch.___parentBranch;
     }
     const thisPromise = scope[promiseAccessor] = promise.then((data2) => {
@@ -1583,7 +1583,7 @@ function awaitTag(nodeAccessor, renderer) {
       }
     }).catch((error) => {
       let tryBranch2 = scope.___closestBranch;
-      while (tryBranch2 && !tryBranch2["^CatchContent" /* CatchContent */]) {
+      while (tryBranch2 && !tryBranch2["#CatchContent" /* CatchContent */]) {
         tryBranch2 = tryBranch2.___parentBranch;
       }
       if (!tryBranch2) {
@@ -1593,12 +1593,12 @@ function awaitTag(nodeAccessor, renderer) {
       } else {
         setConditionalRenderer(
           tryBranch2._,
-          tryBranch2["*BranchAccessor" /* BranchAccessor */],
-          tryBranch2["^CatchContent" /* CatchContent */],
+          tryBranch2["#BranchAccessor" /* BranchAccessor */],
+          tryBranch2["#CatchContent" /* CatchContent */],
           createAndSetupBranch
         );
-        tryBranch2["^CatchContent" /* CatchContent */].___params?.(
-          tryBranch2._["ConditionalScope:" /* ConditionalScope */ + tryBranch2["*BranchAccessor" /* BranchAccessor */]],
+        tryBranch2["#CatchContent" /* CatchContent */].___params?.(
+          tryBranch2._["ConditionalScope:" /* ConditionalScope */ + tryBranch2["#BranchAccessor" /* BranchAccessor */]],
           [error]
         );
       }
@@ -1610,7 +1610,7 @@ function awaitTag(nodeAccessor, renderer) {
           if (tryBranch.___pendingAsyncCount && !tryBranch.___destroyed) {
             const placeholderBranch = tryBranch["#PlaceholderBranch" /* PlaceholderBranch */] = createAndSetupBranch(
               scope.$global,
-              tryBranch["%PlaceholderContent" /* PlaceholderContent */],
+              tryBranch["#PlaceholderContent" /* PlaceholderContent */],
               tryBranch._,
               tryBranch.___startNode.parentNode
             );
@@ -1646,9 +1646,9 @@ function createTry(nodeAccessor, tryContent) {
     }
     const branch = scope[branchAccessor];
     if (branch) {
-      branch["*BranchAccessor" /* BranchAccessor */] = nodeAccessor;
-      branch["^CatchContent" /* CatchContent */] = normalizeDynamicRenderer(input.catch);
-      branch["%PlaceholderContent" /* PlaceholderContent */] = normalizeDynamicRenderer(
+      branch["#BranchAccessor" /* BranchAccessor */] = nodeAccessor;
+      branch["#CatchContent" /* CatchContent */] = normalizeDynamicRenderer(input.catch);
+      branch["#PlaceholderContent" /* PlaceholderContent */] = normalizeDynamicRenderer(
         input.placeholder
       );
     }
@@ -1960,19 +1960,19 @@ var enableCatch = () => {
       runRender2(render);
     } catch (error) {
       let branch = render.___scope.___closestBranch;
-      while (branch && !branch["^CatchContent" /* CatchContent */])
+      while (branch && !branch["#CatchContent" /* CatchContent */])
         branch = branch.___parentBranch;
       if (!branch) {
         throw error;
       } else {
         setConditionalRenderer(
           branch._,
-          branch["*BranchAccessor" /* BranchAccessor */],
-          branch["^CatchContent" /* CatchContent */],
+          branch["#BranchAccessor" /* BranchAccessor */],
+          branch["#CatchContent" /* CatchContent */],
           createAndSetupBranch
         );
-        branch["^CatchContent" /* CatchContent */].___params?.(
-          branch._["ConditionalScope:" /* ConditionalScope */ + branch["*BranchAccessor" /* BranchAccessor */]],
+        branch["#CatchContent" /* CatchContent */].___params?.(
+          branch._["ConditionalScope:" /* ConditionalScope */ + branch["#BranchAccessor" /* BranchAccessor */]],
           [error]
         );
       }

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;
@@ -1644,7 +1689,7 @@ function withContext(key, value, cb) {
 }
 function setTagVar(parentScopeId, scopeOffsetAccessor, childScope, registryId) {
   ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId();
-  childScope["/TagVariable" /* TagVariable */] = register2(
+  childScope["#TagVariable" /* TagVariable */] = register2(
     {},
     registryId,
     parentScopeId
@@ -1961,9 +2006,9 @@ function tryContent(scopeId, accessor, content, input) {
     content();
   }
   writeScope(branchId, {
-    ["*BranchAccessor" /* BranchAccessor */]: accessor,
-    ["^CatchContent" /* CatchContent */]: catchContent,
-    ["%PlaceholderContent" /* PlaceholderContent */]: placeholderContent
+    ["#BranchAccessor" /* BranchAccessor */]: accessor,
+    ["#CatchContent" /* CatchContent */]: catchContent,
+    ["#PlaceholderContent" /* PlaceholderContent */]: placeholderContent
   });
   writeScope(scopeId, {
     ["ConditionalScope:" /* ConditionalScope */ + accessor]: getScopeById(branchId)

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;
@@ -1560,7 +1605,7 @@ function withContext(key, value, cb) {
 }
 function setTagVar(parentScopeId, scopeOffsetAccessor, childScope, registryId) {
   ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId();
-  childScope["/TagVariable" /* TagVariable */] = register2(
+  childScope["#TagVariable" /* TagVariable */] = register2(
     {},
     registryId,
     parentScopeId
@@ -1877,9 +1922,9 @@ function tryContent(scopeId, accessor, content, input) {
     content();
   }
   writeScope(branchId, {
-    ["*BranchAccessor" /* BranchAccessor */]: accessor,
-    ["^CatchContent" /* CatchContent */]: catchContent,
-    ["%PlaceholderContent" /* PlaceholderContent */]: placeholderContent
+    ["#BranchAccessor" /* BranchAccessor */]: accessor,
+    ["#CatchContent" /* CatchContent */]: catchContent,
+    ["#PlaceholderContent" /* PlaceholderContent */]: placeholderContent
   });
   writeScope(scopeId, {
     ["ConditionalScope:" /* ConditionalScope */ + accessor]: getScopeById(branchId)