valdres 0.2.0-alpha.59 → 0.2.0-alpha.60

package/dist/index.js

@@ -614,22 +614,27 @@ var recursivlyResetTxnSelectorCache = (state, txnSubscribers, txnSelectorCache)
     }
   }
 };
-var captureScopedTransaction = (scopedData) => {
+var captureScopedTransaction = (scopedData, parentGet) => {
   let txn;
   transaction((scopedTxn) => {
     txn = scopedTxn;
-  }, scopedData, false);
+  }, scopedData, false, parentGet);
   return txn;
 };
-var transaction = (callback, data, autoCommit = true) => {
-  let txnAtomMap = new Map;
-  let txnSelectorCache = new Map;
-  let txnSubscribers = new Map;
-  let dirtySelectors = new Set;
+var transaction = (callback, data, autoCommit = true, parentScopeGet) => {
+  const txnAtomMap = new Map;
+  const txnSelectorCache = new Map;
+  const txnSubscribers = new Map;
+  const dirtySelectors = new Set;
   let scopedTransactions;
   const txnGet = (state) => {
     if (isAtom(state)) {
-      return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState(state, data);
+      if (txnAtomMap.has(state)) {
+        return txnAtomMap.get(state);
+      } else if (parentScopeGet) {
+        return parentScopeGet(state);
+      }
+      return getState(state, data);
     } else if (isSelector(state)) {
       if (txnSelectorCache.has(state)) {
         return txnSelectorCache.get(state);
@@ -647,8 +652,8 @@ var transaction = (callback, data, autoCommit = true) => {
       }
       txnSelectorCache.set(state, res);
       return res;
-    } else if (isFamily(state)) {
-      return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState(state.__keysSelector, data);
+    } else if (isAtomFamily(state)) {
+      return txnGet(state.__keysSelector);
     } else {
       throw new Error("Unsupported state");
     }
@@ -668,6 +673,14 @@ var transaction = (callback, data, autoCommit = true) => {
       recursivlyResetTxnSelectorCache(atom, txnSubscribers, txnSelectorCache);
     }
     txnAtomMap.set(atom, value);
+    if (isFamilyAtom(atom)) {
+      const currentKeySet = txnGet(atom.family.__keysAtom);
+      if (!currentKeySet.has(atom.familyKey)) {
+        const newSet = new Set(currentKeySet);
+        newSet.add(atom.familyKey);
+        txnSet(atom.family.__keysAtom, newSet);
+      }
+    }
     return value;
   };
   const txnReset = (atom) => {
@@ -696,7 +709,7 @@ var transaction = (callback, data, autoCommit = true) => {
           scopedTransactions = {};
         }
         if (scopedTransactions[scopeId] === undefined) {
-          scopedTransactions[scopeId] = captureScopedTransaction(scopedData);
+          scopedTransactions[scopeId] = captureScopedTransaction(scopedData, txnGet);
         }
         return callback2(scopedTransactions[scopeId]);
       } else {

package/dist/types/src/lib/transaction.d.ts

@@ -1,3 +1,4 @@
+import type { GetValue } from "../types/GetValue";
 import type { StoreData } from "../types/StoreData";
 import type { TransactionFn } from "../types/TransactionFn";
-export declare const transaction: (callback: TransactionFn, data: StoreData, autoCommit?: boolean) => any;
+export declare const transaction: (callback: TransactionFn, data: StoreData, autoCommit?: boolean, parentScopeGet?: GetValue) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.59",
+    "version": "0.2.0-alpha.60",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -36,5 +36,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "7e66391e22da3c056ade60b1f735238fbc25a9d3"
+    "gitHead": "68285bc25279979283ccf0e75e91248a15445dca"
 }