mobx-state-tree 5.2.0-alpha.1 → 5.2.0

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

@@ -196,7 +196,7 @@ function getChildType(object, propertyName) {
 /**
  * Registers a function that will be invoked for each mutation that is applied to the provided model instance, or to any of its children.
  * See [patches](https://github.com/mobxjs/mobx-state-tree#patches) for more details. onPatch events are emitted immediately and will not await the end of a transaction.
- * Patches can be used to deep observe a model tree.
+ * Patches can be used to deeply observe a model tree.
  *
  * @param target the model instance from which to receive patches
  * @param callback the callback that is invoked for each patch. The reversePatch is a patch that would actually undo the emitted patch
@@ -241,7 +241,7 @@ function applyPatch(target, patch) {
 }
 /**
  * Small abstraction around `onPatch` and `applyPatch`, attaches a patch listener to a tree and records all the patches.
- * Returns an recorder object with the following signature:
+ * Returns a recorder object with the following signature:
  *
  * Example:
  * ```ts
@@ -591,7 +591,7 @@ function getIdentifier(target) {
     return getStateTreeNode(target).identifier;
 }
 /**
- * Tests if a reference is valid (pointing to an existing node and optionally if alive) and returns such reference if it the check passes,
+ * Tests if a reference is valid (pointing to an existing node and optionally if alive) and returns such reference if the check passes,
  * else it returns undefined.
  *
  * @param getter Function to access the reference.
@@ -691,9 +691,9 @@ function getRelativePath(base, target) {
 }
 /**
  * Returns a deep copy of the given state tree node as new tree.
- * Short hand for `snapshot(x) = getType(x).create(getSnapshot(x))`
+ * Shorthand for `snapshot(x) = getType(x).create(getSnapshot(x))`
  *
- * _Tip: clone will create a literal copy, including the same identifiers. To modify identifiers etc during cloning, don't use clone but take a snapshot of the tree, modify it, and create new instance_
+ * _Tip: clone will create a literal copy, including the same identifiers. To modify identifiers etc. during cloning, don't use clone but take a snapshot of the tree, modify it, and create new instance_
  *
  * @param source
  * @param keepEnvironment indicates whether the clone should inherit the same environment (`true`, the default), or not have an environment (`false`). If an object is passed in as second argument, that will act as the environment for the cloned tree.
@@ -903,13 +903,13 @@ function getMembers(target) {
  * ```
  *
  * @param snapshotOrInstance Snapshot or instance
- * @returns The same object casted as an instance
+ * @returns The same object cast as an instance
  */
 function cast(snapshotOrInstance) {
     return snapshotOrInstance;
 }
 /**
- * Casts a node instance type to an snapshot type so it can be assigned to a type snapshot (e.g. to be used inside a create call).
+ * Casts a node instance type to a snapshot type so it can be assigned to a type snapshot (e.g. to be used inside a create call).
  * Note that this is just a cast for the type system, this is, it won't actually convert an instance to a snapshot,
  * but just fool typescript into thinking so.
  *
@@ -933,14 +933,14 @@ function cast(snapshotOrInstance) {
  * ```
  *
  * @param snapshotOrInstance Snapshot or instance
- * @returns The same object casted as an input (creation) snapshot
+ * @returns The same object cast as an input (creation) snapshot
  */
 function castToSnapshot(snapshotOrInstance) {
     return snapshotOrInstance;
 }
 /**
- * Casts a node instance type to a reference snapshot type so it can be assigned to a refernence snapshot (e.g. to be used inside a create call).
- * Note that this is just a cast for the type system, this is, it won't actually convert an instance to a refererence snapshot,
+ * Casts a node instance type to a reference snapshot type so it can be assigned to a reference snapshot (e.g. to be used inside a create call).
+ * Note that this is just a cast for the type system, this is, it won't actually convert an instance to a reference snapshot,
  * but just fool typescript into thinking so.
  *
  * Example:
@@ -964,7 +964,7 @@ function castToSnapshot(snapshotOrInstance) {
  * ```
  *
  * @param instance Instance
- * @returns The same object casted as an reference snapshot (string or number)
+ * @returns The same object cast as a reference snapshot (string or number)
  */
 function castToReferenceSnapshot(instance) {
     return instance;
@@ -5123,7 +5123,7 @@ var MapType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (childNodes) {
-            return new MSTMap(childNodes, this.describe());
+            return new MSTMap(childNodes, this.name);
         }
     });
     Object.defineProperty(MapType.prototype, "finalizeNewInstance", {
@@ -5150,7 +5150,7 @@ var MapType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function () {
-            return "Map<string, " + this._subType.describe() + ">";
+            return this.name;
         }
     });
     Object.defineProperty(MapType.prototype, "getChildren", {
@@ -5386,7 +5386,7 @@ MapType.prototype.applySnapshot = action(MapType.prototype.applySnapshot);
  * @returns
  */
 function map(subtype) {
-    return new MapType("map<string, " + subtype.name + ">", subtype);
+    return new MapType("Map<string, " + subtype.name + ">", subtype);
 }
 /**
  * Returns if a given value represents a map type.
@@ -5465,7 +5465,7 @@ var ArrayType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (childNodes) {
-            var options = __assign(__assign({}, mobxShallow), { name: this.describe() });
+            var options = __assign(__assign({}, mobxShallow), { name: this.name });
             return observable.array(convertChildNodesToArray(childNodes), options);
         }
     });
@@ -5493,7 +5493,7 @@ var ArrayType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function () {
-            return this._subType.describe() + "[]";
+            return this.name;
         }
     });
     Object.defineProperty(ArrayType.prototype, "getChildren", {
@@ -5849,8 +5849,18 @@ var defaultObjectOptions = {
     initializers: EMPTY_ARRAY
 };
 function toPropertiesObject(declaredProps) {
+    var keysList = Object.keys(declaredProps);
+    var alreadySeenKeys = {};
+    keysList.forEach(function (key) {
+        if (alreadySeenKeys[key]) {
+            throw fail$1(key + " is declared twice in the model. Model should not contain same keys");
+        }
+        else {
+            alreadySeenKeys[key] = true;
+        }
+    });
     // loop through properties and ensures that all items are types
-    return Object.keys(declaredProps).reduce(function (props, key) {
+    return keysList.reduce(function (props, key) {
         var _a, _b, _c;
         // warn if user intended a HOOK
         if (key in Hook)
@@ -6196,7 +6206,7 @@ var ModelType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (childNodes) {
-            var options = __assign(__assign({}, mobxShallow), { name: this.describe() });
+            var options = __assign(__assign({}, mobxShallow), { name: this.name });
             return observable.object(childNodes, EMPTY_OBJECT, options);
         }
     });
@@ -6273,10 +6283,11 @@ var ModelType = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (node, key) {
+            var _a;
             if (!(key in this.properties))
                 throw fail$1("Not a value property: " + key);
             var adm = _getAdministration(node.storedValue, key);
-            var childNode = adm.raw();
+            var childNode = (_a = adm.raw) === null || _a === void 0 ? void 0 : _a.call(adm);
             if (!childNode)
                 throw fail$1("Node not available for property " + key);
             return childNode;
@@ -6291,7 +6302,14 @@ var ModelType = /** @class */ (function (_super) {
             if (applyPostProcess === void 0) { applyPostProcess = true; }
             var res = {};
             this.forAllProps(function (name, type) {
-                getAtom(node.storedValue, name).reportObserved();
+                try {
+                    // TODO: FIXME, make sure the observable ref is used!
+                    var atom = getAtom(node.storedValue, name);
+                    atom.reportObserved();
+                }
+                catch (e) {
+                    throw fail$1(name + " property is declared twice");
+                }
                 res[name] = _this.getChildNode(node, name).snapshot;
             });
             if (applyPostProcess) {
@@ -7163,7 +7181,7 @@ var OptionalValue = /** @class */ (function (_super) {
         writable: true,
         value: function (parent, subpath, environment, initialValue) {
             if (this.optionalValues.indexOf(initialValue) >= 0) {
-                var defaultInstanceOrSnapshot = this.getDefaultInstanceOrSnapshot(parent);
+                var defaultInstanceOrSnapshot = this.getDefaultInstanceOrSnapshot();
                 return this._subtype.instantiate(parent, subpath, environment, defaultInstanceOrSnapshot);
             }
             return this._subtype.instantiate(parent, subpath, environment, initialValue);
@@ -7176,16 +7194,16 @@ var OptionalValue = /** @class */ (function (_super) {
         value: function (current, newValue, parent, subpath) {
             return this._subtype.reconcile(current, this.optionalValues.indexOf(newValue) < 0 && this._subtype.is(newValue)
                 ? newValue
-                : this.getDefaultInstanceOrSnapshot(parent), parent, subpath);
+                : this.getDefaultInstanceOrSnapshot(), parent, subpath);
         }
     });
     Object.defineProperty(OptionalValue.prototype, "getDefaultInstanceOrSnapshot", {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function (parent) {
+        value: function () {
             var defaultInstanceOrSnapshot = typeof this._defaultValue === "function"
-                ? this._defaultValue(parent)
+                ? this._defaultValue()
                 : this._defaultValue;
             // while static values are already snapshots and checked on types.optional
             // generator functions must always be rechecked just in case

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

@@ -200,7 +200,7 @@
     /**
      * Registers a function that will be invoked for each mutation that is applied to the provided model instance, or to any of its children.
      * See [patches](https://github.com/mobxjs/mobx-state-tree#patches) for more details. onPatch events are emitted immediately and will not await the end of a transaction.
-     * Patches can be used to deep observe a model tree.
+     * Patches can be used to deeply observe a model tree.
      *
      * @param target the model instance from which to receive patches
      * @param callback the callback that is invoked for each patch. The reversePatch is a patch that would actually undo the emitted patch
@@ -245,7 +245,7 @@
     }
     /**
      * Small abstraction around `onPatch` and `applyPatch`, attaches a patch listener to a tree and records all the patches.
-     * Returns an recorder object with the following signature:
+     * Returns a recorder object with the following signature:
      *
      * Example:
      * ```ts
@@ -595,7 +595,7 @@
         return getStateTreeNode(target).identifier;
     }
     /**
-     * Tests if a reference is valid (pointing to an existing node and optionally if alive) and returns such reference if it the check passes,
+     * Tests if a reference is valid (pointing to an existing node and optionally if alive) and returns such reference if the check passes,
      * else it returns undefined.
      *
      * @param getter Function to access the reference.
@@ -695,9 +695,9 @@
     }
     /**
      * Returns a deep copy of the given state tree node as new tree.
-     * Short hand for `snapshot(x) = getType(x).create(getSnapshot(x))`
+     * Shorthand for `snapshot(x) = getType(x).create(getSnapshot(x))`
      *
-     * _Tip: clone will create a literal copy, including the same identifiers. To modify identifiers etc during cloning, don't use clone but take a snapshot of the tree, modify it, and create new instance_
+     * _Tip: clone will create a literal copy, including the same identifiers. To modify identifiers etc. during cloning, don't use clone but take a snapshot of the tree, modify it, and create new instance_
      *
      * @param source
      * @param keepEnvironment indicates whether the clone should inherit the same environment (`true`, the default), or not have an environment (`false`). If an object is passed in as second argument, that will act as the environment for the cloned tree.
@@ -907,13 +907,13 @@
      * ```
      *
      * @param snapshotOrInstance Snapshot or instance
-     * @returns The same object casted as an instance
+     * @returns The same object cast as an instance
      */
     function cast(snapshotOrInstance) {
         return snapshotOrInstance;
     }
     /**
-     * Casts a node instance type to an snapshot type so it can be assigned to a type snapshot (e.g. to be used inside a create call).
+     * Casts a node instance type to a snapshot type so it can be assigned to a type snapshot (e.g. to be used inside a create call).
      * Note that this is just a cast for the type system, this is, it won't actually convert an instance to a snapshot,
      * but just fool typescript into thinking so.
      *
@@ -937,14 +937,14 @@
      * ```
      *
      * @param snapshotOrInstance Snapshot or instance
-     * @returns The same object casted as an input (creation) snapshot
+     * @returns The same object cast as an input (creation) snapshot
      */
     function castToSnapshot(snapshotOrInstance) {
         return snapshotOrInstance;
     }
     /**
-     * Casts a node instance type to a reference snapshot type so it can be assigned to a refernence snapshot (e.g. to be used inside a create call).
-     * Note that this is just a cast for the type system, this is, it won't actually convert an instance to a refererence snapshot,
+     * Casts a node instance type to a reference snapshot type so it can be assigned to a reference snapshot (e.g. to be used inside a create call).
+     * Note that this is just a cast for the type system, this is, it won't actually convert an instance to a reference snapshot,
      * but just fool typescript into thinking so.
      *
      * Example:
@@ -968,7 +968,7 @@
      * ```
      *
      * @param instance Instance
-     * @returns The same object casted as an reference snapshot (string or number)
+     * @returns The same object cast as a reference snapshot (string or number)
      */
     function castToReferenceSnapshot(instance) {
         return instance;
@@ -5105,7 +5105,7 @@
             configurable: true,
             writable: true,
             value: function (childNodes) {
-                return new MSTMap(childNodes, this.describe());
+                return new MSTMap(childNodes, this.name);
             }
         });
         Object.defineProperty(MapType.prototype, "finalizeNewInstance", {
@@ -5132,7 +5132,7 @@
             configurable: true,
             writable: true,
             value: function () {
-                return "Map<string, " + this._subType.describe() + ">";
+                return this.name;
             }
         });
         Object.defineProperty(MapType.prototype, "getChildren", {
@@ -5368,7 +5368,7 @@
      * @returns
      */
     function map(subtype) {
-        return new MapType("map<string, " + subtype.name + ">", subtype);
+        return new MapType("Map<string, " + subtype.name + ">", subtype);
     }
     /**
      * Returns if a given value represents a map type.
@@ -5447,7 +5447,7 @@
             configurable: true,
             writable: true,
             value: function (childNodes) {
-                var options = __assign(__assign({}, mobxShallow), { name: this.describe() });
+                var options = __assign(__assign({}, mobxShallow), { name: this.name });
                 return mobx.observable.array(convertChildNodesToArray(childNodes), options);
             }
         });
@@ -5475,7 +5475,7 @@
             configurable: true,
             writable: true,
             value: function () {
-                return this._subType.describe() + "[]";
+                return this.name;
             }
         });
         Object.defineProperty(ArrayType.prototype, "getChildren", {
@@ -5831,8 +5831,18 @@
         initializers: EMPTY_ARRAY
     };
     function toPropertiesObject(declaredProps) {
+        var keysList = Object.keys(declaredProps);
+        var alreadySeenKeys = {};
+        keysList.forEach(function (key) {
+            if (alreadySeenKeys[key]) {
+                throw fail$1(key + " is declared twice in the model. Model should not contain same keys");
+            }
+            else {
+                alreadySeenKeys[key] = true;
+            }
+        });
         // loop through properties and ensures that all items are types
-        return Object.keys(declaredProps).reduce(function (props, key) {
+        return keysList.reduce(function (props, key) {
             var _a, _b, _c;
             // warn if user intended a HOOK
             if (key in Hook)
@@ -6178,7 +6188,7 @@
             configurable: true,
             writable: true,
             value: function (childNodes) {
-                var options = __assign(__assign({}, mobxShallow), { name: this.describe() });
+                var options = __assign(__assign({}, mobxShallow), { name: this.name });
                 return mobx.observable.object(childNodes, EMPTY_OBJECT, options);
             }
         });
@@ -6255,10 +6265,11 @@
             configurable: true,
             writable: true,
             value: function (node, key) {
+                var _a;
                 if (!(key in this.properties))
                     throw fail$1("Not a value property: " + key);
                 var adm = mobx._getAdministration(node.storedValue, key);
-                var childNode = adm.raw();
+                var childNode = (_a = adm.raw) === null || _a === void 0 ? void 0 : _a.call(adm);
                 if (!childNode)
                     throw fail$1("Node not available for property " + key);
                 return childNode;
@@ -6273,7 +6284,14 @@
                 if (applyPostProcess === void 0) { applyPostProcess = true; }
                 var res = {};
                 this.forAllProps(function (name, type) {
-                    mobx.getAtom(node.storedValue, name).reportObserved();
+                    try {
+                        // TODO: FIXME, make sure the observable ref is used!
+                        var atom = mobx.getAtom(node.storedValue, name);
+                        atom.reportObserved();
+                    }
+                    catch (e) {
+                        throw fail$1(name + " property is declared twice");
+                    }
                     res[name] = _this.getChildNode(node, name).snapshot;
                 });
                 if (applyPostProcess) {
@@ -7145,7 +7163,7 @@
             writable: true,
             value: function (parent, subpath, environment, initialValue) {
                 if (this.optionalValues.indexOf(initialValue) >= 0) {
-                    var defaultInstanceOrSnapshot = this.getDefaultInstanceOrSnapshot(parent);
+                    var defaultInstanceOrSnapshot = this.getDefaultInstanceOrSnapshot();
                     return this._subtype.instantiate(parent, subpath, environment, defaultInstanceOrSnapshot);
                 }
                 return this._subtype.instantiate(parent, subpath, environment, initialValue);
@@ -7158,16 +7176,16 @@
             value: function (current, newValue, parent, subpath) {
                 return this._subtype.reconcile(current, this.optionalValues.indexOf(newValue) < 0 && this._subtype.is(newValue)
                     ? newValue
-                    : this.getDefaultInstanceOrSnapshot(parent), parent, subpath);
+                    : this.getDefaultInstanceOrSnapshot(), parent, subpath);
             }
         });
         Object.defineProperty(OptionalValue.prototype, "getDefaultInstanceOrSnapshot", {
             enumerable: false,
             configurable: true,
             writable: true,
-            value: function (parent) {
+            value: function () {
                 var defaultInstanceOrSnapshot = typeof this._defaultValue === "function"
-                    ? this._defaultValue(parent)
+                    ? this._defaultValue()
                     : this._defaultValue;
                 // while static values are already snapshots and checked on types.optional
                 // generator functions must always be rechecked just in case