mobx-state-tree 5.0.2 → 5.1.0

package/README.md

@@ -4,7 +4,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)
+[![Codecov](https://codecov.io/gh/mobxjs/mobx-state-tree/branch/master/graph/badge.svg?token=BFkuCB6CtL)](https://codecov.io/gh/mobxjs/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]));
@@ -577,7 +580,7 @@ function resolveIdentifier(type, target, identifier) {
     assertIsStateTreeNode(target, 2);
     assertIsValidIdentifier(identifier, 3);
     var node = getStateTreeNode(target).root.identifierCache.resolve(type, normalizeIdentifier(identifier));
-    return node ? node.value : undefined;
+    return node === null || node === void 0 ? void 0 : node.value;
 }
 /**
  * Returns the identifier of the target node.
@@ -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);
@@ -3911,14 +3930,12 @@ function isMutable(value) {
  */
 function isPrimitive(value, includeDate) {
     if (includeDate === void 0) { includeDate = true; }
-    if (value === null || value === undefined)
-        return true;
-    if (typeof value === "string" ||
+    return (value === null ||
+        value === undefined ||
+        typeof value === "string" ||
         typeof value === "number" ||
         typeof value === "boolean" ||
-        (includeDate && value instanceof Date))
-        return true;
-    return false;
+        (includeDate && value instanceof Date));
 }
 /**
  * @internal
@@ -4575,6 +4592,8 @@ function splitJsonPath(path) {
     return parts;
 }
 
+/** @hidden */
+var $preProcessorFailed = Symbol("$preProcessorFailed");
 var SnapshotProcessor = /** @class */ (function (_super) {
     __extends(SnapshotProcessor, _super);
     function SnapshotProcessor(_subtype, _processors, name) {
@@ -4619,6 +4638,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,
@@ -4642,6 +4674,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", {
@@ -4684,7 +4719,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);
         }
     });
@@ -4705,7 +4743,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;
         }
     });
@@ -4717,6 +4758,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) {
@@ -4978,18 +5031,17 @@ var MapType = /** @class */ (function (_super) {
             }
             var modelTypes = [];
             if (tryCollectModelTypes(this._subType, modelTypes)) {
-                var identifierAttribute_1 = undefined;
-                modelTypes.forEach(function (type) {
-                    if (type.identifierAttribute) {
-                        if (identifierAttribute_1 && identifierAttribute_1 !== type.identifierAttribute) {
-                            throw fail$1("The objects in a map should all have the same identifier attribute, expected '" + identifierAttribute_1 + "', but child of type '" + type.name + "' declared attribute '" + type.identifierAttribute + "' as identifier");
-                        }
-                        identifierAttribute_1 = type.identifierAttribute;
+                var identifierAttribute = modelTypes.reduce(function (current, type) {
+                    if (!type.identifierAttribute)
+                        return current;
+                    if (current && current !== type.identifierAttribute) {
+                        throw fail$1("The objects in a map should all have the same identifier attribute, expected '" + current + "', but child of type '" + type.name + "' declared attribute '" + type.identifierAttribute + "' as identifier");
                     }
-                });
-                if (identifierAttribute_1) {
+                    return type.identifierAttribute;
+                }, undefined);
+                if (identifierAttribute) {
                     this.identifierMode = MapIdentifierMode.YES;
-                    this.mapIdentifierAttribute = identifierAttribute_1;
+                    this.mapIdentifierAttribute = identifierAttribute;
                 }
                 else {
                     this.identifierMode = MapIdentifierMode.NO;
@@ -5708,13 +5760,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.
@@ -6868,7 +6924,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);