@colyseus/schema 2.0.4 → 2.0.5

package/build/umd/index.js

@@ -2,9 +2,9 @@
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
     typeof define === 'function' && define.amd ? define(['exports'], factory) :
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.schema = {}));
-}(this, (function (exports) { 'use strict';
+})(this, (function (exports) { 'use strict';
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -42,10 +42,14 @@
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     }
 
-    function __spreadArray(to, from) {
-        for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-            to[j] = from[i];
-        return to;
+    function __spreadArray(to, from, pack) {
+        if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+            if (ar || !(i in from)) {
+                if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+                ar[i] = from[i];
+            }
+        }
+        return to.concat(ar || Array.prototype.slice.call(from));
     }
 
     // export const SWITCH_TO_STRUCTURE = 193; (easily collides with DELETE_AND_ADD + fieldIndex = 2)
@@ -212,7 +216,7 @@
                 ? fieldName
                 : this.indexes[fieldName];
             if (index === undefined) {
-                console.warn("@colyseus/schema " + this.ref.constructor.name + ": trying to delete non-existing index: " + fieldName + " (" + index + ")");
+                console.warn("@colyseus/schema ".concat(this.ref.constructor.name, ": trying to delete non-existing index: ").concat(fieldName, " (").concat(index, ")"));
                 return;
             }
             var previousValue = this.getValue(index);
@@ -284,7 +288,7 @@
         };
         ChangeTree.prototype.assertValidIndex = function (index, fieldName) {
             if (index === undefined) {
-                throw new Error("ChangeTree: missing index for field \"" + fieldName + "\"");
+                throw new Error("ChangeTree: missing index for field \"".concat(fieldName, "\""));
             }
         };
         return ChangeTree;
@@ -522,7 +526,7 @@
             for (var _i = 0; _i < arguments.length; _i++) {
                 items[_i] = arguments[_i];
             }
-            return new (ArraySchema.bind.apply(ArraySchema, __spreadArray([void 0], (_a = Array.from(this.$items.values())).concat.apply(_a, items))))();
+            return new (ArraySchema.bind.apply(ArraySchema, __spreadArray([void 0], (_a = Array.from(this.$items.values())).concat.apply(_a, items), false)))();
         };
         /**
          * Adds all the elements of an array separated by the specified separator string.
@@ -562,7 +566,7 @@
          * @param end The end of the specified portion of the array. This is exclusive of the element at the index 'end'.
          */
         ArraySchema.prototype.slice = function (start, end) {
-            return new (ArraySchema.bind.apply(ArraySchema, __spreadArray([void 0], Array.from(this.$items.values()).slice(start, end))))();
+            return new (ArraySchema.bind.apply(ArraySchema, __spreadArray([void 0], Array.from(this.$items.values()).slice(start, end), false)))();
         };
         /**
          * Sorts an array.
@@ -591,10 +595,6 @@
          */
         ArraySchema.prototype.splice = function (start, deleteCount) {
             if (deleteCount === void 0) { deleteCount = this.length - start; }
-            var items = [];
-            for (var _i = 2; _i < arguments.length; _i++) {
-                items[_i - 2] = arguments[_i];
-            }
             var indexes = Array.from(this.$items.keys());
             var removedItems = [];
             for (var i = start; i < start + deleteCount; i++) {
@@ -689,7 +689,7 @@
          * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
          */
         ArraySchema.prototype.reduce = function (callbackfn, initialValue) {
-            return Array.from(this.$items.values()).reduce(callbackfn, initialValue);
+            return Array.prototype.reduce.apply(Array.from(this.$items.values()), arguments);
         };
         /**
          * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
@@ -697,7 +697,7 @@
          * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
          */
         ArraySchema.prototype.reduceRight = function (callbackfn, initialValue) {
-            return Array.from(this.$items.values()).reduceRight(callbackfn, initialValue);
+            return Array.prototype.reduceRight.apply(Array.from(this.$items.values()), arguments);
         };
         /**
          * Returns the value of the first element in the array where predicate is true, and undefined
@@ -764,9 +764,6 @@
         ArraySchema.prototype[Symbol.iterator] = function () {
             return Array.from(this.$items.values())[Symbol.iterator]();
         };
-        ArraySchema.prototype[Symbol.unscopables] = function () {
-            return this.$items[Symbol.unscopables]();
-        };
         /**
          * Returns an iterable of key, value pairs for every entry in the array
          */
@@ -846,12 +843,12 @@
         ArraySchema.prototype.clone = function (isDecoding) {
             var cloned;
             if (isDecoding) {
-                cloned = new (ArraySchema.bind.apply(ArraySchema, __spreadArray([void 0], Array.from(this.$items.values()))))();
+                cloned = new (ArraySchema.bind.apply(ArraySchema, __spreadArray([void 0], Array.from(this.$items.values()), false)))();
             }
             else {
                 cloned = new (ArraySchema.bind.apply(ArraySchema, __spreadArray([void 0], this.map(function (item) { return ((item['$changes'])
                     ? item.clone()
-                    : item); }))))();
+                    : item); }), false)))();
             }
             return cloned;
         };
