mobx-state-tree 5.0.0 → 5.0.4

package/dist/mobx-state-tree.umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('mobx')) :
     typeof define === 'function' && define.amd ? define(['exports', 'mobx'], factory) :
-    (global = global || self, factory(global.mobxStateTree = {}, global.mobx));
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.mobxStateTree = {}, global.mobx));
 }(this, (function (exports, mobx) { 'use strict';
 
     var livelinessChecking = "warn";
@@ -68,11 +68,13 @@
     var extendStatics = function(d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
 
     function __extends(d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -101,13 +103,6 @@
         return t;
     }
 
-    function __decorate(decorators, target, key, desc) {
-        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-        else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-        return c > 3 && r && Object.defineProperty(target, key, r), r;
-    }
-
     function __generator(thisArg, body) {
         var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
         return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
@@ -165,6 +160,7 @@
         return ar;
     }
 
+    /** @deprecated */
     function __spread() {
         for (var ar = [], i = 0; i < arguments.length; i++)
             ar = ar.concat(__read(arguments[i]));
@@ -1134,6 +1130,14 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(BaseNode.prototype, "getReconciliationType", {
+            enumerable: false,
+            configurable: true,
+            writable: true,
+            value: function () {
+                return this.type;
+            }
+        });
         Object.defineProperty(BaseNode.prototype, "baseSetParent", {
             enumerable: false,
             configurable: true,
@@ -1269,7 +1273,6 @@
         __extends(ScalarNode, _super);
         function ScalarNode(simpleType, parent, subpath, environment, initialSnapshot) {
             var _this = _super.call(this, simpleType, parent, subpath, environment) || this;
-            mobx.makeObservable(_this);
             try {
                 _this.storedValue = simpleType.createNewInstance(initialSnapshot);
             }
@@ -1390,11 +1393,9 @@
                 this.fireInternalHook(name);
             }
         });
-        __decorate([
-            mobx.action
-        ], ScalarNode.prototype, "die", null);
         return ScalarNode;
     }(BaseNode));
+    ScalarNode.prototype.die = mobx.action(ScalarNode.prototype.die);
 
     var nextNodeId = 1;
     var snapshotReactionOptions = {
@@ -1512,6 +1513,12 @@
                 writable: true,
                 value: false
             });
+            Object.defineProperty(_this, "_snapshotComputed", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
             Object.defineProperty(_this, "_snapshotUponDeath", {
                 enumerable: true,
                 configurable: true,
@@ -1525,7 +1532,7 @@
                 writable: true,
                 value: void 0
             });
-            mobx.makeObservable(_this);
+            _this._snapshotComputed = mobx.computed(function () { return freeze(_this.getSnapshot()); });
             _this.unbox = _this.unbox.bind(_this);
             _this._initialSnapshot = freeze(initialValue);
             _this.identifierAttribute = complexType.identifierAttribute;
@@ -1645,9 +1652,7 @@
                     this._isRunningAction = false;
                 }
                 this._observableInstanceState = 2 /* CREATED */;
-                // NOTE: we need to touch snapshot, because non-observable
-                // "_observableInstanceState" field was touched
-                invalidateComputed(this, "snapshot");
+                this._snapshotComputed.trackAndCompute();
                 if (this.isRoot)
                     this._addSnapshotReaction();
                 this._childNodes = EMPTY_OBJECT;
@@ -1759,7 +1764,7 @@
         Object.defineProperty(ObjectNode.prototype, "snapshot", {
             // advantage of using computed for a snapshot is that nicely respects transactions etc.
             get: function () {
-                return freeze(this.getSnapshot());
+                return this._snapshotComputed.get();
             },
             enumerable: false,
             configurable: true
@@ -2255,21 +2260,13 @@
                 }
             }
         });
-        __decorate([
-            mobx.action
-        ], ObjectNode.prototype, "createObservableInstance", null);
-        __decorate([
-            mobx.computed
-        ], ObjectNode.prototype, "snapshot", null);
-        __decorate([
-            mobx.action
-        ], ObjectNode.prototype, "detach", null);
-        __decorate([
-            mobx.action
-        ], ObjectNode.prototype, "die", null);
         return ObjectNode;
     }(BaseNode));
+    ObjectNode.prototype.createObservableInstance = mobx.action(ObjectNode.prototype.createObservableInstance);
+    ObjectNode.prototype.detach = mobx.action(ObjectNode.prototype.detach);
+    ObjectNode.prototype.die = mobx.action(ObjectNode.prototype.die);
 
