@colyseus/schema 4.0.15 → 4.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/schema",
-  "version": "4.0.15",
+  "version": "4.0.17",
   "description": "Binary state serializer with delta encoding for games",
   "type": "module",
   "bin": {

package/src/Schema.ts

@@ -122,7 +122,7 @@ export class Schema<C = any> implements IRef {
      * @param jsonData JSON data to restore the instance from
      * @returns
      */
-    public restore(jsonData: ToJSON<this>): this {
+    public restore<T extends Partial<this>>(jsonData: ToJSON<T>): this {
         const metadata: Metadata = (this.constructor as typeof Schema)[Symbol.metadata];
 
         for (const fieldIndex in metadata) {
@@ -224,7 +224,7 @@ export class Schema<C = any> implements IRef {
         return cloned;
     }
 
-    toJSON (this: any): ToJSON<this> {
+    toJSON (this: any): ToJSON<Partial<this>> {
         const obj: any = {};
         const metadata = this.constructor[Symbol.metadata];
         for (const index in metadata) {

package/src/encoder/StateView.ts

@@ -261,14 +261,31 @@ export class StateView {
 
             } else {
                 // delete all "tagged" properties.
-                metadata?.[$viewFieldIndexes]?.forEach((index) =>
-                    changes[index] = OPERATION.DELETE);
+                metadata?.[$viewFieldIndexes]?.forEach((index) => {
+                    changes[index] = OPERATION.DELETE;
+
+                    // Remove child structures of @view() fields from visible set.
+                    // (They were added during view.add() via forEachChild)
+                    const value = changeTree.ref[metadata[index].name as keyof Ref];
+                    if (value?.[$changes]) {
+                        this.visible.delete(value[$changes]);
+                        this._recursiveDeleteVisibleChangeTree(value[$changes]);
+                    }
+                });
             }
 
         } else {
             // delete only tagged properties
-            metadata?.[$fieldIndexesByViewTag][tag].forEach((index) =>
-                changes[index] = OPERATION.DELETE);
+            metadata?.[$fieldIndexesByViewTag][tag].forEach((index) => {
+                changes[index] = OPERATION.DELETE;
+
+                // Remove child structures from visible set
+                const value = changeTree.ref[metadata[index].name as keyof Ref];
+                if (value?.[$changes]) {
+                    this.visible.delete(value[$changes]);
+                    this._recursiveDeleteVisibleChangeTree(value[$changes]);
+                }
+            });
         }
 
         // remove tag