valdres 1.0.0-beta.15 → 1.0.0-beta.16

package/dist/index.js

@@ -749,7 +749,7 @@ var evaluateSelector = (selector, data, initializedAtomsSet, circularDependencyS
   const prevCtx = latestEvalContext.get(selector);
   if (prevCtx)
     prevCtx.revoked = true;
-  const evalCtx = { revoked: false };
+  const evalCtx = { revoked: false, preserveSignalOnRevoke: false };
   latestEvalContext.set(selector, evalCtx);
   if (circularDependencySet.has(selector)) {
     throw new SelectorCircularDependencyError;
@@ -774,7 +774,9 @@ var evaluateSelector = (selector, data, initializedAtomsSet, circularDependencyS
             if (!controller) {
               controller = new AbortController;
               if (myEvalCtx.revoked) {
-                controller.abort();
+                if (!myEvalCtx.preserveSignalOnRevoke) {
+                  controller.abort();
+                }
               } else {
                 data.abortControllers.set(selector, controller);
               }
@@ -878,7 +880,10 @@ var handleSelectorResult = (value, selector, data) => {
   if (value instanceof SuspendAndWaitForResolveError) {
     data.abortControllers.delete(selector);
     const promise = value.promise;
+    const evaluationContext = data.latestEvalContext.get(selector);
     promise.then(() => {
+      if (!evaluationContext || evaluationContext.revoked || data.latestEvalContext.get(selector) !== evaluationContext)
+        return;
       if (!data.stateDependencies.has(selector))
         return;
       if (data.values.has(selector) && data.values.get(selector) !== promise)
@@ -896,7 +901,12 @@ var handleSelectorResult = (value, selector, data) => {
     });
     return promise;
   } else if (isPromiseLike(value)) {
+    const evaluationContext = data.latestEvalContext.get(selector);
     value.then((resolved) => {
+      if (!evaluationContext || evaluationContext.revoked || data.latestEvalContext.get(selector) !== evaluationContext) {
+        pendingAsyncDeps.delete(value);
+        return;
+      }
       if (!data.stateDependencies.has(selector)) {
         pendingAsyncDeps.delete(value);
         return;
@@ -2131,6 +2141,13 @@ var cleanupOrphanedDeps = (state, data) => {
     const dependents = data.stateDependents.get(current);
     const deps = data.stateDependencies.get(current);
     if (deps) {
+      const selector = current;
+      const evaluationContext = data.latestEvalContext.get(selector);
+      if (evaluationContext) {
+        evaluationContext.preserveSignalOnRevoke = true;
+        evaluationContext.revoked = true;
+      }
+      data.latestEvalContext.delete(selector);
       for (const dep of deps) {
         data.stateDependents.get(dep)?.delete(current);
       }
@@ -4220,9 +4237,9 @@ var isFamilySelector = (state) => isFamilyState(state) && isSelector(state);
 // src/index.ts
 var slot = valdresGlobal();
 if (slot.version) {
-  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${slot.version}. Attempted to load: ${"1.0.0-beta.15"}`);
+  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${slot.version}. Attempted to load: ${"1.0.0-beta.16"}`);
 } else {
-  slot.version = "1.0.0-beta.15";
+  slot.version = "1.0.0-beta.16";
 }
 export {
   store,

package/dist/types/types/StoreData.d.ts

@@ -120,6 +120,7 @@ export type StoreData = {
      *  registration from store1's in-flight async eval. */
     latestEvalContext: WeakMap<Selector, {
         revoked: boolean;
+        preserveSignalOnRevoke: boolean;
     }>;
     /** Per-atom timestamp of the last value write, used for lazy
      *  maxAge revalidation when the atom is unmounted (no active timer

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "valdres",
     "description": "Fast atom-based state management for JavaScript. Inspired by Recoil and Jotai.",
-    "version": "1.0.0-beta.15",
+    "version": "1.0.0-beta.16",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"