mobx 5.14.1 → 5.15.2

package/lib/mobx.js

@@ -77,7 +77,7 @@ function __spread() {
     return ar;
 }
 
-var OBFUSCATED_ERROR = "An invariant failed, however the error is obfuscated because this is an production build.";
+var OBFUSCATED_ERROR = "An invariant failed, however the error is obfuscated because this is a production build.";
 var EMPTY_ARRAY = [];
 Object.freeze(EMPTY_ARRAY);
 var EMPTY_OBJECT = {};
@@ -321,14 +321,27 @@ function createPropertyInitializerDescriptor(prop, enumerable) {
         }));
 }
 function initializeInstance(target) {
+    var e_1, _a;
     if (target[mobxDidRunLazyInitializersSymbol] === true)
         return;
     var decorators = target[mobxPendingDecorators];
     if (decorators) {
         addHiddenProp(target, mobxDidRunLazyInitializersSymbol, true);
-        for (var key in decorators) {
-            var d = decorators[key];
-            d.propertyCreator(target, d.prop, d.descriptor, d.decoratorTarget, d.decoratorArguments);
+        // Build property key array from both strings and symbols
+        var keys = __spread(Object.getOwnPropertySymbols(decorators), Object.keys(decorators));
+        try {
+            for (var keys_1 = __values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
+                var key = keys_1_1.value;
+                var d = decorators[key];
+                d.propertyCreator(target, d.prop, d.descriptor, d.decoratorTarget, d.decoratorArguments);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
+            }
+            finally { if (e_1) throw e_1.error; }
         }
     }
 }
@@ -371,7 +384,8 @@ function createPropDecorator(propertyInitiallyEnumerable, propertyCreator) {
     };
 }
 function quacksLikeADecorator(args) {
-    return (((args.length === 2 || args.length === 3) && typeof args[1] === "string") ||
+    return (((args.length === 2 || args.length === 3) &&
+        (typeof args[1] === "string" || typeof args[1] === "symbol")) ||
         (args.length === 4 && args[3] === true));
 }
 
@@ -488,7 +502,7 @@ function getEnhancerFromOptions(options) {
  */
 function createObservable(v, arg2, arg3) {
     // @observable someProp;
-    if (typeof arguments[1] === "string") {
+    if (typeof arguments[1] === "string" || typeof arguments[1] === "symbol") {
         return deepDecorator.apply(null, arguments);
     }
     // it is an observable already, done
@@ -655,6 +669,8 @@ function shouldCompute(derivation) {
         case exports.IDerivationState.STALE:
             return true;
         case exports.IDerivationState.POSSIBLY_STALE: {
+            // state propagation can occur outside of action/reactive context #2195
+            var prevAllowStateReads = allowStateReadsStart(true);
             var prevUntracked = untrackedStart(); // no need for those computeds to be reported, they will be picked up in trackDerivedFunction.
             var obs = derivation.observing, l = obs.length;
             for (var i = 0; i < l; i++) {
@@ -670,6 +686,7 @@ function shouldCompute(derivation) {
                         catch (e) {
                             // we are not interested in the value *or* exception at this moment, but if there is one, notify all
                             untrackedEnd(prevUntracked);
+                            allowStateReadsEnd(prevAllowStateReads);
                             return true;
                         }
                     }
@@ -678,12 +695,14 @@ function shouldCompute(derivation) {
                     // invariantShouldCompute(derivation)
                     if (derivation.dependenciesState === exports.IDerivationState.STALE) {
                         untrackedEnd(prevUntracked);
+                        allowStateReadsEnd(prevAllowStateReads);
                         return true;
                     }
                 }
             }
             changeDependenciesStateTo0(derivation);
             untrackedEnd(prevUntracked);
+            allowStateReadsEnd(prevAllowStateReads);
             return false;
         }
     }
@@ -1132,8 +1151,7 @@ var ComputedValue = /** @class */ (function () {
         this.isComputing = false; // to check for cycles
         this.isRunningSetter = false;
         this.isTracing = TraceMode.NONE;
-        if (process.env.NODE_ENV !== "production" && !options.get)
-            throw "[mobx] missing option for computed: get";
+        invariant(options.get, "missing option for computed: get");
         this.derivation = options.get;
         this.name = options.name || "ComputedValue@" + getNextId();
         if (options.set)
@@ -1427,6 +1445,19 @@ var MobXGlobals = /** @class */ (function () {
     }
     return MobXGlobals;
 }());
+var mockGlobal = {};
+function getGlobal() {
+    if (typeof window !== "undefined") {
+        return window;
+    }
+    if (typeof global !== "undefined") {
+        return global;
+    }
+    if (typeof self !== "undefined") {
+        return self;
+    }
+    return mockGlobal;
+}
 var canMergeGlobalState = true;
 var isolateCalled = false;
 var globalState = (function () {
@@ -1480,16 +1511,6 @@ function resetGlobalState() {
             globalState[key] = defaultGlobals[key];
     globalState.allowStateChanges = !globalState.enforceActions;
 }
-var mockGlobal = {};
-function getGlobal() {
-    if (typeof window !== "undefined") {
-        return window;
-    }
-    if (typeof global !== "undefined") {
-        return global;
-    }
-    return mockGlobal;
-}
 
 function hasObservers(observable) {
     return observable.observers && observable.observers.size > 0;
@@ -1895,7 +1916,7 @@ function spyReport(event) {
 function spyReportStart(event) {
     if (process.env.NODE_ENV === "production")
         return;
-    var change = __assign({}, event, { spyReportStart: true });
+    var change = __assign(__assign({}, event), { spyReportStart: true });
     spyReport(change);
 }
 var END_EVENT = { spyReportEnd: true };
@@ -1903,7 +1924,7 @@ function spyReportEnd(change) {
     if (process.env.NODE_ENV === "production")
         return;
     if (change)
-        spyReport(__assign({}, change, { spyReportEnd: true }));
+        spyReport(__assign(__assign({}, change), { spyReportEnd: true }));
     else
         spyReport(END_EVENT);
 }
@@ -2298,8 +2319,6 @@ function extendObservableObjectWithProperties(target, properties, decorators, de
                 if (process.env.NODE_ENV !== "production") {
                     if (!isPlainObject(properties))
                         fail("'extendObservabe' only accepts plain objects as second argument");
-                    if (Object.getOwnPropertyDescriptor(target, key))
-                        fail("'extendObservable' can only be used to introduce new properties. Use 'set' or 'decorate' instead. The property '" + stringifyKey(key) + "' already exists on '" + target + "'");
                     if (isComputed(descriptor.value))
                         fail("Passing a 'computed' as initial property value is no longer supported by extendObservable. Use a getter or decorator instead");
                 }
@@ -2353,9 +2372,16 @@ function nodeToObserverTree(node) {
 }
 
 var generatorId = 0;
+function FlowCancellationError() {
+    this.message = "FLOW_CANCELLED";
+}
+FlowCancellationError.prototype = Object.create(Error.prototype);
+function isFlowCancellationError(error) {
+    return error instanceof FlowCancellationError;
+}
 function flow(generator) {
     if (arguments.length !== 1)
-        fail(!!process.env.NODE_ENV && "Flow expects one 1 argument and cannot be used as decorator");
+        fail(!!process.env.NODE_ENV && "Flow expects 1 argument and cannot be used as decorator");
     var name = generator.name || "<unnamed flow>";
     // Implementation based on https://github.com/tj/co/blob/master/index.js
     return function () {
@@ -2408,13 +2434,13 @@ function flow(generator) {
                 if (pendingPromise)
                     cancelPromise(pendingPromise);
                 // Finally block can return (or yield) stuff..
-                var res = gen.return();
+                var res = gen.return(undefined);
                 // eat anything that promise would do, it's cancelled!
                 var yieldedPromise = Promise.resolve(res.value);
                 yieldedPromise.then(noop, noop);
                 cancelPromise(yieldedPromise); // maybe it can be cancelled :)
                 // reject our original promise
-                rejector(new Error("FLOW_CANCELLED"));
+                rejector(new FlowCancellationError());
             }
             catch (e) {
                 rejector(e); // there could be a throwing finally block
@@ -2861,7 +2887,7 @@ function whenPromise(predicate, opts) {
         return fail("the options 'onError' and 'promise' cannot be combined");
     var cancel;
     var res = new Promise(function (resolve, reject) {
-        var disposer = _when(predicate, resolve, __assign({}, opts, { onError: reject }));
+        var disposer = _when(predicate, resolve, __assign(__assign({}, opts), { onError: reject }));
         cancel = function () {
             disposer();
             reject("WHEN_CANCELLED");
@@ -3178,7 +3204,7 @@ var ObservableArrayAdministration = /** @class */ (function () {
         // 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 && process.env.NODE_ENV !== "production")
-            spyReportStart(__assign({}, change, { name: this.atom.name }));
+            spyReportStart(__assign(__assign({}, change), { name: this.atom.name }));
         this.atom.reportChanged();
         if (notify)
             notifyListeners(this, change);
@@ -3200,7 +3226,7 @@ var ObservableArrayAdministration = /** @class */ (function () {
             }
             : null;
         if (notifySpy && process.env.NODE_ENV !== "production")
-            spyReportStart(__assign({}, change, { name: this.atom.name }));
+            spyReportStart(__assign(__assign({}, change), { name: this.atom.name }));
         this.atom.reportChanged();
         // conform: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/observe
         if (notify)
@@ -3469,7 +3495,7 @@ var ObservableMap = /** @class */ (function () {
                 }
                 : null;
             if (notifySpy && process.env.NODE_ENV !== "production")
-                spyReportStart(__assign({}, change, { name: this.name, key: key }));
+                spyReportStart(__assign(__assign({}, change), { name: this.name, key: key }));
             transaction(function () {
                 _this._keysAtom.reportChanged();
                 _this._updateHasMapEntry(key, false);
@@ -3507,7 +3533,7 @@ var ObservableMap = /** @class */ (function () {
                 }
                 : null;
             if (notifySpy && process.env.NODE_ENV !== "production")
-                spyReportStart(__assign({}, change, { name: this.name, key: key }));
+                spyReportStart(__assign(__assign({}, change), { name: this.name, key: key }));
             observable.setNewValue(newValue);
             if (notify)
                 notifyListeners(this, change);
@@ -3536,7 +3562,7 @@ var ObservableMap = /** @class */ (function () {
             }
             : null;
         if (notifySpy && process.env.NODE_ENV !== "production")
-            spyReportStart(__assign({}, change, { name: this.name, key: key }));
+            spyReportStart(__assign(__assign({}, change), { name: this.name, key: key }));
         if (notify)
             notifyListeners(this, change);
         if (notifySpy && process.env.NODE_ENV !== "production")
@@ -3590,17 +3616,17 @@ var ObservableMap = /** @class */ (function () {
         return this.entries();
     };
     ObservableMap.prototype.forEach = function (callback, thisArg) {
-        var e_1, _a;
+        var e_1, _b;
         try {
-            for (var _b = __values(this), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
+            for (var _c = __values(this), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var _e = __read(_d.value, 2), key = _e[0], value = _e[1];
                 callback.call(thisArg, value, key, this);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -3615,8 +3641,8 @@ var ObservableMap = /** @class */ (function () {
             if (isPlainObject(other))
                 getPlainObjectKeys(other).forEach(function (key) { return _this.set(key, other[key]); });
             else if (Array.isArray(other))
-                other.forEach(function (_a) {
-                    var _b = __read(_a, 2), key = _b[0], value = _b[1];
+                other.forEach(function (_b) {
+                    var _c = __read(_b, 2), key = _c[0], value = _c[1];
                     return _this.set(key, value);
                 });
             else if (isES6Map(other)) {
@@ -3633,17 +3659,17 @@ var ObservableMap = /** @class */ (function () {
         var _this = this;
         transaction(function () {
             untracked(function () {
-                var e_2, _a;
+                var e_2, _b;
                 try {
-                    for (var _b = __values(_this.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var key = _c.value;
+                    for (var _c = __values(_this.keys()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        var key = _d.value;
                         _this.delete(key);
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
@@ -3678,11 +3704,11 @@ var ObservableMap = /** @class */ (function () {
      * If there are duplicating keys after converting them to strings, behaviour is undetermined.
      */
     ObservableMap.prototype.toPOJO = function () {
-        var e_3, _a;
+        var e_3, _b;
         var res = {};
         try {
-            for (var _b = __values(this), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
+            for (var _c = __values(this), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var _e = __read(_d.value, 2), key = _e[0], value = _e[1];
                 // We lie about symbol key types due to https://github.com/Microsoft/TypeScript/issues/1863
                 res[typeof key === "symbol" ? key : stringifyKey(key)] = value;
             }
@@ -3690,7 +3716,7 @@ var ObservableMap = /** @class */ (function () {
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -3763,17 +3789,17 @@ var ObservableSet = /** @class */ (function () {
         var _this = this;
         transaction(function () {
             untracked(function () {
-                var e_1, _a;
+                var e_1, _b;
                 try {
-                    for (var _b = __values(_this._data.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var value = _c.value;
+                    for (var _c = __values(_this._data.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        var value = _d.value;
                         _this.delete(value);
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -3781,17 +3807,17 @@ var ObservableSet = /** @class */ (function () {
         });
     };
     ObservableSet.prototype.forEach = function (callbackFn, thisArg) {
-        var e_2, _a;
+        var e_2, _b;
         try {
-            for (var _b = __values(this), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var value = _c.value;
+            for (var _c = __values(this), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var value = _d.value;
                 callbackFn.call(thisArg, value, value, this);
             }
         }
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
             finally { if (e_2) throw e_2.error; }
         }
@@ -3863,7 +3889,7 @@ var ObservableSet = /** @class */ (function () {
                 }
                 : null;
             if (notifySpy && process.env.NODE_ENV !== "production")
-                spyReportStart(__assign({}, change, { name: this.name }));
+                spyReportStart(__assign(__assign({}, change), { name: this.name }));
             transaction(function () {
                 _this._atom.reportChanged();
                 _this._data.delete(value);
@@ -3998,7 +4024,7 @@ var ObservableObjectAdministration = /** @class */ (function () {
                 }
                 : null;
             if (notifySpy && process.env.NODE_ENV !== "production")
-                spyReportStart(__assign({}, change, { name: this.name, key: key }));
+                spyReportStart(__assign(__assign({}, change), { name: this.name, key: key }));
             observable.setNewValue(newValue);
             if (notify)
                 notifyListeners(this, change);
@@ -4088,7 +4114,7 @@ var ObservableObjectAdministration = /** @class */ (function () {
                 }
                 : null;
             if (notifySpy && process.env.NODE_ENV !== "production")
-                spyReportStart(__assign({}, change, { name: this.name, key: key }));
+                spyReportStart(__assign(__assign({}, change), { name: this.name, key: key }));
             if (notify)
                 notifyListeners(this, change);
             if (notifySpy && process.env.NODE_ENV !== "production")
@@ -4145,7 +4171,7 @@ var ObservableObjectAdministration = /** @class */ (function () {
             }
             : null;
         if (notifySpy && process.env.NODE_ENV !== "production")
-            spyReportStart(__assign({}, change, { name: this.name, key: key }));
+            spyReportStart(__assign(__assign({}, change), { name: this.name, key: key }));
         if (notify)
             notifyListeners(this, change);
         if (notifySpy && process.env.NODE_ENV !== "production")
@@ -4337,9 +4363,6 @@ function eq(a, b, depth, aStack, bStack) {
     var type = typeof a;
     if (type !== "function" && type !== "object" && typeof b != "object")
         return false;
-    // Unwrap any wrapped objects.
-    a = unwrap(a);
-    b = unwrap(b);
     // Compare `[[Class]]` names.
     var className = toString.call(a);
     if (className !== toString.call(b))
@@ -4367,7 +4390,18 @@ function eq(a, b, depth, aStack, bStack) {
             return +a === +b;
         case "[object Symbol]":
             return (typeof Symbol !== "undefined" && Symbol.valueOf.call(a) === Symbol.valueOf.call(b));
+        case "[object Map]":
+        case "[object Set]":
+            // Maps and Sets are unwrapped to arrays of entry-pairs, adding an incidental level.
+            // Hide this extra level by increasing the depth.
+            if (depth >= 0) {
+                depth++;
+            }
+            break;
     }
+    // Unwrap any wrapped objects.
+    a = unwrap(a);
+    b = unwrap(b);
     var areArrays = className === "[object Array]";
     if (!areArrays) {
         if (typeof a != "object" || typeof b != "object")
@@ -4521,11 +4555,14 @@ if (typeof __MOBX_DEVTOOLS_GLOBAL_HOOK__ === "object") {
 }
 
 exports.$mobx = $mobx;
+exports.FlowCancellationError = FlowCancellationError;
 exports.ObservableMap = ObservableMap;
 exports.ObservableSet = ObservableSet;
 exports.Reaction = Reaction;
 exports._allowStateChanges = allowStateChanges;
 exports._allowStateChangesInsideComputed = allowStateChangesInsideComputed;
+exports._allowStateReadsEnd = allowStateReadsEnd;
+exports._allowStateReadsStart = allowStateReadsStart;
 exports._endAction = _endAction;
 exports._getAdministration = getAdministration;
 exports._getGlobalState = getGlobalState;
@@ -4555,6 +4592,7 @@ exports.isArrayLike = isArrayLike;
 exports.isBoxedObservable = isObservableValue;
 exports.isComputed = isComputed;
 exports.isComputedProp = isComputedProp;
+exports.isFlowCancellationError = isFlowCancellationError;
 exports.isObservable = isObservable;
 exports.isObservableArray = isObservableArray;
 exports.isObservableMap = isObservableMap;

package/lib/mobx.js.flow

@@ -475,11 +475,62 @@ declare export function createAtom(
 
 declare export function decorate<T>(target: T, decorators: any): T
 
-declare export function flow<T>(fn: (...args: any[]) => T): (...args: any[]) => Promise<T>
+export type CancellablePromise<T> = Promise<T> & { cancel: () => void }
+
 declare export function flow<T>(
-    name: string,
-    fn: (...args: any[]) => T
-): (...args: any[]) => Promise<T>
+    fn: () => Generator<any, T | Promise<T>, any> | AsyncGenerator<any, T | Promise<T>, any>
+): () => CancellablePromise<T>
+declare export function flow<T, A>(
+    fn: (A) => Generator<any, T | Promise<T>, any> | AsyncGenerator<any, T | Promise<T>, any>
+): A => CancellablePromise<T>
+declare export function flow<T, A, B>(
+    fn: (A, B) => Generator<any, T | Promise<T>, any> | AsyncGenerator<any, T | Promise<T>, any>
+): (A, B) => CancellablePromise<T>
+declare export function flow<T, A, B, C>(
+    fn: (A, B, C) => Generator<any, T | Promise<T>, any> | AsyncGenerator<any, T | Promise<T>, any>
+): (A, B, C) => CancellablePromise<T>
+declare export function flow<T, A, B, C, D>(
+    fn: (
+        A,
+        B,
+        C,
+        D
+    ) => Generator<any, T | Promise<T>, any> | AsyncGenerator<any, T | Promise<T>, any>
+): (A, B, C, D) => CancellablePromise<T>
+declare export function flow<T, A, B, C, D, E>(
+    fn: (
+        A,
+        B,
+        C,
+        D,
+        E
+    ) => Generator<any, T | Promise<T>, any> | AsyncGenerator<any, T | Promise<T>, any>
+): (A, B, C, D, E) => CancellablePromise<T>
+declare export function flow<T, A, B, C, D, E, F>(
+    fn: (
+        A,
+        B,
+        C,
+        D,
+        E,
+        F
+    ) => Generator<any, T | Promise<T>, any> | AsyncGenerator<any, T | Promise<T>, any>
+): (A, B, C, D, E, F) => CancellablePromise<T>
+declare export function flow<T, A, B, C, D, E, F, G, H>(
+    fn: (
+        A,
+        B,
+        C,
+        D,
+        E,
+        F,
+        G,
+        H
+    ) => Generator<any, T | Promise<T>, any> | AsyncGenerator<any, T | Promise<T>, any>
+): (A, B, C, D, E, F, G, H) => CancellablePromise<T>
+
+declare export function isFlowCancellationError(error: Error): boolean
+declare export class FlowCancellationError extends Error {}
 
 declare export function keys<K>(map: ObservableMap<K, any>): K[]
 declare export function keys(obj: any): string[]