valdres 0.2.0-pre.20 → 0.2.0-pre.22

package/dist/index.js

@@ -144,6 +144,18 @@ ${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/utils/isAtomFamily.ts
 var isAtomFamily = (state) => state && Object.hasOwn(state, "__valdresAtomFamilyMap");
 
@@ -317,7 +329,9 @@ var getOrInitDependentsSet = (state, data) => {
 };
 var evaluateSelector = (selector, data, initializedAtomsSet, circularDependencySet = new WeakSet) => {
   const updatedDependencies = new Set;
-  if (circularDependencySet.has(selector)) {}
+  if (circularDependencySet.has(selector)) {
+    throw new SelectorCircularDependencyError;
+  }
   circularDependencySet.add(selector);
   let result;
   try {
@@ -349,6 +363,7 @@ var evaluateSelector = (selector, data, initializedAtomsSet, circularDependencyS
     set.delete(selector);
   }
   data.stateDependencies.set(selector, updatedDependencies);
+  circularDependencySet.delete(selector);
   return result;
 };
 var handleSelectorResult = (value, selector, data) => {
@@ -555,16 +570,18 @@ var propagateDeletedAtoms = (atoms, data, subscriptions = new Set, families = ne
   }
   propagateDirtySelectors(atoms, selectors, data, subscriptions, families);
 };
-var propagateUpdatedAtoms = (atoms, data, subscriptions = new Set, families = new Map, isRecursive = false, timestamp = performance.now()) => {
+var propagateUpdatedAtoms = (atoms, data, subscriptions = new Set, families = new Map, isRecursive = false, timestamp = performance.now(), selectorsOnly = false) => {
   const selectors = new Set;
   for (const atom of atoms) {
     addSetToSet(data.stateDependents.get(atom), selectors);
-    addSetToSet(data.subscriptions.get(atom), subscriptions);
-    if (isFamilyAtom(atom)) {
-      if (!families.has(atom.family)) {
-        families.set(atom.family, new Set);
+    if (!selectorsOnly) {
+      addSetToSet(data.subscriptions.get(atom), subscriptions);
+      if (isFamilyAtom(atom)) {
+        if (!families.has(atom.family)) {
+          families.set(atom.family, new Set);
+        }
+        families.get(atom.family).add(atom);
       }
-      families.get(atom.family).add(atom);
     }
   }
   if (families.size > 0) {
@@ -578,6 +595,20 @@ var propagateUpdatedAtoms = (atoms, data, subscriptions = new Set, families = ne
   }
   if (!isRecursive) {
     propagateDirtySelectors(atoms, selectors, data, subscriptions, families);
+    if (data.scopes) {
+      for (const scopeId in data.scopes) {
+        const scope = data.scopes[scopeId];
+        const atomsToUpdateInScope = [];
+        for (const atom of atoms) {
+          if (!scope.values.has(atom)) {
+            atomsToUpdateInScope.push(atom);
+          }
+        }
+        if (atomsToUpdateInScope.length > 0) {
+          propagateUpdatedAtoms(atomsToUpdateInScope, scope, undefined, undefined, false, timestamp, true);
+        }
+      }
+    }
   }
 };
 var propagateDirtySelectors = (updatedAtoms, selectors, data, subscriptions, families) => {
@@ -1472,9 +1503,9 @@ var isFamilySelector = (state) => isFamilyState(state) && isSelector(state);
 
 // src/index.ts
 if (globalThis.__valdres__) {
-  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${globalThis.__valdres__}. Attempted to load: ${"0.2.0-pre.20"}`);
+  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${globalThis.__valdres__}. Attempted to load: ${"0.2.0-pre.22"}`);
 } else {
-  globalThis.__valdres__ = "0.2.0-pre.20";
+  globalThis.__valdres__ = "0.2.0-pre.22";
 }
 export {
   store,

package/dist/types/lib/propagateUpdatedAtoms.d.ts

@@ -20,6 +20,6 @@ export declare const createAtomFamilyIndex: (parentIndex?: AtomFamilyIndex) => A
 export declare const deleteFamilyAtomsFromSet: (family: Family<any>, familyAtoms: Set<AtomFamilyAtom<any>>, data: StoreData, timestamp: number) => void;
 export declare const addFamilyAtomsToSet: (family: Family<any>, familyAtoms: Set<AtomFamilyAtom<any>>, data: StoreData, timestamp: Number) => void;
 export declare const propagateDeletedAtoms: (atoms: AtomFamilyAtom<any, any>[], data: StoreData, subscriptions?: Set<Subscription>, families?: Map<AtomFamily<any>, Set<AtomFamilyAtom<any>>>, timestamp?: number) => void;
-export declare const propagateUpdatedAtoms: (atoms: (Atom<any> | AtomFamilyAtom<any, any> | AtomFamily<any, any>)[], data: StoreData, subscriptions?: Set<Subscription>, families?: Map<AtomFamily<any>, Set<AtomFamilyAtom<any>>>, isRecursive?: boolean, timestamp?: number) => void;
+export declare const propagateUpdatedAtoms: (atoms: (Atom<any> | AtomFamilyAtom<any, any> | AtomFamily<any, any>)[], data: StoreData, subscriptions?: Set<Subscription>, families?: Map<AtomFamily<any>, Set<AtomFamilyAtom<any>>>, isRecursive?: boolean, timestamp?: number, selectorsOnly?: boolean) => void;
 export declare const propagateDirtySelectors: (updatedAtoms: Atom[], selectors: Set<Selector>, data: StoreData, subscriptions: Set<Subscription>, families: Map<AtomFamily<any>, Set<AtomFamilyAtom<any>>>) => void;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-pre.20",
+    "version": "0.2.0-pre.22",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"