atom.io 0.16.1 → 0.16.2

package/internal/dist/index.js

@@ -503,11 +503,14 @@ var setAtom = (atom, next, target) => {
   const update = { oldValue, newValue };
   if (target.transactionMeta === null) {
     emitUpdate(atom, update, target);
-  } else if (target.on.transactionApplying && target.parent) {
-    stowUpdate(atom, update, target);
-    if (atom.key.startsWith(`*`)) {
+  } else if (target.parent) {
+    if (target.on.transactionApplying.state === null) {
+      stowUpdate(atom, update, target);
+    } else if (atom.key.startsWith(`*`)) {
       const mutableKey = atom.key.slice(1);
-      const mutable = target.valueMap.get(mutableKey);
+      const mutableAtom = target.atoms.get(mutableKey);
+      let mutable = target.valueMap.get(mutableKey);
+      mutable = copyMutableIfWithinTransaction(mutable, mutableAtom, target);
       mutable.do(update.newValue);
     }
   }
@@ -928,6 +931,7 @@ var Tracker = class {
     return latestUpdateState;
   }
   observeCore(mutableState, latestUpdateState, store) {
+    const subscriptionKey = `tracker:${store.config.name}:${store.transactionMeta === null ? `main` : store.transactionMeta.update.key}:${mutableState.key}`;
     const originalInnerValue = getState(mutableState, store);
     const target = newest(store);
     this.unsubscribeFromInnerValue = originalInnerValue.subscribe(
@@ -935,7 +939,7 @@ var Tracker = class {
       (update) => {
         if (target.operation.open) {
           const unsubscribe = target.on.operationClose.subscribe(
-            mutableState.key,
+            subscriptionKey,
             () => {
               unsubscribe();
               setState(latestUpdateState, update, target);
@@ -954,11 +958,11 @@ var Tracker = class {
           this.unsubscribeFromInnerValue();
           const target2 = newest(store);
           this.unsubscribeFromInnerValue = update.newValue.subscribe(
-            `tracker:${store.config.name}:${target2.transactionMeta === null ? `main` : target2.transactionMeta.update.key}`,
+            subscriptionKey,
             (update2) => {
               if (target2.operation.open) {
                 const unsubscribe = target2.on.operationClose.subscribe(
-                  mutableState.key,
+                  subscriptionKey,
                   () => {
                     unsubscribe();
                     setState(latestUpdateState, update2, target2);
@@ -972,11 +976,12 @@ var Tracker = class {
           );
         }
       },
-      `${store.config.name}: tracker observing inner value`,
+      subscriptionKey,
       store
     );
   }
   updateCore(mutableState, latestUpdateState, store) {
+    const subscriptionKey = `tracker:${store.config.name}:${store.transactionMeta === null ? `main` : store.transactionMeta.update.key}:${mutableState.key}`;
     subscribeToState(
       latestUpdateState,
       ({ newValue, oldValue }) => {
@@ -1003,14 +1008,14 @@ var Tracker = class {
                   store
                 );
               },
-              `${mutableState.key}: tracker observing timeline`,
+              subscriptionKey,
               store
             );
             return;
           }
         }
         const unsubscribe = store.on.operationClose.subscribe(
-          latestUpdateState.key,
+          subscriptionKey,
           () => {
             unsubscribe();
             const mutable = getState(mutableState, store);
@@ -1026,7 +1031,7 @@ var Tracker = class {
           }
         );
       },
-      `${store.config.name}: tracker observing latest update`,
+      subscriptionKey,
       store
     );
   }
@@ -2036,7 +2041,7 @@ var buildTransaction = (key, params, store, id) => {
     transactors: {
       get: (token) => getState(token, child),
       set: (token, value) => setState(token, value, child),
-      run: (token) => runTransaction(token, child),
+      run: (token, id2) => runTransaction(token, id2, child),
       find: (token, key2) => findInStore(token, key2, child),
       env: () => getEnvironmentData(child)
     }