valdres 0.2.0-alpha.60 → 0.2.0-alpha.61

package/dist/index.js

@@ -614,26 +614,35 @@ var recursivlyResetTxnSelectorCache = (state, txnSubscribers, txnSelectorCache)
     }
   }
 };
-var captureScopedTransaction = (scopedData, parentGet) => {
+var captureScopedTransaction = (scopedData, parentGetFromTxnOrData) => {
   let txn;
   transaction((scopedTxn) => {
     txn = scopedTxn;
-  }, scopedData, false, parentGet);
+  }, scopedData, false, parentGetFromTxnOrData);
   return txn;
 };
-var transaction = (callback, data, autoCommit = true, parentScopeGet) => {
+var transaction = (callback, data, autoCommit = true, parentGetFromTxnOrData) => {
   const txnAtomMap = new Map;
   const txnSelectorCache = new Map;
   const txnSubscribers = new Map;
   const dirtySelectors = new Set;
   let scopedTransactions;
+  const getFromTxnOrData = (state) => {
+    if (txnAtomMap.has(state)) {
+      return txnAtomMap.get(state);
+    }
+    if (data.values.has(state)) {
+      return data.values.get(state);
+    }
+    if (parentGetFromTxnOrData) {
+      return parentGetFromTxnOrData(state);
+    }
+  };
   const txnGet = (state) => {
     if (isAtom(state)) {
-      if (txnAtomMap.has(state)) {
-        return txnAtomMap.get(state);
-      } else if (parentScopeGet) {
-        return parentScopeGet(state);
-      }
+      const value = getFromTxnOrData(state);
+      if (value)
+        return value;
       return getState(state, data);
     } else if (isSelector(state)) {
       if (txnSelectorCache.has(state)) {
@@ -709,7 +718,7 @@ var transaction = (callback, data, autoCommit = true, parentScopeGet) => {
           scopedTransactions = {};
         }
         if (scopedTransactions[scopeId] === undefined) {
-          scopedTransactions[scopeId] = captureScopedTransaction(scopedData, txnGet);
+          scopedTransactions[scopeId] = captureScopedTransaction(scopedData, getFromTxnOrData);
         }
         return callback2(scopedTransactions[scopeId]);
       } else {

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

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

package/package.json

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