+    var _a;
     /**
      * @internal
      * @hidden
@@ -2355,7 +2352,6 @@
                 writable: true,
                 value: void 0
             });
-            mobx.makeObservable(this);
             this.name = name;
         }
         Object.defineProperty(BaseType.prototype, "create", {
@@ -2440,13 +2436,10 @@
             enumerable: false,
             configurable: true
         });
-        var _a;
-        _a = $type;
-        __decorate([
-            mobx.action
-        ], BaseType.prototype, "create", null);
         return BaseType;
     }());
+    _a = $type;
+    BaseType.prototype.create = mobx.action(BaseType.prototype.create);
     /**
      * A complex type produces a MST node (Node in the state tree)
      *
@@ -2483,6 +2476,16 @@
                 return node.storedValue;
             }
         });
+        Object.defineProperty(ComplexType.prototype, "isMatchingSnapshotId", {
+            enumerable: false,
+            configurable: true,
+            writable: true,
+            value: function (current, snapshot) {
+                return (!current.identifierAttribute ||
+                    current.identifier ===
+                        normalizeIdentifier(snapshot[current.identifierAttribute]));
+            }
+        });
         Object.defineProperty(ComplexType.prototype, "tryToReconcileNode", {
             enumerable: false,
             configurable: true,
@@ -2501,9 +2504,7 @@
                 if (current.type === this &&
                     isMutable(newValue) &&
                     !isStateTreeNode(newValue) &&
-                    (!current.identifierAttribute ||
-                        current.identifier ===
-                            normalizeIdentifier(newValue[current.identifierAttribute]))) {
+                    this.isMatchingSnapshotId(current, newValue)) {
                     // the newValue has no node, so can be treated like a snapshot
                     // we can reconcile
                     current.applySnapshot(newValue);
@@ -2543,11 +2544,9 @@
                 return null;
             }
         });
-        __decorate([
-            mobx.action
-        ], ComplexType.prototype, "create", null);
         return ComplexType;
     }(BaseType));
+    ComplexType.prototype.create = mobx.action(ComplexType.prototype.create);
     /**
      * @internal
      * @hidden
@@ -3972,12 +3971,21 @@
     function isSerializable(value) {
         return typeof value !== "function";
     }
+    /**
+     * @internal
+     * @hidden
+     */
+    function defineProperty(object, key, descriptor) {
+        mobx.isObservableObject(object)
+            ? mobx.defineProperty(object, key, descriptor)
+            : Object.defineProperty(object, key, descriptor);
+    }
     /**
      * @internal
      * @hidden
      */
     function addHiddenFinalProp(object, propName, value) {
-        Object.defineProperty(object, propName, {
+        defineProperty(object, propName, {
             enumerable: false,
             writable: false,
             configurable: true,
@@ -3989,7 +3997,7 @@
      * @hidden
      */
     function addHiddenWritableProp(object, propName, value) {
-        Object.defineProperty(object, propName, {
+        defineProperty(object, propName, {
             enumerable: false,
             writable: true,
             configurable: true,
@@ -4181,14 +4189,6 @@
             res[i] = args[i];
         return res;
     }
-    /**
-     * @internal
-     * @hidden
-     */
-    function invalidateComputed(target, propName) {
-        var atom = mobx.getAtom(target, propName);
-        atom.trackAndCompute();
-    }
     /**
      * @internal
      * @hidden
@@ -4572,6 +4572,8 @@
         return parts;
     }
 
+    /** @hidden */
+    var $preProcessorFailed = Symbol("$preProcessorFailed");
     var SnapshotProcessor = /** @class */ (function (_super) {
         __extends(SnapshotProcessor, _super);
         function SnapshotProcessor(_subtype, _processors, name) {
@@ -4616,6 +4618,19 @@
                 return sn;
             }
         });
+        Object.defineProperty(SnapshotProcessor.prototype, "preProcessSnapshotSafe", {
+            enumerable: false,
+            configurable: true,
+            writable: true,
+            value: function (sn) {
+                try {
+                    return this.preProcessSnapshot(sn);
+                }
+                catch (e) {
+                    return $preProcessorFailed;
+                }
+            }
+        });
         Object.defineProperty(SnapshotProcessor.prototype, "postProcessSnapshot", {
             enumerable: false,
             configurable: true,
@@ -4634,11 +4649,14 @@
             value: function (node) {
                 var _this = this;
                 // the node has to use these methods rather than the original type ones
-                proxyNodeTypeMethods(node.type, this, "create");
+                proxyNodeTypeMethods(node.type, this, "create", "is", "isMatchingSnapshotId");
                 var oldGetSnapshot = node.getSnapshot;
                 node.getSnapshot = function () {
                     return _this.postProcessSnapshot(oldGetSnapshot.call(node));
                 };
+                node.getReconciliationType = function () {
+                    return _this;
+                };
             }
         });
         Object.defineProperty(SnapshotProcessor.prototype, "instantiate", {
@@ -4681,7 +4699,10 @@
             configurable: true,
             writable: true,
             value: function (value, context) {
-                var processedSn = this.preProcessSnapshot(value);
+                var processedSn = this.preProcessSnapshotSafe(value);
+                if (processedSn === $preProcessorFailed) {
+                    return typeCheckFailure(context, value, "Failed to preprocess value");
+                }
                 return this._subtype.validate(processedSn, context);
             }
         });
@@ -4702,7 +4723,10 @@
                     ? this._subtype
                     : isStateTreeNode(thing)
                         ? getSnapshot(thing, false)
-                        : this.preProcessSnapshot(thing);
+                        : this.preProcessSnapshotSafe(thing);
+                if (value === $preProcessorFailed) {
+                    return false;
+                }
                 return this._subtype.validate(value, [{ path: "", type: this._subtype }]).length === 0;
             }
         });
@@ -4714,6 +4738,18 @@
                 return this._subtype.isAssignableFrom(type);
             }
         });
+        Object.defineProperty(SnapshotProcessor.prototype, "isMatchingSnapshotId", {
+            enumerable: false,
+            configurable: true,
+            writable: true,
+            value: function (current, snapshot) {
+                if (!(this._subtype instanceof ComplexType)) {
+                    return false;
+                }
+                var processedSn = this.preProcessSnapshot(snapshot);
+                return ComplexType.prototype.isMatchingSnapshotId.call(this._subtype, current, processedSn);
+            }
+        });
         return SnapshotProcessor;
     }(BaseType));
     function proxyNodeTypeMethods(nodeType, snapshotProcessorType) {
@@ -4945,7 +4981,6 @@
             });
             _this._determineIdentifierMode();
             _this.hookInitializers = hookInitializers;
