atom.io 0.13.0 → 0.14.0

package/internal/dist/index.js

@@ -1,5 +1,6 @@
-import { getState, setState, subscribe, subscribeToTimeline, AtomIOLogger, runTransaction } from 'atom.io';
+import { AtomIOLogger, getState, setState, runTransaction } from 'atom.io';
 import { selectJson, stringifyJson, parseJson, selectJsonFamily } from 'atom.io/json';
+import { withdraw as withdraw$1, subscribeToRootAtoms as subscribeToRootAtoms$1 } from 'atom.io/internal';
 
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
@@ -98,151 +99,296 @@ var evictCachedValue = (key, store) => {
   core.valueMap.delete(key);
   store.logger.info(`\u{1F5D1}`, `state`, key, `evicted`);
 };
-var Tracker = class {
-  constructor(mutableState, store) {
-    this.unsubscribeFromInnerValue = null;
-    this.mutableState = mutableState;
-    const target = newest(store);
-    this.latestUpdateState = this.initializeState(mutableState, target);
-    this.observeCore(mutableState, this.latestUpdateState, target);
-    this.updateCore(mutableState, this.latestUpdateState, target);
-    target.trackers.set(mutableState.key, this);
+
+// src/read-or-compute-value.ts
+var readOrComputeValue = (state, store) => {
+  if (isValueCached(state.key, store)) {
+    store.logger.info(`\u{1F4D6}`, state.type, state.key, `reading cached value`);
+    return readCachedValue(state.key, store);
   }
-  initializeState(mutableState, store) {
-    const latestUpdateStateKey = `*${mutableState.key}`;
-    deleteAtom({ type: `atom`, key: latestUpdateStateKey }, store);
-    const familyMetaData = mutableState.family ? {
-      key: `*${mutableState.family.key}`,
-      subKey: mutableState.family.subKey
-    } : void 0;
-    const latestUpdateState = createAtom(
-      {
-        key: latestUpdateStateKey,
-        default: null
-      },
-      familyMetaData,
-      store
+  if (state.type !== `atom`) {
+    store.logger.info(`\u{1F9EE}`, state.type, state.key, `computing value`);
+    return state.get();
+  }
+  const fallback = state.default instanceof Function ? state.default() : state.default;
+  store.logger.info(
+    `\u{1F481}`,
+    `atom`,
+    state.key,
+    `could not find cached value; using default`,
+    fallback
+  );
+  return state.default instanceof Function ? state.default() : state.default;
+};
+
+// src/operation.ts
+var openOperation = (token, store) => {
+  const target = newest(store);
+  if (target.operation.open) {
+    store.logger.error(
+      `\u274C`,
+      token.type,
+      token.key,
+      `failed to setState during a setState for "${target.operation.token.key}"`
     );
-    return latestUpdateState;
+    return `rejection`;
   }
-  observeCore(mutableState, latestUpdateState, store) {
-    const originalInnerValue = getState(mutableState, store);
-    const target = newest(store);
-    this.unsubscribeFromInnerValue = originalInnerValue.subscribe(
-      `tracker:${store.config.name}:${target.transactionMeta === null ? `main` : target.transactionMeta.update.key}`,
-      (update) => {
-        const unsubscribe = store.subject.operationStatus.subscribe(
-          mutableState.key,
-          () => {
-            unsubscribe();
-            setState(latestUpdateState, update, store);
-          }
-        );
-      }
+  target.operation = {
+    open: true,
+    done: /* @__PURE__ */ new Set(),
+    prev: /* @__PURE__ */ new Map(),
+    time: Date.now(),
+    token
+  };
+  store.logger.info(
+    `\u2B55`,
+    token.type,
+    token.key,
+    `operation start in store "${store.config.name}"${target.transactionMeta === null ? `` : ` ${target.transactionMeta.phase} "${target.transactionMeta.update.key}"`}`
+  );
+};
+var closeOperation = (store) => {
+  const target = newest(store);
+  if (target.operation.open) {
+    store.logger.info(
+      `\u{1F534}`,
+      target.operation.token.type,
+      target.operation.token.key,
+      `operation done in store "${store.config.name}"`
     );
-    subscribe(
-      mutableState,
-      (update) => {
-        var _a;
-        if (update.newValue !== update.oldValue) {
-          (_a = this.unsubscribeFromInnerValue) == null ? void 0 : _a.call(this);
-          const target2 = newest(store);
-          this.unsubscribeFromInnerValue = update.newValue.subscribe(
-            `tracker:${store.config.name}:${target2.transactionMeta === null ? `main` : target2.transactionMeta.update.key}`,
-            (update2) => {
-              const unsubscribe = store.subject.operationStatus.subscribe(
-                mutableState.key,
-                () => {
-                  unsubscribe();
-                  setState(latestUpdateState, update2, store);
-                }
-              );
-            }
-          );
-        }
-      },
-      `${store.config.name}: tracker observing inner value`,
-      store
+  }
+  target.operation = { open: false };
+  store.subject.operationStatus.next(target.operation);
+};
+var isDone = (key, store) => {
+  const target = newest(store);
+  if (!target.operation.open) {
+    store.logger.warn(
+      `\u{1F41E}`,
+      `unknown`,
+      key,
+      `isDone called outside of an operation. This is probably a bug.`
     );
+    return true;
   }
-  updateCore(mutableState, latestUpdateState, store) {
-    subscribe(
-      latestUpdateState,
-      ({ newValue, oldValue }) => {
-        const timelineId = store.timelineAtoms.getRelatedKey(
-          latestUpdateState.key
-        );
-        if (timelineId) {
-          const timelineData = store.timelines.get(timelineId);
-          if (timelineData == null ? void 0 : timelineData.timeTraveling) {
-            const unsubscribe2 = subscribeToTimeline(
-              { key: timelineId, type: `timeline` },
-              (update) => {
-                unsubscribe2();
-                setState(
-                  mutableState,
-                  (transceiver) => {
-                    if (update === `redo` && newValue) {
-                      transceiver.do(newValue);
-                    } else if (update === `undo` && oldValue) {
-                      transceiver.undo(oldValue);
-                    }
-                    return transceiver;
-                  },
-                  store
-                );
-              }
-            );
-            return;
-          }
-        }
-        const unsubscribe = store.subject.operationStatus.subscribe(
-          latestUpdateState.key,
-          () => {
-            unsubscribe();
-            const mutable = getState(mutableState, store);
-            const updateNumber = mutable.getUpdateNumber(newValue);
-            const eventOffset = updateNumber - mutable.cacheUpdateNumber;
-            if (newValue && eventOffset === 1) {
-              setState(
-                mutableState,
-                (transceiver) => (transceiver.do(newValue), transceiver),
-                store
-              );
-            }
-          }
-        );
-      },
-      `${store.config.name}: tracker observing latest update`,
-      store
+  return target.operation.done.has(key);
+};
+var markDone = (key, store) => {
+  const target = newest(store);
+  if (!target.operation.open) {
+    store.logger.warn(
+      `\u{1F41E}`,
+      `unknown`,
+      key,
+      `markDone called outside of an operation. This is probably a bug.`
     );
+    return;
   }
+  target.operation.done.add(key);
 };
 
-// src/mutable/create-mutable-atom.ts
-function createMutableAtom(options, store) {
+// src/set-state/become.ts
+var become = (nextVersionOfThing) => (originalThing) => nextVersionOfThing instanceof Function ? nextVersionOfThing(
+  originalThing instanceof Function ? originalThing() : originalThing
+) : nextVersionOfThing;
+
+// src/subject.ts
+var Subject = class {
+  constructor() {
+    this.subscribers = /* @__PURE__ */ new Map();
+  }
+  subscribe(key, subscriber) {
+    this.subscribers.set(key, subscriber);
+    const unsubscribe = () => this.unsubscribe(key);
+    return unsubscribe;
+  }
+  unsubscribe(key) {
+    this.subscribers.delete(key);
+  }
+  next(value) {
+    for (const subscriber of this.subscribers.values()) {
+      subscriber(value);
+    }
+  }
+};
+var StatefulSubject = class extends Subject {
+  constructor(initialState) {
+    super();
+    this.state = initialState;
+  }
+  next(value) {
+    this.state = value;
+    super.next(value);
+  }
+};
+
+// src/set-state/copy-mutable-if-needed.ts
+function copyMutableIfNeeded(atom, transform, 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 = transform.toJson(originValue);
+    const copiedValue = transform.fromJson(jsonValue);
+    target.valueMap.set(atom.key, copiedValue);
+    new Tracker(atom, origin);
+    return copiedValue;
+  }
+  return targetValue;
+}
+
+// src/set-state/copy-mutable-in-transaction.ts
+function copyMutableIfWithinTransaction(oldValue, atom, store) {
+  const target = newest(store);
+  const parent = target.parent;
+  if (parent !== null) {
+    if (`toJson` in atom && `fromJson` in atom) {
+      const copiedValue = copyMutableIfNeeded(atom, atom, parent, target);
+      return copiedValue;
+    }
+    if (`family` in atom) {
+      const family = parent.families.get(atom.family.key);
+      if (family && family.type === `atom_family`) {
+        const result = copyMutableFamilyMemberWithinTransaction(
+          atom,
+          family,
+          parent,
+          target
+        );
+        if (result) {
+          return result;
+        }
+      }
+    }
+  }
+  return oldValue;
+}
+function copyMutableFamilyMemberWithinTransaction(atom, family, origin, target) {
+  if (`toJson` in family && `fromJson` in family) {
+    const copyCreated = copyMutableIfNeeded(atom, family, origin, target);
+    return copyCreated;
+  }
+  return null;
+}
+
+// src/set-state/emit-update.ts
+var emitUpdate = (state, update, store) => {
   store.logger.info(
-    `\u{1F527}`,
-    `atom`,
-    options.key,
-    `creating in store "${store.config.name}"`
+    `\u{1F4E2}`,
+    state.type,
+    state.key,
+    `went (`,
+    update.oldValue,
+    `->`,
+    update.newValue,
+    `) subscribers:`,
+    state.subject.subscribers
   );
-  const coreState = createAtom(options, void 0, store);
-  new Tracker(coreState, store);
-  const jsonState = selectJson(coreState, options, store);
+  state.subject.next(update);
+};
+
+// src/set-state/evict-downstream.ts
+var evictDownStream = (atom, store) => {
   const target = newest(store);
-  subscribe(
-    jsonState,
-    () => {
-      const trackerHasBeenInitialized = newest(store).trackers.has(coreState.key);
-      if (!trackerHasBeenInitialized) {
-        new Tracker(coreState, store);
-      }
-    },
-    `tracker-initializer:${store == null ? void 0 : store.config.name}:${target.transactionMeta === null ? `main` : `${target.transactionMeta.update.key}`}`
+  const downstreamKeys = target.selectorAtoms.getRelatedKeys(atom.key);
+  store.logger.info(
+    `\u{1F9F9}`,
+    atom.type,
+    atom.key,
+    downstreamKeys ? `evicting ${downstreamKeys.size} states downstream:` : `no downstream states`,
+    downstreamKeys != null ? downstreamKeys : `to evict`
   );
-  return coreState;
+  if (downstreamKeys) {
+    if (target.operation.open) {
+      store.logger.info(
+        `\u{1F9F9}`,
+        atom.type,
+        atom.key,
+        `[ ${[...target.operation.done].join(`, `)} ] already done`
+      );
+    }
+    for (const key of downstreamKeys) {
+      if (isDone(key, store)) {
+        continue;
+      }
+      evictCachedValue(key, store);
+      markDone(key, store);
+    }
+  }
+};
+
+// src/set-state/stow-update.ts
+function shouldUpdateBeStowed(key, update) {
+  if (isTransceiver(update.newValue)) {
+    return false;
+  }
+  if (key.includes(`\u{1F441}\u200D\u{1F5E8}`)) {
+    return false;
+  }
+  return true;
 }
+var stowUpdate = (state, update, store) => {
+  const { key } = state;
+  const target = newest(store);
+  if (target.transactionMeta === null || target.transactionMeta.phase !== `building`) {
+    store.logger.error(
+      `\u{1F41E}`,
+      `atom`,
+      key,
+      `stowUpdate called outside of a transaction. This is probably a bug.`
+    );
+    return;
+  }
+  const shouldStow = shouldUpdateBeStowed(key, update);
+  if (!shouldStow) {
+    return;
+  }
+  const atomUpdate = __spreadValues({ key }, update);
+  if (state.family) {
+    atomUpdate.family = state.family;
+  }
+  target.transactionMeta.update.updates.push(atomUpdate);
+  store.logger.info(
+    `\u{1F4C1}`,
+    `atom`,
+    key,
+    `stowed (`,
+    update.oldValue,
+    `->`,
+    update.newValue,
+    `)`
+  );
+};
+
+// src/set-state/set-atom.ts
+var setAtom = (atom, next, store) => {
+  const target = newest(store);
+  const oldValue = readOrComputeValue(atom, store);
+  let newValue = copyMutableIfWithinTransaction(oldValue, atom, store);
+  newValue = become(next)(newValue);
+  store.logger.info(`\u{1F4DD}`, `atom`, atom.key, `set to`, newValue);
+  newValue = cacheValue(atom.key, newValue, atom.subject, store);
+  if (isAtomDefault(atom.key, store)) {
+    markAtomAsNotDefault(atom.key, store);
+  }
+  markDone(atom.key, store);
+  evictDownStream(atom, store);
+  const update = { oldValue, newValue };
+  if (target.transactionMeta === null || target.transactionMeta.phase === `applying`) {
+    emitUpdate(atom, update, store);
+  } else {
+    stowUpdate(atom, update, store);
+  }
+};
+
+// src/set-state/set-atom-or-selector.ts
+var setAtomOrSelector = (state, value, store) => {
+  if (state.type === `selector`) {
+    state.set(value);
+  } else {
+    setAtom(state, value, store);
+  }
+};
 
 // src/store/deposit.ts
 function deposit(state) {
@@ -490,57 +636,27 @@ var Junction = class {
         return [...aRelations].map((b2) => {
           var _a;
           return [b2, (_a = this.getContent(a, b2)) != null ? _a : null];
-        });
-      }
-    }
-    if (a === void 0 && b !== void 0) {
-      const bRelations = this.getRelatedKeys(b);
-      if (bRelations) {
-        return [...bRelations].map((a2) => {
-          var _a;
-          return [a2, (_a = this.getContent(a2, b)) != null ? _a : null];
-        });
-      }
-    }
-    return [];
-  }
-  has(a, b) {
-    var _a;
-    if (b) {
-      const setA = this.getRelatedKeys(a);
-      return (_a = setA == null ? void 0 : setA.has(b)) != null ? _a : false;
-    }
-    return this.relations.has(a);
-  }
-};
-
-// src/subject.ts
-var Subject = class {
-  constructor() {
-    this.subscribers = /* @__PURE__ */ new Map();
-  }
-  subscribe(key, subscriber) {
-    this.subscribers.set(key, subscriber);
-    const unsubscribe = () => this.unsubscribe(key);
-    return unsubscribe;
-  }
-  unsubscribe(key) {
-    this.subscribers.delete(key);
-  }
-  next(value) {
-    for (const subscriber of this.subscribers.values()) {
-      subscriber(value);
+        });
+      }
     }
+    if (a === void 0 && b !== void 0) {
+      const bRelations = this.getRelatedKeys(b);
+      if (bRelations) {
+        return [...bRelations].map((a2) => {
+          var _a;
+          return [a2, (_a = this.getContent(a2, b)) != null ? _a : null];
+        });
+      }
+    }
+    return [];
   }
-};
-var StatefulSubject = class extends Subject {
-  constructor(initialState) {
-    super();
-    this.state = initialState;
-  }
-  next(value) {
-    this.state = value;
-    super.next(value);
+  has(a, b) {
+    var _a;
+    if (b) {
+      const setA = this.getRelatedKeys(a);
+      return (_a = setA == null ? void 0 : setA.has(b)) != null ? _a : false;
+    }
+    return this.relations.has(a);
   }
 };
 
@@ -675,559 +791,568 @@ function withdrawNewFamilyMember(token, store) {
   return void 0;
 }
 
-// src/families/create-atom-family.ts
-function createAtomFamily(options, store) {
-  const subject = new Subject();
-  const atomFamily = Object.assign(
-    (key) => {
-      const subKey = stringifyJson(key);
-      const family = { key: options.key, subKey };
-      const fullKey = `${options.key}(${subKey})`;
-      const existing = withdraw({ key: fullKey, type: `atom` }, store);
-      let token;
-      if (existing) {
-        token = deposit(existing);
-      } else {
-        const individualOptions = {
-          key: fullKey,
-          default: options.default instanceof Function ? options.default(key) : options.default
-        };
-        if (options.effects) {
-          individualOptions.effects = options.effects(key);
-        }
-        token = createAtom(individualOptions, family, store);
-        subject.next(token);
-      }
-      return token;
-    },
-    {
-      key: options.key,
-      type: `atom_family`,
-      subject
-    }
-  );
-  const target = newest(store);
-  target.families.set(options.key, atomFamily);
-  return atomFamily;
-}
+// src/keys.ts
+var isAtomKey = (key, store) => newest(store).atoms.has(key);
+var isSelectorKey = (key, store) => newest(store).selectors.has(key);
+var isReadonlySelectorKey = (key, store) => newest(store).readonlySelectors.has(key);
+var isStateKey = (key, store) => isAtomKey(key, store) || isSelectorKey(key, store) || isReadonlySelectorKey(key, store);
 
-// src/operation.ts
-var openOperation = (token, store) => {
-  const target = newest(store);
-  if (target.operation.open) {
-    store.logger.error(
-      `\u274C`,
-      token.type,
-      token.key,
-      `failed to setState during a setState for "${target.operation.token.key}"`
-    );
-    return `rejection`;
+// src/selector/get-selector-dependency-keys.ts
+var getSelectorDependencyKeys = (key, store) => {
+  const sources = newest(store).selectorGraph.getRelationEntries({ downstreamSelectorKey: key }).filter(([_, { source }]) => source !== key).map(([_, { source }]) => source).filter((source) => isStateKey(source, store));
+  return sources;
+};
+
+// src/selector/trace-selector-atoms.ts
+var traceSelectorAtoms = (selectorKey, directDependencyKey, store) => {
+  const rootKeys = [];
+  const indirectDependencyKeys = getSelectorDependencyKeys(
+    directDependencyKey,
+    store
+  );
+  let depth = 0;
+  while (indirectDependencyKeys.length > 0) {
+    const indirectDependencyKey = indirectDependencyKeys.shift();
+    ++depth;
+    if (depth > 99999) {
+      throw new Error(
+        `Maximum selector dependency depth exceeded (> 99999) in selector "${selectorKey}". This is likely due to a circular dependency.`
+      );
+    }
+    if (!isAtomKey(indirectDependencyKey, store)) {
+      indirectDependencyKeys.push(
+        ...getSelectorDependencyKeys(indirectDependencyKey, store)
+      );
+    } else if (!rootKeys.includes(indirectDependencyKey)) {
+      rootKeys.push(indirectDependencyKey);
+    }
   }
-  target.operation = {
-    open: true,
-    done: /* @__PURE__ */ new Set(),
-    prev: /* @__PURE__ */ new Map(),
-    time: Date.now(),
-    token
-  };
-  store.logger.info(
-    `\u2B55`,
-    token.type,
-    token.key,
-    `operation start in store "${store.config.name}"${target.transactionMeta === null ? `` : ` ${target.transactionMeta.phase} "${target.transactionMeta.update.key}"`}`
+  return rootKeys;
+};
+var traceAllSelectorAtoms = (selectorKey, store) => {
+  const directDependencyKeys = getSelectorDependencyKeys(selectorKey, store);
+  return directDependencyKeys.flatMap(
+    (depKey) => isAtomKey(depKey, store) ? depKey : traceSelectorAtoms(selectorKey, depKey, store)
   );
 };
-var closeOperation = (store) => {
+
+// src/selector/update-selector-atoms.ts
+var updateSelectorAtoms = (selectorKey, dependency, store) => {
   const target = newest(store);
-  if (target.operation.open) {
+  if (dependency.type === `atom`) {
+    target.selectorAtoms.set({
+      selectorKey,
+      atomKey: dependency.key
+    });
     store.logger.info(
-      `\u{1F534}`,
-      target.operation.token.type,
-      target.operation.token.key,
-      `operation done in store "${store.config.name}"`
-    );
-  }
-  target.operation = { open: false };
-  store.subject.operationStatus.next(target.operation);
-};
-var isDone = (key, store) => {
-  const target = newest(store);
-  if (!target.operation.open) {
-    store.logger.warn(
-      `\u{1F41E}`,
-      `unknown`,
-      key,
-      `isDone called outside of an operation. This is probably a bug.`
+      `\u{1F50D}`,
+      `selector`,
+      selectorKey,
+      `discovers root atom "${dependency.key}"`
     );
-    return true;
-  }
-  return target.operation.done.has(key);
-};
-var markDone = (key, store) => {
-  const target = newest(store);
-  if (!target.operation.open) {
-    store.logger.warn(
-      `\u{1F41E}`,
-      `unknown`,
-      key,
-      `markDone called outside of an operation. This is probably a bug.`
+  } else {
+    const rootKeys = traceSelectorAtoms(selectorKey, dependency.key, store);
+    store.logger.info(
+      `\u{1F50D}`,
+      `selector`,
+      selectorKey,
+      `discovers root atoms: [ ${rootKeys.map((key) => `"${key}"`).join(`, `)} ]`
     );
-    return;
-  }
-  target.operation.done.add(key);
-};
-
-// src/set-state/become.ts
-var become = (nextVersionOfThing) => (originalThing) => nextVersionOfThing instanceof Function ? nextVersionOfThing(
-  originalThing instanceof Function ? originalThing() : originalThing
-) : nextVersionOfThing;
-
-// src/read-or-compute-value.ts
-var readOrComputeValue = (state, store) => {
-  if (isValueCached(state.key, store)) {
-    store.logger.info(`\u{1F4D6}`, state.type, state.key, `reading cached value`);
-    return readCachedValue(state.key, store);
-  }
-  if (state.type !== `atom`) {
-    store.logger.info(`\u{1F9EE}`, state.type, state.key, `computing value`);
-    return state.get();
+    for (const atomKey of rootKeys) {
+      target.selectorAtoms = target.selectorAtoms.set({
+        selectorKey,
+        atomKey
+      });
+    }
   }
-  const fallback = state.default instanceof Function ? state.default() : state.default;
-  store.logger.info(
-    `\u{1F481}`,
-    `atom`,
-    state.key,
-    `could not find cached value; using default`,
-    fallback
-  );
-  return state.default instanceof Function ? state.default() : state.default;
 };
 
-// src/set-state/copy-mutable-if-needed.ts
-function copyMutableIfNeeded(atom, transform, 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 = transform.toJson(originValue);
-    const copiedValue = transform.fromJson(jsonValue);
-    target.valueMap.set(atom.key, copiedValue);
-    new Tracker(atom, origin);
-    return copiedValue;
+// src/selector/register-selector.ts
+var registerSelector = (selectorKey, store) => ({
+  get: (dependency) => {
+    const target = newest(store);
+    const alreadyRegistered = target.selectorGraph.getRelationEntries({ downstreamSelectorKey: selectorKey }).some(([_, { source }]) => source === dependency.key);
+    const dependencyState = withdraw(dependency, store);
+    if (dependencyState === void 0) {
+      throw new Error(
+        `State "${dependency.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`
+      );
+    }
+    const dependencyValue = readOrComputeValue(dependencyState, store);
+    store.logger.info(
+      `\u{1F50C}`,
+      `selector`,
+      selectorKey,
+      `registers dependency ( "${dependency.key}" =`,
+      dependencyValue,
+      `)`
+    );
+    if (!alreadyRegistered) {
+      target.selectorGraph.set(
+        {
+          upstreamSelectorKey: dependency.key,
+          downstreamSelectorKey: selectorKey
+        },
+        {
+          source: dependency.key
+        }
+      );
+    }
+    updateSelectorAtoms(selectorKey, dependency, store);
+    return dependencyValue;
+  },
+  set: (stateToken, newValue) => {
+    const state = withdraw(stateToken, store);
+    if (state === void 0) {
+      throw new Error(
+        `State "${stateToken.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`
+      );
+    }
+    setAtomOrSelector(state, newValue, store);
   }
-  return targetValue;
-}
+});
 
-// src/set-state/copy-mutable-in-transaction.ts
-function copyMutableIfWithinTransaction(oldValue, atom, store) {
+// src/selector/create-read-write-selector.ts
+var createReadWriteSelector = (options, family, store) => {
   const target = newest(store);
-  const parent = target.parent;
-  if (parent !== null) {
-    if (`toJson` in atom && `fromJson` in atom) {
-      const copiedValue = copyMutableIfNeeded(atom, atom, parent, target);
-      return copiedValue;
-    }
-    if (`family` in atom) {
-      const family = parent.families.get(atom.family.key);
-      if (family && family.type === `atom_family`) {
-        const result = copyMutableFamilyMemberWithinTransaction(
-          atom,
-          family,
-          parent,
-          target
-        );
-        if (result) {
-          return result;
-        }
-      }
+  const subject = new Subject();
+  const { get, set } = registerSelector(options.key, store);
+  const getSelf = () => {
+    const value = options.get({ get });
+    cacheValue(options.key, value, subject, store);
+    return value;
+  };
+  const setSelf = (next) => {
+    const oldValue = getSelf();
+    const newValue = become(next)(oldValue);
+    store.logger.info(
+      `\u{1F4DD}`,
+      `selector`,
+      options.key,
+      `set (`,
+      oldValue,
+      `->`,
+      newValue,
+      `)`
+    );
+    cacheValue(options.key, newValue, subject, store);
+    markDone(options.key, store);
+    if (target.transactionMeta === null) {
+      subject.next({ newValue, oldValue });
     }
+    options.set({ get, set }, newValue);
+  };
+  const mySelector = __spreadValues(__spreadProps(__spreadValues({}, options), {
+    subject,
+    install: (s) => createSelector(options, family, s),
+    get: getSelf,
+    set: setSelf,
+    type: `selector`
+  }), family && { family });
+  target.selectors.set(options.key, mySelector);
+  const initialValue = getSelf();
+  store.logger.info(`\u2728`, mySelector.type, mySelector.key, `=`, initialValue);
+  const token = {
+    key: options.key,
+    type: `selector`
+  };
+  if (family) {
+    token.family = family;
   }
-  return oldValue;
-}
-function copyMutableFamilyMemberWithinTransaction(atom, family, origin, target) {
-  if (`toJson` in family && `fromJson` in family) {
-    const copyCreated = copyMutableIfNeeded(atom, family, origin, target);
-    return copyCreated;
-  }
-  return null;
-}
-
-// 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
-  );
-  state.subject.next(update);
+  store.subject.selectorCreation.next(token);
+  return token;
 };
 
-// src/set-state/evict-downstream.ts
-var evictDownStream = (atom, store) => {
+// src/selector/create-readonly-selector.ts
+var createReadonlySelector = (options, family, store) => {
   const target = newest(store);
-  const downstreamKeys = target.selectorAtoms.getRelatedKeys(atom.key);
+  const subject = new Subject();
+  const { get } = registerSelector(options.key, store);
+  const getSelf = () => {
+    const value = options.get({ get });
+    cacheValue(options.key, value, subject, store);
+    return value;
+  };
+  const readonlySelector = __spreadValues(__spreadProps(__spreadValues({}, options), {
+    subject,
+    install: (s) => createSelector(options, family, s),
+    get: getSelf,
+    type: `readonly_selector`
+  }), family && { family });
+  target.readonlySelectors.set(options.key, readonlySelector);
+  const initialValue = getSelf();
   store.logger.info(
-    `\u{1F9F9}`,
-    atom.type,
-    atom.key,
-    downstreamKeys ? `evicting ${downstreamKeys.size} states downstream:` : `no downstream states`,
-    downstreamKeys != null ? downstreamKeys : `to evict`
+    `\u2728`,
+    readonlySelector.type,
+    readonlySelector.key,
+    `=`,
+    initialValue
   );
-  if (downstreamKeys) {
-    if (target.operation.open) {
-      store.logger.info(
-        `\u{1F9F9}`,
-        atom.type,
-        atom.key,
-        `[ ${[...target.operation.done].join(`, `)} ] already done`
-      );
-    }
-    for (const key of downstreamKeys) {
-      if (isDone(key, store)) {
-        continue;
-      }
-      evictCachedValue(key, store);
-      markDone(key, store);
-    }
+  const token = {
+    key: options.key,
+    type: `readonly_selector`
+  };
+  if (family) {
+    token.family = family;
   }
+  store.subject.selectorCreation.next(token);
+  return token;
 };
 
-// src/set-state/stow-update.ts
-function shouldUpdateBeStowed(key, update) {
-  if (isTransceiver(update.newValue)) {
-    return false;
-  }
-  if (key.includes(`\u{1F441}\u200D\u{1F5E8}`)) {
-    return false;
-  }
-  return true;
-}
-var stowUpdate = (state, update, store) => {
-  const { key } = state;
+// src/selector/create-selector.ts
+function createSelector(options, family, store) {
   const target = newest(store);
-  if (target.transactionMeta === null || target.transactionMeta.phase !== `building`) {
+  const existingWritable = target.selectors.get(options.key);
+  const existingReadonly = target.readonlySelectors.get(options.key);
+  if (existingWritable || existingReadonly) {
     store.logger.error(
-      `\u{1F41E}`,
-      `atom`,
-      key,
-      `stowUpdate called outside of a transaction. This is probably a bug.`
+      `\u274C`,
+      existingReadonly ? `readonly_selector` : `selector`,
+      options.key,
+      `Tried to create selector, but it already exists in the store. (Ignore if you are in development using hot module replacement.)`
     );
-    return;
-  }
-  const shouldStow = shouldUpdateBeStowed(key, update);
-  if (!shouldStow) {
-    return;
   }
-  const atomUpdate = __spreadValues({ key }, update);
-  if (state.family) {
-    atomUpdate.family = state.family;
+  if (`set` in options) {
+    return createReadWriteSelector(options, family, store);
   }
-  target.transactionMeta.update.updates.push(atomUpdate);
-  store.logger.info(
-    `\u{1F4C1}`,
-    `atom`,
-    key,
-    `stowed (`,
-    update.oldValue,
-    `->`,
-    update.newValue,
-    `)`
-  );
-};
+  return createReadonlySelector(options, family, store);
+}
 
-// src/set-state/set-atom.ts
-var setAtom = (atom, next, store) => {
+// src/selector/delete-selector.ts
+function deleteSelector(selectorToken, store) {
   const target = newest(store);
-  const oldValue = readOrComputeValue(atom, store);
-  let newValue = copyMutableIfWithinTransaction(oldValue, atom, store);
-  newValue = become(next)(newValue);
-  store.logger.info(`\u{1F4DD}`, `atom`, atom.key, `set to`, newValue);
-  newValue = cacheValue(atom.key, newValue, atom.subject, store);
-  if (isAtomDefault(atom.key, store)) {
-    markAtomAsNotDefault(atom.key, store);
-  }
-  markDone(atom.key, store);
-  evictDownStream(atom, store);
-  const update = { oldValue, newValue };
-  if (target.transactionMeta === null || target.transactionMeta.phase === `applying`) {
-    emitUpdate(atom, update, store);
-  } else {
-    stowUpdate(atom, update, store);
-  }
-};
-
-// src/set-state/set-atom-or-selector.ts
-var setAtomOrSelector = (state, value, store) => {
-  if (state.type === `selector`) {
-    state.set(value);
-  } else {
-    setAtom(state, value, store);
+  const { key } = selectorToken;
+  switch (selectorToken.type) {
+    case `selector`:
+      target.selectors.delete(key);
+      break;
+    case `readonly_selector`:
+      target.readonlySelectors.delete(key);
+      break;
   }
-};
-
-// src/keys.ts
-var isAtomKey = (key, store) => newest(store).atoms.has(key);
-var isSelectorKey = (key, store) => newest(store).selectors.has(key);
-var isReadonlySelectorKey = (key, store) => newest(store).readonlySelectors.has(key);
-var isStateKey = (key, store) => isAtomKey(key, store) || isSelectorKey(key, store) || isReadonlySelectorKey(key, store);
+  target.valueMap.delete(key);
+  target.selectorAtoms.delete(key);
+  const downstreamTokens = target.selectorGraph.getRelationEntries({ upstreamSelectorKey: key }).filter(([_, { source }]) => source === key).map(
+    ([downstreamSelectorKey]) => {
+      var _a;
+      return (_a = target.selectors.get(downstreamSelectorKey)) != null ? _a : target.readonlySelectors.get(downstreamSelectorKey);
+    }
+  );
+  for (const downstreamToken of downstreamTokens) {
+    if (downstreamToken) {
+      deleteSelector(downstreamToken, store);
+    }
+  }
+  target.selectorGraph.delete(key);
+  store.logger.info(`\u{1F525}`, selectorToken.type, `${key}`, `deleted`);
+}
 
-// src/selector/get-selector-dependency-keys.ts
-var getSelectorDependencyKeys = (key, store) => {
-  const sources = newest(store).selectorGraph.getRelationEntries({ downstreamSelectorKey: key }).filter(([_, { source }]) => source !== key).map(([_, { source }]) => source).filter((source) => isStateKey(source, store));
-  return sources;
+// src/subscribe/recall-state.ts
+var recallState = (state, store) => {
+  const target = newest(store);
+  if (!target.operation.open) {
+    return target.valueMap.get(state.key);
+  }
+  return target.operation.prev.get(state.key);
 };
 
-// src/selector/trace-selector-atoms.ts
-var traceSelectorAtoms = (selectorKey, directDependencyKey, store) => {
-  const rootKeys = [];
-  const indirectDependencyKeys = getSelectorDependencyKeys(
-    directDependencyKey,
-    store
-  );
-  let depth = 0;
-  while (indirectDependencyKeys.length > 0) {
-    const indirectDependencyKey = indirectDependencyKeys.shift();
-    ++depth;
-    if (depth > 99999) {
+// src/subscribe/subscribe-to-root-atoms.ts
+var subscribeToRootAtoms = (state, store) => {
+  const dependencySubscriptions = `default` in state ? null : traceAllSelectorAtoms(state.key, store).map((atomKey) => {
+    const atom = store.atoms.get(atomKey);
+    if (atom === void 0) {
       throw new Error(
-        `Maximum selector dependency depth exceeded (> 99999) in selector "${selectorKey}". This is likely due to a circular dependency.`
-      );
-    }
-    if (!isAtomKey(indirectDependencyKey, store)) {
-      indirectDependencyKeys.push(
-        ...getSelectorDependencyKeys(indirectDependencyKey, store)
+        `Atom "${atomKey}", a dependency of selector "${state.key}", not found in store "${store.config.name}".`
       );
-    } else if (!rootKeys.includes(indirectDependencyKey)) {
-      rootKeys.push(indirectDependencyKey);
     }
-  }
-  return rootKeys;
-};
-var traceAllSelectorAtoms = (selectorKey, store) => {
-  const directDependencyKeys = getSelectorDependencyKeys(selectorKey, store);
-  return directDependencyKeys.flatMap(
-    (depKey) => isAtomKey(depKey, store) ? depKey : traceSelectorAtoms(selectorKey, depKey, store)
-  );
+    return atom.subject.subscribe(
+      `${state.type}:${state.key}`,
+      (atomChange) => {
+        store.logger.info(
+          `\u{1F4E2}`,
+          state.type,
+          state.key,
+          `root`,
+          atomKey,
+          `went`,
+          atomChange.oldValue,
+          `->`,
+          atomChange.newValue
+        );
+        const oldValue = recallState(state, store);
+        const newValue = readOrComputeValue(state, store);
+        store.logger.info(
+          `\u2728`,
+          state.type,
+          state.key,
+          `went`,
+          oldValue,
+          `->`,
+          newValue
+        );
+        state.subject.next({ newValue, oldValue });
+      }
+    );
+  });
+  return dependencySubscriptions;
 };
-
-// src/selector/update-selector-atoms.ts
-var updateSelectorAtoms = (selectorKey, dependency, store) => {
-  const core = newest(store);
-  if (dependency.type === `atom`) {
-    core.selectorAtoms = core.selectorAtoms.set({
-      selectorKey,
-      atomKey: dependency.key
-    });
+function subscribeToState(token, handleUpdate, key, store) {
+  const state = withdraw$1(token, store);
+  if (state === void 0) {
+    throw new Error(
+      `State "${token.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`
+    );
+  }
+  const unsubFunction = state.subject.subscribe(key, handleUpdate);
+  store.logger.info(`\u{1F440}`, state.type, state.key, `Adding subscription "${key}"`);
+  const dependencyUnsubFunctions = state.type !== `atom` ? subscribeToRootAtoms$1(state, store) : null;
+  const unsubscribe = dependencyUnsubFunctions === null ? () => {
     store.logger.info(
-      `\u{1F50D}`,
-      `selector`,
-      selectorKey,
-      `discovers root atom "${dependency.key}"`
+      `\u{1F648}`,
+      state.type,
+      state.key,
+      `Removing subscription "${key}"`
     );
-  } else {
-    const rootKeys = traceSelectorAtoms(selectorKey, dependency.key, store);
+    unsubFunction();
+  } : () => {
     store.logger.info(
-      `\u{1F50D}`,
-      `selector`,
-      selectorKey,
-      `discovers root atoms: [ ${rootKeys.map((key) => `"${key}"`).join(`, `)} ]`
+      `\u{1F648}`,
+      state.type,
+      state.key,
+      `Removing subscription "${key}"`
     );
-    for (const atomKey of rootKeys) {
-      core.selectorAtoms = core.selectorAtoms.set({
-        selectorKey,
-        atomKey
-      });
+    unsubFunction();
+    for (const unsubFromDependency of dependencyUnsubFunctions) {
+      unsubFromDependency();
     }
+  };
+  return unsubscribe;
+}
+var subscribeToTimeline = (token, handleUpdate, key, store) => {
+  const tl = withdraw$1(token, store);
+  if (tl === void 0) {
+    throw new Error(
+      `Cannot subscribe to timeline "${token.key}": timeline not found in store "${store.config.name}".`
+    );
   }
-};
-
-// src/selector/register-selector.ts
-var registerSelector = (selectorKey, store) => ({
-  get: (dependency) => {
-    const target = newest(store);
-    const alreadyRegistered = target.selectorGraph.getRelationEntries({ downstreamSelectorKey: selectorKey }).some(([_, { source }]) => source === dependency.key);
-    const dependencyState = withdraw(dependency, store);
-    if (dependencyState === void 0) {
-      throw new Error(
-        `State "${dependency.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`
-      );
-    }
-    const dependencyValue = readOrComputeValue(dependencyState, store);
+  store.logger.info(`\u{1F440}`, `timeline`, token.key, `Adding subscription "${key}"`);
+  const unsubscribe = tl.subject.subscribe(key, handleUpdate);
+  return () => {
     store.logger.info(
-      `\u{1F50C}`,
-      `selector`,
-      selectorKey,
-      `registers dependency ( "${dependency.key}" =`,
-      dependencyValue,
-      `)`
+      `\u{1F648}`,
+      `timeline`,
+      token.key,
+      `Removing subscription "${key}" from timeline`
     );
-    if (!alreadyRegistered) {
-      target.selectorGraph = target.selectorGraph.set(
-        {
-          upstreamSelectorKey: dependency.key,
-          downstreamSelectorKey: selectorKey
-        },
-        {
-          source: dependency.key
-        }
-      );
-    }
-    updateSelectorAtoms(selectorKey, dependency, store);
-    return dependencyValue;
-  },
-  set: (stateToken, newValue) => {
-    const state = withdraw(stateToken, store);
-    if (state === void 0) {
-      throw new Error(
-        `State "${stateToken.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`
-      );
-    }
-    setAtomOrSelector(state, newValue, store);
-  }
-});
-
-// src/selector/create-read-write-selector.ts
-var createReadWriteSelector = (options, family, store) => {
-  const target = newest(store);
-  const subject = new Subject();
-  const { get, set } = registerSelector(options.key, store);
-  const getSelf = () => {
-    const value = options.get({ get });
-    cacheValue(options.key, value, subject, store);
-    return value;
+    unsubscribe();
   };
-  const setSelf = (next) => {
-    const oldValue = getSelf();
-    const newValue = become(next)(oldValue);
+};
+var subscribeToTransaction = (token, handleUpdate, key, store) => {
+  const tx = withdraw$1(token, store);
+  if (tx === void 0) {
+    throw new Error(
+      `Cannot subscribe to transaction "${token.key}": transaction not found in store "${store.config.name}".`
+    );
+  }
+  store.logger.info(
+    `\u{1F440}`,
+    `transaction`,
+    token.key,
+    `Adding subscription "${key}"`
+  );
+  const unsubscribe = tx.subject.subscribe(key, handleUpdate);
+  return () => {
     store.logger.info(
-      `\u{1F4DD}`,
-      `selector`,
-      options.key,
-      `set (`,
-      oldValue,
-      `->`,
-      newValue,
-      `)`
+      `\u{1F648}`,
+      `transaction`,
+      token.key,
+      `Removing subscription "${key}"`
+    );
+    unsubscribe();
+  };
+};
+var Tracker = class {
+  constructor(mutableState, store) {
+    this.unsubscribeFromInnerValue = null;
+    this.mutableState = mutableState;
+    const target = newest(store);
+    this.latestUpdateState = this.initializeState(mutableState, target);
+    this.observeCore(mutableState, this.latestUpdateState, target);
+    this.updateCore(mutableState, this.latestUpdateState, target);
+    target.trackers.set(mutableState.key, this);
+  }
+  initializeState(mutableState, store) {
+    const latestUpdateStateKey = `*${mutableState.key}`;
+    deleteAtom({ type: `atom`, key: latestUpdateStateKey }, store);
+    const familyMetaData = mutableState.family ? {
+      key: `*${mutableState.family.key}`,
+      subKey: mutableState.family.subKey
+    } : void 0;
+    const latestUpdateState = createAtom(
+      {
+        key: latestUpdateStateKey,
+        default: null
+      },
+      familyMetaData,
+      store
+    );
+    return latestUpdateState;
+  }
+  observeCore(mutableState, latestUpdateState, store) {
+    const originalInnerValue = getState(mutableState, store);
+    const target = newest(store);
+    this.unsubscribeFromInnerValue = originalInnerValue.subscribe(
+      `tracker:${store.config.name}:${target.transactionMeta === null ? `main` : target.transactionMeta.update.key}`,
+      (update) => {
+        const unsubscribe = store.subject.operationStatus.subscribe(
+          mutableState.key,
+          () => {
+            unsubscribe();
+            setState(latestUpdateState, update, store);
+          }
+        );
+      }
+    );
+    subscribeToState(
+      mutableState,
+      (update) => {
+        var _a;
+        if (update.newValue !== update.oldValue) {
+          (_a = this.unsubscribeFromInnerValue) == null ? void 0 : _a.call(this);
+          const target2 = newest(store);
+          this.unsubscribeFromInnerValue = update.newValue.subscribe(
+            `tracker:${store.config.name}:${target2.transactionMeta === null ? `main` : target2.transactionMeta.update.key}`,
+            (update2) => {
+              const unsubscribe = store.subject.operationStatus.subscribe(
+                mutableState.key,
+                () => {
+                  unsubscribe();
+                  setState(latestUpdateState, update2, store);
+                }
+              );
+            }
+          );
+        }
+      },
+      `${store.config.name}: tracker observing inner value`,
+      store
+    );
+  }
+  updateCore(mutableState, latestUpdateState, store) {
+    subscribeToState(
+      latestUpdateState,
+      ({ newValue, oldValue }) => {
+        const timelineId = store.timelineAtoms.getRelatedKey(
+          latestUpdateState.key
+        );
+        if (timelineId) {
+          const timelineData = store.timelines.get(timelineId);
+          if (timelineData == null ? void 0 : timelineData.timeTraveling) {
+            const unsubscribe2 = subscribeToTimeline(
+              { key: timelineId, type: `timeline` },
+              (update) => {
+                unsubscribe2();
+                setState(
+                  mutableState,
+                  (transceiver) => {
+                    if (update === `redo` && newValue) {
+                      transceiver.do(newValue);
+                    } else if (update === `undo` && oldValue) {
+                      transceiver.undo(oldValue);
+                    }
+                    return transceiver;
+                  },
+                  store
+                );
+              },
+              `${mutableState.key}: tracker observing timeline`,
+              store
+            );
+            return;
+          }
+        }
+        const unsubscribe = store.subject.operationStatus.subscribe(
+          latestUpdateState.key,
+          () => {
+            unsubscribe();
+            const mutable = getState(mutableState, store);
+            const updateNumber = mutable.getUpdateNumber(newValue);
+            const eventOffset = updateNumber - mutable.cacheUpdateNumber;
+            if (newValue && eventOffset === 1) {
+              setState(
+                mutableState,
+                (transceiver) => (transceiver.do(newValue), transceiver),
+                store
+              );
+            }
+          }
+        );
+      },
+      `${store.config.name}: tracker observing latest update`,
+      store
     );
-    cacheValue(options.key, newValue, subject, store);
-    markDone(options.key, store);
-    if (target.transactionMeta === null) {
-      subject.next({ newValue, oldValue });
-    }
-    options.set({ get, set }, newValue);
-  };
-  const mySelector = __spreadValues(__spreadProps(__spreadValues({}, options), {
-    subject,
-    install: (s) => createSelector(options, family, s),
-    get: getSelf,
-    set: setSelf,
-    type: `selector`
-  }), family && { family });
-  target.selectors.set(options.key, mySelector);
-  const initialValue = getSelf();
-  store.logger.info(`\u2728`, mySelector.type, mySelector.key, `=`, initialValue);
-  const token = {
-    key: options.key,
-    type: `selector`
-  };
-  if (family) {
-    token.family = family;
   }
-  store.subject.selectorCreation.next(token);
-  return token;
 };
 
-// src/selector/create-readonly-selector.ts
-var createReadonlySelector = (options, family, store) => {
-  const target = newest(store);
-  const subject = new Subject();
-  const { get } = registerSelector(options.key, store);
-  const getSelf = () => {
-    const value = options.get({ get });
-    cacheValue(options.key, value, subject, store);
-    return value;
-  };
-  const readonlySelector = __spreadValues(__spreadProps(__spreadValues({}, options), {
-    subject,
-    install: (s) => createSelector(options, family, s),
-    get: getSelf,
-    type: `readonly_selector`
-  }), family && { family });
-  target.readonlySelectors.set(options.key, readonlySelector);
-  const initialValue = getSelf();
+// src/mutable/create-mutable-atom.ts
+function createMutableAtom(options, store) {
   store.logger.info(
-    `\u2728`,
-    readonlySelector.type,
-    readonlySelector.key,
-    `=`,
-    initialValue
+    `\u{1F527}`,
+    `atom`,
+    options.key,
+    `creating in store "${store.config.name}"`
   );
-  const token = {
-    key: options.key,
-    type: `readonly_selector`
-  };
-  if (family) {
-    token.family = family;
-  }
-  store.subject.selectorCreation.next(token);
-  return token;
-};
-
-// src/selector/create-selector.ts
-function createSelector(options, family, store) {
+  const coreState = createAtom(options, void 0, store);
+  new Tracker(coreState, store);
+  const jsonState = selectJson(coreState, options, store);
   const target = newest(store);
-  const existingWritable = target.selectors.get(options.key);
-  const existingReadonly = target.readonlySelectors.get(options.key);
-  if (existingWritable || existingReadonly) {
-    store.logger.error(
-      `\u274C`,
-      existingReadonly ? `readonly_selector` : `selector`,
-      options.key,
-      `Tried to create selector, but it already exists in the store. (Ignore if you are in development using hot module replacement.)`
-    );
-  }
-  if (`set` in options) {
-    return createReadWriteSelector(options, family, store);
-  }
-  return createReadonlySelector(options, family, store);
+  subscribeToState(
+    jsonState,
+    () => {
+      const trackerHasBeenInitialized = newest(store).trackers.has(coreState.key);
+      if (!trackerHasBeenInitialized) {
+        new Tracker(coreState, store);
+      }
+    },
+    `tracker-initializer:${store == null ? void 0 : store.config.name}:${target.transactionMeta === null ? `main` : `${target.transactionMeta.update.key}`}`,
+    store
+  );
+  return coreState;
 }
-
-// src/selector/delete-selector.ts
-function deleteSelector(selectorToken, store) {
-  const target = newest(store);
-  const { key } = selectorToken;
-  switch (selectorToken.type) {
-    case `selector`:
-      target.selectors.delete(key);
-      break;
-    case `readonly_selector`:
-      target.readonlySelectors.delete(key);
-      break;
-  }
-  target.valueMap.delete(key);
-  target.selectorAtoms.delete(key);
-  const downstreamTokens = target.selectorGraph.getRelationEntries({ upstreamSelectorKey: key }).filter(([_, { source }]) => source === key).map(
-    ([downstreamSelectorKey]) => {
-      var _a;
-      return (_a = target.selectors.get(downstreamSelectorKey)) != null ? _a : target.readonlySelectors.get(downstreamSelectorKey);
+function createAtomFamily(options, store) {
+  const subject = new Subject();
+  const atomFamily = Object.assign(
+    (key) => {
+      const subKey = stringifyJson(key);
+      const family = { key: options.key, subKey };
+      const fullKey = `${options.key}(${subKey})`;
+      const existing = withdraw({ key: fullKey, type: `atom` }, store);
+      let token;
+      if (existing) {
+        token = deposit(existing);
+      } else {
+        const individualOptions = {
+          key: fullKey,
+          default: options.default instanceof Function ? options.default(key) : options.default
+        };
+        if (options.effects) {
+          individualOptions.effects = options.effects(key);
+        }
+        token = createAtom(individualOptions, family, store);
+        subject.next(token);
+      }
+      return token;
+    },
+    {
+      key: options.key,
+      type: `atom_family`,
+      subject
     }
   );
-  for (const downstreamToken of downstreamTokens) {
-    if (downstreamToken) {
-      deleteSelector(downstreamToken, store);
-    }
-  }
-  target.selectorGraph.delete(key);
-  store.logger.info(`\u{1F525}`, selectorToken.type, `${key}`, `deleted`);
+  const target = newest(store);
+  target.families.set(options.key, atomFamily);
+  return atomFamily;
 }
-
-// src/families/create-readonly-selector-family.ts
 function createReadonlySelectorFamily(options, store) {
   const subject = new Subject();
   return Object.assign(
@@ -1454,7 +1579,7 @@ function createAtom(options, family, store) {
     for (const effect of options.effects) {
       const cleanup = effect({
         setSelf: (next) => setState(token, next, store),
-        onSet: (handle) => subscribe(token, handle, `effect[${effectIndex}]`, store)
+        onSet: (handle) => subscribeToState(token, handle, `effect[${effectIndex}]`, store)
       });
       if (cleanup) {
         cleanupFunctions.push(cleanup);
@@ -1553,62 +1678,6 @@ var NotFoundError = class extends Error {
   }
 };
 
-// src/subscribe/recall-state.ts
-var recallState = (state, store) => {
-  const target = newest(store);
-  if (!target.operation.open) {
-    store.logger.warn(
-      `\u{1F41E}`,
-      state.type,
-      state.key,
-      `recall called outside of an operation. This is probably a bug.`
-    );
-    return target.valueMap.get(state.key);
-  }
-  return target.operation.prev.get(state.key);
-};
-
-// src/subscribe/subscribe-to-root-atoms.ts
-var subscribeToRootAtoms = (state, store) => {
-  const dependencySubscriptions = `default` in state ? null : traceAllSelectorAtoms(state.key, store).map((atomKey) => {
-    const atom = store.atoms.get(atomKey);
-    if (atom === void 0) {
-      throw new Error(
-        `Atom "${atomKey}", a dependency of selector "${state.key}", not found in store "${store.config.name}".`
-      );
-    }
-    return atom.subject.subscribe(
-      `${state.type}:${state.key}`,
-      (atomChange) => {
-        store.logger.info(
-          `\u{1F4E2}`,
-          state.type,
-          state.key,
-          `root`,
-          atomKey,
-          `went`,
-          atomChange.oldValue,
-          `->`,
-          atomChange.newValue
-        );
-        const oldValue = recallState(state, store);
-        const newValue = readOrComputeValue(state, store);
-        store.logger.info(
-          `\u2728`,
-          state.type,
-          state.key,
-          `went`,
-          oldValue,
-          `->`,
-          newValue
-        );
-        state.subject.next({ newValue, oldValue });
-      }
-    );
-  });
-  return dependencySubscriptions;
-};
-
 // src/timeline/add-atom-to-timeline.ts
 var addAtomToTimeline = (atomToken, tl, store) => {
   const atom = withdraw(atomToken, store);
@@ -2168,6 +2237,6 @@ var undoTransactionUpdate = (transactionUpdate, store) => {
 // src/transaction/index.ts
 var TRANSACTION_PHASES = [`idle`, `building`, `applying`];
 
-export { FamilyTracker, Future, IMPLICIT, LazyMap, NotFoundError, StatefulSubject, Store, Subject, TRANSACTION_PHASES, Tracker, abortTransaction, addAtomToTimeline, applyTransaction, become, buildTransaction, cacheValue, clearStore, closeOperation, createAtom, createAtomFamily, createMutableAtom, createMutableAtomFamily, createReadonlySelectorFamily, createSelector, createSelectorFamily, createTimeline, createTransaction, deleteAtom, deleteSelector, deposit, eldest, evictCachedValue, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getUpdateToken, isAtomDefault, isAtomKey, isAtomMutable, isAtomTokenMutable, isDone, isReadonlySelectorKey, isSelectorDefault, isSelectorKey, isStateKey, isTransceiver, isValueCached, markAtomAsDefault, markAtomAsNotDefault, markDone, newest, openOperation, readCachedValue, readOrComputeValue, redoTransactionUpdate, registerSelector, setAtomOrSelector, subscribeToRootAtoms, timeTravel, traceAllSelectorAtoms, traceSelectorAtoms, undoTransactionUpdate, updateSelectorAtoms, withdraw, withdrawNewFamilyMember };
+export { FamilyTracker, Future, IMPLICIT, LazyMap, NotFoundError, StatefulSubject, Store, Subject, TRANSACTION_PHASES, Tracker, abortTransaction, addAtomToTimeline, applyTransaction, become, buildTransaction, cacheValue, clearStore, closeOperation, createAtom, createAtomFamily, createMutableAtom, createMutableAtomFamily, createReadonlySelectorFamily, createSelector, createSelectorFamily, createTimeline, createTransaction, deleteAtom, deleteSelector, deposit, eldest, evictCachedValue, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getUpdateToken, isAtomDefault, isAtomKey, isAtomMutable, isAtomTokenMutable, isDone, isReadonlySelectorKey, isSelectorDefault, isSelectorKey, isStateKey, isTransceiver, isValueCached, markAtomAsDefault, markAtomAsNotDefault, markDone, newest, openOperation, readCachedValue, readOrComputeValue, redoTransactionUpdate, registerSelector, setAtomOrSelector, subscribeToRootAtoms, subscribeToState, subscribeToTimeline, subscribeToTransaction, timeTravel, traceAllSelectorAtoms, traceSelectorAtoms, undoTransactionUpdate, updateSelectorAtoms, withdraw, withdrawNewFamilyMember };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.js.map