valdres 1.0.0-beta.13 → 1.0.0-beta.14

package/dist/index.js

@@ -1391,6 +1391,24 @@ var propagateDownstreamTopo = (seeds, data, collectedSubscribers, updatedInitial
   }
   const needsEval = new Set(seeds);
   let graphMutated = false;
+  let resweep;
+  const markForResweep = (selector) => {
+    graphMutated = true;
+    if (!resweep)
+      resweep = new Set;
+    const stack = [selector];
+    for (let i = 0;i < stack.length; i++) {
+      const s = stack[i];
+      if (resweep.has(s))
+        continue;
+      resweep.add(s);
+      const downstream = data.stateDependents.get(s);
+      if (downstream) {
+        for (const d of downstream)
+          stack.push(d);
+      }
+    }
+  };
   const advance = (selector, propagateChange) => {
     const downstream = data.stateDependents.get(selector);
     if (!downstream)
@@ -1406,7 +1424,13 @@ var propagateDownstreamTopo = (seeds, data, collectedSubscribers, updatedInitial
         }
         continue;
       }
-      const c = (pending.get(d) ?? 0) - 1;
+      const cur = pending.get(d);
+      if (cur === undefined) {
+        if (propagateChange)
+          markForResweep(d);
+        continue;
+      }
+      const c = cur - 1;
       pending.set(d, c);
       if (propagateChange)
         needsEval.add(d);
