@manyducks.co/dolla 2.0.0-alpha.62 → 2.0.0-alpha.63

package/dist/{markup-UzKSsawX.js → markup-CW_lWDfq.js}

@@ -1,60 +1,60 @@
-var it = Object.defineProperty;
-var B = (i) => {
-  throw TypeError(i);
+var nt = Object.defineProperty;
+var K = (o) => {
+  throw TypeError(o);
 };
-var nt = (i, o, t) => o in i ? it(i, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[o] = t;
-var a = (i, o, t) => nt(i, typeof o != "symbol" ? o + "" : o, t), j = (i, o, t) => o.has(i) || B("Cannot " + t);
-var O = (i, o, t) => (j(i, o, "read from private field"), t ? t.call(i) : o.get(i)), V = (i, o, t) => o.has(i) ? B("Cannot add the same private member more than once") : o instanceof WeakSet ? o.add(i) : o.set(i, t), T = (i, o, t, e) => (j(i, o, "write to private field"), e ? e.call(i, t) : o.set(i, t), t);
-import { c as m, t as rt, i as C, b as D } from "./typeChecking-CbltMOUt.js";
-import { u as I, g as x, f as Y, h as M, e as v, t as J, o as ct, i as at, b as ht, $ as _, d as ut } from "./signals-gCwiIe5X.js";
-import { c as lt, g as dt } from "./logger-Bl496yfY.js";
-var g = /* @__PURE__ */ ((i) => (i[i.WILL_MOUNT = 0] = "WILL_MOUNT", i[i.DID_MOUNT = 1] = "DID_MOUNT", i[i.WILL_UNMOUNT = 2] = "WILL_UNMOUNT", i[i.DID_UNMOUNT = 3] = "DID_UNMOUNT", i[i.DISPOSE = 4] = "DISPOSE", i))(g || {});
-const U = Symbol("name"), d = Symbol("lifecycle"), b = Symbol("parent"), y = Symbol("stores"), w = Symbol("state");
-class ft {
-  constructor(o) {
+var rt = (o, i, t) => i in o ? nt(o, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[i] = t;
+var a = (o, i, t) => rt(o, typeof i != "symbol" ? i + "" : i, t), j = (o, i, t) => i.has(o) || K("Cannot " + t);
+var _ = (o, i, t) => (j(o, i, "read from private field"), t ? t.call(o) : i.get(o)), V = (o, i, t) => i.has(o) ? K("Cannot add the same private member more than once") : i instanceof WeakSet ? i.add(o) : i.set(o, t), T = (o, i, t, e) => (j(o, i, "write to private field"), e ? e.call(o, t) : i.set(o, t), t);
+import { c as m, t as ct, i as D, b as R } from "./typeChecking-CbltMOUt.js";
+import { u as L, g as x, i as $, j as S, e as w, I as v, t as Q, c as at, o as ht, k as ut, b as lt, w as F, d as dt, m as ft } from "./signals-DbDmN2gr.js";
+import { c as mt } from "./logger-B7RBYtzP.js";
+var b = /* @__PURE__ */ ((o) => (o[o.WILL_MOUNT = 0] = "WILL_MOUNT", o[o.DID_MOUNT = 1] = "DID_MOUNT", o[o.WILL_UNMOUNT = 2] = "WILL_UNMOUNT", o[o.DID_UNMOUNT = 3] = "DID_UNMOUNT", o[o.DISPOSE = 4] = "DISPOSE", o))(b || {});
+const U = Symbol("name"), d = Symbol("lifecycle"), g = Symbol("parent"), N = Symbol("stores"), y = Symbol("state");
+class pt {
+  constructor(i) {
     a(this, "context");
     a(this, "state", 0);
     a(this, "listeners", /* @__PURE__ */ new Map());
     a(this, "bound");
-    this.context = o;
+    this.context = i;
   }
   /**
    * Listen for a certain event to be emitted. Listeners are called when the event results in a state change.
    */
-  on(o, t) {
-    const e = this.listeners.get(o);
-    e ? e.add(t) : this.listeners.set(o, /* @__PURE__ */ new Set([t]));
+  on(i, t) {
+    const e = this.listeners.get(i);
+    e ? e.add(t) : this.listeners.set(i, /* @__PURE__ */ new Set([t]));
   }
   /**
    * Stop a particular listener from being called when an event is emitted.
    */
-  off(o, t) {
-    const e = this.listeners.get(o);
-    e && (e.delete(t), e.size === 0 && this.listeners.delete(o));
+  off(i, t) {
+    const e = this.listeners.get(i);
+    e && (e.delete(t), e.size === 0 && this.listeners.delete(i));
   }
   /**
    * Advance the lifecycle state machine.
    */
-  emit(o) {
-    switch (o) {
+  emit(i) {
+    switch (i) {
       case 0: {
-        this.state < 1 ? (this.state = 1, this.notify(o)) : this.context.crash(new Error(`Tried to WILL_MOUNT context at state ${this.state}`));
+        this.state < 1 ? (this.state = 1, this.notify(i)) : this.context.crash(new Error(`Tried to WILL_MOUNT context at state ${this.state}`));
         break;
       }
       case 1: {
-        this.state >= 1 && this.state < 2 ? (this.state = 2, this.notify(o)) : this.context.crash(new Error(`Tried to WILL_UNMOUNT context at state ${this.state}`));
+        this.state >= 1 && this.state < 2 ? (this.state = 2, this.notify(i)) : this.context.crash(new Error(`Tried to WILL_UNMOUNT context at state ${this.state}`));
         break;
       }
       case 2: {
-        this.state >= 2 && this.state < 3 ? (this.notify(o), this.state = 3) : this.context.crash(new Error(`Tried to WILL_UNMOUNT context at state ${this.state}`));
+        this.state >= 2 && this.state < 3 ? (this.notify(i), this.state = 3) : this.context.crash(new Error(`Tried to WILL_UNMOUNT context at state ${this.state}`));
         break;
       }
       case 3: {
-        this.state >= 3 && this.state < 4 ? (this.state = 4 % 4, this.notify(o)) : this.context.crash(new Error(`Tried to DID_UNMOUNT context at state ${this.state}`));
+        this.state >= 3 && this.state < 4 ? (this.state = 4 % 4, this.notify(i)) : this.context.crash(new Error(`Tried to DID_UNMOUNT context at state ${this.state}`));
         break;
       }
       case 4: {
-        this.state === 0 ? (this.notify(o), this.listeners.clear(), this.bound = void 0, this.context[w] = void 0, this.context[y] = void 0, this.state = 5) : this.context.crash(new Error(`Tried to DISPOSE context at state ${this.state}`));
+        this.state === 0 ? (this.notify(i), this.listeners.clear(), this.bound = void 0, this.context[y] = void 0, this.context[N] = void 0, this.state = 5) : this.context.crash(new Error(`Tried to DISPOSE context at state ${this.state}`));
         break;
       }
     }
@@ -62,93 +62,96 @@ class ft {
   /**
    * Bind `context` to this lifecycle; when any event is emitted here it will be emitted for `context` as well.
    */
-  bind(o) {
-    this.bound ? this.bound.add(o) : this.bound = /* @__PURE__ */ new Set([o]);
+  bind(i) {
+    this.bound ? this.bound.add(i) : this.bound = /* @__PURE__ */ new Set([i]);
   }
   /**
    * Call all the event's listeners and re-emit to bound contexts.
    */
-  notify(o) {
-    const t = this.listeners.get(o);
+  notify(i) {
+    const t = this.listeners.get(i);
     if (t)
       for (const e of t)
         e();
     if (this.bound)
       for (const e of this.bound)
-        e[d].emit(o);
+        e[d].emit(i);
   }
 }
-var z, F, H, Z, K, N;
-K = U, Z = d, H = b, F = y, z = w;
-const L = class L {
-  constructor(o, t) {
-    V(this, N);
-    a(this, K);
-    a(this, Z, new ft(this));
+var z, H, Z, Y, J, k;
+J = U, Y = d, Z = g, H = N, z = y;
+const O = class O {
+  constructor(i, t) {
+    V(this, k);
+    a(this, J);
+    a(this, Y, new pt(this));
+    a(this, Z);
     a(this, H);
-    a(this, F);
     a(this, z);
-    T(this, N, o), this[U] = I(o);
-    const e = lt(() => x(O(this, N)), t == null ? void 0 : t.logger), s = Object.getOwnPropertyDescriptors(e);
+    T(this, k, i), this[U] = L(i);
+    const e = mt(() => x(_(this, k)), t == null ? void 0 : t.logger), s = Object.getOwnPropertyDescriptors(e);
     for (const n in s)
       Object.defineProperty(this, n, s[n]);
   }
   get isMounted() {
-    const { state: o } = this[d];
-    return o >= 2 && o < 4;
+    const { state: i } = this[d];
+    return i >= 2 && i < 4;
   }
   /**
    * Returns a new Context with this one as its parent.
    */
-  static linked(o, t, e) {
-    const s = new L(t, e);
-    return s[b] = o, e != null && e.bindLifecycleToParent && o[d].bind(s), s;
+  static linked(i, t, e) {
+    const s = new O(t, e);
+    return s[g] = i, e != null && e.bindLifecycleToParent && i[d].bind(s), s;
   }
   /**
    * Emit a lifecycle event to `context`.
    */
-  static emit(o, t) {
-    o[d].emit(t);
+  static emit(i, t) {
+    i[d].emit(t);
   }
   /**
    * Traverses _parent contexts until arriving at one that doesn't have a parent itself.
    * Returns null if this context is the parent.
    */
-  static getRoot(o) {
-    let t = o[b];
-    for (; t != null && t[b]; )
-      t = t[b];
+  static getRoot(i) {
+    let t = i[g];
+    for (; t != null && t[g]; )
+      t = t[g];
     return t ?? null;
   }
+  // nextTick(callback: () => void) {
+  //   scheduler.nextTick(callback);
+  // }
   /**
    * Returns the current name of this context.
    */
   getName() {
-    return I(O(this, N));
+    return L(_(this, k));
   }
   /**
    * Sets a new name for this context.
    */
-  setName(o) {
-    T(this, N, o), this[U] = I(o);
+  setName(i) {
+    T(this, k, i), this[U] = L(i);
   }
   /**
    * Creates an instance of a store and attaches it to this context.
    */
-  addStore(o, t) {
+  addStore(i, t) {
     var s;
-    if ((s = this[y]) != null && s.get(o)) {
-      let n = o.name ? `'${o.name}'` : "this store";
+    if ((s = this[N]) != null && s.get(i)) {
+      let n = i.name ? `'${i.name}'` : "this store";
       throw this.crash(new Error(`An instance of ${n} was already added on this context.`));
     }
-    const e = L.linked(this, o.name, {
+    const e = O.linked(this, i.name, {
       bindLifecycleToParent: !0,
-      logger: { tag: Y(), tagName: "uid" }
+      logger: { tag: $(), tagName: "uid" }
     });
     try {
-      this[y] || (this[y] = /* @__PURE__ */ new Map());
-      const n = M(e), c = o.call(e, t, e);
-      M(n), this[y].set(o, c);
+      this[N] || (this[N] = /* @__PURE__ */ new Map());
+      const n = S(e), c = i.call(e, t, e);
+      S(n), this[N].set(i, c);
     } catch (n) {
       throw this.crash(n);
     }
@@ -159,71 +162,71 @@ const L = class L {
    * 1. An instance of the store is found and returned.
    * 2. No instance is found and an error is thrown.
    */
-  getStore(o) {
+  getStore(i) {
     var s;
-    if (!m(o))
+    if (!m(i))
       throw new Error("Invalid store.");
     let t = this, e;
-    for (; e = (s = t[y]) == null ? void 0 : s.get(o), e == null && t[b] != null; )
-      t = t[b];
+    for (; e = (s = t[N]) == null ? void 0 : s.get(i), e == null && t[g] != null; )
+      t = t[g];
     if (e == null)
-      throw this.crash(new Error(`Store '${o.name}' is not provided by this context.`));
+      throw this.crash(new Error(`Store '${i.name}' is not provided by this context.`));
     return e;
   }
   /**
    * Schedule a callback function to run just before this context is mounted.
    */
-  beforeMount(o) {
-    return this[d].on(0, o), () => this[d].off(0, o);
+  beforeMount(i) {
+    return this[d].on(0, i), () => this[d].off(0, i);
   }
   /**
    * Schedule a callback function to run after this context is mounted.
    */
-  onMount(o) {
-    return this[d].on(1, o), () => this[d].off(1, o);
+  onMount(i) {
+    return this[d].on(1, i), () => this[d].off(1, i);
   }
   /**
    * Schedule a callback function to run just before this context is unmounted.
    */
-  beforeUnmount(o) {
-    return this[d].on(2, o), () => this[d].off(2, o);
+  beforeUnmount(i) {
+    return this[d].on(2, i), () => this[d].off(2, i);
   }
   /**
    * Schedule a callback function to run after this context is unmounted.
    */
-  onUnmount(o) {
-    return this[d].on(3, o), () => this[d].off(3, o);
+  onUnmount(i) {
+    return this[d].on(3, i), () => this[d].off(3, i);
   }
-  effect(o) {
+  effect(i) {
     const t = () => {
       try {
-        return o();
+        return i();
       } catch (e) {
         this.error(e), e instanceof Error ? this.crash(e) : typeof e == "string" ? this.crash(new Error(e)) : this.crash(new Error("Unknown error thrown in effect callback"));
       }
     };
     if (this[d].state >= 1) {
-      const e = v(t);
+      const e = w(t, { _type: v });
       return this[d].on(3, e), e;
     } else {
       let e, s = !1;
       return this[d].on(0, () => {
-        s || (e = v(t), this[d].on(3, e));
+        s || (e = w(t, { _type: v }), this[d].on(3, e));
       }), () => {
         e != null && (s = !0, e());
       };
     }
   }
-  getState(o, t) {
+  getState(i, t) {
     var c;
     const e = (t == null ? void 0 : t.immediate) ?? !1;
     let s = this, n;
-    for (; n = (c = s[w]) == null ? void 0 : c.get(o), n === void 0 && !e && s[b] != null; )
-      s = s[b];
+    for (; n = (c = s[y]) == null ? void 0 : c.get(i), n === void 0 && !e && s[g] != null; )
+      s = s[g];
     if (n === void 0) {
       if (t != null && Object.hasOwn(t, "fallback"))
         return t.fallback;
-      throw new Error(`Expected a value for '${String(o)}' but got undefined.`);
+      throw new Error(`Expected a value for '${String(i)}' but got undefined.`);
     }
     return n;
   }
@@ -233,30 +236,30 @@ const L = class L {
    * Pass `options.immediate` to only include state stored on this context.
    * By default all state stored on parent contexts is also included.
    */
-  getStateMap(o) {
+  getStateMap(i) {
     let t = this;
-    const e = (o == null ? void 0 : o.immediate) ?? !1, s = [];
-    for (; t[w] && s.push(...t[w].entries()), !e && t[b] != null; )
-      t = t[b];
+    const e = (i == null ? void 0 : i.immediate) ?? !1, s = [];
+    for (; t[y] && s.push(...t[y].entries()), !e && t[g] != null; )
+      t = t[g];
     return new Map(s.reverse());
   }
-  setState(...o) {
-    if (this[w] || (this[w] = /* @__PURE__ */ new Map()), o.length === 2)
-      this[w].set(o[0], o[1]);
-    else if (rt(o[0]) === "array")
-      for (const [t, e] of o[0])
-        e === void 0 ? this[w].delete(t) : this[w].set(t, e);
+  setState(...i) {
+    if (this[y] || (this[y] = /* @__PURE__ */ new Map()), i.length === 2)
+      this[y].set(i[0], i[1]);
+    else if (ct(i[0]) === "array")
+      for (const [t, e] of i[0])
+        e === void 0 ? this[y].delete(t) : this[y].set(t, e);
     else
       throw new Error("Invalid arguments.");
     return this;
   }
 };
-N = new WeakMap();
-let f = L;
-function Lt(i, o) {
-  return new f(i, o);
+k = new WeakMap();
+let f = O;
+function _t(o, i) {
+  return new f(o, i);
 }
-class k {
+class M {
   /**
    * Returns a single DOM node to represent this MarkupNode's position in the DOM.
    * Usually the parent element, but it can be an empty Text node used as a marker.
@@ -276,7 +279,7 @@ class k {
    * Mount this node to a `parent` element.
    * If passed, this node will be mounted as the next sibling of `after`.
    */
-  mount(o, t) {
+  mount(i, t) {
     throw new Error("mount method is not implemented");
   }
   /**
@@ -287,17 +290,17 @@ class k {
    *
    * @param skipDOM - No DOM updates will be performed when true. Lifecycle methods will be called regardless.
    */
-  unmount(o) {
+  unmount(i) {
     throw new Error("unmount method is not implemented");
   }
   /**
    * Moves a node without unmounting and remounting (if the browser supports Element.moveBefore).
    */
-  move(o, t) {
+  move(i, t) {
     throw new Error("move method is not implemented");
   }
 }
-class $ extends k {
+class P extends M {
   constructor(t) {
     super();
     a(this, "root");
@@ -326,15 +329,15 @@ class $ extends k {
       this.mount(t, e);
   }
 }
-class A extends k {
+class C extends M {
   constructor(t, e) {
     super();
     a(this, "root", document.createTextNode(""));
     a(this, "children", []);
     a(this, "context");
-    a(this, "$slot");
+    a(this, "slot");
     a(this, "unsubscribe");
-    this.context = t, this.$slot = e;
+    this.context = t, this.slot = e;
   }
   getRoot() {
     return this.root;
@@ -343,16 +346,17 @@ class A extends k {
     return this.root.parentElement != null;
   }
   mount(t, e) {
-    this.isMounted() || (t.insertBefore(this.root, (e == null ? void 0 : e.nextSibling) ?? null), this.unsubscribe = v(() => {
-      try {
-        const s = this.$slot();
-        I(() => {
-          this.update(J(s));
-        });
-      } catch (s) {
-        this.context.crash(s);
-      }
-    }));
+    this.isMounted() || (t.insertBefore(this.root, (e == null ? void 0 : e.nextSibling) ?? null), this.unsubscribe = w(
+      () => {
+        try {
+          const s = this.slot();
+          this.update(Q(s));
+        } catch (s) {
+          this.context.crash(s);
+        }
+      },
+      { _type: v, deps: [this.slot] }
+    ));
   }
   unmount(t = !1) {
     var e, s;
@@ -380,7 +384,7 @@ class A extends k {
   update(t) {
     var c, r, h;
     if (this.cleanup(!1), t.length === 0 || !this.isMounted()) return;
-    const e = W(this.context, t);
+    const e = B(this.context, t);
     for (const u of e) {
       const l = ((c = this.children.at(-1)) == null ? void 0 : c.getRoot()) || this.root;
       u.mount(this.root.parentElement, l), this.children.push(u);
@@ -389,8 +393,8 @@ class A extends k {
     "moveBefore" in s ? s.moveBefore(this.root, n) : s.insertBefore(this.root, n);
   }
 }
-const Q = Symbol("ViewNode");
-class X extends k {
+const X = Symbol("ViewNode");
+class tt extends M {
   /**
    * @param context - Parent contenxt to link to.
    * @param view - View function to mount.
@@ -398,17 +402,17 @@ class X extends k {
    */
   constructor(t, e, s) {
     super();
-    a(this, "uniqueId", Y());
-    a(this, "context");
+    a(this, "id", $());
     a(this, "props");
+    a(this, "context");
     a(this, "view");
     a(this, "node");
     this.context = f.linked(t, e.name ?? "anonymous view", {
       logger: {
-        tag: this.uniqueId,
+        tag: this.id,
         tagName: "uid"
       }
-    }), this.context.setState(Q, this), this.props = s, this.view = e;
+    }), this.context.setState(X, this), this.props = s, this.view = e;
   }
   getRoot() {
     var t;
@@ -423,28 +427,29 @@ class X extends k {
     if (!s) {
       const { context: n, props: c, view: r } = this;
       try {
-        const h = M(n), u = r.call(n, c, n);
-        M(h), u != null && u !== !1 && (this.node = ot(u, n));
+        const h = S(n), u = r.call(n, c, n);
+        S(h), u != null && u !== !1 && (this.node = ot(u, n));
       } catch (h) {
         throw h instanceof Error && n.crash(h), h;
       }
-      f.emit(this.context, g.WILL_MOUNT);
+      f.emit(this.context, b.WILL_MOUNT);
     }
-    this.node && this.node.mount(t, e), s || f.emit(this.context, g.DID_MOUNT);
+    this.node && this.node.mount(t, e), s || f.emit(this.context, b.DID_MOUNT);
   }
   unmount(t = !1) {
-    f.emit(this.context, g.WILL_UNMOUNT), this.node && this.node.unmount(t), f.emit(this.context, g.DID_UNMOUNT), f.emit(this.context, g.DISPOSE);
+    f.emit(this.context, b.WILL_UNMOUNT), this.node && this.node.unmount(t), f.emit(this.context, b.DID_UNMOUNT), f.emit(this.context, b.DISPOSE);
   }
   move(t, e) {
     var s;
     (s = this.node) == null || s.move(t, e);
   }
 }
-const mt = (i) => /^on[A-Z]/.test(i), P = Symbol("HTML.isSVG"), pt = ["class", "className", "ref", "mixin", "children"];
-class bt extends k {
+const gt = (o) => /^on[A-Z]/.test(o), A = Symbol("HTML.isSVG"), bt = ["class", "className", "ref", "mixin", "children"];
+class yt extends M {
   constructor(t, e, s) {
     super();
     a(this, "root");
+    a(this, "id", $());
     a(this, "tag");
     a(this, "props");
     a(this, "context");
@@ -454,17 +459,17 @@ class bt extends k {
     a(this, "ref");
     // Prevents 'onClickOutside' handlers from firing in the same cycle in which the element is connected.
     a(this, "canClickAway", !1);
-    if (this.tag = e, this.props = s, this.context = f.linked(t, q.bind(this)), e.toLowerCase() === "svg" && this.context.setState(P, !0), this.context.getState(P, { fallback: !1 }) ? this.root = document.createElementNS("http://www.w3.org/2000/svg", e) : this.root = document.createElement(e), dt() === "development") {
-      const c = this.context.getState(Q, { fallback: null });
+    if (this.tag = e, this.props = s, this.context = f.linked(t, G.bind(this)), e.toLowerCase() === "svg" && this.context.setState(A, !0), this.context.getState(A, { fallback: !1 }) ? this.root = document.createElementNS("http://www.w3.org/2000/svg", e) : this.root = document.createElement(e), at() === "development") {
+      const c = this.context.getState(X, { fallback: null });
       c && (this.root.dataset.view = c.context.getName());
     }
     if (s.mixin)
-      for (const c of J(s.mixin)) {
-        const r = f.linked(this.context, q.bind(this), {
+      for (const c of Q(s.mixin)) {
+        const r = f.linked(this.context, G.bind(this), {
           bindLifecycleToParent: !0,
           logger: { tagName: c.name === "mixin" ? void 0 : "mixin", tag: c.name }
-        }), h = M(r);
-        c(this.root, r), M(h);
+        }), h = S(r);
+        c(this.root, r), S(h);
       }
     const n = s.className ?? s.class;
     if (this.applyProps(this.root, s), s.style && this.applyStyles(this.root, s.style, this.unsubscribers), n && this.applyClasses(this.root, n, this.unsubscribers), s.ref)
@@ -472,7 +477,7 @@ class bt extends k {
         this.ref = s.ref, this.ref(this.root);
       else
         throw new Error("Expected ref to be a function. Got: " + s.ref);
-    s.children && (this.childNodes = W(this.context, s.children));
+    s.children && (this.childNodes = B(this.context, s.children));
   }
   getRoot() {
     return this.root;
@@ -483,23 +488,23 @@ class bt extends k {
   mount(t, e) {
     const s = this.isMounted();
     if (!s) {
-      f.emit(this.context, g.WILL_MOUNT);
+      f.emit(this.context, b.WILL_MOUNT);
       for (let n = 0; n < this.childNodes.length; n++) {
         const c = this.childNodes[n], r = n > 0 ? this.childNodes[n - 1].getRoot() : void 0;
         c.mount(this.root, r);
       }
     }
-    t.insertBefore(this.root, (e == null ? void 0 : e.nextSibling) ?? null), this.canClickAway = !0, s || f.emit(this.context, g.DID_MOUNT);
+    t.insertBefore(this.root, (e == null ? void 0 : e.nextSibling) ?? null), this.canClickAway = !0, s || f.emit(this.context, b.DID_MOUNT);
   }
   unmount(t = !1) {
     var e;
-    f.emit(this.context, g.WILL_UNMOUNT), t || (e = this.root.parentNode) == null || e.removeChild(this.root);
+    f.emit(this.context, b.WILL_UNMOUNT), t || (e = this.root.parentNode) == null || e.removeChild(this.root);
     for (const s of this.childNodes)
       s.unmount(!0);
     this.canClickAway = !1;
     for (const s of this.unsubscribers)
       s();
-    this.unsubscribers.length = 0, this.ref && this.ref(void 0), f.emit(this.context, g.DID_UNMOUNT), f.emit(this.context, g.DISPOSE);
+    this.unsubscribers.length = 0, this.ref && this.ref(void 0), f.emit(this.context, b.DID_UNMOUNT), f.emit(this.context, b.DISPOSE);
   }
   move(t, e) {
     if ("moveBefore" in t)
@@ -511,19 +516,25 @@ class bt extends k {
     else
       this.mount(t, e);
   }
-  attachProp(t, e) {
+  attachProp(t, e, s) {
     m(t) ? this.unsubscribers.push(
-      v(() => {
-        try {
-          e(t());
-        } catch (s) {
-          this.context.error(s), this.context.crash(s);
-        }
-      })
+      w(
+        () => {
+          try {
+            e(t());
+          } catch (n) {
+            this.context.error(n), this.context.crash(n);
+          }
+        },
+        { _type: v }
+      )
     ) : e(t);
   }
+  getKey(t) {
+    return this.id + ":" + t;
+  }
   applyProps(t, e) {
-    for (const s in ct(pt, e)) {
+    for (const s in ht(bt, e)) {
       const n = e[s];
       if (s === "on:clickoutside" || s === "onClickOutside" || s === "onclickoutside") {
         const c = (h) => {
@@ -534,92 +545,144 @@ class bt extends k {
         });
       } else if (s.startsWith("prop:")) {
         const c = s.substring(5);
-        this.attachProp(n, (r) => {
-          t[c] = r;
-        });
+        this.attachProp(
+          n,
+          (r) => {
+            t[c] = r;
+          },
+          this.getKey(c)
+        );
       } else if (s.startsWith("on:")) {
         const c = s.substring(3);
         let r;
         m(n) ? (t.addEventListener(c, n), this.unsubscribers.push(() => {
           t.removeEventListener(c, n);
-        })) : this.attachProp(n, (h) => {
-          !h && r ? t.removeEventListener(c, r) : h != null && (r && r !== h && t.removeEventListener(c, r), t.addEventListener(c, h)), r = h;
-        });
+        })) : this.attachProp(
+          n,
+          (h) => {
+            !h && r ? t.removeEventListener(c, r) : h != null && (r && r !== h && t.removeEventListener(c, r), t.addEventListener(c, h)), r = h;
+          },
+          this.getKey(c)
+        );
       } else if (s.startsWith("attr:")) {
         const c = s.substring(5).toLowerCase();
-        this.attachProp(n, (r) => {
-          r != null ? t.setAttribute(c, String(r)) : t.removeAttribute(c);
-        });
-      } else if (m(n) && mt(s)) {
+        this.attachProp(
+          n,
+          (r) => {
+            r != null ? t.setAttribute(c, String(r)) : t.removeAttribute(c);
+          },
+          this.getKey(c)
+        );
+      } else if (m(n) && gt(s)) {
         const c = s.slice(2).toLowerCase(), r = n;
         t.addEventListener(c, r), this.unsubscribers.push(() => {
           t.removeEventListener(c, r);
         });
-      } else if (s.startsWith("on") && m(n) && gt.includes(s.substring(2)))
+      } else if (s.startsWith("on") && m(n) && wt.includes(s.substring(2)))
         t[s] = n, this.unsubscribers.push(() => {
           t[s] = void 0;
         });
       else if (s.includes("-"))
-        this.attachProp(n, (c) => {
-          c == null ? t.removeAttribute(s) : t.setAttribute(s, String(c));
-        });
-      else if (this.context.getState(P, { fallback: !1 }))
-        this.attachProp(n, (c) => {
-          c != null ? t.setAttribute(s, String(e[s])) : t.removeAttribute(s);
-        });
+        this.attachProp(
+          n,
+          (c) => {
+            c == null ? t.removeAttribute(s) : t.setAttribute(s, String(c));
+          },
+          this.getKey(s)
+        );
+      else if (this.context.getState(A, { fallback: !1 }))
+        this.attachProp(
+          n,
+          (c) => {
+            c != null ? t.setAttribute(s, String(e[s])) : t.removeAttribute(s);
+          },
+          this.getKey(s)
+        );
       else
         switch (s) {
           case "contentEditable":
           case "value":
-            this.attachProp(n, (r) => {
-              t[s] = String(r);
-            });
+            this.attachProp(
+              n,
+              (r) => {
+                t[s] = String(r);
+              },
+              this.getKey(s)
+            );
             break;
           case "for":
-            this.attachProp(n, (r) => {
-              t.htmlFor = r;
-            });
+            this.attachProp(
+              n,
+              (r) => {
+                t.htmlFor = r;
+              },
+              this.getKey(s)
+            );
             break;
           case "innerHTML":
-            this.attachProp(n, (r) => {
-              t.innerHTML = r;
-            });
+            this.attachProp(
+              n,
+              (r) => {
+                t.innerHTML = r;
+              },
+              this.getKey(s)
+            );
             break;
           case "title":
-            this.attachProp(n, (r) => {
-              r == null ? t.removeAttribute(s) : t.setAttribute(s, String(r));
-            });
+            this.attachProp(
+              n,
+              (r) => {
+                r == null ? t.removeAttribute(s) : t.setAttribute(s, String(r));
+              },
+              this.getKey(s)
+            );
           case "checked":
-            this.attachProp(n, (r) => {
-              t.checked = r, r ? t.setAttribute("checked", "") : t.removeAttribute("checked");
-            });
+            this.attachProp(
+              n,
+              (r) => {
+                t.checked = r, r ? t.setAttribute("checked", "") : t.removeAttribute("checked");
+              },
+              this.getKey(s)
+            );
             break;
           case "dataset":
             let c = {};
-            this.attachProp(n, (r) => {
-              if (C(r)) {
-                const h = {};
-                for (const u in r)
-                  h[at(u)] = String(r[u]);
-                for (const u in c)
-                  Object.hasOwn(h, u) || (delete t.dataset[u], delete c[u]);
-                for (const u in h)
-                  c[u] !== h[u] && (t.dataset[u] = h[u], c[u] = h[u]);
-              } else
-                for (const h in c)
-                  delete t.dataset[h];
-            });
+            this.attachProp(
+              n,
+              (r) => {
+                if (D(r)) {
+                  const h = {};
+                  for (const u in r)
+                    h[ut(u)] = String(r[u]);
+                  for (const u in c)
+                    Object.hasOwn(h, u) || (delete t.dataset[u], delete c[u]);
+                  for (const u in h)
+                    c[u] !== h[u] && (t.dataset[u] = h[u], c[u] = h[u]);
+                } else
+                  for (const h in c)
+                    delete t.dataset[h];
+              },
+              this.getKey(s)
+            );
             break;
           case "autocomplete":
           case "autocapitalize":
-            this.attachProp(n, (r) => {
-              typeof r == "string" ? t[s] = r : r ? t[s] = "on" : t[s] = "off";
-            });
+            this.attachProp(
+              n,
+              (r) => {
+                typeof r == "string" ? t[s] = r : r ? t[s] = "on" : t[s] = "off";
+              },
+              this.getKey(s)
+            );
             break;
           default: {
-            this.attachProp(n, (r) => {
-              t[s] = r;
-            });
+            this.attachProp(
+              n,
+              (r) => {
+                t[s] = r;
+              },
+              this.getKey(s)
+            );
             break;
           }
         }
@@ -629,18 +692,24 @@ class bt extends k {
     const n = [];
     if (m(e)) {
       let c;
-      const r = v(() => {
-        m(c) && c(), t.style.cssText = "", c = this.applyStyles(t, x(e), s);
-      });
+      const r = w(
+        () => {
+          m(c) && c(), t.style.cssText = "", c = this.applyStyles(t, x(e), s);
+        },
+        { _type: v }
+      );
       s.push(r), n.push(r);
     } else {
-      const c = et(e);
+      const c = st(e);
       for (const r in c) {
         const { value: h, priority: u } = c[r];
         if (m(h)) {
-          const l = v(() => {
-            x(h) ? t.style.setProperty(r, String(x(h)), u) : t.style.removeProperty(r);
-          });
+          const l = w(
+            () => {
+              x(h) ? t.style.setProperty(r, String(x(h)), u) : t.style.removeProperty(r);
+            },
+            { _type: v }
+          );
           s.push(l), n.push(l);
         } else h != null && t.style.setProperty(r, String(h));
       }
@@ -654,18 +723,24 @@ class bt extends k {
     const n = [];
     if (m(e)) {
       let c;
-      const r = v(() => {
-        m(c) && c(), t.removeAttribute("class"), c = this.applyClasses(t, x(e), s);
-      });
+      const r = w(
+        () => {
+          m(c) && c(), t.removeAttribute("class"), c = this.applyClasses(t, x(e), s);
+        },
+        { _type: v }
+      );
       s.push(r), n.push(r);
     } else {
-      const c = tt(e);
+      const c = et(e);
       for (const r in c) {
         const h = c[r];
         if (m(h)) {
-          const u = v(() => {
-            x(h) ? t.classList.add(r) : t.classList.remove(r);
-          });
+          const u = w(
+            () => {
+              x(h) ? t.classList.add(r) : t.classList.remove(r);
+            },
+            { _type: v }
+          );
           s.push(u), n.push(u);
         } else h && t.classList.add(r);
       }
@@ -676,49 +751,49 @@ class bt extends k {
     };
   }
 }
-function tt(i) {
-  let o = {};
-  if (D(i)) {
-    const t = i.split(" ");
+function et(o) {
+  let i = {};
+  if (R(o)) {
+    const t = o.split(" ");
     for (const e of t)
-      o[e] = !0;
-  } else C(i) ? Object.assign(o, i) : Array.isArray(i) && Array.from(i).filter(Boolean).forEach((t) => {
-    Object.assign(o, tt(t));
+      i[e] = !0;
+  } else D(o) ? Object.assign(i, o) : Array.isArray(o) && Array.from(o).filter(Boolean).forEach((t) => {
+    Object.assign(i, et(t));
   });
-  return delete o.undefined, o;
+  return delete i.undefined, i;
 }
-function et(i) {
-  let o = {};
-  if (D(i)) {
-    const t = i.split(";").filter((e) => e.trim() !== "");
+function st(o) {
+  let i = {};
+  if (R(o)) {
+    const t = o.split(";").filter((e) => e.trim() !== "");
     for (const e of t) {
       const [s, n] = e.split(":"), c = {
         value: n
       };
-      n.includes("!important") ? (c.priority = "important", c.value = n.replace("!important", "").trim()) : c.value = n.trim(), o[G(s.trim())] = c;
+      n.includes("!important") ? (c.priority = "important", c.value = n.replace("!important", "").trim()) : c.value = n.trim(), i[q(s.trim())] = c;
     }
   }
-  if (C(i))
-    for (const t in i)
-      t.startsWith("--") ? o[t] = { value: i[t] } : o[G(t)] = { value: i[t] };
-  else Array.isArray(i) && Array.from(i).filter((t) => t != null).forEach((t) => {
-    Object.assign(o, et(t));
+  if (D(o))
+    for (const t in o)
+      t.startsWith("--") ? i[t] = { value: o[t] } : i[q(t)] = { value: o[t] };
+  else Array.isArray(o) && Array.from(o).filter((t) => t != null).forEach((t) => {
+    Object.assign(i, st(t));
   });
-  return o;
+  return i;
 }
-function q() {
-  const i = this.getRoot();
-  if (i == null) return this.tag;
-  let o = this.getRoot().tagName.toLowerCase();
-  if (i.id && (o += `#${i.id}`), i.classList.length > 0)
-    for (const t of i.classList.values())
-      o += `.${t}`;
-  return o;
+function G() {
+  const o = this.getRoot();
+  if (o == null) return this.tag;
+  let i = this.getRoot().tagName.toLowerCase();
+  if (o.id && (i += `#${o.id}`), o.classList.length > 0)
+    for (const t of o.classList.values())
+      i += `.${t}`;
+  return i;
 }
-function G(i) {
-  return i.replace(/[A-Z]+(?![a-z])|[A-Z]/g, (o, t) => (t ? "-" : "") + o.toLowerCase());
+function q(o) {
+  return o.replace(/[A-Z]+(?![a-z])|[A-Z]/g, (i, t) => (t ? "-" : "") + i.toLowerCase());
 }
-const gt = [
+const wt = [
   // Element
   "animationcancel",
   "animationend",
@@ -808,7 +883,7 @@ const gt = [
   "reset",
   "submit"
 ];
-class wt extends k {
+class vt extends M {
   constructor(t, e, s) {
     super();
     a(this, "context");
@@ -835,7 +910,7 @@ class wt extends k {
   move(t, e) {
   }
 }
-class vt extends k {
+class xt extends M {
   constructor(t, e, s, n) {
     super();
     a(this, "root", document.createTextNode(""));
@@ -854,12 +929,15 @@ class vt extends k {
     return this.root.parentElement != null;
   }
   mount(t, e) {
-    this.isMounted() || (t.insertBefore(this.root, (e == null ? void 0 : e.nextSibling) ?? null), this.unsubscribe = v(() => {
-      let s = this.items();
-      s == null && (s = [], this.context.warn("repeat() received empty value for items", s)), I(() => {
-        this._update(Array.from(s));
-      });
-    }));
+    this.isMounted() || (t.insertBefore(this.root, (e == null ? void 0 : e.nextSibling) ?? null), this.unsubscribe = w(
+      () => {
+        let s = this.items();
+        s == null && (s = [], this.context.warn("repeat() received empty value for items", s)), L(() => {
+          this._update(Array.from(s));
+        });
+      },
+      { _type: v }
+    ));
   }
   unmount(t = !1) {
     var e;
@@ -890,20 +968,20 @@ class vt extends k {
     const n = [];
     for (const l of this.connectedItems.values())
       !e.has(l.key) && l.node.isMounted() && l.node.unmount(!1);
-    ht(() => {
+    lt(() => {
       for (const l of e.values()) {
         const p = this.connectedItems.get(l.key);
         if (p && p.node.isMounted())
-          p.$item(l.value), p.$index(l.index), n[l.index] = p;
+          p.item.set(l.value), p.index.set(l.index), n[l.index] = p;
         else {
-          const S = _(l.value, { equals: ut }), E = _(l.index);
+          const E = F(l.value, { equals: dt }), I = F(l.index);
           n[l.index] = {
             key: l.key,
-            $item: S,
-            $index: E,
-            node: new X(this.context, yt, {
-              $item: () => S(),
-              $index: () => E(),
+            item: E,
+            index: I,
+            node: new tt(this.context, kt, {
+              item: () => E(),
+              index: () => I(),
               render: this.render
             })
           };
@@ -911,8 +989,8 @@ class vt extends k {
       }
     });
     for (let l = 0; l < n.length; l++) {
-      const p = n[l], S = ((r = n[l - 1]) == null ? void 0 : r.node.getRoot()) ?? this.root, E = this.connectedItems.get(p.key);
-      E && E.node.isMounted() ? p.node.move(this.root.parentElement, S) : p.node.mount(this.root.parentElement, S);
+      const p = n[l], E = ((r = n[l - 1]) == null ? void 0 : r.node.getRoot()) ?? this.root, I = this.connectedItems.get(p.key);
+      I && I.node.isMounted() ? p.node.move(this.root.parentElement, E) : p.node.mount(this.root.parentElement, E);
     }
     this.connectedItems.clear();
     for (const l of n)
@@ -921,12 +999,12 @@ class vt extends k {
     (u = this.root.parentNode) == null || u.insertBefore(this.root, c.nextSibling);
   }
 }
-const xt = "dolla.RepeatItemView";
-function yt(i, o) {
-  return o.setName(xt), i.render.call(o, i.$item, i.$index, o);
+const Nt = "dolla.RepeatItemView";
+function kt(o, i) {
+  return i.setName(Nt), o.render.call(i, o.item, o.index, i);
 }
-class st {
-  constructor(o, t) {
+class it {
+  constructor(i, t) {
     /**
      * In the case of a view, type will be the View function itself. It can also hold an identifier for special nodes like "$cond", "$repeat", etc.
      * DOM nodes can be created by name, such as HTML elements like "div", "ul" or "span", SVG elements like ""
@@ -937,101 +1015,101 @@ class st {
      * Includes a `children` prop if children were passed.
      */
     a(this, "props");
-    this.type = o, this.props = t;
+    this.type = i, this.props = t;
   }
 }
-var Nt = /* @__PURE__ */ ((i) => (i.DOM = "$dom", i.Dynamic = "$dynamic", i.Portal = "$portal", i.Repeat = "$repeat", i))(Nt || {});
-function R(i, o) {
-  return new st(i, o ?? {});
+var Mt = /* @__PURE__ */ ((o) => (o.DOM = "$dom", o.Dynamic = "$dynamic", o.Portal = "$portal", o.Repeat = "$repeat", o))(Mt || {});
+function W(o, i) {
+  return new it(o, i ?? {});
 }
-function kt(i, o, t) {
-  return R("$dynamic", {
-    source: _(() => {
-      const e = x(i);
-      return e && o ? o : !e && t ? t : null;
+function St(o, i, t) {
+  return W("$dynamic", {
+    source: ft(() => {
+      const e = x(o);
+      return e && i ? i : !e && t ? t : null;
     })
   });
 }
-function Ot(i, o, t) {
-  return kt(i, t, o);
+function Tt(o, i, t) {
+  return St(o, t, i);
 }
-function Tt(i, o, t) {
-  return R("$repeat", { items: () => x(i), key: o, render: t });
+function Ut(o, i, t) {
+  return W("$repeat", { items: () => x(o), key: i, render: t });
 }
-function Ut(i, o) {
-  return R("$portal", { parent: i, content: o });
+function Pt(o, i) {
+  return W("$portal", { parent: o, content: i });
 }
-function ot(i, o = new f("$")) {
-  const t = W(o, i);
-  return t.length === 1 ? t[0] : new A(o, () => t);
+function ot(o, i = new f("$")) {
+  const t = B(i, o);
+  return t.length === 1 ? t[0] : new C(i, () => t);
 }
-function W(i, ...o) {
-  const t = o.flat(1 / 0), e = [];
+function B(o, ...i) {
+  const t = i.flat(1 / 0), e = [];
   for (const s of t)
     if (!(s == null || s === !1)) {
       if (s instanceof Node) {
-        e.push(new $(s));
+        e.push(new P(s));
         continue;
       }
-      if (s instanceof st)
+      if (s instanceof it)
         if (m(s.type)) {
-          e.push(new X(i, s.type, s.props));
+          e.push(new tt(o, s.type, s.props));
           continue;
-        } else if (D(s.type))
+        } else if (R(s.type))
           switch (s.type) {
             case "$dom": {
               const n = s.props;
-              e.push(new $(n.value));
+              e.push(new P(n.value));
               continue;
             }
             case "$dynamic": {
               const n = s.props;
-              e.push(new A(i, n.source));
+              e.push(new C(o, n.source));
               continue;
             }
             case "$portal": {
               const n = s.props;
-              e.push(new wt(i, n.content, n.parent));
+              e.push(new vt(o, n.content, n.parent));
               continue;
             }
             case "$repeat": {
               const n = s.props;
-              e.push(new vt(i, n.items, n.key, n.render));
+              e.push(new xt(o, n.items, n.key, n.render));
               continue;
             }
             default:
-              e.push(new bt(i, s.type, s.props));
+              e.push(new yt(o, s.type, s.props));
               continue;
           }
         else
           throw new TypeError(`Expected a string or view function. Got: ${s.type}`);
-      if (s instanceof k) {
+      if (s instanceof M) {
         e.push(s);
         continue;
       }
       if (m(s)) {
-        e.push(new A(i, s));
+        e.push(new C(o, s));
         continue;
       }
-      e.push(new $(document.createTextNode(String(s))));
+      e.push(new P(document.createTextNode(String(s))));
     }
   return e;
 }
 export {
   f as C,
-  A as D,
-  g as L,
-  k as M,
-  vt as R,
-  X as V,
-  Tt as a,
-  Nt as b,
-  Lt as c,
-  st as d,
-  R as m,
-  Ut as p,
+  C as D,
+  b as L,
+  it as M,
+  xt as R,
+  tt as V,
+  M as a,
+  Ut as b,
+  _t as c,
+  Mt as d,
+  W as m,
+  Pt as p,
   ot as r,
-  Ot as u,
-  kt as w
+  Tt as u,
+  St as w
 };
-//# sourceMappingURL=markup-UzKSsawX.js.map
+//# sourceMappingURL=markup-CW_lWDfq.js.map