mobx-state-tree 5.0.1 → 5.0.5

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

@@ -1,4 +1,4 @@
-import { isComputedProp, isObservableProp, createAtom, action, computed, _allowStateChangesInsideComputed, reaction, runInAction, observable, values, entries, _getGlobalState, isObservableArray, ObservableMap, _interceptReads, intercept, observe, _getAdministration, set, makeObservable, getAtom } from 'mobx';
+import { isComputedProp, isObservableProp, createAtom, action, computed, _allowStateChangesInsideComputed, reaction, runInAction, observable, values, entries, _getGlobalState, isObservableArray, isObservableObject, defineProperty as defineProperty$1, ObservableMap, _interceptReads, intercept, observe, _getAdministration, set, makeObservable, getAtom } from 'mobx';
 
 var livelinessChecking = "warn";
 /**
@@ -64,11 +64,13 @@ PERFORMANCE OF THIS SOFTWARE.
 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 __());
@@ -154,6 +156,7 @@ function __read(o, n) {
     return ar;
 }
 
+/** @deprecated */
 function __spread() {
     for (var ar = [], i = 0; i < arguments.length; i++)
         ar = ar.concat(__read(arguments[i]));
@@ -1123,6 +1126,14 @@ var BaseNode = /** @class */ (function () {
         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,
@@ -2461,6 +2472,16 @@ var ComplexType = /** @class */ (function (_super) {
             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,
@@ -2479,9 +2500,7 @@ var ComplexType = /** @class */ (function (_super) {
             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);
@@ -3952,12 +3971,21 @@ function deepFreeze(value) {
 function isSerializable(value) {
     return typeof value !== "function";
 }
+/**
+ * @internal
+ * @hidden
+ */
+function defineProperty(object, key, descriptor) {
+    isObservableObject(object)
+        ? defineProperty$1(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,
@@ -3969,7 +3997,7 @@ function addHiddenFinalProp(object, propName, value) {
  * @hidden
  */
 function addHiddenWritableProp(object, propName, value) {
-    Object.defineProperty(object, propName, {
+    defineProperty(object, propName, {
         enumerable: false,
         writable: true,
         configurable: true,
@@ -4562,6 +4590,8 @@ function splitJsonPath(path) {
     return parts;
 }
 
+/** @hidden */
+var $preProcessorFailed = Symbol("$preProcessorFailed");
 var SnapshotProcessor = /** @class */ (function (_super) {
     __extends(SnapshotProcessor, _super);
     function SnapshotProcessor(_subtype, _processors, name) {
@@ -4606,6 +4636,19 @@ var SnapshotProcessor = /** @class */ (function (_super) {
             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,
@@ -4629,6 +4672,9 @@ var SnapshotProcessor = /** @class */ (function (_super) {
             node.getSnapshot = function () {
                 return _this.postProcessSnapshot(oldGetSnapshot.call(node));
             };
+            node.getReconciliationType = function () {
+                return _this;
+            };
         }
     });
     Object.defineProperty(SnapshotProcessor.prototype, "instantiate", {
@@ -4671,7 +4717,10 @@ var SnapshotProcessor = /** @class */ (function (_super) {
         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);
         }
     });
@@ -4692,7 +4741,10 @@ var SnapshotProcessor = /** @class */ (function (_super) {
                 ? 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;
         }
     });
@@ -4704,6 +4756,18 @@ var SnapshotProcessor = /** @class */ (function (_super) {
             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 this._subtype.isMatchingSnapshotId(current, processedSn);
+        }
+    });
     return SnapshotProcessor;
 }(BaseType));
 function proxyNodeTypeMethods(nodeType, snapshotProcessorType) {
@@ -5242,7 +5306,7 @@ MapType.prototype.applySnapshot = 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
@@ -5559,7 +5623,7 @@ ArrayType.prototype.applySnapshot = 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
@@ -5695,13 +5759,17 @@ function areSame(oldNode, newValue) {
     if (oldNode.snapshot === newValue) {
         return true;
     }
+    // Non object nodes don't get reconciled
+    if (!(oldNode instanceof ObjectNode)) {
+        return false;
+    }
+    var oldNodeType = oldNode.getReconciliationType();
     // new value is a snapshot with the correct identifier
-    return (oldNode instanceof ObjectNode &&
-        oldNode.identifier !== null &&
+    return (oldNode.identifier !== null &&
         oldNode.identifierAttribute &&
         isPlainObject(newValue) &&
-        oldNode.identifier === normalizeIdentifier(newValue[oldNode.identifierAttribute]) &&
-        oldNode.type.is(newValue));
+        oldNodeType.is(newValue) &&
+        oldNodeType.isMatchingSnapshotId(oldNode, newValue));
 }
 /**
  * Returns if a given value represents an array type.
@@ -6026,19 +6094,8 @@ var ModelType = /** @class */ (function (_super) {
                 // is this a computed property?
                 var descriptor = Object.getOwnPropertyDescriptor(views, key);
                 if ("get" in descriptor) {
-                    if (isComputedProp(self, key)) {
-                        var computedValue = _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 = action(computedValue.name + "-setter", descriptor.set);
-                    }
-                    else {
-                        Object.defineProperty(self, key, descriptor);
-                        makeObservable(self, (_a = {}, _a[key] = computed, _a));
-                    }
+                    defineProperty$1(self, key, descriptor);
+                    makeObservable(self, (_a = {}, _a[key] = computed, _a));
                 }
                 else if (typeof descriptor.value === "function") {
                     (!devMode() ? addHiddenFinalProp : addHiddenWritableProp)(self, key, descriptor.value);
@@ -6866,7 +6923,7 @@ var Union = /** @class */ (function (_super) {
         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);

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 __());
@@ -158,6 +160,7 @@
         return ar;
     }
 
+    /** @deprecated */
     function __spread() {
         for (var ar = [], i = 0; i < arguments.length; i++)
             ar = ar.concat(__read(arguments[i]));
@@ -1127,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,
@@ -2465,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,
@@ -2483,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);
@@ -3952,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,
@@ -3969,7 +3997,7 @@
      * @hidden
      */
     function addHiddenWritableProp(object, propName, value) {
-        Object.defineProperty(object, propName, {
+        defineProperty(object, propName, {
             enumerable: false,
             writable: true,
             configurable: true,
@@ -4544,6 +4572,8 @@
         return parts;
     }
 
+    /** @hidden */
+    var $preProcessorFailed = Symbol("$preProcessorFailed");
     var SnapshotProcessor = /** @class */ (function (_super) {
         __extends(SnapshotProcessor, _super);
         function SnapshotProcessor(_subtype, _processors, name) {
@@ -4588,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,
@@ -4611,6 +4654,9 @@
                 node.getSnapshot = function () {
                     return _this.postProcessSnapshot(oldGetSnapshot.call(node));
                 };
+                node.getReconciliationType = function () {
+                    return _this;
+                };
             }
         });
         Object.defineProperty(SnapshotProcessor.prototype, "instantiate", {
@@ -4653,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);
             }
         });
@@ -4674,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;
             }
         });
@@ -4686,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 this._subtype.isMatchingSnapshotId(current, processedSn);
+            }
+        });
         return SnapshotProcessor;
     }(BaseType));
     function proxyNodeTypeMethods(nodeType, snapshotProcessorType) {
@@ -5000,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);
@@ -5224,7 +5288,7 @@
      * `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
@@ -5342,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);
@@ -5541,7 +5605,7 @@
     /**
      * `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
@@ -5677,13 +5741,17 @@
         if (oldNode.snapshot === newValue) {
             return true;
         }
+        // Non object nodes don't get reconciled
+        if (!(oldNode instanceof ObjectNode)) {
+            return false;
+        }
+        var oldNodeType = oldNode.getReconciliationType();
         // new value is a snapshot with the correct identifier
-        return (oldNode instanceof ObjectNode &&
-            oldNode.identifier !== null &&
+        return (oldNode.identifier !== null &&
             oldNode.identifierAttribute &&
             isPlainObject(newValue) &&
-            oldNode.identifier === normalizeIdentifier(newValue[oldNode.identifierAttribute]) &&
-            oldNode.type.is(newValue));
+            oldNodeType.is(newValue) &&
+            oldNodeType.isMatchingSnapshotId(oldNode, newValue));
     }
     /**
      * Returns if a given value represents an array type.
@@ -5742,11 +5810,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?
             }
@@ -5930,7 +5998,7 @@
                     boundAction.$mst_middleware = middlewares;
                     var actionInvoker = createActionInvoker(self, name, boundAction);
                     actions[name] = actionInvoker;
-                    ( addHiddenWritableProp)(self, name, actionInvoker);
+                    (addHiddenWritableProp)(self, name, actionInvoker);
                 });
             }
         });
@@ -6008,22 +6076,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");
@@ -6848,7 +6905,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);
@@ -7208,7 +7265,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;
                     }