valdres 0.2.0-alpha.60 → 0.2.0-alpha.62

package/dist/index.js

@@ -235,14 +235,7 @@ var findClosestStoreWithAtomInitialized = (atom, data) => {
   return findClosestStoreWithAtomInitialized(atom, data.parent);
 };
 
-// src/lib/initSelector.ts
-class SuspendAndWaitForResolveError extends Error {
-  promise;
-  constructor(promise) {
-    super();
-    this.promise = promise;
-  }
-}
+// src/errors/lib/generateSelectorTrace.ts
 var generateSelectorTrace = (selectors) => {
   const lastIndex = selectors.length - 1;
   return [...selectors].reverse().map((selector, index) => {
@@ -258,21 +251,44 @@ var generateSelectorTrace = (selectors) => {
 `);
 };
 
-class CircularDependencyError extends Error {
+// src/errors/SelectorEvaluationError.ts
+class SelectorEvaluationError extends Error {
   selectors;
-  constructor() {
+  constructor(cause) {
     super();
+    this.cause = cause;
     this.selectors = [];
   }
   track(selector) {
     this.selectors.push(selector);
   }
+  get message() {
+    const firstSelectorName = this.selectors[0].name ?? "Anonymous Selector";
+    return `Selector eval crashed in '${firstSelectorName}'
+${generateSelectorTrace(this.selectors)}`;
+  }
+}
+
+// src/errors/SelectorCircularDependencyError.ts
+class SelectorCircularDependencyError extends SelectorEvaluationError {
+  constructor() {
+    super();
+  }
   get message() {
     const firstSelectorName = this.selectors[0].name ?? "Anonymous Selector";
     return `Circular dependency detected in '${firstSelectorName}'
 ${generateSelectorTrace(this.selectors)}`;
   }
 }
+
+// src/lib/initSelector.ts
+class SuspendAndWaitForResolveError extends Error {
+  promise;
+  constructor(promise) {
+    super();
+    this.promise = promise;
+  }
+}
 var getOrInitConsumersSet = (state, data) => {
   const set = data.stateConsumers.get(state);
   if (set)
@@ -284,7 +300,7 @@ var getOrInitConsumersSet = (state, data) => {
 var evaluateSelector = (selector, data, circularDependencyMap = new WeakSet) => {
   const updatedDependencies = new Set;
   if (circularDependencyMap.has(selector)) {
-    throw new CircularDependencyError;
+    throw new SelectorCircularDependencyError;
   }
   circularDependencyMap.add(selector);
   let result;
@@ -299,8 +315,10 @@ var evaluateSelector = (selector, data, circularDependencyMap = new WeakSet) =>
   } catch (error) {
     if (error instanceof SuspendAndWaitForResolveError) {
       result = error;
-    } else {
+    } else if (error instanceof SelectorEvaluationError) {
       throw error;
+    } else {
+      throw new SelectorEvaluationError(error);
     }
   }
   const currentDependencies = data.stateDependencies.get(selector) ?? new Set;
@@ -337,7 +355,7 @@ var initSelector = (selector, data, circularDependencySet = new WeakSet) => {
   try {
     tmpValue = evaluateSelector(selector, data, circularDependencySet);
   } catch (e) {
-    if (e instanceof CircularDependencyError)
+    if (e instanceof SelectorEvaluationError)
       e.track(selector);
     throw e;
   }
@@ -614,26 +632,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 +736,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/errors/SelectorCircularDependencyError.d.ts

@@ -0,0 +1,5 @@
+import { SelectorEvaluationError } from "./SelectorEvaluationError";
+export declare class SelectorCircularDependencyError extends SelectorEvaluationError {
+    constructor();
+    get message(): string;
+}

package/dist/types/src/errors/SelectorEvaluationError.d.ts

@@ -0,0 +1,7 @@
+import type { Selector } from "../types/Selector";
+export declare class SelectorEvaluationError extends Error {
+    selectors: any[];
+    constructor(cause?: any);
+    track(selector: Selector<any>): void;
+    get message(): string;
+}

package/dist/types/src/errors/lib/generateSelectorTrace.d.ts

@@ -0,0 +1,2 @@
+import type { Selector } from "../../types/Selector";
+export declare const generateSelectorTrace: (selectors: Selector[]) => string;

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.62",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -36,5 +36,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "68285bc25279979283ccf0e75e91248a15445dca"
+    "gitHead": "c7bbe5a9bad35399cce7fd9da5d1935d3be29ce8"
 }