@solidjs/signals 0.4.3 → 0.4.4

package/dist/prod.js

@@ -45,30 +45,30 @@ function schedule() {
   if (scheduled)
     return;
   scheduled = true;
-  if (!globalQueue.x)
+  if (!globalQueue.z)
     queueMicrotask(flush);
 }
 function notifyUnobserved() {
   for (let i = 0; i < unobserved.length; i++) {
     const source = unobserved[i];
     if (!source.d || !source.d.length)
-      unobserved[i].ca?.();
+      unobserved[i].da?.();
   }
   unobserved = [];
 }
 var pureQueue = [];
 var Queue = class {
-  p = null;
-  x = false;
-  o = [[], []];
-  q = [];
+  m = null;
+  z = false;
+  f = [[], []];
+  e = [];
   created = clock;
   enqueue(type, fn) {
-    if (ActiveTransition)
-      return ActiveTransition.enqueue(type, fn);
+    if (ActiveTransition && ActiveTransition.w.has(this))
+      return ActiveTransition.w.get(this).enqueue(type, fn);
     pureQueue.push(fn);
     if (type)
-      this.o[type - 1].push(fn);
+      this.f[type - 1].push(fn);
     schedule();
   }
   run(type) {
@@ -76,19 +76,19 @@ var Queue = class {
       pureQueue.length && runQueue(pureQueue, type);
       pureQueue = [];
       return;
-    } else if (this.o[type - 1].length) {
-      const effects = this.o[type - 1];
-      this.o[type - 1] = [];
+    } else if (this.f[type - 1].length) {
+      const effects = this.f[type - 1];
+      this.f[type - 1] = [];
       runQueue(effects, type);
     }
-    for (let i = 0; i < this.q.length; i++) {
-      this.q[i].run(type);
+    for (let i = 0; i < this.e.length; i++) {
+      this.e[i].run(type);
     }
   }
   flush() {
-    if (this.x)
+    if (this.z)
       return;
-    this.x = true;
+    this.z = true;
     try {
       this.run(EFFECT_PURE);
       incrementClock();
@@ -96,24 +96,37 @@ var Queue = class {
       this.run(EFFECT_RENDER);
       this.run(EFFECT_USER);
     } finally {
-      this.x = false;
+      this.z = false;
       unobserved.length && notifyUnobserved();
     }
   }
   addChild(child) {
-    this.q.push(child);
-    child.p = this;
+    this.e.push(child);
+    child.m = this;
   }
   removeChild(child) {
-    const index = this.q.indexOf(child);
+    const index = this.e.indexOf(child);
     if (index >= 0)
-      this.q.splice(index, 1);
+      this.e.splice(index, 1);
   }
   notify(...args) {
-    if (this.p)
-      return this.p.notify(...args);
+    if (ActiveTransition && ActiveTransition.w.has(this))
+      return ActiveTransition.w.get(this).notify(...args);
+    if (this.m)
+      return this.m.notify(...args);
     return false;
   }
+  merge(queue) {
+    this.f[0].push.apply(this.f[0], queue.f[0]);
+    this.f[1].push.apply(this.f[1], queue.f[1]);
+    for (let i = 0; i < queue.e.length; i++) {
+      const og = this.e.find((c) => c.j === queue.e[i].j);
+      if (og)
+        og.merge(queue.e[i]);
+      else
+        this.addChild(queue.e[i]);
+    }
+  }
 };
 var globalQueue = new Queue();
 function flush() {
@@ -128,61 +141,68 @@ function runQueue(queue, type) {
 var Transition = class _Transition {
   a = /* @__PURE__ */ new Map();
   t = /* @__PURE__ */ new Set();
-  M = /* @__PURE__ */ new Set();
-  T = /* @__PURE__ */ new Set();
-  E = false;
-  o = [[], []];
-  F = [];
-  q = [];
-  p = null;
-  x = false;
-  U = false;
+  Q = /* @__PURE__ */ new Set();
+  W = /* @__PURE__ */ new Set();
+  I = false;
+  f = [[], []];
+  w = /* @__PURE__ */ new Map();
+  E = [];
+  e = [];
+  m = null;
+  z = false;
+  X = false;
   created = clock;
+  constructor() {
+    this.w.set(globalQueue, this);
+    for (const child of globalQueue.e) {
+      cloneQueue(child, this, this.w);
+    }
+  }
   enqueue(type, fn) {
-    this.F.push(fn);
+    this.E.push(fn);
     if (type)
-      this.o[type - 1].push(fn);
+      this.f[type - 1].push(fn);
     this.schedule();
   }
   run(type) {
     if (type === EFFECT_PURE) {
-      this.F.length && runQueue(this.F, type);
-      this.F = [];
+      this.E.length && runQueue(this.E, type);
+      this.E = [];
       return;
-    } else if (this.o[type - 1].length) {
-      const effects = this.o[type - 1];
-      this.o[type - 1] = [];
+    } else if (this.f[type - 1].length) {
+      const effects = this.f[type - 1];
+      this.f[type - 1] = [];
       runQueue(effects, type);
     }
-    for (let i = 0; i < this.q.length; i++) {
-      this.q[i].run(type);
+    for (let i = 0; i < this.e.length; i++) {
+      this.e[i].run(type);
     }
   }
   flush() {
-    if (this.x)
+    if (this.z)
       return;
-    this.x = true;
+    this.z = true;
     let currentTransition = ActiveTransition;
     ActiveTransition = this;
     try {
       this.run(EFFECT_PURE);
       incrementClock();
-      this.U = false;
+      this.X = false;
       ActiveTransition = currentTransition;
       finishTransition(this);
     } finally {
-      this.x = false;
+      this.z = false;
       ActiveTransition = currentTransition;
     }
   }
   addChild(child) {
-    this.q.push(child);
-    child.p = this;
+    this.e.push(child);
+    child.m = this;
   }
   removeChild(child) {
-    const index = this.q.indexOf(child);
+    const index = this.e.indexOf(child);
     if (index >= 0)
-      this.q.splice(index, 1);
+      this.e.splice(index, 1);
   }
   notify(node, type, flags) {
     if (!(type & LOADING_BIT))
@@ -194,17 +214,29 @@ var Transition = class _Transition {
     }
     return true;
   }
+  merge(queue) {
+    this.f[0].push.apply(this.f[0], queue.f[0]);
+    this.f[1].push.apply(this.f[1], queue.f[1]);
+    this.E.push.apply(this.E, queue.E);
+    for (let i = 0; i < queue.e.length; i++) {
+      const og = this.e.find((c) => c.j === queue.e[i].j);
+      if (og)
+        og.merge(queue.e[i]);
+      else
+        this.addChild(queue.e[i]);
+    }
+  }
   schedule() {
-    if (this.U)
+    if (this.X)
       return;
-    this.U = true;
-    if (!this.x)
+    this.X = true;
+    if (!this.z)
       queueMicrotask(() => this.flush());
   }
   runTransition(fn, force = false) {
-    if (this.E) {
-      if (this.E instanceof _Transition)
-        return this.E.runTransition(fn, force);
+    if (this.I) {
+      if (this.I instanceof _Transition)
+        return this.I.runTransition(fn, force);
       if (!force)
         throw new Error("Transition already completed");
       fn();
@@ -215,9 +247,9 @@ var Transition = class _Transition {
       const result = fn();
       const transition2 = ActiveTransition;
       if (result instanceof Promise) {
-        transition2.M.add(result);
+        transition2.Q.add(result);
         result.finally(() => {
-          transition2.M.delete(result);
+          transition2.Q.delete(result);
           finishTransition(transition2);
         });
       }
@@ -228,33 +260,31 @@ var Transition = class _Transition {
     }
   }
   addOptimistic(fn) {
-    if (fn.h && fn.h !== this) {
-      mergeTransitions(fn.h, this);
-      ActiveTransition = fn.h;
+    if (fn.k && fn.k !== this) {
+      mergeTransitions(fn.k, this);
+      ActiveTransition = fn.k;
       return;
     }
-    fn.h = this;
-    this.T.add(fn);
+    fn.k = this;
+    this.W.add(fn);
   }
 };
-var Transitions = /* @__PURE__ */ new Set();
 function transition(fn) {
   let t = new Transition();
-  Transitions.add(t);
   queueMicrotask(() => t.runTransition(() => fn((fn2) => t.runTransition(fn2))));
 }
 function cloneGraph(node) {
-  if (node.h) {
-    if (node.h !== ActiveTransition) {
-      mergeTransitions(node.h, ActiveTransition);
-      ActiveTransition = node.h;
+  if (node.k) {
+    if (node.k !== ActiveTransition) {
+      mergeTransitions(node.k, ActiveTransition);
+      ActiveTransition = node.k;
     }
-    return node.h.a.get(node);
+    return node.k.a.get(node);
   }
   const clone = Object.create(Object.getPrototypeOf(node));
-  Object.assign(clone, node, { j: null, r: null, N: node });
+  Object.assign(clone, node, { n: null, s: null, j: node });
   ActiveTransition.a.set(node, clone);
-  node.h = ActiveTransition;
+  node.k = ActiveTransition;
   if (node.d) {
     for (let i = 0, length = node.d.length; i < length; i++) {
       const o = node.d[i];
@@ -278,44 +308,84 @@ function removeSourceObservers(node, index) {
     }
   }
 }
+function cloneQueue(queue, parent, clonedQueues) {
+  const clone = Object.create(Object.getPrototypeOf(queue));
+  Object.assign(clone, queue, {
+    j: queue,
+    m: parent,
+    e: [],
+    enqueue(type, fn) {
+      ActiveTransition?.enqueue(type, fn);
+    },
+    notify(node, type, flags) {
+      node = node.j || node;
+      if (!clone.F || type & LOADING_BIT) {
+        type &= ~LOADING_BIT;
+        ActiveTransition?.notify(node, LOADING_BIT, flags);
+        if (!type)
+          return true;
+      }
+      return queue.notify.call(this, node, type, flags);
+    }
+  });
+  parent.e.push(clone);
+  clonedQueues.set(queue, clone);
+  for (const child of queue.e) {
+    cloneQueue(child, clone, clonedQueues);
+  }
+}
+function resolveQueues(children) {
+  for (const child of children) {
+    const og = child.j;
+    if (og) {
+      const clonedChildren = child.e;
+      delete child.enqueue;
+      delete child.notify;
+      delete child.m;
+      delete child.e;
+      Object.assign(og, child);
+      delete og.j;
+      resolveQueues(clonedChildren);
+    } else if (child.m.j) {
+      child.m.j.addChild(child);
+    }
+  }
+}
 function mergeTransitions(t1, t2) {
   t2.a.forEach((value, key) => {
-    key.h = t1;
+    key.k = t1;
     t1.a.set(key, value);
   });
-  t2.T.forEach((c) => {
-    c.h = t1;
-    t1.T.add(c);
+  t2.W.forEach((c) => {
+    c.k = t1;
+    t1.W.add(c);
   });
-  t2.M.forEach((p) => t1.M.add(p));
+  t2.Q.forEach((p) => t1.Q.add(p));
   t2.t.forEach((n) => t1.t.add(n));
-  t2.o[0].forEach((f) => t1.o[0].push(f));
-  t2.o[1].forEach((f) => t1.o[1].push(f));
-  t2.F.forEach((f) => t1.F.push(f));
-  t2.q.forEach((c) => t1.addChild(c));
-  t2.E = t1;
-  Transitions.delete(t2);
+  t1.merge(t2);
+  t2.I = t1;
 }
 function finishTransition(transition2) {
-  if (transition2.E || transition2.U || transition2.M.size || transition2.t.size)
+  if (transition2.I || transition2.X || transition2.Q.size || transition2.t.size)
     return;
   for (const [source, clone] of transition2.a) {
-    if (source === clone || source.h !== transition2)
+    if (source === clone || source.k !== transition2)
       continue;
     if (clone.a)
       removeSourceObservers(clone, 0);
     source.dispose(false);
     source.emptyDisposal();
     Object.assign(source, clone);
-    delete source.N;
-    delete source.h;
-  }
-  transition2.E = true;
-  Transitions.delete(transition2);
-  transition2.run(EFFECT_RENDER);
-  transition2.run(EFFECT_USER);
-  for (const reset of transition2.T) {
-    delete reset.h;
+    delete source.j;
+    delete source.k;
+  }
+  globalQueue.f[0].push.apply(globalQueue.f[0], transition2.f[0]);
+  globalQueue.f[1].push.apply(globalQueue.f[1], transition2.f[1]);
+  resolveQueues(transition2.e);
+  transition2.I = true;
+  globalQueue.flush();
+  for (const reset of transition2.W) {
+    delete reset.k;
     reset();
   }
 }
@@ -335,14 +405,14 @@ var Owner = class {
   // We flatten the owner tree into a linked list so that we don't need a pointer to .firstChild
   // However, the children are actually added in reverse creation order
   // See comment at the top of the file for an example of the _nextSibling traversal
-  p = null;
-  r = null;
-  z = null;
+  m = null;
+  s = null;
+  B = null;
   b = STATE_CLEAN;
-  j = null;
-  u = defaultContext;
-  i = globalQueue;
-  da = 0;
+  n = null;
+  x = defaultContext;
+  l = globalQueue;
+  ea = 0;
   id = null;
   constructor(id = null, skipAppend = false) {
     this.id = id;
@@ -351,64 +421,64 @@ var Owner = class {
     }
   }
   append(child) {
-    child.p = this;
-    child.z = this;
-    if (this.r)
-      this.r.z = child;
-    child.r = this.r;
-    this.r = child;
+    child.m = this;
+    child.B = this;
+    if (this.s)
+      this.s.B = child;
+    child.s = this.s;
+    this.s = child;
     if (this.id != null && child.id == null)
       child.id = this.getNextChildId();
-    if (child.u !== this.u) {
-      child.u = { ...this.u, ...child.u };
+    if (child.x !== this.x) {
+      child.x = { ...this.x, ...child.x };
     }
-    if (this.i)
-      child.i = this.i;
+    if (this.l)
+      child.l = this.l;
   }
   dispose(self = true) {
     if (this.b === STATE_DISPOSED)
       return;
-    let head = self ? this.z || this.p : this, current = this.r, next = null;
-    while (current && current.p === this) {
+    let head = self ? this.B || this.m : this, current = this.s, next = null;
+    while (current && current.m === this) {
       current.dispose(true);
-      current.G();
-      next = current.r;
-      current.r = null;
+      current.J();
+      next = current.s;
+      current.s = null;
       current = next;
     }
-    this.da = 0;
+    this.ea = 0;
     if (self)
-      this.G();
+      this.J();
     if (current)
-      current.z = !self ? this : this.z;
+      current.B = !self ? this : this.B;
     if (head)
-      head.r = current;
-  }
-  G() {
-    if (this.z)
-      this.z.r = null;
-    this.p = null;
-    this.z = null;
-    this.u = defaultContext;
+      head.s = current;
+  }
+  J() {
+    if (this.B)
+      this.B.s = null;
+    this.m = null;
+    this.B = null;
+    this.x = defaultContext;
     this.b = STATE_DISPOSED;
     this.emptyDisposal();
   }
   emptyDisposal() {
-    if (!this.j)
+    if (!this.n)
       return;
-    if (Array.isArray(this.j)) {
-      for (let i = 0; i < this.j.length; i++) {
-        const callable = this.j[i];
+    if (Array.isArray(this.n)) {
+      for (let i = 0; i < this.n.length; i++) {
+        const callable = this.n[i];
         callable.call(callable);
       }
     } else {
-      this.j.call(this.j);
+      this.n.call(this.n);
     }
-    this.j = null;
+    this.n = null;
   }
   getNextChildId() {
     if (this.id != null)
-      return formatId(this.id, this.da++);
+      return formatId(this.id, this.ea++);
     throw new Error("Cannot get child id from owner without an id");
   }
 };
@@ -419,7 +489,7 @@ function getContext(context, owner = currentOwner) {
   if (!owner) {
     throw new NoOwnerError();
   }
-  const value = hasContext(context, owner) ? owner.u[context.id] : context.defaultValue;
+  const value = hasContext(context, owner) ? owner.x[context.id] : context.defaultValue;
   if (isUndefined(value)) {
     throw new ContextNotFoundError();
   }
@@ -429,24 +499,24 @@ function setContext(context, value, owner = currentOwner) {
   if (!owner) {
     throw new NoOwnerError();
   }
-  owner.u = {
-    ...owner.u,
+  owner.x = {
+    ...owner.x,
     [context.id]: isUndefined(value) ? context.defaultValue : value
   };
 }
 function hasContext(context, owner = currentOwner) {
-  return !isUndefined(owner?.u[context.id]);
+  return !isUndefined(owner?.x[context.id]);
 }
 function onCleanup(fn) {
   if (!currentOwner)
     return fn;
   const node = currentOwner;
-  if (!node.j) {
-    node.j = fn;
-  } else if (Array.isArray(node.j)) {
-    node.j.push(fn);
+  if (!node.n) {
+    node.n = fn;
+  } else if (Array.isArray(node.n)) {
+    node.n.push(fn);
   } else {
-    node.j = [node.j, fn];
+    node.n = [node.n, fn];
   }
   return fn;
 }
@@ -474,48 +544,48 @@ var UNCHANGED = Symbol(0);
 var Computation = class extends Owner {
   a = null;
   d = null;
-  g;
-  O;
-  H;
+  i;
+  R;
+  K;
   // Used in __DEV__ mode, hopefully removed in production
-  ja;
+  ka;
   // Using false is an optimization as an alternative to _equals: () => false
   // which could enable more efficient DIRTY notification
-  _ = isEqual;
-  ca;
-  fa = false;
+  $ = isEqual;
+  da;
+  ga = false;
   /** Whether the computation is an error or has ancestors that are unresolved */
-  f = 0;
+  h = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
-  $ = DEFAULT_FLAGS;
-  I = -1;
-  C = false;
-  h;
-  N;
+  aa = DEFAULT_FLAGS;
+  L = -1;
+  G = false;
+  k;
+  j;
   constructor(initialValue, compute2, options) {
     super(options?.id, compute2 === null);
-    this.H = compute2;
+    this.K = compute2;
     this.b = compute2 ? STATE_DIRTY : STATE_CLEAN;
-    this.f = compute2 && initialValue === void 0 ? UNINITIALIZED_BIT : 0;
-    this.g = initialValue;
+    this.h = compute2 && initialValue === void 0 ? UNINITIALIZED_BIT : 0;
+    this.i = initialValue;
     if (options?.equals !== void 0)
-      this._ = options.equals;
+      this.$ = options.equals;
     if (options?.pureWrite)
-      this.fa = true;
+      this.ga = true;
     if (options?.unobserved)
-      this.ca = options?.unobserved;
+      this.da = options?.unobserved;
     if (ActiveTransition) {
-      this.h = ActiveTransition;
+      this.k = ActiveTransition;
       ActiveTransition.a.set(this, this);
     }
   }
-  ea() {
+  fa() {
     track(this);
-    newFlags |= this.f & ~currentMask;
-    if (this.f & ERROR_BIT) {
-      throw this.O;
+    newFlags |= this.h & ~currentMask;
+    if (this.h & ERROR_BIT) {
+      throw this.R;
     } else {
-      return this.g;
+      return this.i;
     }
   }
   /**
@@ -528,13 +598,13 @@ var Computation = class extends Owner {
       if (clone !== this)
         return clone.read();
     }
-    if (this.H) {
-      if (this.f & ERROR_BIT && this.I <= clock)
+    if (this.K) {
+      if (this.h & ERROR_BIT && this.L <= clock)
         update(this);
       else
-        this.D();
+        this.H();
     }
-    return this.ea();
+    return this.fa();
   }
   /**
    * Return the current value of this computation
@@ -549,64 +619,65 @@ var Computation = class extends Owner {
       if (clone !== this)
         return clone.wait();
     }
-    if (this.H) {
-      if (this.f & ERROR_BIT && this.I <= clock)
+    if (this.K) {
+      if (this.h & ERROR_BIT && this.L <= clock)
         update(this);
       else
-        this.D();
+        this.H();
     }
-    if ((notStale || this.f & UNINITIALIZED_BIT) && this.f & LOADING_BIT) {
+    if ((notStale || this.h & UNINITIALIZED_BIT) && this.h & LOADING_BIT) {
       track(this);
       throw new NotReadyError();
     }
-    if (staleCheck && this.f & LOADING_BIT) {
-      staleCheck.g = true;
+    if (staleCheck && this.h & LOADING_BIT) {
+      staleCheck.i = true;
     }
-    return this.ea();
+    return this.fa();
   }
   /** Update the computation with a new value. */
   write(value, flags = 0, raw = false) {
-    if (ActiveTransition && !this.N) {
+    if (ActiveTransition && !this.j) {
       const clone = cloneGraph(this);
-      return clone.write(value, flags, raw);
+      if (clone !== this)
+        return clone.write(value, flags, raw);
     }
-    const newValue = !raw && typeof value === "function" ? value(this.g) : value;
-    const valueChanged = newValue !== UNCHANGED && (!!(this.f & UNINITIALIZED_BIT) || // this._stateFlags & LOADING_BIT & ~flags ||
-    this._ === false || !this._(this.g, newValue));
+    const newValue = !raw && typeof value === "function" ? value(this.i) : value;
+    const valueChanged = newValue !== UNCHANGED && (!!(this.h & UNINITIALIZED_BIT) || // this._stateFlags & LOADING_BIT & ~flags ||
+    this.$ === false || !this.$(this.i, newValue));
     if (valueChanged) {
-      this.g = newValue;
-      this.O = void 0;
+      this.i = newValue;
+      this.R = void 0;
     }
-    const changedFlagsMask = this.f ^ flags, changedFlags = changedFlagsMask & flags;
-    this.f = flags;
-    this.I = clock + 1;
+    const changedFlagsMask = this.h ^ flags, changedFlags = changedFlagsMask & flags;
+    this.h = flags;
+    this.L = clock + 1;
     if (this.d) {
       for (let i = 0; i < this.d.length; i++) {
         if (valueChanged) {
-          this.d[i].k(STATE_DIRTY);
+          this.d[i].o(STATE_DIRTY);
         } else if (changedFlagsMask) {
-          this.d[i].V(changedFlagsMask, changedFlags);
+          this.d[i].Y(changedFlagsMask, changedFlags);
         }
       }
     }
-    return this.g;
+    return this.i;
   }
   /**
    * Set the current node's state, and recursively mark all of this node's observers as STATE_CHECK
    */
-  k(state, skipQueue) {
+  o(state, skipQueue) {
     if (ActiveTransition && ActiveTransition.a.has(this)) {
       const clone = ActiveTransition.a.get(this);
       if (clone !== this)
-        return clone.k(state, skipQueue);
+        return clone.o(state, skipQueue);
     }
-    if (this.b >= state && !this.C)
+    if (this.b >= state && !this.G)
       return;
-    this.C = !!skipQueue;
+    this.G = !!skipQueue;
     this.b = state;
     if (this.d) {
       for (let i = 0; i < this.d.length; i++) {
-        this.d[i].k(STATE_CHECK, skipQueue);
+        this.d[i].o(STATE_CHECK, skipQueue);
       }
     }
   }
@@ -616,31 +687,36 @@ var Computation = class extends Owner {
    * @param mask A bitmask for which flag(s) were changed.
    * @param newFlags The source's new flags, masked to just the changed ones.
    */
-  V(mask, newFlags2) {
+  Y(mask, newFlags2) {
     if (this.b >= STATE_DIRTY)
       return;
-    if (mask & this.$) {
-      this.k(STATE_DIRTY);
+    if (mask & this.aa) {
+      this.o(STATE_DIRTY);
       return;
     }
     if (this.b >= STATE_CHECK)
       return;
-    const prevFlags = this.f & mask;
+    const prevFlags = this.h & mask;
     const deltaFlags = prevFlags ^ newFlags2;
     if (newFlags2 === prevFlags) ; else if (deltaFlags & prevFlags & mask) {
-      this.k(STATE_CHECK);
+      this.o(STATE_CHECK);
     } else {
-      this.f ^= deltaFlags;
+      this.h ^= deltaFlags;
       if (this.d) {
         for (let i = 0; i < this.d.length; i++) {
-          this.d[i].V(mask, newFlags2);
+          this.d[i].Y(mask, newFlags2);
         }
       }
     }
   }
-  P(error) {
-    this.O = error;
-    this.write(UNCHANGED, this.f & ~LOADING_BIT | ERROR_BIT | UNINITIALIZED_BIT);
+  M(error) {
+    if (ActiveTransition && !this.j) {
+      const clone = cloneGraph(this);
+      if (clone !== this)
+        return clone.M(error);
+    }
+    this.R = error;
+    this.write(UNCHANGED, this.h & ~LOADING_BIT | ERROR_BIT | UNINITIALIZED_BIT);
   }
   /**
    * This is the core part of the reactivity system, which makes sure that the values are updated
@@ -649,8 +725,8 @@ var Computation = class extends Owner {
    *
    * This function will ensure that the value and states we read from the computation are up to date
    */
-  D() {
-    if (!this.H) {
+  H() {
+    if (!this.K) {
       return;
     }
     if (this.b === STATE_DISPOSED) {
@@ -663,8 +739,8 @@ var Computation = class extends Owner {
     if (this.b === STATE_CHECK) {
       for (let i = 0; i < this.a.length; i++) {
         const source = ActiveTransition && ActiveTransition.a.get(this.a[i]) || this.a[i];
-        source.D();
-        observerFlags |= source.f;
+        source.H();
+        observerFlags |= source.h;
         if (this.b === STATE_DIRTY) {
           break;
         }
@@ -680,17 +756,17 @@ var Computation = class extends Owner {
   /**
    * Remove ourselves from the owner graph and the computation graph
    */
-  G() {
+  J() {
     if (this.b === STATE_DISPOSED)
       return;
     if (this.a)
       removeSourceObservers(this, 0);
-    super.G();
+    super.J();
   }
 };
 function track(computation) {
-  if (ActiveTransition && computation.N)
-    computation = computation.N;
+  if (ActiveTransition && computation.j)
+    computation = computation.j;
   if (currentObserver) {
     if (!newSources && currentObserver.a && currentObserver.a[newSourcesIndex] === computation) {
       newSourcesIndex++;
@@ -700,7 +776,7 @@ function track(computation) {
       newSources.push(computation);
     }
     if (updateCheck) {
-      updateCheck.g = computation.I > currentObserver.I;
+      updateCheck.i = computation.L > currentObserver.L;
     }
   }
 }
@@ -712,13 +788,13 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.H, node);
+    const result = compute(node, node.K, node);
     node.write(result, newFlags, true);
   } catch (error) {
     if (error instanceof NotReadyError) {
-      node.write(UNCHANGED, newFlags | LOADING_BIT | node.f & UNINITIALIZED_BIT);
+      node.write(UNCHANGED, newFlags | LOADING_BIT | node.h & UNINITIALIZED_BIT);
     } else {
-      node.P(error);
+      node.M(error);
     }
   } finally {
     if (newSources) {
@@ -747,7 +823,7 @@ function update(node) {
     newSources = prevSources;
     newSourcesIndex = prevSourcesIndex;
     newFlags = prevFlags;
-    node.I = clock + 1;
+    node.L = clock + 1;
     node.b = STATE_CLEAN;
   }
 }
@@ -761,20 +837,20 @@ function untrack(fn) {
 }
 function hasUpdated(fn) {
   const current = updateCheck;
-  updateCheck = { g: false };
+  updateCheck = { i: false };
   try {
     fn();
-    return updateCheck.g;
+    return updateCheck.i;
   } finally {
     updateCheck = current;
   }
 }
 function pendingCheck(fn, loadingValue) {
   const current = staleCheck;
-  staleCheck = { g: false };
+  staleCheck = { i: false };
   try {
     latest(fn);
-    return staleCheck.g;
+    return staleCheck.i;
   } catch (err) {
     if (!(err instanceof NotReadyError))
       return false;
@@ -789,7 +865,7 @@ function isPending(fn, loadingValue) {
   if (!currentObserver)
     return pendingCheck(fn, loadingValue);
   const c = new Computation(void 0, () => pendingCheck(fn, loadingValue));
-  c.$ |= LOADING_BIT;
+  c.aa |= LOADING_BIT;
   return c.read();
 }
 function latest(fn, fallback) {
@@ -819,10 +895,10 @@ function runWithObserver(observer, run) {
     if (error instanceof NotReadyError) {
       observer.write(
         UNCHANGED,
-        newFlags | LOADING_BIT | observer.f & UNINITIALIZED_BIT
+        newFlags | LOADING_BIT | observer.h & UNINITIALIZED_BIT
       );
     } else {
-      observer.P(error);
+      observer.M(error);
     }
   } finally {
     if (newSources) {
@@ -851,10 +927,10 @@ function runWithObserver(observer, run) {
 function compute(owner, fn, observer) {
   const prevOwner = setOwner(owner), prevObserver = currentObserver, prevMask = currentMask, prevNotStale = notStale;
   currentObserver = observer;
-  currentMask = observer?.$ ?? DEFAULT_FLAGS;
+  currentMask = observer?.aa ?? DEFAULT_FLAGS;
   notStale = true;
   try {
-    return fn(observer ? observer.g : void 0);
+    return fn(observer ? observer.i : void 0);
   } finally {
     setOwner(prevOwner);
     currentObserver = prevObserver;
@@ -865,97 +941,98 @@ function compute(owner, fn, observer) {
 
 // src/core/effect.ts
 var Effect = class extends Computation {
-  aa;
-  W;
-  J;
-  ba = false;
-  X;
-  y;
+  ba;
+  Z;
+  N;
+  ca = false;
+  _;
+  A;
   constructor(initialValue, compute2, effect, error, options) {
     super(initialValue, compute2, options);
-    this.aa = effect;
-    this.W = error;
-    this.X = initialValue;
-    this.y = options?.render ? EFFECT_RENDER : EFFECT_USER;
-    if (this.y === EFFECT_RENDER) {
-      this.H = (p) => !ActiveTransition && clock > this.i.created && !(this.f & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
+    this.ba = effect;
+    this.Z = error;
+    this._ = initialValue;
+    this.A = options?.render ? EFFECT_RENDER : EFFECT_USER;
+    if (this.A === EFFECT_RENDER) {
+      this.K = (p) => !ActiveTransition && clock > this.l.created && !(this.h & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
     }
-    this.D();
-    !options?.defer && (this.y === EFFECT_USER ? (ActiveTransition || this.i).enqueue(this.y, this.A.bind(this)) : this.A(this.y));
+    this.H();
+    !options?.defer && (this.A === EFFECT_USER ? this.l.enqueue(this.A, this.C.bind(this)) : this.C(this.A));
   }
   write(value, flags = 0) {
     if (this.b == STATE_DIRTY) {
-      this.f = flags;
-      if (this.y === EFFECT_RENDER) {
-        (ActiveTransition || this.i).notify(this, LOADING_BIT | ERROR_BIT, flags);
+      this.h = flags;
+      if (this.A === EFFECT_RENDER) {
+        this.l.notify(this, LOADING_BIT | ERROR_BIT, flags);
       }
     }
     if (value === UNCHANGED)
-      return this.g;
-    this.g = value;
-    this.ba = true;
+      return this.i;
+    this.i = value;
+    this.ca = true;
     return value;
   }
-  k(state, skipQueue) {
+  o(state, skipQueue) {
     if (ActiveTransition && ActiveTransition.a.has(this)) {
-      return ActiveTransition.a.get(this).k(state, skipQueue);
+      return ActiveTransition.a.get(this).o(state, skipQueue);
     }
     if (this.b >= state || skipQueue)
       return;
     if (this.b === STATE_CLEAN)
-      (ActiveTransition || this.i).enqueue(this.y, this.A.bind(this));
+      this.l.enqueue(this.A, this.C.bind(this));
     this.b = state;
   }
-  V(mask, newFlags2) {
+  Y(mask, newFlags2) {
     if (ActiveTransition && ActiveTransition.a.has(this)) {
       if (this.b >= STATE_CHECK)
         return;
       if (mask & 3) {
-        this.k(STATE_DIRTY);
+        this.o(STATE_DIRTY);
         return;
       }
     }
-    super.V(mask, newFlags2);
+    super.Y(mask, newFlags2);
   }
-  P(error) {
-    this.O = error;
-    (ActiveTransition || this.i).notify(this, LOADING_BIT, 0);
-    this.f = ERROR_BIT;
-    if (this.y === EFFECT_USER) {
+  M(error) {
+    this.R = error;
+    this.l.notify(this, LOADING_BIT, 0);
+    this.h = ERROR_BIT;
+    if (this.A === EFFECT_USER) {
       try {
-        return this.W ? this.W(error, () => {
-          this.J?.();
-          this.J = void 0;
+        return this.Z ? this.Z(error, () => {
+          this.N?.();
+          this.N = void 0;
         }) : console.error(error);
       } catch (e) {
         error = e;
       }
     }
-    if (!(ActiveTransition || this.i).notify(this, ERROR_BIT, ERROR_BIT))
+    if (!this.l.notify(this, ERROR_BIT, ERROR_BIT))
       throw error;
   }
-  G() {
+  J() {
     if (this.b === STATE_DISPOSED)
       return;
-    this.aa = void 0;
-    this.X = void 0;
-    this.W = void 0;
-    this.J?.();
-    this.J = void 0;
-    super.G();
-  }
-  A(type) {
+    this.ba = void 0;
+    this._ = void 0;
+    this.Z = void 0;
+    this.N?.();
+    this.N = void 0;
+    super.J();
+  }
+  C(type) {
     if (type) {
-      if (this.ba && this.b !== STATE_DISPOSED) {
-        this.J?.();
+      const effect = this.j || this;
+      if (effect.ca && effect.b !== STATE_DISPOSED) {
+        effect.N?.();
         try {
-          this.J = this.aa(this.g, this.X);
+          effect.N = effect.ba(effect.i, effect._);
         } catch (e) {
-          if (!(ActiveTransition || this.i).notify(this, ERROR_BIT, ERROR_BIT))
+          if (!effect.l.notify(effect, ERROR_BIT, ERROR_BIT))
             throw e;
         } finally {
-          this.X = this.g;
-          this.ba = false;
+          effect._ = effect.i;
+          effect.ca = false;
         }
       }
     } else
@@ -965,19 +1042,19 @@ var Effect = class extends Computation {
 var EagerComputation = class extends Computation {
   constructor(initialValue, compute2, options) {
     super(initialValue, compute2, options);
-    !options?.defer && this.D();
+    !options?.defer && this.H();
   }
-  k(state, skipQueue) {
+  o(state, skipQueue) {
     if (ActiveTransition && ActiveTransition.a.has(this)) {
-      return ActiveTransition.a.get(this).k(state, skipQueue);
+      return ActiveTransition.a.get(this).o(state, skipQueue);
     }
-    if (this.b >= state && !this.C)
+    if (this.b >= state && !this.G)
       return;
-    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.C))
-      (ActiveTransition || this.i).enqueue(EFFECT_PURE, this.A.bind(this));
-    super.k(state, skipQueue);
+    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.G))
+      this.l.enqueue(EFFECT_PURE, this.C.bind(this));
+    super.o(state, skipQueue);
   }
-  A() {
+  C() {
     this.b !== STATE_CLEAN && runTop(this);
   }
 };
@@ -986,31 +1063,31 @@ var FirewallComputation = class extends Computation {
   constructor(compute2) {
     super(void 0, compute2);
   }
-  k(state, skipQueue) {
+  o(state, skipQueue) {
     if (ActiveTransition && ActiveTransition.a.has(this)) {
-      return ActiveTransition.a.get(this).k(state, skipQueue);
+      return ActiveTransition.a.get(this).o(state, skipQueue);
     }
-    if (this.b >= state && !this.C)
+    if (this.b >= state && !this.G)
       return;
-    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.C))
-      (ActiveTransition || this.i).enqueue(EFFECT_PURE, this.A.bind(this));
-    super.k(state, true);
-    this.C = !!skipQueue;
+    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.G))
+      this.l.enqueue(EFFECT_PURE, this.C.bind(this));
+    super.o(state, true);
+    this.G = !!skipQueue;
   }
-  A() {
+  C() {
     this.b !== STATE_CLEAN && runTop(this);
   }
 };
 function runTop(node) {
   const ancestors = [];
-  for (let current = node; current !== null; current = current.p) {
+  for (let current = node; current !== null; current = current.m) {
     if (current.b !== STATE_CLEAN) {
       ancestors.push(current);
     }
   }
   for (let i = ancestors.length - 1; i >= 0; i--) {
     if (ancestors[i].b !== STATE_DISPOSED)
-      ancestors[i].D();
+      ancestors[i].H();
   }
 }
 
@@ -1144,7 +1221,7 @@ var storeTraps = {
         return desc.get.call(receiver);
     }
     if (Writing?.has(receiver)) {
-      let value2 = tracked && (overridden || !proxySource) ? tracked.g : storeValue[property];
+      let value2 = tracked && (overridden || !proxySource) ? tracked.i : storeValue[property];
       value2 === $DELETED && (value2 = void 0);
       if (!isWrappable(value2))
         return value2;
@@ -1679,7 +1756,7 @@ function createMemo(compute2, value, options) {
         return resolvedValue;
       }
       resolvedValue = node.wait();
-      if (!node.a?.length && node.r?.p !== node) {
+      if (!node.a?.length && node.s?.m !== node) {
         node.dispose();
         node = void 0;
       }
@@ -1715,8 +1792,8 @@ function createAsync(compute2, value, options) {
             if (abort)
               return;
             if (transition2)
-              return transition2.runTransition(() => node.P(error), true);
-            node.P(error);
+              return transition2.runTransition(() => node.M(error), true);
+            node.M(error);
           }
         );
       } else {
@@ -1742,7 +1819,7 @@ function createAsync(compute2, value, options) {
   read.refresh = () => {
     node.b = STATE_DIRTY;
     refreshing = true;
-    node.D();
+    node.H();
   };
   return read;
 }
@@ -1854,95 +1931,95 @@ function createOptimistic(initial, compute2, key) {
 function mapArray(list, map, options) {
   const keyFn = typeof options?.keyed === "function" ? options.keyed : void 0;
   return updateKeyedMap.bind({
-    Q: new Owner(),
-    l: 0,
-    ga: list,
-    B: [],
-    K: map,
-    e: [],
+    S: new Owner(),
+    p: 0,
+    ha: list,
+    D: [],
+    O: map,
+    g: [],
     c: [],
-    L: keyFn,
-    m: keyFn || options?.keyed === false ? [] : void 0,
-    n: map.length > 1 ? [] : void 0,
-    R: options?.fallback
+    P: keyFn,
+    q: keyFn || options?.keyed === false ? [] : void 0,
+    r: map.length > 1 ? [] : void 0,
+    T: options?.fallback
   });
 }
 var pureOptions = { pureWrite: true };
 function updateKeyedMap() {
-  const newItems = this.ga() || [], newLen = newItems.length;
+  const newItems = this.ha() || [], newLen = newItems.length;
   newItems[$TRACK];
-  runWithOwner(this.Q, () => {
-    let i, j, mapper = this.m ? () => {
-      this.m[j] = new Computation(newItems[j], null, pureOptions);
-      this.n && (this.n[j] = new Computation(j, null, pureOptions));
-      return this.K(
-        Computation.prototype.read.bind(this.m[j]),
-        this.n ? Computation.prototype.read.bind(this.n[j]) : void 0
+  runWithOwner(this.S, () => {
+    let i, j, mapper = this.q ? () => {
+      this.q[j] = new Computation(newItems[j], null, pureOptions);
+      this.r && (this.r[j] = new Computation(j, null, pureOptions));
+      return this.O(
+        Computation.prototype.read.bind(this.q[j]),
+        this.r ? Computation.prototype.read.bind(this.r[j]) : void 0
       );
-    } : this.n ? () => {
+    } : this.r ? () => {
       const item = newItems[j];
-      this.n[j] = new Computation(j, null, pureOptions);
-      return this.K(() => item, Computation.prototype.read.bind(this.n[j]));
+      this.r[j] = new Computation(j, null, pureOptions);
+      return this.O(() => item, Computation.prototype.read.bind(this.r[j]));
     } : () => {
       const item = newItems[j];
-      return this.K(() => item);
+      return this.O(() => item);
     };
     if (newLen === 0) {
-      if (this.l !== 0) {
-        this.Q.dispose(false);
+      if (this.p !== 0) {
+        this.S.dispose(false);
         this.c = [];
-        this.B = [];
-        this.e = [];
-        this.l = 0;
-        this.m && (this.m = []);
-        this.n && (this.n = []);
+        this.D = [];
+        this.g = [];
+        this.p = 0;
+        this.q && (this.q = []);
+        this.r && (this.r = []);
       }
-      if (this.R && !this.e[0]) {
-        this.e[0] = compute(
+      if (this.T && !this.g[0]) {
+        this.g[0] = compute(
           this.c[0] = new Owner(),
-          this.R,
+          this.T,
           null
         );
       }
-    } else if (this.l === 0) {
+    } else if (this.p === 0) {
       if (this.c[0])
         this.c[0].dispose();
-      this.e = new Array(newLen);
+      this.g = new Array(newLen);
       for (j = 0; j < newLen; j++) {
-        this.B[j] = newItems[j];
-        this.e[j] = compute(this.c[j] = new Owner(), mapper, null);
+        this.D[j] = newItems[j];
+        this.g[j] = compute(this.c[j] = new Owner(), mapper, null);
       }
-      this.l = newLen;
+      this.p = newLen;
     } else {
-      let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.m ? new Array(newLen) : void 0, tempIndexes = this.n ? new Array(newLen) : void 0;
-      for (start = 0, end = Math.min(this.l, newLen); start < end && (this.B[start] === newItems[start] || this.m && compare(this.L, this.B[start], newItems[start])); start++) {
-        if (this.m)
-          this.m[start].write(newItems[start]);
+      let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.q ? new Array(newLen) : void 0, tempIndexes = this.r ? new Array(newLen) : void 0;
+      for (start = 0, end = Math.min(this.p, newLen); start < end && (this.D[start] === newItems[start] || this.q && compare(this.P, this.D[start], newItems[start])); start++) {
+        if (this.q)
+          this.q[start].write(newItems[start]);
       }
-      for (end = this.l - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.B[end] === newItems[newEnd] || this.m && compare(this.L, this.B[end], newItems[newEnd])); end--, newEnd--) {
-        temp[newEnd] = this.e[end];
+      for (end = this.p - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.D[end] === newItems[newEnd] || this.q && compare(this.P, this.D[end], newItems[newEnd])); end--, newEnd--) {
+        temp[newEnd] = this.g[end];
         tempNodes[newEnd] = this.c[end];
-        tempRows && (tempRows[newEnd] = this.m[end]);
-        tempIndexes && (tempIndexes[newEnd] = this.n[end]);
+        tempRows && (tempRows[newEnd] = this.q[end]);
+        tempIndexes && (tempIndexes[newEnd] = this.r[end]);
       }
       newIndices = /* @__PURE__ */ new Map();
       newIndicesNext = new Array(newEnd + 1);
       for (j = newEnd; j >= start; j--) {
         item = newItems[j];
-        key = this.L ? this.L(item) : item;
+        key = this.P ? this.P(item) : item;
         i = newIndices.get(key);
         newIndicesNext[j] = i === void 0 ? -1 : i;
         newIndices.set(key, j);
       }
       for (i = start; i <= end; i++) {
-        item = this.B[i];
-        key = this.L ? this.L(item) : item;
+        item = this.D[i];
+        key = this.P ? this.P(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
-          temp[j] = this.e[i];
+          temp[j] = this.g[i];
           tempNodes[j] = this.c[i];
-          tempRows && (tempRows[j] = this.m[i]);
-          tempIndexes && (tempIndexes[j] = this.n[i]);
+          tempRows && (tempRows[j] = this.q[i]);
+          tempIndexes && (tempIndexes[j] = this.r[i]);
           j = newIndicesNext[j];
           newIndices.set(key, j);
         } else
@@ -1950,100 +2027,100 @@ function updateKeyedMap() {
       }
       for (j = start; j < newLen; j++) {
         if (j in temp) {
-          this.e[j] = temp[j];
+          this.g[j] = temp[j];
           this.c[j] = tempNodes[j];
           if (tempRows) {
-            this.m[j] = tempRows[j];
-            this.m[j].write(newItems[j]);
+            this.q[j] = tempRows[j];
+            this.q[j].write(newItems[j]);
           }
           if (tempIndexes) {
-            this.n[j] = tempIndexes[j];
-            this.n[j].write(j);
+            this.r[j] = tempIndexes[j];
+            this.r[j].write(j);
           }
         } else {
-          this.e[j] = compute(this.c[j] = new Owner(), mapper, null);
+          this.g[j] = compute(this.c[j] = new Owner(), mapper, null);
         }
       }
-      this.e = this.e.slice(0, this.l = newLen);
-      this.B = newItems.slice(0);
+      this.g = this.g.slice(0, this.p = newLen);
+      this.D = newItems.slice(0);
     }
   });
-  return this.e;
+  return this.g;
 }
 function repeat(count, map, options) {
   return updateRepeat.bind({
-    Q: new Owner(),
-    l: 0,
-    w: 0,
-    ha: count,
-    K: map,
+    S: new Owner(),
+    p: 0,
+    y: 0,
+    ia: count,
+    O: map,
     c: [],
-    e: [],
-    ia: options?.from,
-    R: options?.fallback
+    g: [],
+    ja: options?.from,
+    T: options?.fallback
   });
 }
 function updateRepeat() {
-  const newLen = this.ha();
-  const from = this.ia?.() || 0;
-  runWithOwner(this.Q, () => {
+  const newLen = this.ia();
+  const from = this.ja?.() || 0;
+  runWithOwner(this.S, () => {
     if (newLen === 0) {
-      if (this.l !== 0) {
-        this.Q.dispose(false);
+      if (this.p !== 0) {
+        this.S.dispose(false);
         this.c = [];
-        this.e = [];
-        this.l = 0;
+        this.g = [];
+        this.p = 0;
       }
-      if (this.R && !this.e[0]) {
-        this.e[0] = compute(
+      if (this.T && !this.g[0]) {
+        this.g[0] = compute(
           this.c[0] = new Owner(),
-          this.R,
+          this.T,
           null
         );
       }
       return;
     }
     const to = from + newLen;
-    const prevTo = this.w + this.l;
-    if (this.l === 0 && this.c[0])
+    const prevTo = this.y + this.p;
+    if (this.p === 0 && this.c[0])
       this.c[0].dispose();
     for (let i = to; i < prevTo; i++)
-      this.c[i - this.w].dispose();
-    if (this.w < from) {
-      let i = this.w;
-      while (i < from && i < this.l)
+      this.c[i - this.y].dispose();
+    if (this.y < from) {
+      let i = this.y;
+      while (i < from && i < this.p)
         this.c[i++].dispose();
-      this.c.splice(0, from - this.w);
-      this.e.splice(0, from - this.w);
-    } else if (this.w > from) {
-      let i = prevTo - this.w - 1;
-      let difference = this.w - from;
-      this.c.length = this.e.length = newLen;
+      this.c.splice(0, from - this.y);
+      this.g.splice(0, from - this.y);
+    } else if (this.y > from) {
+      let i = prevTo - this.y - 1;
+      let difference = this.y - from;
+      this.c.length = this.g.length = newLen;
       while (i >= difference) {
         this.c[i] = this.c[i - difference];
-        this.e[i] = this.e[i - difference];
+        this.g[i] = this.g[i - difference];
         i--;
       }
       for (let i2 = 0; i2 < difference; i2++) {
-        this.e[i2] = compute(
+        this.g[i2] = compute(
           this.c[i2] = new Owner(),
-          () => this.K(i2 + from),
+          () => this.O(i2 + from),
           null
         );
       }
     }
     for (let i = prevTo; i < to; i++) {
-      this.e[i - from] = compute(
+      this.g[i - from] = compute(
         this.c[i - from] = new Owner(),
-        () => this.K(i),
+        () => this.O(i),
         null
       );
     }
-    this.e = this.e.slice(0, newLen);
-    this.w = from;
-    this.l = newLen;
+    this.g = this.g.slice(0, newLen);
+    this.y = from;
+    this.p = newLen;
   });
-  return this.e;
+  return this.g;
 }
 function compare(key, a, b) {
   return key ? key(a) === key(b) : true;
@@ -2051,24 +2128,24 @@ function compare(key, a, b) {
 
 // src/boundaries.ts
 var BoundaryComputation = class extends EagerComputation {
-  S;
+  U;
   constructor(compute2, propagationMask) {
     super(void 0, compute2, { defer: true });
-    this.S = propagationMask;
+    this.U = propagationMask;
   }
   write(value, flags) {
-    super.write(value, flags & ~this.S);
-    if (this.S & LOADING_BIT && !(this.f & UNINITIALIZED_BIT)) {
+    super.write(value, flags & ~this.U);
+    if (this.U & LOADING_BIT && !(this.h & UNINITIALIZED_BIT)) {
       flags &= ~LOADING_BIT;
     }
-    this.i.notify(this, this.S, flags);
-    return this.g;
+    this.l.notify(this, this.U, flags);
+    return this.i;
   }
 };
 function createBoundChildren(owner, fn, queue, mask) {
-  const parentQueue = owner.i;
-  parentQueue.addChild(owner.i = queue);
-  onCleanup(() => parentQueue.removeChild(owner.i));
+  const parentQueue = owner.l;
+  parentQueue.addChild(owner.l = queue);
+  onCleanup(() => parentQueue.removeChild(owner.l));
   return compute(
     owner,
     () => {
@@ -2079,20 +2156,22 @@ function createBoundChildren(owner, fn, queue, mask) {
   );
 }
 var ConditionalQueue = class extends Queue {
-  s;
-  Y = /* @__PURE__ */ new Set();
+  u;
+  V = /* @__PURE__ */ new Set();
   t = /* @__PURE__ */ new Set();
   constructor(disabled) {
     super();
-    this.s = disabled;
+    this.u = disabled;
   }
   run(type) {
-    if (!type || this.s.read())
+    if (!type || this.u.read())
       return;
     return super.run(type);
   }
   notify(node, type, flags) {
-    if (this.s.read()) {
+    if (ActiveTransition && ActiveTransition.w.has(this))
+      return ActiveTransition.w.get(this).notify(node, type, flags);
+    if (this.u.read()) {
       if (type & LOADING_BIT) {
         if (flags & LOADING_BIT) {
           this.t.add(node);
@@ -2102,43 +2181,54 @@ var ConditionalQueue = class extends Queue {
       }
       if (type & ERROR_BIT) {
         if (flags & ERROR_BIT) {
-          this.Y.add(node);
+          this.V.add(node);
           type &= ~ERROR_BIT;
-        } else if (this.Y.delete(node))
+        } else if (this.V.delete(node))
           type &= ~ERROR_BIT;
       }
     }
     return type ? super.notify(node, type, flags) : true;
   }
+  merge(queue) {
+    queue.t.forEach((n) => this.notify(n, LOADING_BIT, LOADING_BIT));
+    queue.V.forEach((n) => this.notify(n, ERROR_BIT, ERROR_BIT));
+    super.merge(queue);
+  }
 };
 var CollectionQueue = class extends Queue {
-  Z;
+  F;
   c = /* @__PURE__ */ new Set();
-  s = new Computation(false, null, { pureWrite: true });
+  u = new Computation(false, null, { pureWrite: true });
   constructor(type) {
     super();
-    this.Z = type;
+    this.F = type;
   }
   run(type) {
-    if (!type || this.s.read())
+    if (!type || this.u.read())
       return;
     return super.run(type);
   }
   notify(node, type, flags) {
-    if (!(type & this.Z))
+    if (ActiveTransition && ActiveTransition.w.has(this))
+      return ActiveTransition.w.get(this).notify(node, type, flags);
+    if (!(type & this.F))
       return super.notify(node, type, flags);
-    if (flags & this.Z) {
+    if (flags & this.F) {
       this.c.add(node);
       if (this.c.size === 1)
-        this.s.write(true);
+        this.u.write(true);
     } else {
       this.c.delete(node);
       if (this.c.size === 0)
-        this.s.write(false);
+        this.u.write(false);
     }
-    type &= ~this.Z;
+    type &= ~this.F;
     return type ? super.notify(node, type, flags) : true;
   }
+  merge(queue) {
+    queue.c.forEach((n) => this.notify(n, this.F, this.F));
+    super.merge(queue);
+  }
 };
 function createBoundary(fn, condition) {
   const owner = new Owner();
@@ -2147,25 +2237,25 @@ function createBoundary(fn, condition) {
   );
   const tree = createBoundChildren(owner, fn, queue, 0);
   new EagerComputation(void 0, () => {
-    const disabled = queue.s.read();
-    tree.S = disabled ? ERROR_BIT | LOADING_BIT : 0;
+    const disabled = queue.u.read();
+    tree.U = disabled ? ERROR_BIT | LOADING_BIT : 0;
     if (!disabled) {
       queue.t.forEach((node) => queue.notify(node, LOADING_BIT, LOADING_BIT));
-      queue.Y.forEach((node) => queue.notify(node, ERROR_BIT, ERROR_BIT));
+      queue.V.forEach((node) => queue.notify(node, ERROR_BIT, ERROR_BIT));
       queue.t.clear();
-      queue.Y.clear();
+      queue.V.clear();
     }
   });
-  return () => queue.s.read() ? void 0 : tree.read();
+  return () => queue.u.read() ? void 0 : tree.read();
 }
 function createCollectionBoundary(type, fn, fallback) {
   const owner = new Owner();
   const queue = new CollectionQueue(type);
   const tree = createBoundChildren(owner, fn, queue, type);
   const decision = new Computation(void 0, () => {
-    if (!queue.s.read()) {
+    if (!queue.u.read()) {
       const resolved = tree.read();
-      if (!queue.s.read())
+      if (!queue.u.read())
         return resolved;
     }
     return fallback(queue);
@@ -2176,17 +2266,17 @@ function createSuspense(fn, fallback) {
   return createCollectionBoundary(LOADING_BIT, fn, () => fallback());
 }
 function createErrorBoundary(fn, fallback) {
-  return createCollectionBoundary(
-    ERROR_BIT,
-    fn,
-    (queue) => fallback(queue.c.values().next().value.O, () => {
+  return createCollectionBoundary(ERROR_BIT, fn, (queue) => {
+    let node = queue.c.values().next().value;
+    ActiveTransition && ActiveTransition.a.has(node) && (node = ActiveTransition.a.get(node));
+    return fallback(node.R, () => {
       incrementClock();
-      for (let node of queue.c) {
-        node.b = STATE_DIRTY;
-        node.i?.enqueue(node.y, node.A.bind(node));
+      for (let node2 of queue.c) {
+        node2.b = STATE_DIRTY;
+        node2.l?.enqueue(node2.A, node2.C.bind(node2));
       }
-    })
-  );
+    });
+  });
 }
 function flatten(children, options) {
   if (typeof children === "function" && !children.length) {