@solidjs/signals 0.7.0 → 0.7.1

package/dist/dev.js

@@ -1189,7 +1189,10 @@ function runTop(node) {
 function createSignal(first, second, third) {
   if (typeof first === "function") {
     const node2 = new Computation(second, first, third);
-    return [node2.read.bind(node2), node2.write.bind(node2)];
+    return [node2.read.bind(node2), (v) => {
+      node2._updateIfNecessary();
+      return node2.write(v);
+    }];
   }
   const o = getOwner();
   const needsId = o?.id != null;
@@ -1366,7 +1369,12 @@ function createOptimistic(first, second, third) {
       throw new Error("createOptimistic can only be updated inside a transition");
     ActiveTransition.addOptimistic(reset);
     cloneGraph(node, true);
-    queueMicrotask(() => reset._transition && node.write(v));
+    queueMicrotask(() => {
+      if (reset._transition) {
+        node._updateIfNecessary();
+        node.write(v);
+      }
+    });
   }
   return [node.read.bind(node), write];
 }

package/dist/node.cjs

@@ -102,14 +102,14 @@ var Queue = class {
     }
   }
   addChild(child) {
-    if (ActiveTransition && ActiveTransition.G.has(this))
-      return ActiveTransition.G.get(this).addChild(child);
+    if (ActiveTransition && ActiveTransition.H.has(this))
+      return ActiveTransition.H.get(this).addChild(child);
     this.f.push(child);
     child.k = this;
   }
   removeChild(child) {
-    if (ActiveTransition && ActiveTransition.G.has(this))
-      return ActiveTransition.G.get(this).removeChild(child);
+    if (ActiveTransition && ActiveTransition.H.has(this))
+      return ActiveTransition.H.get(this).removeChild(child);
     const index = this.f.indexOf(child);
     if (index >= 0) {
       this.f.splice(index, 1);
@@ -161,12 +161,12 @@ function runQueue(queue, type) {
 var Transition = class _Transition {
   a = /* @__PURE__ */ new Map();
   s = /* @__PURE__ */ new Set();
-  H = /* @__PURE__ */ new Set();
   I = /* @__PURE__ */ new Set();
-  D = false;
+  J = /* @__PURE__ */ new Set();
+  E = false;
   g = [[], []];
-  G = /* @__PURE__ */ new Map();
-  J = [];
+  H = /* @__PURE__ */ new Map();
+  K = [];
   f = [];
   k = null;
   B = false;
@@ -174,21 +174,21 @@ var Transition = class _Transition {
   d = globalQueue;
   created = clock;
   constructor() {
-    this.G.set(globalQueue, this);
+    this.H.set(globalQueue, this);
     for (const child of globalQueue.f) {
       cloneQueue(child, this, this);
     }
   }
   enqueue(type, fn) {
-    this.J.push(fn);
+    this.K.push(fn);
     if (type)
       this.g[type - 1].push(fn);
     this.schedule();
   }
   run(type) {
     if (type === EFFECT_PURE) {
-      this.J.length && runQueue(this.J, type);
-      this.J = [];
+      this.K.length && runQueue(this.K, type);
+      this.K = [];
       return;
     } else if (this.g[type - 1].length) {
       const effects = this.g[type - 1];
@@ -238,7 +238,7 @@ var Transition = class _Transition {
   merge(queue) {
     this.g[0].push.apply(this.g[0], queue.g[0]);
     this.g[1].push.apply(this.g[1], queue.g[1]);
-    this.J.push.apply(this.J, queue.J);
+    this.K.push.apply(this.K, queue.K);
     for (let i = 0; i < queue.f.length; i++) {
       const og = this.f.find((c) => c.d === queue.f[i].d);
       if (og)
@@ -255,9 +255,9 @@ var Transition = class _Transition {
       queueMicrotask(() => this.flush());
   }
   runTransition(fn, force = false) {
-    if (this.D) {
-      if (this.D instanceof _Transition)
-        return this.D.runTransition(fn, force);
+    if (this.E) {
+      if (this.E instanceof _Transition)
+        return this.E.runTransition(fn, force);
       if (!force)
         throw new Error("Transition already completed");
       fn();
@@ -272,12 +272,12 @@ var Transition = class _Transition {
           let temp, value;
           while (!(temp = result.next(value)).done) {
             if (temp.value instanceof Promise) {
-              transition2.H.add(temp.value);
+              transition2.I.add(temp.value);
               try {
                 value = await temp.value;
               } finally {
                 transition2 = latestTransition(transition2);
-                transition2.H.delete(temp.value);
+                transition2.I.delete(temp.value);
               }
               ActiveTransition = transition2;
             } else
@@ -288,10 +288,10 @@ var Transition = class _Transition {
         })();
       }
       if (result instanceof Promise) {
-        transition2.H.add(result);
+        transition2.I.add(result);
         result.finally(() => {
           transition2 = latestTransition(transition2);
-          transition2.H.delete(result);
+          transition2.I.delete(result);
           ActiveTransition = null;
           finishTransition(transition2);
         });
@@ -309,7 +309,7 @@ var Transition = class _Transition {
       return;
     }
     fn.j = this;
-    this.I.add(fn);
+    this.J.add(fn);
   }
 };
 function transition(fn) {
@@ -331,7 +331,7 @@ function cloneGraph(node, optimistic) {
     c: null,
     a: node.a ? [...node.a] : null,
     d: node,
-    I: !!optimistic
+    J: !!optimistic
   });
   delete clone.T;
   ActiveTransition.a.set(node, clone);
@@ -349,8 +349,8 @@ function cloneGraph(node, optimistic) {
   return clone;
 }
 function latestTransition(t) {
-  while (t.D instanceof Transition)
-    t = t.D;
+  while (t.E instanceof Transition)
+    t = t.E;
   return t;
 }
 function replaceSourceObservers(node, transition2) {
@@ -378,7 +378,7 @@ function cloneQueue(queue, parent, transition2) {
     },
     notify(node, type, flags) {
       node = node.d || node;
-      if (!clone.K || type & LOADING_BIT) {
+      if (!clone.L || type & LOADING_BIT) {
         type &= ~LOADING_BIT;
         transition2 = latestTransition(transition2);
         transition2.notify(node, LOADING_BIT, flags);
@@ -389,7 +389,7 @@ function cloneQueue(queue, parent, transition2) {
     }
   });
   parent.f.push(clone);
-  transition2.G.set(queue, clone);
+  transition2.H.set(queue, clone);
   for (const child of queue.f) {
     cloneQueue(child, clone, transition2);
   }
@@ -416,14 +416,14 @@ function mergeTransitions(t1, t2) {
     key.j = t1;
     t1.a.set(key, value);
   });
-  t2.I.forEach((c) => {
+  t2.J.forEach((c) => {
     c.j = t1;
-    t1.I.add(c);
+    t1.J.add(c);
   });
-  t2.H.forEach((p) => t1.H.add(p));
+  t2.I.forEach((p) => t1.I.add(p));
   t2.s.forEach((n) => t1.s.add(n));
   t1.merge(t2);
-  t2.D = t1;
+  t2.E = t1;
 }
 function getTransitionSource(input) {
   return ActiveTransition && ActiveTransition.a.get(input) || input;
@@ -431,7 +431,7 @@ function getTransitionSource(input) {
 function getQueue(node) {
   var _a;
   const transition2 = ActiveTransition || ((_a = node.d) == null ? void 0 : _a.j);
-  return transition2 && transition2.G.get(node.C) || node.C;
+  return transition2 && transition2.H.get(node.C) || node.C;
 }
 function initialDispose(node) {
   let current = node.m;
@@ -444,7 +444,7 @@ function initialDispose(node) {
   }
 }
 function finishTransition(transition2) {
-  if (transition2.D || transition2.Y || transition2.H.size || transition2.s.size)
+  if (transition2.E || transition2.Y || transition2.I.size || transition2.s.size)
     return;
   globalQueue.g[0].push.apply(globalQueue.g[0], transition2.g[0]);
   globalQueue.g[1].push.apply(globalQueue.g[1], transition2.g[1]);
@@ -456,7 +456,7 @@ function finishTransition(transition2) {
     }
     if (clone.a)
       replaceSourceObservers(clone, transition2);
-    if (clone.I) {
+    if (clone.J) {
       clone.dispose();
       clone.emptyDisposal();
       delete source.j;
@@ -481,8 +481,8 @@ function finishTransition(transition2) {
     }
     delete source.j;
   }
-  transition2.D = true;
-  for (const reset of transition2.I) {
+  transition2.E = true;
+  for (const reset of transition2.J) {
     delete reset.j;
     reset();
   }
@@ -546,13 +546,13 @@ var Owner = class {
     }
     this.fa = 0;
     if (self)
-      this.L();
+      this.M();
     if (current)
       current.y = !self ? this : this.y;
     if (head)
       head.m = current;
   }
-  L() {
+  M() {
     if (this.y)
       this.y.m = null;
     this.k = null;
@@ -657,10 +657,10 @@ var Computation = class extends Owner {
   /** Which flags raised by sources are handled, vs. being passed through. */
   ba = DEFAULT_FLAGS;
   Q = -1;
-  E = false;
+  F = false;
   j;
   d;
-  I = false;
+  J = false;
   constructor(initialValue, compute2, options) {
     super(options == null ? void 0 : options.id, compute2 === null);
     this.P = compute2;
@@ -699,7 +699,7 @@ var Computation = class extends Owner {
       if (this.i & ERROR_BIT && this.Q <= clock)
         update(this);
       else
-        this.M();
+        this.D();
     }
     return this.ga();
   }
@@ -720,7 +720,7 @@ var Computation = class extends Owner {
       if (this.i & ERROR_BIT && this.Q <= clock)
         update(this);
       else
-        this.M();
+        this.D();
     }
     if ((notStale || this.i & UNINITIALIZED_BIT) && this.i & LOADING_BIT) {
       track(this);
@@ -763,9 +763,9 @@ var Computation = class extends Owner {
    * Set the current node's state, and recursively mark all of this node's observers as STATE_CHECK
    */
   t(state, skipQueue) {
-    if (this.b >= state && !this.E)
+    if (this.b >= state && !this.F)
       return;
-    this.E = !!skipQueue;
+    this.F = !!skipQueue;
     this.b = state;
     if (this.c) {
       for (let i = 0; i < this.c.length; i++) {
@@ -786,7 +786,7 @@ var Computation = class extends Owner {
       this.t(STATE_DIRTY);
       return;
     }
-    if (this.b >= STATE_CHECK && !this.E)
+    if (this.b >= STATE_CHECK && !this.F)
       return;
     const prevFlags = this.i & mask;
     const deltaFlags = prevFlags ^ newFlags2;
@@ -817,7 +817,7 @@ var Computation = class extends Owner {
    *
    * This function will ensure that the value and states we read from the computation are up to date
    */
-  M() {
+  D() {
     if (!this.P) {
       return;
     }
@@ -831,7 +831,7 @@ var Computation = class extends Owner {
     if (this.b === STATE_CHECK) {
       for (let i = 0; i < this.a.length; i++) {
         const source = getTransitionSource(this.a[i]);
-        source.M();
+        source.D();
         observerFlags |= source.i & ~UNINITIALIZED_BIT;
         if (this.b === STATE_DIRTY) {
           break;
@@ -848,12 +848,12 @@ var Computation = class extends Owner {
   /**
    * Remove ourselves from the owner graph and the computation graph
    */
-  L() {
+  M() {
     if (this.b === STATE_DISPOSED)
       return;
     if (this.a)
       removeSourceObservers(this, 0);
-    super.L();
+    super.M();
   }
 };
 function track(computation) {
@@ -1014,7 +1014,7 @@ var Effect = class extends Computation {
         return !this.d && clock > this.C.created && !(this.i & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
       };
     }
-    this.M();
+    this.D();
     !(options == null ? void 0 : options.defer) && (this.r === EFFECT_USER ? getQueue(this).enqueue(this.r, this.w.bind(this)) : this.w(this.r));
   }
   write(value, flags = 0) {
@@ -1067,7 +1067,7 @@ var Effect = class extends Computation {
     if (!getQueue(this).notify(this, ERROR_BIT, ERROR_BIT))
       throw error;
   }
-  L() {
+  M() {
     var _a;
     if (this.b === STATE_DISPOSED)
       return;
@@ -1077,7 +1077,7 @@ var Effect = class extends Computation {
     (_a = this.u) == null ? void 0 : _a.call(this);
     this.u = void 0;
     getQueue(this).notify(this, ERROR_BIT | LOADING_BIT, 0);
-    super.L();
+    super.M();
   }
   w(type) {
     var _a;
@@ -1118,14 +1118,14 @@ var TrackedEffect = class extends Computation {
       getQueue(this).enqueue(this.r, this.w.bind(this));
     this.b = state;
   }
-  L() {
+  M() {
     var _a;
     if (this.b === STATE_DISPOSED)
       return;
     (_a = this.u) == null ? void 0 : _a.call(this);
     this.u = void 0;
     getQueue(this).notify(this, ERROR_BIT | LOADING_BIT, 0);
-    super.L();
+    super.M();
   }
   w(type) {
     if (type)
@@ -1135,12 +1135,12 @@ var TrackedEffect = class extends Computation {
 var EagerComputation = class extends Computation {
   constructor(initialValue, compute2, options) {
     super(initialValue, compute2, options);
-    !(options == null ? void 0 : options.defer) && this.M();
+    !(options == null ? void 0 : options.defer) && this.D();
   }
   t(state, skipQueue) {
-    if (this.b >= state && !this.E)
+    if (this.b >= state && !this.F)
       return;
-    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.E))
+    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.F))
       getQueue(this).enqueue(EFFECT_PURE, this.w.bind(this));
     super.t(state, skipQueue);
   }
@@ -1154,12 +1154,12 @@ var FirewallComputation = class extends Computation {
     super(void 0, compute2);
   }
   t(state, skipQueue) {
-    if (this.b >= state && !this.E)
+    if (this.b >= state && !this.F)
       return;
-    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.E))
+    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.F))
       getQueue(this).enqueue(EFFECT_PURE, this.w.bind(this));
     super.t(state, true);
-    this.E = !!skipQueue;
+    this.F = !!skipQueue;
   }
   w() {
     this.b !== STATE_CLEAN && runTop(this);
@@ -1176,7 +1176,7 @@ function runTop(node) {
   }
   for (let i = ancestors.length - 1; i >= 0; i--) {
     if (ancestors[i].b !== STATE_DISPOSED)
-      ancestors[i].M();
+      ancestors[i].D();
   }
 }
 
@@ -1184,7 +1184,10 @@ function runTop(node) {
 function createSignal(first, second, third) {
   if (typeof first === "function") {
     const node2 = new Computation(second, first, third);
-    return [node2.read.bind(node2), node2.write.bind(node2)];
+    return [node2.read.bind(node2), (v) => {
+      node2.D();
+      return node2.write(v);
+    }];
   }
   const o = getOwner();
   const needsId = (o == null ? void 0 : o.id) != null;
@@ -1289,7 +1292,7 @@ function createAsync(compute2, value, options) {
     }
     n.b = STATE_DIRTY;
     refreshing = true;
-    n.M();
+    n.D();
   };
   return read;
 }
@@ -1363,7 +1366,12 @@ function createOptimistic(first, second, third) {
       throw new Error("createOptimistic can only be updated inside a transition");
     ActiveTransition.addOptimistic(reset);
     cloneGraph(node, true);
-    queueMicrotask(() => reset.j && node.write(v));
+    queueMicrotask(() => {
+      if (reset.j) {
+        node.D();
+        node.write(v);
+      }
+    });
   }
   return [node.read.bind(node), write];
 }
@@ -2071,7 +2079,7 @@ function mapArray(list, map, options) {
     U: new Owner(),
     o: 0,
     ia: list,
-    F: [],
+    G: [],
     R: map,
     h: [],
     e: [],
@@ -2105,7 +2113,7 @@ function updateKeyedMap() {
       if (this.o !== 0) {
         this.U.dispose(false);
         this.e = [];
-        this.F = [];
+        this.G = [];
         this.h = [];
         this.o = 0;
         this.p && (this.p = []);
@@ -2123,17 +2131,17 @@ function updateKeyedMap() {
         this.e[0].dispose();
       this.h = new Array(newLen);
       for (j = 0; j < newLen; j++) {
-        this.F[j] = newItems[j];
+        this.G[j] = newItems[j];
         this.h[j] = compute(this.e[j] = new Owner(), mapper, null);
       }
       this.o = newLen;
     } else {
       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.F[start] === newItems[start] || this.p && compare(this.S, this.F[start], newItems[start])); start++) {
+      for (start = 0, end = Math.min(this.o, newLen); start < end && (this.G[start] === newItems[start] || this.p && compare(this.S, this.G[start], newItems[start])); start++) {
         if (this.p)
           this.p[start].write(newItems[start]);
       }
-      for (end = this.o - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.F[end] === newItems[newEnd] || this.p && compare(this.S, this.F[end], newItems[newEnd])); end--, newEnd--) {
+      for (end = this.o - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.G[end] === newItems[newEnd] || this.p && compare(this.S, this.G[end], newItems[newEnd])); end--, newEnd--) {
         temp[newEnd] = this.h[end];
         tempNodes[newEnd] = this.e[end];
         tempRows && (tempRows[newEnd] = this.p[end]);
@@ -2149,7 +2157,7 @@ function updateKeyedMap() {
         newIndices.set(key, j);
       }
       for (i = start; i <= end; i++) {
-        item = this.F[i];
+        item = this.G[i];
         key = this.S ? this.S(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
@@ -2179,7 +2187,7 @@ function updateKeyedMap() {
         }
       }
       this.h = this.h.slice(0, this.o = newLen);
-      this.F = newItems.slice(0);
+      this.G = newItems.slice(0);
     }
   });
   return this.h;
@@ -2332,12 +2340,12 @@ var ConditionalQueue = class extends Queue {
   }
 };
 var CollectionQueue = class extends Queue {
-  K;
+  L;
   e = /* @__PURE__ */ new Set();
   x = new Computation(false, null, { pureWrite: true });
   constructor(type) {
     super();
-    this.K = type;
+    this.L = type;
   }
   run(type) {
     if (!type || this.x.read())
@@ -2345,9 +2353,9 @@ var CollectionQueue = class extends Queue {
     return super.run(type);
   }
   notify(node, type, flags) {
-    if (!(type & this.K))
+    if (!(type & this.L))
       return super.notify(node, type, flags);
-    if (flags & this.K) {
+    if (flags & this.L) {
       this.e.add(node);
       if (this.e.size === 1)
         this.x.write(true);
@@ -2356,11 +2364,11 @@ var CollectionQueue = class extends Queue {
       if (this.e.size === 0)
         this.x.write(false);
     }
-    type &= ~this.K;
+    type &= ~this.L;
     return type ? super.notify(node, type, flags) : true;
   }
   merge(queue) {
-    queue.e.forEach((n) => this.notify(n, this.K, this.K));
+    queue.e.forEach((n) => this.notify(n, this.L, this.L));
     super.merge(queue);
   }
 };

package/dist/prod.js

@@ -99,14 +99,14 @@ var Queue = class {
     }
   }
   addChild(child) {
-    if (ActiveTransition && ActiveTransition.G.has(this))
-      return ActiveTransition.G.get(this).addChild(child);
+    if (ActiveTransition && ActiveTransition.H.has(this))
+      return ActiveTransition.H.get(this).addChild(child);
     this.f.push(child);
     child.k = this;
   }
   removeChild(child) {
-    if (ActiveTransition && ActiveTransition.G.has(this))
-      return ActiveTransition.G.get(this).removeChild(child);
+    if (ActiveTransition && ActiveTransition.H.has(this))
+      return ActiveTransition.H.get(this).removeChild(child);
     const index = this.f.indexOf(child);
     if (index >= 0) {
       this.f.splice(index, 1);
@@ -158,12 +158,12 @@ function runQueue(queue, type) {
 var Transition = class _Transition {
   a = /* @__PURE__ */ new Map();
   s = /* @__PURE__ */ new Set();
-  H = /* @__PURE__ */ new Set();
   I = /* @__PURE__ */ new Set();
-  D = false;
+  J = /* @__PURE__ */ new Set();
+  E = false;
   g = [[], []];
-  G = /* @__PURE__ */ new Map();
-  J = [];
+  H = /* @__PURE__ */ new Map();
+  K = [];
   f = [];
   k = null;
   B = false;
@@ -171,21 +171,21 @@ var Transition = class _Transition {
   d = globalQueue;
   created = clock;
   constructor() {
-    this.G.set(globalQueue, this);
+    this.H.set(globalQueue, this);
     for (const child of globalQueue.f) {
       cloneQueue(child, this, this);
     }
   }
   enqueue(type, fn) {
-    this.J.push(fn);
+    this.K.push(fn);
     if (type)
       this.g[type - 1].push(fn);
     this.schedule();
   }
   run(type) {
     if (type === EFFECT_PURE) {
-      this.J.length && runQueue(this.J, type);
-      this.J = [];
+      this.K.length && runQueue(this.K, type);
+      this.K = [];
       return;
     } else if (this.g[type - 1].length) {
       const effects = this.g[type - 1];
@@ -235,7 +235,7 @@ var Transition = class _Transition {
   merge(queue) {
     this.g[0].push.apply(this.g[0], queue.g[0]);
     this.g[1].push.apply(this.g[1], queue.g[1]);
-    this.J.push.apply(this.J, queue.J);
+    this.K.push.apply(this.K, queue.K);
     for (let i = 0; i < queue.f.length; i++) {
       const og = this.f.find((c) => c.d === queue.f[i].d);
       if (og)
@@ -252,9 +252,9 @@ var Transition = class _Transition {
       queueMicrotask(() => this.flush());
   }
   runTransition(fn, force = false) {
-    if (this.D) {
-      if (this.D instanceof _Transition)
-        return this.D.runTransition(fn, force);
+    if (this.E) {
+      if (this.E instanceof _Transition)
+        return this.E.runTransition(fn, force);
       if (!force)
         throw new Error("Transition already completed");
       fn();
@@ -269,12 +269,12 @@ var Transition = class _Transition {
           let temp, value;
           while (!(temp = result.next(value)).done) {
             if (temp.value instanceof Promise) {
-              transition2.H.add(temp.value);
+              transition2.I.add(temp.value);
               try {
                 value = await temp.value;
               } finally {
                 transition2 = latestTransition(transition2);
-                transition2.H.delete(temp.value);
+                transition2.I.delete(temp.value);
               }
               ActiveTransition = transition2;
             } else
@@ -285,10 +285,10 @@ var Transition = class _Transition {
         })();
       }
       if (result instanceof Promise) {
-        transition2.H.add(result);
+        transition2.I.add(result);
         result.finally(() => {
           transition2 = latestTransition(transition2);
-          transition2.H.delete(result);
+          transition2.I.delete(result);
           ActiveTransition = null;
           finishTransition(transition2);
         });
@@ -306,7 +306,7 @@ var Transition = class _Transition {
       return;
     }
     fn.j = this;
-    this.I.add(fn);
+    this.J.add(fn);
   }
 };
 function transition(fn) {
@@ -328,7 +328,7 @@ function cloneGraph(node, optimistic) {
     c: null,
     a: node.a ? [...node.a] : null,
     d: node,
-    I: !!optimistic
+    J: !!optimistic
   });
   delete clone.T;
   ActiveTransition.a.set(node, clone);
@@ -346,8 +346,8 @@ function cloneGraph(node, optimistic) {
   return clone;
 }
 function latestTransition(t) {
-  while (t.D instanceof Transition)
-    t = t.D;
+  while (t.E instanceof Transition)
+    t = t.E;
   return t;
 }
 function replaceSourceObservers(node, transition2) {
@@ -375,7 +375,7 @@ function cloneQueue(queue, parent, transition2) {
     },
     notify(node, type, flags) {
       node = node.d || node;
-      if (!clone.K || type & LOADING_BIT) {
+      if (!clone.L || type & LOADING_BIT) {
         type &= ~LOADING_BIT;
         transition2 = latestTransition(transition2);
         transition2.notify(node, LOADING_BIT, flags);
@@ -386,7 +386,7 @@ function cloneQueue(queue, parent, transition2) {
     }
   });
   parent.f.push(clone);
-  transition2.G.set(queue, clone);
+  transition2.H.set(queue, clone);
   for (const child of queue.f) {
     cloneQueue(child, clone, transition2);
   }
@@ -413,21 +413,21 @@ function mergeTransitions(t1, t2) {
     key.j = t1;
     t1.a.set(key, value);
   });
-  t2.I.forEach((c) => {
+  t2.J.forEach((c) => {
     c.j = t1;
-    t1.I.add(c);
+    t1.J.add(c);
   });
-  t2.H.forEach((p) => t1.H.add(p));
+  t2.I.forEach((p) => t1.I.add(p));
   t2.s.forEach((n) => t1.s.add(n));
   t1.merge(t2);
-  t2.D = t1;
+  t2.E = t1;
 }
 function getTransitionSource(input) {
   return ActiveTransition && ActiveTransition.a.get(input) || input;
 }
 function getQueue(node) {
   const transition2 = ActiveTransition || node.d?.j;
-  return transition2 && transition2.G.get(node.C) || node.C;
+  return transition2 && transition2.H.get(node.C) || node.C;
 }
 function initialDispose(node) {
   let current = node.m;
@@ -440,7 +440,7 @@ function initialDispose(node) {
   }
 }
 function finishTransition(transition2) {
-  if (transition2.D || transition2.Y || transition2.H.size || transition2.s.size)
+  if (transition2.E || transition2.Y || transition2.I.size || transition2.s.size)
     return;
   globalQueue.g[0].push.apply(globalQueue.g[0], transition2.g[0]);
   globalQueue.g[1].push.apply(globalQueue.g[1], transition2.g[1]);
@@ -452,7 +452,7 @@ function finishTransition(transition2) {
     }
     if (clone.a)
       replaceSourceObservers(clone, transition2);
-    if (clone.I) {
+    if (clone.J) {
       clone.dispose();
       clone.emptyDisposal();
       delete source.j;
@@ -477,8 +477,8 @@ function finishTransition(transition2) {
     }
     delete source.j;
   }
-  transition2.D = true;
-  for (const reset of transition2.I) {
+  transition2.E = true;
+  for (const reset of transition2.J) {
     delete reset.j;
     reset();
   }
@@ -542,13 +542,13 @@ var Owner = class {
     }
     this.fa = 0;
     if (self)
-      this.L();
+      this.M();
     if (current)
       current.y = !self ? this : this.y;
     if (head)
       head.m = current;
   }
-  L() {
+  M() {
     if (this.y)
       this.y.m = null;
     this.k = null;
@@ -653,10 +653,10 @@ var Computation = class extends Owner {
   /** Which flags raised by sources are handled, vs. being passed through. */
   ba = DEFAULT_FLAGS;
   Q = -1;
-  E = false;
+  F = false;
   j;
   d;
-  I = false;
+  J = false;
   constructor(initialValue, compute2, options) {
     super(options?.id, compute2 === null);
     this.P = compute2;
@@ -695,7 +695,7 @@ var Computation = class extends Owner {
       if (this.i & ERROR_BIT && this.Q <= clock)
         update(this);
       else
-        this.M();
+        this.D();
     }
     return this.ga();
   }
@@ -716,7 +716,7 @@ var Computation = class extends Owner {
       if (this.i & ERROR_BIT && this.Q <= clock)
         update(this);
       else
-        this.M();
+        this.D();
     }
     if ((notStale || this.i & UNINITIALIZED_BIT) && this.i & LOADING_BIT) {
       track(this);
@@ -759,9 +759,9 @@ var Computation = class extends Owner {
    * Set the current node's state, and recursively mark all of this node's observers as STATE_CHECK
    */
   t(state, skipQueue) {
-    if (this.b >= state && !this.E)
+    if (this.b >= state && !this.F)
       return;
-    this.E = !!skipQueue;
+    this.F = !!skipQueue;
     this.b = state;
     if (this.c) {
       for (let i = 0; i < this.c.length; i++) {
@@ -782,7 +782,7 @@ var Computation = class extends Owner {
       this.t(STATE_DIRTY);
       return;
     }
-    if (this.b >= STATE_CHECK && !this.E)
+    if (this.b >= STATE_CHECK && !this.F)
       return;
     const prevFlags = this.i & mask;
     const deltaFlags = prevFlags ^ newFlags2;
@@ -813,7 +813,7 @@ var Computation = class extends Owner {
    *
    * This function will ensure that the value and states we read from the computation are up to date
    */
-  M() {
+  D() {
     if (!this.P) {
       return;
     }
@@ -827,7 +827,7 @@ var Computation = class extends Owner {
     if (this.b === STATE_CHECK) {
       for (let i = 0; i < this.a.length; i++) {
         const source = getTransitionSource(this.a[i]);
-        source.M();
+        source.D();
         observerFlags |= source.i & ~UNINITIALIZED_BIT;
         if (this.b === STATE_DIRTY) {
           break;
@@ -844,12 +844,12 @@ var Computation = class extends Owner {
   /**
    * Remove ourselves from the owner graph and the computation graph
    */
-  L() {
+  M() {
     if (this.b === STATE_DISPOSED)
       return;
     if (this.a)
       removeSourceObservers(this, 0);
-    super.L();
+    super.M();
   }
 };
 function track(computation) {
@@ -1010,7 +1010,7 @@ var Effect = class extends Computation {
         return !this.d && clock > this.C.created && !(this.i & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
       };
     }
-    this.M();
+    this.D();
     !options?.defer && (this.r === EFFECT_USER ? getQueue(this).enqueue(this.r, this.w.bind(this)) : this.w(this.r));
   }
   write(value, flags = 0) {
@@ -1062,7 +1062,7 @@ var Effect = class extends Computation {
     if (!getQueue(this).notify(this, ERROR_BIT, ERROR_BIT))
       throw error;
   }
-  L() {
+  M() {
     if (this.b === STATE_DISPOSED)
       return;
     this.ca = void 0;
@@ -1071,7 +1071,7 @@ var Effect = class extends Computation {
     this.u?.();
     this.u = void 0;
     getQueue(this).notify(this, ERROR_BIT | LOADING_BIT, 0);
-    super.L();
+    super.M();
   }
   w(type) {
     if (type) {
@@ -1110,13 +1110,13 @@ var TrackedEffect = class extends Computation {
       getQueue(this).enqueue(this.r, this.w.bind(this));
     this.b = state;
   }
-  L() {
+  M() {
     if (this.b === STATE_DISPOSED)
       return;
     this.u?.();
     this.u = void 0;
     getQueue(this).notify(this, ERROR_BIT | LOADING_BIT, 0);
-    super.L();
+    super.M();
   }
   w(type) {
     if (type)
@@ -1126,12 +1126,12 @@ var TrackedEffect = class extends Computation {
 var EagerComputation = class extends Computation {
   constructor(initialValue, compute2, options) {
     super(initialValue, compute2, options);
-    !options?.defer && this.M();
+    !options?.defer && this.D();
   }
   t(state, skipQueue) {
-    if (this.b >= state && !this.E)
+    if (this.b >= state && !this.F)
       return;
-    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.E))
+    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.F))
       getQueue(this).enqueue(EFFECT_PURE, this.w.bind(this));
     super.t(state, skipQueue);
   }
@@ -1145,12 +1145,12 @@ var FirewallComputation = class extends Computation {
     super(void 0, compute2);
   }
   t(state, skipQueue) {
-    if (this.b >= state && !this.E)
+    if (this.b >= state && !this.F)
       return;
-    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.E))
+    if (!skipQueue && (this.b === STATE_CLEAN || this.b === STATE_CHECK && this.F))
       getQueue(this).enqueue(EFFECT_PURE, this.w.bind(this));
     super.t(state, true);
-    this.E = !!skipQueue;
+    this.F = !!skipQueue;
   }
   w() {
     this.b !== STATE_CLEAN && runTop(this);
@@ -1167,7 +1167,7 @@ function runTop(node) {
   }
   for (let i = ancestors.length - 1; i >= 0; i--) {
     if (ancestors[i].b !== STATE_DISPOSED)
-      ancestors[i].M();
+      ancestors[i].D();
   }
 }
 
@@ -1175,7 +1175,10 @@ function runTop(node) {
 function createSignal(first, second, third) {
   if (typeof first === "function") {
     const node2 = new Computation(second, first, third);
-    return [node2.read.bind(node2), node2.write.bind(node2)];
+    return [node2.read.bind(node2), (v) => {
+      node2.D();
+      return node2.write(v);
+    }];
   }
   const o = getOwner();
   const needsId = o?.id != null;
@@ -1279,7 +1282,7 @@ function createAsync(compute2, value, options) {
     }
     n.b = STATE_DIRTY;
     refreshing = true;
-    n.M();
+    n.D();
   };
   return read;
 }
@@ -1352,7 +1355,12 @@ function createOptimistic(first, second, third) {
       throw new Error("createOptimistic can only be updated inside a transition");
     ActiveTransition.addOptimistic(reset);
     cloneGraph(node, true);
-    queueMicrotask(() => reset.j && node.write(v));
+    queueMicrotask(() => {
+      if (reset.j) {
+        node.D();
+        node.write(v);
+      }
+    });
   }
   return [node.read.bind(node), write];
 }
@@ -2052,7 +2060,7 @@ function mapArray(list, map, options) {
     U: new Owner(),
     o: 0,
     ia: list,
-    F: [],
+    G: [],
     R: map,
     h: [],
     e: [],
@@ -2086,7 +2094,7 @@ function updateKeyedMap() {
       if (this.o !== 0) {
         this.U.dispose(false);
         this.e = [];
-        this.F = [];
+        this.G = [];
         this.h = [];
         this.o = 0;
         this.p && (this.p = []);
@@ -2104,17 +2112,17 @@ function updateKeyedMap() {
         this.e[0].dispose();
       this.h = new Array(newLen);
       for (j = 0; j < newLen; j++) {
-        this.F[j] = newItems[j];
+        this.G[j] = newItems[j];
         this.h[j] = compute(this.e[j] = new Owner(), mapper, null);
       }
       this.o = newLen;
     } else {
       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.F[start] === newItems[start] || this.p && compare(this.S, this.F[start], newItems[start])); start++) {
+      for (start = 0, end = Math.min(this.o, newLen); start < end && (this.G[start] === newItems[start] || this.p && compare(this.S, this.G[start], newItems[start])); start++) {
         if (this.p)
           this.p[start].write(newItems[start]);
       }
-      for (end = this.o - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.F[end] === newItems[newEnd] || this.p && compare(this.S, this.F[end], newItems[newEnd])); end--, newEnd--) {
+      for (end = this.o - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.G[end] === newItems[newEnd] || this.p && compare(this.S, this.G[end], newItems[newEnd])); end--, newEnd--) {
         temp[newEnd] = this.h[end];
         tempNodes[newEnd] = this.e[end];
         tempRows && (tempRows[newEnd] = this.p[end]);
@@ -2130,7 +2138,7 @@ function updateKeyedMap() {
         newIndices.set(key, j);
       }
       for (i = start; i <= end; i++) {
-        item = this.F[i];
+        item = this.G[i];
         key = this.S ? this.S(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
@@ -2160,7 +2168,7 @@ function updateKeyedMap() {
         }
       }
       this.h = this.h.slice(0, this.o = newLen);
-      this.F = newItems.slice(0);
+      this.G = newItems.slice(0);
     }
   });
   return this.h;
@@ -2312,12 +2320,12 @@ var ConditionalQueue = class extends Queue {
   }
 };
 var CollectionQueue = class extends Queue {
-  K;
+  L;
   e = /* @__PURE__ */ new Set();
   x = new Computation(false, null, { pureWrite: true });
   constructor(type) {
     super();
-    this.K = type;
+    this.L = type;
   }
   run(type) {
     if (!type || this.x.read())
@@ -2325,9 +2333,9 @@ var CollectionQueue = class extends Queue {
     return super.run(type);
   }
   notify(node, type, flags) {
-    if (!(type & this.K))
+    if (!(type & this.L))
       return super.notify(node, type, flags);
-    if (flags & this.K) {
+    if (flags & this.L) {
       this.e.add(node);
       if (this.e.size === 1)
         this.x.write(true);
@@ -2336,11 +2344,11 @@ var CollectionQueue = class extends Queue {
       if (this.e.size === 0)
         this.x.write(false);
     }
-    type &= ~this.K;
+    type &= ~this.L;
     return type ? super.notify(node, type, flags) : true;
   }
   merge(queue) {
-    queue.e.forEach((n) => this.notify(n, this.K, this.K));
+    queue.e.forEach((n) => this.notify(n, this.L, this.L));
     super.merge(queue);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/signals",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "",
   "author": "Ryan Carniato",
   "license": "MIT",