@@ -898,7 +895,8 @@
             this.$indexes = new Map();
             this.$refId = 0;
             if (initialValues) {
-                if (initialValues instanceof Map) {
+                if (initialValues instanceof Map ||
+                    initialValues instanceof MapSchema) {
                     initialValues.forEach(function (v, k) { return _this.set(k, v); });
                 }
                 else {
@@ -928,7 +926,7 @@
         });
         MapSchema.prototype.set = function (key, value) {
             if (value === undefined || value === null) {
-                throw new Error("MapSchema#set('" + key + "', " + value + "): trying to set " + value + " value on '" + key + "'.");
+                throw new Error("MapSchema#set('".concat(key, "', ").concat(value, "): trying to set ").concat(value, " value on '").concat(key, "'."));
             }
             // get "index" for this value.
             var hasIndex = typeof (this.$changes.indexes[key]) !== "undefined";
@@ -1123,7 +1121,7 @@
                 return true;
             }
             else {
-                console.warn("@filterChildren: field '" + field + "' can't have children. Ignoring filter.");
+                console.warn("@filterChildren: field '".concat(field, "' can't have children. Ignoring filter."));
             }
         };
         SchemaDefinition.prototype.getChildrenFilter = function (field) {
@@ -1193,7 +1191,7 @@
             var constructor = target.constructor;
             constructor._context = context;
             if (!type) {
-                throw new Error(constructor.name + ": @type() reference provided for \"" + field + "\" is undefined. Make sure you don't have any circular dependencies.");
+                throw new Error("".concat(constructor.name, ": @type() reference provided for \"").concat(field, "\" is undefined. Make sure you don't have any circular dependencies."));
             }
             /*
              * static schema
@@ -1215,11 +1213,11 @@
                     // trying to define same property multiple times across inheritance.
                     // https://github.com/colyseus/colyseus-unity3d/issues/131#issuecomment-814308572
                     try {
-                        throw new Error("@colyseus/schema: Duplicate '" + field + "' definition on '" + constructor.name + "'.\nCheck @type() annotation");
+                        throw new Error("@colyseus/schema: Duplicate '".concat(field, "' definition on '").concat(constructor.name, "'.\nCheck @type() annotation"));
                     }
                     catch (e) {
                         var definitionAtLine = e.stack.split("\n")[4].trim();
-                        throw new Error(e.message + " " + definitionAtLine);
+                        throw new Error("".concat(e.message, " ").concat(definitionAtLine));
                     }
                 }
             }
@@ -1243,7 +1241,7 @@
                 };
                 return;
             }
-            var fieldCached = "_" + field;
+            var fieldCached = "_".concat(field);
             definition.descriptors[fieldCached] = {
                 enumerable: false,
                 configurable: false,
@@ -1265,7 +1263,7 @@
                         value !== null) {
                         // automaticallty transform Array into ArraySchema
                         if (isArray && !(value instanceof ArraySchema)) {
-                            value = new (ArraySchema.bind.apply(ArraySchema, __spreadArray([void 0], value)))();
+                            value = new (ArraySchema.bind.apply(ArraySchema, __spreadArray([void 0], value, false)))();
                         }
                         // automaticallty transform Map into MapSchema
                         if (isMap && !(value instanceof MapSchema)) {
@@ -1290,7 +1288,7 @@
                             value['$changes'].setParent(this, this.$changes.root, this._definition.indexes[field]);
                         }
                     }
-                    else {
+                    else if (this[fieldCached]) {
                         //
                         // Setting a field to `null` or `undefined` will delete it.
                         //
@@ -1336,7 +1334,7 @@
             definition.deprecated[field] = true;
             if (throws) {
                 definition.descriptors[field] = {
-                    get: function () { throw new Error(field + " is deprecated."); },
+                    get: function () { throw new Error("".concat(field, " is deprecated.")); },
                     set: function (value) { },
                     enumerable: false,
                     configurable: true
@@ -2309,7 +2307,7 @@
             case "float64":
                 typeofTarget = "number";
                 if (isNaN(value)) {
-                    console.log("trying to encode \"NaN\" in " + klass.constructor.name + "#" + field);
+                    console.log("trying to encode \"NaN\" in ".concat(klass.constructor.name, "#").concat(field));
                 }
                 break;
             case "string":
@@ -2321,13 +2319,13 @@
                 return;
         }
         if (typeof (value) !== typeofTarget && (!allowNull || (allowNull && value !== null))) {
-            var foundValue = "'" + JSON.stringify(value) + "'" + ((value && value.constructor && " (" + value.constructor.name + ")") || '');
-            throw new EncodeSchemaError("a '" + typeofTarget + "' was expected, but " + foundValue + " was provided in " + klass.constructor.name + "#" + field);
+            var foundValue = "'".concat(JSON.stringify(value), "'").concat((value && value.constructor && " (".concat(value.constructor.name, ")")) || '');
+            throw new EncodeSchemaError("a '".concat(typeofTarget, "' was expected, but ").concat(foundValue, " was provided in ").concat(klass.constructor.name, "#").concat(field));
         }
     }
     function assertInstanceType(value, type, klass, field) {
         if (!(value instanceof type)) {
-            throw new EncodeSchemaError("a '" + type.name + "' was expected, but '" + value.constructor.name + "' was provided in " + klass.constructor.name + "#" + field);
+            throw new EncodeSchemaError("a '".concat(type.name, "' was expected, but '").concat(value.constructor.name, "' was provided in ").concat(klass.constructor.name, "#").concat(field));
         }
     }
     function encodePrimitiveType(type, bytes, value, klass, field) {
@@ -2337,7 +2335,7 @@
             encodeFunc(bytes, value);
         }
         else {
-            throw new EncodeSchemaError("a '" + type + "' was expected, but " + value + " was provided in " + klass.constructor.name + "#" + field);
+            throw new EncodeSchemaError("a '".concat(type, "' was expected, but ").concat(value, " was provided in ").concat(klass.constructor.name, "#").concat(field));
         }
     }
     function decodePrimitiveType(type, bytes, it) {
@@ -2426,6 +2424,7 @@
             return function () { return spliceOne(_this.$callbacks[attr], _this.$callbacks[attr].indexOf(callback)); };
         };
         Schema.prototype.decode = function (bytes, it, ref) {
+            var _a;
             if (it === void 0) { it = { offset: 0 }; }
             if (ref === void 0) { ref = this; }
             var allChanges = [];
@@ -2442,7 +2441,7 @@
                     // Trying to access a reference that haven't been decoded yet.
                     //
                     if (!nextRef) {
-                        throw new Error("\"refId\" not found: " + refId);
+                        throw new Error("\"refId\" not found: ".concat(refId));
                     }
                     ref = nextRef;
                     continue;
@@ -2485,7 +2484,7 @@
                     }
                 }
                 else {
-                    previousValue = ref["_" + fieldName];
+                    previousValue = ref["_".concat(fieldName)];
                 }
                 //
                 // Delete operations
@@ -2565,7 +2564,7 @@
                             var entries = previousValue.entries();
                             var iter = void 0;
                             while ((iter = entries.next()) && !iter.done) {
-                                var _a = iter.value, key = _a[0], value_1 = _a[1];
+                                var key = (_a = iter.value, _a[0]), value_1 = _a[1];
                                 allChanges.push({
                                     refId: refId_2,
                                     op: exports.OPERATION.DELETE,
@@ -2592,6 +2591,7 @@
                         var key = dynamicIndex;
                         // ref.set(key, value);
                         ref['$items'].set(key, value);
+                        ref['$changes'].allChanges.add(fieldIndex);
                     }
                     else if (ref instanceof ArraySchema) {
                         // const key = ref['$indexes'][field];
@@ -2744,7 +2744,7 @@
                         //
                         // ensure a ArraySchema has been provided
                         //
-                        assertInstanceType(ref["_" + field], definition.constructor, ref, field);
+                        assertInstanceType(ref["_".concat(field)], definition.constructor, ref, field);
                         //
                         // Encode refId for this instance.
                         // The actual instance is going to be encoded on next `changeTree` iteration.
@@ -2946,11 +2946,12 @@
             return filteredBytes;
         };
         Schema.prototype.clone = function () {
+            var _a;
             var cloned = new (this.constructor);
             var schema = this._definition.schema;
             for (var field in schema) {
                 if (typeof (this[field]) === "object" &&
-                    typeof (this[field].clone) === "function") {
+                    typeof ((_a = this[field]) === null || _a === void 0 ? void 0 : _a.clone) === "function") {
                     // deep clone
                     cloned[field] = this[field].clone();
                 }
@@ -2969,7 +2970,7 @@
                 if (!deprecated[field] && this[field] !== null && typeof (this[field]) !== "undefined") {
                     obj[field] = (typeof (this[field]['toJSON']) === "function")
                         ? this[field]['toJSON']()
-                        : this["_" + field];
+                        : this["_".concat(field)];
                 }
             }
             return obj;
@@ -3004,7 +3005,7 @@
             return instance;
         };
         Schema.prototype._triggerChanges = function (changes) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             var uniqueRefIds = new Set();
             var $refs = this.$changes.root.refs;
             var _loop_2 = function (i) {
@@ -3027,7 +3028,7 @@
                     if (!uniqueRefIds.has(refId)) {
                         try {
                             // trigger onChange
-                            (_d = (_c = $callbacks) === null || _c === void 0 ? void 0 : _c[exports.OPERATION.REPLACE]) === null || _d === void 0 ? void 0 : _d.forEach(function (callback) {
+                            (_c = $callbacks === null || $callbacks === void 0 ? void 0 : $callbacks[exports.OPERATION.REPLACE]) === null || _c === void 0 ? void 0 : _c.forEach(function (callback) {
                                 return callback(changes);
                             });
                         }
@@ -3037,7 +3038,7 @@
                     }
                     try {
                         if ($callbacks.hasOwnProperty(change.field)) {
-                            (_e = $callbacks[change.field]) === null || _e === void 0 ? void 0 : _e.forEach(function (callback) {
+                            (_d = $callbacks[change.field]) === null || _d === void 0 ? void 0 : _d.forEach(function (callback) {
                                 return callback(change.value, change.previousValue);
                             });
                         }
@@ -3050,7 +3051,7 @@
                     // is a collection of items
                     if (change.op === exports.OPERATION.ADD && change.previousValue === undefined) {
                         // triger onAdd
-                        (_f = $callbacks[exports.OPERATION.ADD]) === null || _f === void 0 ? void 0 : _f.forEach(function (callback) { var _a; return callback(change.value, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
+                        (_e = $callbacks[exports.OPERATION.ADD]) === null || _e === void 0 ? void 0 : _e.forEach(function (callback) { var _a; return callback(change.value, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
                     }
                     else if (change.op === exports.OPERATION.DELETE) {
                         //
@@ -3059,20 +3060,20 @@
                         //
                         if (change.previousValue !== undefined) {
                             // triger onRemove
-                            (_g = $callbacks[exports.OPERATION.DELETE]) === null || _g === void 0 ? void 0 : _g.forEach(function (callback) { var _a; return callback(change.previousValue, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
+                            (_f = $callbacks[exports.OPERATION.DELETE]) === null || _f === void 0 ? void 0 : _f.forEach(function (callback) { var _a; return callback(change.previousValue, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
                         }
                     }
                     else if (change.op === exports.OPERATION.DELETE_AND_ADD) {
                         // triger onRemove
                         if (change.previousValue !== undefined) {
-                            (_h = $callbacks[exports.OPERATION.DELETE]) === null || _h === void 0 ? void 0 : _h.forEach(function (callback) { var _a; return callback(change.previousValue, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
+                            (_g = $callbacks[exports.OPERATION.DELETE]) === null || _g === void 0 ? void 0 : _g.forEach(function (callback) { var _a; return callback(change.previousValue, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
                         }
                         // triger onAdd
-                        (_j = $callbacks[exports.OPERATION.ADD]) === null || _j === void 0 ? void 0 : _j.forEach(function (callback) { var _a; return callback(change.value, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
+                        (_h = $callbacks[exports.OPERATION.ADD]) === null || _h === void 0 ? void 0 : _h.forEach(function (callback) { var _a; return callback(change.value, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
                     }
                     // trigger onChange
                     if (change.value !== change.previousValue) {
-                        (_k = $callbacks[exports.OPERATION.REPLACE]) === null || _k === void 0 ? void 0 : _k.forEach(function (callback) { var _a; return callback(change.value, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
+                        (_j = $callbacks[exports.OPERATION.REPLACE]) === null || _j === void 0 ? void 0 : _j.forEach(function (callback) { var _a; return callback(change.value, (_a = change.dynamicIndex) !== null && _a !== void 0 ? _a : change.field); });
                     }
                 }
                 uniqueRefIds.add(refId);
@@ -3292,4 +3293,4 @@
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));