@colyseus/schema 3.0.43 → 3.0.44

package/build/cjs/index.js

@@ -1088,6 +1088,7 @@ class ChangeTree {
                     // re-assigning a child of the same root, move it to the end
                     // of the changes queue so encoding order is preserved
                     //
+                    root.add(child);
                     root.moveToEndOfChanges(child);
                     return;
                 }
@@ -1425,7 +1426,7 @@ class ChangeTree {
      */
     addParent(parent, index) {
         // Check if this parent already exists in the chain
-        if (this.hasParent((p, i) => p === parent && i === index)) {
+        if (this.hasParent((p, i) => p[$changes] === parent[$changes] && i === index)) {
             return;
         }
         this.parentChain = {
@@ -1439,7 +1440,7 @@ class ChangeTree {
      * @param parent - The parent to remove
      * @returns true if parent was removed
      */
-    removeParent(parent) {
+    removeParent(parent = this.parent) {
         let current = this.parentChain;
         let previous = null;
         while (current) {
@@ -2009,7 +2010,7 @@ class ArraySchema {
                             }
                             if (previousValue !== undefined) {
                                 // remove root reference from previous value
-                                previousValue[$changes].root?.remove(previousValue[$changes]);
+                                previousValue[$changes].root?.remove(previousValue[$changes], obj);
                             }
                         }
                         else {
@@ -2166,7 +2167,7 @@ class ArraySchema {
         const changeTree = this[$changes];
         // remove children references
         changeTree.forEachChild((childChangeTree, _) => {
-            changeTree.root?.remove(childChangeTree);
+            changeTree.root?.remove(childChangeTree, this);
         });
         changeTree.discard(true);
         changeTree.operation(exports.OPERATION.CLEAR);
@@ -2720,7 +2721,7 @@ class MapSchema {
                 operation = exports.OPERATION.DELETE_AND_ADD;
                 // remove reference from previous value
                 if (previousValue !== undefined) {
-                    previousValue[$changes].root?.remove(previousValue[$changes]);
+                    previousValue[$changes].root?.remove(previousValue[$changes], this);
                 }
             }
         }
@@ -2757,7 +2758,7 @@ class MapSchema {
         changeTree.indexes = {};
         // remove children references
         changeTree.forEachChild((childChangeTree, _) => {
-            changeTree.root?.remove(childChangeTree);
+            changeTree.root?.remove(childChangeTree, this);
         });
         // clear previous indexes
         this.$indexes.clear();
@@ -3398,9 +3399,9 @@ class Schema {
         });
         return output;
     }
-    static debugRefIdEncodeOrder(ref) {
+    static debugRefIdEncodingOrder(ref, changeSet = 'allChanges') {
         let encodeOrder = [];
-        let current = ref[$changes].root.allChanges.next;
+        let current = ref[$changes].root[changeSet].next;
         while (current) {
             if (current.changeTree) {
                 encodeOrder.push(current.changeTree.refId);
@@ -3409,7 +3410,7 @@ class Schema {
         }
         return encodeOrder;
     }
-    static debugRefIdsDecoder(decoder) {
+    static debugRefIdsFromDecoder(decoder) {
         return this.debugRefIds(decoder.state, false, 0, decoder);
     }
     /**
@@ -3599,7 +3600,7 @@ class CollectionSchema {
         changeTree.indexes = {};
         // remove children references
         changeTree.forEachChild((childChangeTree, _) => {
-            changeTree.root?.remove(childChangeTree);
+            changeTree.root?.remove(childChangeTree, this);
         });
         // clear previous indexes
         this.$indexes.clear();
@@ -3918,10 +3919,12 @@ class Root {
             }
         }
         this.refCount[changeTree.refId] = (previousRefCount || 0) + 1;
+        // console.log("ADD", { refId: changeTree.refId, refCount: this.refCount[changeTree.refId] });
         return isNewChangeTree;
     }
-    remove(changeTree) {
+    remove(changeTree, parent) {
         const refCount = (this.refCount[changeTree.refId]) - 1;
+        // console.log("REMOVE", { refId: changeTree.refId, refCount });
         if (refCount <= 0) {
             //
             // Only remove "root" reference if it's the last reference
@@ -3940,7 +3943,7 @@ class Root {
                     if ((child.parentChain === undefined || // no parent, remove it
                         (child.parentChain && this.refCount[child.refId] > 1) // parent is still in use, but has more than one reference, remove it
                     )) {
-                        this.remove(child);
+                        this.remove(child, changeTree.ref);
                     }
                     else if (child.parentChain) {
                         // re-assigning a child of the same root, move it to the end
@@ -4421,11 +4424,7 @@ class Decoder {
                 // Trying to access a reference that haven't been decoded yet.
                 //
                 if (!nextRef) {
-                    // throw new Error(`"refId" not found: ${nextRefId}`);
-                    console.error(`"refId" not found: ${nextRefId}`, { previousRef: ref, previousRefId: this.currentRefId });
-                    console.warn("Please report this to the developers. All refIds =>");
-                    console.warn(Schema.debugRefIdsDecoder(this));
-                    this.skipCurrentStructure(bytes, it, totalBytes);
+                    throw new Error(`"refId" not found: ${nextRefId}`);
                 }
                 else {
                     ref = nextRef;
@@ -5001,11 +5000,12 @@ class StateView {
     // TODO: allow to set multiple tags at once
     add(obj, tag = DEFAULT_VIEW_TAG, checkIncludeParent = true) {
         const changeTree = obj?.[$changes];
+        const parentChangeTree = changeTree.parent;
         if (!changeTree) {
             console.warn("StateView#add(), invalid object:", obj);
-            return this;
+            return false;
         }
-        else if (!changeTree.parent &&
+        else if (!parentChangeTree &&
             changeTree.refId !== 0 // allow root object
         ) {
             /**
@@ -5027,18 +5027,31 @@ class StateView {
         // add parent ChangeTree's
         // - if it was invisible to this view
         // - if it were previously filtered out
-        if (checkIncludeParent && changeTree.parent) {
+        if (checkIncludeParent && parentChangeTree) {
             this.addParentOf(changeTree, tag);
         }
-        //
-        // TODO: when adding an item of a MapSchema, the changes may not
-        // be set (only the parent's changes are set)
-        //
         let changes = this.changes.get(changeTree.refId);
         if (changes === undefined) {
             changes = {};
+            // FIXME / OPTIMIZE: do not add if no changes are needed
             this.changes.set(changeTree.refId, changes);
         }
+        let isChildAdded = false;
+        //
+        // Add children of this ChangeTree first.
+        // If successful, we must link the current ChangeTree to the child.
+        //
+        changeTree.forEachChild((change, index) => {
+            // Do not ADD children that don't have the same tag
+            if (metadata &&
+                metadata[index].tag !== undefined &&
+                metadata[index].tag !== tag) {
+                return;
+            }
+            if (this.add(change.ref, tag, false)) {
+                isChildAdded = true;
+            }
+        });
         // set tag
         if (tag !== DEFAULT_VIEW_TAG) {
             if (!this.tags) {
@@ -5060,11 +5073,12 @@ class StateView {
                 }
             });
         }
-        else {
-            const isInvisible = this.invisible.has(changeTree);
+        else if (!changeTree.isNew || isChildAdded) {
+            // new structures will be added as part of .encode() call, no need to force it to .encodeView()
             const changeSet = (changeTree.filteredChanges !== undefined)
                 ? changeTree.allFilteredChanges
                 : changeTree.allChanges;
+            const isInvisible = this.invisible.has(changeTree);
             for (let i = 0, len = changeSet.operations.length; i < len; i++) {
                 const index = changeSet.operations[i];
                 if (index === undefined) {
@@ -5072,27 +5086,17 @@ class StateView {
                 } // skip "undefined" indexes
                 const op = changeTree.indexedOperations[index] ?? exports.OPERATION.ADD;
                 const tagAtIndex = metadata?.[index].tag;
-                if (!changeTree.isNew && // new structures will be added as part of .encode() call, no need to force it to .encodeView()
+                if (op !== exports.OPERATION.DELETE &&
                     (isInvisible || // if "invisible", include all
                         tagAtIndex === undefined || // "all change" with no tag
                         tagAtIndex === tag // tagged property
-                    ) &&
-                    op !== exports.OPERATION.DELETE) {
+                    )) {
                     changes[index] = op;
+                    isChildAdded = true; // FIXME: assign only once
                 }
             }
         }
-        // Add children of this ChangeTree to this view
-        changeTree.forEachChild((change, index) => {
-            // Do not ADD children that don't have the same tag
-            if (metadata &&
-                metadata[index].tag !== undefined &&
-                metadata[index].tag !== tag) {
-                return;
-            }
-            this.add(change.ref, tag, false);
-        });
-        return this;
+        return isChildAdded;
     }
     addParentOf(childChangeTree, tag) {
         const changeTree = childChangeTree.parent[$changes];