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

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

@@ -6125,11 +6125,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 +6184,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 +6236,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 +6389,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) {
@@ -7173,7 +7185,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()) {

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

@@ -6107,11 +6107,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 +6166,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 +6218,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 +6371,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) {
@@ -7155,7 +7167,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
         {