mobx-state-tree 5.0.1 → 5.0.5

package/README.md

@@ -5,7 +5,7 @@
 [![npm version](https://badge.fury.io/js/mobx-state-tree.svg)](https://badge.fury.io/js/mobx-state-tree)
 [![CircleCI](https://circleci.com/gh/mobxjs/mobx-state-tree.svg?style=svg)](https://circleci.com/gh/mobxjs/mobx-state-tree)
 [![Coverage Status](https://coveralls.io/repos/github/mobxjs/mobx-state-tree/badge.svg?branch=master)](https://coveralls.io/github/mobxjs/mobx-state-tree?branch=master)
-[![Have a question? Ask on Spectrum!](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/mobx-state-tree)
+[![Have a question? Ask on GitHub Discussions!](https://img.shields.io/badge/Have%20a%20question%3F-Ask%20on%20GitHub%20Discussions!-blue)](https://github.com/mobxjs/mobx-state-tree/discussions)
 
 ## What is mobx-state-tree?
 

package/dist/mobx-state-tree.js

@@ -68,11 +68,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 __());
@@ -158,6 +160,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]));
@@ -1127,6 +1130,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,
@@ -2465,6 +2476,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,
@@ -2483,9 +2504,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);
@@ -3956,12 +3975,21 @@ function deepFreeze(value) {
 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,
@@ -3973,7 +4001,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,
@@ -4566,6 +4594,8 @@ function splitJsonPath(path) {
     return parts;
 }
 
+/** @hidden */
+var $preProcessorFailed = Symbol("$preProcessorFailed");
 var SnapshotProcessor = /** @class */ (function (_super) {
     __extends(SnapshotProcessor, _super);
     function SnapshotProcessor(_subtype, _processors, name) {
@@ -4610,6 +4640,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,
@@ -4633,6 +4676,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", {
@@ -4675,7 +4721,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);
         }
     });
@@ -4696,7 +4745,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;
         }
     });
@@ -4708,6 +4760,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) {
@@ -5246,7 +5310,7 @@ 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
@@ -5563,7 +5627,7 @@ ArrayType.prototype.applySnapshot = mobx.action(ArrayType.prototype.applySnapsho
 /**
  * `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
@@ -5699,13 +5763,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.
@@ -6030,19 +6098,8 @@ var ModelType = /** @class */ (function (_super) {
                 // 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") {
                     (!devMode() ? addHiddenFinalProp : addHiddenWritableProp)(self, key, descriptor.value);
@@ -6870,7 +6927,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);