mobx-state-tree 5.0.3 → 5.1.2

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

@@ -576,7 +576,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.
@@ -1126,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,
@@ -3918,14 +3926,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
@@ -4582,6 +4588,8 @@ function splitJsonPath(path) {
     return parts;
 }
 
+/** @hidden */
+var $preProcessorFailed = Symbol("$preProcessorFailed");
 var SnapshotProcessor = /** @class */ (function (_super) {
     __extends(SnapshotProcessor, _super);
     function SnapshotProcessor(_subtype, _processors, name) {
@@ -4626,6 +4634,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,
@@ -4644,11 +4665,14 @@ var SnapshotProcessor = /** @class */ (function (_super) {
         value: function (node) {
             var _this = this;
             // the node has to use these methods rather than the original type ones
-            proxyNodeTypeMethods(node.type, this, "create", "is", "isMatchingSnapshotId");
+            proxyNodeTypeMethods(node.type, this, "create");
             var oldGetSnapshot = node.getSnapshot;
             node.getSnapshot = function () {
                 return _this.postProcessSnapshot(oldGetSnapshot.call(node));
             };
+            node.getReconciliationType = function () {
+                return _this;
+            };
         }
     });
     Object.defineProperty(SnapshotProcessor.prototype, "instantiate", {
@@ -4691,7 +4715,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);
         }
     });
@@ -4712,7 +4739,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;
         }
     });
@@ -4733,7 +4763,7 @@ var SnapshotProcessor = /** @class */ (function (_super) {
                 return false;
             }
             var processedSn = this.preProcessSnapshot(snapshot);
-            return ComplexType.prototype.isMatchingSnapshotId.call(this._subtype, current, processedSn);
+            return this._subtype.isMatchingSnapshotId(current, processedSn);
         }
     });
     return SnapshotProcessor;
@@ -4997,18 +5027,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;
@@ -5727,13 +5756,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.type.isMatchingSnapshotId(oldNode, newValue) &&
-        oldNode.type.is(newValue));
+        oldNodeType.is(newValue) &&
+        oldNodeType.isMatchingSnapshotId(oldNode, newValue));
 }
 /**
  * Returns if a given value represents an array type.
@@ -6887,7 +6920,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

@@ -580,7 +580,7 @@
         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.
@@ -1130,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,
@@ -3922,14 +3930,12 @@
      */
     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
@@ -4564,6 +4570,8 @@
         return parts;
     }
 
+    /** @hidden */
+    var $preProcessorFailed = Symbol("$preProcessorFailed");
     var SnapshotProcessor = /** @class */ (function (_super) {
         __extends(SnapshotProcessor, _super);
         function SnapshotProcessor(_subtype, _processors, name) {
@@ -4608,6 +4616,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,
@@ -4626,11 +4647,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", "is", "isMatchingSnapshotId");
+                proxyNodeTypeMethods(node.type, this, "create");
                 var oldGetSnapshot = node.getSnapshot;
                 node.getSnapshot = function () {
                     return _this.postProcessSnapshot(oldGetSnapshot.call(node));
                 };
+                node.getReconciliationType = function () {
+                    return _this;
+                };
             }
         });
         Object.defineProperty(SnapshotProcessor.prototype, "instantiate", {
@@ -4673,7 +4697,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);
             }
         });
@@ -4694,7 +4721,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;
             }
         });
@@ -4715,7 +4745,7 @@
                     return false;
                 }
                 var processedSn = this.preProcessSnapshot(snapshot);
-                return ComplexType.prototype.isMatchingSnapshotId.call(this._subtype, current, processedSn);
+                return this._subtype.isMatchingSnapshotId(current, processedSn);
             }
         });
         return SnapshotProcessor;
@@ -4979,18 +5009,17 @@
                 }
                 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;
@@ -5709,13 +5738,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.type.isMatchingSnapshotId(oldNode, newValue) &&
-            oldNode.type.is(newValue));
+            oldNodeType.is(newValue) &&
+            oldNodeType.isMatchingSnapshotId(oldNode, newValue));
     }
     /**
      * Returns if a given value represents an array type.
@@ -6869,7 +6902,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);