marko 6.0.0-next.3.62 → 6.0.0-next.3.64

package/dist/dom.mjs

@@ -200,7 +200,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                       let parentBranchId = parentBranchIds.get(scopeId);
                       if (parentBranchId && (scope.j = scopes[parentBranchId]), branchIds.has(scopeId)) {
                         let branch = scope, parentBranch = branch.j;
-                        scope.j = branch, parentBranch && (branch.n = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(
+                        scope.j = branch, parentBranch && (branch.t = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(
                           branch
                         ));
                       }
@@ -634,7 +634,7 @@ var pendingScopes = [];
 function createScope($global, closestBranch) {
   let scope = {
     l: $global.m++,
-    o: 1,
+    n: 1,
     j: closestBranch,
     $global
   };
@@ -645,16 +645,22 @@ function skipScope(scope) {
 }
 function finishPendingScopes() {
   for (let scope of pendingScopes)
-    scope.o = 0;
+    scope.n = 0;
   pendingScopes = [];
 }
+function findBranchWithKey(scope, key) {
+  let branch = scope.j;
+  for (; branch && !branch[key]; )
+    branch = branch.t;
+  return branch;
+}
 function destroyBranch(branch) {
-  branch.n?.z?.delete(branch), destroyNestedBranches(branch);
+  branch.t?.z?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.q = 1, branch.z?.forEach(destroyNestedBranches), branch.H?.forEach((scope) => {
-    for (let id in scope.t)
-      scope.t[id]?.abort();
+  branch.o = 1, branch.z?.forEach(destroyNestedBranches), branch.I?.forEach((scope) => {
+    for (let id in scope.u)
+      scope.u[id]?.abort();
   });
 }
 function removeAndDestroyBranch(branch) {
@@ -794,7 +800,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
 // src/dom/renderer.ts
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.j;
-  return branch._ = renderer.u || parentScope, branch.j = branch, parentBranch && (branch.n = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(branch)), renderer.A?.(
+  return branch._ = renderer.x || parentScope, branch.j = branch, parentBranch && (branch.t = parentBranch, (parentBranch.z ||= /* @__PURE__ */ new Set()).add(branch)), renderer.A?.(
     branch,
     parentNode.namespaceURI
   ), branch;
@@ -831,11 +837,11 @@ function createContent(id, template, walks, setup, params, closures, dynamicScop
   return (owner) => ({
     l: id,
     A: clone,
-    u: owner,
+    x: owner,
     B: setup,
     k: params,
     D: closures,
-    x: dynamicScopesAccessor
+    y: dynamicScopesAccessor
   });
 }
 function registerContent(id, template, walks, setup, params, closures, dynamicScopesAccessor) {
@@ -909,7 +915,7 @@ function value(valueAccessor, fn = () => {
 }
 function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
   return (scope) => {
-    scope.o ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+    scope.n ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
 }
 function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
@@ -919,7 +925,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       ownerScope,
       () => {
         for (let scope of scopes)
-          !scope.o && !scope.q && childSignal(scope);
+          !scope.n && !scope.o && childSignal(scope);
       },
       -1,
       0,
@@ -931,7 +937,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function conditionalClosure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.o && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.n && scope[branchAccessor] === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }
@@ -945,11 +951,11 @@ function subscribeToScopeSet(ownerScope, accessor, scope) {
 function dynamicClosure(...closureSignals) {
   let [{ E: ___scopeInstancesAccessor, F: ___signalIndexAccessor }] = closureSignals;
   for (let i = closureSignals.length; i--; )
-    closureSignals[i].I = i;
+    closureSignals[i].J = i;
   return (scope) => {
     if (scope[___scopeInstancesAccessor])
       for (let childScope of scope[___scopeInstancesAccessor])
-        childScope.o || queueRender(
+        childScope.n || queueRender(
           childScope,
           closureSignals[childScope[___signalIndexAccessor]],
           -1
@@ -958,7 +964,7 @@ function dynamicClosure(...closureSignals) {
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
   let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
-    scope[closureSignal.F] = closureSignal.I, childSignal(scope), subscribeToScopeSet(
+    scope[closureSignal.F] = closureSignal.J, childSignal(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
       closureSignal.E,
       scope
@@ -1006,71 +1012,53 @@ function hoist(...path) {
 function awaitTag(nodeAccessor, renderer) {
   let promiseAccessor = "n" /* Promise */ + nodeAccessor, branchAccessor = "d" /* ConditionalScope */ + nodeAccessor;
   return (scope, promise) => {
-    let tryBranch = scope.j, awaitBranch = scope[branchAccessor], referenceNode = scope[nodeAccessor], namespaceNode = (awaitBranch?.g ?? referenceNode).parentNode;
-    for (; tryBranch && !tryBranch.d; )
-      tryBranch = tryBranch.n;
-    let thisPromise = scope[promiseAccessor] = promise.then((data2) => {
-      if (scope.j?.q || scope[promiseAccessor] !== thisPromise)
-        return;
-      scope[promiseAccessor] = void 0;
-      let effects = prepareEffects(() => {
-        (!awaitBranch || !tryBranch) && (insertBranchBefore(
-          awaitBranch ??= scope[branchAccessor] = createAndSetupBranch(
-            scope.$global,
-            renderer,
-            scope,
-            namespaceNode
-          ),
-          referenceNode.parentNode,
-          referenceNode
-        ), referenceNode.remove()), renderer.k?.(awaitBranch, [data2]);
-      });
-      if (tryBranch) {
-        if (!--tryBranch.y) {
-          let placeholderBranch = tryBranch.c;
-          placeholderBranch ? (insertBranchBefore(
-            tryBranch,
-            placeholderBranch.g.parentNode,
-            placeholderBranch.g
-          ), removeAndDestroyBranch(placeholderBranch)) : insertBranchBefore(
-            tryBranch,
+    let tryWithPlaceholder = findBranchWithKey(
+      scope,
+      "d" /* PlaceholderContent */
+    ), awaitBranch = scope[branchAccessor], referenceNode = scope[nodeAccessor], namespaceNode = (awaitBranch?.g ?? referenceNode).parentNode, thisPromise = scope[promiseAccessor] = promise.then((data2) => {
+      if (!(scope.j?.o || scope[promiseAccessor] !== thisPromise) && (scope[promiseAccessor] = void 0, runEffects(
+        prepareEffects(() => {
+          tryWithPlaceholder && placeholderShown.add(pendingEffects), (!awaitBranch || !tryWithPlaceholder) && (insertBranchBefore(
+            awaitBranch ??= scope[branchAccessor] = createAndSetupBranch(
+              scope.$global,
+              renderer,
+              scope,
+              namespaceNode
+            ),
             referenceNode.parentNode,
             referenceNode
-          );
-        }
-      } else
-        runEffects(effects);
+          ), referenceNode.remove()), renderer.k?.(awaitBranch, [data2]);
+        })
+      ), tryWithPlaceholder && !--tryWithPlaceholder.p)) {
+        let placeholderBranch = tryWithPlaceholder.c;
+        tryWithPlaceholder.c = void 0, placeholderBranch ? (insertBranchBefore(
+          tryWithPlaceholder,
+          placeholderBranch.g.parentNode,
+          placeholderBranch.g
+        ), removeAndDestroyBranch(placeholderBranch)) : insertBranchBefore(
+          tryWithPlaceholder,
+          referenceNode.parentNode,
+          referenceNode
+        ), tryWithPlaceholder.G && runEffects(tryWithPlaceholder.G, !0);
+      }
     }).catch((error) => {
-      let tryBranch2 = scope.j;
-      for (; tryBranch2 && !tryBranch2.b; )
-        tryBranch2 = tryBranch2.n;
-      tryBranch2 ? (setConditionalRenderer(
-        tryBranch2._,
-        tryBranch2.a,
-        tryBranch2.b,
-        createAndSetupBranch
-      ), tryBranch2.b.k?.(
-        tryBranch2._["d" /* ConditionalScope */ + tryBranch2.a],
-        [error]
-      )) : setTimeout(() => {
-        throw error;
-      });
+      renderCatch(scope, error, !0);
     });
-    tryBranch ? (tryBranch.y || (tryBranch.y = 0, requestAnimationFrame(() => {
-      if (tryBranch.y && !tryBranch.q) {
-        let placeholderBranch = tryBranch.c = createAndSetupBranch(
+    tryWithPlaceholder ? (placeholderShown.add(pendingEffects), tryWithPlaceholder.p || (tryWithPlaceholder.p = 0, requestAnimationFrame(() => {
+      if (tryWithPlaceholder.p && !tryWithPlaceholder.o) {
+        let placeholderBranch = tryWithPlaceholder.c = createAndSetupBranch(
           scope.$global,
-          tryBranch.d,
-          tryBranch._,
-          tryBranch.g.parentNode
+          tryWithPlaceholder.d,
+          tryWithPlaceholder._,
+          tryWithPlaceholder.g.parentNode
         );
         insertBranchBefore(
           placeholderBranch,
-          tryBranch.g.parentNode,
-          tryBranch.g
-        ), tempDetatchBranch(tryBranch);
+          tryWithPlaceholder.g.parentNode,
+          tryWithPlaceholder.g
+        ), tempDetatchBranch(tryWithPlaceholder);
       }
-    })), tryBranch.y++) : awaitBranch && (awaitBranch.g.parentNode.insertBefore(
+    })), tryWithPlaceholder.p++) : awaitBranch && (awaitBranch.g.parentNode.insertBefore(
       referenceNode,
       awaitBranch.g
     ), tempDetatchBranch(awaitBranch));
@@ -1091,6 +1079,26 @@ function createTry(nodeAccessor, tryContent) {
     ));
   };
 }
+function renderCatch(scope, error, async) {
+  let tryWithCatch = findBranchWithKey(scope, "b" /* CatchContent */);
+  if (tryWithCatch) {
+    let placeholderBranch = tryWithCatch.c;
+    placeholderBranch && (tryWithCatch._["d" /* ConditionalScope */ + tryWithCatch.a] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(
+      tryWithCatch._,
+      tryWithCatch.a,
+      tryWithCatch.b,
+      createAndSetupBranch
+    ), tryWithCatch.b.k?.(
+      tryWithCatch._["d" /* ConditionalScope */ + tryWithCatch.a],
+      [error]
+    );
+  } else if (async)
+    setTimeout(() => {
+      throw error;
+    });
+  else
+    throw error;
+}
 function conditional(nodeAccessor, ...branches) {
   let branchAccessor = "c" /* ConditionalRenderer */ + nodeAccessor;
   return (scope, newBranch) => {
@@ -1123,15 +1131,15 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             0,
             content,
             createAndSetupBranch
-          ), content.x && subscribeToScopeSet(
-            content.u,
+          ), content.y && subscribeToScopeSet(
             content.x,
+            content.y,
             scope[childScopeAccessor]["d" /* ConditionalScope */ + 0]
           );
         }
-      } else normalizedRenderer?.x && subscribeToScopeSet(
-        normalizedRenderer.u,
+      } else normalizedRenderer?.y && subscribeToScopeSet(
         normalizedRenderer.x,
+        normalizedRenderer.y,
         scope[childScopeAccessor]
       );
     if (normalizedRenderer) {
@@ -1225,21 +1233,21 @@ function byFirstArg(name) {
 }
 
 // src/dom/queue.ts
-var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), pendingEffects = [], rendering = !1, scopeKeyOffset = 1e3;
+var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], rendering = !1, scopeKeyOffset = 1e3;
 function queueRender(scope, signal, signalKey, value2, scopeKey = scope.l) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
-    existingRender.G = value2;
+    existingRender.H = value2;
   else {
     let render = {
-      p: key,
+      q: key,
       C: scope,
-      J: signal,
-      G: value2
+      K: signal,
+      H: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
       let parentIndex = i - 1 >> 1, parent = pendingRenders[parentIndex];
-      if (key - parent.p >= 0) break;
+      if (key - parent.q >= 0) break;
       pendingRenders[i] = parent, i = parentIndex;
     }
     signalKey >= 0 && pendingRendersLookup.set(key, render), pendingRenders[i] = render;
@@ -1267,62 +1275,63 @@ function prepareEffects(fn) {
   }
   return preparedEffects;
 }
-function runEffects(effects) {
+var runEffects = (effects) => {
   for (let i = 0, scope; i < effects.length; )
     effects[i++](
       scope = effects[i++],
       scope
     );
-}
+};
 function runRenders() {
   for (; pendingRenders.length; ) {
     let render = pendingRenders[0], item = pendingRenders.pop();
     if (render !== item) {
-      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).p;
+      let i = 0, mid = pendingRenders.length >> 1, key = (pendingRenders[0] = item).q;
       for (; i < mid; ) {
         let bestChild = (i << 1) + 1, right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].p - pendingRenders[bestChild].p < 0 && (bestChild = right), pendingRenders[bestChild].p - key >= 0)
+        if (right < pendingRenders.length && pendingRenders[right].q - pendingRenders[bestChild].q < 0 && (bestChild = right), pendingRenders[bestChild].q - key >= 0)
           break;
         pendingRenders[i] = pendingRenders[bestChild], i = bestChild;
       }
       pendingRenders[i] = item;
     }
-    render.C.j?.q || runRender(render);
+    render.C.j?.o || runRender(render);
   }
   finishPendingScopes();
 }
-var runRender = (render) => render.J(render.C, render.G), enableCatch = () => {
+var runRender = (render) => render.K(render.C, render.H), enableCatch = () => {
   enableCatch = () => {
-  }, runRender = /* @__PURE__ */ ((runRender2) => (render) => {
+  };
+  let handlePendingTry = (fn, scope, branch) => {
+    for (; branch; ) {
+      if (branch.p)
+        return (branch.G ||= []).push(fn, scope);
+      branch = branch.t;
+    }
+  };
+  runEffects = /* @__PURE__ */ ((runEffects2) => (effects, checkPending = placeholderShown.has(effects)) => {
+    if (checkPending || caughtError.has(effects)) {
+      let i = 0, fn, scope, branch;
+      for (; i < effects.length; )
+        fn = effects[i++], scope = effects[i++], branch = scope.j, !branch?.o && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope, scope);
+    } else
+      runEffects2(effects);
+  })(runEffects), runRender = /* @__PURE__ */ ((runRender2) => (render) => {
     try {
       runRender2(render);
     } catch (error) {
-      let branch = render.C.j;
-      for (; branch && !branch.b; )
-        branch = branch.n;
-      if (branch)
-        setConditionalRenderer(
-          branch._,
-          branch.a,
-          branch.b,
-          createAndSetupBranch
-        ), branch.b.k?.(
-          branch._["d" /* ConditionalScope */ + branch.a],
-          [error]
-        );
-      else
-        throw error;
+      renderCatch(render.C, error);
     }
   })(runRender);
 };
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let ctrl = scope.t?.[id];
-  ctrl && (queueEffect(ctrl, abort), scope.t[id] = void 0);
+  let ctrl = scope.u?.[id];
+  ctrl && (queueEffect(ctrl, abort), scope.u[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.j && (scope.j.H ||= /* @__PURE__ */ new Set()).add(scope), ((scope.t ||= {})[id] ||= new AbortController()).signal;
+  return scope.j && (scope.j.I ||= /* @__PURE__ */ new Set()).add(scope), ((scope.u ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -1387,7 +1396,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
       branch ? existing = !0 : (out.global.m ||= 0, branch = component.scope = createAndSetupBranch(
         out.global,
         renderer,
-        renderer.u,
+        renderer.x,
         document.body
       )), renderer.k?.(branch, renderer._ ? args[0] : args);
     }), !existing)

package/dist/html.js

@@ -178,7 +178,7 @@ function forTo(to, from, step, cb) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e)))}})';
+var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e.r)))}})';
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {}, Generator = function* () {
@@ -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

@@ -97,7 +97,7 @@ function forTo(to, from, step, cb) {
 }
 
 // src/html/inlined-runtimes.ts
-var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e)))}})';
+var WALKER_RUNTIME_CODE = '(e=>self[e]=self[e]||(l=>{let t,d={},s=[],f=document,i=f.createTreeWalker(f,129),n=self[e][l]={i:l=e+l,d:f,l:d,v:s,x(){},w(e){for(;e=i.nextNode();)this.x(n=(n=e.data)&&!n.indexOf(l)&&(d[t=n.slice(x+1)]=e,n[x]),t,e),n>"#"&&s.push(e)}},x=l.length}))', REORDER_RUNTIME_CODE = '(e=>{let i,t,r,l={},o=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,a,c,p)=>{"#"==d?(l[n]=t).i++:a==r&&i(),"T"==a.tagName&&(n=a.getAttribute(e.i))&&((c=e.l["^"+n])&&(l[n]={i:1,c(i=e.l[n]||a){for(;i.parentNode!==c.parentNode;)i=i.parentNode;for(;i!=r;(r=c.nextSibling).remove());o(c,a)}}),r=a.nextSibling,t=l[n],i=()=>{c||o(e.l[n],a),--t.i||t.c()},(d=e.j[n])&&(p=t.c,t.c=()=>p()+d(e.r)))}})';
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {}, Generator = function* () {
@@ -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.64",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",