-            mobx.makeObservable(_this);
             return _this;
         }
         Object.defineProperty(MapType.prototype, "hooks", {
@@ -5029,7 +5064,7 @@
                     Object.keys(hooks).forEach(function (name) {
                         var hook = hooks[name];
                         var actionInvoker = createActionInvoker(instance, name, hook);
-                        ( addHiddenWritableProp)(instance, name, actionInvoker);
+                        (addHiddenWritableProp)(instance, name, actionInvoker);
                     });
                 });
                 mobx.intercept(instance, this.willChange);
@@ -5246,16 +5281,14 @@
                 node.storedValue.delete(subpath);
             }
         });
-        __decorate([
-            mobx.action
-        ], MapType.prototype, "applySnapshot", null);
         return MapType;
     }(ComplexType));
+    MapType.prototype.applySnapshot = mobx.action(MapType.prototype.applySnapshot);
     /**
      * `types.map` - Creates a key based collection type who's children are all of a uniform declared type.
      * If the type stored in a map has an identifier, it is mandatory to store the child under that identifier in the map.
      *
-     * This type will always produce [observable maps](https://mobx.js.org/refguide/map.html)
+     * This type will always produce [observable maps](https://mobx.js.org/api.html#observablemap)
      *
      * Example:
      * ```ts
@@ -5318,7 +5351,6 @@
                 writable: true,
                 value: []
             });
-            mobx.makeObservable(_this);
             _this.hookInitializers = hookInitializers;
             return _this;
         }
@@ -5374,7 +5406,7 @@
                     Object.keys(hooks).forEach(function (name) {
                         var hook = hooks[name];
                         var actionInvoker = createActionInvoker(instance, name, hook);
-                        ( addHiddenWritableProp)(instance, name, actionInvoker);
+                        (addHiddenWritableProp)(instance, name, actionInvoker);
                     });
                 });
                 mobx.intercept(instance, this.willChange);
@@ -5567,15 +5599,13 @@
                 node.storedValue.splice(Number(subpath), 1);
             }
         });
-        __decorate([
-            mobx.action
-        ], ArrayType.prototype, "applySnapshot", null);
         return ArrayType;
     }(ComplexType));
+    ArrayType.prototype.applySnapshot = mobx.action(ArrayType.prototype.applySnapshot);
     /**
      * `types.array` - Creates an index based collection type who's children are all of a uniform declared type.
      *
-     * This type will always produce [observable arrays](https://mobx.js.org/refguide/array.html)
+     * This type will always produce [observable arrays](https://mobx.js.org/api.html#observablearray)
      *
      * Example:
      * ```ts
@@ -5716,8 +5746,8 @@
             oldNode.identifier !== null &&
             oldNode.identifierAttribute &&
             isPlainObject(newValue) &&
-            oldNode.identifier === normalizeIdentifier(newValue[oldNode.identifierAttribute]) &&
-            oldNode.type.is(newValue));
+            oldNode.type.is(newValue) &&
+            oldNode.type.isMatchingSnapshotId(oldNode, newValue));
     }
     /**
      * Returns if a given value represents an array type.
@@ -5776,11 +5806,11 @@
                 return props;
                 // its a function, maybe the user wanted a view?
             }
-            else if ( typeof value === "function") {
+            else if (typeof value === "function") {
                 throw fail$1("Invalid type definition for property '" + key + "', it looks like you passed a function. Did you forget to invoke it, or did you intend to declare a view / action?");
                 // no other complex values
             }
-            else if ( typeof value === "object") {
+            else if (typeof value === "object") {
                 throw fail$1("Invalid type definition for property '" + key + "', it looks like you passed an object. Try passing another model type or a types.frozen.");
                 // WTF did you pass in mate?
             }
@@ -5880,7 +5910,6 @@
                         });
                 }
             });
-            mobx.makeObservable(_this);
             Object.assign(_this, defaultObjectOptions, opts);
             // ensures that any default value gets converted to its related type
             _this.properties = toPropertiesObject(_this.properties);
@@ -5965,7 +5994,7 @@
                     boundAction.$mst_middleware = middlewares;
                     var actionInvoker = createActionInvoker(self, name, boundAction);
                     actions[name] = actionInvoker;
-                    ( addHiddenWritableProp)(self, name, actionInvoker);
+                    (addHiddenWritableProp)(self, name, actionInvoker);
                 });
             }
         });
@@ -6043,22 +6072,11 @@
                     // is this a computed property?
                     var descriptor = Object.getOwnPropertyDescriptor(views, key);
                     if ("get" in descriptor) {
-                        if (mobx.isComputedProp(self, key)) {
-                            var computedValue = mobx._getAdministration(self, key);
-                            // TODO: mobx currently does not allow redefining computes yet, pending #1121
-                            // FIXME: this binds to the internals of mobx!
-                            computedValue.derivation = descriptor.get;
-                            computedValue.scope = self;
-                            if (descriptor.set)
-                                computedValue.setter = mobx.action(computedValue.name + "-setter", descriptor.set);
-                        }
-                        else {
-                            Object.defineProperty(self, key, descriptor);
-                            mobx.makeObservable(self, (_a = {}, _a[key] = mobx.computed, _a));
-                        }
+                        mobx.defineProperty(self, key, descriptor);
+                        mobx.makeObservable(self, (_a = {}, _a[key] = mobx.computed, _a));
                     }
                     else if (typeof descriptor.value === "function") {
-                        ( addHiddenWritableProp)(self, key, descriptor.value);
+                        (addHiddenWritableProp)(self, key, descriptor.value);
                     }
                     else {
                         throw fail$1("A view member should either be a function or getter based property");
@@ -6319,11 +6337,9 @@
                 node.storedValue[subpath] = undefined;
             }
         });
-        __decorate([
-            mobx.action
-        ], ModelType.prototype, "applySnapshot", null);
         return ModelType;
     }(ComplexType));
+    ModelType.prototype.applySnapshot = mobx.action(ModelType.prototype.applySnapshot);
     /**
      * `types.model` - Creates a new model type by providing a name, properties, volatile state and actions.
      *
@@ -6885,7 +6901,7 @@
             configurable: true,
             writable: true,
             value: function (current, newValue, parent, subpath) {
-                var type = this.determineType(newValue, current.type);
+                var type = this.determineType(newValue, current.getReconciliationType());
                 if (!type)
                     throw fail$1("No matching type for union " + this.describe()); // can happen in prod builds
                 return type.reconcile(current, newValue, parent, subpath);
@@ -7245,7 +7261,7 @@
                     if (mustSucceed && t === undefined)
                         throw fail$1("Late type seems to be used too early, the definition (still) returns undefined");
                     if (t) {
-                        if ( !isType(t))
+                        if (!isType(t))
                             throw fail$1("Failed to determine subtype, make sure types.late returns a type definition.");
                         this._subType = t;
                     }