fixes .onChange() + .listen(). bump version.

colyseus · Oct 9, 2023 · 2a789a1 · 2a789a1
1 parent a0ec61d
commit 2a789a1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/schema",
-  "version": "2.0.17",
+  "version": "2.0.18",
   "description": "Binary state serializer with delta encoding for games",
   "bin": {
     "schema-codegen": "./bin/schema-codegen"

diff --git a/src/Schema.ts b/src/Schema.ts
@@ -141,10 +141,10 @@ export abstract class Schema {
     protected $callbacks: { [op: number]: Array<Function> };
 
     public onChange(callback: () => void): () => void {
-        return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.REPLACE, callback);
+        return addCallback((this.$callbacks || (this.$callbacks = {})), OPERATION.REPLACE, callback);
     }
     public onRemove(callback: () => void): () => void {
-        return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.DELETE, callback);
+        return addCallback((this.$callbacks || (this.$callbacks = {})), OPERATION.DELETE, callback);
     }
 
     // allow inherited classes to have a constructor

diff --git a/src/types/ArraySchema.ts b/src/types/ArraySchema.ts
@@ -86,16 +86,16 @@ export class ArraySchema<V = any> implements Array<V>, SchemaDecoderCallbacks {
     public $callbacks: { [operation: number]: Array<(item: V, key: number) => void> };
     public onAdd(callback: (item: V, key: number) => void, triggerAll: boolean = true) {
         return addCallback(
-            (this.$callbacks || (this.$callbacks = [])),
+            (this.$callbacks || (this.$callbacks = {})),
             OPERATION.ADD,
             callback,
             (triggerAll)
                 ? this.$items
                 : undefined
         );
     }
-    public onRemove(callback: (item: V, key: number) => void) { return addCallback(this.$callbacks || (this.$callbacks = []), OPERATION.DELETE, callback); }
-    public onChange(callback: (item: V, key: number) => void) { return addCallback(this.$callbacks || (this.$callbacks = []), OPERATION.REPLACE, callback); }
+    public onRemove(callback: (item: V, key: number) => void) { return addCallback(this.$callbacks || (this.$callbacks = {}), OPERATION.DELETE, callback); }
+    public onChange(callback: (item: V, key: number) => void) { return addCallback(this.$callbacks || (this.$callbacks = {}), OPERATION.REPLACE, callback); }
 
     static is(type: any) {
         return (

diff --git a/src/types/MapSchema.ts b/src/types/MapSchema.ts
@@ -61,16 +61,16 @@ export class MapSchema<V=any, K extends string = string> implements Map<K, V>, S
     public $callbacks: { [operation: number]: Array<(item: V, key: string) => void> };
     public onAdd(callback: (item: V, key: string) => void, triggerAll: boolean = true) {
         return addCallback(
-            (this.$callbacks || (this.$callbacks = [])),
+            (this.$callbacks || (this.$callbacks = {})),
             OPERATION.ADD,
             callback,
             (triggerAll)
                 ? this.$items
                 : undefined
         );
     }
-    public onRemove(callback: (item: V, key: string) => void) { return addCallback(this.$callbacks || (this.$callbacks = []), OPERATION.DELETE, callback); }
-    public onChange(callback: (item: V, key: string) => void) { return addCallback(this.$callbacks || (this.$callbacks = []), OPERATION.REPLACE, callback); }
+    public onRemove(callback: (item: V, key: string) => void) { return addCallback(this.$callbacks || (this.$callbacks = {}), OPERATION.DELETE, callback); }
+    public onChange(callback: (item: V, key: string) => void) { return addCallback(this.$callbacks || (this.$callbacks = {}), OPERATION.REPLACE, callback); }
 
     static is(type: any) {
         return type['map'] !== undefined;

diff --git a/test/ChangeAPI.test.ts b/test/ChangeAPI.test.ts
@@ -1133,6 +1133,25 @@ describe("Change API", () => {
     });
 
     describe(".listen()", () => {
+        it("should allow .onChange() + listen on same object", () => {
+            let callCount: number = 0;
+
+            class State extends Schema {
+                @type("string") map: string;
+            }
+
+            const state = new State();
+            state.map = "Hello world!";
+
+            const decodedState = new State();
+            decodedState.onChange(() => callCount++);
+            decodedState.listen("map", () => callCount++);
+
+            decodedState.decode(state.encode());
+
+            assert.strictEqual(2, callCount);
+        });
+
         it("should trigger immediatelly", () => {
             let listenCallCount = 0;