valdres 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/index.js

@@ -417,96 +417,110 @@ var evaluateSelector = (selector, data, initializedAtomsSet, circularDependencyS
     throw new SelectorCircularDependencyError;
   }
   circularDependencySet.add(selector);
-  const prev = data.abortControllers.get(selector);
-  let options;
-  if (prev === false) {
-    let cached = syncOptionsCache.get(data);
-    if (!cached) {
-      cached = { signal: neverAbortedSignal, storeId: data.id };
-      syncOptionsCache.set(data, cached);
-    }
-    options = cached;
-  } else {
-    if (prev)
-      prev.abort();
-    const abortController = new AbortController;
-    data.abortControllers.set(selector, abortController);
-    options = { signal: abortController.signal, storeId: data.id };
-  }
-  let allDepsThisEval;
-  let result;
   try {
-    result = selector.get((state) => {
-      if (evaluationComplete) {
-        if (!evalCtx.revoked && allDepsThisEval) {
-          allDepsThisEval.add(state);
-        }
-        if (evalCtx.revoked) {
-          return getState(state, data, new Set);
-        }
-        return lateGet(state, selector, data);
-      }
-      const value = getState(state, data, initializedAtomsSet, circularDependencySet);
-      updatedDepsArray.push(state);
-      if (!depsChanged && (!currentDependencies || !currentDependencies.has(state))) {
-        depsChanged = true;
+    const prev = data.abortControllers.get(selector);
+    let options;
+    if (prev === false) {
+      let cached = syncOptionsCache.get(data);
+      if (!cached) {
+        cached = { signal: neverAbortedSignal, storeId: data.id };
+        syncOptionsCache.set(data, cached);
       }
-      if (isPromiseLike(value))
-        throw new SuspendAndWaitForResolveError(value);
-      return value;
-    }, options);
-  } catch (error) {
-    if (error instanceof NeedsInitError) {
-      circularDependencySet.delete(selector);
-      throw error;
-    }
-    if (error instanceof SuspendAndWaitForResolveError) {
-      result = error;
-    } else if (error instanceof SelectorEvaluationError) {
-      throw error;
+      options = cached;
     } else {
-      throw new SelectorEvaluationError(error);
+      if (prev)
+        prev.abort();
+      let controller;
+      const myEvalCtx = evalCtx;
+      options = {
+        storeId: data.id,
+        get signal() {
+          if (!controller) {
+            controller = new AbortController;
+            if (myEvalCtx.revoked) {
+              controller.abort();
+            } else {
+              data.abortControllers.set(selector, controller);
+            }
+          }
+          return controller.signal;
+        }
+      };
     }
-  }
-  evaluationComplete = true;
-  const isAsyncResult = result instanceof SuspendAndWaitForResolveError || isPromiseLike(result);
-  if (!isAsyncResult && !depsChanged && currentDependencies && currentDependencies.size !== updatedDepsArray.length) {
-    depsChanged = true;
-  }
-  if (depsChanged || !currentDependencies) {
-    const updatedDependencies = new Set(updatedDepsArray);
-    if (isAsyncResult && currentDependencies) {
-      for (const dep of currentDependencies) {
-        updatedDependencies.add(dep);
+    let allDepsThisEval;
+    let result;
+    try {
+      result = selector.get((state) => {
+        if (evaluationComplete) {
+          if (!evalCtx.revoked && allDepsThisEval) {
+            allDepsThisEval.add(state);
+          }
+          if (evalCtx.revoked) {
+            return getState(state, data, new Set);
+          }
+          return lateGet(state, selector, data);
+        }
+        const value = getState(state, data, initializedAtomsSet, circularDependencySet);
+        updatedDepsArray.push(state);
+        if (!depsChanged && (!currentDependencies || !currentDependencies.has(state))) {
+          depsChanged = true;
+        }
+        if (isPromiseLike(value))
+          throw new SuspendAndWaitForResolveError(value);
+        return value;
+      }, options);
+    } catch (error) {
+      if (error instanceof NeedsInitError)
+        throw error;
+      if (error instanceof SuspendAndWaitForResolveError) {
+        result = error;
+      } else if (error instanceof SelectorEvaluationError) {
+        throw error;
+      } else {
+        throw new SelectorEvaluationError(error);
       }
     }
-    const prev2 = currentDependencies ?? new Set;
-    for (const state of updatedDependencies) {
-      if (!prev2.has(state)) {
-        const set = getOrInitDependentsSet(state, data);
-        set.add(selector);
-        if (addedDepsOut)
-          addedDepsOut.add(state);
-      }
+    evaluationComplete = true;
+    const isAsyncResult = result instanceof SuspendAndWaitForResolveError || isPromiseLike(result);
+    if (!isAsyncResult && !depsChanged && currentDependencies && currentDependencies.size !== updatedDepsArray.length) {
+      depsChanged = true;
     }
-    if (!isAsyncResult) {
-      for (const state of prev2) {
-        if (!updatedDependencies.has(state)) {
+    if (depsChanged || !currentDependencies) {
+      const updatedDependencies = new Set(updatedDepsArray);
+      if (isAsyncResult && currentDependencies) {
+        for (const dep of currentDependencies) {
+          updatedDependencies.add(dep);
+        }
+      }
+      const prev2 = currentDependencies ?? new Set;
+      for (const state of updatedDependencies) {
+        if (!prev2.has(state)) {
           const set = getOrInitDependentsSet(state, data);
-          set.delete(selector);
-          if (removedDepsOut)
-            removedDepsOut.add(state);
+          set.add(selector);
+          if (addedDepsOut)
+            addedDepsOut.add(state);
         }
       }
+      if (!isAsyncResult) {
+        for (const state of prev2) {
+          if (!updatedDependencies.has(state)) {
+            const set = getOrInitDependentsSet(state, data);
+            set.delete(selector);
+            if (removedDepsOut)
+              removedDepsOut.add(state);
+          }
+        }
+      }
+      data.stateDependencies.set(selector, updatedDependencies);
     }
-    data.stateDependencies.set(selector, updatedDependencies);
-  }
-  if (isPromiseLike(result)) {
-    allDepsThisEval = new Set(updatedDepsArray);
-    pendingAsyncDeps.set(result, allDepsThisEval);
+    if (isPromiseLike(result)) {
+      allDepsThisEval = new Set(updatedDepsArray);
+      pendingAsyncDeps.set(result, allDepsThisEval);
+    }
+    return result;
+  } finally {
+    circularDependencySet.delete(selector);
   }
-  circularDependencySet.delete(selector);
-  return result;
 };
 var handleSelectorResult = (value, selector, data) => {
   if (value instanceof SuspendAndWaitForResolveError) {
@@ -2402,9 +2416,9 @@ var isFamilySelector = (state) => isFamilyState(state) && isSelector(state);
 
 // src/index.ts
 if (globalThis.__valdres__) {
-  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${globalThis.__valdres__}. Attempted to load: ${"1.0.0-beta.1"}`);
+  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${globalThis.__valdres__}. Attempted to load: ${"1.0.0-beta.3"}`);
 } else {
-  globalThis.__valdres__ = "1.0.0-beta.1";
+  globalThis.__valdres__ = "1.0.0-beta.3";
 }
 export {
   store,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "1.0.0-beta.1",
+    "version": "1.0.0-beta.3",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"