mobx-state-tree 5.0.3 → 5.0.4

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

@@ -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,
@@ -4582,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) {
@@ -4626,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,
@@ -4649,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", {
@@ -4691,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);
         }
     });
@@ -4712,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;
         }
     });
@@ -5732,8 +5764,8 @@ function areSame(oldNode, newValue) {
         oldNode.identifier !== null &&
         oldNode.identifierAttribute &&
         isPlainObject(newValue) &&
-        oldNode.type.isMatchingSnapshotId(oldNode, newValue) &&
-        oldNode.type.is(newValue));
+        oldNode.type.is(newValue) &&
+        oldNode.type.isMatchingSnapshotId(oldNode, newValue));
 }
 /**
  * Returns if a given value represents an array type.
@@ -6887,7 +6919,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

@@ -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,
@@ -4564,6 +4572,8 @@
         return parts;
     }
 
+    /** @hidden */
+    var $preProcessorFailed = Symbol("$preProcessorFailed");
     var SnapshotProcessor = /** @class */ (function (_super) {
         __extends(SnapshotProcessor, _super);
         function SnapshotProcessor(_subtype, _processors, name) {
@@ -4608,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,
@@ -4631,6 +4654,9 @@
                 node.getSnapshot = function () {
                     return _this.postProcessSnapshot(oldGetSnapshot.call(node));
                 };
+                node.getReconciliationType = function () {
+                    return _this;
+                };
             }
         });
         Object.defineProperty(SnapshotProcessor.prototype, "instantiate", {
@@ -4673,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);
             }
         });
@@ -4694,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;
             }
         });
@@ -5714,8 +5746,8 @@
             oldNode.identifier !== null &&
             oldNode.identifierAttribute &&
             isPlainObject(newValue) &&
-            oldNode.type.isMatchingSnapshotId(oldNode, newValue) &&
-            oldNode.type.is(newValue));
+            oldNode.type.is(newValue) &&
+            oldNode.type.isMatchingSnapshotId(oldNode, newValue));
     }
     /**
      * Returns if a given value represents an array type.
@@ -6869,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);