mobx 6.3.10 → 6.4.0

package/dist/mobx.cjs.development.js

@@ -27,9 +27,9 @@ var niceErrors = {
   10: "'has()' can only be used on observable objects, arrays and maps",
   11: "'get()' can only be used on observable objects, arrays and maps",
   12: "Invalid annotation",
-  13: "Dynamic observable objects cannot be frozen",
+  13: "Dynamic observable objects cannot be frozen. If you're passing observables to 3rd party component/function that calls Object.freeze, pass copy instead: toJS(observable)",
   14: "Intercept handlers should return nothing or a change object",
-  15: "Observable arrays cannot be frozen",
+  15: "Observable arrays cannot be frozen. If you're passing observables to 3rd party component/function that calls Object.freeze, pass copy instead: toJS(observable)",
   16: "Modification exception: the internal structure of an observable array was changed.",
   17: function _(index, length) {
     return "[mobx.array] Index out of bounds, " + index + " is larger than " + length;
@@ -143,7 +143,10 @@ function getNextId() {
 function once(func) {
   var invoked = false;
   return function () {
-    if (invoked) return;
+    if (invoked) {
+      return;
+    }
+
     invoked = true;
     return func.apply(this, arguments);
   };
@@ -168,17 +171,31 @@ function isObject(value) {
   return value !== null && typeof value === "object";
 }
 function isPlainObject(value) {
-  if (!isObject(value)) return false;
+  if (!isObject(value)) {
+    return false;
+  }
+
   var proto = Object.getPrototypeOf(value);
-  if (proto == null) return true;
+
+  if (proto == null) {
+    return true;
+  }
+
   var protoConstructor = Object.hasOwnProperty.call(proto, "constructor") && proto.constructor;
   return typeof protoConstructor === "function" && protoConstructor.toString() === plainObjectString;
 } // https://stackoverflow.com/a/37865170
 
 function isGenerator(obj) {
   var constructor = obj == null ? void 0 : obj.constructor;
-  if (!constructor) return false;
-  if ("GeneratorFunction" === constructor.name || "GeneratorFunction" === constructor.displayName) return true;
+
+  if (!constructor) {
+    return false;
+  }
+
+  if ("GeneratorFunction" === constructor.name || "GeneratorFunction" === constructor.displayName) {
+    return true;
+  }
+
   return false;
 }
 function addHiddenProp(object, propName, value) {
@@ -218,9 +235,16 @@ var hasGetOwnPropertySymbols = typeof Object.getOwnPropertySymbols !== "undefine
 function getPlainObjectKeys(object) {
   var keys = Object.keys(object); // Not supported in IE, so there are not going to be symbol props anyway...
 
-  if (!hasGetOwnPropertySymbols) return keys;
+  if (!hasGetOwnPropertySymbols) {
+    return keys;
+  }
+
   var symbols = Object.getOwnPropertySymbols(object);
-  if (!symbols.length) return keys;
+
+  if (!symbols.length) {
+    return keys;
+  }
+
   return [].concat(keys, symbols.filter(function (s) {
     return objectPrototype.propertyIsEnumerable.call(object, s);
   }));
@@ -233,8 +257,14 @@ var ownKeys = typeof Reflect !== "undefined" && Reflect.ownKeys ? Reflect.ownKey
 /* istanbul ignore next */
 Object.getOwnPropertyNames;
 function stringifyKey(key) {
-  if (typeof key === "string") return key;
-  if (typeof key === "symbol") return key.toString();
+  if (typeof key === "string") {
+    return key;
+  }
+
+  if (typeof key === "symbol") {
+    return key.toString();
+  }
+
   return new String(key).toString();
 }
 function toPrimitive(value) {
@@ -522,7 +552,10 @@ function shallowComparer(a, b) {
 }
 
 function defaultComparer(a, b) {
-  if (Object.is) return Object.is(a, b);
+  if (Object.is) {
+    return Object.is(a, b);
+  }
+
   return a === b ? a !== 0 || 1 / a === 1 / b : a !== a && b !== b;
 }
 
@@ -535,20 +568,34 @@ var comparer = {
 
 function deepEnhancer(v, _, name) {
   // it is an observable already, done
-  if (isObservable(v)) return v; // something that can be converted and mutated?
+  if (isObservable(v)) {
+    return v;
+  } // something that can be converted and mutated?
 
-  if (Array.isArray(v)) return observable.array(v, {
-    name: name
-  });
-  if (isPlainObject(v)) return observable.object(v, undefined, {
-    name: name
-  });
-  if (isES6Map(v)) return observable.map(v, {
-    name: name
-  });
-  if (isES6Set(v)) return observable.set(v, {
-    name: name
-  });
+
+  if (Array.isArray(v)) {
+    return observable.array(v, {
+      name: name
+    });
+  }
+
+  if (isPlainObject(v)) {
+    return observable.object(v, undefined, {
+      name: name
+    });
+  }
+
+  if (isES6Map(v)) {
+    return observable.map(v, {
+      name: name
+    });
+  }
+
+  if (isES6Set(v)) {
+    return observable.set(v, {
+      name: name
+    });
+  }
 
   if (typeof v === "function" && !isAction(v) && !isFlow(v)) {
     if (isGenerator(v)) {
@@ -561,33 +608,59 @@ function deepEnhancer(v, _, name) {
   return v;
 }
 function shallowEnhancer(v, _, name) {
-  if (v === undefined || v === null) return v;
-  if (isObservableObject(v) || isObservableArray(v) || isObservableMap(v) || isObservableSet(v)) return v;
-  if (Array.isArray(v)) return observable.array(v, {
-    name: name,
-    deep: false
-  });
-  if (isPlainObject(v)) return observable.object(v, undefined, {
-    name: name,
-    deep: false
-  });
-  if (isES6Map(v)) return observable.map(v, {
-    name: name,
-    deep: false
-  });
-  if (isES6Set(v)) return observable.set(v, {
-    name: name,
-    deep: false
-  });
-  die("The shallow modifier / decorator can only used in combination with arrays, objects, maps and sets");
+  if (v === undefined || v === null) {
+    return v;
+  }
+
+  if (isObservableObject(v) || isObservableArray(v) || isObservableMap(v) || isObservableSet(v)) {
+    return v;
+  }
+
+  if (Array.isArray(v)) {
+    return observable.array(v, {
+      name: name,
+      deep: false
+    });
+  }
+
+  if (isPlainObject(v)) {
+    return observable.object(v, undefined, {
+      name: name,
+      deep: false
+    });
+  }
+
+  if (isES6Map(v)) {
+    return observable.map(v, {
+      name: name,
+      deep: false
+    });
+  }
+
+  if (isES6Set(v)) {
+    return observable.set(v, {
+      name: name,
+      deep: false
+    });
+  }
+
+  {
+    die("The shallow modifier / decorator can only used in combination with arrays, objects, maps and sets");
+  }
 }
 function referenceEnhancer(newValue) {
   // never turn into an observable
   return newValue;
 }
 function refStructEnhancer(v, oldValue) {
-  if ( isObservable(v)) die("observable.struct should not be used with observable values");
-  if (deepEqual(v, oldValue)) return oldValue;
+  if ( isObservable(v)) {
+    die("observable.struct should not be used with observable values");
+  }
+
+  if (deepEqual(v, oldValue)) {
+    return oldValue;
+  }
+
   return v;
 }
 
@@ -735,10 +808,12 @@ 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.extend_(adm, key, descriptor, false) === null) return 0
-    /* Cancel */
-    ;
+  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 */
+      ;
+    }
   }
 
   if (isFlow(descriptor.value)) {
@@ -779,16 +854,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,
@@ -1022,17 +1104,35 @@ function createObservable(v, arg2, arg3) {
   } // already observable - ignore
 
 
-  if (isObservable(v)) return v; // plain object
+  if (isObservable(v)) {
+    return v;
+  } // plain object
 
-  if (isPlainObject(v)) return observable.object(v, arg2, arg3); // Array
 
-  if (Array.isArray(v)) return observable.array(v, arg2); // Map
+  if (isPlainObject(v)) {
+    return observable.object(v, arg2, arg3);
+  } // Array
 
-  if (isES6Map(v)) return observable.map(v, arg2); // Set
 
-  if (isES6Set(v)) return observable.set(v, arg2); // other object - ignore
+  if (Array.isArray(v)) {
+    return observable.array(v, arg2);
+  } // Map
+
+
+  if (isES6Map(v)) {
+    return observable.map(v, arg2);
+  } // Set
+
+
+  if (isES6Set(v)) {
+    return observable.set(v, arg2);
+  } // other object - ignore
+
+
+  if (typeof v === "object" && v !== null) {
+    return v;
+  } // anything else
 
-  if (typeof v === "object" && v !== null) return v; // anything else
 
   return observable.box(v, arg2);
 }
@@ -1090,8 +1190,13 @@ var computed = function computed(arg1, arg2) {
 
 
   {
-    if (!isFunction(arg1)) die("First argument to `computed` should be an expression.");
-    if (isFunction(arg2)) die("A setter as second argument is no longer supported, use `{ set: fn }` option instead");
+    if (!isFunction(arg1)) {
+      die("First argument to `computed` should be an expression.");
+    }
+
+    if (isFunction(arg2)) {
+      die("A setter as second argument is no longer supported, use `{ set: fn }` option instead");
+    }
   }
 
   var opts = isPlainObject(arg2) ? arg2 : {};
@@ -1123,8 +1228,13 @@ function createAction(actionName, fn, autoAction, ref) {
   }
 
   {
-    if (!isFunction(fn)) die("`action` can only be invoked on functions");
-    if (typeof actionName !== "string" || !actionName) die("actions should have valid names, got: '" + actionName + "'");
+    if (!isFunction(fn)) {
+      die("`action` can only be invoked on functions");
+    }
+
+    if (typeof actionName !== "string" || !actionName) {
+      die("actions should have valid names, got: '" + actionName + "'");
+    }
   }
 
   function res() {
@@ -1206,7 +1316,10 @@ function _endAction(runInfo) {
   allowStateChangesEnd(runInfo.prevAllowStateChanges_);
   allowStateReadsEnd(runInfo.prevAllowStateReads_);
   endBatch();
-  if (runInfo.runAsAction_) untrackedEnd(runInfo.prevDerivation_);
+
+  if (runInfo.runAsAction_) {
+    untrackedEnd(runInfo.prevDerivation_);
+  }
 
   if ( runInfo.notifySpy_) {
     spyReportEnd({
@@ -1286,7 +1399,10 @@ var ObservableValue = /*#__PURE__*/function (_Atom, _Symbol$toPrimitive2) {
   var _proto = ObservableValue.prototype;
 
   _proto.dehanceValue = function dehanceValue(value) {
-    if (this.dehancer !== undefined) return this.dehancer(value);
+    if (this.dehancer !== undefined) {
+      return this.dehancer(value);
+    }
+
     return value;
   };
 
@@ -1309,7 +1425,10 @@ var ObservableValue = /*#__PURE__*/function (_Atom, _Symbol$toPrimitive2) {
       }
 
       this.setNewValue_(newValue);
-      if ( notifySpy) spyReportEnd();
+
+      if ( notifySpy) {
+        spyReportEnd();
+      }
     }
   };
 
@@ -1322,7 +1441,11 @@ var ObservableValue = /*#__PURE__*/function (_Atom, _Symbol$toPrimitive2) {
         type: UPDATE,
         newValue: newValue
       });
-      if (!change) return globalState.UNCHANGED;
+
+      if (!change) {
+        return globalState.UNCHANGED;
+      }
+
       newValue = change.newValue;
     } // apply modifier
 
@@ -1356,14 +1479,17 @@ var ObservableValue = /*#__PURE__*/function (_Atom, _Symbol$toPrimitive2) {
   };
 
   _proto.observe_ = function observe_(listener, fireImmediately) {
-    if (fireImmediately) listener({
-      observableKind: "value",
-      debugObjectName: this.name_,
-      object: this,
-      type: UPDATE,
-      newValue: this.value_,
-      oldValue: undefined
-    });
+    if (fireImmediately) {
+      listener({
+        observableKind: "value",
+        debugObjectName: this.name_,
+        object: this,
+        type: UPDATE,
+        newValue: this.value_,
+        oldValue: undefined
+      });
+    }
+
     return registerListener(this, listener);
   };
 
@@ -1458,7 +1584,11 @@ var ComputedValue = /*#__PURE__*/function (_Symbol$toPrimitive2) {
     this.keepAlive_ = void 0;
     this.onBOL = void 0;
     this.onBUOL = void 0;
-    if (!options.get) die(31);
+
+    if (!options.get) {
+      die(31);
+    }
+
     this.derivation = options.get;
     this.name_ = options.name || ( "ComputedValue@" + getNextId() );
 
@@ -1500,7 +1630,9 @@ var ComputedValue = /*#__PURE__*/function (_Symbol$toPrimitive2) {
   ;
 
   _proto.get = function get() {
-    if (this.isComputing_) die(32, this.name_, this.derivation);
+    if (this.isComputing_) {
+      die(32, this.name_, this.derivation);
+    }
 
     if (globalState.inBatch === 0 && // !globalState.trackingDerivatpion &&
     this.observers_.size === 0 && !this.keepAlive_) {
@@ -1516,20 +1648,34 @@ var ComputedValue = /*#__PURE__*/function (_Symbol$toPrimitive2) {
 
       if (shouldCompute(this)) {
         var prevTrackingContext = globalState.trackingContext;
-        if (this.keepAlive_ && !prevTrackingContext) globalState.trackingContext = this;
-        if (this.trackAndCompute()) propagateChangeConfirmed(this);
+
+        if (this.keepAlive_ && !prevTrackingContext) {
+          globalState.trackingContext = this;
+        }
+
+        if (this.trackAndCompute()) {
+          propagateChangeConfirmed(this);
+        }
+
         globalState.trackingContext = prevTrackingContext;
       }
     }
 
     var result = this.value_;
-    if (isCaughtException(result)) throw result.cause;
+
+    if (isCaughtException(result)) {
+      throw result.cause;
+    }
+
     return result;
   };
 
   _proto.set = function set(value) {
     if (this.setter_) {
-      if (this.isRunningSetter_) die(33, this.name_);
+      if (this.isRunningSetter_) {
+        die(33, this.name_);
+      }
+
       this.isRunningSetter_ = true;
 
       try {
@@ -1537,7 +1683,9 @@ var ComputedValue = /*#__PURE__*/function (_Symbol$toPrimitive2) {
       } finally {
         this.isRunningSetter_ = false;
       }
-    } else die(34, this.name_);
+    } else {
+      die(34, this.name_);
+    }
   };
 
   _proto.trackAndCompute = function trackAndCompute() {
@@ -1766,7 +1914,9 @@ function checkIfStateModificationsAreAllowed(atom) {
 
   var hasObservers = 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_);
+  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_);
+  }
 }
 function checkIfStateReadsAreAllowed(observable) {
   if ( !globalState.allowStateReads && globalState.observableRequiresReaction) {
@@ -1811,7 +1961,10 @@ function trackDerivedFunction(derivation, f, context) {
 }
 
 function warnAboutDerivationWithoutDependencies(derivation) {
-  if (derivation.observing_.length !== 0) return;
+
+  if (derivation.observing_.length !== 0) {
+    return;
+  }
 
   if (globalState.reactionRequiresObservable || derivation.requiresObservable_) {
     console.warn("[mobx] Derivation '" + derivation.name_ + "' is created/updated without reading any observable value.");
@@ -1840,7 +1993,11 @@ function bindDependencies(derivation) {
 
     if (dep.diffValue_ === 0) {
       dep.diffValue_ = 1;
-      if (i0 !== i) observing[i0] = dep;
+
+      if (i0 !== i) {
+        observing[i0] = dep;
+      }
+
       i0++;
     } // Upcast is 'safe' here, because if dep is IObservable, `dependenciesState` will be undefined,
     // not hitting the condition
@@ -1932,7 +2089,10 @@ function allowStateReadsEnd(prev) {
  */
 
 function changeDependenciesStateTo0(derivation) {
-  if (derivation.dependenciesState_ === IDerivationState_.UP_TO_DATE_) return;
+  if (derivation.dependenciesState_ === IDerivationState_.UP_TO_DATE_) {
+    return;
+  }
+
   derivation.dependenciesState_ = IDerivationState_.UP_TO_DATE_;
   var obs = derivation.observing_;
   var i = obs.length;
@@ -1976,8 +2136,14 @@ var canMergeGlobalState = true;
 var isolateCalled = false;
 var globalState = /*#__PURE__*/function () {
   var global = /*#__PURE__*/getGlobal();
-  if (global.__mobxInstanceCount > 0 && !global.__mobxGlobals) canMergeGlobalState = false;
-  if (global.__mobxGlobals && global.__mobxGlobals.version !== new MobXGlobals().version) canMergeGlobalState = false;
+
+  if (global.__mobxInstanceCount > 0 && !global.__mobxGlobals) {
+    canMergeGlobalState = false;
+  }
+
+  if (global.__mobxGlobals && global.__mobxGlobals.version !== new MobXGlobals().version) {
+    canMergeGlobalState = false;
+  }
 
   if (!canMergeGlobalState) {
     // Because this is a IIFE we need to let isolateCalled a chance to change
@@ -1990,7 +2156,11 @@ var globalState = /*#__PURE__*/function () {
     return new MobXGlobals();
   } else if (global.__mobxGlobals) {
     global.__mobxInstanceCount += 1;
-    if (!global.__mobxGlobals.UNCHANGED) global.__mobxGlobals.UNCHANGED = {}; // make merge backward compatible
+
+    if (!global.__mobxGlobals.UNCHANGED) {
+      global.__mobxGlobals.UNCHANGED = {};
+    } // make merge backward compatible
+
 
     return global.__mobxGlobals;
   } else {
@@ -1999,12 +2169,19 @@ var globalState = /*#__PURE__*/function () {
   }
 }();
 function isolateGlobalState() {
-  if (globalState.pendingReactions.length || globalState.inBatch || globalState.isRunningReactions) die(36);
+  if (globalState.pendingReactions.length || globalState.inBatch || globalState.isRunningReactions) {
+    die(36);
+  }
+
   isolateCalled = true;
 
   if (canMergeGlobalState) {
     var global = getGlobal();
-    if (--global.__mobxInstanceCount === 0) global.__mobxGlobals = undefined;
+
+    if (--global.__mobxInstanceCount === 0) {
+      global.__mobxGlobals = undefined;
+    }
+
     globalState = new MobXGlobals();
   }
 }
@@ -2020,7 +2197,9 @@ function resetGlobalState() {
   var defaultGlobals = new MobXGlobals();
 
   for (var key in defaultGlobals) {
-    if (persistentKeys.indexOf(key) === -1) globalState[key] = defaultGlobals[key];
+    if (persistentKeys.indexOf(key) === -1) {
+      globalState[key] = defaultGlobals[key];
+    }
   }
 
   globalState.allowStateChanges = !globalState.enforceActions;
@@ -2054,8 +2233,12 @@ function addObserver(observable, node) {
   // invariant(observable._observers.indexOf(node) === -1, "INTERNAL ERROR add already added node");
   // invariantObservers(observable);
   observable.observers_.add(node);
-  if (observable.lowestObserverState_ > node.dependenciesState_) observable.lowestObserverState_ = node.dependenciesState_; // invariantObservers(observable);
+
+  if (observable.lowestObserverState_ > node.dependenciesState_) {
+    observable.lowestObserverState_ = node.dependenciesState_;
+  } // invariantObservers(observable);
   // invariant(observable._observers.indexOf(node) !== -1, "INTERNAL ERROR didn't add node");
+
 }
 function removeObserver(observable, node) {
   // invariant(globalState.inBatch > 0, "INTERNAL ERROR, remove should be called only inside batch");
@@ -2166,7 +2349,10 @@ function reportObserved(observable) {
 
 function propagateChanged(observable) {
   // invariantLOS(observable, "changed start");
-  if (observable.lowestObserverState_ === IDerivationState_.STALE_) return;
+  if (observable.lowestObserverState_ === IDerivationState_.STALE_) {
+    return;
+  }
+
   observable.lowestObserverState_ = IDerivationState_.STALE_; // Ideally we use for..of here, but the downcompiled version is really slow...
 
   observable.observers_.forEach(function (d) {
@@ -2184,7 +2370,10 @@ function propagateChanged(observable) {
 
 function propagateChangeConfirmed(observable) {
   // invariantLOS(observable, "confirmed start");
-  if (observable.lowestObserverState_ === IDerivationState_.STALE_) return;
+  if (observable.lowestObserverState_ === IDerivationState_.STALE_) {
+    return;
+  }
+
   observable.lowestObserverState_ = IDerivationState_.STALE_;
   observable.observers_.forEach(function (d) {
     if (d.dependenciesState_ === IDerivationState_.POSSIBLY_STALE_) {
@@ -2202,7 +2391,10 @@ function propagateChangeConfirmed(observable) {
 
 function propagateMaybeChanged(observable) {
   // invariantLOS(observable, "maybe start");
-  if (observable.lowestObserverState_ !== IDerivationState_.UP_TO_DATE_) return;
+  if (observable.lowestObserverState_ !== IDerivationState_.UP_TO_DATE_) {
+    return;
+  }
+
   observable.lowestObserverState_ = IDerivationState_.POSSIBLY_STALE_;
   observable.observers_.forEach(function (d) {
     if (d.dependenciesState_ === IDerivationState_.UP_TO_DATE_) {
@@ -2230,9 +2422,12 @@ function printDepTree(tree, lines, depth) {
   }
 
   lines.push("" + "\t".repeat(depth - 1) + tree.name);
-  if (tree.dependencies) tree.dependencies.forEach(function (child) {
-    return printDepTree(child, lines, depth + 1);
-  });
+
+  if (tree.dependencies) {
+    tree.dependencies.forEach(function (child) {
+      return printDepTree(child, lines, depth + 1);
+    });
+  }
 }
 
 var Reaction = /*#__PURE__*/function () {
@@ -2350,7 +2545,9 @@ var Reaction = /*#__PURE__*/function () {
       clearObserving(this);
     }
 
-    if (isCaughtException(result)) this.reportExceptionInDerivation_(result.cause);
+    if (isCaughtException(result)) {
+      this.reportExceptionInDerivation_(result.cause);
+    }
 
     if ( notify) {
       spyReportEnd({
@@ -2369,13 +2566,18 @@ var Reaction = /*#__PURE__*/function () {
       return;
     }
 
-    if (globalState.disableErrorBoundaries) throw error;
+    if (globalState.disableErrorBoundaries) {
+      throw error;
+    }
+
     var message =  "[mobx] Encountered an uncaught exception that was thrown by a reaction or observer component, in: '" + this + "'" ;
 
     if (!globalState.suppressReactionErrors) {
       console.error(message, error);
       /** If debugging brought you here, please, read the above message :-). Tnx! */
-    } else console.warn("[mobx] (error in reaction '" + this.name_ + "' suppressed, fix error of causing action below)"); // prettier-ignore
+    } else {
+      console.warn("[mobx] (error in reaction '" + this.name_ + "' suppressed, fix error of causing action below)");
+    } // prettier-ignore
 
 
     if ( isSpyEnabled()) {
@@ -2429,7 +2631,10 @@ function onReactionError(handler) {
   globalState.globalReactionErrorHandlers.push(handler);
   return function () {
     var idx = globalState.globalReactionErrorHandlers.indexOf(handler);
-    if (idx >= 0) globalState.globalReactionErrorHandlers.splice(idx, 1);
+
+    if (idx >= 0) {
+      globalState.globalReactionErrorHandlers.splice(idx, 1);
+    }
   };
 }
 /**
@@ -2446,7 +2651,10 @@ var reactionScheduler = function reactionScheduler(f) {
 
 function runReactions() {
   // Trampolining, if runReactions are already running, new reactions will be picked up
-  if (globalState.inBatch > 0 || globalState.isRunningReactions) return;
+  if (globalState.inBatch > 0 || globalState.isRunningReactions) {
+    return;
+  }
+
   reactionScheduler(runReactionsHelper);
 }
 
@@ -2489,7 +2697,11 @@ function isSpyEnabled() {
 }
 function spyReport(event) {
 
-  if (!globalState.spyListeners.length) return;
+
+  if (!globalState.spyListeners.length) {
+    return;
+  }
+
   var listeners = globalState.spyListeners;
 
   for (var i = 0, l = listeners.length; i < l; i++) {
@@ -2509,10 +2721,15 @@ var END_EVENT = {
   spyReportEnd: true
 };
 function spyReportEnd(change) {
-  if (change) spyReport(_extends({}, change, {
-    type: "report-end",
-    spyReportEnd: true
-  }));else spyReport(END_EVENT);
+
+  if (change) {
+    spyReport(_extends({}, change, {
+      type: "report-end",
+      spyReportEnd: true
+    }));
+  } else {
+    spyReport(END_EVENT);
+  }
 }
 function spy(listener) {
   {
@@ -2545,9 +2762,15 @@ var autoActionBoundAnnotation = /*#__PURE__*/createActionAnnotation(AUTOACTION_B
 function createActionFactory(autoAction) {
   var res = function action(arg1, arg2) {
     // action(fn() {})
-    if (isFunction(arg1)) return createAction(arg1.name || DEFAULT_ACTION_NAME, arg1, autoAction); // action("name", fn() {})
+    if (isFunction(arg1)) {
+      return createAction(arg1.name || DEFAULT_ACTION_NAME, arg1, autoAction);
+    } // action("name", fn() {})
+
+
+    if (isFunction(arg2)) {
+      return createAction(arg1, arg2, autoAction);
+    } // @action
 
-    if (isFunction(arg2)) return createAction(arg1, arg2, autoAction); // @action
 
     if (isStringish(arg2)) {
       return storeAnnotation(arg1, arg2, autoAction ? autoActionAnnotation : actionAnnotation);
@@ -2561,7 +2784,9 @@ function createActionFactory(autoAction) {
       }));
     }
 
-    die("Invalid arguments for `action`");
+    {
+      die("Invalid arguments for `action`");
+    }
   };
 
   return res;
@@ -2595,8 +2820,13 @@ function autorun(view, opts) {
   }
 
   {
-    if (!isFunction(view)) die("Autorun expects a function as first argument");
-    if (isAction(view)) die("Autorun does not accept actions since actions are untrackable");
+    if (!isFunction(view)) {
+      die("Autorun expects a function as first argument");
+    }
+
+    if (isAction(view)) {
+      die("Autorun does not accept actions since actions are untrackable");
+    }
   }
 
   var name = (_opts$name = (_opts = opts) == null ? void 0 : _opts.name) != null ? _opts$name :  view.name || "Autorun@" + getNextId() ;
@@ -2617,7 +2847,10 @@ function autorun(view, opts) {
         isScheduled = true;
         scheduler(function () {
           isScheduled = false;
-          if (!reaction.isDisposed_) reaction.track(reactionRunner);
+
+          if (!reaction.isDisposed_) {
+            reaction.track(reactionRunner);
+          }
         });
       }
     }, opts.onError, opts.requiresObservable);
@@ -2649,8 +2882,13 @@ function reaction(expression, effect, opts) {
   }
 
   {
-    if (!isFunction(expression) || !isFunction(effect)) die("First and second argument to reaction should be functions");
-    if (!isPlainObject(opts)) die("Third argument of reactions should be an object");
+    if (!isFunction(expression) || !isFunction(effect)) {
+      die("First and second argument to reaction should be functions");
+    }
+
+    if (!isPlainObject(opts)) {
+      die("Third argument of reactions should be an object");
+    }
   }
 
   var name = (_opts$name2 = opts.name) != null ? _opts$name2 :  "Reaction@" + getNextId() ;
@@ -2673,7 +2911,11 @@ function reaction(expression, effect, opts) {
 
   function reactionRunner() {
     isScheduled = false;
-    if (r.isDisposed_) return;
+
+    if (r.isDisposed_) {
+      return;
+    }
+
     var changed = false;
     r.track(function () {
       var nextValue = allowStateChanges(false, function () {
@@ -2683,7 +2925,13 @@ function reaction(expression, effect, opts) {
       oldValue = value;
       value = nextValue;
     });
-    if (firstTime && opts.fireImmediately) effectAction(value, oldValue, r);else if (!firstTime && changed) effectAction(value, oldValue, r);
+
+    if (firstTime && opts.fireImmediately) {
+      effectAction(value, oldValue, r);
+    } else if (!firstTime && changed) {
+      effectAction(value, oldValue, r);
+    }
+
     firstTime = false;
   }
 
@@ -2750,7 +2998,9 @@ function configure(options) {
     globalState.useProxies = useProxies === ALWAYS ? true : useProxies === NEVER ? false : typeof Proxy !== "undefined";
   }
 
-  if (useProxies === "ifavailable") globalState.verifyProxies = true;
+  if (useProxies === "ifavailable") {
+    globalState.verifyProxies = true;
+  }
 
   if (enforceActions !== undefined) {
     var ea = enforceActions === ALWAYS ? ALWAYS : enforceActions === OBSERVED;
@@ -2758,7 +3008,9 @@ function configure(options) {
     globalState.allowStateChanges = ea === true || ea === ALWAYS ? false : true;
   }
   ["computedRequiresReaction", "reactionRequiresObservable", "observableRequiresReaction", "disableErrorBoundaries", "safeDescriptors"].forEach(function (key) {
-    if (key in options) globalState[key] = !!options[key];
+    if (key in options) {
+      globalState[key] = !!options[key];
+    }
   });
   globalState.allowStateReads = !globalState.observableRequiresReaction;
 
@@ -2773,11 +3025,25 @@ function configure(options) {
 
 function extendObservable(target, properties, annotations, options) {
   {
-    if (arguments.length > 4) die("'extendObservable' expected 2-4 arguments");
-    if (typeof target !== "object") die("'extendObservable' expects an object as first argument");
-    if (isObservableMap(target)) die("'extendObservable' should not be used on maps, use map.merge instead");
-    if (!isPlainObject(properties)) die("'extendObservable' only accepts plain objects as second argument");
-    if (isObservable(properties) || isObservable(annotations)) die("Extending an object with another observable (object) is not supported");
+    if (arguments.length > 4) {
+      die("'extendObservable' expected 2-4 arguments");
+    }
+
+    if (typeof target !== "object") {
+      die("'extendObservable' expects an object as first argument");
+    }
+
+    if (isObservableMap(target)) {
+      die("'extendObservable' should not be used on maps, use map.merge instead");
+    }
+
+    if (!isPlainObject(properties)) {
+      die("'extendObservable' only accepts plain objects as second argument");
+    }
+
+    if (isObservable(properties) || isObservable(annotations)) {
+      die("Extending an object with another observable (object) is not supported");
+    }
   } // Pull descriptors first, so we don't have to deal with props added by administration ($mobx)
 
 
@@ -2805,7 +3071,11 @@ function nodeToDependencyTree(node) {
   var result = {
     name: node.name_
   };
-  if (node.observing_ && node.observing_.length > 0) result.dependencies = unique(node.observing_).map(nodeToDependencyTree);
+
+  if (node.observing_ && node.observing_.length > 0) {
+    result.dependencies = unique(node.observing_).map(nodeToDependencyTree);
+  }
+
   return result;
 }
 
@@ -2817,7 +3087,11 @@ function nodeToObserverTree(node) {
   var result = {
     name: node.name_
   };
-  if (hasObservers(node)) result.observers = Array.from(getObservers(node)).map(nodeToObserverTree);
+
+  if (hasObservers(node)) {
+    result.observers = Array.from(getObservers(node)).map(nodeToObserverTree);
+  }
+
   return result;
 }
 
@@ -2844,7 +3118,10 @@ var flow = /*#__PURE__*/Object.assign(function flow(arg1, arg2) {
   } // flow(fn)
 
 
-  if ( arguments.length !== 1) die("Flow expects single argument with generator function");
+  if ( arguments.length !== 1) {
+    die("Flow expects single argument with generator function");
+  }
+
   var generator = arg1;
   var name = generator.name || "<unnamed flow>"; // Implementation based on https://github.com/tj/co/blob/master/index.js
 
@@ -2892,7 +3169,10 @@ var flow = /*#__PURE__*/Object.assign(function flow(arg1, arg2) {
           return;
         }
 
-        if (ret.done) return resolve(ret.value);
+        if (ret.done) {
+          return resolve(ret.value);
+        }
+
         pendingPromise = Promise.resolve(ret.value);
         return pendingPromise.then(onFulfilled, onRejected);
       }
@@ -2901,7 +3181,10 @@ var flow = /*#__PURE__*/Object.assign(function flow(arg1, arg2) {
     });
     promise.cancel = action(name + " - runid: " + runId + " - cancel", function () {
       try {
-        if (pendingPromise) cancelPromise(pendingPromise); // Finally block can return (or yield) stuff..
+        if (pendingPromise) {
+          cancelPromise(pendingPromise);
+        } // Finally block can return (or yield) stuff..
+
 
         var _res = gen["return"](undefined); // eat anything that promise would do, it's cancelled!
 
@@ -2925,7 +3208,9 @@ var flow = /*#__PURE__*/Object.assign(function flow(arg1, arg2) {
 flow.bound = /*#__PURE__*/createDecoratorAnnotation(flowBoundAnnotation);
 
 function cancelPromise(promise) {
-  if (isFunction(promise.cancel)) promise.cancel();
+  if (isFunction(promise.cancel)) {
+    promise.cancel();
+  }
 }
 
 function flowResult(result) {
@@ -2941,13 +3226,19 @@ function interceptReads(thing, propOrHandler, handler) {
   if (isObservableMap(thing) || isObservableArray(thing) || isObservableValue(thing)) {
     target = getAdministration(thing);
   } else if (isObservableObject(thing)) {
-    if ( !isStringish(propOrHandler)) return die("InterceptReads can only be used with a specific property, not with an object in general");
+    if ( !isStringish(propOrHandler)) {
+      return die("InterceptReads can only be used with a specific property, not with an object in general");
+    }
+
     target = getAdministration(thing, propOrHandler);
   } else {
     return die("Expected observable map, object or array as first array");
   }
 
-  if ( target.dehancer !== undefined) return die("An intercept reader was already established");
+  if ( target.dehancer !== undefined) {
+    return die("An intercept reader was already established");
+  }
+
   target.dehancer = typeof propOrHandler === "function" ? propOrHandler : handler;
   return function () {
     target.dehancer = undefined;
@@ -2955,7 +3246,11 @@ function interceptReads(thing, propOrHandler, handler) {
 }
 
 function intercept(thing, propOrHandler, handler) {
-  if (isFunction(handler)) return interceptProperty(thing, propOrHandler, handler);else return interceptInterceptable(thing, propOrHandler);
+  if (isFunction(handler)) {
+    return interceptProperty(thing, propOrHandler, handler);
+  } else {
+    return interceptInterceptable(thing, propOrHandler);
+  }
 }
 
 function interceptInterceptable(thing, handler) {
@@ -2971,25 +3266,41 @@ function _isComputed(value, property) {
     return isComputedValue(value);
   }
 
-  if (isObservableObject(value) === false) return false;
-  if (!value[$mobx].values_.has(property)) return false;
+  if (isObservableObject(value) === false) {
+    return false;
+  }
+
+  if (!value[$mobx].values_.has(property)) {
+    return false;
+  }
+
   var atom = getAtom(value, property);
   return isComputedValue(atom);
 }
 function isComputed(value) {
-  if ( arguments.length > 1) return die("isComputed expects only 1 argument. Use isComputedProp to inspect the observability of a property");
+  if ( arguments.length > 1) {
+    return die("isComputed expects only 1 argument. Use isComputedProp to inspect the observability of a property");
+  }
+
   return _isComputed(value);
 }
 function isComputedProp(value, propName) {
-  if ( !isStringish(propName)) return die("isComputed expected a property name as second argument");
+  if ( !isStringish(propName)) {
+    return die("isComputed expected a property name as second argument");
+  }
+
   return _isComputed(value, propName);
 }
 
 function _isObservable(value, property) {
-  if (!value) return false;
+  if (!value) {
+    return false;
+  }
 
   if (property !== undefined) {
-    if ( (isObservableMap(value) || isObservableArray(value))) return die("isObservable(object, propertyName) is not supported for arrays and maps. Use map.has or array.length instead.");
+    if ( (isObservableMap(value) || isObservableArray(value))) {
+      return die("isObservable(object, propertyName) is not supported for arrays and maps. Use map.has or array.length instead.");
+    }
 
     if (isObservableObject(value)) {
       return value[$mobx].values_.has(property);
@@ -3003,11 +3314,17 @@ function _isObservable(value, property) {
 }
 
 function isObservable(value) {
-  if ( arguments.length !== 1) die("isObservable expects only 1 argument. Use isObservableProp to inspect the observability of a property");
+  if ( arguments.length !== 1) {
+    die("isObservable expects only 1 argument. Use isObservableProp to inspect the observability of a property");
+  }
+
   return _isObservable(value);
 }
 function isObservableProp(value, propName) {
-  if ( !isStringish(propName)) return die("expected a property name as second argument");
+  if ( !isStringish(propName)) {
+    return die("expected a property name as second argument");
+  }
+
   return _isObservable(value, propName);
 }
 
@@ -3099,13 +3416,25 @@ function set(obj, key, value) {
   } else if (isObservableSet(obj)) {
     obj.add(key);
   } else if (isObservableArray(obj)) {
-    if (typeof key !== "number") key = parseInt(key, 10);
-    if (key < 0) die("Invalid index: '" + key + "'");
-    startBatch();
-    if (key >= obj.length) obj.length = key + 1;
-    obj[key] = value;
-    endBatch();
-  } else die(8);
+    if (typeof key !== "number") {
+      key = parseInt(key, 10);
+    }
+
+    if (key < 0) {
+      die("Invalid index: '" + key + "'");
+    }
+
+    startBatch();
+
+    if (key >= obj.length) {
+      obj.length = key + 1;
+    }
+
+    obj[key] = value;
+    endBatch();
+  } else {
+    die(8);
+  }
 }
 function remove(obj, key) {
   if (isObservableObject(obj)) {
@@ -3115,7 +3444,10 @@ function remove(obj, key) {
   } else if (isObservableSet(obj)) {
     obj["delete"](key);
   } else if (isObservableArray(obj)) {
-    if (typeof key !== "number") key = parseInt(key, 10);
+    if (typeof key !== "number") {
+      key = parseInt(key, 10);
+    }
+
     obj.splice(key, 1);
   } else {
     die(9);
@@ -3135,7 +3467,9 @@ function has(obj, key) {
   die(10);
 }
 function get(obj, key) {
-  if (!has(obj, key)) return undefined;
+  if (!has(obj, key)) {
+    return undefined;
+  }
 
   if (isObservableObject(obj)) {
     return obj[$mobx].get_(key);
@@ -3163,7 +3497,11 @@ function apiOwnKeys(obj) {
 }
 
 function observe(thing, propOrCb, cbOrFire, fireImmediately) {
-  if (isFunction(cbOrFire)) return observeObservableProperty(thing, propOrCb, cbOrFire, fireImmediately);else return observeObservable(thing, propOrCb, cbOrFire);
+  if (isFunction(cbOrFire)) {
+    return observeObservableProperty(thing, propOrCb, cbOrFire, fireImmediately);
+  } else {
+    return observeObservable(thing, propOrCb, cbOrFire);
+  }
 }
 
 function observeObservable(thing, listener, fireImmediately) {
@@ -3180,8 +3518,13 @@ function cache(map, key, value) {
 }
 
 function toJSHelper(source, __alreadySeen) {
-  if (source == null || typeof source !== "object" || source instanceof Date || !isObservable(source)) return source;
-  if (isObservableValue(source) || isComputedValue(source)) return toJSHelper(source.get(), __alreadySeen);
+  if (source == null || typeof source !== "object" || source instanceof Date || !isObservable(source)) {
+    return source;
+  }
+
+  if (isObservableValue(source) || isComputedValue(source)) {
+    return toJSHelper(source.get(), __alreadySeen);
+  }
 
   if (__alreadySeen.has(source)) {
     return __alreadySeen.get(source);
@@ -3224,23 +3567,33 @@ 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.
  */
 
 
 function toJS(source, options) {
-  if ( options) die("toJS no longer supports options");
+  if ( options) {
+    die("toJS no longer supports options");
+  }
+
   return toJSHelper(source, new Map());
 }
 
 function trace() {
+
   var enterBreakPoint = false;
 
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
     args[_key] = arguments[_key];
   }
 
-  if (typeof args[args.length - 1] === "boolean") enterBreakPoint = args.pop();
+  if (typeof args[args.length - 1] === "boolean") {
+    enterBreakPoint = args.pop();
+  }
+
   var derivation = getAtomFromArgs(args);
 
   if (!derivation) {
@@ -3290,7 +3643,10 @@ function transaction(action, thisArg) {
 }
 
 function when(predicate, arg1, arg2) {
-  if (arguments.length === 1 || arg1 && typeof arg1 === "object") return whenPromise(predicate, arg1);
+  if (arguments.length === 1 || arg1 && typeof arg1 === "object") {
+    return whenPromise(predicate, arg1);
+  }
+
   return _when(predicate, arg1, arg2 || {});
 }
 
@@ -3302,7 +3658,12 @@ function _when(predicate, effect, opts) {
     timeoutHandle = setTimeout(function () {
       if (!disposer[$mobx].isDisposed_) {
         disposer();
-        if (opts.onError) opts.onError(error);else throw error;
+
+        if (opts.onError) {
+          opts.onError(error);
+        } else {
+          throw error;
+        }
       }
     }, opts.timeout);
   }
@@ -3316,7 +3677,11 @@ function _when(predicate, effect, opts) {
 
     if (cond) {
       r.dispose();
-      if (timeoutHandle) clearTimeout(timeoutHandle);
+
+      if (timeoutHandle) {
+        clearTimeout(timeoutHandle);
+      }
+
       effectAction();
     }
   }, opts);
@@ -3324,7 +3689,10 @@ function _when(predicate, effect, opts) {
 }
 
 function whenPromise(predicate, opts) {
-  if ( opts && opts.onError) return die("the options 'onError' and 'promise' cannot be combined");
+  if ( opts && opts.onError) {
+    return die("the options 'onError' and 'promise' cannot be combined");
+  }
+
   var cancel;
   var res = new Promise(function (resolve, reject) {
     var disposer = _when(predicate, resolve, _extends({}, opts, {
@@ -3348,7 +3716,10 @@ function getAdm(target) {
 
 var objectProxyTraps = {
   has: function has(target, name) {
-    if ( globalState.trackingDerivation) warnAboutProxyRequirement("detect new properties using the 'in' operator. Use 'has' from 'mobx' instead.");
+    if ( globalState.trackingDerivation) {
+      warnAboutProxyRequirement("detect new properties using the 'in' operator. Use 'has' from 'mobx' instead.");
+    }
+
     return getAdm(target).has_(name);
   },
   get: function get(target, name) {
@@ -3357,7 +3728,9 @@ var objectProxyTraps = {
   set: function set(target, name, value) {
     var _getAdm$set_;
 
-    if (!isStringish(name)) return false;
+    if (!isStringish(name)) {
+      return false;
+    }
 
     if ( !getAdm(target).values_.has(name)) {
       warnAboutProxyRequirement("add a new observable property through direct assignment. Use 'set' from 'mobx' instead.");
@@ -3373,7 +3746,10 @@ var objectProxyTraps = {
       warnAboutProxyRequirement("delete properties from an observable object. Use 'remove' from 'mobx' instead.");
     }
 
-    if (!isStringish(name)) return false; // null (intercepted) -> true (success)
+    if (!isStringish(name)) {
+      return false;
+    } // null (intercepted) -> true (success)
+
 
     return (_getAdm$delete_ = getAdm(target).delete_(name, true)) != null ? _getAdm$delete_ : true;
   },
@@ -3388,7 +3764,10 @@ var objectProxyTraps = {
     return (_getAdm$definePropert = getAdm(target).defineProperty_(name, descriptor)) != null ? _getAdm$definePropert : true;
   },
   ownKeys: function ownKeys(target) {
-    if ( globalState.trackingDerivation) warnAboutProxyRequirement("iterate keys to detect added / removed properties. Use 'keys' from 'mobx' instead.");
+    if ( globalState.trackingDerivation) {
+      warnAboutProxyRequirement("iterate keys to detect added / removed properties. Use 'keys' from 'mobx' instead.");
+    }
+
     return getAdm(target).ownKeys_();
   },
   preventExtensions: function preventExtensions(target) {
@@ -3411,7 +3790,10 @@ function registerInterceptor(interceptable, handler) {
   interceptors.push(handler);
   return once(function () {
     var idx = interceptors.indexOf(handler);
-    if (idx !== -1) interceptors.splice(idx, 1);
+
+    if (idx !== -1) {
+      interceptors.splice(idx, 1);
+    }
   });
 }
 function interceptChange(interceptable, change) {
@@ -3423,8 +3805,14 @@ function interceptChange(interceptable, change) {
 
     for (var i = 0, l = interceptors.length; i < l; i++) {
       change = interceptors[i](change);
-      if (change && !change.type) die(14);
-      if (!change) break;
+
+      if (change && !change.type) {
+        die(14);
+      }
+
+      if (!change) {
+        break;
+      }
     }
 
     return change;
@@ -3441,13 +3829,20 @@ function registerListener(listenable, handler) {
   listeners.push(handler);
   return once(function () {
     var idx = listeners.indexOf(handler);
-    if (idx !== -1) listeners.splice(idx, 1);
+
+    if (idx !== -1) {
+      listeners.splice(idx, 1);
+    }
   });
 }
 function notifyListeners(listenable, change) {
   var prevU = untrackedStart();
   var listeners = listenable.changeListeners_;
-  if (!listeners) return;
+
+  if (!listeners) {
+    return;
+  }
+
   listeners = listeners.slice();
 
   for (var i = 0, l = listeners.length; i < l; i++) {
@@ -3484,8 +3879,13 @@ function makeObservable(target, annotations, options) {
 var keysSymbol = /*#__PURE__*/Symbol("mobx-keys");
 function makeAutoObservable(target, overrides, options) {
   {
-    if (!isPlainObject(target) && !isPlainObject(Object.getPrototypeOf(target))) die("'makeAutoObservable' can only be used for classes that don't have a superclass");
-    if (isObservableObject(target)) die("makeAutoObservable can only be used on objects not already made observable");
+    if (!isPlainObject(target) && !isPlainObject(Object.getPrototypeOf(target))) {
+      die("'makeAutoObservable' can only be used for classes that don't have a superclass");
+    }
+
+    if (isObservableObject(target)) {
+      die("makeAutoObservable can only be used on objects not already made observable");
+    }
   } // Optimization: avoid visiting protos
   // Assumes that annotation.make_/.extend_ works the same for plain objects
 
@@ -3526,8 +3926,14 @@ var MAX_SPLICE_SIZE = 10000; // See e.g. https://github.com/mobxjs/mobx/issues/8
 var arrayTraps = {
   get: function get(target, name) {
     var adm = target[$mobx];
-    if (name === $mobx) return adm;
-    if (name === "length") return adm.getArrayLength_();
+
+    if (name === $mobx) {
+      return adm;
+    }
+
+    if (name === "length") {
+      return adm.getArrayLength_();
+    }
 
     if (typeof name === "string" && !isNaN(name)) {
       return adm.get_(parseInt(name));
@@ -3588,12 +3994,18 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
   var _proto = ObservableArrayAdministration.prototype;
 
   _proto.dehanceValue_ = function dehanceValue_(value) {
-    if (this.dehancer !== undefined) return this.dehancer(value);
+    if (this.dehancer !== undefined) {
+      return this.dehancer(value);
+    }
+
     return value;
   };
 
   _proto.dehanceValues_ = function dehanceValues_(values) {
-    if (this.dehancer !== undefined && values.length > 0) return values.map(this.dehancer);
+    if (this.dehancer !== undefined && values.length > 0) {
+      return values.map(this.dehancer);
+    }
+
     return values;
   };
 
@@ -3629,9 +4041,15 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
   };
 
   _proto.setArrayLength_ = function setArrayLength_(newLength) {
-    if (typeof newLength !== "number" || isNaN(newLength) || newLength < 0) die("Out of range: " + newLength);
+    if (typeof newLength !== "number" || isNaN(newLength) || newLength < 0) {
+      die("Out of range: " + newLength);
+    }
+
     var currentLength = this.values_.length;
-    if (newLength === currentLength) return;else if (newLength > currentLength) {
+
+    if (newLength === currentLength) {
+      return;
+    } else if (newLength > currentLength) {
       var newItems = new Array(newLength - currentLength);
 
       for (var i = 0; i < newLength - currentLength; i++) {
@@ -3640,13 +4058,21 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
 
 
       this.spliceWithArray_(currentLength, 0, newItems);
-    } else this.spliceWithArray_(newLength, currentLength - newLength);
+    } else {
+      this.spliceWithArray_(newLength, currentLength - newLength);
+    }
   };
 
   _proto.updateArrayLength_ = function updateArrayLength_(oldLength, delta) {
-    if (oldLength !== this.lastKnownLength_) die(16);
+    if (oldLength !== this.lastKnownLength_) {
+      die(16);
+    }
+
     this.lastKnownLength_ += delta;
-    if (this.legacyMode_ && delta > 0) reserveArrayBuffer(oldLength + delta + 1);
+
+    if (this.legacyMode_ && delta > 0) {
+      reserveArrayBuffer(oldLength + delta + 1);
+    }
   };
 
   _proto.spliceWithArray_ = function spliceWithArray_(index, deleteCount, newItems) {
@@ -3654,9 +4080,26 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
 
     checkIfStateModificationsAreAllowed(this.atom_);
     var length = this.values_.length;
-    if (index === undefined) index = 0;else if (index > length) index = length;else if (index < 0) index = Math.max(0, length + index);
-    if (arguments.length === 1) deleteCount = length - index;else if (deleteCount === undefined || deleteCount === null) deleteCount = 0;else deleteCount = Math.max(0, Math.min(deleteCount, length - index));
-    if (newItems === undefined) newItems = EMPTY_ARRAY;
+
+    if (index === undefined) {
+      index = 0;
+    } else if (index > length) {
+      index = length;
+    } else if (index < 0) {
+      index = Math.max(0, length + index);
+    }
+
+    if (arguments.length === 1) {
+      deleteCount = length - index;
+    } else if (deleteCount === undefined || deleteCount === null) {
+      deleteCount = 0;
+    } else {
+      deleteCount = Math.max(0, Math.min(deleteCount, length - index));
+    }
+
+    if (newItems === undefined) {
+      newItems = EMPTY_ARRAY;
+    }
 
     if (hasInterceptors(this)) {
       var change = interceptChange(this, {
@@ -3666,7 +4109,11 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
         removedCount: deleteCount,
         added: newItems
       });
-      if (!change) return EMPTY_ARRAY;
+
+      if (!change) {
+        return EMPTY_ARRAY;
+      }
+
       deleteCount = change.removedCount;
       newItems = change.added;
     }
@@ -3681,7 +4128,11 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
     }
 
     var res = this.spliceItemsIntoValues_(index, deleteCount, newItems);
-    if (deleteCount !== 0 || newItems.length !== 0) this.notifyArraySplice_(index, newItems, res);
+
+    if (deleteCount !== 0 || newItems.length !== 0) {
+      this.notifyArraySplice_(index, newItems, res);
+    }
+
     return this.dehanceValues_(res);
   };
 
@@ -3724,10 +4175,19 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
     } : null; // The reason why this is on right hand side here (and not above), is this way the uglifier will drop it, but it won't
     // cause any runtime overhead in development mode without NODE_ENV set, unless spying is enabled
 
-    if ( notifySpy) spyReportStart(change);
+    if ( notifySpy) {
+      spyReportStart(change);
+    }
+
     this.atom_.reportChanged();
-    if (notify) notifyListeners(this, change);
-    if ( notifySpy) spyReportEnd();
+
+    if (notify) {
+      notifyListeners(this, change);
+    }
+
+    if ( notifySpy) {
+      spyReportEnd();
+    }
   };
 
   _proto.notifyArraySplice_ = function notifyArraySplice_(index, added, removed) {
@@ -3744,11 +4204,20 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
       removedCount: removed.length,
       addedCount: added.length
     } : null;
-    if ( notifySpy) spyReportStart(change);
+
+    if ( notifySpy) {
+      spyReportStart(change);
+    }
+
     this.atom_.reportChanged(); // conform: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/observe
 
-    if (notify) notifyListeners(this, change);
-    if ( notifySpy) spyReportEnd();
+    if (notify) {
+      notifyListeners(this, change);
+    }
+
+    if ( notifySpy) {
+      spyReportEnd();
+    }
   };
 
   _proto.get_ = function get_(index) {
@@ -3775,7 +4244,11 @@ var ObservableArrayAdministration = /*#__PURE__*/function () {
           index: index,
           newValue: newValue
         });
-        if (!change) return;
+
+        if (!change) {
+          return;
+        }
+
         newValue = change.newValue;
       }
 
@@ -4016,6 +4489,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;
     }
@@ -4043,7 +4518,9 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
     this.keysAtom_ = createAtom( this.name_ + ".keys()" );
     this.data_ = new Map();
     this.hasMap_ = new Map();
-    this.merge(initialData);
+    allowStateChanges(true, function () {
+      _this.merge(initialData);
+    });
   }
 
   var _proto = ObservableMap.prototype;
@@ -4053,16 +4530,19 @@ 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);
+    }
 
-    if (!globalState.trackingDerivation) return this.has_(key);
     var entry = this.hasMap_.get(key);
 
     if (!entry) {
       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);
+        return _this2.hasMap_["delete"](key);
       });
     }
 
@@ -4079,7 +4559,11 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
         newValue: value,
         name: key
       });
-      if (!change) return this;
+
+      if (!change) {
+        return this;
+      }
+
       value = change.newValue;
     }
 
@@ -4093,7 +4577,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
   };
 
   _proto["delete"] = function _delete(key) {
-    var _this2 = this;
+    var _this3 = this;
 
     checkIfStateModificationsAreAllowed(this.keysAtom_);
 
@@ -4103,7 +4587,10 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
         object: this,
         name: key
       });
-      if (!change) return false;
+
+      if (!change) {
+        return false;
+      }
     }
 
     if (this.has_(key)) {
@@ -4119,23 +4606,33 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
         name: key
       } : null;
 
-      if ( notifySpy) spyReportStart(_change); // TODO fix type
+      if ( 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 ( notifySpy) spyReportEnd();
+
+      if (notify) {
+        notifyListeners(this, _change);
+      }
+
+      if ( notifySpy) {
+        spyReportEnd();
+      }
+
       return true;
     }
 
@@ -4158,30 +4655,40 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
         name: key,
         newValue: newValue
       } : null;
-      if ( notifySpy) spyReportStart(change); // TODO fix type
+
+      if ( notifySpy) {
+        spyReportStart(change);
+      } // TODO fix type
+
 
       observable.setNewValue_(newValue);
-      if (notify) notifyListeners(this, change);
-      if ( notifySpy) spyReportEnd();
+
+      if (notify) {
+        notifyListeners(this, change);
+      }
+
+      if ( notifySpy) {
+        spyReportEnd();
+      }
     }
   };
 
   _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_,  _this3.name_ + "." + stringifyKey(key) , false);
+      var observable = new ObservableValue(newValue, _this4.enhancer_,  _this4.name_ + "." + stringifyKey(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);
@@ -4193,14 +4700,26 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
       name: key,
       newValue: newValue
     } : null;
-    if ( notifySpy) spyReportStart(change); // TODO fix type
 
-    if (notify) notifyListeners(this, change);
-    if ( notifySpy) spyReportEnd();
+    if ( notifySpy) {
+      spyReportStart(change);
+    } // TODO fix type
+
+
+    if (notify) {
+      notifyListeners(this, change);
+    }
+
+    if ( notifySpy) {
+      spyReportEnd();
+    }
   };
 
   _proto.get = function get(key) {
-    if (this.has(key)) return this.dehanceValue_(this.data_.get(key).get());
+    if (this.has(key)) {
+      return this.dehanceValue_(this.data_.get(key).get());
+    }
+
     return this.dehanceValue_(undefined);
   };
 
@@ -4267,45 +4786,54 @@ 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);
     }
 
     transaction(function () {
-      if (isPlainObject(other)) getPlainObjectKeys(other).forEach(function (key) {
-        return _this4.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);
-      });else if (isES6Map(other)) {
-        if (other.constructor !== Map) die(19, other);
+      if (isPlainObject(other)) {
+        getPlainObjectKeys(other).forEach(function (key) {
+          return _this5.set(key, other[key]);
+        });
+      } else if (Array.isArray(other)) {
+        other.forEach(function (_ref) {
+          var key = _ref[0],
+              value = _ref[1];
+          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);
+      } else if (other !== null && other !== undefined) {
+        die(20, other);
+      }
     });
     return this;
   };
 
   _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
@@ -4322,13 +4850,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) {
@@ -4336,7 +4864,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);
           }
@@ -4350,17 +4878,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?
 
@@ -4373,11 +4901,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();
@@ -4385,7 +4913,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
 
           while (!next1.done) {
             if (next1.value !== next2.value) {
-              _this6.keysAtom_.reportChanged();
+              _this7.keysAtom_.reportChanged();
 
               break;
             }
@@ -4397,7 +4925,7 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
       } // Use correctly ordered map
 
 
-      _this6.data_ = orderedData;
+      _this7.data_ = orderedData;
     });
     return this;
   };
@@ -4416,7 +4944,10 @@ var ObservableMap = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
    * for callback details
    */
   _proto.observe_ = function observe_(listener, fireImmediately) {
-    if ( fireImmediately === true) die("`observe` doesn't support fireImmediately=true in combination with maps.");
+    if ( fireImmediately === true) {
+      die("`observe` doesn't support fireImmediately=true in combination with maps.");
+    }
+
     return registerListener(this, listener);
   };
 
@@ -4541,8 +5072,12 @@ var ObservableSet = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
         object: this,
         newValue: value
       });
-      if (!change) return this; // ideally, value = change.value would be done here, so that values can be
+
+      if (!change) {
+        return this;
+      } // ideally, value = change.value would be done here, so that values can be
       // changed by interceptor. Same applies for other Set and Map api's.
+
     }
 
     if (!this.has(value)) {
@@ -4562,9 +5097,17 @@ var ObservableSet = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
         newValue: value
       } : null;
 
-      if (notifySpy && "development" !== "production") spyReportStart(_change);
-      if (notify) notifyListeners(this, _change);
-      if (notifySpy && "development" !== "production") spyReportEnd();
+      if (notifySpy && "development" !== "production") {
+        spyReportStart(_change);
+      }
+
+      if (notify) {
+        notifyListeners(this, _change);
+      }
+
+      if (notifySpy && "development" !== "production") {
+        spyReportEnd();
+      }
     }
 
     return this;
@@ -4579,7 +5122,10 @@ var ObservableSet = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
         object: this,
         oldValue: value
       });
-      if (!change) return false;
+
+      if (!change) {
+        return false;
+      }
     }
 
     if (this.has(value)) {
@@ -4594,14 +5140,24 @@ var ObservableSet = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
         oldValue: value
       } : null;
 
-      if (notifySpy && "development" !== "production") spyReportStart(_change2);
+      if (notifySpy && "development" !== "production") {
+        spyReportStart(_change2);
+      }
+
       transaction(function () {
         _this3.atom_.reportChanged();
 
         _this3.data_["delete"](value);
       });
-      if (notify) notifyListeners(this, _change2);
-      if (notifySpy && "development" !== "production") spyReportEnd();
+
+      if (notify) {
+        notifyListeners(this, _change2);
+      }
+
+      if (notifySpy && "development" !== "production") {
+        spyReportEnd();
+      }
+
       return true;
     }
 
@@ -4681,7 +5237,10 @@ var ObservableSet = /*#__PURE__*/function (_Symbol$iterator2, _Symbol$toStringTa
 
   _proto.observe_ = function observe_(listener, fireImmediately) {
     // ... 'fireImmediately' could also be true?
-    if ( fireImmediately === true) die("`observe` doesn't support fireImmediately=true in combination with sets.");
+    if ( fireImmediately === true) {
+      die("`observe` doesn't support fireImmediately=true in combination with sets.");
+    }
+
     return registerListener(this, listener);
   };
 
@@ -4783,7 +5342,11 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
         name: key,
         newValue: newValue
       });
-      if (!change) return null;
+
+      if (!change) {
+        return null;
+      }
+
       newValue = change.newValue;
     }
 
@@ -4803,10 +5366,18 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
         newValue: newValue
       } : null;
 
-      if ( notifySpy) spyReportStart(_change);
+      if ( notifySpy) {
+        spyReportStart(_change);
+      }
       observable.setNewValue_(newValue);
-      if (notify) notifyListeners(this, _change);
-      if ( notifySpy) spyReportEnd();
+
+      if (notify) {
+        notifyListeners(this, _change);
+      }
+
+      if ( notifySpy) {
+        spyReportEnd();
+      }
     }
 
     return true;
@@ -4915,12 +5486,18 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
 
       if (descriptor) {
         var outcome = annotation.make_(this, key, descriptor, source);
+
         if (outcome === 0
         /* Cancel */
-        ) return;
+        ) {
+          return;
+        }
+
         if (outcome === 1
         /* Break */
-        ) break;
+        ) {
+          break;
+        }
       }
 
       source = Object.getPrototypeOf(source);
@@ -4990,7 +5567,11 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
           type: ADD,
           newValue: descriptor.value
         });
-        if (!change) return null;
+
+        if (!change) {
+          return null;
+        }
+
         var newValue = change.newValue;
 
         if (descriptor.value !== newValue) {
@@ -5042,7 +5623,11 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
           type: ADD,
           newValue: value
         });
-        if (!change) return null;
+
+        if (!change) {
+          return null;
+        }
+
         value = change.newValue;
       }
 
@@ -5097,7 +5682,10 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
           type: ADD,
           newValue: undefined
         });
-        if (!change) return null;
+
+        if (!change) {
+          return null;
+        }
       }
 
       options.name || (options.name = "development" !== "production" ? this.name_ + "." + key.toString() : "ObservableObject.key");
@@ -5153,7 +5741,9 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
         type: REMOVE
       }); // Cancelled
 
-      if (!change) return null;
+      if (!change) {
+        return null;
+      }
     } // Delete
 
 
@@ -5214,9 +5804,18 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
           oldValue: value,
           name: key
         };
-        if ("development" !== "production" && notifySpy) spyReportStart(_change2);
-        if (notify) notifyListeners(this, _change2);
-        if ("development" !== "production" && notifySpy) spyReportEnd();
+
+        if ("development" !== "production" && notifySpy) {
+          spyReportStart(_change2);
+        }
+
+        if (notify) {
+          notifyListeners(this, _change2);
+        }
+
+        if ("development" !== "production" && notifySpy) {
+          spyReportEnd();
+        }
       }
     } finally {
       endBatch();
@@ -5232,7 +5831,10 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
   ;
 
   _proto.observe_ = function observe_(callback, fireImmediately) {
-    if ( fireImmediately === true) die("`observe` doesn't support the fire immediately property for observable objects.");
+    if ( fireImmediately === true) {
+      die("`observe` doesn't support the fire immediately property for observable objects.");
+    }
+
     return registerListener(this, callback);
   };
 
@@ -5255,9 +5857,18 @@ var ObservableObjectAdministration = /*#__PURE__*/function () {
         name: key,
         newValue: value
       } : null;
-      if ( notifySpy) spyReportStart(change);
-      if (notify) notifyListeners(this, change);
-      if ( notifySpy) spyReportEnd();
+
+      if ( notifySpy) {
+        spyReportStart(change);
+      }
+
+      if (notify) {
+        notifyListeners(this, change);
+      }
+
+      if ( notifySpy) {
+        spyReportEnd();
+      }
     }
 
     (_this$pendingKeys_2 = this.pendingKeys_) == null ? void 0 : (_this$pendingKeys_2$g = _this$pendingKeys_2.get(key)) == null ? void 0 : _this$pendingKeys_2$g.set(true); // Notify "keys/entries/values" observers
@@ -5298,7 +5909,10 @@ function asObservableObject(target, options) {
     return target;
   }
 
-  if ( !Object.isExtensible(target)) die("Cannot make the designated object observable; it is not extensible");
+  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(), String(name), getAnnotationFromOptions(options));
   addHiddenProp(target, $mobx, adm);
@@ -5455,7 +6069,6 @@ var LegacyObservableArray = /*#__PURE__*/function (_StubArray, _Symbol$toStringT
     var nextIndex = 0;
     return makeIterable({
       next: function next() {
-        // @ts-ignore
         return nextIndex < self.length ? {
           value: self[nextIndex++],
           done: false
@@ -5488,7 +6101,10 @@ var LegacyObservableArray = /*#__PURE__*/function (_StubArray, _Symbol$toStringT
 Object.entries(arrayExtensions).forEach(function (_ref) {
   var prop = _ref[0],
       fn = _ref[1];
-  if (prop !== "concat") addHiddenProp(LegacyObservableArray.prototype, prop, fn);
+
+  if (prop !== "concat") {
+    addHiddenProp(LegacyObservableArray.prototype, prop, fn);
+  }
 });
 
 function createArrayEntryDescriptor(index) {
@@ -5525,7 +6141,10 @@ function createLegacyArray(initialValues, enhancer, name) {
 function getAtom(thing, property) {
   if (typeof thing === "object" && thing !== null) {
     if (isObservableArray(thing)) {
-      if (property !== undefined) die(23);
+      if (property !== undefined) {
+        die(23);
+      }
+
       return thing[$mobx].atom_;
     }
 
@@ -5534,18 +6153,31 @@ function getAtom(thing, property) {
     }
 
     if (isObservableMap(thing)) {
-      if (property === undefined) return thing.keysAtom_;
+      if (property === undefined) {
+        return thing.keysAtom_;
+      }
+
       var observable = thing.data_.get(property) || thing.hasMap_.get(property);
-      if (!observable) die(25, property, getDebugName(thing));
+
+      if (!observable) {
+        die(25, property, getDebugName(thing));
+      }
+
       return observable;
     }
 
+
     if (isObservableObject(thing)) {
-      if (!property) return die(26);
+      if (!property) {
+        return die(26);
+      }
 
       var _observable = thing[$mobx].values_.get(property);
 
-      if (!_observable) die(27, property, getDebugName(thing));
+      if (!_observable) {
+        die(27, property, getDebugName(thing));
+      }
+
       return _observable;
     }
 
@@ -5562,11 +6194,26 @@ function getAtom(thing, property) {
   die(28);
 }
 function getAdministration(thing, property) {
-  if (!thing) die(29);
-  if (property !== undefined) return getAdministration(getAtom(thing, property));
-  if (isAtom(thing) || isComputedValue(thing) || isReaction(thing)) return thing;
-  if (isObservableMap(thing) || isObservableSet(thing)) return thing;
-  if (thing[$mobx]) return thing[$mobx];
+  if (!thing) {
+    die(29);
+  }
+
+  if (property !== undefined) {
+    return getAdministration(getAtom(thing, property));
+  }
+
+  if (isAtom(thing) || isComputedValue(thing) || isReaction(thing)) {
+    return thing;
+  }
+
+  if (isObservableMap(thing) || isObservableSet(thing)) {
+    return thing;
+  }
+
+  if (thing[$mobx]) {
+    return thing[$mobx];
+  }
+
   die(24, thing);
 }
 function getDebugName(thing, property) {
@@ -5599,17 +6246,33 @@ function deepEqual(a, b, depth) {
 function eq(a, b, depth, aStack, bStack) {
   // Identical objects are equal. `0 === -0`, but they aren't identical.
   // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
-  if (a === b) return a !== 0 || 1 / a === 1 / b; // `null` or `undefined` only equal to itself (strict comparison).
+  if (a === b) {
+    return a !== 0 || 1 / a === 1 / b;
+  } // `null` or `undefined` only equal to itself (strict comparison).
 
-  if (a == null || b == null) return false; // `NaN`s are equivalent, but non-reflexive.
 
-  if (a !== a) return b !== b; // Exhaust primitive checks
+  if (a == null || b == null) {
+    return false;
+  } // `NaN`s are equivalent, but non-reflexive.
+
+
+  if (a !== a) {
+    return b !== b;
+  } // Exhaust primitive checks
+
 
   var type = typeof a;
-  if (type !== "function" && 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;
+
+  if (className !== toString.call(b)) {
+    return false;
+  }
 
   switch (className) {
     // Strings, numbers, regular expressions, dates, and booleans are compared by value.
@@ -5623,7 +6286,10 @@ function eq(a, b, depth, aStack, bStack) {
     case "[object Number]":
       // `NaN`s are equivalent, but non-reflexive.
       // Object(NaN) is equivalent to NaN.
-      if (+a !== +a) return +b !== +b; // An `egal` comparison is performed for other numeric values.
+      if (+a !== +a) {
+        return +b !== +b;
+      } // An `egal` comparison is performed for other numeric values.
+
 
       return +a === 0 ? 1 / +a === 1 / b : +a === +b;
 
@@ -5654,9 +6320,12 @@ function eq(a, b, depth, aStack, bStack) {
   var areArrays = className === "[object Array]";
 
   if (!areArrays) {
-    if (typeof a != "object" || typeof b != "object") return false; // Objects with different constructors are not equivalent, but `Object`s or `Array`s
+    if (typeof a != "object" || typeof b != "object") {
+      return false;
+    } // Objects with different constructors are not equivalent, but `Object`s or `Array`s
     // from different frames are.
 
+
     var aCtor = a.constructor,
         bCtor = b.constructor;
 
@@ -5682,7 +6351,9 @@ function eq(a, b, depth, aStack, bStack) {
   while (length--) {
     // Linear search. Performance is inversely proportional to the number of
     // unique nested structures.
-    if (aStack[length] === a) return bStack[length] === b;
+    if (aStack[length] === a) {
+      return bStack[length] === b;
+    }
   } // Add the first object to the stack of traversed objects.
 
 
@@ -5692,10 +6363,16 @@ function eq(a, b, depth, aStack, bStack) {
   if (areArrays) {
     // Compare array lengths to determine if a deep comparison is necessary.
     length = a.length;
-    if (length !== b.length) return false; // Deep compare the contents, ignoring non-numeric properties.
+
+    if (length !== b.length) {
+      return false;
+    } // Deep compare the contents, ignoring non-numeric properties.
+
 
     while (length--) {
-      if (!eq(a[length], b[length], depth - 1, aStack, bStack)) return false;
+      if (!eq(a[length], b[length], depth - 1, aStack, bStack)) {
+        return false;
+      }
     }
   } else {
     // Deep compare objects.
@@ -5703,12 +6380,17 @@ function eq(a, b, depth, aStack, bStack) {
     var key;
     length = keys.length; // Ensure that both objects contain the same number of properties before comparing deep equality.
 
-    if (Object.keys(b).length !== length) return false;
+    if (Object.keys(b).length !== length) {
+      return false;
+    }
 
     while (length--) {
       // Deep compare each member
       key = keys[length];
-      if (!(hasProp(b, key) && eq(a[key], b[key], depth - 1, aStack, bStack))) return false;
+
+      if (!(hasProp(b, key) && eq(a[key], b[key], depth - 1, aStack, bStack))) {
+        return false;
+      }
     }
   } // Remove the first object from the stack of traversed objects.
 
@@ -5719,9 +6401,18 @@ function eq(a, b, depth, aStack, bStack) {
 }
 
 function unwrap(a) {
-  if (isObservableArray(a)) return a.slice();
-  if (isES6Map(a) || isObservableMap(a)) return Array.from(a.entries());
-  if (isES6Set(a) || isObservableSet(a)) return Array.from(a.entries());
+  if (isObservableArray(a)) {
+    return a.slice();
+  }
+
+  if (isES6Map(a) || isObservableMap(a)) {
+    return Array.from(a.entries());
+  }
+
+  if (isES6Set(a) || isObservableSet(a)) {
+    return Array.from(a.entries());
+  }
+
   return a;
 }