@colyseus/schema 3.0.51 → 3.0.52

package/src/encoder/Root.ts

@@ -1,6 +1,6 @@
 import { OPERATION } from "../encoding/spec";
 import { TypeContext } from "../types/TypeContext";
-import { ChangeTree, setOperationAtIndex, ChangeTreeList, createChangeTreeList, ChangeSetName, Ref } from "./ChangeTree";
+import { ChangeTree, setOperationAtIndex, ChangeTreeList, createChangeTreeList, ChangeSetName, type ChangeTreeNode } from "./ChangeTree";
 
 export class Root {
     protected nextUniqueId: number = 0;
@@ -47,7 +47,7 @@ export class Root {
 
         this.refCount[changeTree.refId] = (previousRefCount || 0) + 1;
 
-        // console.log("ADD", { refId: changeTree.refId, refCount: this.refCount[changeTree.refId] });
+        // console.log("ADD", { refId: changeTree.refId, ref: changeTree.ref.constructor.name, refCount: this.refCount[changeTree.refId], isNewChangeTree });
 
         return isNewChangeTree;
     }
@@ -55,6 +55,8 @@ export class Root {
     remove(changeTree: ChangeTree) {
         const refCount = (this.refCount[changeTree.refId]) - 1;
 
+        // console.log("REMOVE", { refId: changeTree.refId, ref: changeTree.ref.constructor.name, refCount, needRemove: refCount <= 0 });
+
         if (refCount <= 0) {
             //
             // Only remove "root" reference if it's the last reference
@@ -147,7 +149,36 @@ export class Root {
         changeSet.tail = node;
     }
 
-    protected removeChangeFromChangeSet(changeSetName: ChangeSetName, changeTree: ChangeTree) {
+    public enqueueChangeTree(
+        changeTree: ChangeTree,
+        changeSet: 'changes' | 'filteredChanges' | 'allFilteredChanges' | 'allChanges',
+        queueRootNode = changeTree[changeSet].queueRootNode
+    ) {
+        // skip
+        if (queueRootNode) { return; }
+
+        // Add to linked list if not already present
+        changeTree[changeSet].queueRootNode = this.addToChangeTreeList(this[changeSet], changeTree);
+    }
+
+    protected addToChangeTreeList(list: ChangeTreeList, changeTree: ChangeTree): ChangeTreeNode {
+        const node: ChangeTreeNode = { changeTree, next: undefined, prev: undefined };
+
+        if (!list.next) {
+            list.next = node;
+            list.tail = node;
+        } else {
+            node.prev = list.tail;
+            list.tail!.next = node;
+            list.tail = node;
+        }
+
+        list.length++;
+
+        return node;
+    }
+
+    public removeChangeFromChangeSet(changeSetName: ChangeSetName, changeTree: ChangeTree) {
         const changeSet = this[changeSetName];
         const node = changeTree[changeSetName].queueRootNode;
 

package/src/types/custom/ArraySchema.ts

@@ -1,6 +1,6 @@
 import { $changes, $childType, $decoder, $deleteByIndex, $onEncodeEnd, $encoder, $filter, $getByIndex, $onDecodeEnd } from "../symbols";
 import type { Schema } from "../../Schema";
-import { ChangeTree, enqueueChangeTree, setOperationAtIndex } from "../../encoder/ChangeTree";
+import { ChangeTree, setOperationAtIndex } from "../../encoder/ChangeTree";
 import { OPERATION } from "../../encoding/spec";
 import { registerType } from "../registry";
 import { Collection } from "../HelperTypes";
@@ -482,10 +482,10 @@ export class ArraySchema<V = any> implements Array<V>, Collection<number, V> {
         // FIXME: this code block is duplicated on ChangeTree
         //
         if (changeTree.filteredChanges !== undefined) {
-            enqueueChangeTree(changeTree.root, changeTree, 'filteredChanges');
+            changeTree.root?.enqueueChangeTree(changeTree, 'filteredChanges');
 
         } else {
-            enqueueChangeTree(changeTree.root, changeTree, 'changes');
+            changeTree.root?.enqueueChangeTree(changeTree, 'changes');
         }
 
         return this.items.splice(start, deleteCount, ...insertItems);

package/src/types/custom/MapSchema.ts

@@ -118,6 +118,10 @@ export class MapSchema<V=any, K extends string = string> implements Map<K, V>, C
                 }
             }
 
+            if (this.deletedItems[index]) {
+                delete this.deletedItems[index];
+            }
+
         } else {
             index = changeTree.indexes[$numFields] ?? 0;
             operation = OPERATION.ADD;