valdres 0.2.0-alpha.44 → 0.2.0-alpha.45

package/dist/index.js

@@ -566,11 +566,12 @@ var recursivlyResetTxnSelectorCache = (state, txnSubscribers, txnSelectorCache)
     }
   }
 };
-var transaction = (callback, data) => {
+var transaction = (callback, data, autoCommit = true) => {
   let txnAtomMap = new Map;
   let txnSelectorCache = new Map;
   let txnSubscribers = new Map;
   let dirtySelectors = new Set;
+  let scopedTransactions;
   const txnGet = (state) => {
     if (isAtom(state)) {
       return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState(state, data);
@@ -621,9 +622,34 @@ var transaction = (callback, data) => {
   const commit = () => {
     setAtoms(txnAtomMap, data);
     dirtySelectors.clear();
+    if (scopedTransactions) {
+      for (const scopedTxn of Object.values(scopedTransactions)) {
+        scopedTxn[3]();
+      }
+    }
   };
-  const result = callback(txnSet, txnGet, txnReset, commit);
-  commit();
+  const result = callback(txnSet, txnGet, txnReset, commit, (scopeId, callback2) => {
+    if (scopeId in data.scopes) {
+      const scopedData = data.scopes[scopeId];
+      if (scopedTransactions?.[scopeId] === undefined) {
+        scopedTransactions ||= {};
+        transaction((set, get, reset, commit2, scope) => {
+          scopedTransactions[scopeId] = [
+            set,
+            get,
+            reset,
+            commit2,
+            scope
+          ];
+        }, scopedData, false);
+      }
+      callback2(...scopedTransactions[scopeId]);
+    } else {
+      throw new Error("Scope not found");
+    }
+  });
+  if (autoCommit)
+    commit();
   return result;
 };
 
@@ -695,7 +721,7 @@ var store = (id) => {
   return storeFromStoreData(data);
 };
 // package.json
-var version = "0.2.0-alpha.43";
+var version = "0.2.0-alpha.44";
 
 // src/globalStore.ts
 if (globalThis.__valdres__) {

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

@@ -1,9 +1,3 @@
-import type { State } from "../types/State";
 import type { StoreData } from "../types/StoreData";
-import type { Atom } from "../types/Atom";
-type GetValdresValue = <V>(state: State<V>) => V;
-type SetValdresValue = <V>(state: State<V>, value: V) => void;
-type ResetValdresValue = <V>(atom: Atom<V>) => V;
-type TransactionInterface = (set: SetValdresValue, get: GetValdresValue, reset: ResetValdresValue, commit: () => void) => void;
-export declare const transaction: (callback: TransactionInterface, data: StoreData) => void;
-export {};
+import type { TransactionFn } from "../types/TransactionFn";
+export declare const transaction: (callback: TransactionFn, data: StoreData, autoCommit?: boolean) => void;

package/dist/types/src/types/TransactionFn.d.ts

@@ -1,4 +1,4 @@
 import type { GetValue } from "./GetValue";
 import type { ResetAtom } from "./ResetAtom";
 import type { SetAtom } from "./SetAtom";
-export type TransactionFn = (set: SetAtom, get: GetValue, reset: ResetAtom, commit: () => void) => void;
+export type TransactionFn = (set: SetAtom, get: GetValue, reset: ResetAtom, commit: () => void, scope: (scopeId: string, callback: TransactionFn) => void) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.44",
+    "version": "0.2.0-alpha.45",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -36,5 +36,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "1b5b205b6b1d2783a2e8b41932199a71da540901"
+    "gitHead": "8d9c1d1c9108b11ae9201a2bcd139f384d3884c5"
 }