@solidjs/signals 0.4.4 → 0.4.6

package/dist/node.cjs

@@ -41,7 +41,7 @@ function incrementClock() {
   clock++;
 }
 var ActiveTransition = null;
-var unobserved = [];
+var Unobserved = [];
 var scheduled = false;
 function schedule() {
   if (scheduled)
@@ -52,12 +52,12 @@ function schedule() {
 }
 function notifyUnobserved() {
   var _a, _b;
-  for (let i = 0; i < unobserved.length; i++) {
-    const source = unobserved[i];
-    if (!source.d || !source.d.length)
-      (_b = (_a = unobserved[i]).da) == null ? void 0 : _b.call(_a);
+  for (let i = 0; i < Unobserved.length; i++) {
+    const source = Unobserved[i];
+    if (!source.b || !source.b.length)
+      (_b = (_a = Unobserved[i]).da) == null ? void 0 : _b.call(_a);
   }
-  unobserved = [];
+  Unobserved = [];
 }
 var pureQueue = [];
 var Queue = class {
@@ -67,8 +67,8 @@ var Queue = class {
   e = [];
   created = clock;
   enqueue(type, fn) {
-    if (ActiveTransition && ActiveTransition.w.has(this))
-      return ActiveTransition.w.get(this).enqueue(type, fn);
+    if (ActiveTransition && ActiveTransition.u.has(this))
+      return ActiveTransition.u.get(this).enqueue(type, fn);
     pureQueue.push(fn);
     if (type)
       this.f[type - 1].push(fn);
@@ -100,7 +100,7 @@ var Queue = class {
       this.run(EFFECT_USER);
     } finally {
       this.z = false;
-      unobserved.length && notifyUnobserved();
+      Unobserved.length && notifyUnobserved();
     }
   }
   addChild(child) {
@@ -113,8 +113,8 @@ var Queue = class {
       this.e.splice(index, 1);
   }
   notify(...args) {
-    if (ActiveTransition && ActiveTransition.w.has(this))
-      return ActiveTransition.w.get(this).notify(...args);
+    if (ActiveTransition && ActiveTransition.u.has(this))
+      return ActiveTransition.u.get(this).notify(...args);
     if (this.m)
       return this.m.notify(...args);
     return false;
@@ -123,7 +123,7 @@ var Queue = class {
     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);
+      const og = this.e.find((c) => c.g === queue.e[i].g);
       if (og)
         og.merge(queue.e[i]);
       else
@@ -143,12 +143,12 @@ function runQueue(queue, type) {
 }
 var Transition = class _Transition {
   a = /* @__PURE__ */ new Map();
-  t = /* @__PURE__ */ new Set();
-  Q = /* @__PURE__ */ new Set();
+  s = /* @__PURE__ */ new Set();
+  R = /* @__PURE__ */ new Set();
   W = /* @__PURE__ */ new Set();
   I = false;
   f = [[], []];
-  w = /* @__PURE__ */ new Map();
+  u = /* @__PURE__ */ new Map();
   E = [];
   e = [];
   m = null;
@@ -156,9 +156,9 @@ var Transition = class _Transition {
   X = false;
   created = clock;
   constructor() {
-    this.w.set(globalQueue, this);
+    this.u.set(globalQueue, this);
     for (const child of globalQueue.e) {
-      cloneQueue(child, this, this.w);
+      cloneQueue(child, this, this.u);
     }
   }
   enqueue(type, fn) {
@@ -211,9 +211,9 @@ var Transition = class _Transition {
     if (!(type & LOADING_BIT))
       return false;
     if (flags & LOADING_BIT) {
-      this.t.add(node);
+      this.s.add(node);
     } else {
-      this.t.delete(node);
+      this.s.delete(node);
     }
     return true;
   }
@@ -222,7 +222,7 @@ var Transition = class _Transition {
     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);
+      const og = this.e.find((c) => c.g === queue.e[i].g);
       if (og)
         og.merge(queue.e[i]);
       else
@@ -250,9 +250,9 @@ var Transition = class _Transition {
       const result = fn();
       const transition2 = ActiveTransition;
       if (result instanceof Promise) {
-        transition2.Q.add(result);
+        transition2.R.add(result);
         result.finally(() => {
-          transition2.Q.delete(result);
+          transition2.R.delete(result);
           finishTransition(transition2);
         });
       }
@@ -263,12 +263,12 @@ var Transition = class _Transition {
     }
   }
   addOptimistic(fn) {
-    if (fn.k && fn.k !== this) {
-      mergeTransitions(fn.k, this);
-      ActiveTransition = fn.k;
+    if (fn.l && fn.l !== this) {
+      mergeTransitions(fn.l, this);
+      ActiveTransition = fn.l;
       return;
     }
-    fn.k = this;
+    fn.l = this;
     this.W.add(fn);
   }
 };
@@ -277,51 +277,59 @@ function transition(fn) {
   queueMicrotask(() => t.runTransition(() => fn((fn2) => t.runTransition(fn2))));
 }
 function cloneGraph(node) {
-  if (node.k) {
-    if (node.k !== ActiveTransition) {
-      mergeTransitions(node.k, ActiveTransition);
-      ActiveTransition = node.k;
+  if (node.l) {
+    if (node.l !== ActiveTransition) {
+      mergeTransitions(node.l, ActiveTransition);
+      ActiveTransition = node.l;
     }
-    return node.k.a.get(node);
+    return node.l.a.get(node);
   }
   const clone = Object.create(Object.getPrototypeOf(node));
-  Object.assign(clone, node, { n: null, s: null, j: node });
+  Object.assign(clone, node, {
+    n: null,
+    r: null,
+    b: null,
+    a: node.a ? [...node.a] : null,
+    g: node
+  });
   ActiveTransition.a.set(node, clone);
-  node.k = ActiveTransition;
-  if (node.d) {
-    for (let i = 0, length = node.d.length; i < length; i++) {
-      const o = node.d[i];
-      node.d.push(cloneGraph(o));
+  node.l = ActiveTransition;
+  if (node.a) {
+    for (let i = 0; i < node.a.length; i++)
+      node.a[i].b.push(clone);
+  }
+  if (node.b) {
+    clone.b = [];
+    for (let i = 0, length = node.b.length; i < length; i++) {
+      !node.b[i].g && clone.b.push(cloneGraph(node.b[i]));
     }
   }
   return clone;
 }
-function removeSourceObservers(node, index) {
+function replaceSourceObservers(node, transition2) {
   let source;
+  let transitionSource;
   let swap;
-  for (let i = index; i < node.a.length; i++) {
-    source = ActiveTransition && ActiveTransition.a.get(node.a[i]) || node.a[i];
-    if (source.d) {
-      if ((swap = source.d.indexOf(node)) !== -1) {
-        source.d[swap] = source.d[source.d.length - 1];
-        source.d.pop();
-      }
-      if (!source.d.length)
-        unobserved.push(source);
+  for (let i = 0; i < node.a.length; i++) {
+    transitionSource = transition2.a.get(node.a[i]);
+    source = transitionSource || node.a[i];
+    if (source.b && (swap = source.b.indexOf(node)) !== -1) {
+      source.b[swap] = transitionSource ? node.g : source.b[source.b.length - 1];
+      !transitionSource && source.b.pop();
     }
   }
 }
 function cloneQueue(queue, parent, clonedQueues) {
   const clone = Object.create(Object.getPrototypeOf(queue));
   Object.assign(clone, queue, {
-    j: queue,
+    g: queue,
     m: parent,
     e: [],
     enqueue(type, fn) {
       ActiveTransition == null ? void 0 : ActiveTransition.enqueue(type, fn);
     },
     notify(node, type, flags) {
-      node = node.j || node;
+      node = node.g || node;
       if (!clone.F || type & LOADING_BIT) {
         type &= ~LOADING_BIT;
         ActiveTransition == null ? void 0 : ActiveTransition.notify(node, LOADING_BIT, flags);
@@ -339,7 +347,7 @@ function cloneQueue(queue, parent, clonedQueues) {
 }
 function resolveQueues(children) {
   for (const child of children) {
-    const og = child.j;
+    const og = child.g;
     if (og) {
       const clonedChildren = child.e;
       delete child.enqueue;
@@ -347,50 +355,50 @@ function resolveQueues(children) {
       delete child.m;
       delete child.e;
       Object.assign(og, child);
-      delete og.j;
+      delete og.g;
       resolveQueues(clonedChildren);
-    } else if (child.m.j) {
-      child.m.j.addChild(child);
+    } else if (child.m.g) {
+      child.m.g.addChild(child);
     }
   }
 }
 function mergeTransitions(t1, t2) {
   t2.a.forEach((value, key) => {
-    key.k = t1;
+    key.l = t1;
     t1.a.set(key, value);
   });
   t2.W.forEach((c) => {
-    c.k = t1;
+    c.l = t1;
     t1.W.add(c);
   });
-  t2.Q.forEach((p) => t1.Q.add(p));
-  t2.t.forEach((n) => t1.t.add(n));
+  t2.R.forEach((p) => t1.R.add(p));
+  t2.s.forEach((n) => t1.s.add(n));
   t1.merge(t2);
   t2.I = t1;
 }
 function finishTransition(transition2) {
-  if (transition2.I || transition2.X || transition2.Q.size || transition2.t.size)
+  if (transition2.I || transition2.X || transition2.R.size || transition2.s.size)
     return;
   for (const [source, clone] of transition2.a) {
-    if (source === clone || source.k !== transition2)
+    if (source === clone || source.l !== transition2)
       continue;
     if (clone.a)
-      removeSourceObservers(clone, 0);
+      replaceSourceObservers(clone, transition2);
     source.dispose(false);
     source.emptyDisposal();
     Object.assign(source, clone);
-    delete source.j;
-    delete source.k;
+    delete source.g;
+    delete source.l;
   }
   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;
+    delete reset.l;
     reset();
   }
+  globalQueue.flush();
 }
 
 // src/core/owner.ts
@@ -409,12 +417,12 @@ var Owner = class {
   // 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
   m = null;
-  s = null;
+  r = null;
   B = null;
-  b = STATE_CLEAN;
+  c = STATE_CLEAN;
   n = null;
-  x = defaultContext;
-  l = globalQueue;
+  w = defaultContext;
+  k = globalQueue;
   ea = 0;
   id = null;
   constructor(id = null, skipAppend = false) {
@@ -426,27 +434,27 @@ var Owner = class {
   append(child) {
     child.m = this;
     child.B = this;
-    if (this.s)
-      this.s.B = child;
-    child.s = this.s;
-    this.s = child;
+    if (this.r)
+      this.r.B = child;
+    child.r = this.r;
+    this.r = child;
     if (this.id != null && child.id == null)
       child.id = this.getNextChildId();
-    if (child.x !== this.x) {
-      child.x = { ...this.x, ...child.x };
+    if (child.w !== this.w) {
+      child.w = { ...this.w, ...child.w };
     }
-    if (this.l)
-      child.l = this.l;
+    if (this.k)
+      child.k = this.k;
   }
   dispose(self = true) {
-    if (this.b === STATE_DISPOSED)
+    if (this.c === STATE_DISPOSED)
       return;
-    let head = self ? this.B || this.m : this, current = this.s, next = null;
+    let head = self ? this.B || this.m : this, current = this.r, next = null;
     while (current && current.m === this) {
       current.dispose(true);
       current.J();
-      next = current.s;
-      current.s = null;
+      next = current.r;
+      current.r = null;
       current = next;
     }
     this.ea = 0;
@@ -455,15 +463,15 @@ var Owner = class {
     if (current)
       current.B = !self ? this : this.B;
     if (head)
-      head.s = current;
+      head.r = current;
   }
   J() {
     if (this.B)
-      this.B.s = null;
+      this.B.r = null;
     this.m = null;
     this.B = null;
-    this.x = defaultContext;
-    this.b = STATE_DISPOSED;
+    this.w = defaultContext;
+    this.c = STATE_DISPOSED;
     this.emptyDisposal();
   }
   emptyDisposal() {
@@ -492,7 +500,7 @@ function getContext(context, owner = currentOwner) {
   if (!owner) {
     throw new NoOwnerError();
   }
-  const value = hasContext(context, owner) ? owner.x[context.id] : context.defaultValue;
+  const value = hasContext(context, owner) ? owner.w[context.id] : context.defaultValue;
   if (isUndefined(value)) {
     throw new ContextNotFoundError();
   }
@@ -502,13 +510,13 @@ function setContext(context, value, owner = currentOwner) {
   if (!owner) {
     throw new NoOwnerError();
   }
-  owner.x = {
-    ...owner.x,
+  owner.w = {
+    ...owner.w,
     [context.id]: isUndefined(value) ? context.defaultValue : value
   };
 }
 function hasContext(context, owner = currentOwner) {
-  return !isUndefined(owner == null ? void 0 : owner.x[context.id]);
+  return !isUndefined(owner == null ? void 0 : owner.w[context.id]);
 }
 function onCleanup(fn) {
   if (!currentOwner)
@@ -546,10 +554,10 @@ function getObserver() {
 var UNCHANGED = Symbol(0);
 var Computation = class extends Owner {
   a = null;
-  d = null;
-  i;
-  R;
+  b = null;
+  j;
   K;
+  L;
   // Used in __DEV__ mode, hopefully removed in production
   ka;
   // Using false is an optimization as an alternative to _equals: () => false
@@ -561,16 +569,16 @@ var Computation = class extends Owner {
   h = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
   aa = DEFAULT_FLAGS;
-  L = -1;
+  M = -1;
   G = false;
-  k;
-  j;
+  l;
+  g;
   constructor(initialValue, compute2, options) {
     super(options == null ? void 0 : options.id, compute2 === null);
-    this.K = compute2;
-    this.b = compute2 ? STATE_DIRTY : STATE_CLEAN;
+    this.L = compute2;
+    this.c = compute2 ? STATE_DIRTY : STATE_CLEAN;
     this.h = compute2 && initialValue === void 0 ? UNINITIALIZED_BIT : 0;
-    this.i = initialValue;
+    this.j = initialValue;
     if ((options == null ? void 0 : options.equals) !== void 0)
       this.$ = options.equals;
     if (options == null ? void 0 : options.pureWrite)
@@ -578,7 +586,7 @@ var Computation = class extends Owner {
     if (options == null ? void 0 : options.unobserved)
       this.da = options == null ? void 0 : options.unobserved;
     if (ActiveTransition) {
-      this.k = ActiveTransition;
+      this.l = ActiveTransition;
       ActiveTransition.a.set(this, this);
     }
   }
@@ -586,9 +594,9 @@ var Computation = class extends Owner {
     track(this);
     newFlags |= this.h & ~currentMask;
     if (this.h & ERROR_BIT) {
-      throw this.R;
+      throw this.K;
     } else {
-      return this.i;
+      return this.j;
     }
   }
   /**
@@ -596,13 +604,13 @@ var Computation = class extends Owner {
    * Automatically re-executes the surrounding computation when the value changes
    */
   read() {
-    if (ActiveTransition && ActiveTransition.a.has(this)) {
-      const clone = ActiveTransition.a.get(this);
+    if (ActiveTransition && (ActiveTransition.a.has(this) || !this.g && this.h & UNINITIALIZED_BIT)) {
+      const clone = ActiveTransition.a.get(this) || cloneGraph(this);
       if (clone !== this)
         return clone.read();
     }
-    if (this.K) {
-      if (this.h & ERROR_BIT && this.L <= clock)
+    if (this.L) {
+      if (this.h & ERROR_BIT && this.M <= clock)
         update(this);
       else
         this.H();
@@ -617,13 +625,13 @@ var Computation = class extends Owner {
    * before continuing
    */
   wait() {
-    if (ActiveTransition && ActiveTransition.a.has(this)) {
-      const clone = ActiveTransition.a.get(this);
+    if (ActiveTransition && (ActiveTransition.a.has(this) || !this.g && this.h & UNINITIALIZED_BIT)) {
+      const clone = ActiveTransition.a.get(this) || cloneGraph(this);
       if (clone !== this)
         return clone.wait();
     }
-    if (this.K) {
-      if (this.h & ERROR_BIT && this.L <= clock)
+    if (this.L) {
+      if (this.h & ERROR_BIT && this.M <= clock)
         update(this);
       else
         this.H();
@@ -633,54 +641,49 @@ var Computation = class extends Owner {
       throw new NotReadyError();
     }
     if (staleCheck && this.h & LOADING_BIT) {
-      staleCheck.i = true;
+      staleCheck.j = true;
     }
     return this.fa();
   }
   /** Update the computation with a new value. */
   write(value, flags = 0, raw = false) {
-    if (ActiveTransition && !this.j) {
+    if (ActiveTransition && !this.g) {
       const clone = cloneGraph(this);
       if (clone !== this)
         return clone.write(value, flags, raw);
     }
-    const newValue = !raw && typeof value === "function" ? value(this.i) : value;
+    const newValue = !raw && typeof value === "function" ? value(this.j) : value;
     const valueChanged = newValue !== UNCHANGED && (!!(this.h & UNINITIALIZED_BIT) || // this._stateFlags & LOADING_BIT & ~flags ||
-    this.$ === false || !this.$(this.i, newValue));
+    this.$ === false || !this.$(this.j, newValue));
     if (valueChanged) {
-      this.i = newValue;
-      this.R = void 0;
+      this.j = newValue;
+      this.K = void 0;
     }
     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++) {
+    this.M = clock + 1;
+    if (this.b) {
+      for (let i = 0; i < this.b.length; i++) {
         if (valueChanged) {
-          this.d[i].o(STATE_DIRTY);
+          this.b[i].x(STATE_DIRTY);
         } else if (changedFlagsMask) {
-          this.d[i].Y(changedFlagsMask, changedFlags);
+          this.b[i].Y(changedFlagsMask, changedFlags);
         }
       }
     }
-    return this.i;
+    return this.j;
   }
   /**
    * Set the current node's state, and recursively mark all of this node's observers as STATE_CHECK
    */
-  o(state, skipQueue) {
-    if (ActiveTransition && ActiveTransition.a.has(this)) {
-      const clone = ActiveTransition.a.get(this);
-      if (clone !== this)
-        return clone.o(state, skipQueue);
-    }
-    if (this.b >= state && !this.G)
+  x(state, skipQueue) {
+    if (this.c >= state && !this.G)
       return;
     this.G = !!skipQueue;
-    this.b = state;
-    if (this.d) {
-      for (let i = 0; i < this.d.length; i++) {
-        this.d[i].o(STATE_CHECK, skipQueue);
+    this.c = state;
+    if (this.b) {
+      for (let i = 0; i < this.b.length; i++) {
+        this.b[i].x(STATE_CHECK, skipQueue);
       }
     }
   }
@@ -691,34 +694,34 @@ var Computation = class extends Owner {
    * @param newFlags The source's new flags, masked to just the changed ones.
    */
   Y(mask, newFlags2) {
-    if (this.b >= STATE_DIRTY)
+    if (this.c >= STATE_DIRTY)
       return;
     if (mask & this.aa) {
-      this.o(STATE_DIRTY);
+      this.x(STATE_DIRTY);
       return;
     }
-    if (this.b >= STATE_CHECK)
+    if (this.c >= STATE_CHECK)
       return;
     const prevFlags = this.h & mask;
     const deltaFlags = prevFlags ^ newFlags2;
     if (newFlags2 === prevFlags) ; else if (deltaFlags & prevFlags & mask) {
-      this.o(STATE_CHECK);
+      this.x(STATE_CHECK);
     } else {
       this.h ^= deltaFlags;
-      if (this.d) {
-        for (let i = 0; i < this.d.length; i++) {
-          this.d[i].Y(mask, newFlags2);
+      if (this.b) {
+        for (let i = 0; i < this.b.length; i++) {
+          this.b[i].Y(mask, newFlags2);
         }
       }
     }
   }
-  M(error) {
-    if (ActiveTransition && !this.j) {
+  N(error) {
+    if (ActiveTransition && !this.g) {
       const clone = cloneGraph(this);
       if (clone !== this)
-        return clone.M(error);
+        return clone.N(error);
     }
-    this.R = error;
+    this.K = error;
     this.write(UNCHANGED, this.h & ~LOADING_BIT | ERROR_BIT | UNINITIALIZED_BIT);
   }
   /**
@@ -729,38 +732,38 @@ var Computation = class extends Owner {
    * This function will ensure that the value and states we read from the computation are up to date
    */
   H() {
-    if (!this.K) {
+    if (!this.L) {
       return;
     }
-    if (this.b === STATE_DISPOSED) {
+    if (this.c === STATE_DISPOSED) {
       return;
     }
-    if (this.b === STATE_CLEAN) {
+    if (this.c === STATE_CLEAN) {
       return;
     }
     let observerFlags = 0;
-    if (this.b === STATE_CHECK) {
+    if (this.c === STATE_CHECK) {
       for (let i = 0; i < this.a.length; i++) {
         const source = ActiveTransition && ActiveTransition.a.get(this.a[i]) || this.a[i];
         source.H();
-        observerFlags |= source.h;
-        if (this.b === STATE_DIRTY) {
+        observerFlags |= source.h & ~UNINITIALIZED_BIT;
+        if (this.c === STATE_DIRTY) {
           break;
         }
       }
     }
-    if (this.b === STATE_DIRTY) {
+    if (this.c === STATE_DIRTY) {
       update(this);
     } else {
       this.write(UNCHANGED, observerFlags);
-      this.b = STATE_CLEAN;
+      this.c = STATE_CLEAN;
     }
   }
   /**
    * Remove ourselves from the owner graph and the computation graph
    */
   J() {
-    if (this.b === STATE_DISPOSED)
+    if (this.c === STATE_DISPOSED)
       return;
     if (this.a)
       removeSourceObservers(this, 0);
@@ -768,8 +771,8 @@ var Computation = class extends Owner {
   }
 };
 function track(computation) {
-  if (ActiveTransition && computation.j)
-    computation = computation.j;
+  if (ActiveTransition && computation.g)
+    computation = computation.g;
   if (currentObserver) {
     if (!newSources && currentObserver.a && currentObserver.a[newSourcesIndex] === computation) {
       newSourcesIndex++;
@@ -779,7 +782,7 @@ function track(computation) {
       newSources.push(computation);
     }
     if (updateCheck) {
-      updateCheck.i = computation.L > currentObserver.L;
+      updateCheck.j = computation.M > currentObserver.M;
     }
   }
 }
@@ -791,13 +794,13 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.K, node);
+    const result = compute(node, node.L, node);
     node.write(result, newFlags, true);
   } catch (error) {
     if (error instanceof NotReadyError) {
       node.write(UNCHANGED, newFlags | LOADING_BIT | node.h & UNINITIALIZED_BIT);
     } else {
-      node.M(error);
+      node.N(error);
     }
   } finally {
     if (newSources) {
@@ -813,11 +816,11 @@ function update(node) {
       }
       let source;
       for (let i = newSourcesIndex; i < node.a.length; i++) {
-        source = node.a[i];
-        if (!source.d)
-          source.d = [node];
+        source = ActiveTransition && ActiveTransition.a.get(node.a[i]) || node.a[i];
+        if (!source.b)
+          source.b = [node];
         else
-          source.d.push(node);
+          source.b.push(node);
       }
     } else if (node.a && newSourcesIndex < node.a.length) {
       removeSourceObservers(node, newSourcesIndex);
@@ -826,8 +829,23 @@ function update(node) {
     newSources = prevSources;
     newSourcesIndex = prevSourcesIndex;
     newFlags = prevFlags;
-    node.L = clock + 1;
-    node.b = STATE_CLEAN;
+    node.M = clock + 1;
+    node.c = STATE_CLEAN;
+  }
+}
+function removeSourceObservers(node, index) {
+  let source;
+  let swap;
+  for (let i = index; i < node.a.length; i++) {
+    source = ActiveTransition && ActiveTransition.a.get(node.a[i]) || node.a[i];
+    if (source.b) {
+      if ((swap = source.b.indexOf(node)) !== -1) {
+        source.b[swap] = source.b[source.b.length - 1];
+        source.b.pop();
+      }
+      if (!source.b.length)
+        Unobserved.push(source);
+    }
   }
 }
 function isEqual(a, b) {
@@ -840,20 +858,20 @@ function untrack(fn) {
 }
 function hasUpdated(fn) {
   const current = updateCheck;
-  updateCheck = { i: false };
+  updateCheck = { j: false };
   try {
     fn();
-    return updateCheck.i;
+    return updateCheck.j;
   } finally {
     updateCheck = current;
   }
 }
 function pendingCheck(fn, loadingValue) {
   const current = staleCheck;
-  staleCheck = { i: false };
+  staleCheck = { j: false };
   try {
     latest(fn);
-    return staleCheck.i;
+    return staleCheck.j;
   } catch (err) {
     if (!(err instanceof NotReadyError))
       return false;
@@ -901,7 +919,7 @@ function runWithObserver(observer, run) {
         newFlags | LOADING_BIT | observer.h & UNINITIALIZED_BIT
       );
     } else {
-      observer.M(error);
+      observer.N(error);
     }
   } finally {
     if (newSources) {
@@ -916,10 +934,10 @@ function runWithObserver(observer, run) {
       let source;
       for (let i = newSourcesIndex; i < observer.a.length; i++) {
         source = observer.a[i];
-        if (!source.d)
-          source.d = [observer];
+        if (!source.b)
+          source.b = [observer];
         else
-          source.d.push(observer);
+          source.b.push(observer);
       }
     }
     newSources = prevSources;
@@ -933,7 +951,7 @@ function compute(owner, fn, observer) {
   currentMask = (observer == null ? void 0 : observer.aa) ?? DEFAULT_FLAGS;
   notStale = true;
   try {
-    return fn(observer ? observer.i : void 0);
+    return fn.call(observer, observer ? observer.j : void 0);
   } finally {
     setOwner(prevOwner);
     currentObserver = prevObserver;
@@ -946,7 +964,7 @@ function compute(owner, fn, observer) {
 var Effect = class extends Computation {
   ba;
   Z;
-  N;
+  O;
   ca = false;
   _;
   A;
@@ -957,92 +975,93 @@ var Effect = class extends Computation {
     this._ = initialValue;
     this.A = (options == null ? void 0 : 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.L = function(p) {
+        return !this.g && clock > this.k.created && !(this.h & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
+      };
     }
     this.H();
-    !(options == null ? void 0 : options.defer) && (this.A === EFFECT_USER ? this.l.enqueue(this.A, this.C.bind(this)) : this.C(this.A));
+    !(options == null ? void 0 : options.defer) && (this.A === EFFECT_USER ? this.k.enqueue(this.A, this.C.bind(this)) : this.C(this.A));
   }
   write(value, flags = 0) {
-    if (this.b == STATE_DIRTY) {
+    if (this.c == STATE_DIRTY) {
       this.h = flags;
       if (this.A === EFFECT_RENDER) {
-        this.l.notify(this, LOADING_BIT | ERROR_BIT, flags);
+        this.k.notify(this, LOADING_BIT | ERROR_BIT, this.h);
       }
     }
     if (value === UNCHANGED)
-      return this.i;
-    this.i = value;
+      return this.j;
+    this.j = value;
     this.ca = true;
+    this.K = void 0;
     return value;
   }
-  o(state, skipQueue) {
-    if (ActiveTransition && ActiveTransition.a.has(this)) {
-      return ActiveTransition.a.get(this).o(state, skipQueue);
-    }
-    if (this.b >= state || skipQueue)
+  x(state, skipQueue) {
+    if (this.c >= state || skipQueue)
       return;
-    if (this.b === STATE_CLEAN)
-      this.l.enqueue(this.A, this.C.bind(this));
-    this.b = state;
+    if (this.c === STATE_CLEAN)
+      this.k.enqueue(this.A, this.C.bind(this));
+    this.c = state;
   }
   Y(mask, newFlags2) {
-    if (ActiveTransition && ActiveTransition.a.has(this)) {
-      if (this.b >= STATE_CHECK)
+    if (this.g) {
+      if (this.c >= STATE_DIRTY)
         return;
       if (mask & 3) {
-        this.o(STATE_DIRTY);
+        this.x(STATE_DIRTY);
         return;
       }
     }
     super.Y(mask, newFlags2);
   }
-  M(error) {
-    this.R = error;
-    this.l.notify(this, LOADING_BIT, 0);
+  N(error) {
+    this.K = error;
+    this.k.notify(this, LOADING_BIT, 0);
     this.h = ERROR_BIT;
     if (this.A === EFFECT_USER) {
       try {
         return this.Z ? this.Z(error, () => {
           var _a;
-          (_a = this.N) == null ? void 0 : _a.call(this);
-          this.N = void 0;
+          (_a = this.O) == null ? void 0 : _a.call(this);
+          this.O = void 0;
         }) : console.error(error);
       } catch (e) {
         error = e;
       }
     }
-    if (!this.l.notify(this, ERROR_BIT, ERROR_BIT))
+    if (!this.k.notify(this, ERROR_BIT, ERROR_BIT))
       throw error;
   }
   J() {
     var _a;
-    if (this.b === STATE_DISPOSED)
+    if (this.c === STATE_DISPOSED)
       return;
     this.ba = void 0;
     this._ = void 0;
     this.Z = void 0;
-    (_a = this.N) == null ? void 0 : _a.call(this);
-    this.N = void 0;
+    (_a = this.O) == null ? void 0 : _a.call(this);
+    this.O = void 0;
+    this.k.notify(this, ERROR_BIT | LOADING_BIT, 0);
     super.J();
   }
   C(type) {
     var _a;
     if (type) {
-      const effect = this.j || this;
-      if (effect.ca && effect.b !== STATE_DISPOSED) {
-        (_a = effect.N) == null ? void 0 : _a.call(effect);
+      const effect = this.g || this;
+      if (effect.ca && effect.c !== STATE_DISPOSED) {
+        (_a = effect.O) == null ? void 0 : _a.call(effect);
         try {
-          effect.N = effect.ba(effect.i, effect._);
+          effect.O = effect.ba(effect.j, effect._);
         } catch (e) {
-          if (!effect.l.notify(effect, ERROR_BIT, ERROR_BIT))
+          if (!effect.k.notify(effect, ERROR_BIT, ERROR_BIT))
             throw e;
         } finally {
-          effect._ = effect.i;
+          effect._ = effect.j;
           effect.ca = false;
         }
       }
     } else
-      this.b !== STATE_CLEAN && runTop(this);
+      this.c !== STATE_CLEAN && runTop(this);
   }
 };
 var EagerComputation = class extends Computation {
@@ -1050,18 +1069,15 @@ var EagerComputation = class extends Computation {
     super(initialValue, compute2, options);
     !(options == null ? void 0 : options.defer) && this.H();
   }
-  o(state, skipQueue) {
-    if (ActiveTransition && ActiveTransition.a.has(this)) {
-      return ActiveTransition.a.get(this).o(state, skipQueue);
-    }
-    if (this.b >= state && !this.G)
+  x(state, skipQueue) {
+    if (this.c >= state && !this.G)
       return;
-    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);
+    if (!skipQueue && (this.c === STATE_CLEAN || this.c === STATE_CHECK && this.G))
+      this.k.enqueue(EFFECT_PURE, this.C.bind(this));
+    super.x(state, skipQueue);
   }
   C() {
-    this.b !== STATE_CLEAN && runTop(this);
+    this.c !== STATE_CLEAN && runTop(this);
   }
 };
 var FirewallComputation = class extends Computation {
@@ -1069,30 +1085,27 @@ var FirewallComputation = class extends Computation {
   constructor(compute2) {
     super(void 0, compute2);
   }
-  o(state, skipQueue) {
-    if (ActiveTransition && ActiveTransition.a.has(this)) {
-      return ActiveTransition.a.get(this).o(state, skipQueue);
-    }
-    if (this.b >= state && !this.G)
+  x(state, skipQueue) {
+    if (this.c >= state && !this.G)
       return;
-    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);
+    if (!skipQueue && (this.c === STATE_CLEAN || this.c === STATE_CHECK && this.G))
+      this.k.enqueue(EFFECT_PURE, this.C.bind(this));
+    super.x(state, true);
     this.G = !!skipQueue;
   }
   C() {
-    this.b !== STATE_CLEAN && runTop(this);
+    this.c !== STATE_CLEAN && runTop(this);
   }
 };
 function runTop(node) {
   const ancestors = [];
   for (let current = node; current !== null; current = current.m) {
-    if (current.b !== STATE_CLEAN) {
+    if (current.c !== STATE_CLEAN) {
       ancestors.push(current);
     }
   }
   for (let i = ancestors.length - 1; i >= 0; i--) {
-    if (ancestors[i].b !== STATE_DISPOSED)
+    if (ancestors[i].c !== STATE_DISPOSED)
       ancestors[i].H();
   }
 }
@@ -1228,7 +1241,7 @@ var storeTraps = {
         return desc.get.call(receiver);
     }
     if (Writing == null ? void 0 : Writing.has(receiver)) {
-      let value2 = tracked && (overridden || !proxySource) ? tracked.i : storeValue[property];
+      let value2 = tracked && (overridden || !proxySource) ? tracked.j : storeValue[property];
       value2 === $DELETED && (value2 = void 0);
       if (!isWrappable(value2))
         return value2;
@@ -1525,6 +1538,8 @@ function applyState(next, state, keyFn, all) {
 }
 function reconcile(value, key, all = false) {
   return (state) => {
+    if (state == null)
+      throw new Error("Cannot reconcile null or undefined state");
     const keyFn = typeof key === "string" ? (item) => item[key] : key;
     const eq = keyFn(state);
     if (eq !== void 0 && keyFn(value) !== keyFn(state))
@@ -1766,12 +1781,12 @@ function createMemo(compute2, value, options) {
   return () => {
     var _a, _b;
     if (node) {
-      if (node.b === STATE_DISPOSED) {
+      if (node.c === STATE_DISPOSED) {
         node = void 0;
         return resolvedValue;
       }
       resolvedValue = node.wait();
-      if (!((_a = node.a) == null ? void 0 : _a.length) && ((_b = node.s) == null ? void 0 : _b.m) !== node) {
+      if (!((_a = node.a) == null ? void 0 : _a.length) && ((_b = node.r) == null ? void 0 : _b.m) !== node && !(node.h & UNINITIALIZED_BIT)) {
         node.dispose();
         node = void 0;
       }
@@ -1807,8 +1822,8 @@ function createAsync(compute2, value, options) {
             if (abort)
               return;
             if (transition2)
-              return transition2.runTransition(() => node.M(error), true);
-            node.M(error);
+              return transition2.runTransition(() => node.N(error), true);
+            node.N(error);
           }
         );
       } else {
@@ -1832,9 +1847,13 @@ function createAsync(compute2, value, options) {
   );
   const read = node.wait.bind(node);
   read.refresh = () => {
-    node.b = STATE_DIRTY;
+    let n = node;
+    if (ActiveTransition && !node.g) {
+      n = cloneGraph(node);
+    }
+    n.c = STATE_DIRTY;
     refreshing = true;
-    node.H();
+    n.H();
   };
   return read;
 }
@@ -1915,7 +1934,7 @@ function createOptimistic(initial, compute2, key) {
       (s) => {
         const value = initial();
         if (!ActiveTransition)
-          s.value = value;
+          reconcile({ value }, key)(s);
       },
       { value: void 0 }
     );
@@ -1923,9 +1942,9 @@ function createOptimistic(initial, compute2, key) {
     [store, setStore] = createStore({ value: initial });
   const reset = () => setStore(
     (s) => reconcile(
-      typeof initial === "function" ? initial() : initial,
+      { value: typeof initial === "function" ? initial() : initial },
       key
-    )(s.value)
+    )(s)
   );
   let lastChange = void 0;
   function write(v) {
@@ -1947,15 +1966,15 @@ function mapArray(list, map, options) {
   const keyFn = typeof (options == null ? void 0 : options.keyed) === "function" ? options.keyed : void 0;
   return updateKeyedMap.bind({
     S: new Owner(),
-    p: 0,
+    o: 0,
     ha: list,
     D: [],
-    O: map,
-    g: [],
-    c: [],
-    P: keyFn,
-    q: keyFn || (options == null ? void 0 : options.keyed) === false ? [] : void 0,
-    r: map.length > 1 ? [] : void 0,
+    P: map,
+    i: [],
+    d: [],
+    Q: keyFn,
+    p: keyFn || (options == null ? void 0 : options.keyed) === false ? [] : void 0,
+    q: map.length > 1 ? [] : void 0,
     T: options == null ? void 0 : options.fallback
   });
 }
@@ -1964,113 +1983,113 @@ function updateKeyedMap() {
   const newItems = this.ha() || [], newLen = newItems.length;
   newItems[$TRACK];
   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
+    let i, j, mapper = this.p ? () => {
+      this.p[j] = new Computation(newItems[j], null, pureOptions);
+      this.q && (this.q[j] = new Computation(j, null, pureOptions));
+      return this.P(
+        Computation.prototype.read.bind(this.p[j]),
+        this.q ? Computation.prototype.read.bind(this.q[j]) : void 0
       );
-    } : this.r ? () => {
+    } : this.q ? () => {
       const item = newItems[j];
-      this.r[j] = new Computation(j, null, pureOptions);
-      return this.O(() => item, Computation.prototype.read.bind(this.r[j]));
+      this.q[j] = new Computation(j, null, pureOptions);
+      return this.P(() => item, Computation.prototype.read.bind(this.q[j]));
     } : () => {
       const item = newItems[j];
-      return this.O(() => item);
+      return this.P(() => item);
     };
     if (newLen === 0) {
-      if (this.p !== 0) {
+      if (this.o !== 0) {
         this.S.dispose(false);
-        this.c = [];
+        this.d = [];
         this.D = [];
-        this.g = [];
-        this.p = 0;
+        this.i = [];
+        this.o = 0;
+        this.p && (this.p = []);
         this.q && (this.q = []);
-        this.r && (this.r = []);
       }
-      if (this.T && !this.g[0]) {
-        this.g[0] = compute(
-          this.c[0] = new Owner(),
+      if (this.T && !this.i[0]) {
+        this.i[0] = compute(
+          this.d[0] = new Owner(),
           this.T,
           null
         );
       }
-    } else if (this.p === 0) {
-      if (this.c[0])
-        this.c[0].dispose();
-      this.g = new Array(newLen);
+    } else if (this.o === 0) {
+      if (this.d[0])
+        this.d[0].dispose();
+      this.i = new Array(newLen);
       for (j = 0; j < newLen; j++) {
         this.D[j] = newItems[j];
-        this.g[j] = compute(this.c[j] = new Owner(), mapper, null);
+        this.i[j] = compute(this.d[j] = new Owner(), mapper, null);
       }
-      this.p = newLen;
+      this.o = newLen;
     } else {
-      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]);
+      let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.p ? new Array(newLen) : void 0, tempIndexes = this.q ? new Array(newLen) : void 0;
+      for (start = 0, end = Math.min(this.o, newLen); start < end && (this.D[start] === newItems[start] || this.p && compare(this.Q, this.D[start], newItems[start])); start++) {
+        if (this.p)
+          this.p[start].write(newItems[start]);
       }
-      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.q[end]);
-        tempIndexes && (tempIndexes[newEnd] = this.r[end]);
+      for (end = this.o - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.D[end] === newItems[newEnd] || this.p && compare(this.Q, this.D[end], newItems[newEnd])); end--, newEnd--) {
+        temp[newEnd] = this.i[end];
+        tempNodes[newEnd] = this.d[end];
+        tempRows && (tempRows[newEnd] = this.p[end]);
+        tempIndexes && (tempIndexes[newEnd] = this.q[end]);
       }
       newIndices = /* @__PURE__ */ new Map();
       newIndicesNext = new Array(newEnd + 1);
       for (j = newEnd; j >= start; j--) {
         item = newItems[j];
-        key = this.P ? this.P(item) : item;
+        key = this.Q ? this.Q(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.D[i];
-        key = this.P ? this.P(item) : item;
+        key = this.Q ? this.Q(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
-          temp[j] = this.g[i];
-          tempNodes[j] = this.c[i];
-          tempRows && (tempRows[j] = this.q[i]);
-          tempIndexes && (tempIndexes[j] = this.r[i]);
+          temp[j] = this.i[i];
+          tempNodes[j] = this.d[i];
+          tempRows && (tempRows[j] = this.p[i]);
+          tempIndexes && (tempIndexes[j] = this.q[i]);
           j = newIndicesNext[j];
           newIndices.set(key, j);
         } else
-          this.c[i].dispose();
+          this.d[i].dispose();
       }
       for (j = start; j < newLen; j++) {
         if (j in temp) {
-          this.g[j] = temp[j];
-          this.c[j] = tempNodes[j];
+          this.i[j] = temp[j];
+          this.d[j] = tempNodes[j];
           if (tempRows) {
-            this.q[j] = tempRows[j];
-            this.q[j].write(newItems[j]);
+            this.p[j] = tempRows[j];
+            this.p[j].write(newItems[j]);
           }
           if (tempIndexes) {
-            this.r[j] = tempIndexes[j];
-            this.r[j].write(j);
+            this.q[j] = tempIndexes[j];
+            this.q[j].write(j);
           }
         } else {
-          this.g[j] = compute(this.c[j] = new Owner(), mapper, null);
+          this.i[j] = compute(this.d[j] = new Owner(), mapper, null);
         }
       }
-      this.g = this.g.slice(0, this.p = newLen);
+      this.i = this.i.slice(0, this.o = newLen);
       this.D = newItems.slice(0);
     }
   });
-  return this.g;
+  return this.i;
 }
 function repeat(count, map, options) {
   return updateRepeat.bind({
     S: new Owner(),
-    p: 0,
+    o: 0,
     y: 0,
     ia: count,
-    O: map,
-    c: [],
-    g: [],
+    P: map,
+    d: [],
+    i: [],
     ja: options == null ? void 0 : options.from,
     T: options == null ? void 0 : options.fallback
   });
@@ -2081,15 +2100,15 @@ function updateRepeat() {
   const from = ((_a = this.ja) == null ? void 0 : _a.call(this)) || 0;
   runWithOwner(this.S, () => {
     if (newLen === 0) {
-      if (this.p !== 0) {
+      if (this.o !== 0) {
         this.S.dispose(false);
-        this.c = [];
-        this.g = [];
-        this.p = 0;
+        this.d = [];
+        this.i = [];
+        this.o = 0;
       }
-      if (this.T && !this.g[0]) {
-        this.g[0] = compute(
-          this.c[0] = new Owner(),
+      if (this.T && !this.i[0]) {
+        this.i[0] = compute(
+          this.d[0] = new Owner(),
           this.T,
           null
         );
@@ -2097,46 +2116,46 @@ function updateRepeat() {
       return;
     }
     const to = from + newLen;
-    const prevTo = this.y + this.p;
-    if (this.p === 0 && this.c[0])
-      this.c[0].dispose();
+    const prevTo = this.y + this.o;
+    if (this.o === 0 && this.d[0])
+      this.d[0].dispose();
     for (let i = to; i < prevTo; i++)
-      this.c[i - this.y].dispose();
+      this.d[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.y);
-      this.g.splice(0, from - this.y);
+      while (i < from && i < this.o)
+        this.d[i++].dispose();
+      this.d.splice(0, from - this.y);
+      this.i.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;
+      this.d.length = this.i.length = newLen;
       while (i >= difference) {
-        this.c[i] = this.c[i - difference];
-        this.g[i] = this.g[i - difference];
+        this.d[i] = this.d[i - difference];
+        this.i[i] = this.i[i - difference];
         i--;
       }
       for (let i2 = 0; i2 < difference; i2++) {
-        this.g[i2] = compute(
-          this.c[i2] = new Owner(),
-          () => this.O(i2 + from),
+        this.i[i2] = compute(
+          this.d[i2] = new Owner(),
+          () => this.P(i2 + from),
           null
         );
       }
     }
     for (let i = prevTo; i < to; i++) {
-      this.g[i - from] = compute(
-        this.c[i - from] = new Owner(),
-        () => this.O(i),
+      this.i[i - from] = compute(
+        this.d[i - from] = new Owner(),
+        () => this.P(i),
         null
       );
     }
-    this.g = this.g.slice(0, newLen);
+    this.i = this.i.slice(0, newLen);
     this.y = from;
-    this.p = newLen;
+    this.o = newLen;
   });
-  return this.g;
+  return this.i;
 }
 function compare(key, a, b) {
   return key ? key(a) === key(b) : true;
@@ -2154,14 +2173,14 @@ var BoundaryComputation = class extends EagerComputation {
     if (this.U & LOADING_BIT && !(this.h & UNINITIALIZED_BIT)) {
       flags &= ~LOADING_BIT;
     }
-    this.l.notify(this, this.U, flags);
-    return this.i;
+    this.k.notify(this, this.U, flags);
+    return this.j;
   }
 };
 function createBoundChildren(owner, fn, queue, mask) {
-  const parentQueue = owner.l;
-  parentQueue.addChild(owner.l = queue);
-  onCleanup(() => parentQueue.removeChild(owner.l));
+  const parentQueue = owner.k;
+  parentQueue.addChild(owner.k = queue);
+  onCleanup(() => parentQueue.removeChild(owner.k));
   return compute(
     owner,
     () => {
@@ -2172,27 +2191,27 @@ function createBoundChildren(owner, fn, queue, mask) {
   );
 }
 var ConditionalQueue = class extends Queue {
-  u;
+  t;
   V = /* @__PURE__ */ new Set();
-  t = /* @__PURE__ */ new Set();
+  s = /* @__PURE__ */ new Set();
   constructor(disabled) {
     super();
-    this.u = disabled;
+    this.t = disabled;
   }
   run(type) {
-    if (!type || this.u.read())
+    if (!type || this.t.read())
       return;
     return super.run(type);
   }
   notify(node, type, flags) {
-    if (ActiveTransition && ActiveTransition.w.has(this))
-      return ActiveTransition.w.get(this).notify(node, type, flags);
-    if (this.u.read()) {
+    if (ActiveTransition && ActiveTransition.u.has(this))
+      return ActiveTransition.u.get(this).notify(node, type, flags);
+    if (this.t.read()) {
       if (type & LOADING_BIT) {
         if (flags & LOADING_BIT) {
-          this.t.add(node);
+          this.s.add(node);
           type &= ~LOADING_BIT;
-        } else if (this.t.delete(node))
+        } else if (this.s.delete(node))
           type &= ~LOADING_BIT;
       }
       if (type & ERROR_BIT) {
@@ -2206,43 +2225,43 @@ var ConditionalQueue = class extends Queue {
     return type ? super.notify(node, type, flags) : true;
   }
   merge(queue) {
-    queue.t.forEach((n) => this.notify(n, LOADING_BIT, LOADING_BIT));
+    queue.s.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 {
   F;
-  c = /* @__PURE__ */ new Set();
-  u = new Computation(false, null, { pureWrite: true });
+  d = /* @__PURE__ */ new Set();
+  t = new Computation(false, null, { pureWrite: true });
   constructor(type) {
     super();
     this.F = type;
   }
   run(type) {
-    if (!type || this.u.read())
+    if (!type || this.t.read())
       return;
     return super.run(type);
   }
   notify(node, type, flags) {
-    if (ActiveTransition && ActiveTransition.w.has(this))
-      return ActiveTransition.w.get(this).notify(node, type, flags);
+    if (ActiveTransition && ActiveTransition.u.has(this))
+      return ActiveTransition.u.get(this).notify(node, type, flags);
     if (!(type & this.F))
       return super.notify(node, type, flags);
     if (flags & this.F) {
-      this.c.add(node);
-      if (this.c.size === 1)
-        this.u.write(true);
+      this.d.add(node);
+      if (this.d.size === 1)
+        this.t.write(true);
     } else {
-      this.c.delete(node);
-      if (this.c.size === 0)
-        this.u.write(false);
+      this.d.delete(node);
+      if (this.d.size === 0)
+        this.t.write(false);
     }
     type &= ~this.F;
     return type ? super.notify(node, type, flags) : true;
   }
   merge(queue) {
-    queue.c.forEach((n) => this.notify(n, this.F, this.F));
+    queue.d.forEach((n) => this.notify(n, this.F, this.F));
     super.merge(queue);
   }
 };
@@ -2253,25 +2272,25 @@ function createBoundary(fn, condition) {
   );
   const tree = createBoundChildren(owner, fn, queue, 0);
   new EagerComputation(void 0, () => {
-    const disabled = queue.u.read();
+    const disabled = queue.t.read();
     tree.U = disabled ? ERROR_BIT | LOADING_BIT : 0;
     if (!disabled) {
-      queue.t.forEach((node) => queue.notify(node, LOADING_BIT, LOADING_BIT));
+      queue.s.forEach((node) => queue.notify(node, LOADING_BIT, LOADING_BIT));
       queue.V.forEach((node) => queue.notify(node, ERROR_BIT, ERROR_BIT));
-      queue.t.clear();
+      queue.s.clear();
       queue.V.clear();
     }
   });
-  return () => queue.u.read() ? void 0 : tree.read();
+  return () => queue.t.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.u.read()) {
+    if (!queue.t.read()) {
       const resolved = tree.read();
-      if (!queue.u.read())
+      if (!queue.t.read())
         return resolved;
     }
     return fallback(queue);
@@ -2283,14 +2302,16 @@ function createSuspense(fn, fallback) {
 }
 function createErrorBoundary(fn, fallback) {
   return createCollectionBoundary(ERROR_BIT, fn, (queue) => {
-    let node = queue.c.values().next().value;
+    let node = queue.d.values().next().value;
     ActiveTransition && ActiveTransition.a.has(node) && (node = ActiveTransition.a.get(node));
-    return fallback(node.R, () => {
+    return fallback(node.K, () => {
       var _a;
       incrementClock();
-      for (let node2 of queue.c) {
-        node2.b = STATE_DIRTY;
-        (_a = node2.l) == null ? void 0 : _a.enqueue(node2.A, node2.C.bind(node2));
+      for (let node2 of queue.d) {
+        if (ActiveTransition && !node2.g)
+          node2 = cloneGraph(node2);
+        node2.c = STATE_DIRTY;
+        (_a = node2.k) == null ? void 0 : _a.enqueue(node2.A, node2.C.bind(node2));
       }
     });
   });