valdres 0.2.0-alpha.47 → 0.2.0-alpha.49

package/dist/index.js

@@ -194,22 +194,22 @@ var initAtom = (atom, data) => {
 };
 
 // src/lib/getState.ts
-function getState(state, data) {
+function getState(state, data, circularDependencySet) {
   if (data.values.has(state))
     return data.values.get(state);
   if (isAtom(state)) {
     if ("parent" in data)
-      return getState(state, data.parent);
+      return getState(state, data.parent, circularDependencySet);
     return initAtom(state, data);
   }
   if (isSelector(state))
-    return initSelector(state, data);
+    return initSelector(state, data, circularDependencySet);
   if (isAtomFamily(state)) {
     if ("parent" in data) {
       const closestData = findClosestStoreWithAtomInitialized(state.__keysAtom, data);
-      return getState(state.__keysSelector, closestData);
+      return getState(state.__keysSelector, closestData, circularDependencySet);
     }
-    return getState(state.__keysSelector, data);
+    return getState(state.__keysSelector, data, circularDependencySet);
   }
   if (isSelectorFamily(state)) {
     const array = Array.from(state.__valdresSelectorFamilyMap.keys());
@@ -236,6 +236,36 @@ class SuspendAndWaitForResolveError extends Error {
     this.promise = promise;
   }
 }
+var generateSelectorTrace = (selectors) => {
+  const lastIndex = selectors.length - 1;
+  return selectors.map((selector, index) => {
+    const name = selector.name ?? "Anonymous Selector";
+    if (index === 0) {
+      return `[START] ${name}`;
+    } else if (index === lastIndex) {
+      return `[CRASH] ${name}`;
+    } else {
+      return `        ${" ".repeat(index)}${name}`;
+    }
+  }).join(`
+`);
+};
+
+class CircularDependencyError extends Error {
+  selectors;
+  constructor() {
+    super();
+    this.selectors = [];
+  }
+  track(selector) {
+    this.selectors.push(selector);
+  }
+  get message() {
+    const firstSelectorName = this.selectors[0].name ?? "Anonymous Selector";
+    return `Circular dependency detected in '${firstSelectorName}'
+${generateSelectorTrace(this.selectors)}`;
+  }
+}
 var getOrInitConsumersSet = (state, data) => {
   const set = data.stateConsumers.get(state);
   if (set)
@@ -244,12 +274,16 @@ var getOrInitConsumersSet = (state, data) => {
   data.stateConsumers.set(state, newSet);
   return newSet;
 };
-var evaluateSelector = (selector, data) => {
+var evaluateSelector = (selector, data, circularDependencyMap = new WeakSet) => {
   const updatedDependencies = new Set;
+  if (circularDependencyMap.has(selector)) {
+    throw new CircularDependencyError;
+  }
+  circularDependencyMap.add(selector);
   let result;
   try {
     result = selector.get((state) => {
-      const value = getState(state, data);
+      const value = getState(state, data, circularDependencyMap);
       updatedDependencies.add(state);
       if (isPromiseLike(value))
         throw new SuspendAndWaitForResolveError(value);
@@ -291,8 +325,15 @@ var handleSelectorResult = (value, selector, data) => {
     return value;
   }
 };
-var initSelector = (selector, data) => {
-  const tmpValue = evaluateSelector(selector, data);
+var initSelector = (selector, data, circularDependencySet = new WeakSet) => {
+  let tmpValue;
+  try {
+    tmpValue = evaluateSelector(selector, data, circularDependencySet);
+  } catch (e) {
+    if (e instanceof CircularDependencyError)
+      e.track(selector);
+    throw e;
+  }
   const value = handleSelectorResult(tmpValue, selector, data);
   if (data.expiredValues.has(selector)) {
     const expiredValue = data.expiredValues.get(selector);
@@ -566,6 +607,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 +672,7 @@ var transaction = (callback, data, autoCommit = true) => {
     dirtySelectors.clear();
     if (scopedTransactions) {
       for (const scopedTxn of Object.values(scopedTransactions)) {
-        scopedTxn[3]();
+        scopedTxn.commit();
       }
     }
   };
@@ -636,19 +684,13 @@ 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 '${scopeId}' not found. Registered scopes: ${Object.keys(data.scopes).join(", ")}`);
       }
@@ -727,7 +769,7 @@ var store = (id) => {
   return storeFromStoreData(data);
 };
 // package.json
-var version = "0.2.0-alpha.46";
+var version = "0.2.0-alpha.48";
 
 // src/globalStore.ts
 if (globalThis.__valdres__) {

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

@@ -2,6 +2,6 @@ import type { Atom } from "../types/Atom";
 import type { AtomFamily } from "../types/AtomFamily";
 import type { Selector } from "../types/Selector";
 import type { StoreData } from "../types/StoreData";
-export declare function getState<V, K>(atom: Atom<V>, data: StoreData): V;
-export declare function getState<V, K>(selector: Selector<V>, data: StoreData): V;
-export declare function getState<V, K>(family: AtomFamily<V, K>, data: StoreData): K[];
+export declare function getState<V, K>(atom: Atom<V>, data: StoreData, circularDependencySet?: WeakSet<Selector>): V;
+export declare function getState<V, K>(selector: Selector<V>, data: StoreData, circularDependencySet?: WeakSet<Selector>): V;
+export declare function getState<V, K>(family: AtomFamily<V, K>, data: StoreData, circularDependencySet?: WeakSet<Selector>): K[];

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

@@ -1,4 +1,3 @@
 import type { StoreData } from "../types/StoreData";
 import type { Selector } from "../types/Selector";
-export declare const reEvaluateSelector: <V>(selector: Selector<V>, data: StoreData) => void;
-export declare const initSelector: <V>(selector: Selector<V>, data: StoreData) => V | Promise<V>;
+export declare const initSelector: <V>(selector: Selector<V>, data: StoreData, circularDependencySet?: WeakSet<WeakKey>) => V | Promise<V>;

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.47",
+    "version": "0.2.0-alpha.49",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -36,5 +36,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "c26d007ebb65bdcfb7fd81122cc51b4bcc8f4d22"
+    "gitHead": "1aa6c47faaaf0158c7ff7ed18e3b20648c183e24"
 }