@colyseus/schema 3.0.48 → 3.0.50

package/build/cjs/index.js

@@ -1104,7 +1104,7 @@ class ChangeTree {
             if (typeof (this.ref[$childType]) !== "string") {
                 // MapSchema / ArraySchema, etc.
                 for (const [key, value] of this.ref.entries()) {
-                    callback(value[$changes], key);
+                    callback(value[$changes], this.indexes?.[key] ?? key);
                 }
             }
         }
@@ -1543,10 +1543,6 @@ const encodeSchemaOperation = function (encoder, bytes, changeTree, index, opera
 const encodeKeyValueOperation = function (encoder, bytes, changeTree, index, operation, it) {
     // encode operation
     bytes[it.offset++] = operation & 255;
-    // custom operations
-    if (operation === exports.OPERATION.CLEAR) {
-        return;
-    }
     // encode index
     encode.number(bytes, index, it);
     // Do not encode value for DELETE operations
@@ -1605,11 +1601,6 @@ const encodeArray = function (encoder, bytes, changeTree, field, operation, it,
     }
     // encode operation
     bytes[it.offset++] = operation & 255;
-    // custom operations
-    if (operation === exports.OPERATION.CLEAR ||
-        operation === exports.OPERATION.REVERSE) {
-        return;
-    }
     // encode index
     encode.number(bytes, refOrIndex, it);
     // Do not encode value for DELETE operations
@@ -3180,20 +3171,29 @@ function defineTypes(target, fields, options) {
     }
     return target;
 }
-function schema(fields, name, inherits = Schema) {
+function schema(fieldsAndMethods, name, inherits = Schema) {
+    const fields = {};
+    const methods = {};
     const defaultValues = {};
     const viewTagFields = {};
-    for (let fieldName in fields) {
-        const field = fields[fieldName];
-        if (typeof (field) === "object") {
-            if (field['default'] !== undefined) {
-                defaultValues[fieldName] = field['default'];
+    for (let fieldName in fieldsAndMethods) {
+        const value = fieldsAndMethods[fieldName];
+        if (typeof (value) === "object") {
+            if (value['default'] !== undefined) {
+                defaultValues[fieldName] = value['default'];
             }
-            if (field['view'] !== undefined) {
-                viewTagFields[fieldName] = (typeof (field['view']) === "boolean")
+            if (value['view'] !== undefined) {
+                viewTagFields[fieldName] = (typeof (value['view']) === "boolean")
                     ? DEFAULT_VIEW_TAG
-                    : field['view'];
+                    : value['view'];
             }
+            fields[fieldName] = value;
+        }
+        else if (typeof (value) === "function") {
+            methods[fieldName] = value;
+        }
+        else {
+            fields[fieldName] = value;
         }
     }
     const klass = Metadata.setFields(class extends inherits {
@@ -3205,6 +3205,9 @@ function schema(fields, name, inherits = Schema) {
     for (let fieldName in viewTagFields) {
         view(viewTagFields[fieldName])(klass.prototype, fieldName);
     }
+    for (let methodName in methods) {
+        klass.prototype[methodName] = methods[methodName];
+    }
     if (name) {
         Object.defineProperty(klass, "name", { value: name });
     }
@@ -3401,7 +3404,12 @@ class Schema {
             ? ` [×${root.refCount[refId]}]`
             : '';
         let output = `${getIndent(level)}${keyPrefix}${ref.constructor.name} (refId: ${refId})${refCount}${contents}\n`;
-        changeTree.forEachChild((childChangeTree, key) => {
+        changeTree.forEachChild((childChangeTree, indexOrKey) => {
+            let key = indexOrKey;
+            if (typeof indexOrKey === 'number' && ref['$indexes']) {
+                // MapSchema
+                key = ref['$indexes'].get(indexOrKey) ?? indexOrKey;
+            }
             const keyPrefix = (ref['forEach'] !== undefined && key !== undefined) ? `["${key}"]: ` : "";
             output += this.debugRefIds(childChangeTree.ref, showContents, level + 1, decoder, keyPrefix);
         });
@@ -4096,11 +4104,15 @@ class Encoder {
             }
             for (let j = 0; j < numChanges; j++) {
                 const fieldIndex = changeSet.operations[j];
-                const operation = (fieldIndex < 0)
-                    ? Math.abs(fieldIndex) // "pure" operation without fieldIndex (e.g. CLEAR, REVERSE, etc.)
-                    : (isEncodeAll)
-                        ? exports.OPERATION.ADD
-                        : changeTree.indexedOperations[fieldIndex];
+                if (fieldIndex < 0) {
+                    // "pure" operation without fieldIndex (e.g. CLEAR, REVERSE, etc.)
+                    // encode and continue early - no need to reach $filter check
+                    buffer[it.offset++] = Math.abs(fieldIndex) & 255;
+                    continue;
+                }
+                const operation = (isEncodeAll)
+                    ? exports.OPERATION.ADD
+                    : changeTree.indexedOperations[fieldIndex];
                 //
                 // first pass (encodeAll), identify "filtered" operations without encoding them
                 // they will be encoded per client, based on their view.