mobx 6.1.4 → 6.1.8

package/dist/mobx.umd.development.js

@@ -82,6 +82,10 @@
 
     var mockGlobal = {};
     function getGlobal() {
+      if (typeof globalThis !== "undefined") {
+        return globalThis;
+      }
+
       if (typeof window !== "undefined") {
         return window;
       }
@@ -363,9 +367,7 @@
       assertNotDecorated(prototype, annotation, key); // Ignore override
 
       if (!isOverride(annotation)) {
-        prototype[storedAnnotationsSymbol][key] = _extends({}, annotation, {
-          isDecorator_: true
-        });
+        prototype[storedAnnotationsSymbol][key] = annotation;
       }
     }
 
@@ -405,7 +407,7 @@
        */
       function Atom(name_) {
         if (name_ === void 0) {
-          name_ = "Atom@" + getNextId();
+          name_ =  "Atom@" + getNextId() ;
         }
 
         this.name_ = void 0;
@@ -595,7 +597,7 @@
     }
 
     function make_$1(adm, key) {
-      var _this$options_$bound, _this$options_;
+      var _this$options_$bound, _this$options_, _adm$target_$storedAn;
 
       var annotated = false;
       var source = adm.target_;
@@ -645,7 +647,7 @@
 
       if (annotated) {
         recordAnnotationApplied(adm, this, key);
-      } else if (!this.isDecorator_) {
+      } else if (!((_adm$target_$storedAn = adm.target_[storedAnnotationsSymbol]) == null ? void 0 : _adm$target_$storedAn[key])) {
         // Throw on missing key, except for decorators:
         // Decorator annotations are collected from whole prototype chain.
         // When called from super() some props may not exist yet.
@@ -709,6 +711,8 @@
     }
 
     function make_$2(adm, key) {
+      var _adm$target_$storedAn;
+
       var annotated = false;
       var source = adm.target_;
 
@@ -746,7 +750,7 @@
 
       if (annotated) {
         recordAnnotationApplied(adm, this, key);
-      } else if (!this.isDecorator_) {
+      } else if (!((_adm$target_$storedAn = adm.target_[storedAnnotationsSymbol]) == null ? void 0 : _adm$target_$storedAn[key])) {
         // Throw on missing key, except for decorators:
         // Decorator annotations are collected from whole prototype chain.
         // When called from super() some props may not exist yet.
@@ -800,6 +804,8 @@
     }
 
     function make_$3(adm, key) {
+      var _adm$target_$storedAn;
+
       var source = adm.target_;
 
       while (source && source !== objectPrototype) {
@@ -824,7 +830,7 @@
         source = Object.getPrototypeOf(source);
       }
 
-      if (!this.isDecorator_) {
+      if (!((_adm$target_$storedAn = adm.target_[storedAnnotationsSymbol]) == null ? void 0 : _adm$target_$storedAn[key])) {
         // Throw on missing key, except for decorators:
         // Decorator annotations are collected from whole prototype chain.
         // When called from super() some props may not exist yet.
@@ -861,6 +867,8 @@
     }
 
     function make_$4(adm, key) {
+      var _adm$target_$storedAn;
+
       var source = adm.target_; // Copy props from proto as well, see test:
       // "decorate should work with Object.create"
 
@@ -885,7 +893,7 @@
         source = Object.getPrototypeOf(source);
       }
 
-      if (!this.isDecorator_) {
+      if (!((_adm$target_$storedAn = adm.target_[storedAnnotationsSymbol]) == null ? void 0 : _adm$target_$storedAn[key])) {
         // Throw on missing key, except for decorators:
         // Decorator annotations are collected from whole prototype chain.
         // When called from super() some props may not exist yet.
@@ -969,7 +977,7 @@
 
       if (typeof v === "object" && v !== null) return v; // anything else
 
-      return observable.box(v);
+      return observable.box(v, arg2);
     }
 
     Object.assign(createObservable, observableDecoratorAnnotation);
@@ -1031,7 +1039,7 @@
 
       var opts = isPlainObject(arg2) ? arg2 : {};
       opts.get = arg1;
-      opts.name = opts.name || arg1.name || "";
+      opts.name || (opts.name = arg1.name || "");
       /* for generated name */
 
       return new ComputedValue(opts);
@@ -1179,7 +1187,7 @@
         var _this;
 
         if (name_ === void 0) {
-          name_ = "ObservableValue@" + getNextId();
+          name_ =  "ObservableValue@" + getNextId() ;
         }
 
         if (notifySpy === void 0) {
@@ -1379,7 +1387,6 @@
         this.lastAccessedBy_ = 0;
         this.lowestObserverState_ = IDerivationState_.UP_TO_DATE_;
         this.unboundDepsCount_ = 0;
-        this.mapid_ = "#" + getNextId();
         this.value_ = new CaughtException(null);
         this.name_ = void 0;
         this.triggeredBy_ = void 0;
@@ -1396,8 +1403,12 @@
         this.onBUOL = void 0;
         if (!options.get) die(31);
         this.derivation = options.get;
-        this.name_ = options.name || "ComputedValue@" + getNextId();
-        if (options.set) this.setter_ = createAction(this.name_ + "-setter", options.set);
+        this.name_ = options.name || ( "ComputedValue@" + getNextId() );
+
+        if (options.set) {
+          this.setter_ = createAction( this.name_ + "-setter" , options.set);
+        }
+
         this.equals_ = options.equals || (options.compareStructural || options.struct ? comparer.structural : comparer["default"]);
         this.scope_ = options.context;
         this.requiresReaction_ = !!options.requiresReaction;
@@ -2168,7 +2179,7 @@
       // nodes we are looking at. Our value depends on these nodes
       function Reaction(name_, onInvalidate_, errorHandler_, requiresObservable_) {
         if (name_ === void 0) {
-          name_ = "Reaction@" + getNextId();
+          name_ =  "Reaction@" + getNextId() ;
         }
 
         if (requiresObservable_ === void 0) {
@@ -2185,7 +2196,6 @@
         this.diffValue_ = 0;
         this.runId_ = 0;
         this.unboundDepsCount_ = 0;
-        this.mapid_ = "#" + getNextId();
         this.isDisposed_ = false;
         this.isScheduled_ = false;
         this.isTrackPending_ = false;
@@ -2518,6 +2528,8 @@
      */
 
     function autorun(view, opts) {
+      var _opts$name, _opts;
+
       if (opts === void 0) {
         opts = EMPTY_OBJECT;
       }
@@ -2527,7 +2539,7 @@
         if (isAction(view)) die("Autorun does not accept actions since actions are untrackable");
       }
 
-      var name = opts && opts.name || view.name || "Autorun@" + getNextId();
+      var name = (_opts$name = (_opts = opts) == null ? void 0 : _opts.name) != null ? _opts$name :  view.name || "Autorun@" + getNextId() ;
       var runSync = !opts.scheduler && !opts.delay;
       var reaction;
 
@@ -2570,6 +2582,8 @@
     }
 
     function reaction(expression, effect, opts) {
+      var _opts$name2;
+
       if (opts === void 0) {
         opts = EMPTY_OBJECT;
       }
@@ -2579,7 +2593,7 @@
         if (!isPlainObject(opts)) die("Third argument of reactions should be an object");
       }
 
-      var name = opts.name || "Reaction@" + getNextId();
+      var name = (_opts$name2 = opts.name) != null ? _opts$name2 :  "Reaction@" + getNextId() ;
       var effectAction = action(name, opts.onError ? wrapErrorHandler(opts.onError, effect) : effect);
       var runSync = !opts.scheduler && !opts.delay;
       var scheduler = createSchedulerFromOptions(opts);
@@ -3216,8 +3230,8 @@
         }, opts.timeout);
       }
 
-      opts.name = opts.name || "When@" + getNextId();
-      var effectAction = createAction(opts.name + "-effect", effect); // eslint-disable-next-line
+      opts.name =  opts.name || "When@" + getNextId() ;
+      var effectAction = createAction( opts.name + "-effect" , effect); // eslint-disable-next-line
 
       var disposer = autorun(function (r) {
         // predicate should not change state
@@ -3401,9 +3415,20 @@
       startBatch();
 
       try {
+        // Use cached inferred annotations if available (only in classes)
         if (target[inferredAnnotationsSymbol]) {
-          for (var key in target[inferredAnnotationsSymbol]) {
-            adm.make_(key, target[inferredAnnotationsSymbol][key]);
+          target[inferredAnnotationsSymbol].forEach(function (value, key) {
+            return adm.make_(key, value);
+          }); // Overrides are not cached, unless `true`, see #2832
+
+          if (overrides) {
+            ownKeys(overrides).forEach(function (key) {
+              var annotation = overrides[key];
+
+              if (annotation !== true) {
+                adm.make_(key, annotation);
+              }
+            });
           }
         } else {
           var _ignoreKeys;
@@ -3474,6 +3499,10 @@
     var ObservableArrayAdministration = /*#__PURE__*/function () {
       // this is the prop that gets proxied, so can't replace it!
       function ObservableArrayAdministration(name, enhancer, owned_, legacyMode_) {
+        if (name === void 0) {
+          name =  "ObservableArray@" + getNextId() ;
+        }
+
         this.owned_ = void 0;
         this.legacyMode_ = void 0;
         this.atom_ = void 0;
@@ -3486,10 +3515,10 @@
         this.lastKnownLength_ = 0;
         this.owned_ = owned_;
         this.legacyMode_ = legacyMode_;
-        this.atom_ = new Atom(name || "ObservableArray@" + getNextId());
+        this.atom_ = new Atom(name);
 
         this.enhancer_ = function (newV, oldV) {
-          return enhancer(newV, oldV, name + "[..]");
+          return enhancer(newV, oldV,  name + "[..]" );
         };
       }
 
@@ -3704,7 +3733,7 @@
     }();
     function createObservableArray(initialValues, enhancer, name, owned) {
       if (name === void 0) {
-        name = "ObservableArray@" + getNextId();
+        name =  "ObservableArray@" + getNextId() ;
       }
 
       if (owned === void 0) {
@@ -3926,7 +3955,7 @@
         }
 
         if (name_ === void 0) {
-          name_ = "ObservableMap@" + getNextId();
+          name_ =  "ObservableMap@" + getNextId() ;
         }
 
         this.enhancer_ = void 0;
@@ -3945,7 +3974,7 @@
           die(18);
         }
 
-        this.keysAtom_ = createAtom(this.name_ + ".keys()");
+        this.keysAtom_ = createAtom( this.name_ + ".keys()" );
         this.data_ = new Map();
         this.hasMap_ = new Map();
         this.merge(initialData);
@@ -3964,7 +3993,7 @@
         var entry = this.hasMap_.get(key);
 
         if (!entry) {
-          var newEntry = entry = new ObservableValue(this.has_(key), referenceEnhancer, this.name_ + "." + stringifyKey(key) + "?", false);
+          var newEntry = entry = new ObservableValue(this.has_(key), referenceEnhancer,  this.name_ + "." + stringifyKey(key) + "?" , false);
           this.hasMap_.set(key, newEntry);
           onBecomeUnobserved(newEntry, function () {
             return _this.hasMap_["delete"](key);
@@ -4080,7 +4109,7 @@
 
         checkIfStateModificationsAreAllowed(this.keysAtom_);
         transaction(function () {
-          var observable = new ObservableValue(newValue, _this3.enhancer_, _this3.name_ + "." + stringifyKey(key), false);
+          var observable = new ObservableValue(newValue, _this3.enhancer_,  _this3.name_ + "." + stringifyKey(key) , false);
 
           _this3.data_.set(key, observable);
 
@@ -4377,7 +4406,7 @@
         }
 
         if (name_ === void 0) {
-          name_ = "ObservableSet@" + getNextId();
+          name_ =  "ObservableSet@" + getNextId() ;
         }
 
         this.name_ = void 0;
@@ -4661,7 +4690,7 @@
         this.name_ = name_;
         this.defaultAnnotation_ = defaultAnnotation_;
         this.autoBind_ = autoBind_;
-        this.keysAtom_ = new Atom(name_ + ".keys"); // Optimization: we use this frequently
+        this.keysAtom_ = new Atom( this.name_ + ".keys" ); // Optimization: we use this frequently
 
         this.isPlainObject_ = isPlainObject(this.target_);
 
@@ -4788,7 +4817,7 @@
         var entry = this.pendingKeys_.get(key);
 
         if (!entry) {
-          entry = new ObservableValue(key in this.target_, referenceEnhancer, this.name_ + "." + stringifyKey(key) + "?", false);
+          entry = new ObservableValue(key in this.target_, referenceEnhancer,  this.name_ + "." + stringifyKey(key) + "?" , false);
           this.pendingKeys_.set(key, entry);
         }
 
@@ -4848,7 +4877,7 @@
         var _this$target_$inferre;
 
         // Inherited is fine - annotation cannot differ in subclass
-        var annotation = (_this$target_$inferre = this.target_[inferredAnnotationsSymbol]) == null ? void 0 : _this$target_$inferre[key];
+        var annotation = (_this$target_$inferre = this.target_[inferredAnnotationsSymbol]) == null ? void 0 : _this$target_$inferre.get(key);
         if (annotation) return annotation;
         var current = this.target_;
 
@@ -4875,10 +4904,10 @@
           var closestProto = Object.getPrototypeOf(this.target_);
 
           if (!hasProp(closestProto, inferredAnnotationsSymbol)) {
-            addHiddenProp(closestProto, inferredAnnotationsSymbol, {});
+            addHiddenProp(closestProto, inferredAnnotationsSymbol, new Map());
           }
 
-          closestProto[inferredAnnotationsSymbol][key] = annotation;
+          closestProto[inferredAnnotationsSymbol].set(key, annotation);
         }
 
         return annotation;
@@ -4986,7 +5015,7 @@
             defineProperty(this.target_, key, descriptor);
           }
 
-          var _observable = new ObservableValue(value, enhancer, this.name_ + "." + stringifyKey(key), false);
+          var _observable = new ObservableValue(value, enhancer, "development" !== "production" ? this.name_ + "." + key.toString() : "ObservableObject.key", false);
 
           this.values_.set(key, _observable); // Notify (value possibly changed by ObservableValue)
 
@@ -5025,7 +5054,7 @@
             if (!change) return null;
           }
 
-          options.name || (options.name = this.name_ + "." + stringifyKey(key));
+          options.name || (options.name = "development" !== "production" ? this.name_ + "." + key.toString() : "ObservableObject.key");
           options.context = this.proxy_ || this.target_;
           var cachedDescriptor = getCachedObservablePropDescriptor(key);
           var descriptor = {
@@ -5217,10 +5246,17 @@
         die("Options can't be provided for already observable objects.");
       }
 
-      if (hasProp(target, $mobx)) return target;
+      if (hasProp(target, $mobx)) {
+        if ( !(getAdministration(target) instanceof ObservableObjectAdministration)) {
+          die("Cannot convert '" + getDebugName(target) + "' into observable object:" + "\nThe target is already observable of different type." + "\nExtending builtins is not supported.");
+        }
+
+        return target;
+      }
+
       if ( !Object.isExtensible(target)) die("Cannot make the designated object observable; it is not extensible");
-      var name = (_options$name = options == null ? void 0 : options.name) != null ? _options$name : (isPlainObject(target) ? "ObservableObject" : target.constructor.name) + "@" + getNextId();
-      var adm = new ObservableObjectAdministration(target, new Map(), stringifyKey(name), getAnnotationFromOptions(options), options == null ? void 0 : options.autoBind);
+      var name = (_options$name = options == null ? void 0 : options.name) != null ? _options$name :  (isPlainObject(target) ? "ObservableObject" : target.constructor.name) + "@" + getNextId() ;
+      var adm = new ObservableObjectAdministration(target, new Map(), String(name), getAnnotationFromOptions(options), options == null ? void 0 : options.autoBind);
       addHiddenProp(target, $mobx, adm);
       return target;
     }
@@ -5245,14 +5281,14 @@
       return false;
     }
     function recordAnnotationApplied(adm, annotation, key) {
+      var _adm$target_$storedAn;
+
       {
         adm.appliedAnnotations_[key] = annotation;
       } // Remove applied decorator annotation so we don't try to apply it again in subclass constructor
 
 
-      if (annotation.isDecorator_) {
-        delete adm.target_[storedAnnotationsSymbol][key];
-      }
+      (_adm$target_$storedAn = adm.target_[storedAnnotationsSymbol]) == null ? true : delete _adm$target_$storedAn[key];
     }
 
     function assertAnnotable(adm, annotation, key) {
@@ -5332,7 +5368,7 @@
         var _this;
 
         if (name === void 0) {
-          name = "ObservableArray@" + getNextId();
+          name =  "ObservableArray@" + getNextId() ;
         }
 
         if (owned === void 0) {
@@ -5491,7 +5527,17 @@
     }
     function getDebugName(thing, property) {
       var named;
-      if (property !== undefined) named = getAtom(thing, property);else if (isObservableObject(thing) || isObservableMap(thing) || isObservableSet(thing)) named = getAdministration(thing);else named = getAtom(thing); // valid for arrays as well
+
+      if (property !== undefined) {
+        named = getAtom(thing, property);
+      } else if (isAction(thing)) {
+        return thing.name;
+      } else if (isObservableObject(thing) || isObservableMap(thing) || isObservableSet(thing)) {
+        named = getAdministration(thing);
+      } else {
+        // valid for arrays as well
+        named = getAtom(thing);
+      }
 
       return named.name_;
     }