@colyseus/schema 4.0.22 → 4.0.24

package/build/index.js

@@ -1235,12 +1235,26 @@
                 }
                 return;
             }
-            const changeSet = (this.filteredChanges !== undefined)
+            // Mirror `change()`: a field's add/delete must target the same
+            // changeset family (filtered vs non-filtered). Otherwise
+            // `deleteOperationAtIndex` falls through to its "find last
+            // operation" branch and evicts an unrelated sibling field —
+            // surfaced as encodeAll() dropping a non-@view field after a
+            // sibling @view field is set to undefined on a Schema with
+            // mixed @view / non-@view fields (filteredChanges defined,
+            // isFiltered false).
+            const isFiltered = this.isFiltered || (this.metadata?.[index]?.tag !== undefined);
+            const changeSet = (isFiltered)
                 ? this.filteredChanges
                 : this.changes;
             this.indexedOperations[index] = operation ?? exports.OPERATION.DELETE;
             setOperationAtIndex(changeSet, index);
-            deleteOperationAtIndex(this.allChanges, allChangesIndex);
+            if (isFiltered) {
+                deleteOperationAtIndex(this.allFilteredChanges, allChangesIndex);
+            }
+            else {
+                deleteOperationAtIndex(this.allChanges, allChangesIndex);
+            }
             const previousValue = this.getValue(index);
             // remove `root` reference
             if (previousValue && previousValue[$changes]) {
@@ -1256,11 +1270,7 @@
                 //
                 this.root?.remove(previousValue[$changes]);
             }
-            //
-            // FIXME: this is looking a ugly and repeated
-            //
-            if (this.filteredChanges !== undefined) {
-                deleteOperationAtIndex(this.allFilteredChanges, allChangesIndex);
+            if (isFiltered) {
                 this.root?.enqueueChangeTree(this, 'filteredChanges');
             }
             else {
@@ -5538,6 +5548,7 @@
             else if ('decoder' in roomOrDecoder.serializer) {
                 return getDecoderStateCallbacks(roomOrDecoder.serializer.decoder);
             }
+            throw new Error('Invalid room or decoder');
         },
         getRawChanges(decoder, callback) {
             return getRawChangesCallback(decoder, callback);

package/build/index.mjs

@@ -1229,12 +1229,26 @@ class ChangeTree {
             }
             return;
         }
-        const changeSet = (this.filteredChanges !== undefined)
+        // Mirror `change()`: a field's add/delete must target the same
+        // changeset family (filtered vs non-filtered). Otherwise
+        // `deleteOperationAtIndex` falls through to its "find last
+        // operation" branch and evicts an unrelated sibling field —
+        // surfaced as encodeAll() dropping a non-@view field after a
+        // sibling @view field is set to undefined on a Schema with
+        // mixed @view / non-@view fields (filteredChanges defined,
+        // isFiltered false).
+        const isFiltered = this.isFiltered || (this.metadata?.[index]?.tag !== undefined);
+        const changeSet = (isFiltered)
             ? this.filteredChanges
             : this.changes;
         this.indexedOperations[index] = operation ?? OPERATION.DELETE;
         setOperationAtIndex(changeSet, index);
-        deleteOperationAtIndex(this.allChanges, allChangesIndex);
+        if (isFiltered) {
+            deleteOperationAtIndex(this.allFilteredChanges, allChangesIndex);
+        }
+        else {
+            deleteOperationAtIndex(this.allChanges, allChangesIndex);
+        }
         const previousValue = this.getValue(index);
         // remove `root` reference
         if (previousValue && previousValue[$changes]) {
@@ -1250,11 +1264,7 @@ class ChangeTree {
             //
             this.root?.remove(previousValue[$changes]);
         }
-        //
-        // FIXME: this is looking a ugly and repeated
-        //
-        if (this.filteredChanges !== undefined) {
-            deleteOperationAtIndex(this.allFilteredChanges, allChangesIndex);
+        if (isFiltered) {
             this.root?.enqueueChangeTree(this, 'filteredChanges');
         }
         else {
@@ -5532,6 +5542,7 @@ const Callbacks = {
         else if ('decoder' in roomOrDecoder.serializer) {
             return getDecoderStateCallbacks(roomOrDecoder.serializer.decoder);
         }
+        throw new Error('Invalid room or decoder');
     },
     getRawChanges(decoder, callback) {
         return getRawChangesCallback(decoder, callback);