@colyseus/schema 3.0.16 → 3.0.18

package/src/decoder/DecodeOperation.ts

@@ -73,18 +73,6 @@ export function decodeValue(
         const refId = decode.number(bytes, it);
         value = $root.refs.get(refId);
 
-        if (previousValue) {
-            const previousRefId = $root.refIds.get(previousValue);
-            if (
-                previousRefId &&
-                refId !== previousRefId &&
-                // FIXME: we may need to check for REPLACE operation as well
-                ((operation & OPERATION.DELETE) === OPERATION.DELETE)
-            ) {
-                $root.removeRef(previousRefId);
-            }
-        }
-
         if ((operation & OPERATION.ADD) === OPERATION.ADD) {
             const childType = decoder.getInstanceType(bytes, it, type);
             if (!value) {
@@ -101,7 +89,6 @@ export function decodeValue(
             );
         }
 
-
     } else if (typeof(type) === "string") {
         //
         // primitive value (number, string, boolean, etc)
@@ -123,8 +110,6 @@ export function decodeValue(
             let previousRefId = $root.refIds.get(previousValue);
 
             if (previousRefId !== undefined && refId !== previousRefId) {
-                $root.removeRef(previousRefId);
-
                 //
                 // enqueue onRemove if structure has been replaced.
                 //
@@ -153,7 +138,10 @@ export function decodeValue(
             }
         }
 
-        $root.addRef(refId, value, (valueRef !== previousValue));
+        $root.addRef(refId, value, (
+            valueRef !== previousValue ||
+            (operation === OPERATION.DELETE_AND_ADD && valueRef === previousValue)
+        ));
     }
 
     return { value, previousValue };

package/src/decoder/ReferenceTracker.ts

@@ -103,7 +103,7 @@ export class ReferenceTracker {
                 for (const index in metadata) {
                     const field = metadata[index as any as number].name;
                     const childRefId = typeof(ref[field]) === "object" && this.refIds.get(ref[field]);
-                    if (childRefId) {
+                    if (childRefId && !this.deletedRefs.has(childRefId)) {
                         this.removeRef(childRefId);
                     }
                 }
@@ -111,7 +111,12 @@ export class ReferenceTracker {
             } else {
                 if (typeof (Object.values(ref[$childType])[0]) === "function") {
                     Array.from((ref as MapSchema).values())
-                        .forEach((child) => this.removeRef(this.refIds.get(child)));
+                        .forEach((child) => {
+                            const childRefId = this.refIds.get(child);
+                            if (!this.deletedRefs.has(childRefId)) {
+                                this.removeRef(childRefId);
+                            }
+                        });
                 }
             }