valdres 0.2.0-alpha.4 → 0.2.0-alpha.5

package/dist/index.js

@@ -182,7 +182,6 @@ var handleSelectorResult = (value, selector, data) => {
     value.then((resolved) => {
       data.values.set(selector, resolved);
       updateStateSubscribers(selector, data);
-      console.log(`TODO: Should we check if other selectors are using this?`);
     });
     return value;
   } else {
@@ -446,23 +445,41 @@ var findDependencies = (state, data, result = new Set) => {
   }
   return result;
 };
+var recursivlyResetTxnSelectorCache = (state, txnSubscribers, txnSelectorCache) => {
+  for (const dep of txnSubscribers.get(state)) {
+    txnSelectorCache.delete(dep);
+    if (txnSubscribers.get(dep)?.size) {
+      recursivlyResetTxnSelectorCache(dep, txnSubscribers, txnSelectorCache);
+    }
+  }
+};
 var transaction = (callback, data) => {
   let txnAtomMap = new Map;
   let txnSelectorCache = new Map;
+  let txnSubscribers = new Map;
   let dirtySelectors = new Set;
   const txnGet = (state) => {
     if (isAtom(state)) {
       return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState2(state, data);
-    } else {
+    } else if (isSelector(state)) {
       if (txnSelectorCache.has(state)) {
         return txnSelectorCache.get(state);
-      } else if (dirtySelectors.has(state)) {
-        const res = state.get(txnGet);
-        txnSelectorCache.set(state, res);
-        return res;
-      } else {
-        return getState2(state, data);
       }
+      const deps = new Set;
+      const res = state.get((s) => {
+        deps.add(s);
+        return txnGet(s);
+      });
+      for (const dep of deps) {
+        if (!txnSubscribers.has(dep)) {
+          txnSubscribers.set(dep, new Set);
+        }
+        txnSubscribers.get(dep).add(state);
+      }
+      txnSelectorCache.set(state, res);
+      return res;
+    } else {
+      throw new Error("Unsupported state");
     }
   };
   const txnSet = (atom3, value) => {
@@ -476,6 +493,9 @@ var transaction = (callback, data) => {
       dirtySelectors.add(selector);
       txnSelectorCache.delete(selector);
     }
+    if (txnSubscribers.get(atom3)?.size) {
+      recursivlyResetTxnSelectorCache(atom3, txnSubscribers, txnSelectorCache);
+    }
     txnAtomMap.set(atom3, value);
   };
   const txnReset = (atom3) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.4",
+    "version": "0.2.0-alpha.5",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -34,5 +34,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "1bde879ca28be7fb3e98add8bbcd2c568f8c6911"
+    "gitHead": "75721256957ea160c2a82ac4ebb5a12e4c447f1f"
 }