mobx-state-tree 7.0.0-pre.2 → 7.0.1

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

@@ -59,7 +59,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 var extendStatics = function(d, b) {
     extendStatics = Object.setPrototypeOf ||
@@ -100,8 +100,8 @@ function __rest(s, e) {
 }
 
 function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -1797,7 +1797,9 @@ var ObjectNode = /** @class */ (function (_super) {
                 if (!this.parent && newParent.root === this) {
                     throw new MstError("A state tree is not allowed to contain itself. Cannot assign ".concat(this, " to path '").concat(newParent.path, "/").concat(subpath, "'"));
                 }
-                if (!this.parent && !!this.environment && this.environment !== newParent.root.environment) {
+                if (!this.parent &&
+                    !!this.environment &&
+                    this.environment !== newParent.root.environment) {
                     throw new MstError("A state tree cannot be made part of another state tree as long as their environments are different.");
                 }
             }
@@ -1821,7 +1823,9 @@ var ObjectNode = /** @class */ (function (_super) {
         value: function (name) {
             var _this = this;
             this.fireInternalHook(name);
-            var fn = this.storedValue && typeof this.storedValue === "object" && this.storedValue[name];
+            var fn = this.storedValue &&
+                typeof this.storedValue === "object" &&
+                this.storedValue[name];
             if (typeof fn === "function") {
                 // we check for it to allow old mobx peer dependencies that don't have the method to work (even when still bugged)
                 if (_allowStateChangesInsideComputed) {
@@ -1926,7 +1930,8 @@ var ObjectNode = /** @class */ (function (_super) {
             var actionFullPath = "";
             if (actionContext && actionContext.name != null) {
                 // try to use the context, and if it not available use the node one
-                var actionPath = (actionContext && actionContext.context && getPath(actionContext.context)) || escapedPath;
+                var actionPath = (actionContext && actionContext.context && getPath(actionContext.context)) ||
+                    escapedPath;
                 actionFullPath = "".concat(actionPath, ".").concat(actionContext.name, "()");
             }
             return "You are trying to read or write to an object that is no longer part of a state tree. (Object type: '".concat(this.type.name, "', Path upon death: '").concat(escapedPath, "', Subpath: '").concat(subpath, "', Action: '").concat(actionFullPath, "'). Either detach nodes first, or don't use objects after removing / replacing them in the tree.");
@@ -2561,7 +2566,8 @@ var ComplexType = /** @class */ (function (_super) {
         writable: true,
         value: function (current, snapshot) {
             return (!current.identifierAttribute ||
-                current.identifier === normalizeIdentifier(snapshot[current.identifierAttribute]));
+                current.identifier ===
+                    normalizeIdentifier(snapshot[current.identifierAttribute]));
         }
     });
     Object.defineProperty(ComplexType.prototype, "tryToReconcileNode", {
@@ -2959,7 +2965,8 @@ function serializeArgument(node, actionName, index, arg) {
     if (typeof arg === "function")
         return serializeTheUnserializable("[function]");
     if (typeof arg === "object" && !isPlainObject(arg) && !isArray(arg))
-        return serializeTheUnserializable("[object ".concat((arg && arg.constructor && arg.constructor.name) || "Complex Object", "]"));
+        return serializeTheUnserializable("[object ".concat((arg && arg.constructor && arg.constructor.name) ||
+            "Complex Object", "]"));
     try {
         // Check if serializable, cycle free etc...
         // MWE: there must be a better way....
@@ -3215,7 +3222,8 @@ function createActionInvoker(target, name, fn) {
             tree: getRoot(target),
             rootId: parentContext ? parentContext.rootId : id,
             parentId: parentContext ? parentContext.id : 0,
-            allParentIds: parentContext ? __spreadArray(__spreadArray([], __read(parentContext.allParentIds), false), [parentContext.id], false) : [],
+            allParentIds: parentContext
+                ? __spreadArray(__spreadArray([], __read(parentContext.allParentIds), false), [parentContext.id], false) : [],
             parentEvent: parentContext,
             parentActionEvent: parentActionContext
         }, fn);
@@ -3809,7 +3817,7 @@ function getRelativePathBetweenNodes(base, target) {
             break;
     }
     // TODO: assert that no targetParts paths are "..", "." or ""!
-    return baseParts.slice(common).map(doubleDot).join("/") + joinJsonPath(targetParts.slice(common));
+    return (baseParts.slice(common).map(doubleDot).join("/") + joinJsonPath(targetParts.slice(common)));
 }
 /**
  * @internal
@@ -4057,7 +4065,8 @@ function deepFreeze(value) {
     freeze(value);
     if (isPlainObject(value)) {
         Object.keys(value).forEach(function (propKey) {
-            if (!isPrimitive(value[propKey]) && !Object.isFrozen(value[propKey])) {
+            if (!isPrimitive(value[propKey]) &&
+                !Object.isFrozen(value[propKey])) {
                 deepFreeze(value[propKey]);
             }
         });
@@ -6125,11 +6134,16 @@ var ModelType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (self, actions) {
+            var _this = this;
             // check if return is correct
-            if (!isPlainObject(actions))
+            if (!isPlainObject(actions)) {
                 throw new MstError("actions initializer should return a plain object containing actions");
+            }
             // bind actions to the object created
-            Object.keys(actions).forEach(function (name) {
+            Object.getOwnPropertyNames(actions).forEach(function (name) {
+                if (name in _this.properties) {
+                    throw new MstError("'".concat(name, "' is a property and cannot be declared as an action"));
+                }
                 // warn if preprocessor was given
                 if (name === PRE_PROCESS_SNAPSHOT)
                     throw new MstError("Cannot define action '".concat(PRE_PROCESS_SNAPSHOT, "', it should be defined using 'type.preProcessSnapshot(fn)' instead"));
@@ -6179,10 +6193,17 @@ var ModelType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (self, state) {
+            var _this = this;
             // check views return
-            if (!isPlainObject(state))
+            if (!isPlainObject(state)) {
                 throw new MstError("volatile state initializer should return a plain object containing state");
-            set(self, state);
+            }
+            Object.getOwnPropertyNames(state).forEach(function (name) {
+                if (name in _this.properties) {
+                    throw new MstError("'".concat(name, "' is a property and cannot be declared as volatile state"));
+                }
+                set(self, name, state[name]);
+            });
         }
     });
     Object.defineProperty(ModelType.prototype, "extend", {
@@ -6224,19 +6245,24 @@ var ModelType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (self, views) {
+            var _this = this;
             // check views return
-            if (!isPlainObject(views))
+            if (!isPlainObject(views)) {
                 throw new MstError("views initializer should return a plain object containing views");
-            Object.getOwnPropertyNames(views).forEach(function (key) {
+            }
+            Object.getOwnPropertyNames(views).forEach(function (name) {
                 var _a;
+                if (name in _this.properties) {
+                    throw new MstError("'".concat(name, "' is a property and cannot be declared as a view"));
+                }
                 // is this a computed property?
-                var descriptor = Object.getOwnPropertyDescriptor(views, key);
+                var descriptor = Object.getOwnPropertyDescriptor(views, name);
                 if ("get" in descriptor) {
-                    defineProperty$1(self, key, descriptor);
-                    makeObservable(self, (_a = {}, _a[key] = computed, _a));
+                    defineProperty$1(self, name, descriptor);
+                    makeObservable(self, (_a = {}, _a[name] = computed, _a));
                 }
                 else if (typeof descriptor.value === "function") {
-                    (!devMode() ? addHiddenFinalProp : addHiddenWritableProp)(self, key, descriptor.value);
+                    (!devMode() ? addHiddenFinalProp : addHiddenWritableProp)(self, name, descriptor.value);
                 }
                 else {
                     throw new MstError("A view member should either be a function or getter based property");
@@ -6372,14 +6398,9 @@ var ModelType = /** @class */ (function (_super) {
             if (applyPostProcess === void 0) { applyPostProcess = true; }
             var res = {};
             this.forAllProps(function (name, type) {
-                try {
-                    // TODO: FIXME, make sure the observable ref is used!
-                    var atom = getAtom(node.storedValue, name);
-                    atom.reportObserved();
-                }
-                catch (e) {
-                    throw new MstError("".concat(name, " property is declared twice"));
-                }
+                // TODO: FIXME, make sure the observable ref is used!
+                var atom = getAtom(node.storedValue, name);
+                atom.reportObserved();
                 res[name] = _this.getChildNode(node, name).snapshot;
             });
             if (applyPostProcess) {
@@ -6972,7 +6993,9 @@ function refinement() {
     var name = typeof args[0] === "string" ? args.shift() : isType(args[0]) ? args[0].name : null;
     var type = args[0];
     var predicate = args[1];
-    var message = args[2] ? args[2] : function (v) { return "Value does not respect the refinement predicate"; };
+    var message = args[2]
+        ? args[2]
+        : function (v) { return "Value does not respect the refinement predicate"; };
     // ensures all parameters are correct
     assertIsType(type, [1, 2]);
     assertIsString(name, 1);
@@ -7173,7 +7196,7 @@ function union(optionsOrType) {
         otherTypes[_i - 1] = arguments[_i];
     }
     var options = isType(optionsOrType) ? undefined : optionsOrType;
-    var types = isType(optionsOrType) ? __spreadArray([optionsOrType], __read(otherTypes), false) : otherTypes;
+    var types = (isType(optionsOrType) ? __spreadArray([optionsOrType], __read(otherTypes), false) : otherTypes);
     var name = "(" + types.map(function (type) { return type.name; }).join(" | ") + ")";
     // check all options
     if (devMode()) {
@@ -7594,7 +7617,8 @@ var Lazy = /** @class */ (function (_super) {
         when(function () {
             return _this.pendingNodeList.length > 0 &&
                 _this.pendingNodeList.some(function (node) {
-                    return node.isAlive && _this.options.shouldLoadPredicate(node.parent ? node.parent.value : null);
+                    return node.isAlive &&
+                        _this.options.shouldLoadPredicate(node.parent ? node.parent.value : null);
                 });
         }, function () {
             _this.options.loadType().then(action(function (type) {
@@ -8108,7 +8132,9 @@ var IdentifierReferenceType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (parent, subpath, environment, initialValue) {
-            var identifier = isStateTreeNode(initialValue) ? getIdentifier(initialValue) : initialValue;
+            var identifier = isStateTreeNode(initialValue)
+                ? getIdentifier(initialValue)
+                : initialValue;
             var storedRef = new StoredReference(initialValue, this.targetType);
             var storedRefNode = createScalarNode(this, parent, subpath, environment, storedRef);
             storedRef.node = storedRefNode;
@@ -8193,7 +8219,9 @@ var CustomReferenceType = /** @class */ (function (_super) {
             var newIdentifier = isStateTreeNode(newValue)
                 ? this.options.set(newValue, current ? current.storedValue : null)
                 : newValue;
-            if (!current.isDetaching && current.type === this && current.storedValue === newIdentifier) {
+            if (!current.isDetaching &&
+                current.type === this &&
+                current.storedValue === newIdentifier) {
                 current.setParent(parent, subpath);
                 return current;
             }

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

@@ -63,7 +63,7 @@
     OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
     PERFORMANCE OF THIS SOFTWARE.
     ***************************************************************************** */
-    /* global Reflect, Promise, SuppressedError, Symbol */
+    /* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
     var extendStatics = function(d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -104,8 +104,8 @@
     }
 
     function __generator(thisArg, body) {
-        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+        return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
         function verb(n) { return function (v) { return step([n, v]); }; }
         function step(op) {
             if (f) throw new TypeError("Generator is already executing.");
@@ -1801,7 +1801,9 @@
                     if (!this.parent && newParent.root === this) {
                         throw new MstError("A state tree is not allowed to contain itself. Cannot assign ".concat(this, " to path '").concat(newParent.path, "/").concat(subpath, "'"));
                     }
-                    if (!this.parent && !!this.environment && this.environment !== newParent.root.environment) {
+                    if (!this.parent &&
+                        !!this.environment &&
+                        this.environment !== newParent.root.environment) {
                         throw new MstError("A state tree cannot be made part of another state tree as long as their environments are different.");
                     }
                 }
@@ -1825,7 +1827,9 @@
             value: function (name) {
                 var _this = this;
                 this.fireInternalHook(name);
-                var fn = this.storedValue && typeof this.storedValue === "object" && this.storedValue[name];
+                var fn = this.storedValue &&
+                    typeof this.storedValue === "object" &&
+                    this.storedValue[name];
                 if (typeof fn === "function") {
                     // we check for it to allow old mobx peer dependencies that don't have the method to work (even when still bugged)
                     if (mobx._allowStateChangesInsideComputed) {
@@ -1930,7 +1934,8 @@
                 var actionFullPath = "";
                 if (actionContext && actionContext.name != null) {
                     // try to use the context, and if it not available use the node one
-                    var actionPath = (actionContext && actionContext.context && getPath(actionContext.context)) || escapedPath;
+                    var actionPath = (actionContext && actionContext.context && getPath(actionContext.context)) ||
+                        escapedPath;
                     actionFullPath = "".concat(actionPath, ".").concat(actionContext.name, "()");
                 }
                 return "You are trying to read or write to an object that is no longer part of a state tree. (Object type: '".concat(this.type.name, "', Path upon death: '").concat(escapedPath, "', Subpath: '").concat(subpath, "', Action: '").concat(actionFullPath, "'). Either detach nodes first, or don't use objects after removing / replacing them in the tree.");
@@ -2565,7 +2570,8 @@
             writable: true,
             value: function (current, snapshot) {
                 return (!current.identifierAttribute ||
-                    current.identifier === normalizeIdentifier(snapshot[current.identifierAttribute]));
+                    current.identifier ===
+                        normalizeIdentifier(snapshot[current.identifierAttribute]));
             }
         });
         Object.defineProperty(ComplexType.prototype, "tryToReconcileNode", {
@@ -2963,7 +2969,8 @@
         if (typeof arg === "function")
             return serializeTheUnserializable("[function]");
         if (typeof arg === "object" && !isPlainObject(arg) && !isArray(arg))
-            return serializeTheUnserializable("[object ".concat((arg && arg.constructor && arg.constructor.name) || "Complex Object", "]"));
+            return serializeTheUnserializable("[object ".concat((arg && arg.constructor && arg.constructor.name) ||
+                "Complex Object", "]"));
         try {
             // Check if serializable, cycle free etc...
             // MWE: there must be a better way....
@@ -3219,7 +3226,8 @@
                 tree: getRoot(target),
                 rootId: parentContext ? parentContext.rootId : id,
                 parentId: parentContext ? parentContext.id : 0,
-                allParentIds: parentContext ? __spreadArray(__spreadArray([], __read(parentContext.allParentIds), false), [parentContext.id], false) : [],
+                allParentIds: parentContext
+                    ? __spreadArray(__spreadArray([], __read(parentContext.allParentIds), false), [parentContext.id], false) : [],
                 parentEvent: parentContext,
                 parentActionEvent: parentActionContext
             }, fn);
@@ -3813,7 +3821,7 @@
                 break;
         }
         // TODO: assert that no targetParts paths are "..", "." or ""!
-        return baseParts.slice(common).map(doubleDot).join("/") + joinJsonPath(targetParts.slice(common));
+        return (baseParts.slice(common).map(doubleDot).join("/") + joinJsonPath(targetParts.slice(common)));
     }
     /**
      * @internal
@@ -4057,7 +4065,8 @@
         freeze(value);
         if (isPlainObject(value)) {
             Object.keys(value).forEach(function (propKey) {
-                if (!isPrimitive(value[propKey]) && !Object.isFrozen(value[propKey])) {
+                if (!isPrimitive(value[propKey]) &&
+                    !Object.isFrozen(value[propKey])) {
                     deepFreeze(value[propKey]);
                 }
             });
@@ -6107,11 +6116,16 @@
             configurable: true,
             writable: true,
             value: function (self, actions) {
+                var _this = this;
                 // check if return is correct
-                if (!isPlainObject(actions))
+                if (!isPlainObject(actions)) {
                     throw new MstError("actions initializer should return a plain object containing actions");
+                }
                 // bind actions to the object created
-                Object.keys(actions).forEach(function (name) {
+                Object.getOwnPropertyNames(actions).forEach(function (name) {
+                    if (name in _this.properties) {
+                        throw new MstError("'".concat(name, "' is a property and cannot be declared as an action"));
+                    }
                     // warn if preprocessor was given
                     if (name === PRE_PROCESS_SNAPSHOT)
                         throw new MstError("Cannot define action '".concat(PRE_PROCESS_SNAPSHOT, "', it should be defined using 'type.preProcessSnapshot(fn)' instead"));
@@ -6161,10 +6175,17 @@
             configurable: true,
             writable: true,
             value: function (self, state) {
+                var _this = this;
                 // check views return
-                if (!isPlainObject(state))
+                if (!isPlainObject(state)) {
                     throw new MstError("volatile state initializer should return a plain object containing state");
-                mobx.set(self, state);
+                }
+                Object.getOwnPropertyNames(state).forEach(function (name) {
+                    if (name in _this.properties) {
+                        throw new MstError("'".concat(name, "' is a property and cannot be declared as volatile state"));
+                    }
+                    mobx.set(self, name, state[name]);
+                });
             }
         });
         Object.defineProperty(ModelType.prototype, "extend", {
@@ -6206,19 +6227,24 @@
             configurable: true,
             writable: true,
             value: function (self, views) {
+                var _this = this;
                 // check views return
-                if (!isPlainObject(views))
+                if (!isPlainObject(views)) {
                     throw new MstError("views initializer should return a plain object containing views");
-                Object.getOwnPropertyNames(views).forEach(function (key) {
+                }
+                Object.getOwnPropertyNames(views).forEach(function (name) {
                     var _a;
+                    if (name in _this.properties) {
+                        throw new MstError("'".concat(name, "' is a property and cannot be declared as a view"));
+                    }
                     // is this a computed property?
-                    var descriptor = Object.getOwnPropertyDescriptor(views, key);
+                    var descriptor = Object.getOwnPropertyDescriptor(views, name);
                     if ("get" in descriptor) {
-                        mobx.defineProperty(self, key, descriptor);
-                        mobx.makeObservable(self, (_a = {}, _a[key] = mobx.computed, _a));
+                        mobx.defineProperty(self, name, descriptor);
+                        mobx.makeObservable(self, (_a = {}, _a[name] = mobx.computed, _a));
                     }
                     else if (typeof descriptor.value === "function") {
-                        (addHiddenWritableProp)(self, key, descriptor.value);
+                        (addHiddenWritableProp)(self, name, descriptor.value);
                     }
                     else {
                         throw new MstError("A view member should either be a function or getter based property");
@@ -6354,14 +6380,9 @@
                 if (applyPostProcess === void 0) { applyPostProcess = true; }
                 var res = {};
                 this.forAllProps(function (name, type) {
-                    try {
-                        // TODO: FIXME, make sure the observable ref is used!
-                        var atom = mobx.getAtom(node.storedValue, name);
-                        atom.reportObserved();
-                    }
-                    catch (e) {
-                        throw new MstError("".concat(name, " property is declared twice"));
-                    }
+                    // TODO: FIXME, make sure the observable ref is used!
+                    var atom = mobx.getAtom(node.storedValue, name);
+                    atom.reportObserved();
                     res[name] = _this.getChildNode(node, name).snapshot;
                 });
                 if (applyPostProcess) {
@@ -6954,7 +6975,9 @@
         var name = typeof args[0] === "string" ? args.shift() : isType(args[0]) ? args[0].name : null;
         var type = args[0];
         var predicate = args[1];
-        var message = args[2] ? args[2] : function (v) { return "Value does not respect the refinement predicate"; };
+        var message = args[2]
+            ? args[2]
+            : function (v) { return "Value does not respect the refinement predicate"; };
         // ensures all parameters are correct
         assertIsType(type, [1, 2]);
         assertIsString(name, 1);
@@ -7155,7 +7178,7 @@
             otherTypes[_i - 1] = arguments[_i];
         }
         var options = isType(optionsOrType) ? undefined : optionsOrType;
-        var types = isType(optionsOrType) ? __spreadArray([optionsOrType], __read(otherTypes), false) : otherTypes;
+        var types = (isType(optionsOrType) ? __spreadArray([optionsOrType], __read(otherTypes), false) : otherTypes);
         var name = "(" + types.map(function (type) { return type.name; }).join(" | ") + ")";
         // check all options
         {
@@ -7576,7 +7599,8 @@
             mobx.when(function () {
                 return _this.pendingNodeList.length > 0 &&
                     _this.pendingNodeList.some(function (node) {
-                        return node.isAlive && _this.options.shouldLoadPredicate(node.parent ? node.parent.value : null);
+                        return node.isAlive &&
+                            _this.options.shouldLoadPredicate(node.parent ? node.parent.value : null);
                     });
             }, function () {
                 _this.options.loadType().then(mobx.action(function (type) {
@@ -8090,7 +8114,9 @@
             configurable: true,
             writable: true,
             value: function (parent, subpath, environment, initialValue) {
-                var identifier = isStateTreeNode(initialValue) ? getIdentifier(initialValue) : initialValue;
+                var identifier = isStateTreeNode(initialValue)
+                    ? getIdentifier(initialValue)
+                    : initialValue;
                 var storedRef = new StoredReference(initialValue, this.targetType);
                 var storedRefNode = createScalarNode(this, parent, subpath, environment, storedRef);
                 storedRef.node = storedRefNode;
@@ -8175,7 +8201,9 @@
                 var newIdentifier = isStateTreeNode(newValue)
                     ? this.options.set(newValue, current ? current.storedValue : null)
                     : newValue;
-                if (!current.isDetaching && current.type === this && current.storedValue === newIdentifier) {
+                if (!current.isDetaching &&
+                    current.type === this &&
+                    current.storedValue === newIdentifier) {
                     current.setParent(parent, subpath);
                     return current;
                 }