valdres 1.0.0-beta.7 → 1.0.0-beta.8

package/dist/index.js

@@ -122,40 +122,7 @@ var isFamilyAtom = (state) => isFamilyState(state) && isAtom(state);
 // src/utils/isSelectorFamily.ts
 var isSelectorFamily = (state) => state && Object.hasOwn(state, "__valdresSelectorFamilyMap");
 
-// src/utils/deepFreeze.ts
-var deepFreeze = (obj, seen) => {
-  if (obj === null || obj === undefined)
-    return obj;
-  if (typeof obj !== "object" && typeof obj !== "function")
-    return obj;
-  if (Object.isFrozen(obj) || seen?.has(obj))
-    return obj;
-  if (Array.isArray(obj)) {
-    for (const item of obj) {
-      if (item && typeof item === "object") {
-        seen ??= new WeakSet;
-        seen.add(obj);
-        deepFreeze(item, seen);
-      }
-    }
-  } else {
-    const propNames = Object.getOwnPropertyNames(obj);
-    for (const name of propNames) {
-      const value = obj[name];
-      if (value && typeof value === "object") {
-        seen ??= new WeakSet;
-        seen.add(obj);
-        deepFreeze(value, seen);
-      }
-    }
-  }
-  return Object.freeze(obj);
-};
-
-// src/lib/IS_PROD.ts
-var IS_PROD = typeof process !== "undefined" && process.env != null && process.env.NODE_ENV === "production";
-
-// src/lib/setValueInData.ts
+// src/lib/trackScopeValue.ts
 var trackScopeValue = (key, data) => {
   const parent = data.parent;
   const indexKeys = data.scopeIndexKeys;
@@ -170,30 +137,6 @@ var trackScopeValue = (key, data) => {
   set.add(data);
   indexKeys.add(key);
 };
-var setValueInData = (atom, value, data) => {
-  const isNewAtomInScope = data.parent && Object.hasOwn(atom, "defaultValue") && !data.values.has(atom);
-  let written;
-  if (atom.mutable || IS_PROD) {
-    data.values.set(atom, value);
-    written = value;
-  } else {
-    const frozenValue = value !== null && (typeof value === "object" || typeof value === "function") ? deepFreeze(value) : value;
-    data.values.set(atom, frozenValue);
-    written = frozenValue;
-  }
-  if (isNewAtomInScope) {
-    trackScopeValue(atom, data);
-    const subs = data.subscriptions.get(atom);
-    if (subs) {
-      for (const sub of subs)
-        sub.reRoot?.();
-    }
-  }
-  if (atom.maxAge !== undefined) {
-    data.lastValueWriteAt.set(atom, Date.now());
-  }
-  return written;
-};
 
 // src/lib/atomFamilyIndex.ts
 var getAtomFamilyRenderedMap = (index) => {
@@ -292,13 +235,29 @@ var recursivelyUpdateIndexes = (data, family) => {
     recursivelyUpdateIndexes(scopedData, family);
   }
 };
+var ensureFamilyAncestorChain = (family, data) => {
+  if (!data.parent)
+    return;
+  const parentIndex = initFamilyIndex(family, data.parent);
+  const own = data.values.get(family).__index;
+  if (own.parentIndex !== parentIndex) {
+    own.parentIndex = parentIndex;
+    own.rendered = null;
+    own.renderedArray = null;
+    data.values.set(family, renderAtomFamilyIndex(own));
+    recursivelyUpdateIndexes(data, family);
+  }
+};
 var addFamilyAtomsToSet = (family, familyAtoms, data, timestamp) => {
   if (familyAtoms.size === 0)
-    return;
+    return false;
   const index = findFamilyIndex(family, data);
   if (!index)
     throw new Error("index not found");
+  let membershipChanged = false;
   for (const atom of familyAtoms) {
+    if (!(index.created.has(atom) && !index.deleted.has(atom)))
+      membershipChanged = true;
     index.created.set(atom, timestamp);
     index.deleted.delete(atom);
   }
@@ -306,6 +265,7 @@ var addFamilyAtomsToSet = (family, familyAtoms, data, timestamp) => {
   index.renderedArray = null;
   data.values.set(family, renderAtomFamilyIndex(index));
   recursivelyUpdateIndexes(data, family);
+  return membershipChanged;
 };
 
 // src/errors/lib/generateSelectorTrace.ts
@@ -610,6 +570,69 @@ var flushChangeSink = (sink) => {
   }
 };
 
+// src/utils/deepFreeze.ts
+var deepFreeze = (obj, seen) => {
+  if (obj === null || obj === undefined)
+    return obj;
+  if (typeof obj !== "object" && typeof obj !== "function")
+    return obj;
+  if (Object.isFrozen(obj) || seen?.has(obj))
+    return obj;
+  if (Array.isArray(obj)) {
+    for (const item of obj) {
+      if (item && typeof item === "object") {
+        seen ??= new WeakSet;
+        seen.add(obj);
+        deepFreeze(item, seen);
+      }
+    }
+  } else {
+    const propNames = Object.getOwnPropertyNames(obj);
+    for (const name of propNames) {
+      const value = obj[name];
+      if (value && typeof value === "object") {
+        seen ??= new WeakSet;
+        seen.add(obj);
+        deepFreeze(value, seen);
+      }
+    }
+  }
+  return Object.freeze(obj);
+};
+
+// src/lib/IS_PROD.ts
+var IS_PROD = typeof process !== "undefined" && process.env != null && process.env.NODE_ENV === "production";
+
+// src/lib/setValueInData.ts
+var setValueInData = (atom, value, data) => {
+  const isNewAtomInScope = data.parent && Object.hasOwn(atom, "defaultValue") && !data.values.has(atom);
+  const isNewFamilyInScope = !!data.parent && !data.values.has(atom) && isAtomFamily(atom);
+  let written;
+  if (atom.mutable || IS_PROD) {
+    data.values.set(atom, value);
+    written = value;
+  } else {
+    const frozenValue = value !== null && (typeof value === "object" || typeof value === "function") ? deepFreeze(value) : value;
+    data.values.set(atom, frozenValue);
+    written = frozenValue;
+  }
+  if (isNewAtomInScope) {
+    trackScopeValue(atom, data);
+    const subs = data.subscriptions.get(atom);
+    if (subs) {
+      for (const sub of subs)
+        sub.reRoot?.();
+    }
+  } else if (isNewFamilyInScope) {
+    trackScopeValue(atom, data);
+    ensureFamilyAncestorChain(atom, data);
+  }
+  if (atom.maxAge !== undefined) {
+    data.lastValueWriteAt.set(atom, Date.now());
+  }
+  return written;
+};
+
 // src/lib/initSelector.ts
 var neverAbortedSignal = new AbortController().signal;
 var syncOptionsCache = new WeakMap;
@@ -1017,6 +1040,7 @@ var propagateAtomUpdate = (atoms, data, isInitOnly = false, notify, report, skip
       updatedFamilyAtoms.get(atom.family).add(atom);
     }
   }
