mobx 6.3.9 → 6.3.13

package/dist/mobx.esm.js

@@ -733,7 +733,7 @@ function make_$2(adm, key, descriptor, source) {
   // bound - must annotate protos to support super.flow()
 
 
-  if ((_this$options_ = this.options_) != null && _this$options_.bound && !isFlow(adm.target_[key])) {
+  if ((_this$options_ = this.options_) != null && _this$options_.bound && (!hasProp(adm.target_, key) || !isFlow(adm.target_[key]))) {
     if (this.extend_(adm, key, descriptor, false) === null) return 0
     /* Cancel */
     ;
@@ -777,16 +777,23 @@ safeDescriptors) {
   }
 
   assertFlowDescriptor(adm, annotation, key, descriptor);
-  var value = descriptor.value;
+  var value = descriptor.value; // In case of flow.bound, the descriptor can be from already annotated prototype
+
+  if (!isFlow(value)) {
+    value = flow(value);
+  }
 
   if (bound) {
     var _adm$proxy_;
 
-    value = value.bind((_adm$proxy_ = adm.proxy_) != null ? _adm$proxy_ : adm.target_);
+    // We do not keep original function around, so we bind the existing flow
+    value = value.bind((_adm$proxy_ = adm.proxy_) != null ? _adm$proxy_ : adm.target_); // This is normally set by `flow`, but `bind` returns new function...
+
+    value.isMobXFlow = true;
   }
 
   return {
-    value: flow(value),
+    value: value,
     // Non-configurable for classes
     // prevents accidental field redefinition in subclass
     configurable: safeDescriptors ? adm.isPlainObject_ : true,
@@ -3233,7 +3240,10 @@ function toJSHelper(source, __alreadySeen) {
   }
 }
 /**
- * Basically, a deep clone, so that no reactive property will exist anymore.
+ * Recursively converts an observable to it's non-observable native counterpart.
+ * It does NOT recurse into non-observables, these are left as they are, even if they contain observables.
+ * Computed and other non-enumerable properties are completely ignored.
+ * Complex scenarios require custom solution, eg implementing `toJSON` or using `serializr` lib.
  */
 
 
@@ -4026,6 +4036,8 @@ _Symbol$toStringTag = Symbol.toStringTag;
 var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTag2) {
   // hasMap, not hashMap >-).
   function ObservableMap(initialData, enhancer_, name_) {
+    var _this = this;
+
     if (enhancer_ === void 0) {
       enhancer_ = deepEnhancer;
     }
@@ -4053,7 +4065,9 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
     this.keysAtom_ = createAtom(process.env.NODE_ENV !== "production" ? this.name_ + ".keys()" : "ObservableMap.keys()");
     this.data_ = new Map();
     this.hasMap_ = new Map();
-    this.merge(initialData);
+    allowStateChanges(true, function () {
+      _this.merge(initialData);
+    });
   }
 
   var _proto = ObservableMap.prototype;
@@ -4063,7 +4077,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
   };
 
   _proto.has = function has(key) {
-    var _this = this;
+    var _this2 = this;
 
     if (!globalState.trackingDerivation) return this.has_(key);
     var entry = this.hasMap_.get(key);
@@ -4072,7 +4086,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
       var newEntry = entry = new ObservableValue(this.has_(key), referenceEnhancer, process.env.NODE_ENV !== "production" ? this.name_ + "." + stringifyKey(key) + "?" : "ObservableMap.key?", false);
       this.hasMap_.set(key, newEntry);
       onBecomeUnobserved(newEntry, function () {
-        return _this.hasMap_["delete"](key);
+        return _this2.hasMap_["delete"](key);
       });
     }
 
@@ -4103,7 +4117,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
   };
 
   _proto["delete"] = function _delete(key) {
-    var _this2 = this;
+    var _this3 = this;
 
     checkIfStateModificationsAreAllowed(this.keysAtom_);
 
@@ -4132,17 +4146,17 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
       if (process.env.NODE_ENV !== "production" && notifySpy) spyReportStart(_change); // TODO fix type
 
       transaction(function () {
-        var _this2$hasMap_$get;
+        var _this3$hasMap_$get;
 
-        _this2.keysAtom_.reportChanged();
+        _this3.keysAtom_.reportChanged();
 
-        (_this2$hasMap_$get = _this2.hasMap_.get(key)) == null ? void 0 : _this2$hasMap_$get.setNewValue_(false);
+        (_this3$hasMap_$get = _this3.hasMap_.get(key)) == null ? void 0 : _this3$hasMap_$get.setNewValue_(false);
 
-        var observable = _this2.data_.get(key);
+        var observable = _this3.data_.get(key);
 
         observable.setNewValue_(undefined);
 
-        _this2.data_["delete"](key);
+        _this3.data_["delete"](key);
       });
       if (notify) notifyListeners(this, _change);
       if (process.env.NODE_ENV !== "production" && notifySpy) spyReportEnd();
@@ -4177,21 +4191,21 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
   };
 
   _proto.addValue_ = function addValue_(key, newValue) {
-    var _this3 = this;
+    var _this4 = this;
 
     checkIfStateModificationsAreAllowed(this.keysAtom_);
     transaction(function () {
-      var _this3$hasMap_$get;
+      var _this4$hasMap_$get;
 
-      var observable = new ObservableValue(newValue, _this3.enhancer_, process.env.NODE_ENV !== "production" ? _this3.name_ + "." + stringifyKey(key) : "ObservableMap.key", false);
+      var observable = new ObservableValue(newValue, _this4.enhancer_, process.env.NODE_ENV !== "production" ? _this4.name_ + "." + stringifyKey(key) : "ObservableMap.key", false);
 
-      _this3.data_.set(key, observable);
+      _this4.data_.set(key, observable);
 
       newValue = observable.value_; // value might have been changed
 
-      (_this3$hasMap_$get = _this3.hasMap_.get(key)) == null ? void 0 : _this3$hasMap_$get.setNewValue_(true);
+      (_this4$hasMap_$get = _this4.hasMap_.get(key)) == null ? void 0 : _this4$hasMap_$get.setNewValue_(true);
 
-      _this3.keysAtom_.reportChanged();
+      _this4.keysAtom_.reportChanged();
     });
     var notifySpy = isSpyEnabled();
     var notify = hasListeners(this);
@@ -4277,7 +4291,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
   ;
 
   _proto.merge = function merge(other) {
-    var _this4 = this;
+    var _this5 = this;
 
     if (isObservableMap(other)) {
       other = new Map(other);
@@ -4285,15 +4299,15 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
 
     transaction(function () {
       if (isPlainObject(other)) getPlainObjectKeys(other).forEach(function (key) {
-        return _this4.set(key, other[key]);
+        return _this5.set(key, other[key]);
       });else if (Array.isArray(other)) other.forEach(function (_ref) {
         var key = _ref[0],
             value = _ref[1];
-        return _this4.set(key, value);
+        return _this5.set(key, value);
       });else if (isES6Map(other)) {
         if (other.constructor !== Map) die(19, other);
         other.forEach(function (value, key) {
-          return _this4.set(key, value);
+          return _this5.set(key, value);
         });
       } else if (other !== null && other !== undefined) die(20, other);
     });
@@ -4301,21 +4315,21 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
   };
 
   _proto.clear = function clear() {
-    var _this5 = this;
+    var _this6 = this;
 
     transaction(function () {
       untracked(function () {
-        for (var _iterator2 = _createForOfIteratorHelperLoose(_this5.keys()), _step2; !(_step2 = _iterator2()).done;) {
+        for (var _iterator2 = _createForOfIteratorHelperLoose(_this6.keys()), _step2; !(_step2 = _iterator2()).done;) {
           var key = _step2.value;
 
-          _this5["delete"](key);
+          _this6["delete"](key);
         }
       });
     });
   };
 
   _proto.replace = function replace(values) {
-    var _this6 = this;
+    var _this7 = this;
 
     // Implementation requirements:
     // - respect ordering of replacement map
@@ -4332,13 +4346,13 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
       // if the key deletion is prevented by interceptor
       // add entry at the beginning of the result map
 
-      for (var _iterator3 = _createForOfIteratorHelperLoose(_this6.data_.keys()), _step3; !(_step3 = _iterator3()).done;) {
+      for (var _iterator3 = _createForOfIteratorHelperLoose(_this7.data_.keys()), _step3; !(_step3 = _iterator3()).done;) {
         var key = _step3.value;
 
         // Concurrently iterating/deleting keys
         // iterator should handle this correctly
         if (!replacementMap.has(key)) {
-          var deleted = _this6["delete"](key); // Was the key removed?
+          var deleted = _this7["delete"](key); // Was the key removed?
 
 
           if (deleted) {
@@ -4346,7 +4360,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
             keysReportChangedCalled = true;
           } else {
             // Delete prevented by interceptor
-            var value = _this6.data_.get(key);
+            var value = _this7.data_.get(key);
 
             orderedData.set(key, value);
           }
@@ -4360,17 +4374,17 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
             _value = _step4$value[1];
 
         // We will want to know whether a new key is added
-        var keyExisted = _this6.data_.has(_key); // Add or update value
+        var keyExisted = _this7.data_.has(_key); // Add or update value
 
 
-        _this6.set(_key, _value); // The addition could have been prevent by interceptor
+        _this7.set(_key, _value); // The addition could have been prevent by interceptor
 
 
-        if (_this6.data_.has(_key)) {
+        if (_this7.data_.has(_key)) {
           // The update could have been prevented by interceptor
           // and also we want to preserve existing values
           // so use value from _data map (instead of replacement map)
-          var _value2 = _this6.data_.get(_key);
+          var _value2 = _this7.data_.get(_key);
 
           orderedData.set(_key, _value2); // Was a new key added?
 
@@ -4383,11 +4397,11 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
 
 
       if (!keysReportChangedCalled) {
-        if (_this6.data_.size !== orderedData.size) {
+        if (_this7.data_.size !== orderedData.size) {
           // If size differs, keys are definitely modified
-          _this6.keysAtom_.reportChanged();
+          _this7.keysAtom_.reportChanged();
         } else {
-          var iter1 = _this6.data_.keys();
+          var iter1 = _this7.data_.keys();
 
           var iter2 = orderedData.keys();
           var next1 = iter1.next();
@@ -4395,7 +4409,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
 
           while (!next1.done) {
             if (next1.value !== next2.value) {
-              _this6.keysAtom_.reportChanged();
+              _this7.keysAtom_.reportChanged();
 
               break;
             }
@@ -4407,7 +4421,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
       } // Use correctly ordered map
 
 
-      _this6.data_ = orderedData;
+      _this7.data_ = orderedData;
     });
     return this;
   };
@@ -5616,7 +5630,7 @@ function eq(a, b, depth, aStack, bStack) {
   if (a !== a) return b !== b; // Exhaust primitive checks
 
   var type = typeof a;
-  if (!isFunction(type) && type !== "object" && typeof b != "object") return false; // Compare `[[Class]]` names.
+  if (type !== "function" && type !== "object" && typeof b != "object") return false; // Compare `[[Class]]` names.
 
   var className = toString.call(a);
   if (className !== toString.call(b)) return false;