@colyseus/schema 3.0.12 → 3.0.14

package/build/cjs/index.js

@@ -1248,6 +1248,7 @@ class ChangeTree {
         else {
             enqueueChangeTree(this.root, this, 'changes');
         }
+        return previousValue;
     }
     endEncode() {
         this.indexedOperations = {};
@@ -2493,7 +2494,7 @@ class MapSchema {
     static [(_a$3 = $encoder, _b$3 = $decoder, $filter)](ref, index, view) {
         return (!view ||
             typeof (ref[$childType]) === "string" ||
-            view.items.has(ref[$getByIndex](index)[$changes]));
+            view.items.has((ref[$getByIndex](index) ?? ref.deletedItems[index])[$changes]));
     }
     static is(type) {
         return type['map'] !== undefined;
@@ -2501,6 +2502,7 @@ class MapSchema {
     constructor(initialValues) {
         this.$items = new Map();
         this.$indexes = new Map();
+        this.deletedItems = {};
         this[$changes] = new ChangeTree(this);
         this[$changes].indexes = {};
         if (initialValues) {
@@ -2580,7 +2582,7 @@ class MapSchema {
     }
     delete(key) {
         const index = this[$changes].indexes[key];
-        this[$changes].delete(index);
+        this.deletedItems[index] = this[$changes].delete(index);
         return this.$items.delete(key);
     }
     clear() {
@@ -2627,17 +2629,7 @@ class MapSchema {
         this.$indexes.delete(index);
     }
     [$onEncodeEnd]() {
-        const changeTree = this[$changes];
-        const keys = Object.keys(changeTree.indexedOperations);
-        for (let i = 0, len = keys.length; i < len; i++) {
-            const key = keys[i];
-            const fieldIndex = Number(key);
-            const operation = changeTree.indexedOperations[key];
-            if (operation === exports.OPERATION.DELETE) {
-                const index = this[$getByIndex](fieldIndex);
-                delete changeTree.indexes[index];
-            }
-        }
+        this.deletedItems = {};
     }
     toJSON() {
         const map = {};
@@ -3944,11 +3936,13 @@ class Encoder {
             bytes[it.offset++] = SWITCH_TO_STRUCTURE & 255;
             encode.number(bytes, changeTree.refId, it);
             for (let i = 0, numChanges = keys.length; i < numChanges; i++) {
-                const key = keys[i];
-                const operation = changes[key];
+                const index = Number(keys[i]);
+                // workaround when using view.add() on item that has been deleted from state (see test "adding to view item that has been removed from state")
+                const value = changeTree.ref[$getByIndex](index);
+                const operation = (value !== undefined && changes[index]) || exports.OPERATION.DELETE;
                 // isEncodeAll = false
                 // hasView = true
-                encoder(this, bytes, changeTree, Number(key), operation, it, false, true, metadata);
+                encoder(this, bytes, changeTree, index, operation, it, false, true, metadata);
             }
         }
         //
@@ -4695,7 +4689,6 @@ class StateView {
          * Manual "ADD" operations for changes per ChangeTree, specific to this view.
          * (This is used to force encoding a property, even if it was not changed)
          */
-        // TODO: use map here!? may fix encode ordering issue
         this.changes = new Map();
     }
     // TODO: allow to set multiple tags at once
@@ -4780,19 +4773,18 @@ class StateView {
     addParentOf(childChangeTree, tag) {
         const changeTree = childChangeTree.parent[$changes];
         const parentIndex = childChangeTree.parentIndex;
-        // view must have all "changeTree" parent tree
-        this.items.add(changeTree);
-        // add parent's parent
-        const parentChangeTree = changeTree.parent?.[$changes];
-        if (parentChangeTree && (parentChangeTree.filteredChanges !== undefined)) {
-            this.addParentOf(changeTree, tag);
-        }
-        if (
-        // parent is already available, no need to add it!
-        !this.invisible.has(changeTree) &&
-            // item is being replaced, no need to add parent
-            changeTree.indexedOperations[parentIndex] !== exports.OPERATION.DELETE_AND_ADD) {
-            return;
+        if (!this.items.has(changeTree)) {
+            // view must have all "changeTree" parent tree
+            this.items.add(changeTree);
+            // add parent's parent
+            const parentChangeTree = changeTree.parent?.[$changes];
+            if (parentChangeTree && (parentChangeTree.filteredChanges !== undefined)) {
+                this.addParentOf(changeTree, tag);
+            }
+            // parent is already available, no need to add it!
+            if (!this.invisible.has(changeTree)) {
+                return;
+            }
         }
         // add parent's tag properties
         if (changeTree.getChange(parentIndex) !== exports.OPERATION.DELETE) {
@@ -4870,6 +4862,13 @@ class StateView {
         }
         return this;
     }
+    has(obj) {
+        return this.items.has(obj[$changes]);
+    }
+    hasTag(ob, tag = DEFAULT_VIEW_TAG) {
+        const tags = this.tags?.get(ob[$changes]);
+        return tags?.has(tag) ?? false;
+    }
 }
 
 registerType("map", { constructor: MapSchema });