+  let membershipChanged;
   if (updatedFamilyAtoms.size > 0) {
     const timestamp = performance.now();
     for (const [family, familyAtoms] of updatedFamilyAtoms) {
@@ -1024,7 +1048,11 @@ var propagateAtomUpdate = (atoms, data, isInitOnly = false, notify, report, skip
       addSetToSet(data.subscriptions.get(family), subscriptions);
       if (familyAtoms.size === 0)
         throw new Error("Should not be possible");
-      addFamilyAtomsToSet(family, familyAtoms, data, timestamp);
+      if (addFamilyAtomsToSet(family, familyAtoms, data, timestamp)) {
+        if (!membershipChanged)
+          membershipChanged = new Set;
+        membershipChanged.add(family);
+      }
     }
   }
   if (data.scopes && data.scopes.size > 0) {
@@ -1058,7 +1086,15 @@ var propagateAtomUpdate = (atoms, data, isInitOnly = false, notify, report, skip
   if (watching && reportIsSink)
     emitOrigin(effectiveReport);
   if (hasScopes) {
-    propagateToScopes(atoms, data, isInitOnly, notify, effectiveReport);
+    let scopeAtoms = atoms;
+    if (membershipChanged) {
+      scopeAtoms = atoms.slice();
+      for (const family of membershipChanged) {
+        if (!scopeAtoms.includes(family))
+          scopeAtoms.push(family);
+      }
+    }
+    propagateToScopes(scopeAtoms, data, isInitOnly, notify, effectiveReport);
   }
   if (watching && !reportIsSink)
     emitOrigin(effectiveReport);
@@ -2520,7 +2556,13 @@ class Transaction {
     if (moveUpIfParent && this.parentTransaction)
       return this.parentTransaction.cloneFamilyIntoTxn(family, parentIndex, moveUpIfParent);
     const currentFamilyList = this.get(family);
-    const clonedIndex = cloneAtomFamilyIndex(currentFamilyList.__index, parentIndex);
+    const scopeFirstMaterialization = this.data.parent && !this._atomMap.has(family) && !this.data.values.has(family);
+    let clonedIndex;
+    if (scopeFirstMaterialization) {
+      clonedIndex = createAtomFamilyIndex(parentIndex ?? currentFamilyList.__index);
+    } else {
+      clonedIndex = cloneAtomFamilyIndex(currentFamilyList.__index, parentIndex);
+    }
     if (this._scopedTransactions?.size) {
       for (const [, scopedTxn] of this._scopedTransactions) {
         scopedTxn.cloneFamilyIntoTxn(family, clonedIndex, false);
@@ -3310,9 +3352,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: ${"1.0.0-beta.7"}`);
+  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${globalThis.__valdres__}. Attempted to load: ${"1.0.0-beta.8"}`);
 } else {
-  globalThis.__valdres__ = "1.0.0-beta.7";
+  globalThis.__valdres__ = "1.0.0-beta.8";
 }
 export {
   store,

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

@@ -14,5 +14,7 @@ export type AtomFamilyIndex = {
 export declare const cloneAtomFamilyIndex: (index: AtomFamilyIndex, parentIndexOverride?: AtomFamilyIndex) => AtomFamilyIndex;
 export declare const createAtomFamilyIndex: (parentIndex?: AtomFamilyIndex) => AtomFamilyIndex;
 export declare const deleteFamilyAtomsFromSet: (family: Family<any>, familyAtoms: Set<AtomFamilyAtom<any>>, data: StoreData, timestamp: number) => void;
+export declare const initFamilyIndex: (family: Family<any>, data: StoreData) => any;
 export declare const recursivelyUpdateIndexes: (data: StoreData, family: Family<any>) => void;
-export declare const addFamilyAtomsToSet: (family: Family<any>, familyAtoms: Set<AtomFamilyAtom<any>>, data: StoreData, timestamp: number) => void;
+export declare const ensureFamilyAncestorChain: (family: Family<any>, data: StoreData) => void;
+export declare const addFamilyAtomsToSet: (family: Family<any>, familyAtoms: Set<AtomFamilyAtom<any>>, data: StoreData, timestamp: number) => boolean;

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

@@ -1,8 +1,6 @@
 import type { Atom } from "../types/Atom";
 import type { AtomFamily } from "../types/AtomFamily";
 import type { StoreData } from "../types/StoreData";
-/** Register `key` in the parent's scopeValueIndex. Throws if called on
- *  a root store — `parent` and `scopeIndexKeys` are only populated for
- *  scoped stores (see createStoreData). */
-export declare const trackScopeValue: (key: WeakKey, data: StoreData) => void;
+import { trackScopeValue } from "./trackScopeValue";
+export { trackScopeValue };
 export declare const setValueInData: <Value extends unknown>(atom: Atom<Value> | AtomFamily<any, any>, value: Value, data: StoreData) => Value;

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

@@ -0,0 +1,10 @@
+import type { StoreData } from "../types/StoreData";
+/** Register `key` (an atom or family) in the parent's scopeValueIndex, recording
+ *  it in this scope's scopeIndexKeys for cleanup on detach. Throws if called on
+ *  a root store — `parent` and `scopeIndexKeys` are only populated for scoped
+ *  stores (see createStoreData).
+ *
+ *  Lives in its own module (rather than setValueInData) so both the scope-value
+ *  write path (setValueInData) and the family-index path (atomFamilyIndex) can
+ *  depend on it without an import cycle. */
+export declare const trackScopeValue: (key: WeakKey, data: StoreData) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "1.0.0-beta.7",
+    "version": "1.0.0-beta.8",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"