mobx 6.3.4 → 6.3.8

package/dist/mobx.esm.js

@@ -1537,22 +1537,21 @@ var ComputedValue = /*#__PURE__*/function () {
     /* see #1208 */
     this.dependenciesState_ === IDerivationState_.NOT_TRACKING_;
     var newValue = this.computeValue_(true);
-
-    if (process.env.NODE_ENV !== "production" && isSpyEnabled()) {
-      spyReport({
-        observableKind: "computed",
-        debugObjectName: this.name_,
-        object: this.scope_,
-        type: "update",
-        oldValue: this.value_,
-        newValue: newValue
-      });
-    }
-
     var changed = wasSuspended || isCaughtException(oldValue) || isCaughtException(newValue) || !this.equals_(oldValue, newValue);
 
     if (changed) {
       this.value_ = newValue;
+
+      if (process.env.NODE_ENV !== "production" && isSpyEnabled()) {
+        spyReport({
+          observableKind: "computed",
+          debugObjectName: this.name_,
+          object: this.scope_,
+          type: "update",
+          oldValue: oldValue,
+          newValue: newValue
+        });
+      }
     }
 
     return changed;
@@ -2662,8 +2661,7 @@ function reaction(expression, effect, opts) {
   var firstTime = true;
   var isScheduled = false;
   var value;
-  var oldValue = undefined; // only an issue with fireImmediately
-
+  var oldValue;
   var equals = opts.compareStructural ? comparer.structural : opts.equals || comparer["default"];
   var r = new Reaction(name, function () {
     if (firstTime || runSync) {
@@ -3337,7 +3335,7 @@ function whenPromise(predicate, opts) {
 
     cancel = function cancel() {
       disposer();
-      reject("WHEN_CANCELLED");
+      reject(new Error("WHEN_CANCELLED"));
     };
   });
   res.cancel = cancel;
@@ -3468,7 +3466,11 @@ function makeObservable(target, annotations, options) {
   try {
     var _annotations;
 
-    // Default to decorators
+    if (process.env.NODE_ENV !== "production" && annotations && target[storedAnnotationsSymbol]) {
+      die("makeObservable second arg must be nullish when using decorators. Mixing @decorator syntax with annotations is not supported.");
+    } // Default to decorators
+
+
     (_annotations = annotations) != null ? _annotations : annotations = collectStoredAnnotations(target); // Annotate
 
     ownKeys(annotations).forEach(function (key) {
@@ -3691,9 +3693,12 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
 
       return (_this$values_ = this.values_).splice.apply(_this$values_, [index, deleteCount].concat(newItems));
     } else {
-      var res = this.values_.slice(index, index + deleteCount);
-      var oldItems = this.values_.slice(index + deleteCount);
-      this.values_.length = index + newItems.length - deleteCount;
+      // The items removed by the splice
+      var res = this.values_.slice(index, index + deleteCount); // The items that that should remain at the end of the array
+
+      var oldItems = this.values_.slice(index + deleteCount); // New length is the previous length + addition count - deletion count
+
+      this.values_.length += newItems.length - deleteCount;
 
       for (var i = 0; i < newItems.length; i++) {
         this.values_[index + i] = newItems[i];