atom.io 0.18.0 → 0.18.1

package/internal/dist/index.d.ts

@@ -320,7 +320,7 @@ declare function createStandaloneAtom<T extends Transceiver<any>, J extends Json
 
 declare function createRegularAtom<T>(options: MutableAtomOptions<any, any> | RegularAtomOptions<T>, family: FamilyMetadata | undefined, store: Store): RegularAtomToken<T>;
 
-declare function deleteAtom(atomToken: RegularAtomToken<unknown>, store: Store): void;
+declare function deleteAtom(atomToken: AtomToken<unknown>, store: Store): void;
 
 declare const isAtomDefault: (key: string, store: Store) => boolean;
 declare const markAtomAsDefault: (key: string, store: Store) => void;

package/internal/dist/index.js

@@ -268,6 +268,24 @@ var Future = class extends Promise {
   }
 };
 
+// internal/src/set-state/copy-mutable-if-needed.ts
+function copyMutableIfNeeded(atom, origin, target) {
+  const originValue = origin.valueMap.get(atom.key);
+  const targetValue = target.valueMap.get(atom.key);
+  if (originValue === targetValue) {
+    if (originValue === void 0) {
+      return typeof atom.default === `function` ? atom.default() : atom.default;
+    }
+    origin.logger.info(`\u{1F4C3}`, `atom`, `${atom.key}`, `copying`);
+    const jsonValue = atom.toJson(originValue);
+    const copiedValue = atom.fromJson(jsonValue);
+    target.valueMap.set(atom.key, copiedValue);
+    new Tracker(atom, origin);
+    return copiedValue;
+  }
+  return targetValue;
+}
+
 // internal/src/caching.ts
 function cacheValue(key, value, subject, target) {
   const currentValue = target.valueMap.get(key);
@@ -294,7 +312,12 @@ function cacheValue(key, value, subject, target) {
   return value;
 }
 var readCachedValue = (token, target) => {
-  const value = target.valueMap.get(token.key);
+  let value = target.valueMap.get(token.key);
+  if (token.type === `mutable_atom` && isChildStore(target)) {
+    const { parent } = target;
+    const copiedValue = copyMutableIfNeeded(token, parent, target);
+    value = copiedValue;
+  }
   return value;
 };
 var evictCachedValue = (key, target) => {
@@ -541,34 +564,33 @@ var markDone = (key, store) => {
   store.operation.done.add(key);
 };
 
-// internal/src/set-state/copy-mutable-if-needed.ts
-function copyMutableIfNeeded(atom, origin, target) {
-  const originValue = origin.valueMap.get(atom.key);
-  const targetValue = target.valueMap.get(atom.key);
-  if (originValue === targetValue) {
-    origin.logger.info(`\u{1F4C3}`, `atom`, `${atom.key}`, `copying`);
-    const jsonValue = atom.toJson(originValue);
-    const copiedValue = atom.fromJson(jsonValue);
-    target.valueMap.set(atom.key, copiedValue);
-    new Tracker(atom, origin);
-    return copiedValue;
-  }
-  return targetValue;
-}
-
 // internal/src/set-state/emit-update.ts
 var emitUpdate = (state, update, store) => {
-  store.logger.info(
-    `\u{1F4E2}`,
-    state.type,
-    state.key,
-    `went (`,
-    update.oldValue,
-    `->`,
-    update.newValue,
-    `) subscribers:`,
-    state.subject.subscribers
-  );
+  switch (state.type) {
+    case `mutable_atom`:
+      store.logger.info(
+        `\u{1F4E2}`,
+        state.type,
+        state.key,
+        `is now (`,
+        update.newValue,
+        `) subscribers:`,
+        state.subject.subscribers
+      );
+      break;
+    default:
+      store.logger.info(
+        `\u{1F4E2}`,
+        state.type,
+        state.key,
+        `went (`,
+        update.oldValue,
+        `->`,
+        update.newValue,
+        `) subscribers:`,
+        state.subject.subscribers
+      );
+  }
   state.subject.next(update);
 };
 
@@ -669,14 +691,16 @@ var setAtom = (atom, next, target) => {
       stowUpdate(atom, update, target);
     } else if (atom.key.startsWith(`*`)) {
       const mutableKey = atom.key.slice(1);
-      target.atoms.get(mutableKey);
+      const mutableAtom = target.atoms.get(mutableKey);
       let transceiver = target.valueMap.get(mutableKey);
-      if (atom.type === `mutable_atom` && isChildStore(target)) {
+      if (mutableAtom.type === `mutable_atom` && isChildStore(target)) {
         const { parent } = target;
-        const copiedValue = copyMutableIfNeeded(atom, parent, target);
+        const copiedValue = copyMutableIfNeeded(mutableAtom, parent, target);
         transceiver = copiedValue;
       }
-      transceiver.do(update.newValue);
+      const accepted = transceiver.do(update.newValue) === null;
+      if (accepted)
+        evictDownStream(mutableAtom, target);
     }
   }
 };
@@ -1551,6 +1575,10 @@ function deleteAtom(atomToken, store) {
   target.selectorAtoms.delete(key);
   target.atomsThatAreDefault.delete(key);
   target.timelineAtoms.delete(key);
+  if (atomToken.type === `mutable_atom`) {
+    const updateToken = getUpdateToken(atomToken);
+    deleteAtom(updateToken, store);
+  }
   store.logger.info(`\u{1F525}`, `atom`, `${key}`, `deleted`);
 }
 
@@ -1582,7 +1610,11 @@ function getFromStore(token, store) {
 function ingestAtomUpdate(applying, atomUpdate, store) {
   const { key, newValue, oldValue } = atomUpdate;
   const value = applying === `newValue` ? newValue : oldValue;
-  setIntoStore({ key, type: `atom` }, value, store);
+  const token = { key, type: `atom` };
+  if (atomUpdate.family) {
+    Object.assign(token, { family: atomUpdate.family });
+  }
+  setIntoStore(token, value, store);
 }
 
 // internal/src/ingest-updates/ingest-selector-update.ts
@@ -2050,7 +2082,6 @@ function setEpochNumberOfAction(transactionKey, newEpoch, store) {
   const continuityKey = store.transactionMeta.actionContinuities.getRelatedKey(transactionKey);
   if (continuityKey !== void 0) {
     store.transactionMeta.epoch.set(continuityKey, newEpoch);
-    console.log(`epoch is now`, newEpoch);
   }
 }
 
@@ -2102,7 +2133,6 @@ var applyTransaction = (output, store) => {
   }
   ingestTransactionUpdate(`newValue`, child.transactionMeta.update, parent);
   if (isRootStore(parent)) {
-    console.log(child.transactionMeta.update);
     setEpochNumberOfAction(
       child.transactionMeta.update.key,
       child.transactionMeta.update.epoch,