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

package/dist/debug/html.js

@@ -305,12 +305,12 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
     // repurpose "op" for callbacks ...carefully
     if (op = runtime.j[id]) {
       placeholderCallback = placeholder.c;
-      placeholder.c = () => placeholderCallback() + op(runtime);
+      placeholder.c = () => placeholderCallback() + op(runtime.r);
     }
   }
 };
 })`
-) : `(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)))}})`;
+) : `(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 } = {};
@@ -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

@@ -221,12 +221,12 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
     // repurpose "op" for callbacks ...carefully
     if (op = runtime.j[id]) {
       placeholderCallback = placeholder.c;
-      placeholder.c = () => placeholderCallback() + op(runtime);
+      placeholder.c = () => placeholderCallback() + op(runtime.r);
     }
   }
 };
 })`
-) : `(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)))}})`;
+) : `(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 } = {};
@@ -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/dom/control-flow.d.ts

@@ -6,6 +6,7 @@ export declare function createTry(nodeAccessor: Accessor, tryContent: Renderer):
     catch: unknown;
     placeholder: unknown;
 }) => void;
+export declare function renderCatch(scope: Scope, error: unknown, async?: boolean): void;
 export declare function conditional(nodeAccessor: Accessor, ...branches: Renderer[]): (scope: Scope, newBranch: number) => void;
 export declare function patchDynamicTag(fn: <T extends typeof dynamicTag>(cond: T) => T): void;
 export declare let dynamicTag: (nodeAccessor: Accessor, getContent?: ((scope: Scope) => Renderer) | 0, getTagVar?: (() => Signal<unknown>) | 0, inputIsArgs?: 1) => Signal<Renderer | string | undefined>;

package/dist/dom/queue.d.ts

@@ -1,12 +1,14 @@
-import { type Scope } from "../common/types";
+import type { Scope } from "../common/types";
 import type { Signal } from "./signals";
 type ExecFn<S extends Scope = Scope> = (scope: S, arg?: any) => void;
+export declare const caughtError: WeakSet<unknown[]>;
+export declare const placeholderShown: WeakSet<unknown[]>;
 export declare let pendingEffects: unknown[];
 export declare let rendering: boolean;
 export declare function queueRender<T>(scope: Scope, signal: Signal<T>, signalKey: number, value?: T, scopeKey?: number): void;
 export declare function queueEffect<S extends Scope, T extends ExecFn<S>>(scope: S, fn: T): void;
 export declare function run(): void;
 export declare function prepareEffects(fn: () => void): unknown[];
-export declare function runEffects(effects: unknown[]): void;
+export declare let runEffects: (effects: unknown[]) => void;
 export declare let enableCatch: () => void;
 export {};

package/dist/dom/scope.d.ts

@@ -2,6 +2,7 @@ import type { BranchScope, Scope } from "../common/types";
 export declare function createScope($global: Scope["$global"], closestBranch?: BranchScope): Scope;
 export declare function skipScope(scope: Scope): number;
 export declare function finishPendingScopes(): void;
+export declare function findBranchWithKey(scope: Scope, key: string): BranchScope | undefined;
 export declare function destroyBranch(branch: BranchScope): void;
 export declare function removeAndDestroyBranch(branch: BranchScope): void;
 export declare function insertBranchBefore(branch: BranchScope, parentNode: ParentNode, nextSibling: Node | null): void;