@solidjs/signals 0.7.4 → 0.7.5

package/dist/dev.js

@@ -326,7 +326,7 @@ var Transition = class _Transition {
 function cloneGraph(node) {
   if (node._optimistic) {
     if (node._state !== STATE_DISPOSED) {
-      node._optimistic._init?.();
+      !node._transition && node._optimistic._init?.();
       ActiveTransition.addOptimistic(node._optimistic);
     }
     return node;
@@ -685,6 +685,10 @@ var Computation = class extends Owner {
     }
   }
   _read() {
+    if (staleCheck && (this._stateFlags & LOADING_BIT || this._transition)) {
+      staleCheck._value = true;
+      this._transition?._signal.read();
+    }
     track(this);
     newFlags |= this._stateFlags & ~currentMask;
     if (this._stateFlags & ERROR_BIT) {
@@ -733,10 +737,6 @@ var Computation = class extends Owner {
     if ((notStale || this._stateFlags & UNINITIALIZED_BIT) && this._stateFlags & LOADING_BIT) {
       throw new NotReadyError(this);
     }
-    if (staleCheck && (this._stateFlags & LOADING_BIT || this._transition)) {
-      staleCheck._value = true;
-      this._transition?._signal.read();
-    }
     return this._read();
   }
   /** Update the computation with a new value. */
@@ -1401,10 +1401,11 @@ function createOptimistic(first, second, third) {
   const node = typeof first === "function" ? new Computation(
     second,
     (prev) => {
-      const res = first(prev);
-      if (node._optimistic._transition)
+      if (node._optimistic._transition) {
+        latest(() => first(prev));
         return prev;
-      return res;
+      }
+      return first(prev);
     },
     third
   ) : new Computation(first, null, second);
@@ -1897,10 +1898,11 @@ function createOptimisticStore(first, second, options) {
   const derived = typeof first === "function";
   const { store, node } = derived ? createProjectionInternal(
     (draft) => {
-      const res = first(draft);
-      if (reset._transition)
+      if (reset._transition) {
+        latest(() => first(draft));
         return draft;
-      return res;
+      }
+      return first(draft);
     },
     second,
     options

package/dist/node.cjs

@@ -327,7 +327,7 @@ function cloneGraph(node) {
   var _a, _b;
   if (node.j) {
     if (node.a !== STATE_DISPOSED) {
-      (_b = (_a = node.j).ia) == null ? void 0 : _b.call(_a);
+      !node.f && ((_b = (_a = node.j).ia) == null ? void 0 : _b.call(_a));
       ActiveTransition.addOptimistic(node.j);
     }
     return node;
@@ -686,6 +686,11 @@ var Computation = class extends Owner {
     }
   }
   ha() {
+    var _a;
+    if (staleCheck && (this.g & LOADING_BIT || this.f)) {
+      staleCheck.m = true;
+      (_a = this.f) == null ? void 0 : _a.aa.read();
+    }
     track(this);
     newFlags |= this.g & ~currentMask;
     if (this.g & ERROR_BIT) {
@@ -720,7 +725,6 @@ var Computation = class extends Owner {
    * before continuing
    */
   wait() {
-    var _a;
     if (ActiveTransition && (ActiveTransition.b.has(this) || !this.d && this.g & (UNINITIALIZED_BIT | ERROR_BIT))) {
       const clone = ActiveTransition.b.get(this) || cloneGraph(this);
       if (clone !== this)
@@ -735,10 +739,6 @@ var Computation = class extends Owner {
     if ((notStale || this.g & UNINITIALIZED_BIT) && this.g & LOADING_BIT) {
       throw new NotReadyError(this);
     }
-    if (staleCheck && (this.g & LOADING_BIT || this.f)) {
-      staleCheck.m = true;
-      (_a = this.f) == null ? void 0 : _a.aa.read();
-    }
     return this.ha();
   }
   /** Update the computation with a new value. */
@@ -1400,10 +1400,11 @@ function createOptimistic(first, second, third) {
   const node = typeof first === "function" ? new Computation(
     second,
     (prev) => {
-      const res = first(prev);
-      if (node.j.f)
+      if (node.j.f) {
+        latest(() => first(prev));
         return prev;
-      return res;
+      }
+      return first(prev);
     },
     third
   ) : new Computation(first, null, second);
@@ -1903,10 +1904,11 @@ function createOptimisticStore(first, second, options) {
   const derived = typeof first === "function";
   const { store, node } = derived ? createProjectionInternal(
     (draft) => {
-      const res = first(draft);
-      if (reset.f)
+      if (reset.f) {
+        latest(() => first(draft));
         return draft;
-      return res;
+      }
+      return first(draft);
     },
     second,
     options

package/dist/prod.js

@@ -323,7 +323,7 @@ var Transition = class _Transition {
 function cloneGraph(node) {
   if (node.j) {
     if (node.a !== STATE_DISPOSED) {
-      node.j.ia?.();
+      !node.f && node.j.ia?.();
       ActiveTransition.addOptimistic(node.j);
     }
     return node;
@@ -681,6 +681,10 @@ var Computation = class extends Owner {
     }
   }
   ha() {
+    if (staleCheck && (this.g & LOADING_BIT || this.f)) {
+      staleCheck.m = true;
+      this.f?.aa.read();
+    }
     track(this);
     newFlags |= this.g & ~currentMask;
     if (this.g & ERROR_BIT) {
@@ -729,10 +733,6 @@ var Computation = class extends Owner {
     if ((notStale || this.g & UNINITIALIZED_BIT) && this.g & LOADING_BIT) {
       throw new NotReadyError(this);
     }
-    if (staleCheck && (this.g & LOADING_BIT || this.f)) {
-      staleCheck.m = true;
-      this.f?.aa.read();
-    }
     return this.ha();
   }
   /** Update the computation with a new value. */
@@ -1387,10 +1387,11 @@ function createOptimistic(first, second, third) {
   const node = typeof first === "function" ? new Computation(
     second,
     (prev) => {
-      const res = first(prev);
-      if (node.j.f)
+      if (node.j.f) {
+        latest(() => first(prev));
         return prev;
-      return res;
+      }
+      return first(prev);
     },
     third
   ) : new Computation(first, null, second);
@@ -1883,10 +1884,11 @@ function createOptimisticStore(first, second, options) {
   const derived = typeof first === "function";
   const { store, node } = derived ? createProjectionInternal(
     (draft) => {
-      const res = first(draft);
-      if (reset.f)
+      if (reset.f) {
+        latest(() => first(draft));
         return draft;
-      return res;
+      }
+      return first(draft);
     },
     second,
     options

package/package.json

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