atom.io 0.14.1 → 0.14.3

package/internal/dist/index.cjs

@@ -313,7 +313,8 @@ var Subject = class {
     this.subscribers.delete(key);
   }
   next(value) {
-    for (const subscriber of this.subscribers.values()) {
+    const subscribers = this.subscribers.values();
+    for (const subscriber of subscribers) {
       subscriber(value);
     }
   }
@@ -1298,7 +1299,8 @@ var Tracker = class {
   }
   initializeState(mutableState, store) {
     const latestUpdateStateKey = `*${mutableState.key}`;
-    deleteAtom({ type: `atom`, key: latestUpdateStateKey }, store);
+    store.atoms.delete(latestUpdateStateKey);
+    store.valueMap.delete(latestUpdateStateKey);
     const familyMetaData = mutableState.family ? {
       key: `*${mutableState.family.key}`,
       subKey: mutableState.family.subKey
@@ -1311,6 +1313,10 @@ var Tracker = class {
       familyMetaData,
       store
     );
+    if (store.parent) {
+      const parentValue = store.parent.valueMap.get(latestUpdateStateKey);
+      store.valueMap.set(latestUpdateStateKey, parentValue);
+    }
     return latestUpdateState;
   }
   observeCore(mutableState, latestUpdateState, store) {
@@ -1391,7 +1397,7 @@ var Tracker = class {
           () => {
             unsubscribe();
             const mutable = getState(mutableState, store);
-            const updateNumber = mutable.getUpdateNumber(newValue);
+            const updateNumber = newValue === null ? -1 : mutable.getUpdateNumber(newValue);
             const eventOffset = updateNumber - mutable.cacheUpdateNumber;
             if (newValue && eventOffset === 1) {
               setState(
@@ -1466,6 +1472,9 @@ function createAtomFamily(options, store) {
       subject
     }
   );
+  if (`mutable` in options && typeof options.mutable === `boolean`) {
+    Object.assign(atomFamily, { mutable: options.mutable });
+  }
   const target = newest(store);
   target.families.set(options.key, atomFamily);
   return atomFamily;
@@ -1620,19 +1629,19 @@ var getUpdateToken = (mutableAtomToken) => {
   return updateToken;
 };
 
-// internal/src/mutable/is-atom-token-mutable.ts
-function isAtomTokenMutable(token) {
-  return token.key.endsWith(`::mutable`);
-}
+// internal/src/mutable/get-update-family.ts
+var getUpdateFamily = (mutableAtomFamily, store) => {
+  const target = newest(store);
+  const key = `*${mutableAtomFamily.key}`;
+  const updateFamily = target.families.get(key);
+  return updateFamily;
+};
 
 // internal/src/mutable/transceiver.ts
 function isTransceiver(value) {
   return typeof value === `object` && value !== null && `do` in value && `undo` in value && `subscribe` in value;
 }
 
-// internal/src/mutable/index.ts
-var isAtomMutable = (atom) => `isMutable` in atom;
-
 // internal/src/atom/is-default.ts
 var isAtomDefault = (key, store) => {
   const core = newest(store);
@@ -1718,7 +1727,7 @@ function createAtom(options, family, store) {
 }
 
 // internal/src/atom/delete-atom.ts
-function deleteAtom(atomToken, store) {
+function deleteAtom2(atomToken, store) {
   var _a, _b;
   const target = newest(store);
   const { key } = atomToken;
@@ -1801,7 +1810,13 @@ var NotFoundError = class extends Error {
 
 // internal/src/timeline/add-atom-to-timeline.ts
 var addAtomToTimeline = (atomToken, tl, store) => {
-  const atom = withdraw(atomToken, store);
+  let maybeAtom = withdraw(atomToken, store);
+  if (maybeAtom == null ? void 0 : maybeAtom.mutable) {
+    console.log(`adding transceiver to timeline`, atomToken.key);
+    const updateToken = getUpdateToken(atomToken);
+    maybeAtom = withdraw(updateToken, store);
+  }
+  const atom = maybeAtom;
   if (atom === void 0) {
     throw new Error(
       `Cannot subscribe to atom "${atomToken.key}" because it has not been initialized in store "${store.config.name}"`
@@ -1991,6 +2006,30 @@ var addAtomToTimeline = (atomToken, tl, store) => {
   });
 };
 
+// internal/src/mutable/is-mutable.ts
+function isMutable(atomOrTokenOrFamily, store) {
+  if (`mutable` in atomOrTokenOrFamily) {
+    return atomOrTokenOrFamily.mutable;
+  }
+  if (atomOrTokenOrFamily.type === `atom_family`) {
+    return false;
+  }
+  if (`default` in atomOrTokenOrFamily) {
+    return false;
+  }
+  if (!store) {
+    throw new Error(`Cannot check mutability without a store`);
+  }
+  const atom = withdraw(atomOrTokenOrFamily, store);
+  if (!atom) {
+    throw new Error(`Cannot check mutability without an atom`);
+  }
+  if (`mutable` in atom) {
+    return atom.mutable;
+  }
+  return false;
+}
+
 // internal/src/timeline/create-timeline.ts
 function createTimeline(options, store, data) {
   var _a, _b;
@@ -2009,20 +2048,26 @@ function createTimeline(options, store, data) {
   if (options.shouldCapture) {
     tl.shouldCapture = options.shouldCapture;
   }
+  const timelineKey = options.key;
   const target = newest(store);
   for (const tokenOrFamily of options.atoms) {
-    const timelineKey = target.timelineAtoms.getRelatedKey(tokenOrFamily.key);
-    if (timelineKey) {
+    let atomKey = tokenOrFamily.key;
+    const existingTimelineKey = target.timelineAtoms.getRelatedKey(atomKey);
+    if (existingTimelineKey) {
       store.logger.error(
         `\u274C`,
         `timeline`,
         options.key,
-        `Failed to add atom "${tokenOrFamily.key}" because it already belongs to timeline "${timelineKey}"`
+        `Failed to add atom "${atomKey}" because it already belongs to timeline "${existingTimelineKey}"`
       );
       continue;
     }
     if (tokenOrFamily.type === `atom_family`) {
-      const family = tokenOrFamily;
+      let family = tokenOrFamily;
+      if (isMutable(family)) {
+        family = getUpdateFamily(family, store);
+        atomKey = family.key;
+      }
       family.subject.subscribe(`timeline:${options.key}`, (token2) => {
         addAtomToTimeline(token2, tl, store);
       });
@@ -2032,31 +2077,51 @@ function createTimeline(options, store, data) {
         }
       }
     } else {
-      const token2 = tokenOrFamily;
-      if (`family` in token2 && token2.family) {
+      let atom = withdraw(tokenOrFamily, store);
+      if (atom === void 0) {
+        store.logger.error(
+          `\u274C`,
+          `timeline`,
+          options.key,
+          `Failed to add atom "${atomKey}" because it does not exist in the store`
+        );
+        continue;
+      }
+      if (isMutable(atom)) {
+        const updateAtom = withdraw(getUpdateToken(atom), store);
+        if (updateAtom === void 0) {
+          store.logger.error(
+            `\u274C`,
+            `timeline`,
+            options.key,
+            `Failed to add update atom "${atomKey}" because it does not exist in the store`
+          );
+          continue;
+        }
+        atom = updateAtom;
+        atomKey = atom.key;
+      }
+      if (`family` in atom) {
         const familyTimelineKey = target.timelineAtoms.getRelatedKey(
-          token2.family.key
+          atom.family.key
         );
         if (familyTimelineKey) {
           store.logger.error(
             `\u274C`,
             `timeline`,
             options.key,
-            `Failed to add atom "${token2.key}" because its family "${token2.family.key}" already belongs to timeline "${familyTimelineKey}"`
+            `Failed to add atom "${atom.key}" because its family "${atom.family.key}" already belongs to timeline "${familyTimelineKey}"`
           );
           continue;
         }
       }
-      addAtomToTimeline(token2, tl, store);
+      addAtomToTimeline(atom, tl, store);
     }
-    target.timelineAtoms = target.timelineAtoms.set({
-      atomKey: tokenOrFamily.key,
-      timelineKey: options.key
-    });
+    target.timelineAtoms.set({ atomKey, timelineKey });
   }
   store.timelines.set(options.key, tl);
   const token = {
-    key: options.key,
+    key: timelineKey,
     type: `timeline`
   };
   store.subject.timelineCreation.next(token);
@@ -2395,7 +2460,7 @@ exports.createSelector = createSelector;
 exports.createSelectorFamily = createSelectorFamily;
 exports.createTimeline = createTimeline;
 exports.createTransaction = createTransaction;
-exports.deleteAtom = deleteAtom;
+exports.deleteAtom = deleteAtom2;
 exports.deleteSelector = deleteSelector;
 exports.deposit = deposit;
 exports.eldest = eldest;
@@ -2403,11 +2468,10 @@ exports.evictCachedValue = evictCachedValue;
 exports.getJsonFamily = getJsonFamily;
 exports.getJsonToken = getJsonToken;
 exports.getSelectorDependencyKeys = getSelectorDependencyKeys;
+exports.getUpdateFamily = getUpdateFamily;
 exports.getUpdateToken = getUpdateToken;
 exports.isAtomDefault = isAtomDefault;
 exports.isAtomKey = isAtomKey;
-exports.isAtomMutable = isAtomMutable;
-exports.isAtomTokenMutable = isAtomTokenMutable;
 exports.isDone = isDone;
 exports.isReadonlySelectorKey = isReadonlySelectorKey;
 exports.isSelectorDefault = isSelectorDefault;