mobx 7.0.0 → 7.0.1

package/dist/mobx.esm.development.js

@@ -259,7 +259,8 @@ class Atom {
   constructor(name_ = "Atom@" + getNextId() ) {
     this.name_ = void 0;
     this.flags_ = 0b000;
-    this.observers_ = new Set();
+    // Allocated lazily on first observer to save memory.
+    this.observers_ = null;
     this.lastAccessedBy_ = 0;
     this.lowestObserverState_ = -1 /* IDerivationState_.NOT_TRACKING_ */;
     // onBecomeObservedListeners
@@ -341,6 +342,10 @@ function compareShallow(a, b) {
 const compareDefault = Object.is;
 
 function deepEnhancer(v, _, name) {
+  // primitives can never be made observable; skip the type checks below
+  if (v === null || typeof v !== "object" && typeof v !== "function") {
+    return v;
+  }
   // it is an observable already, done
   if (isObservable(v)) {
     return v;
@@ -1281,7 +1286,8 @@ class ComputedValue {
     // nodes we are looking at. Our value depends on these nodes
     this.newObserving_ = null;
     // during tracking it's an array with new observed observers
-    this.observers_ = new Set();
+    // Lazily allocated on first observer - see Atom.observers_.
+    this.observers_ = null;
     this.runId_ = 0;
     this.lastAccessedBy_ = 0;
     this.lowestObserverState_ = 0 /* IDerivationState_.UP_TO_DATE_ */;
@@ -1364,9 +1370,9 @@ class ComputedValue {
     if (this.isComputing) {
       die(32, this.name_, this.derivation);
     }
-    if (globalState.inBatch === 0 &&
+    if (globalState.inBatch === 0 && (
     // !globalState.trackingDerivatpion &&
-    this.observers_.size === 0 && !this.keepAlive_) {
+    !this.observers_ || this.observers_.size === 0) && !this.keepAlive_) {
       if (shouldCompute(this)) {
         this.warnAboutUntrackedRead_();
         startBatch(); // See perf test 'computed memoization'
@@ -1374,6 +1380,7 @@ class ComputedValue {
         endBatch();
       }
     } else {
+      const wasBeingObserved = this.isBeingObserved;
       reportObserved(this);
       if (shouldCompute(this)) {
         let prevTrackingContext = globalState.trackingContext;
@@ -1384,6 +1391,10 @@ class ComputedValue {
           propagateChangeConfirmed(this);
         }
         globalState.trackingContext = prevTrackingContext;
+      } else if (!wasBeingObserved && this.isBeingObserved) {
+        // We just became observed while serving a cached value, so the getter
+        // won't run and won't re-report our dependencies. Cascade to them. #4547
+        this.observing_.forEach(markObserved);
       }
     }
     const result = this.value_;
@@ -1552,7 +1563,7 @@ function isComputingDerivation() {
   return globalState.trackingDerivation !== null; // filter out actions inside computations
 }
 function checkIfStateModificationsAreAllowed(atom) {
-  const hasObservers = atom.observers_.size > 0;
+  const hasObservers = !!atom.observers_ && atom.observers_.size > 0;
   // Should not be possible to change observed state outside strict mode, except during initialization, see #563
   if (!globalState.allowStateChanges && (hasObservers || globalState.enforceActions === "always")) {
     console.warn("[MobX] " + (globalState.enforceActions ? "Since strict-mode is enabled, changing (observed) observable values without using an action is not allowed. Tried to modify: " : "Side effects like changing state are not allowed at this point. Are you trying to modify state from, for example, a computed value or the render function of a React component? You can wrap side effects in 'runInAction' (or decorate functions with 'action') if needed. Tried to modify: ") + atom.name_);
@@ -1775,6 +1786,13 @@ class MobXGlobals {
      * Are we currently processing reactions?
      */
     this.isRunningReactions = false;
+    /**
+     * Are we currently draining pendingUnobservations in endBatch?
+     * An onBecomeUnobserved handler can dispose a Reaction, which calls
+     * startBatch/endBatch again; this guards against re-entering the same
+     * drain loop recursively (see endBatch in observable.ts).
+     */
+    this.isRunningUnobservations = false;
     /**
      * Is it allowed to change observables at this point?
      * In general, MobX doesn't allow that when running computations and React.render.
@@ -1891,10 +1909,11 @@ function resetGlobalState() {
 }
 
 function hasObservers(observable) {
-  return observable.observers_ && observable.observers_.size > 0;
+  return !!observable.observers_ && observable.observers_.size > 0;
 }
 function getObservers(observable) {
-  return observable.observers_;
+  var _observable$observers;
+  return (_observable$observers = observable.observers_) != null ? _observable$observers : new Set();
 }
 // function invariantObservers(observable: IObservable) {
 //     const list = observable.observers
@@ -1914,10 +1933,8 @@ function getObservers(observable) {
 //     )
 // }
 function addObserver(observable, node) {
-  // invariant(node.dependenciesState !== -1, "INTERNAL ERROR, can add only dependenciesState !== -1");
-  // invariant(observable._observers.indexOf(node) === -1, "INTERNAL ERROR add already added node");
-  // invariantObservers(observable);
-  observable.observers_.add(node);
+  var _observable$observers2;
+  ((_observable$observers2 = observable.observers_) != null ? _observable$observers2 : observable.observers_ = new Set()).add(node);
   if (observable.lowestObserverState_ > node.dependenciesState_) {
     observable.lowestObserverState_ = node.dependenciesState_;
   }
@@ -1928,8 +1945,12 @@ function removeObserver(observable, node) {
   // invariant(globalState.inBatch > 0, "INTERNAL ERROR, remove should be called only inside batch");
   // invariant(observable._observers.indexOf(node) !== -1, "INTERNAL ERROR remove already removed node");
   // invariantObservers(observable);
-  observable.observers_.delete(node);
-  if (observable.observers_.size === 0) {
+  const observers = observable.observers_;
+  if (!observers) {
+    return;
+  }
+  observers.delete(node);
+  if (observers.size === 0) {
     // deleting last observer
     queueForUnobservation(observable);
   }
@@ -1955,26 +1976,59 @@ function endBatch() {
   if (--globalState.inBatch === 0) {
     runReactions();
     // the batch is actually about to finish, all unobserving should happen here.
-    const list = globalState.pendingUnobservations;
-    for (let i = 0; i < list.length; i++) {
-      const observable = list[i];
-      observable.isPendingUnobservation = false;
-      if (observable.observers_.size === 0) {
-        if (observable.isBeingObserved) {
-          // if this observable had reactive observers, trigger the hooks
-          observable.isBeingObserved = false;
-          observable.onBUO();
-        }
-        if (observable instanceof ComputedValue) {
-          // computed values are automatically teared down when the last observer leaves
-          // this process happens recursively, this computed might be the last observabe of another, etc..
-          observable.suspend_();
+    // Guard against re-entering this loop: an onBUO handler can dispose a Reaction,
+    // which calls startBatch/endBatch again while we're still iterating. Bail out of
+    // the nested call instead of recursing; the outer loop re-reads list.length on
+    // every iteration, so it picks up anything the nested dispose() pushes onto the
+    // same pendingUnobservations array.
+    if (!globalState.isRunningUnobservations) {
+      globalState.isRunningUnobservations = true;
+      try {
+        const list = globalState.pendingUnobservations;
+        for (let i = 0; i < list.length; i++) {
+          const observable = list[i];
+          observable.isPendingUnobservation = false;
+          if (!observable.observers_ || observable.observers_.size === 0) {
+            if (observable.isBeingObserved) {
+              // if this observable had reactive observers, trigger the hooks
+              observable.isBeingObserved = false;
+              observable.onBUO();
+            }
+            if (observable instanceof ComputedValue) {
+              // computed values are automatically teared down when the last observer leaves
+              // this process happens recursively, this computed might be the last observabe of another, etc..
+              observable.suspend_();
+            }
+          }
         }
+        globalState.pendingUnobservations = [];
+      } finally {
+        // Always release the guard, even if an onBUO handler (user code) threw,
+        // otherwise every future endBatch() would see isRunningUnobservations
+        // stuck true and silently stop draining pendingUnobservations forever.
+        globalState.isRunningUnobservations = false;
       }
     }
-    globalState.pendingUnobservations = [];
   }
 }
+/**
+ * Marks an observable as observed, cascading into the dependencies of a ComputedValue.
+ * Unobservation already cascades (`suspend_` -> `clearObserving`), observation normally
+ * only does so by accident: a newly observed computed usually recomputes and re-reports
+ * its dependencies. When it serves a cached value instead nothing re-reports them, so the
+ * transition has to be propagated by hand. See #4547.
+ */
+function markObserved(observable) {
+  var _observable$observing;
+  if (observable.isBeingObserved) {
+    return;
+  }
+  observable.isBeingObserved = true;
+  observable.onBO();
+  // No queueForUnobservation here: the observer links already exist, so the regular
+  // suspend_ -> clearObserving -> removeObserver teardown still delivers the onBUO.
+  (_observable$observing = observable.observing_) == null || _observable$observing.forEach(markObserved);
+}
 function reportObserved(observable) {
   checkIfStateReadsAreAllowed(observable);
   const derivation = globalState.trackingDerivation;
@@ -1994,7 +2048,7 @@ function reportObserved(observable) {
       }
     }
     return observable.isBeingObserved;
-  } else if (observable.observers_.size === 0 && globalState.inBatch > 0) {
+  } else if ((!observable.observers_ || observable.observers_.size === 0) && globalState.inBatch > 0) {
     queueForUnobservation(observable);
   }
   return false;
@@ -2021,13 +2075,14 @@ function reportObserved(observable) {
  */
 // Called by Atom when its value changes
 function propagateChanged(observable) {
+  var _observable$observers3;
   // invariantLOS(observable, "changed start");
   if (observable.lowestObserverState_ === 2 /* IDerivationState_.STALE_ */) {
     return;
   }
   observable.lowestObserverState_ = 2 /* IDerivationState_.STALE_ */;
   // Ideally we use for..of here, but the downcompiled version is really slow...
-  observable.observers_.forEach(d => {
+  (_observable$observers3 = observable.observers_) == null || _observable$observers3.forEach(d => {
     if (d.dependenciesState_ === 0 /* IDerivationState_.UP_TO_DATE_ */) {
       d.onBecomeStale_();
     }
@@ -2037,12 +2092,13 @@ function propagateChanged(observable) {
 }
 // Called by ComputedValue when it recalculate and its value changed
 function propagateChangeConfirmed(observable) {
+  var _observable$observers4;
   // invariantLOS(observable, "confirmed start");
   if (observable.lowestObserverState_ === 2 /* IDerivationState_.STALE_ */) {
     return;
   }
   observable.lowestObserverState_ = 2 /* IDerivationState_.STALE_ */;
-  observable.observers_.forEach(d => {
+  (_observable$observers4 = observable.observers_) == null || _observable$observers4.forEach(d => {
     if (d.dependenciesState_ === 1 /* IDerivationState_.POSSIBLY_STALE_ */) {
       d.dependenciesState_ = 2 /* IDerivationState_.STALE_ */;
     } else if (d.dependenciesState_ === 0 /* IDerivationState_.UP_TO_DATE_ */ // this happens during computing of `d`, just keep lowestObserverState up to date.
@@ -2054,12 +2110,13 @@ function propagateChangeConfirmed(observable) {
 }
 // Used by computed when its dependency changed, but we don't wan't to immediately recompute.
 function propagateMaybeChanged(observable) {
+  var _observable$observers5;
   // invariantLOS(observable, "maybe start");
   if (observable.lowestObserverState_ !== 0 /* IDerivationState_.UP_TO_DATE_ */) {
     return;
   }
   observable.lowestObserverState_ = 1 /* IDerivationState_.POSSIBLY_STALE_ */;
-  observable.observers_.forEach(d => {
+  (_observable$observers5 = observable.observers_) == null || _observable$observers5.forEach(d => {
     if (d.dependenciesState_ === 0 /* IDerivationState_.UP_TO_DATE_ */) {
       d.dependenciesState_ = 1 /* IDerivationState_.POSSIBLY_STALE_ */;
       d.onBecomeStale_();
@@ -4314,31 +4371,16 @@ class ObservableSet {
     });
   }
   intersection(otherSet) {
-    if (isES6Set(otherSet) && !isObservableSet(otherSet)) {
-      return otherSet.intersection(this);
-    } else {
-      const dehancedSet = new Set(this);
-      return dehancedSet.intersection(otherSet);
-    }
+    return new Set(this).intersection(otherSet);
   }
   union(otherSet) {
-    if (isES6Set(otherSet) && !isObservableSet(otherSet)) {
-      return otherSet.union(this);
-    } else {
-      const dehancedSet = new Set(this);
-      return dehancedSet.union(otherSet);
-    }
+    return new Set(this).union(otherSet);
   }
   difference(otherSet) {
     return new Set(this).difference(otherSet);
   }
   symmetricDifference(otherSet) {
-    if (isES6Set(otherSet) && !isObservableSet(otherSet)) {
-      return otherSet.symmetricDifference(this);
-    } else {
-      const dehancedSet = new Set(this);
-      return dehancedSet.symmetricDifference(otherSet);
-    }
+    return new Set(this).symmetricDifference(otherSet);
   }
   isSubsetOf(otherSet) {
     return new Set(this).isSubsetOf(otherSet);
@@ -4347,12 +4389,7 @@ class ObservableSet {
     return new Set(this).isSupersetOf(otherSet);
   }
   isDisjointFrom(otherSet) {
-    if (isES6Set(otherSet) && !isObservableSet(otherSet)) {
-      return otherSet.isDisjointFrom(this);
-    } else {
-      const dehancedSet = new Set(this);
-      return dehancedSet.isDisjointFrom(otherSet);
-    }
+    return new Set(this).isDisjointFrom(otherSet);
   }
   replace(other) {
     if (isObservableSet(other)) {