@colyseus/schema 4.0.22 → 4.0.24

package/build/decoder/strategy/Callbacks.d.ts

@@ -41,7 +41,7 @@ export declare class StateCallbackStrategy<TState extends IRef> {
     /**
      * Listen to any property change on an instance.
      */
-    onChange<TInstance extends Schema>(instance: TInstance, handler: InstanceChangeCallback): () => void;
+    onChange<TInstance extends object>(instance: TInstance, handler: InstanceChangeCallback): () => void;
     /**
      * Listen to item changes in a collection on root state.
      */
@@ -49,7 +49,7 @@ export declare class StateCallbackStrategy<TState extends IRef> {
     /**
      * Listen to item changes in a nested collection.
      */
-    onChange<TInstance extends Schema, K extends CollectionPropNames<TInstance>>(instance: TInstance, property: K, handler: KeyValueCallback<CollectionKeyType<TInstance, K>, CollectionValueType<TInstance, K>>): () => void;
+    onChange<TInstance extends object, K extends CollectionPropNames<TInstance>>(instance: TInstance, property: K, handler: KeyValueCallback<CollectionKeyType<TInstance, K>, CollectionValueType<TInstance, K>>): () => void;
     /**
      * Listen to items added to a collection on root state.
      */
@@ -57,7 +57,7 @@ export declare class StateCallbackStrategy<TState extends IRef> {
     /**
      * Listen to items added to a nested collection.
      */
-    onAdd<TInstance extends Schema, K extends CollectionPropNames<TInstance>>(instance: TInstance, property: K, handler: ValueKeyCallback<CollectionValueType<TInstance, K>, CollectionKeyType<TInstance, K>>, immediate?: boolean): () => void;
+    onAdd<TInstance, K extends CollectionPropNames<TInstance>>(instance: TInstance, property: K, handler: ValueKeyCallback<CollectionValueType<TInstance, K>, CollectionKeyType<TInstance, K>>, immediate?: boolean): () => void;
     /**
      * Listen to items removed from a collection on root state.
      */
@@ -65,12 +65,12 @@ export declare class StateCallbackStrategy<TState extends IRef> {
     /**
      * Listen to items removed from a nested collection.
      */
-    onRemove<TInstance extends Schema, K extends CollectionPropNames<TInstance>>(instance: TInstance, property: K, handler: ValueKeyCallback<CollectionValueType<TInstance, K>, CollectionKeyType<TInstance, K>>): () => void;
+    onRemove<TInstance, K extends CollectionPropNames<TInstance>>(instance: TInstance, property: K, handler: ValueKeyCallback<CollectionValueType<TInstance, K>, CollectionKeyType<TInstance, K>>): () => void;
     /**
      * Bind properties from a Schema instance to a target object.
      * Changes will be automatically reflected on the target object.
      */
-    bindTo<TInstance extends Schema, TTarget>(from: TInstance, to: TTarget, properties?: string[], immediate?: boolean): () => void;
+    bindTo<TInstance, TTarget>(from: TInstance, to: TTarget, properties?: string[], immediate?: boolean): () => void;
     protected triggerChanges(allChanges: DataChange[]): void;
 }
 /**

package/build/index.cjs

@@ -1231,12 +1231,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 ?? 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]) {
@@ -1252,11 +1266,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 {
@@ -5534,6 +5544,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);