valdres 0.2.0-alpha.46 → 0.2.0-alpha.48

package/dist/index.js

@@ -566,6 +566,13 @@ var recursivlyResetTxnSelectorCache = (state, txnSubscribers, txnSelectorCache)
     }
   }
 };
+var captureScopedTransaction = (scopedData) => {
+  let txn;
+  transaction((scopedTxn) => {
+    txn = scopedTxn;
+  }, scopedData, false);
+  return txn;
+};
 var transaction = (callback, data, autoCommit = true) => {
   let txnAtomMap = new Map;
   let txnSelectorCache = new Map;
@@ -624,7 +631,7 @@ var transaction = (callback, data, autoCommit = true) => {
     dirtySelectors.clear();
     if (scopedTransactions) {
       for (const scopedTxn of Object.values(scopedTransactions)) {
-        scopedTxn[3]();
+        scopedTxn.commit();
       }
     }
   };
@@ -636,21 +643,15 @@ var transaction = (callback, data, autoCommit = true) => {
     scope: (scopeId, callback2) => {
       if (scopeId in data.scopes) {
         const scopedData = data.scopes[scopeId];
-        if (scopedTransactions?.[scopeId] === undefined) {
-          scopedTransactions ||= {};
-          transaction(({ set, get, reset, commit: commit2, scope }) => {
-            scopedTransactions[scopeId] = [
-              set,
-              get,
-              reset,
-              commit2,
-              scope
-            ];
-          }, scopedData, false);
+        if (scopedTransactions === undefined) {
+          scopedTransactions = {};
+        }
+        if (scopedTransactions[scopeId] === undefined) {
+          scopedTransactions[scopeId] = captureScopedTransaction(scopedData);
         }
-        callback2(...scopedTransactions[scopeId]);
+        return callback2(scopedTransactions[scopeId]);
       } else {
-        throw new Error("Scope not found");
+        throw new Error(`Scope '${scopeId}' not found. Registered scopes: ${Object.keys(data.scopes).join(", ")}`);
       }
     }
   });
@@ -727,7 +728,7 @@ var store = (id) => {
   return storeFromStoreData(data);
 };
 // package.json
-var version = "0.2.0-alpha.45";
+var version = "0.2.0-alpha.47";
 
 // src/globalStore.ts
 if (globalThis.__valdres__) {

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

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

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

@@ -1,2 +1,2 @@
 import type { TransactionInterface } from "./TransactionInterface";
-export type TransactionFn = (args: TransactionInterface) => void;
+export type TransactionFn = (args: TransactionInterface) => any;

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

@@ -7,5 +7,5 @@ export type TransactionInterface = {
     get: GetValue;
     reset: ResetAtom;
     commit: () => void;
-    scope: (scopeId: string, callback: TransactionFn) => void;
+    scope: <Callback extends TransactionFn>(scopeId: string, callback: Callback) => ReturnType<Callback>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.46",
+    "version": "0.2.0-alpha.48",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -36,5 +36,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "ffb8cb2b276f5f8ff00a7f922776218a6697ea26"
+    "gitHead": "65baebd620f63795b27466864bf54a249323bd57"
 }