@@ -1418,12 +1442,18 @@ var propagateDownstreamTopo = (seeds, data, collectedSubscribers, updatedInitial
   let head = 0;
   while (head < ready.length) {
     const selector = ready[head++];
+    if (resweep?.has(selector))
+      continue;
+    if (!pending.has(selector))
+      continue;
     const currentValue = data.values.get(selector);
     if (isPromiseLike(currentValue) && isInitOnly) {
+      pending.delete(selector);
       advance(selector, false);
       continue;
     }
     if (!needsEval.has(selector)) {
+      pending.delete(selector);
       advance(selector, false);
       continue;
     }
@@ -1431,6 +1461,7 @@ var propagateDownstreamTopo = (seeds, data, collectedSubscribers, updatedInitial
     const subscribers = data.subscriptions.get(selector);
     if (!isPromiseLike(currentValue) && (!dependents || dependents.size === 0) && (!subscribers || subscribers.size === 0)) {
       data.values.delete(selector);
+      pending.delete(selector);
       advance(selector, false);
       continue;
     }
@@ -1456,6 +1487,7 @@ var propagateDownstreamTopo = (seeds, data, collectedSubscribers, updatedInitial
         }
       }
     }
+    pending.delete(selector);
     advance(selector, wasValueUpdated);
     if (wasValueUpdated) {
       if (changedSelectors)
@@ -1466,9 +1498,9 @@ var propagateDownstreamTopo = (seeds, data, collectedSubscribers, updatedInitial
   }
   if (!graphMutated)
     return;
-  let stranded;
+  let stranded = resweep;
   for (const s of closure) {
-    if (needsEval.has(s) && (pending.get(s) ?? 0) > 0) {
+    if (needsEval.has(s) && pending.has(s)) {
       if (!stranded)
         stranded = new Set;
       stranded.add(s);
@@ -1477,50 +1509,81 @@ var propagateDownstreamTopo = (seeds, data, collectedSubscribers, updatedInitial
   if (!stranded)
     return;
   let work = stranded;
-  while (work.size > 0) {
-    const next = new Set;
-    for (const selector of work) {
-      const currentValue = data.values.get(selector);
-      if (isPromiseLike(currentValue) && isInitOnly)
-        continue;
-      const dependents = data.stateDependents.get(selector);
-      const subscribers = data.subscriptions.get(selector);
-      if (!isPromiseLike(currentValue) && (!dependents || dependents.size === 0) && (!subscribers || subscribers.size === 0)) {
-        data.values.delete(selector);
-        continue;
-      }
-      depsChange.added = undefined;
-      depsChange.removed = undefined;
-      const wasValueUpdated = reEvaluateSelector(selector, data, updatedInitializedAtoms, depsChange, currentValue);
-      const added = depsChange.added;
-      const removed = depsChange.removed;
-      if ((added || removed) && isLive(selector, data)) {
-        if (added) {
-          for (const dep of added) {
-            onLiveDependencyAdded(dep, data);
-            mountTransitiveDeps(dep, data);
-          }
-        }
-        if (removed) {
-          for (const dep of removed) {
-            onLiveDependencyRemoved(dep, data);
-            unmountOrphanedDeps(dep, data);
-          }
+  const hasUnsettledDependency = (selector) => {
+    const deps = data.stateDependencies.get(selector);
+    if (!deps)
+      return false;
+    for (const dep of deps) {
+      if (dep !== selector && work.has(dep))
+        return true;
+    }
+    return false;
+  };
+  const enqueueDownstream = (selector) => {
+    const downstream = data.stateDependents.get(selector);
+    if (!downstream)
+      return;
+    for (const d of downstream) {
+      work.add(d);
+    }
+  };
+  const evaluateStrandedSelector = (selector) => {
+    const currentValue = data.values.get(selector);
+    if (isPromiseLike(currentValue) && isInitOnly)
+      return false;
+    const dependents = data.stateDependents.get(selector);
+    const subscribers = data.subscriptions.get(selector);
+    if (!isPromiseLike(currentValue) && (!dependents || dependents.size === 0) && (!subscribers || subscribers.size === 0)) {
+      data.values.delete(selector);
+      return false;
+    }
+    depsChange.added = undefined;
+    depsChange.removed = undefined;
+    const wasValueUpdated = reEvaluateSelector(selector, data, updatedInitializedAtoms, depsChange, currentValue);
+    const added = depsChange.added;
+    const removed = depsChange.removed;
+    if ((added || removed) && isLive(selector, data)) {
+      if (added) {
+        for (const dep of added) {
+          onLiveDependencyAdded(dep, data);
+          mountTransitiveDeps(dep, data);
         }
       }
-      if (wasValueUpdated) {
-        if (changedSelectors)
-          changedSelectors.add(selector);
-        if (subscribers)
-          addSetToSet(subscribers, collectedSubscribers);
-        const downstream = data.stateDependents.get(selector);
-        if (downstream) {
-          for (const d of downstream)
-            next.add(d);
+      if (removed) {
+        for (const dep of removed) {
+          onLiveDependencyRemoved(dep, data);
+          unmountOrphanedDeps(dep, data);
         }
       }
     }
-    work = next;
+    if (wasValueUpdated) {
+      if (changedSelectors)
+        changedSelectors.add(selector);
+      if (subscribers)
+        addSetToSet(subscribers, collectedSubscribers);
+      enqueueDownstream(selector);
+    }
+    return wasValueUpdated;
+  };
+  while (work.size > 0) {
+    let progressed = false;
+    const batch = [...work];
+    for (const selector of batch) {
+      if (!work.has(selector))
+        continue;
+      if (hasUnsettledDependency(selector))
+        continue;
+      work.delete(selector);
+      progressed = true;
+      evaluateStrandedSelector(selector);
+    }
+    if (progressed)
+      continue;
+    const cyclicBatch = [...work];
+    work = new Set;
+    for (const selector of cyclicBatch) {
+      evaluateStrandedSelector(selector);
+    }
   }
 };
 var orderInitialSelectors = (selectors, data) => {
@@ -2156,31 +2219,42 @@ var unsubscribe = (state, subscription, data) => {
     }
   }
 };
-var cleanupOrphanedDeps = (state, data, visited = new Set) => {
-  if (visited.has(state))
-    return;
-  visited.add(state);
-  if (isLive(state, data))
-    return;
-  const deps = data.stateDependencies.get(state);
-  if (deps) {
-    for (const dep of deps) {
-      const depDependents = data.stateDependents.get(dep);
-      if (depDependents) {
-        depDependents.delete(state);
+var cleanupOrphanedDeps = (state, data) => {
+  const visited = new Set;
+  const stack = [state];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    if (visited.has(current))
+      continue;
+    visited.add(current);
+    if (isLive(current, data))
+      continue;
+    const dependents = data.stateDependents.get(current);
+    const deps = data.stateDependencies.get(current);
+    if (deps) {
+      for (const dep of deps) {
+        const depDependents = data.stateDependents.get(dep);
+        if (depDependents) {
+          depDependents.delete(current);
+        }
       }
+      data.stateDependencies.delete(current);
+      data.values.delete(current);
+      data.abortControllers.delete(current);
+      if (dependents) {
+        for (const dep of dependents) {
+          stack.push(dep);
+        }
+      }
+      for (const dep of deps) {
+        stack.push(dep);
+      }
+      continue;
     }
-    data.stateDependencies.delete(state);
-    data.values.delete(state);
-    data.abortControllers.delete(state);
-    for (const dep of deps) {
-      cleanupOrphanedDeps(dep, data, visited);
-    }
-  }
-  const dependents = data.stateDependents.get(state);
-  if (dependents) {
-    for (const dep of [...dependents]) {
-      cleanupOrphanedDeps(dep, data, visited);
+    if (dependents) {
+      for (const dep of dependents) {
+        stack.push(dep);
+      }
     }
   }
 };
@@ -4017,9 +4091,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.13"}`);
+  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${slot.version}. Attempted to load: ${"1.0.0-beta.14"}`);
 } else {
-  slot.version = "1.0.0-beta.13";
+  slot.version = "1.0.0-beta.14";
 }
 export {
   store,

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.13",
+    "version": "1.0.0-beta.14",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"