@colyseus/schema 3.0.10 → 3.0.11

package/build/esm/index.mjs

@@ -1236,6 +1236,7 @@ class ChangeTree {
             //
             this.root?.remove(previousValue[$changes]);
         }
+        deleteOperationAtIndex(this.allChanges, allChangesIndex);
         //
         // FIXME: this is looking a ugly and repeated
         //
@@ -1244,7 +1245,6 @@ class ChangeTree {
             enqueueChangeTree(this.root, this, 'filteredChanges');
         }
         else {
-            deleteOperationAtIndex(this.allChanges, allChangesIndex);
             enqueueChangeTree(this.root, this, 'changes');
         }
     }
@@ -3745,15 +3745,31 @@ class Root {
         }
         else {
             this.refCount[changeTree.refId] = refCount;
+            //
+            // When losing a reference to an instance, it is best to move the
+            // ChangeTree to the end of the encoding queue.
+            //
+            // This way, at decoding time, the instance that contains the
+            // ChangeTree will be available before the ChangeTree itself. If the
+            // containing instance is not available, the Decoder will throw
+            // "refId not found" error.
+            //
+            if (changeTree.filteredChanges !== undefined) {
+                this.removeChangeFromChangeSet("filteredChanges", changeTree);
+                enqueueChangeTree(this, changeTree, "filteredChanges");
+            }
+            else {
+                this.removeChangeFromChangeSet("changes", changeTree);
+                enqueueChangeTree(this, changeTree, "changes");
+            }
         }
         changeTree.forEachChild((child, _) => this.remove(child));
         return refCount;
     }
     removeChangeFromChangeSet(changeSetName, changeTree) {
         const changeSet = this[changeSetName];
-        const index = changeSet.indexOf(changeTree);
-        if (index !== -1) {
-            spliceOne(changeSet, index);
+        if (spliceOne(changeSet, changeSet.indexOf(changeTree))) {
+            changeTree[changeSetName].queueRootIndex = -1;
             // changeSet[index] = undefined;
         }
     }