@colyseus/schema 2.0.4 → 2.0.6

package/build/esm/index.mjs

@@ -38,13 +38,19 @@ var OPERATION;
 // }
 
 class ChangeTree {
+    ref;
+    refId;
+    root;
+    parent;
+    parentIndex;
+    indexes;
+    changed = false;
+    changes = new Map();
+    allChanges = new Set();
+    // cached indexes for filtering
+    caches = {};
+    currentCustomOperation = 0;
     constructor(ref, parent, root) {
-        this.changed = false;
-        this.changes = new Map();
-        this.allChanges = new Set();
-        // cached indexes for filtering
-        this.caches = {};
-        this.currentCustomOperation = 0;
         this.ref = ref;
         this.setParent(parent, root);
     }
@@ -334,13 +340,14 @@ function getArrayProxy(value) {
     return value;
 }
 class ArraySchema {
-    constructor(...items) {
-        this.$changes = new ChangeTree(this);
-        this.$items = new Map();
-        this.$indexes = new Map();
-        this.$refId = 0;
-        this.push.apply(this, items);
-    }
+    $changes = new ChangeTree(this);
+    $items = new Map();
+    $indexes = new Map();
+    $refId = 0;
+    //
+    // Decoding callbacks
+    //
+    $callbacks;
     onAdd(callback, triggerAll = true) {
         return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.ADD, callback, (triggerAll)
             ? this.$items
@@ -355,6 +362,9 @@ class ArraySchema {
             // type format: { array: "string" }
             (type['array'] !== undefined));
     }
+    constructor(...items) {
+        this.push.apply(this, items);
+    }
     set length(value) {
         if (value === 0) {
             this.clear();
@@ -597,7 +607,7 @@ class ArraySchema {
      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
      */
     reduce(callbackfn, initialValue) {
-        return Array.from(this.$items.values()).reduce(callbackfn, initialValue);
+        return Array.prototype.reduce.apply(Array.from(this.$items.values()), arguments);
     }
     /**
      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
@@ -605,7 +615,7 @@ class ArraySchema {
      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
      */
     reduceRight(callbackfn, initialValue) {
-        return Array.from(this.$items.values()).reduceRight(callbackfn, initialValue);
+        return Array.prototype.reduceRight.apply(Array.from(this.$items.values()), arguments);
     }
     /**
      * Returns the value of the first element in the array where predicate is true, and undefined
@@ -673,9 +683,10 @@ class ArraySchema {
     [Symbol.iterator]() {
         return Array.from(this.$items.values())[Symbol.iterator]();
     }
-    [Symbol.unscopables]() {
-        return this.$items[Symbol.unscopables]();
-    }
+    // WORKAROUND for compatibility
+    // - TypeScript 4 defines @@unscopables as a function
+    // - TypeScript 5 defines @@unscopables as an object
+    [Symbol.unscopables];
     /**
      * Returns an iterable of key, value pairs for every entry in the array
      */
@@ -800,13 +811,28 @@ function getMapProxy(value) {
     return value;
 }
 class MapSchema {
+    $changes = new ChangeTree(this);
+    $items = new Map();
+    $indexes = new Map();
+    $refId = 0;
+    //
+    // Decoding callbacks
+    //
+    $callbacks;
+    onAdd(callback, triggerAll = true) {
+        return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.ADD, callback, (triggerAll)
+            ? this.$items
+            : undefined);
+    }
+    onRemove(callback) { return addCallback(this.$callbacks || (this.$callbacks = []), OPERATION.DELETE, callback); }
+    onChange(callback) { return addCallback(this.$callbacks || (this.$callbacks = []), OPERATION.REPLACE, callback); }
+    static is(type) {
+        return type['map'] !== undefined;
+    }
     constructor(initialValues) {
-        this.$changes = new ChangeTree(this);
-        this.$items = new Map();
-        this.$indexes = new Map();
-        this.$refId = 0;
         if (initialValues) {
-            if (initialValues instanceof Map) {
+            if (initialValues instanceof Map ||
+                initialValues instanceof MapSchema) {
                 initialValues.forEach((v, k) => this.set(k, v));
             }
             else {
@@ -816,16 +842,6 @@ class MapSchema {
             }
         }
     }
-    onAdd(callback, triggerAll = true) {
-        return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.ADD, callback, (triggerAll)
-            ? this.$items
-            : undefined);
-    }
-    onRemove(callback) { return addCallback(this.$callbacks || (this.$callbacks = []), OPERATION.DELETE, callback); }
-    onChange(callback) { return addCallback(this.$callbacks || (this.$callbacks = []), OPERATION.REPLACE, callback); }
-    static is(type) {
-        return type['map'] !== undefined;
-    }
     /** Iterator */
     [Symbol.iterator]() { return this.$items[Symbol.iterator](); }
     get [Symbol.toStringTag]() { return this.$items[Symbol.toStringTag]; }
@@ -971,15 +987,17 @@ function getType(identifier) {
 }
 
 class SchemaDefinition {
-    constructor() {
-        //
-        // TODO: use a "field" structure combining all these properties per-field.
-        //
-        this.indexes = {};
-        this.fieldsByIndex = {};
-        this.deprecated = {};
-        this.descriptors = {};
-    }
+    schema;
+    //
+    // TODO: use a "field" structure combining all these properties per-field.
+    //
+    indexes = {};
+    fieldsByIndex = {};
+    filters;
+    indexesWithFilters;
+    childFilters; // childFilters are used on Map, Array, Set items.
+    deprecated = {};
+    descriptors = {};
     static create(parent) {
         const definition = new SchemaDefinition();
         // support inheritance
@@ -1035,11 +1053,9 @@ function hasFilter(klass) {
     return klass._context && klass._context.useFilters;
 }
 class Context {
-    constructor() {
-        this.types = {};
-        this.schemas = new Map();
-        this.useFilters = false;
-    }
+    types = {};
+    schemas = new Map();
+    useFilters = false;
     has(schema) {
         return this.schemas.has(schema);
     }
@@ -1183,7 +1199,7 @@ function type(type, options = {}) {
                         value['$changes'].setParent(this, this.$changes.root, this._definition.indexes[field]);
                     }
                 }
-                else {
+                else if (this[fieldCached]) {
                     //
                     // Setting a field to `null` or `undefined` will delete it.
                     //
@@ -1769,15 +1785,14 @@ var decode = /*#__PURE__*/Object.freeze({
 });
 
 class CollectionSchema {
-    constructor(initialValues) {
-        this.$changes = new ChangeTree(this);
-        this.$items = new Map();
-        this.$indexes = new Map();
-        this.$refId = 0;
-        if (initialValues) {
-            initialValues.forEach((v) => this.add(v));
-        }
-    }
+    $changes = new ChangeTree(this);
+    $items = new Map();
+    $indexes = new Map();
+    $refId = 0;
+    //
+    // Decoding callbacks
+    //
+    $callbacks;
     onAdd(callback, triggerAll = true) {
         return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.ADD, callback, (triggerAll)
             ? this.$items
@@ -1788,6 +1803,11 @@ class CollectionSchema {
     static is(type) {
         return type['collection'] !== undefined;
     }
+    constructor(initialValues) {
+        if (initialValues) {
+            initialValues.forEach((v) => this.add(v));
+        }
+    }
     add(value) {
         // set "index" for reference.
         const index = this.$refId++;
@@ -1912,15 +1932,14 @@ class CollectionSchema {
 }
 
 class SetSchema {
-    constructor(initialValues) {
-        this.$changes = new ChangeTree(this);
-        this.$items = new Map();
-        this.$indexes = new Map();
-        this.$refId = 0;
-        if (initialValues) {
-            initialValues.forEach((v) => this.add(v));
-        }
-    }
+    $changes = new ChangeTree(this);
+    $items = new Map();
+    $indexes = new Map();
+    $refId = 0;
+    //
+    // Decoding callbacks
+    //
+    $callbacks;
     onAdd(callback, triggerAll = true) {
         return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.ADD, callback, (triggerAll)
             ? this.$items
@@ -1931,6 +1950,11 @@ class SetSchema {
     static is(type) {
         return type['set'] !== undefined;
     }
+    constructor(initialValues) {
+        if (initialValues) {
+            initialValues.forEach((v) => this.add(v));
+        }
+    }
     add(value) {
         // immediatelly return false if value already added.
         if (this.has(value)) {
@@ -2067,10 +2091,8 @@ class SetSchema {
 }
 
 class ClientState {
-    constructor() {
-        this.refIds = new WeakSet();
-        this.containerIndexes = new WeakMap();
-    }
+    refIds = new WeakSet();
+    containerIndexes = new WeakMap();
     // containerIndexes = new Map<ChangeTree, Set<number>>();
     addRefId(changeTree) {
         if (!this.refIds.has(changeTree)) {
@@ -2087,16 +2109,14 @@ class ClientState {
 }
 
 class ReferenceTracker {
-    constructor() {
-        //
-        // Relation of refId => Schema structure
-        // For direct access of structures during decoding time.
-        //
-        this.refs = new Map();
-        this.refCounts = {};
-        this.deletedRefs = new Set();
-        this.nextUniqueId = 0;
-    }
+    //
+    // Relation of refId => Schema structure
+    // For direct access of structures during decoding time.
+    //
+    refs = new Map();
+    refCounts = {};
+    deletedRefs = new Set();
+    nextUniqueId = 0;
     getNextUniqueId() {
         return this.nextUniqueId++;
     }
@@ -2212,6 +2232,26 @@ function decodePrimitiveType(type, bytes, it) {
  * Schema encoder / decoder
  */
 class Schema {
+    static _typeid;
+    static _context;
+    static _definition = SchemaDefinition.create();
+    static onError(e) {
+        console.error(e);
+    }
+    static is(type) {
+        return (type['_definition'] &&
+            type['_definition'].schema !== undefined);
+    }
+    $changes;
+    // TODO: refactor. this feature needs to be ported to other languages with potentially different API
+    // protected $listeners: { [field: string]: Array<(value: any, previousValue: any) => void> };
+    $callbacks;
+    onChange(callback) {
+        return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.REPLACE, callback);
+    }
+    onRemove(callback) {
+        return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.DELETE, callback);
+    }
     // allow inherited classes to have a constructor
     constructor(...args) {
         // fix enumerability of fields for end-user
@@ -2243,19 +2283,6 @@ class Schema {
             this.assign(args[0]);
         }
     }
-    static onError(e) {
-        console.error(e);
-    }
-    static is(type) {
-        return (type['_definition'] &&
-            type['_definition'].schema !== undefined);
-    }
-    onChange(callback) {
-        return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.REPLACE, callback);
-    }
-    onRemove(callback) {
-        return addCallback((this.$callbacks || (this.$callbacks = [])), OPERATION.DELETE, callback);
-    }
     assign(props) {
         Object.assign(this, props);
         return this;
@@ -2446,6 +2473,7 @@ class Schema {
                     const key = dynamicIndex;
                     // ref.set(key, value);
                     ref['$items'].set(key, value);
+                    ref['$changes'].allChanges.add(fieldIndex);
                 }
                 else if (ref instanceof ArraySchema) {
                     // const key = ref['$indexes'][field];
@@ -2797,7 +2825,7 @@ class Schema {
         const schema = this._definition.schema;
         for (let field in schema) {
             if (typeof (this[field]) === "object" &&
-                typeof (this[field].clone) === "function") {
+                typeof (this[field]?.clone) === "function") {
                 // deep clone
                 cloned[field] = this[field].clone();
             }
@@ -2921,7 +2949,6 @@ class Schema {
         }
     }
 }
-Schema._definition = SchemaDefinition.create();
 
 function dumpChanges(schema) {
     const changeTrees = [schema['$changes']];
@@ -2942,7 +2969,7 @@ function dumpChanges(schema) {
     return dump;
 }
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -2969,6 +2996,9 @@ const reflectionContext = { context: new Context() };
  * Reflection
  */
 class ReflectionField extends Schema {
+    name;
+    type;
+    referencedType;
 }
 __decorate([
     type("string", reflectionContext)
@@ -2980,10 +3010,8 @@ __decorate([
     type("number", reflectionContext)
 ], ReflectionField.prototype, "referencedType", void 0);
 class ReflectionType extends Schema {
-    constructor() {
-        super(...arguments);
-        this.fields = new ArraySchema();
-    }
+    id;
+    fields = new ArraySchema();
 }
 __decorate([
     type("number", reflectionContext)
@@ -2992,10 +3020,8 @@ __decorate([
     type([ReflectionField], reflectionContext)
 ], ReflectionType.prototype, "fields", void 0);
 class Reflection extends Schema {
-    constructor() {
-        super(...arguments);
-        this.types = new ArraySchema();
-    }
+    types = new ArraySchema();
+    rootType;
     static encode(instance) {
         const rootSchemaType = instance.constructor;
         const reflection = new Reflection();