@colyseus/schema 3.0.0-alpha.15 → 3.0.0-alpha.17

package/build/cjs/index.js

@@ -27,6 +27,7 @@ exports.OPERATION = void 0;
     OPERATION[OPERATION["REVERSE"] = 15] = "REVERSE";
     OPERATION[OPERATION["MOVE"] = 32] = "MOVE";
     OPERATION[OPERATION["DELETE_BY_REFID"] = 33] = "DELETE_BY_REFID";
+    OPERATION[OPERATION["ADD_BY_REFID"] = 129] = "ADD_BY_REFID";
 })(exports.OPERATION || (exports.OPERATION = {}));
 
 Symbol.metadata ??= Symbol.for("Symbol.metadata");
@@ -967,15 +968,19 @@ const encodeKeyValueOperation = function (encoder, bytes, changeTree, field, ope
  */
 const encodeArray = function (encoder, bytes, changeTree, field, operation, it, isEncodeAll, hasView) {
     const ref = changeTree.ref;
-    if (hasView &&
-        operation === exports.OPERATION.DELETE &&
-        typeof (changeTree.getType(field)) !== "string") {
-        // encode delete by refId (array of schemas)
-        bytes[it.offset++] = exports.OPERATION.DELETE_BY_REFID;
-        const value = ref['tmpItems'][field];
-        const refId = value[$changes].refId;
-        number$1(bytes, refId, it);
-        return;
+    const useOperationByRefId = hasView && changeTree.isFiltered && (typeof (changeTree.getType(field)) !== "string");
+    let refOrIndex;
+    if (useOperationByRefId) {
+        refOrIndex = ref['tmpItems'][field][$changes].refId;
+        if (operation === exports.OPERATION.DELETE) {
+            operation = exports.OPERATION.DELETE_BY_REFID;
+        }
+        else if (operation === exports.OPERATION.ADD) {
+            operation = exports.OPERATION.ADD_BY_REFID;
+        }
+    }
+    else {
+        refOrIndex = field;
     }
     // encode operation
     bytes[it.offset++] = operation & 255;
@@ -984,7 +989,7 @@ const encodeArray = function (encoder, bytes, changeTree, field, operation, it,
         return;
     }
     // encode index
-    number$1(bytes, field, it);
+    number$1(bytes, refOrIndex, it);
     // Do not encode value for DELETE operations
     if (operation === exports.OPERATION.DELETE) {
         return;
@@ -1443,7 +1448,8 @@ const decodeKeyValueOperation = function (decoder, bytes, it, ref, allChanges) {
 };
 const decodeArray = function (decoder, bytes, it, ref, allChanges) {
     // "uncompressed" index + operation (array/map items)
-    const operation = bytes[it.offset++];
+    let operation = bytes[it.offset++];
+    let index;
     if (operation === exports.OPERATION.CLEAR) {
         //
         // When decoding:
@@ -1458,7 +1464,7 @@ const decodeArray = function (decoder, bytes, it, ref, allChanges) {
         // TODO: refactor here, try to follow same flow as below
         const refId = number(bytes, it);
         const previousValue = decoder.root.refs.get(refId);
-        const index = ref.findIndex((value) => value === previousValue);
+        index = ref.findIndex((value) => value === previousValue);
         ref[$deleteByIndex](index);
         allChanges.push({
             ref,
@@ -1471,7 +1477,18 @@ const decodeArray = function (decoder, bytes, it, ref, allChanges) {
         });
         return;
     }
-    const index = number(bytes, it);
+    else if (operation === exports.OPERATION.ADD_BY_REFID) {
+        // operation = OPERATION.ADD;
+        const refId = number(bytes, it);
+        const itemByRefId = decoder.root.refs.get(refId);
+        // use existing index, or push new value
+        index = (itemByRefId)
+            ? ref.findIndex((value) => value === itemByRefId)
+            : ref.length;
+    }
+    else {
+        index = number(bytes, it);
+    }
     const type = ref[$childType];
     let dynamicIndex = index;
     const { value, previousValue } = decodeValue(decoder, operation, ref, index, type, bytes, it, allChanges);
@@ -4017,16 +4034,7 @@ function getStateCallbacks(decoder) {
                 //
                 // Handle collection of items
                 //
-                if (change.op === exports.OPERATION.ADD && change.previousValue === undefined) {
-                    // triger onAdd
-                    isTriggeringOnAdd = true;
-                    const addCallbacks = $callbacks[exports.OPERATION.ADD];
-                    for (let i = addCallbacks?.length - 1; i >= 0; i--) {
-                        addCallbacks[i](change.value, change.dynamicIndex ?? change.field);
-                    }
-                    isTriggeringOnAdd = false;
-                }
-                else if ((change.op & exports.OPERATION.DELETE) === exports.OPERATION.DELETE) {
+                if ((change.op & exports.OPERATION.DELETE) === exports.OPERATION.DELETE) {
                     //
                     // FIXME: `previousValue` should always be available.
                     //
@@ -4046,6 +4054,15 @@ function getStateCallbacks(decoder) {
                         }
                     }
                 }
+                else if ((change.op & exports.OPERATION.ADD) === exports.OPERATION.ADD && change.previousValue === undefined) {
+                    // triger onAdd
+                    isTriggeringOnAdd = true;
+                    const addCallbacks = $callbacks[exports.OPERATION.ADD];
+                    for (let i = addCallbacks?.length - 1; i >= 0; i--) {
+                        addCallbacks[i](change.value, change.dynamicIndex ?? change.field);
+                    }
+                    isTriggeringOnAdd = false;
+                }
                 // trigger onChange
                 if (change.value !== change.previousValue) {
                     const replaceCallbacks = $callbacks[exports.OPERATION.REPLACE];
@@ -4217,12 +4234,18 @@ class StateView {
             console.warn("StateView#add(), invalid object:", obj);
             return this;
         }
+        // FIXME: ArraySchema/MapSchema does not have metadata
+        const metadata = obj.constructor[Symbol.metadata];
         let changeTree = obj[$changes];
         this.items.add(changeTree);
         // Add children of this ChangeTree to this view
-        changeTree.forEachChild((change, _) => this.add(change.ref, tag));
-        // FIXME: ArraySchema/MapSchema does not have metadata
-        const metadata = obj.constructor[Symbol.metadata];
+        changeTree.forEachChild((change, index) => {
+            // Do not ADD children that don't have the same tag
+            if (metadata && metadata[metadata[index]].tag !== tag) {
+                return;
+            }
+            this.add(change.ref, tag);
+        });
         // add parent ChangeTree's, if they are invisible to this view
         // TODO: REFACTOR addParent()
         this.addParent(changeTree, tag);
@@ -4249,7 +4272,6 @@ class StateView {
                 tags = this.tags.get(changeTree);
             }
             tags.add(tag);
-            // console.log("BY TAG:", tag);
             // Ref: add tagged properties
             metadata?.[-3]?.[tag]?.forEach((index) => {
                 if (changeTree.getChange(index) !== exports.OPERATION.DELETE) {