valdres 0.2.0-pre.26 → 0.2.0-pre.28

package/dist/index.js

@@ -96,6 +96,9 @@ var equal = (a, b, updatedAtomsSet) => {
   }
 };
 
+// src/utils/isAtomFamily.ts
+var isAtomFamily = (state) => state && Object.hasOwn(state, "__valdresAtomFamilyMap");
+
 // src/utils/isAtom.ts
 var isAtom = (state) => Object.hasOwn(state, "defaultValue");
 
@@ -156,9 +159,6 @@ ${generateSelectorTrace(this.selectors)}`;
   }
 }
 
-// src/utils/isAtomFamily.ts
-var isAtomFamily = (state) => state && Object.hasOwn(state, "__valdresAtomFamilyMap");
-
 // src/utils/isSelector.ts
 var isSelector = (state) => state && Object.hasOwn(state, "get");
 
@@ -277,6 +277,14 @@ function getState(state, data, initializedAtomsSet, circularDependencySet) {
   if (isAtom(state)) {
     if ("parent" in data)
       return getState(state, data.parent, initializedAtomsSet, circularDependencySet);
+    if (isFamilyAtom(state)) {
+      const familyValue = data.values.get(state.family);
+      if (familyValue?.__index) {
+        if (isAtomDeletedInFamilyIndex(state, familyValue.__index)) {
+          return state.defaultValue;
+        }
+      }
+    }
     initAtom(state, data, initializedAtomsSet);
     initializedAtomsSet.add(state);
     return data.values.get(state);
@@ -310,6 +318,15 @@ var findClosestStoreWithAtomInitialized = (atom, data) => {
     return data;
   return findClosestStoreWithAtomInitialized(atom, data.parent);
 };
+var isAtomDeletedInFamilyIndex = (atom, index) => {
+  if (index.deleted.has(atom))
+    return true;
+  if (index.created.has(atom))
+    return false;
+  if (index.parentIndex)
+    return isAtomDeletedInFamilyIndex(atom, index.parentIndex);
+  return false;
+};
 
 // src/lib/initSelector.ts
 class SuspendAndWaitForResolveError extends Error {
@@ -569,6 +586,20 @@ var propagateDeletedAtoms = (atoms, data, subscriptions = new Set, families = ne
     }
   }
   propagateDirtySelectors(atoms, selectors, data, subscriptions, families);
+  if (families.size > 0 && data.scopes) {
+    for (const scopeId in data.scopes) {
+      const scope = data.scopes[scopeId];
+      const familiesInScope = [];
+      for (const family of families.keys()) {
+        if (scope.values.has(family)) {
+          familiesInScope.push(family);
+        }
+      }
+      if (familiesInScope.length > 0) {
+        propagateUpdatedAtoms(familiesInScope, scope, undefined, undefined, false, timestamp, true);
+      }
+    }
+  }
 };
 var propagateUpdatedAtoms = (atoms, data, subscriptions = new Set, families = new Map, isRecursive = false, timestamp = performance.now(), selectorsOnly = false) => {
   const selectors = new Set;
@@ -602,6 +633,8 @@ var propagateUpdatedAtoms = (atoms, data, subscriptions = new Set, families = ne
         for (const atom of atoms) {
           if (!scope.values.has(atom)) {
             atomsToUpdateInScope.push(atom);
+          } else if (isAtomFamily(atom)) {
+            atomsToUpdateInScope.push(atom);
           }
         }
         if (atomsToUpdateInScope.length > 0) {
@@ -1025,6 +1058,7 @@ class Transaction {
     setAtoms(this.atomMap, this.data, initializedAtomsSet);
     if (this.deleteSet?.size) {
       deleteAtomFamilyAtoms(this.deleteSet, this.data);
+      propagateDeletedAtoms([...this.deleteSet], this.data);
     }
     if (this._scopedTransactions) {
       for (const [, scopedTxn] of this._scopedTransactions) {
@@ -1518,9 +1552,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.26"}`);
+  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${globalThis.__valdres__}. Attempted to load: ${"0.2.0-pre.28"}`);
 } else {
-  globalThis.__valdres__ = "0.2.0-pre.26";
+  globalThis.__valdres__ = "0.2.0-pre.28";
 }
 export {
   store,

package/package.json

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