atom.io 0.3.0 → 0.3.1

package/dist/index.mjs

@@ -18,27 +18,26 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
-  var target3 = {};
+  var target2 = {};
   for (var prop in source)
     if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target3[prop] = source[prop];
+      target2[prop] = source[prop];
   if (source != null && __getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(source)) {
       if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target3[prop] = source[prop];
+        target2[prop] = source[prop];
     }
-  return target3;
+  return target2;
 };
-var __export = (target3, all) => {
+var __export = (target2, all) => {
   for (var name in all)
-    __defProp(target3, name, { get: all[name], enumerable: true });
+    __defProp(target2, name, { get: all[name], enumerable: true });
 };
 
 // src/internal/index.ts
 var internal_exports = {};
 __export(internal_exports, {
   IMPLICIT: () => IMPLICIT,
-  LOG_LEVELS: () => LOG_LEVELS,
   TRANSACTION_PHASES: () => TRANSACTION_PHASES,
   abortTransaction: () => abortTransaction,
   applyTransaction: () => applyTransaction,
@@ -76,7 +75,6 @@ __export(internal_exports, {
   selectorFamily__INTERNAL: () => selectorFamily__INTERNAL,
   selector__INTERNAL: () => selector__INTERNAL,
   setAtomState: () => setAtomState,
-  setLogLevel: () => setLogLevel,
   setSelectorState: () => setSelectorState,
   setState__INTERNAL: () => setState__INTERNAL,
   storeAtom: () => storeAtom,
@@ -92,7 +90,6 @@ __export(internal_exports, {
   undoTransactionUpdate: () => undoTransactionUpdate,
   undo__INTERNAL: () => undo__INTERNAL,
   updateSelectorAtoms: () => updateSelectorAtoms,
-  useLogger: () => useLogger,
   withdraw: () => withdraw
 });
 
@@ -124,7 +121,7 @@ var getState__INTERNAL = (state, store = IMPLICIT.STORE) => {
     (_a = store.config.logger) == null ? void 0 : _a.info(`>> read "${state.key}"`);
     return readCachedValue(state.key, store);
   }
-  if (`get` in state) {
+  if (state.type !== `atom`) {
     (_b = store.config.logger) == null ? void 0 : _b.info(`-> calc "${state.key}"`);
     return computeSelectorState(state);
   }
@@ -587,21 +584,30 @@ var clearStore = (store = IMPLICIT.STORE) => {
 };
 
 // src/internal/operation.ts
-var openOperation = (store) => {
-  var _a;
+var openOperation = (token, store) => {
+  var _a, _b;
   const core = target(store);
+  if (core.operation.open) {
+    console.warn(core.operation.open);
+    (_a = store.config.logger) == null ? void 0 : _a.error(
+      `\u274C failed to setState to "${token.key}" during a setState for "${core.operation.token.key}"`
+    );
+    throw Symbol(`violation`);
+  }
   core.operation = {
     open: true,
     done: /* @__PURE__ */ new Set(),
-    prev: store.valueMap
+    prev: store.valueMap,
+    time: Date.now(),
+    token
   };
-  (_a = store.config.logger) == null ? void 0 : _a.info(`\u2B55`, `operation start`);
+  (_b = store.config.logger) == null ? void 0 : _b.info(`\u2B55 operation start from "${token.key}"`);
 };
 var closeOperation = (store) => {
   var _a;
   const core = target(store);
   core.operation = { open: false };
-  (_a = store.config.logger) == null ? void 0 : _a.info(`\u{1F534}`, `operation done`);
+  (_a = store.config.logger) == null ? void 0 : _a.info(`\u{1F534} operation done`);
 };
 var isDone = (key, store = IMPLICIT.STORE) => {
   var _a;
@@ -834,7 +840,7 @@ function atomFamily__INTERNAL(options, store = IMPLICIT.STORE) {
       var _a;
       const subKey = stringifyJson(key);
       const family = { key: options.key, subKey };
-      const fullKey = `${options.key}__${subKey}`;
+      const fullKey = `${options.key}(${subKey})`;
       const existing = withdraw({ key: fullKey, type: `atom` }, store);
       const token = existing ? deposit(existing) : atom__INTERNAL(
         {
@@ -862,7 +868,7 @@ function readonlySelectorFamily__INTERNAL(options, store) {
     (key) => {
       const subKey = stringifyJson(key);
       const family = { key: options.key, subKey };
-      const fullKey = `${options.key}__${subKey}`;
+      const fullKey = `${options.key}(${subKey})`;
       const existing = core.readonlySelectors.get(fullKey);
       if (existing) {
         return deposit(existing);
@@ -894,7 +900,7 @@ function selectorFamily__INTERNAL(options, store = IMPLICIT.STORE) {
     (key) => {
       const subKey = stringifyJson(key);
       const family = { key: options.key, subKey };
-      const fullKey = `${options.key}__${subKey}`;
+      const fullKey = `${options.key}(${subKey})`;
       const existing = core.selectors.get(fullKey);
       if (existing) {
         return deposit(existing);
@@ -918,39 +924,6 @@ function selectorFamily__INTERNAL(options, store = IMPLICIT.STORE) {
   );
 }
 
-// src/internal/logger.ts
-var LOG_LEVELS = [
-  `info`,
-  `warn`,
-  `error`
-];
-var setLogLevel = (preferredLevel, store = IMPLICIT.STORE) => {
-  const { logger__INTERNAL } = store.config;
-  if (preferredLevel === null) {
-    store.config.logger = null;
-  } else {
-    store.config.logger = __spreadValues({}, console);
-    LOG_LEVELS.forEach((logLevel) => {
-      if (LOG_LEVELS.indexOf(logLevel) < LOG_LEVELS.indexOf(preferredLevel)) {
-        store.config.logger[logLevel] = doNothing;
-      } else {
-        store.config.logger[logLevel] = logger__INTERNAL[logLevel];
-      }
-    });
-  }
-};
-var useLogger = (logger, store = IMPLICIT.STORE) => {
-  var _a;
-  const currentLogLevel = store.config.logger === null ? null : (_a = LOG_LEVELS.find(
-    (logLevel) => {
-      var _a2;
-      return ((_a2 = store.config.logger) == null ? void 0 : _a2[logLevel]) !== doNothing;
-    }
-  )) != null ? _a : null;
-  store.config.logger__INTERNAL = __spreadValues({}, logger);
-  setLogLevel(currentLogLevel, store);
-};
-
 // src/internal/selector-internal.ts
 import HAMT5 from "hamt_plus";
 import * as Rx4 from "rxjs";
@@ -1014,8 +987,9 @@ var registerSelector = (selectorKey, store = IMPLICIT.STORE) => ({
       );
     } else {
       (_b = store.config.logger) == null ? void 0 : _b.info(
-        `\u{1F50C} registerSelector "${selectorKey}" <- "${dependency.key}" =`,
-        dependencyValue
+        `\u{1F50C} registerSelector "${selectorKey}" <- ( "${dependency.key}" =`,
+        dependencyValue,
+        `)`
       );
       core.selectorGraph = core.selectorGraph.set(selectorKey, dependency.key, {
         source: dependency.key
@@ -1207,6 +1181,8 @@ var subscribeToRootAtoms = (state, store) => {
 // src/internal/timeline-internal.ts
 import HAMT7 from "hamt_plus";
 function timeline__INTERNAL(options, store = IMPLICIT.STORE) {
+  var _a, _b;
+  let incompleteSelectorTime = null;
   let incompleteTransactionKey = null;
   const timelineData = {
     at: 0,
@@ -1216,9 +1192,11 @@ function timeline__INTERNAL(options, store = IMPLICIT.STORE) {
   const subscribeToAtom = (token) => {
     const state = withdraw(token, store);
     state.subject.subscribe((update) => {
-      var _a, _b, _c;
+      var _a2, _b2, _c, _d, _e;
+      const storeCurrentSelectorKey = store.operation.open && store.operation.token.type === `selector` ? store.operation.token.key : null;
+      const storeCurrentSelectorTime = store.operation.open && store.operation.token.type === `selector` ? store.operation.time : null;
       const storeCurrentTransactionKey = store.transactionStatus.phase === `applying` ? store.transactionStatus.key : null;
-      (_a = store.config.logger) == null ? void 0 : _a.info(
+      (_a2 = store.config.logger) == null ? void 0 : _a2.info(
         `\u23F3 timeline "${options.key}" saw atom "${token.key}" go (`,
         update.oldValue,
         `->`,
@@ -1232,14 +1210,17 @@ function timeline__INTERNAL(options, store = IMPLICIT.STORE) {
         );
         if (incompleteTransactionKey !== storeCurrentTransactionKey) {
           if (incompleteTransactionKey) {
-            (_b = store.config.logger) == null ? void 0 : _b.error(
+            (_b2 = store.config.logger) == null ? void 0 : _b2.error(
               `Timeline "${options.key}" was unable to resolve transaction "${incompleteTransactionKey}. This is probably a bug.`
             );
           }
           incompleteTransactionKey = storeCurrentTransactionKey;
           const subscription = currentTransaction.subject.subscribe((update2) => {
-            var _a2;
+            var _a3;
             if (timelineData.timeTraveling === false) {
+              if (timelineData.at !== timelineData.history.length) {
+                timelineData.history.splice(timelineData.at);
+              }
               timelineData.history.push(__spreadProps(__spreadValues({
                 type: `transaction_update`
               }, update2), {
@@ -1251,35 +1232,95 @@ function timeline__INTERNAL(options, store = IMPLICIT.STORE) {
             timelineData.at = timelineData.history.length;
             subscription.unsubscribe();
             incompleteTransactionKey = null;
-            (_a2 = store.config.logger) == null ? void 0 : _a2.info(
-              `\u231B timeline "${options.key}" pushed a transaction_update from "${update2.key}"`
+            (_a3 = store.config.logger) == null ? void 0 : _a3.info(
+              `\u231B timeline "${options.key}" got a transaction_update "${update2.key}"`
             );
           });
         }
+      } else if (storeCurrentSelectorKey) {
+        if (timelineData.timeTraveling === false) {
+          if (storeCurrentSelectorTime !== incompleteSelectorTime) {
+            const newSelectorUpdate = {
+              type: `selector_update`,
+              key: storeCurrentSelectorKey,
+              atomUpdates: []
+            };
+            newSelectorUpdate.atomUpdates.push(__spreadValues({
+              key: token.key,
+              type: `atom_update`
+            }, update));
+            if (timelineData.at !== timelineData.history.length) {
+              timelineData.history.splice(timelineData.at);
+            }
+            timelineData.history.push(newSelectorUpdate);
+            (_c = store.config.logger) == null ? void 0 : _c.info(
+              `\u231B timeline "${options.key}" got a selector_update "${storeCurrentSelectorKey}" with`,
+              newSelectorUpdate.atomUpdates.map((atomUpdate) => atomUpdate.key)
+            );
+            timelineData.at = timelineData.history.length;
+            incompleteSelectorTime = storeCurrentSelectorTime;
+          } else {
+            const latestUpdate = timelineData.history.at(-1);
+            if ((latestUpdate == null ? void 0 : latestUpdate.type) === `selector_update`) {
+              latestUpdate.atomUpdates.push(__spreadValues({
+                key: token.key,
+                type: `atom_update`
+              }, update));
+              (_d = store.config.logger) == null ? void 0 : _d.info(
+                `   \u231B timeline "${options.key}" set selector_update "${storeCurrentSelectorKey}" to`,
+                latestUpdate == null ? void 0 : latestUpdate.atomUpdates.map((atomUpdate) => atomUpdate.key)
+              );
+            }
+          }
+        }
       } else {
         if (timelineData.timeTraveling === false) {
+          incompleteSelectorTime = null;
+          if (timelineData.at !== timelineData.history.length) {
+            timelineData.history.splice(timelineData.at);
+          }
           timelineData.history.push({
-            type: `state_update`,
+            type: `atom_update`,
             key: token.key,
             oldValue: update.oldValue,
             newValue: update.newValue
           });
-          (_c = store.config.logger) == null ? void 0 : _c.info(
-            `\u231B timeline "${options.key}" pushed a state_update to "${token.key}"`
+          (_e = store.config.logger) == null ? void 0 : _e.info(
+            `\u231B timeline "${options.key}" got a state_update to "${token.key}"`
           );
           timelineData.at = timelineData.history.length;
         }
       }
     });
   };
+  const core = target(store);
   for (const tokenOrFamily of options.atoms) {
+    const timelineKey = core.timelineAtoms.getRelatedId(tokenOrFamily.key);
+    if (timelineKey) {
+      (_a = store.config.logger) == null ? void 0 : _a.error(
+        `\u274C Failed to add atom "${tokenOrFamily.key}" to timeline "${options.key}" because it belongs to timeline "${timelineKey}"`
+      );
+      continue;
+    }
     if (tokenOrFamily.type === `atom_family`) {
       const family = tokenOrFamily;
       family.subject.subscribe((token) => subscribeToAtom(token));
     } else {
       const token = tokenOrFamily;
+      if (`family` in token && token.family) {
+        const familyTimelineKey = core.timelineAtoms.getRelatedId(
+          token.family.key
+        );
+        if (familyTimelineKey) {
+          (_b = store.config.logger) == null ? void 0 : _b.error(
+            `\u274C Failed to add atom "${token.key}" to timeline "${options.key}" because its family "${token.family.key}" belongs to timeline "${familyTimelineKey}"`
+          );
+          continue;
+        }
+      }
       subscribeToAtom(token);
     }
+    core.timelineAtoms = core.timelineAtoms.set(tokenOrFamily.key, options.key);
   }
   store.timelineStore = HAMT7.set(options.key, timelineData, store.timelineStore);
   return {
@@ -1288,28 +1329,30 @@ function timeline__INTERNAL(options, store = IMPLICIT.STORE) {
   };
 }
 var redo__INTERNAL = (token, store = IMPLICIT.STORE) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
+  (_a = store.config.logger) == null ? void 0 : _a.info(`\u23E9 redo "${token.key}"`);
   const timelineData = store.timelineStore.get(token.key);
   if (!timelineData) {
-    (_a = store.config.logger) == null ? void 0 : _a.error(
-      `Tried to redo on timeline "${token.key}" has not been initialized.`
+    (_b = store.config.logger) == null ? void 0 : _b.error(
+      `Failed to redo on timeline "${token.key}". This timeline has not been initialized.`
     );
     return;
   }
   if (timelineData.at === timelineData.history.length) {
-    (_b = store.config.logger) == null ? void 0 : _b.warn(
-      `Tried to redo on timeline "${token.key}" but there is nothing to redo.`
+    (_c = store.config.logger) == null ? void 0 : _c.warn(
+      `Failed to redo at the end of timeline "${token.key}". There is nothing to redo.`
     );
     return;
   }
   timelineData.timeTraveling = true;
   const update = timelineData.history[timelineData.at];
   switch (update.type) {
-    case `state_update`: {
+    case `atom_update`: {
       const { key, newValue } = update;
       setState({ key, type: `atom` }, newValue);
       break;
     }
+    case `selector_update`:
     case `transaction_update`: {
       for (const atomUpdate of update.atomUpdates) {
         const { key, newValue } = atomUpdate;
@@ -1320,19 +1363,23 @@ var redo__INTERNAL = (token, store = IMPLICIT.STORE) => {
   }
   ++timelineData.at;
   timelineData.timeTraveling = false;
+  (_d = store.config.logger) == null ? void 0 : _d.info(
+    `\u23F9\uFE0F "${token.key}" is now at ${timelineData.at} / ${timelineData.history.length}`
+  );
 };
 var undo__INTERNAL = (token, store = IMPLICIT.STORE) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
+  (_a = store.config.logger) == null ? void 0 : _a.info(`\u23EA undo "${token.key}"`);
   const timelineData = store.timelineStore.get(token.key);
   if (!timelineData) {
-    (_a = store.config.logger) == null ? void 0 : _a.error(
-      `Tried to undo on timeline "${token.key}" has not been initialized.`
+    (_b = store.config.logger) == null ? void 0 : _b.error(
+      `Failed to undo on timeline "${token.key}". This timeline has not been initialized.`
     );
     return;
   }
   if (timelineData.at === 0) {
-    (_b = store.config.logger) == null ? void 0 : _b.warn(
-      `Tried to undo on timeline "${token.key}" but there is nothing to undo.`
+    (_c = store.config.logger) == null ? void 0 : _c.warn(
+      `Failed to undo at the beginning of timeline "${token.key}". There is nothing to undo.`
     );
     return;
   }
@@ -1340,11 +1387,12 @@ var undo__INTERNAL = (token, store = IMPLICIT.STORE) => {
   --timelineData.at;
   const update = timelineData.history[timelineData.at];
   switch (update.type) {
-    case `state_update`: {
+    case `atom_update`: {
       const { key, oldValue } = update;
       setState({ key, type: `atom` }, oldValue);
       break;
     }
+    case `selector_update`:
     case `transaction_update`: {
       for (const atomUpdate of update.atomUpdates) {
         const { key, oldValue } = atomUpdate;
@@ -1354,6 +1402,9 @@ var undo__INTERNAL = (token, store = IMPLICIT.STORE) => {
     }
   }
   timelineData.timeTraveling = false;
+  (_d = store.config.logger) == null ? void 0 : _d.info(
+    `\u23F9\uFE0F "${token.key}" is now at ${timelineData.at} / ${timelineData.history.length}`
+  );
 };
 
 // src/atom.ts
@@ -1364,6 +1415,39 @@ function atomFamily(options) {
   return atomFamily__INTERNAL(options);
 }
 
+// src/logger.ts
+var LOG_LEVELS = [
+  `info`,
+  `warn`,
+  `error`
+];
+var setLogLevel = (preferredLevel, store = IMPLICIT.STORE) => {
+  const { logger__INTERNAL } = store.config;
+  if (preferredLevel === null) {
+    store.config.logger = null;
+  } else {
+    store.config.logger = __spreadValues({}, console);
+    LOG_LEVELS.forEach((logLevel) => {
+      if (LOG_LEVELS.indexOf(logLevel) < LOG_LEVELS.indexOf(preferredLevel)) {
+        store.config.logger[logLevel] = doNothing;
+      } else {
+        store.config.logger[logLevel] = logger__INTERNAL[logLevel];
+      }
+    });
+  }
+};
+var useLogger = (logger, store = IMPLICIT.STORE) => {
+  var _a;
+  const currentLogLevel = store.config.logger === null ? null : (_a = LOG_LEVELS.find(
+    (logLevel) => {
+      var _a2;
+      return ((_a2 = store.config.logger) == null ? void 0 : _a2[logLevel]) !== doNothing;
+    }
+  )) != null ? _a : null;
+  store.config.logger__INTERNAL = __spreadValues({}, logger);
+  setLogLevel(currentLogLevel, store);
+};
+
 // src/selector.ts
 function selector(options) {
   return selector__INTERNAL(options);
@@ -1372,30 +1456,13 @@ function selectorFamily(options) {
   return selectorFamily__INTERNAL(options);
 }
 
-// src/timeline.ts
-var timeline = (options) => {
-  return timeline__INTERNAL(options);
-};
-var redo = (token) => {
-  return redo__INTERNAL(token, IMPLICIT.STORE);
-};
-var undo = (token) => {
-  return undo__INTERNAL(token, IMPLICIT.STORE);
-};
-
-// src/transaction.ts
-function transaction(options) {
-  return transaction__INTERNAL(options);
-}
-var runTransaction = (token, store = IMPLICIT.STORE) => (...parameters) => withdraw(token, store).run(...parameters);
-
 // src/subscribe.ts
 var subscribe = (token, handleUpdate, store = IMPLICIT.STORE) => {
   var _a;
   const state = withdraw(token, store);
   const subscription = state.subject.subscribe(handleUpdate);
   (_a = store.config.logger) == null ? void 0 : _a.info(`\u{1F440} subscribe to "${state.key}"`);
-  const dependencySubscriptions = `get` in state ? subscribeToRootAtoms(state, store) : null;
+  const dependencySubscriptions = state.type !== `atom` ? subscribeToRootAtoms(state, store) : null;
   const unsubscribe = dependencySubscriptions === null ? () => {
     var _a2;
     (_a2 = store.config.logger) == null ? void 0 : _a2.info(`\u{1F648} unsubscribe from "${state.key}"`);
@@ -1425,19 +1492,44 @@ var subscribeToTransaction = (token, handleUpdate, store = IMPLICIT.STORE) => {
   return unsubscribe;
 };
 
+// src/timeline.ts
+var timeline = (options) => {
+  return timeline__INTERNAL(options);
+};
+var redo = (token) => {
+  return redo__INTERNAL(token, IMPLICIT.STORE);
+};
+var undo = (token) => {
+  return undo__INTERNAL(token, IMPLICIT.STORE);
+};
+
+// src/transaction.ts
+function transaction(options) {
+  return transaction__INTERNAL(options);
+}
+var runTransaction = (token, store = IMPLICIT.STORE) => (...parameters) => withdraw(token, store).run(...parameters);
+
 // src/index.ts
 var getState = (token, store = IMPLICIT.STORE) => {
   const state = withdraw(token, store);
   return getState__INTERNAL(state, store);
 };
 var setState = (token, value, store = IMPLICIT.STORE) => {
-  openOperation(store);
+  try {
+    openOperation(token, store);
+  } catch (thrown) {
+    if (!(typeof thrown === `symbol`)) {
+      throw thrown;
+    }
+    return;
+  }
   const state = withdraw(token, store);
   setState__INTERNAL(state, value, store);
   closeOperation(store);
 };
 var isDefault = (token, store = IMPLICIT.STORE) => token.type === `atom` ? isAtomDefault(token.key, store) : isSelectorDefault(token.key, store);
 export {
+  LOG_LEVELS,
   internal_exports as __INTERNAL__,
   atom,
   atomFamily,