@colyseus/schema 4.0.3 → 4.0.5

package/build/index.js

@@ -3672,6 +3672,15 @@
         static is(type) {
             return typeof (type[Symbol.metadata]) === "object";
         }
+        /**
+         * Check if a value is an instance of Schema.
+         * This method uses duck-typing to avoid issues with multiple @colyseus/schema versions.
+         * @param obj Value to check
+         * @returns true if the value is a Schema instance
+         */
+        static isSchema(obj) {
+            return typeof obj?.assign === "function";
+        }
         /**
          * Track property changes
          */
@@ -4876,13 +4885,13 @@
                 // trigger onRemove on child structure.
                 //
                 if ((change.op & exports.OPERATION.DELETE) === exports.OPERATION.DELETE &&
-                    change.previousValue instanceof Schema) {
+                    Schema.isSchema(change.previousValue)) {
                     const deleteCallbacks = callbacks[change.previousValue[$refId]]?.[exports.OPERATION.DELETE];
                     for (let i = deleteCallbacks?.length - 1; i >= 0; i--) {
                         deleteCallbacks[i]();
                     }
                 }
-                if (ref instanceof Schema) {
+                if (Schema.isSchema(ref)) {
                     //
                     // Handle schema instance
                     //
@@ -5126,32 +5135,6 @@
         decoder.triggerChanges = callback;
     }
 
-    /**
-     * State Callbacks handler
-     *
-     * Usage:
-     * ```ts
-     * const $ = Callbacks.get(decoder);
-     *
-     * // Listen to property changes
-     * $.listen("currentTurn", (currentValue, previousValue) => { ... });
-     *
-     * // Listen to collection additions
-     * $.onAdd("entities", (sessionId, entity) => {
-     *     // Nested property listening
-     *     $.listen(entity, "hp", (currentHp, previousHp) => { ... });
-     * });
-     *
-     * // Listen to collection removals
-     * $.onRemove("entities", (sessionId, entity) => { ... });
-     *
-     * // Listen to any property change on an instance
-     * $.onChange(entity, () => { ... });
-     *
-     * // Bind properties to another object
-     * $.bindTo(player, playerVisual);
-     * ```
-     */
     class StateCallbackStrategy {
         decoder;
         uniqueRefIds = new Set();
@@ -5190,7 +5173,7 @@
                 immediate = immediate && this.isTriggering === false;
                 if (operation === exports.OPERATION.ADD && immediate) {
                     collection.forEach((value, key) => {
-                        handler(key, value);
+                        handler(value, key);
                     });
                 }
                 return this.addCallback(collection[$refId], operation, handler);
@@ -5292,7 +5275,7 @@
                 // trigger onRemove on child structure.
                 //
                 if ((change.op & exports.OPERATION.DELETE) === exports.OPERATION.DELETE &&
-                    change.previousValue instanceof Schema) {
+                    Schema.isSchema(change.previousValue)) {
                     const childRefId = change.previousValue[$refId];
                     const deleteCallbacks = this.callbacks[childRefId]?.[exports.OPERATION.DELETE];
                     if (deleteCallbacks) {
@@ -5301,7 +5284,7 @@
                         }
                     }
                 }
-                if (ref instanceof Schema) {
+                if (Schema.isSchema(ref)) {
                     //
                     // Handle Schema instance
                     //
@@ -5346,11 +5329,11 @@
                         // FIXME: `previousValue` should always be available.
                         //
                         if (change.previousValue !== undefined) {
-                            // trigger onRemove (key, value)
+                            // trigger onRemove (value, key)
                             const deleteCallbacks = $callbacks[exports.OPERATION.DELETE];
                             if (deleteCallbacks) {
                                 for (let j = deleteCallbacks.length - 1; j >= 0; j--) {
-                                    deleteCallbacks[j](dynamicIndex, change.previousValue);
+                                    deleteCallbacks[j](change.previousValue, dynamicIndex);
                                 }
                             }
                         }
@@ -5360,7 +5343,7 @@
                             if (addCallbacks) {
                                 this.isTriggering = true;
                                 for (let j = addCallbacks.length - 1; j >= 0; j--) {
-                                    addCallbacks[j](dynamicIndex, change.value);
+                                    addCallbacks[j](change.value, dynamicIndex);
                                 }
                                 this.isTriggering = false;
                             }
@@ -5368,12 +5351,12 @@
                     }
                     else if ((change.op & exports.OPERATION.ADD) === exports.OPERATION.ADD &&
                         change.previousValue !== change.value) {
-                        // trigger onAdd (key, value)
+                        // trigger onAdd (value, key)
                         const addCallbacks = $callbacks[exports.OPERATION.ADD];
                         if (addCallbacks) {
                             this.isTriggering = true;
                             for (let j = addCallbacks.length - 1; j >= 0; j--) {
-                                addCallbacks[j](dynamicIndex, change.value);
+                                addCallbacks[j](change.value, dynamicIndex);
                             }
                             this.isTriggering = false;
                         }
@@ -5407,13 +5390,13 @@
          * callbacks.listen("currentTurn", (currentValue, previousValue) => { ... });
          *
          * // Listen to collection additions
-         * callbacks.onAdd("entities", (sessionId, entity) => {
+         * callbacks.onAdd("entities", (entity, sessionId) => {
          *     // Nested property listening
          *     callbacks.listen(entity, "hp", (currentHp, previousHp) => { ... });
          * });
          *
          * // Listen to collection removals
-         * callbacks.onRemove("entities", (sessionId, entity) => { ... });
+         * callbacks.onRemove("entities", (entity, sessionId) => { ... });
          *
          * // Listen to any property change on an instance
          * callbacks.onChange(entity, () => { ... });

package/build/index.mjs

@@ -3666,6 +3666,15 @@ class Schema {
     static is(type) {
         return typeof (type[Symbol.metadata]) === "object";
     }
+    /**
+     * Check if a value is an instance of Schema.
+     * This method uses duck-typing to avoid issues with multiple @colyseus/schema versions.
+     * @param obj Value to check
+     * @returns true if the value is a Schema instance
+     */
+    static isSchema(obj) {
+        return typeof obj?.assign === "function";
+    }
     /**
      * Track property changes
      */
@@ -4870,13 +4879,13 @@ function getDecoderStateCallbacks(decoder) {
             // trigger onRemove on child structure.
             //
             if ((change.op & OPERATION.DELETE) === OPERATION.DELETE &&
-                change.previousValue instanceof Schema) {
+                Schema.isSchema(change.previousValue)) {
                 const deleteCallbacks = callbacks[change.previousValue[$refId]]?.[OPERATION.DELETE];
                 for (let i = deleteCallbacks?.length - 1; i >= 0; i--) {
                     deleteCallbacks[i]();
                 }
             }
-            if (ref instanceof Schema) {
+            if (Schema.isSchema(ref)) {
                 //
                 // Handle schema instance
                 //
@@ -5120,32 +5129,6 @@ function getRawChangesCallback(decoder, callback) {
     decoder.triggerChanges = callback;
 }
 
-/**
- * State Callbacks handler
- *
- * Usage:
- * ```ts
- * const $ = Callbacks.get(decoder);
- *
- * // Listen to property changes
- * $.listen("currentTurn", (currentValue, previousValue) => { ... });
- *
- * // Listen to collection additions
- * $.onAdd("entities", (sessionId, entity) => {
- *     // Nested property listening
- *     $.listen(entity, "hp", (currentHp, previousHp) => { ... });
- * });
- *
- * // Listen to collection removals
- * $.onRemove("entities", (sessionId, entity) => { ... });
- *
- * // Listen to any property change on an instance
- * $.onChange(entity, () => { ... });
- *
- * // Bind properties to another object
- * $.bindTo(player, playerVisual);
- * ```
- */
 class StateCallbackStrategy {
     decoder;
     uniqueRefIds = new Set();
@@ -5184,7 +5167,7 @@ class StateCallbackStrategy {
             immediate = immediate && this.isTriggering === false;
             if (operation === OPERATION.ADD && immediate) {
                 collection.forEach((value, key) => {
-                    handler(key, value);
+                    handler(value, key);
                 });
             }
             return this.addCallback(collection[$refId], operation, handler);
@@ -5286,7 +5269,7 @@ class StateCallbackStrategy {
             // trigger onRemove on child structure.
             //
             if ((change.op & OPERATION.DELETE) === OPERATION.DELETE &&
-                change.previousValue instanceof Schema) {
+                Schema.isSchema(change.previousValue)) {
                 const childRefId = change.previousValue[$refId];
                 const deleteCallbacks = this.callbacks[childRefId]?.[OPERATION.DELETE];
                 if (deleteCallbacks) {
@@ -5295,7 +5278,7 @@ class StateCallbackStrategy {
                     }
                 }
             }
-            if (ref instanceof Schema) {
+            if (Schema.isSchema(ref)) {
                 //
                 // Handle Schema instance
                 //
@@ -5340,11 +5323,11 @@ class StateCallbackStrategy {
                     // FIXME: `previousValue` should always be available.
                     //
                     if (change.previousValue !== undefined) {
-                        // trigger onRemove (key, value)
+                        // trigger onRemove (value, key)
                         const deleteCallbacks = $callbacks[OPERATION.DELETE];
                         if (deleteCallbacks) {
                             for (let j = deleteCallbacks.length - 1; j >= 0; j--) {
-                                deleteCallbacks[j](dynamicIndex, change.previousValue);
+                                deleteCallbacks[j](change.previousValue, dynamicIndex);
                             }
                         }
                     }
@@ -5354,7 +5337,7 @@ class StateCallbackStrategy {
                         if (addCallbacks) {
                             this.isTriggering = true;
                             for (let j = addCallbacks.length - 1; j >= 0; j--) {
-                                addCallbacks[j](dynamicIndex, change.value);
+                                addCallbacks[j](change.value, dynamicIndex);
                             }
                             this.isTriggering = false;
                         }
@@ -5362,12 +5345,12 @@ class StateCallbackStrategy {
                 }
                 else if ((change.op & OPERATION.ADD) === OPERATION.ADD &&
                     change.previousValue !== change.value) {
-                    // trigger onAdd (key, value)
+                    // trigger onAdd (value, key)
                     const addCallbacks = $callbacks[OPERATION.ADD];
                     if (addCallbacks) {
                         this.isTriggering = true;
                         for (let j = addCallbacks.length - 1; j >= 0; j--) {
-                            addCallbacks[j](dynamicIndex, change.value);
+                            addCallbacks[j](change.value, dynamicIndex);
                         }
                         this.isTriggering = false;
                     }
@@ -5401,13 +5384,13 @@ const Callbacks = {
      * callbacks.listen("currentTurn", (currentValue, previousValue) => { ... });
      *
      * // Listen to collection additions
-     * callbacks.onAdd("entities", (sessionId, entity) => {
+     * callbacks.onAdd("entities", (entity, sessionId) => {
      *     // Nested property listening
      *     callbacks.listen(entity, "hp", (currentHp, previousHp) => { ... });
      * });
      *
      * // Listen to collection removals
-     * callbacks.onRemove("entities", (sessionId, entity) => { ... });
+     * callbacks.onRemove("entities", (entity, sessionId) => { ... });
      *
      * // Listen to any property change on an instance
      * callbacks.onChange(entity, () => { ... });