@colyseus/schema 3.0.0-alpha.4 → 3.0.0-alpha.40

package/build/umd/index.js

@@ -29,6 +29,7 @@
         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");
@@ -48,11 +49,6 @@
      * (MapSchema, ArraySchema, etc.)
      */
     const $childType = Symbol('$childType');
-    /**
-     * Special ChangeTree property to identify new instances
-     * (Once they're encoded, they're not new anymore)
-     */
-    const $isNew = Symbol("$isNew");
     /**
      * Optional "discard" method for custom types (ArraySchema)
      * (Discards changes for next serialization)
@@ -62,6 +58,14 @@
      * When decoding, this method is called after the instance is fully decoded
      */
     const $onDecodeEnd = Symbol("$onDecodeEnd");
+    /**
+     * Metadata
+     */
+    const $descriptors = Symbol("$descriptors");
+    const $numFields = "$__numFields";
+    const $refTypeFieldIndexes = "$__refTypeFieldIndexes";
+    const $viewFieldIndexes = "$__viewFieldIndexes";
+    const $fieldIndexesByViewTag = "$__fieldIndexesByViewTag";
 
     const registeredTypes = {};
     const identifiers = new Map();
@@ -73,177 +77,416 @@
         return registeredTypes[identifier];
     }
 
+    class TypeContext {
+        /**
+         * For inheritance support
+         * Keeps track of which classes extends which. (parent -> children)
+         */
+        static { this.inheritedTypes = new Map(); }
+        static register(target) {
+            const parent = Object.getPrototypeOf(target);
+            if (parent !== Schema) {
+                let inherits = TypeContext.inheritedTypes.get(parent);
+                if (!inherits) {
+                    inherits = new Set();
+                    TypeContext.inheritedTypes.set(parent, inherits);
+                }
+                inherits.add(target);
+            }
+        }
+        constructor(rootClass) {
+            this.types = {};
+            this.schemas = new Map();
+            this.hasFilters = false;
+            this.parentFiltered = {};
+            if (rootClass) {
+                this.discoverTypes(rootClass);
+            }
+        }
+        has(schema) {
+            return this.schemas.has(schema);
+        }
+        get(typeid) {
+            return this.types[typeid];
+        }
+        add(schema, typeid = this.schemas.size) {
+            // skip if already registered
+            if (this.schemas.has(schema)) {
+                return false;
+            }
+            this.types[typeid] = schema;
+            //
+            // Workaround to allow using an empty Schema (with no `@type()` fields)
+            //
+            if (schema[Symbol.metadata] === undefined) {
+                Metadata.initialize(schema);
+            }
+            this.schemas.set(schema, typeid);
+            return true;
+        }
+        getTypeId(klass) {
+            return this.schemas.get(klass);
+        }
+        discoverTypes(klass, parentIndex, parentFieldViewTag) {
+            if (!this.add(klass)) {
+                return;
+            }
+            // add classes inherited from this base class
+            TypeContext.inheritedTypes.get(klass)?.forEach((child) => {
+                this.discoverTypes(child, parentIndex, parentFieldViewTag);
+            });
+            // add parent classes
+            let parent = klass;
+            while ((parent = Object.getPrototypeOf(parent)) &&
+                parent !== Schema && // stop at root (Schema)
+                parent !== Function.prototype // stop at root (non-Schema)
+            ) {
+                this.discoverTypes(parent);
+            }
+            const metadata = (klass[Symbol.metadata] ??= {});
+            // if any schema/field has filters, mark "context" as having filters.
+            if (metadata[$viewFieldIndexes]) {
+                this.hasFilters = true;
+            }
+            if (parentFieldViewTag !== undefined) {
+                this.parentFiltered[`${this.schemas.get(klass)}-${parentIndex}`] = true;
+            }
+            for (const fieldIndex in metadata) {
+                const index = fieldIndex;
+                const fieldType = metadata[index].type;
+                const viewTag = metadata[index].tag;
+                if (typeof (fieldType) === "string") {
+                    continue;
+                }
+                if (Array.isArray(fieldType)) {
+                    const type = fieldType[0];
+                    // skip primitive types
+                    if (type === "string") {
+                        continue;
+                    }
+                    this.discoverTypes(type, index, viewTag);
+                }
+                else if (typeof (fieldType) === "function") {
+                    this.discoverTypes(fieldType, viewTag);
+                }
+                else {
+                    const type = Object.values(fieldType)[0];
+                    // skip primitive types
+                    if (typeof (type) === "string") {
+                        continue;
+                    }
+                    this.discoverTypes(type, index, viewTag);
+                }
+            }
+        }
+    }
+
+    function getNormalizedType(type) {
+        return (Array.isArray(type))
+            ? { array: type[0] }
+            : (typeof (type['type']) !== "undefined")
+                ? type['type']
+                : type;
+    }
     const Metadata = {
-        addField(metadata, index, field, type, descriptor) {
+        addField(metadata, index, name, type, descriptor) {
             if (index > 64) {
-                throw new Error(`Can't define field '${field}'.\nSchema instances may only have up to 64 fields.`);
+                throw new Error(`Can't define field '${name}'.\nSchema instances may only have up to 64 fields.`);
             }
-            metadata[field] = Object.assign(metadata[field] || {}, // avoid overwriting previous field metadata (@owned / @deprecated)
+            metadata[index] = Object.assign(metadata[index] || {}, // avoid overwriting previous field metadata (@owned / @deprecated)
             {
-                type: (Array.isArray(type))
-                    ? { array: type[0] }
-                    : type,
+                type: getNormalizedType(type),
                 index,
-                descriptor,
+                name,
             });
+            // create "descriptors" map
+            Object.defineProperty(metadata, $descriptors, {
+                value: metadata[$descriptors] || {},
+                enumerable: false,
+                configurable: true,
+            });
+            if (descriptor) {
+                // for encoder
+                metadata[$descriptors][name] = descriptor;
+                metadata[$descriptors][`_${name}`] = {
+                    value: undefined,
+                    writable: true,
+                    enumerable: false,
+                    configurable: true,
+                };
+            }
+            else {
+                // for decoder
+                metadata[$descriptors][name] = {
+                    value: undefined,
+                    writable: true,
+                    enumerable: true,
+                    configurable: true,
+                };
+            }
             // map -1 as last field index
-            Object.defineProperty(metadata, -1, {
+            Object.defineProperty(metadata, $numFields, {
                 value: index,
                 enumerable: false,
                 configurable: true
             });
-            // map index => field name (non enumerable)
-            Object.defineProperty(metadata, index, {
-                value: field,
+            // map field name => index (non enumerable)
+            Object.defineProperty(metadata, name, {
+                value: index,
                 enumerable: false,
                 configurable: true,
             });
+            // if child Ref/complex type, add to -4
+            if (typeof (metadata[index].type) !== "string") {
+                if (metadata[$refTypeFieldIndexes] === undefined) {
+                    Object.defineProperty(metadata, $refTypeFieldIndexes, {
+                        value: [],
+                        enumerable: false,
+                        configurable: true,
+                    });
+                }
+                metadata[$refTypeFieldIndexes].push(index);
+            }
         },
         setTag(metadata, fieldName, tag) {
+            const index = metadata[fieldName];
+            const field = metadata[index];
             // add 'tag' to the field
-            const field = metadata[fieldName];
             field.tag = tag;
-            if (!metadata[-2]) {
+            if (!metadata[$viewFieldIndexes]) {
                 // -2: all field indexes with "view" tag
-                Object.defineProperty(metadata, -2, {
+                Object.defineProperty(metadata, $viewFieldIndexes, {
                     value: [],
                     enumerable: false,
                     configurable: true
                 });
                 // -3: field indexes by "view" tag
-                Object.defineProperty(metadata, -3, {
+                Object.defineProperty(metadata, $fieldIndexesByViewTag, {
                     value: {},
                     enumerable: false,
                     configurable: true
                 });
             }
-            metadata[-2].push(field.index);
-            if (!metadata[-3][tag]) {
-                metadata[-3][tag] = [];
+            metadata[$viewFieldIndexes].push(index);
+            if (!metadata[$fieldIndexesByViewTag][tag]) {
+                metadata[$fieldIndexesByViewTag][tag] = [];
             }
-            metadata[-3][tag].push(field.index);
+            metadata[$fieldIndexesByViewTag][tag].push(index);
         },
         setFields(target, fields) {
-            const metadata = (target.prototype.constructor[Symbol.metadata] ??= {});
-            // target[$track] = function (changeTree, index: number, operation: OPERATION = OPERATION.ADD) {
-            //     changeTree.change(index, operation, encodeSchemaOperation);
-            // };
-            // target[$encoder] = encodeSchemaOperation;
-            // target[$decoder] = decodeSchemaOperation;
-            // if (!target.prototype.toJSON) { target.prototype.toJSON = Schema.prototype.toJSON; }
-            let index = 0;
+            // for inheritance support
+            const constructor = target.prototype.constructor;
+            TypeContext.register(constructor);
+            const parentClass = Object.getPrototypeOf(constructor);
+            const parentMetadata = parentClass && parentClass[Symbol.metadata];
+            const metadata = Metadata.initialize(constructor);
+            // Use Schema's methods if not defined in the class
+            if (!constructor[$track]) {
+                constructor[$track] = Schema[$track];
+            }
+            if (!constructor[$encoder]) {
+                constructor[$encoder] = Schema[$encoder];
+            }
+            if (!constructor[$decoder]) {
+                constructor[$decoder] = Schema[$decoder];
+            }
+            if (!constructor.prototype.toJSON) {
+                constructor.prototype.toJSON = Schema.prototype.toJSON;
+            }
+            //
+            // detect index for this field, considering inheritance
+            //
+            let fieldIndex = metadata[$numFields] // current structure already has fields defined
+                ?? (parentMetadata && parentMetadata[$numFields]) // parent structure has fields defined
+                ?? -1; // no fields defined
+            fieldIndex++;
             for (const field in fields) {
                 const type = fields[field];
+                const normalizedType = getNormalizedType(type);
                 // FIXME: this code is duplicated from @type() annotation
                 const complexTypeKlass = (Array.isArray(type))
                     ? getType("array")
                     : (typeof (Object.keys(type)[0]) === "string") && getType(Object.keys(type)[0]);
-                Metadata.addField(metadata, index, field, type, getPropertyDescriptor(`_${field}`, index, type, complexTypeKlass, metadata, field));
-                index++;
+                const childType = (complexTypeKlass)
+                    ? Object.values(type)[0]
+                    : normalizedType;
+                Metadata.addField(metadata, fieldIndex, field, type, getPropertyDescriptor(`_${field}`, fieldIndex, childType, complexTypeKlass));
+                fieldIndex++;
             }
+            return target;
         },
         isDeprecated(metadata, field) {
             return metadata[field].deprecated === true;
         },
+        init(klass) {
+            //
+            // Used only to initialize an empty Schema (Encoder#constructor)
+            // TODO: remove/refactor this...
+            //
+            const metadata = {};
+            klass[Symbol.metadata] = metadata;
+            Object.defineProperty(metadata, $numFields, {
+                value: 0,
+                enumerable: false,
+                configurable: true,
+            });
+        },
+        initialize(constructor) {
+            const parentClass = Object.getPrototypeOf(constructor);
+            const parentMetadata = parentClass[Symbol.metadata];
+            let metadata = constructor[Symbol.metadata] ?? Object.create(null);
+            // make sure inherited classes have their own metadata object.
+            if (parentClass !== Schema && metadata === parentMetadata) {
+                metadata = Object.create(null);
+                if (parentMetadata) {
+                    //
+                    // assign parent metadata to current
+                    //
+                    Object.setPrototypeOf(metadata, parentMetadata);
+                    // $numFields
+                    Object.defineProperty(metadata, $numFields, {
+                        value: parentMetadata[$numFields],
+                        enumerable: false,
+                        configurable: true,
+                        writable: true,
+                    });
+                    // $viewFieldIndexes / $fieldIndexesByViewTag
+                    if (parentMetadata[$viewFieldIndexes] !== undefined) {
+                        Object.defineProperty(metadata, $viewFieldIndexes, {
+                            value: [...parentMetadata[$viewFieldIndexes]],
+                            enumerable: false,
+                            configurable: true,
+                            writable: true,
+                        });
+                        Object.defineProperty(metadata, $fieldIndexesByViewTag, {
+                            value: { ...parentMetadata[$fieldIndexesByViewTag] },
+                            enumerable: false,
+                            configurable: true,
+                            writable: true,
+                        });
+                    }
+                    // $refTypeFieldIndexes
+                    if (parentMetadata[$refTypeFieldIndexes] !== undefined) {
+                        Object.defineProperty(metadata, $refTypeFieldIndexes, {
+                            value: [...parentMetadata[$refTypeFieldIndexes]],
+                            enumerable: false,
+                            configurable: true,
+                            writable: true,
+                        });
+                    }
+                    // $descriptors
+                    Object.defineProperty(metadata, $descriptors, {
+                        value: { ...parentMetadata[$descriptors] },
+                        enumerable: false,
+                        configurable: true,
+                        writable: true,
+                    });
+                }
+            }
+            constructor[Symbol.metadata] = metadata;
+            return metadata;
+        },
         isValidInstance(klass) {
             return (klass.constructor[Symbol.metadata] &&
-                Object.prototype.hasOwnProperty.call(klass.constructor[Symbol.metadata], -1));
+                Object.prototype.hasOwnProperty.call(klass.constructor[Symbol.metadata], $numFields));
         },
         getFields(klass) {
             const metadata = klass[Symbol.metadata];
             const fields = {};
-            for (let i = 0; i <= metadata[-1]; i++) {
-                fields[metadata[i]] = metadata[metadata[i]].type;
+            for (let i = 0; i <= metadata[$numFields]; i++) {
+                fields[metadata[i].name] = metadata[i].type;
             }
             return fields;
         }
     };
 
-    var _a$5;
-    class Root {
-        constructor() {
-            this.nextUniqueId = 0;
-            this.refCount = new WeakMap();
-            // all changes
-            this.allChanges = new Map();
-            this.allFilteredChanges = new Map();
-            // pending changes to be encoded
-            this.changes = new Map();
-            this.filteredChanges = new Map();
-        }
-        getNextUniqueId() {
-            return this.nextUniqueId++;
+    function setOperationAtIndex(changeSet, index) {
+        const operationsIndex = changeSet.indexes[index];
+        if (operationsIndex === undefined) {
+            changeSet.indexes[index] = changeSet.operations.push(index) - 1;
         }
-        add(changeTree) {
-            const refCount = this.refCount.get(changeTree) || 0;
-            this.refCount.set(changeTree, refCount + 1);
+        else {
+            changeSet.operations[operationsIndex] = index;
         }
-        remove(changeTree) {
-            const refCount = this.refCount.get(changeTree);
-            if (refCount <= 1) {
-                this.allChanges.delete(changeTree);
-                this.changes.delete(changeTree);
-                if (changeTree.isFiltered || changeTree.isPartiallyFiltered) {
-                    this.allFilteredChanges.delete(changeTree);
-                    this.filteredChanges.delete(changeTree);
-                }
-                this.refCount.delete(changeTree);
-            }
-            else {
-                this.refCount.set(changeTree, refCount - 1);
-            }
-            changeTree.forEachChild((child, _) => this.remove(child));
+    }
+    function deleteOperationAtIndex(changeSet, index) {
+        const operationsIndex = changeSet.indexes[index];
+        if (operationsIndex !== undefined) {
+            changeSet.operations[operationsIndex] = undefined;
         }
-        clear() {
-            this.changes.clear();
+        delete changeSet.indexes[index];
+    }
+    function enqueueChangeTree(root, changeTree, changeSet, queueRootIndex = changeTree[changeSet].queueRootIndex) {
+        if (root && root[changeSet][queueRootIndex] !== changeTree) {
+            changeTree[changeSet].queueRootIndex = root[changeSet].push(changeTree) - 1;
         }
     }
     class ChangeTree {
-        static { _a$5 = $isNew; }
-        ;
         constructor(ref) {
-            this.indexes = {}; // TODO: remove this, only used by MapSchema/SetSchema/CollectionSchema (`encodeKeyValueOperation`)
-            this.currentOperationIndex = 0;
-            this.allChanges = new Map();
-            this.allFilteredChanges = new Map();
-            this.changes = new Map();
-            this.filteredChanges = new Map();
-            this[_a$5] = true;
+            this.isFiltered = false;
+            this.isPartiallyFiltered = false;
+            this.indexedOperations = {};
+            //
+            // TODO:
+            //   try storing the index + operation per item.
+            //   example: 1024 & 1025 => ADD, 1026 => DELETE
+            //
+            // => https://chatgpt.com/share/67107d0c-bc20-8004-8583-83b17dd7c196
+            //
+            this.changes = { indexes: {}, operations: [] };
+            this.allChanges = { indexes: {}, operations: [] };
+            /**
+             * Is this a new instance? Used on ArraySchema to determine OPERATION.MOVE_AND_ADD operation.
+             */
+            this.isNew = true;
             this.ref = ref;
+            //
+            // Does this structure have "filters" declared?
+            //
+            if (ref.constructor[Symbol.metadata]?.[$viewFieldIndexes]) {
+                this.allFilteredChanges = { indexes: {}, operations: [] };
+                this.filteredChanges = { indexes: {}, operations: [] };
+            }
         }
         setRoot(root) {
             this.root = root;
-            this.root.add(this);
-            //
-            // At Schema initialization, the "root" structure might not be available
-            // yet, as it only does once the "Encoder" has been set up.
-            //
-            // So the "parent" may be already set without a "root".
-            //
-            this.checkIsFiltered(this.parent, this.parentIndex);
-            // unique refId for the ChangeTree.
-            this.ensureRefId();
+            const isNewChangeTree = this.root.add(this);
+            const metadata = this.ref.constructor[Symbol.metadata];
+            if (this.root.types.hasFilters) {
+                //
+                // At Schema initialization, the "root" structure might not be available
+                // yet, as it only does once the "Encoder" has been set up.
+                //
+                // So the "parent" may be already set without a "root".
+                //
+                this.checkIsFiltered(metadata, this.parent, this.parentIndex);
+                if (this.isFiltered || this.isPartiallyFiltered) {
+                    enqueueChangeTree(root, this, 'filteredChanges');
+                    if (isNewChangeTree) {
+                        this.root.allFilteredChanges.push(this);
+                    }
+                }
+            }
             if (!this.isFiltered) {
-                this.root.changes.set(this, this.changes);
+                enqueueChangeTree(root, this, 'changes');
+                if (isNewChangeTree) {
+                    this.root.allChanges.push(this);
+                }
             }
-            if (this.isFiltered || this.isPartiallyFiltered) {
-                this.root.allFilteredChanges.set(this, this.allFilteredChanges);
-                this.root.filteredChanges.set(this, this.filteredChanges);
-                // } else {
-                //     this.root.allChanges.set(this, this.allChanges);
+            // Recursively set root on child structures
+            if (metadata) {
+                metadata[$refTypeFieldIndexes]?.forEach((index) => {
+                    const field = metadata[index];
+                    const value = this.ref[field.name];
+                    value?.[$changes].setRoot(root);
+                });
             }
-            if (!this.isFiltered) {
-                this.root.allChanges.set(this, this.allChanges);
+            else if (this.ref[$childType] && typeof (this.ref[$childType]) !== "string") {
+                // MapSchema / ArraySchema, etc.
+                this.ref.forEach((value, key) => {
+                    value[$changes].setRoot(root);
+                });
             }
-            this.forEachChild((changeTree, _) => {
-                changeTree.setRoot(root);
-            });
-            // this.allChanges.forEach((_, index) => {
-            //     const childRef = this.ref[$getByIndex](index);
-            //     if (childRef && childRef[$changes]) {
-            //         childRef[$changes].setRoot(root);
-            //     }
-            // });
         }
         setParent(parent, root, parentIndex) {
             this.parent = parent;
@@ -252,83 +495,104 @@
             if (!root) {
                 return;
             }
-            root.add(this);
+            const metadata = this.ref.constructor[Symbol.metadata];
             // skip if parent is already set
-            if (root === this.root) {
-                this.forEachChild((changeTree, atIndex) => {
-                    changeTree.setParent(this.ref, root, atIndex);
-                });
-                return;
+            if (root !== this.root) {
+                this.root = root;
+                const isNewChangeTree = root.add(this);
+                if (root.types.hasFilters) {
+                    this.checkIsFiltered(metadata, parent, parentIndex);
+                    if (this.isFiltered || this.isPartiallyFiltered) {
+                        enqueueChangeTree(root, this, 'filteredChanges');
+                        if (isNewChangeTree) {
+                            this.root.allFilteredChanges.push(this);
+                        }
+                    }
+                }
+                if (!this.isFiltered) {
+                    enqueueChangeTree(root, this, 'changes');
+                    if (isNewChangeTree) {
+                        this.root.allChanges.push(this);
+                    }
+                }
             }
-            this.root = root;
-            this.checkIsFiltered(parent, parentIndex);
-            if (!this.isFiltered) {
-                this.root.changes.set(this, this.changes);
+            else {
+                root.add(this);
             }
-            if (this.isFiltered || this.isPartiallyFiltered) {
-                this.root.filteredChanges.set(this, this.filteredChanges);
-                this.root.allFilteredChanges.set(this, this.filteredChanges);
+            // assign same parent on child structures
+            if (metadata) {
+                metadata[$refTypeFieldIndexes]?.forEach((index) => {
+                    const field = metadata[index];
+                    const value = this.ref[field.name];
+                    value?.[$changes].setParent(this.ref, root, index);
+                    // try { throw new Error(); } catch (e) {
+                    //     console.log(e.stack);
+                    // }
+                });
             }
-            else {
-                this.root.allChanges.set(this, this.allChanges);
+            else if (this.ref[$childType] && typeof (this.ref[$childType]) !== "string") {
+                // MapSchema / ArraySchema, etc.
+                this.ref.forEach((value, key) => {
+                    value[$changes].setParent(this.ref, root, this.indexes[key] ?? key);
+                });
             }
-            this.ensureRefId();
-            this.forEachChild((changeTree, atIndex) => {
-                changeTree.setParent(this.ref, root, atIndex);
-            });
         }
         forEachChild(callback) {
             //
             // assign same parent on child structures
             //
-            if (Metadata.isValidInstance(this.ref)) {
-                const metadata = this.ref['constructor'][Symbol.metadata];
-                // FIXME: need to iterate over parent metadata instead.
-                for (const field in metadata) {
-                    const value = this.ref[field];
-                    if (value && value[$changes]) {
-                        callback(value[$changes], metadata[field].index);
+            const metadata = this.ref.constructor[Symbol.metadata];
+            if (metadata) {
+                metadata[$refTypeFieldIndexes]?.forEach((index) => {
+                    const field = metadata[index];
+                    const value = this.ref[field.name];
+                    if (value) {
+                        callback(value[$changes], index);
                     }
-                }
+                });
             }
-            else if (typeof (this.ref) === "object") {
+            else if (this.ref[$childType] && typeof (this.ref[$childType]) !== "string") {
                 // MapSchema / ArraySchema, etc.
                 this.ref.forEach((value, key) => {
-                    if (Metadata.isValidInstance(value)) {
-                        callback(value[$changes], this.ref[$changes].indexes[key]);
-                    }
+                    callback(value[$changes], this.indexes[key] ?? key);
                 });
             }
         }
         operation(op) {
-            this.changes.set(--this.currentOperationIndex, op);
-            this.root?.changes.set(this, this.changes);
+            // operations without index use negative values to represent them
+            // this is checked during .encode() time.
+            this.changes.operations.push(-op);
+            enqueueChangeTree(this.root, this, 'changes');
         }
         change(index, operation = exports.OPERATION.ADD) {
-            const metadata = this.ref['constructor'][Symbol.metadata];
-            const isFiltered = this.isFiltered || (metadata && metadata[metadata[index]].tag !== undefined);
+            const metadata = this.ref.constructor[Symbol.metadata];
+            const isFiltered = this.isFiltered || (metadata?.[index]?.tag !== undefined);
             const changeSet = (isFiltered)
                 ? this.filteredChanges
                 : this.changes;
-            const previousOperation = changeSet.get(index);
+            const previousOperation = this.indexedOperations[index];
             if (!previousOperation || previousOperation === exports.OPERATION.DELETE) {
                 const op = (!previousOperation)
                     ? operation
                     : (previousOperation === exports.OPERATION.DELETE)
                         ? exports.OPERATION.DELETE_AND_ADD
                         : operation;
-                changeSet.set(index, op);
+                //
+                // TODO: are DELETE operations being encoded as ADD here ??
+                //
+                this.indexedOperations[index] = op;
             }
-            //
-            // TODO: are DELETE operations being encoded as ADD here ??
-            //
+            setOperationAtIndex(changeSet, index);
             if (isFiltered) {
-                this.allFilteredChanges.set(index, exports.OPERATION.ADD);
-                this.root?.filteredChanges.set(this, this.filteredChanges);
+                setOperationAtIndex(this.allFilteredChanges, index);
+                if (this.root) {
+                    enqueueChangeTree(this.root, this, 'filteredChanges');
+                    enqueueChangeTree(this.root, this, 'allFilteredChanges');
+                }
             }
             else {
-                this.allChanges.set(index, exports.OPERATION.ADD);
-                this.root?.changes.set(this, this.changes);
+                setOperationAtIndex(this.allChanges, index);
+                enqueueChangeTree(this.root, this, 'changes');
             }
         }
         shiftChangeIndexes(shiftIndex) {
@@ -340,12 +604,15 @@
             const changeSet = (this.isFiltered)
                 ? this.filteredChanges
                 : this.changes;
-            const changeSetEntries = Array.from(changeSet.entries());
-            changeSet.clear();
-            // Re-insert each entry with the shifted index
-            for (const [index, op] of changeSetEntries) {
-                changeSet.set(index + shiftIndex, op);
+            const newIndexedOperations = {};
+            const newIndexes = {};
+            for (const index in this.indexedOperations) {
+                newIndexedOperations[Number(index) + shiftIndex] = this.indexedOperations[index];
+                newIndexes[Number(index) + shiftIndex] = changeSet[index];
             }
+            this.indexedOperations = newIndexedOperations;
+            changeSet.indexes = newIndexes;
+            changeSet.operations = changeSet.operations.map((index) => index + shiftIndex);
         }
         shiftAllChangeIndexes(shiftIndex, startIndex = 0) {
             //
@@ -361,33 +628,42 @@
                 this._shiftAllChangeIndexes(shiftIndex, startIndex, this.allChanges);
             }
         }
-        _shiftAllChangeIndexes(shiftIndex, startIndex = 0, allChangeSet) {
-            Array.from(allChangeSet.entries()).forEach(([index, op]) => {
-                // console.log('shiftAllChangeIndexes', index >= startIndex, { index, op, shiftIndex, startIndex })
-                if (index >= startIndex) {
-                    allChangeSet.delete(index);
-                    allChangeSet.set(index + shiftIndex, op);
+        _shiftAllChangeIndexes(shiftIndex, startIndex = 0, changeSet) {
+            const newIndexes = {};
+            for (const key in changeSet.indexes) {
+                const index = changeSet.indexes[key];
+                if (index > startIndex) {
+                    newIndexes[Number(key) + shiftIndex] = index;
                 }
-            });
+                else {
+                    newIndexes[key] = index;
+                }
+            }
+            changeSet.indexes = newIndexes;
+            for (let i = 0; i < changeSet.operations.length; i++) {
+                const index = changeSet.operations[i];
+                if (index > startIndex) {
+                    changeSet.operations[i] = index + shiftIndex;
+                }
+            }
         }
         indexedOperation(index, operation, allChangesIndex = index) {
-            const metadata = this.ref['constructor'][Symbol.metadata];
-            const isFiltered = this.isFiltered || (metadata && metadata[metadata[index]].tag !== undefined);
-            if (isFiltered) {
-                this.allFilteredChanges.set(allChangesIndex, exports.OPERATION.ADD);
-                this.filteredChanges.set(index, operation);
-                this.root?.filteredChanges.set(this, this.filteredChanges);
+            this.indexedOperations[index] = operation;
+            if (this.filteredChanges) {
+                setOperationAtIndex(this.allFilteredChanges, allChangesIndex);
+                setOperationAtIndex(this.filteredChanges, index);
+                enqueueChangeTree(this.root, this, 'filteredChanges');
             }
             else {
-                this.allChanges.set(allChangesIndex, exports.OPERATION.ADD);
-                this.changes.set(index, operation);
-                this.root?.changes.set(this, this.changes);
+                setOperationAtIndex(this.allChanges, allChangesIndex);
+                setOperationAtIndex(this.changes, index);
+                enqueueChangeTree(this.root, this, 'changes');
             }
         }
         getType(index) {
             if (Metadata.isValidInstance(this.ref)) {
-                const metadata = this.ref['constructor'][Symbol.metadata];
-                return metadata[metadata[index]].type;
+                const metadata = this.ref.constructor[Symbol.metadata];
+                return metadata[index].type;
             }
             else {
                 //
@@ -400,8 +676,7 @@
             }
         }
         getChange(index) {
-            // TODO: optimize this. avoid checking against multiple instances
-            return this.changes.get(index) ?? this.filteredChanges.get(index);
+            return this.indexedOperations[index];
         }
         //
         // used during `.encode()`
@@ -422,16 +697,14 @@
                 }
                 return;
             }
-            const metadata = this.ref['constructor'][Symbol.metadata];
-            const isFiltered = this.isFiltered || (metadata && metadata[metadata[index]].tag !== undefined);
-            const changeSet = (isFiltered)
+            const changeSet = (this.filteredChanges)
                 ? this.filteredChanges
                 : this.changes;
+            this.indexedOperations[index] = operation ?? exports.OPERATION.DELETE;
+            setOperationAtIndex(changeSet, index);
             const previousValue = this.getValue(index);
-            changeSet.set(index, operation ?? exports.OPERATION.DELETE);
             // remove `root` reference
             if (previousValue && previousValue[$changes]) {
-                previousValue[$changes].root = undefined;
                 //
                 // FIXME: this.root is "undefined"
                 //
@@ -445,22 +718,26 @@
                 this.root?.remove(previousValue[$changes]);
             }
             //
-            // FIXME: this is looking a bit ugly (and repeated from `.change()`)
+            // FIXME: this is looking a ugly and repeated
             //
-            if (isFiltered) {
-                this.root?.filteredChanges.set(this, this.filteredChanges);
-                this.allFilteredChanges.delete(allChangesIndex);
+            if (this.filteredChanges) {
+                deleteOperationAtIndex(this.allFilteredChanges, allChangesIndex);
+                enqueueChangeTree(this.root, this, 'filteredChanges');
             }
             else {
-                this.root?.changes.set(this, this.changes);
-                this.allChanges.delete(allChangesIndex);
+                deleteOperationAtIndex(this.allChanges, allChangesIndex);
+                enqueueChangeTree(this.root, this, 'changes');
             }
         }
         endEncode() {
-            this.changes.clear();
+            this.indexedOperations = {};
+            // // clear changes
+            // this.changes.indexes = {};
+            // this.changes.operations.length = 0;
+            // ArraySchema and MapSchema have a custom "encode end" method
             this.ref[$onEncodeEnd]?.();
             // Not a new instance anymore
-            delete this[$isNew];
+            this.isNew = false;
         }
         discard(discardAll = false) {
             //
@@ -469,13 +746,22 @@
             //      REPLACE in case same key is used on next patches.
             //
             this.ref[$onEncodeEnd]?.();
-            this.changes.clear();
-            this.filteredChanges.clear();
-            // reset operation index
-            this.currentOperationIndex = 0;
+            this.indexedOperations = {};
+            this.changes.indexes = {};
+            this.changes.operations.length = 0;
+            this.changes.queueRootIndex = undefined;
+            if (this.filteredChanges !== undefined) {
+                this.filteredChanges.indexes = {};
+                this.filteredChanges.operations.length = 0;
+                this.filteredChanges.queueRootIndex = undefined;
+            }
             if (discardAll) {
-                this.allChanges.clear();
-                this.allFilteredChanges.clear();
+                this.allChanges.indexes = {};
+                this.allChanges.operations.length = 0;
+                if (this.allFilteredChanges !== undefined) {
+                    this.allFilteredChanges.indexes = {};
+                    this.allFilteredChanges.operations.length = 0;
+                }
                 // remove children references
                 this.forEachChild((changeTree, _) => this.root?.remove(changeTree));
             }
@@ -484,12 +770,13 @@
          * Recursively discard all changes from this, and child structures.
          */
         discardAll() {
-            this.changes.forEach((_, fieldIndex) => {
-                const value = this.getValue(fieldIndex);
+            const keys = Object.keys(this.indexedOperations);
+            for (let i = 0, len = keys.length; i < len; i++) {
+                const value = this.getValue(Number(keys[i]));
                 if (value && value[$changes]) {
                     value[$changes].discardAll();
                 }
-            });
+            }
             this.discard();
         }
         ensureRefId() {
@@ -500,35 +787,49 @@
             this.refId = this.root.getNextUniqueId();
         }
         get changed() {
-            return this.changes.size > 0;
+            return (Object.entries(this.indexedOperations).length > 0);
         }
-        checkIsFiltered(parent, parentIndex) {
+        checkIsFiltered(metadata, parent, parentIndex) {
             // Detect if current structure has "filters" declared
-            this.isPartiallyFiltered = this.ref['constructor']?.[Symbol.metadata]?.[-2];
-            // TODO: support "partially filtered", where the instance is visible, but only a field is not.
-            // Detect if parent has "filters" declared
-            while (parent && !this.isFiltered) {
-                const metadata = parent['constructor'][Symbol.metadata];
-                const fieldName = metadata?.[parentIndex];
-                const isParentOwned = metadata?.[fieldName]?.tag !== undefined;
-                this.isFiltered = isParentOwned || parent[$changes].isFiltered; // metadata?.[-2]
-                parent = parent[$changes].parent;
+            this.isPartiallyFiltered = metadata?.[$viewFieldIndexes] !== undefined;
+            if (this.isPartiallyFiltered) {
+                this.filteredChanges = this.filteredChanges || { indexes: {}, operations: [] };
+                this.allFilteredChanges = this.allFilteredChanges || { indexes: {}, operations: [] };
             }
+            // skip if parent is not set
+            if (!parent) {
+                return;
+            }
+            if (!Metadata.isValidInstance(parent)) {
+                const parentChangeTree = parent[$changes];
+                parent = parentChangeTree.parent;
+                parentIndex = parentChangeTree.parentIndex;
+            }
+            const parentMetadata = parent.constructor?.[Symbol.metadata];
+            this.isFiltered = parentMetadata?.[$viewFieldIndexes]?.includes(parentIndex);
             //
             // TODO: refactor this!
             //
             //      swapping `changes` and `filteredChanges` is required here
             //      because "isFiltered" may not be imedialely available on `change()`
             //
-            if (this.isFiltered && this.changes.size > 0) {
-                // swap changes reference
-                const changes = this.changes;
-                this.changes = this.filteredChanges;
-                this.filteredChanges = changes;
-                // swap "all changes" reference
-                const allFilteredChanges = this.allFilteredChanges;
-                this.allFilteredChanges = this.allChanges;
-                this.allChanges = allFilteredChanges;
+            if (this.isFiltered) {
+                this.filteredChanges = { indexes: {}, operations: [] };
+                this.allFilteredChanges = { indexes: {}, operations: [] };
+                if (this.changes.operations.length > 0) {
+                    // swap changes reference
+                    const changes = this.changes;
+                    this.changes = this.filteredChanges;
+                    this.filteredChanges = changes;
+                    // swap "all changes" reference
+                    const allFilteredChanges = this.allFilteredChanges;
+                    this.allFilteredChanges = this.allChanges;
+                    this.allChanges = allFilteredChanges;
+                    // console.log("SWAP =>", {
+                    //     "this.allFilteredChanges": this.allFilteredChanges,
+                    //     "this.allChanges": this.allChanges
+                    // })
+                }
             }
         }
     }
@@ -565,26 +866,29 @@
         textEncoder = new TextEncoder();
     }
     catch (e) { }
-    function utf8Length(str) {
-        var c = 0, length = 0;
-        for (var i = 0, l = str.length; i < l; i++) {
-            c = str.charCodeAt(i);
-            if (c < 0x80) {
-                length += 1;
-            }
-            else if (c < 0x800) {
-                length += 2;
-            }
-            else if (c < 0xd800 || c >= 0xe000) {
-                length += 3;
-            }
-            else {
-                i++;
-                length += 4;
+    const hasBufferByteLength = (typeof Buffer !== 'undefined' && Buffer.byteLength);
+    const utf8Length = (hasBufferByteLength)
+        ? Buffer.byteLength // node
+        : function (str, _) {
+            var c = 0, length = 0;
+            for (var i = 0, l = str.length; i < l; i++) {
+                c = str.charCodeAt(i);
+                if (c < 0x80) {
+                    length += 1;
+                }
+                else if (c < 0x800) {
+                    length += 2;
+                }
+                else if (c < 0xd800 || c >= 0xe000) {
+                    length += 3;
+                }
+                else {
+                    i++;
+                    length += 4;
+                }
             }
-        }
-        return length;
-    }
+            return length;
+        };
     function utf8Write(view, str, it) {
         var c = 0;
         for (var i = 0, l = str.length; i < l; i++) {
@@ -593,21 +897,24 @@
                 view[it.offset++] = c;
             }
             else if (c < 0x800) {
-                view[it.offset++] = 0xc0 | (c >> 6);
-                view[it.offset++] = 0x80 | (c & 0x3f);
+                view[it.offset] = 0xc0 | (c >> 6);
+                view[it.offset + 1] = 0x80 | (c & 0x3f);
+                it.offset += 2;
             }
             else if (c < 0xd800 || c >= 0xe000) {
-                view[it.offset++] = 0xe0 | (c >> 12);
-                view[it.offset++] = 0x80 | (c >> 6 & 0x3f);
-                view[it.offset++] = 0x80 | (c & 0x3f);
+                view[it.offset] = 0xe0 | (c >> 12);
+                view[it.offset + 1] = 0x80 | (c >> 6 & 0x3f);
+                view[it.offset + 2] = 0x80 | (c & 0x3f);
+                it.offset += 3;
             }
             else {
                 i++;
                 c = 0x10000 + (((c & 0x3ff) << 10) | (str.charCodeAt(i) & 0x3ff));
-                view[it.offset++] = 0xf0 | (c >> 18);
-                view[it.offset++] = 0x80 | (c >> 12 & 0x3f);
-                view[it.offset++] = 0x80 | (c >> 6 & 0x3f);
-                view[it.offset++] = 0x80 | (c & 0x3f);
+                view[it.offset] = 0xf0 | (c >> 18);
+                view[it.offset + 1] = 0x80 | (c >> 12 & 0x3f);
+                view[it.offset + 2] = 0x80 | (c >> 6 & 0x3f);
+                view[it.offset + 3] = 0x80 | (c & 0x3f);
+                it.offset += 4;
             }
         }
     }
@@ -679,8 +986,7 @@
         if (!value) {
             value = "";
         }
-        // let length = utf8Length(value);
-        let length = Buffer.byteLength(value, "utf8");
+        let length = utf8Length(value, "utf8");
         let size = 0;
         // fixstr
         if (length < 0x20) {
@@ -791,81 +1097,30 @@
 
     var encode = /*#__PURE__*/Object.freeze({
         __proto__: null,
-        utf8Length: utf8Length,
-        utf8Write: utf8Write,
-        int8: int8$1,
-        uint8: uint8$1,
+        boolean: boolean$1,
+        float32: float32$1,
+        float64: float64$1,
         int16: int16$1,
-        uint16: uint16$1,
         int32: int32$1,
-        uint32: uint32$1,
         int64: int64$1,
+        int8: int8$1,
+        number: number$1,
+        string: string$1,
+        uint16: uint16$1,
+        uint32: uint32$1,
         uint64: uint64$1,
-        float32: float32$1,
-        float64: float64$1,
+        uint8: uint8$1,
+        utf8Length: utf8Length,
+        utf8Write: utf8Write,
         writeFloat32: writeFloat32,
-        writeFloat64: writeFloat64,
-        boolean: boolean$1,
-        string: string$1,
-        number: number$1
+        writeFloat64: writeFloat64
     });
 
-    class EncodeSchemaError extends Error {
-    }
-    function assertType(value, type, klass, field) {
-        let typeofTarget;
-        let allowNull = false;
-        switch (type) {
-            case "number":
-            case "int8":
-            case "uint8":
-            case "int16":
-            case "uint16":
-            case "int32":
-            case "uint32":
-            case "int64":
-            case "uint64":
-            case "float32":
-            case "float64":
-                typeofTarget = "number";
-                if (isNaN(value)) {
-                    console.log(`trying to encode "NaN" in ${klass.constructor.name}#${field}`);
-                }
-                break;
-            case "string":
-                typeofTarget = "string";
-                allowNull = true;
-                break;
-            case "boolean":
-                // boolean is always encoded as true/false based on truthiness
-                return;
-        }
-        if (typeof (value) !== typeofTarget && (!allowNull || (allowNull && value !== null))) {
-            let foundValue = `'${JSON.stringify(value)}'${(value && value.constructor && ` (${value.constructor.name})`) || ''}`;
-            throw new EncodeSchemaError(`a '${typeofTarget}' was expected, but ${foundValue} was provided in ${klass.constructor.name}#${field}`);
-        }
-    }
-    function assertInstanceType(value, type, klass, field) {
-        if (!(value instanceof type)) {
-            throw new EncodeSchemaError(`a '${type.name}' was expected, but '${value && value.constructor.name}' was provided in ${klass.constructor.name}#${field}`);
-        }
-    }
-
-    function encodePrimitiveType(type, bytes, value, klass, field, it) {
-        assertType(value, type, klass, field);
-        const encodeFunc = encode[type];
-        if (encodeFunc) {
-            encodeFunc(bytes, value, it);
-            // encodeFunc(bytes, value);
-        }
-        else {
-            throw new EncodeSchemaError(`a '${type}' was expected, but ${value} was provided in ${klass.constructor.name}#${field}`);
+    function encodeValue(encoder, bytes, type, value, operation, it) {
+        if (typeof (type) === "string") {
+            encode[type]?.(bytes, value, it);
         }
-    }
-    function encodeValue(encoder, bytes, ref, type, value, field, operation, it) {
-        if (type[Symbol.metadata] !== undefined) {
-            // TODO: move this to the `@type()` annotation
-            assertInstanceType(value, type, ref, field);
+        else if (type[Symbol.metadata] !== undefined) {
             //
             // Encode refId for this instance.
             // The actual instance is going to be encoded on next `changeTree` iteration.
@@ -876,21 +1131,7 @@
                 encoder.tryEncodeTypeId(bytes, type, value.constructor, it);
             }
         }
-        else if (typeof (type) === "string") {
-            //
-            // Primitive values
-            //
-            encodePrimitiveType(type, bytes, value, ref, field, it);
-        }
         else {
-            //
-            // Custom type (MapSchema, ArraySchema, etc)
-            //
-            const definition = getType(Object.keys(type)[0]);
-            //
-            // ensure a ArraySchema has been provided
-            //
-            assertInstanceType(ref[field], definition.constructor, ref, field);
             //
             // Encode refId for this instance.
             // The actual instance is going to be encoded on next `changeTree` iteration.
@@ -902,27 +1143,23 @@
      * Used for Schema instances.
      * @private
      */
-    const encodeSchemaOperation = function (encoder, bytes, changeTree, index, operation, it) {
-        const ref = changeTree.ref;
-        const metadata = ref['constructor'][Symbol.metadata];
-        const field = metadata[index];
-        const type = metadata[field].type;
-        const value = ref[field];
+    const encodeSchemaOperation = function (encoder, bytes, changeTree, index, operation, it, _, __, metadata) {
         // "compress" field index + operation
         bytes[it.offset++] = (index | operation) & 255;
         // Do not encode value for DELETE operations
         if (operation === exports.OPERATION.DELETE) {
             return;
         }
+        const ref = changeTree.ref;
+        const field = metadata[index];
         // TODO: inline this function call small performance gain
-        encodeValue(encoder, bytes, ref, type, value, field, operation, it);
+        encodeValue(encoder, bytes, metadata[index].type, ref[field.name], operation, it);
     };
     /**
      * Used for collections (MapSchema, CollectionSchema, SetSchema)
      * @private
      */
-    const encodeKeyValueOperation = function (encoder, bytes, changeTree, field, operation, it) {
-        const ref = changeTree.ref;
+    const encodeKeyValueOperation = function (encoder, bytes, changeTree, index, operation, it) {
         // encode operation
         bytes[it.offset++] = operation & 255;
         // custom operations
@@ -930,27 +1167,40 @@
             return;
         }
         // encode index
-        number$1(bytes, field, it);
+        number$1(bytes, index, it);
         // Do not encode value for DELETE operations
         if (operation === exports.OPERATION.DELETE) {
             return;
         }
+        const ref = changeTree.ref;
         //
         // encode "alias" for dynamic fields (maps)
         //
-        if ((operation & exports.OPERATION.ADD) == exports.OPERATION.ADD) { // ADD or DELETE_AND_ADD
+        if ((operation & exports.OPERATION.ADD) === exports.OPERATION.ADD) { // ADD or DELETE_AND_ADD
             if (typeof (ref['set']) === "function") {
                 //
                 // MapSchema dynamic key
                 //
-                const dynamicIndex = changeTree.ref['$indexes'].get(field);
+                const dynamicIndex = changeTree.ref['$indexes'].get(index);
                 string$1(bytes, dynamicIndex, it);
             }
         }
-        const type = changeTree.getType(field);
-        const value = changeTree.getValue(field);
+        const type = ref[$childType];
+        const value = ref[$getByIndex](index);
+        // try { throw new Error(); } catch (e) {
+        //     // only print if not coming from Reflection.ts
+        //     if (!e.stack.includes("src/Reflection.ts")) {
+        //         console.log("encodeKeyValueOperation -> ", {
+        //             ref: changeTree.ref.constructor.name,
+        //             field,
+        //             operation: OPERATION[operation],
+        //             value: value?.toJSON(),
+        //             items: ref.toJSON(),
+        //         });
+        //     }
+        // }
         // TODO: inline this function call small performance gain
-        encodeValue(encoder, bytes, ref, type, value, field, operation, it);
+        encodeValue(encoder, bytes, type, value, operation, it);
     };
     /**
      * Used for collections (MapSchema, ArraySchema, etc.)
@@ -958,24 +1208,29 @@
      */
     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;
         // custom operations
-        if (operation === exports.OPERATION.CLEAR) {
+        if (operation === exports.OPERATION.CLEAR ||
+            operation === exports.OPERATION.REVERSE) {
             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;
@@ -990,7 +1245,7 @@
         //     items: ref.toJSON(),
         // });
         // TODO: inline this function call small performance gain
-        encodeValue(encoder, bytes, ref, type, value, field, operation, it);
+        encodeValue(encoder, bytes, type, value, operation, it);
     };
 
     /**
@@ -1224,31 +1479,31 @@
 
     var decode = /*#__PURE__*/Object.freeze({
         __proto__: null,
-        utf8Read: utf8Read,
-        int8: int8,
-        uint8: uint8,
-        int16: int16,
-        uint16: uint16,
-        int32: int32,
-        uint32: uint32,
+        arrayCheck: arrayCheck,
+        boolean: boolean,
         float32: float32,
         float64: float64,
+        int16: int16,
+        int32: int32,
         int64: int64,
-        uint64: uint64,
+        int8: int8,
+        number: number,
+        numberCheck: numberCheck,
         readFloat32: readFloat32,
         readFloat64: readFloat64,
-        boolean: boolean,
         string: string,
         stringCheck: stringCheck,
-        number: number,
-        numberCheck: numberCheck,
-        arrayCheck: arrayCheck,
-        switchStructureCheck: switchStructureCheck
+        switchStructureCheck: switchStructureCheck,
+        uint16: uint16,
+        uint32: uint32,
+        uint64: uint64,
+        uint8: uint8,
+        utf8Read: utf8Read
     });
 
     const DEFINITION_MISMATCH = -1;
     function decodeValue(decoder, operation, ref, index, type, bytes, it, allChanges) {
-        const $root = decoder.$root;
+        const $root = decoder.root;
         const previousValue = ref[$getByIndex](index);
         let value;
         if ((operation & exports.OPERATION.DELETE) === exports.OPERATION.DELETE) {
@@ -1296,7 +1551,9 @@
                 if (!value) {
                     value = decoder.createInstanceOfType(childType);
                 }
-                $root.addRef(refId, value, (value !== previousValue));
+                $root.addRef(refId, value, (value !== previousValue || // increment ref count if value has changed
+                    (operation === exports.OPERATION.DELETE_AND_ADD && value === previousValue) // increment ref count if the same instance is being added again
+                ));
             }
         }
         else if (typeof (type) === "string") {
@@ -1347,18 +1604,19 @@
     }
     const decodeSchemaOperation = function (decoder, bytes, it, ref, allChanges) {
         const first_byte = bytes[it.offset++];
-        const metadata = ref['constructor'][Symbol.metadata];
+        const metadata = ref.constructor[Symbol.metadata];
         // "compressed" index + operation
         const operation = (first_byte >> 6) << 6;
         const index = first_byte % (operation || 255);
         // skip early if field is not defined
         const field = metadata[index];
         if (field === undefined) {
+            console.warn("@colyseus/schema: field not defined at", { index, ref: ref.constructor.name, metadata });
             return DEFINITION_MISMATCH;
         }
-        const { value, previousValue } = decodeValue(decoder, operation, ref, index, metadata[field].type, bytes, it, allChanges);
+        const { value, previousValue } = decodeValue(decoder, operation, ref, index, field.type, bytes, it, allChanges);
         if (value !== null && value !== undefined) {
-            ref[field] = value;
+            ref[field.name] = value;
         }
         // add change
         if (previousValue !== value) {
@@ -1366,7 +1624,7 @@
                 ref,
                 refId: decoder.currentRefId,
                 op: operation,
-                field: field,
+                field: field.name,
                 value,
                 previousValue,
             });
@@ -1434,7 +1692,8 @@
     };
     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:
@@ -1445,11 +1704,15 @@
             ref.clear();
             return;
         }
+        else if (operation === exports.OPERATION.REVERSE) {
+            ref.reverse();
+            return;
+        }
         else if (operation === exports.OPERATION.DELETE_BY_REFID) {
             // 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);
+            const previousValue = decoder.root.refs.get(refId);
+            index = ref.findIndex((value) => value === previousValue);
             ref[$deleteByIndex](index);
             allChanges.push({
                 ref,
@@ -1462,7 +1725,17 @@
             });
             return;
         }
-        const index = number(bytes, it);
+        else if (operation === exports.OPERATION.ADD_BY_REFID) {
+            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);
@@ -1486,6 +1759,47 @@
         }
     };
 
+    class EncodeSchemaError extends Error {
+    }
+    function assertType(value, type, klass, field) {
+        let typeofTarget;
+        let allowNull = false;
+        switch (type) {
+            case "number":
+            case "int8":
+            case "uint8":
+            case "int16":
+            case "uint16":
+            case "int32":
+            case "uint32":
+            case "int64":
+            case "uint64":
+            case "float32":
+            case "float64":
+                typeofTarget = "number";
+                if (isNaN(value)) {
+                    console.log(`trying to encode "NaN" in ${klass.constructor.name}#${field}`);
+                }
+                break;
+            case "string":
+                typeofTarget = "string";
+                allowNull = true;
+                break;
+            case "boolean":
+                // boolean is always encoded as true/false based on truthiness
+                return;
+        }
+        if (typeof (value) !== typeofTarget && (!allowNull || (allowNull && value !== null))) {
+            let foundValue = `'${JSON.stringify(value)}'${(value && value.constructor && ` (${value.constructor.name})`) || ''}`;
+            throw new EncodeSchemaError(`a '${typeofTarget}' was expected, but ${foundValue} was provided in ${klass.constructor.name}#${field}`);
+        }
+    }
+    function assertInstanceType(value, type, instance, field) {
+        if (!(value instanceof type)) {
+            throw new EncodeSchemaError(`a '${type.name}' was expected, but '${value && value.constructor.name}' was provided in ${instance.constructor.name}#${field}`);
+        }
+    }
+
     var _a$4, _b$4;
     const DEFAULT_SORT = (a, b) => {
         const A = a.toString();
@@ -1536,6 +1850,7 @@
             const proxy = new Proxy(this, {
                 get: (obj, prop) => {
                     if (typeof (prop) !== "symbol" &&
+                        // FIXME: d8 accuses this as low performance
                         !isNaN(prop) // https://stackoverflow.com/a/175787/892698
                     ) {
                         return this.items[prop];
@@ -1551,8 +1866,9 @@
                         }
                         else {
                             if (setValue[$changes]) {
+                                assertInstanceType(setValue, obj[$childType], obj, key);
                                 if (obj.items[key] !== undefined) {
-                                    if (setValue[$changes][$isNew]) {
+                                    if (setValue[$changes].isNew) {
                                         this[$changes].indexedOperation(Number(key), exports.OPERATION.MOVE_AND_ADD);
                                     }
                                     else {
@@ -1564,7 +1880,7 @@
                                         }
                                     }
                                 }
-                                else if (setValue[$changes][$isNew]) {
+                                else if (setValue[$changes].isNew) {
                                     this[$changes].indexedOperation(Number(key), exports.OPERATION.ADD);
                                 }
                             }
@@ -1597,7 +1913,10 @@
                 }
             });
             this[$changes] = new ChangeTree(proxy);
-            this.push.apply(this, items);
+            this[$changes].indexes = {};
+            if (items.length > 0) {
+                this.push(...items);
+            }
             return proxy;
         }
         set length(newLength) {
@@ -1616,14 +1935,19 @@
         }
         push(...values) {
             let length = this.tmpItems.length;
-            values.forEach((value, i) => {
-                // skip null values
+            const changeTree = this[$changes];
+            // values.forEach((value, i) => {
+            for (let i = 0, l = values.length; i < values.length; i++, length++) {
+                const value = values[i];
                 if (value === undefined || value === null) {
+                    // skip null values
                     return;
                 }
-                const changeTree = this[$changes];
+                else if (typeof (value) === "object" && this[$childType]) {
+                    assertInstanceType(value, this[$childType], this, i);
+                    // TODO: move value[$changes]?.setParent() to this block.
+                }
                 changeTree.indexedOperation(length, exports.OPERATION.ADD, this.items.length);
-                // changeTree.indexes[length] = length;
                 this.items.push(value);
                 this.tmpItems.push(value);
                 //
@@ -1631,8 +1955,9 @@
                 // (to avoid encoding "refId" operations before parent's "ADD" operation)
                 //
                 value[$changes]?.setParent(this, changeTree.root, length);
-                length++;
-            });
+            }
+            //     length++;
+            // });
             return length;
         }
         /**
@@ -1653,6 +1978,7 @@
             }
             this[$changes].delete(index, undefined, this.items.length - 1);
             // this.tmpItems[index] = undefined;
+            // this.tmpItems.pop();
             this.deletedIndexes[index] = true;
             return this.items.pop();
         }
@@ -1717,9 +2043,12 @@
                 //
                 // TODO: do not use [$changes] at decoding time.
                 //
-                changeTree.root?.changes.delete(changeTree);
-                changeTree.root?.allChanges.delete(changeTree);
-                changeTree.root?.allFilteredChanges.delete(changeTree);
+                const root = changeTree.root;
+                if (root !== undefined) {
+                    root.removeChangeFromChangeSet("changes", changeTree);
+                    root.removeChangeFromChangeSet("allChanges", changeTree);
+                    root.removeChangeFromChangeSet("allFilteredChanges", changeTree);
+                }
             });
             changeTree.discard(true);
             changeTree.operation(exports.OPERATION.CLEAR);
@@ -1763,6 +2092,7 @@
             const changeTree = this[$changes];
             changeTree.delete(index);
             changeTree.shiftAllChangeIndexes(-1, index);
+            // this.deletedIndexes[index] = true;
             return this.items.shift();
         }
         /**
@@ -1843,10 +2173,12 @@
             changeTree.shiftChangeIndexes(items.length);
             // new index
             if (changeTree.isFiltered) {
-                changeTree.filteredChanges.set(this.items.length, exports.OPERATION.ADD);
+                setOperationAtIndex(changeTree.filteredChanges, this.items.length);
+                // changeTree.filteredChanges[this.items.length] = OPERATION.ADD;
             }
             else {
-                changeTree.allChanges.set(this.items.length, exports.OPERATION.ADD);
+                setOperationAtIndex(changeTree.allChanges, this.items.length);
+                // changeTree.allChanges[this.items.length] = OPERATION.ADD;
             }
             // FIXME: should we use OPERATION.MOVE here instead?
             items.forEach((_, index) => {
@@ -1871,14 +2203,6 @@
         lastIndexOf(searchElement, fromIndex = this.length - 1) {
             return this.items.lastIndexOf(searchElement, fromIndex);
         }
-        /**
-         * Determines whether all the members of an array satisfy the specified test.
-         * @param callbackfn A function that accepts up to three arguments. The every method calls
-         * the callbackfn function for each element in the array until the callbackfn returns a value
-         * which is coercible to the Boolean value false, or until the end of the array.
-         * @param thisArg An object to which the this keyword can refer in the callbackfn function.
-         * If thisArg is omitted, undefined is used as the this value.
-         */
         every(callbackfn, thisArg) {
             return this.items.every(callbackfn, thisArg);
         }
@@ -2157,6 +2481,7 @@
             this.$items = new Map();
             this.$indexes = new Map();
             this[$changes] = new ChangeTree(this);
+            this[$changes].indexes = {};
             if (initialValues) {
                 if (initialValues instanceof Map ||
                     initialValues instanceof MapSchema) {
@@ -2183,6 +2508,9 @@
             if (value === undefined || value === null) {
                 throw new Error(`MapSchema#set('${key}', ${value}): trying to set ${value} value on '${key}'.`);
             }
+            else if (typeof (value) === "object" && this[$childType]) {
+                assertInstanceType(value, this[$childType], this, key);
+            }
             // Force "key" as string
             // See: https://github.com/colyseus/colyseus/issues/561#issuecomment-1646733468
             key = key.toString();
@@ -2191,7 +2519,7 @@
             const isReplace = typeof (changeTree.indexes[key]) !== "undefined";
             const index = (isReplace)
                 ? changeTree.indexes[key]
-                : changeTree.indexes[-1] ?? 0;
+                : changeTree.indexes[$numFields] ?? 0;
             let operation = (isReplace)
                 ? exports.OPERATION.REPLACE
                 : exports.OPERATION.ADD;
@@ -2203,7 +2531,7 @@
             if (!isReplace) {
                 this.$indexes.set(index, key);
                 changeTree.indexes[key] = index;
-                changeTree.indexes[-1] = index + 1;
+                changeTree.indexes[$numFields] = index + 1;
             }
             else if (!isRef &&
                 this.$items.get(key) === value) {
@@ -2278,8 +2606,11 @@
         }
         [$onEncodeEnd]() {
             const changeTree = this[$changes];
-            const changes = changeTree.changes.entries();
-            for (const [fieldIndex, operation] of changes) {
+            const keys = Object.keys(changeTree.indexedOperations);
+            for (let i = 0, len = keys.length; i < len; i++) {
+                const key = keys[i];
+                const fieldIndex = Number(key);
+                const operation = changeTree.indexedOperations[key];
                 if (operation === exports.OPERATION.DELETE) {
                     const index = this[$getByIndex](fieldIndex);
                     delete changeTree.indexes[index];
@@ -2305,111 +2636,24 @@
                 // client-side
                 cloned = Object.assign(new MapSchema(), this);
             }
-            else {
-                // server-side
-                cloned = new MapSchema();
-                this.forEach((value, key) => {
-                    if (value[$changes]) {
-                        cloned.set(key, value['clone']());
-                    }
-                    else {
-                        cloned.set(key, value);
-                    }
-                });
-            }
-            return cloned;
-        }
-    }
-    registerType("map", { constructor: MapSchema });
-
-    const DEFAULT_VIEW_TAG = -1;
-    class TypeContext {
-        /**
-         * For inheritance support
-         * Keeps track of which classes extends which. (parent -> children)
-         */
-        static { this.inheritedTypes = new Map(); }
-        static register(target) {
-            const parent = Object.getPrototypeOf(target);
-            if (parent !== Schema) {
-                let inherits = TypeContext.inheritedTypes.get(parent);
-                if (!inherits) {
-                    inherits = new Set();
-                    TypeContext.inheritedTypes.set(parent, inherits);
-                }
-                inherits.add(target);
-            }
-        }
-        constructor(rootClass) {
-            this.types = {};
-            this.schemas = new Map();
-            this.hasFilters = false;
-            if (rootClass) {
-                this.discoverTypes(rootClass);
-            }
-        }
-        has(schema) {
-            return this.schemas.has(schema);
-        }
-        get(typeid) {
-            return this.types[typeid];
-        }
-        add(schema, typeid = this.schemas.size) {
-            // skip if already registered
-            if (this.schemas.has(schema)) {
-                return false;
-            }
-            this.types[typeid] = schema;
-            this.schemas.set(schema, typeid);
-            return true;
-        }
-        getTypeId(klass) {
-            return this.schemas.get(klass);
-        }
-        discoverTypes(klass) {
-            if (!this.add(klass)) {
-                return;
-            }
-            // add classes inherited from this base class
-            TypeContext.inheritedTypes.get(klass)?.forEach((child) => {
-                this.discoverTypes(child);
-            });
-            // skip if no fields are defined for this class.
-            if (klass[Symbol.metadata] === undefined) {
-                klass[Symbol.metadata] = {};
-            }
-            // const metadata = Metadata.getFor(klass);
-            const metadata = klass[Symbol.metadata];
-            // if any schema/field has filters, mark "context" as having filters.
-            if (metadata[-2]) {
-                this.hasFilters = true;
-            }
-            for (const field in metadata) {
-                const fieldType = metadata[field].type;
-                if (typeof (fieldType) === "string") {
-                    continue;
-                }
-                if (Array.isArray(fieldType)) {
-                    const type = fieldType[0];
-                    if (type === "string") {
-                        continue;
-                    }
-                    this.discoverTypes(type);
-                }
-                else if (typeof (fieldType) === "function") {
-                    this.discoverTypes(fieldType);
-                }
-                else {
-                    const type = Object.values(fieldType)[0];
-                    // skip primitive types
-                    if (typeof (type) === "string") {
-                        continue;
+            else {
+                // server-side
+                cloned = new MapSchema();
+                this.forEach((value, key) => {
+                    if (value[$changes]) {
+                        cloned.set(key, value['clone']());
                     }
-                    this.discoverTypes(type);
-                }
+                    else {
+                        cloned.set(key, value);
+                    }
+                });
             }
+            return cloned;
         }
     }
+    registerType("map", { constructor: MapSchema });
+
+    const DEFAULT_VIEW_TAG = -1;
     /**
      * [See documentation](https://docs.colyseus.io/state/schema/)
      *
@@ -2436,8 +2680,8 @@
     //         // detect index for this field, considering inheritance
     //         //
     //         const parent = Object.getPrototypeOf(context.metadata);
-    //         let fieldIndex: number = context.metadata[-1] // current structure already has fields defined
-    //             ?? (parent && parent[-1]) // parent structure has fields defined
+    //         let fieldIndex: number = context.metadata[$numFields] // current structure already has fields defined
+    //             ?? (parent && parent[$numFields]) // parent structure has fields defined
     //             ?? -1; // no fields defined
     //         fieldIndex++;
     //         if (
@@ -2557,18 +2801,20 @@
             const constructor = target.constructor;
             const parentClass = Object.getPrototypeOf(constructor);
             const parentMetadata = parentClass[Symbol.metadata];
+            // TODO: use Metadata.initialize()
             const metadata = (constructor[Symbol.metadata] ??= Object.assign({}, constructor[Symbol.metadata], parentMetadata ?? Object.create(null)));
-            if (!metadata[fieldName]) {
-                //
-                // detect index for this field, considering inheritance
-                //
-                metadata[fieldName] = {
-                    type: undefined,
-                    index: (metadata[-1] // current structure already has fields defined
-                        ?? (parentMetadata && parentMetadata[-1]) // parent structure has fields defined
-                        ?? -1) + 1 // no fields defined
-                };
-            }
+            // const fieldIndex = metadata[fieldName];
+            // if (!metadata[fieldIndex]) {
+            //     //
+            //     // detect index for this field, considering inheritance
+            //     //
+            //     metadata[fieldIndex] = {
+            //         type: undefined,
+            //         index: (metadata[$numFields] // current structure already has fields defined
+            //             ?? (parentMetadata && parentMetadata[$numFields]) // parent structure has fields defined
+            //             ?? -1) + 1 // no fields defined
+            //     }
+            // }
             Metadata.setTag(metadata, fieldName, tag);
         };
     }
@@ -2582,17 +2828,17 @@
             TypeContext.register(constructor);
             const parentClass = Object.getPrototypeOf(constructor);
             const parentMetadata = parentClass[Symbol.metadata];
-            const metadata = (constructor[Symbol.metadata] ??= Object.assign({}, constructor[Symbol.metadata], parentMetadata ?? Object.create(null)));
-            let fieldIndex;
+            const metadata = Metadata.initialize(constructor);
+            let fieldIndex = metadata[field];
             /**
              * skip if descriptor already exists for this field (`@deprecated()`)
              */
-            if (metadata[field]) {
-                if (metadata[field].deprecated) {
+            if (metadata[fieldIndex] !== undefined) {
+                if (metadata[fieldIndex].deprecated) {
                     // do not create accessors for deprecated properties.
                     return;
                 }
-                else if (metadata[field].descriptor !== undefined) {
+                else if (metadata[fieldIndex].type !== undefined) {
                     // trying to define same property multiple times across inheritance.
                     // https://github.com/colyseus/colyseus-unity3d/issues/131#issuecomment-814308572
                     try {
@@ -2603,16 +2849,13 @@
                         throw new Error(`${e.message} ${definitionAtLine}`);
                     }
                 }
-                else {
-                    fieldIndex = metadata[field].index;
-                }
             }
             else {
                 //
                 // detect index for this field, considering inheritance
                 //
-                fieldIndex = metadata[-1] // current structure already has fields defined
-                    ?? (parentMetadata && parentMetadata[-1]) // parent structure has fields defined
+                fieldIndex = metadata[$numFields] // current structure already has fields defined
+                    ?? (parentMetadata && parentMetadata[$numFields]) // parent structure has fields defined
                     ?? -1; // no fields defined
                 fieldIndex++;
             }
@@ -2631,15 +2874,15 @@
                 const childType = (complexTypeKlass)
                     ? Object.values(type)[0]
                     : type;
-                Metadata.addField(metadata, fieldIndex, field, type, getPropertyDescriptor(`_${field}`, fieldIndex, childType, complexTypeKlass, metadata, field));
+                Metadata.addField(metadata, fieldIndex, field, type, getPropertyDescriptor(`_${field}`, fieldIndex, childType, complexTypeKlass));
             }
         };
     }
-    function getPropertyDescriptor(fieldCached, fieldIndex, type, complexTypeKlass, metadata, field) {
+    function getPropertyDescriptor(fieldCached, fieldIndex, type, complexTypeKlass) {
         return {
             get: function () { return this[fieldCached]; },
             set: function (value) {
-                const previousValue = this[fieldCached] || undefined;
+                const previousValue = this[fieldCached] ?? undefined;
                 // skip if value is the same as cached.
                 if (value === previousValue) {
                     return;
@@ -2657,22 +2900,27 @@
                         }
                         value[$childType] = type;
                     }
+                    else if (typeof (type) !== "string") {
+                        assertInstanceType(value, type, this, fieldCached.substring(1));
+                    }
+                    else {
+                        assertType(value, type, this, fieldCached.substring(1));
+                    }
+                    const changeTree = this[$changes];
                     //
                     // Replacing existing "ref", remove it from root.
                     // TODO: if there are other references to this instance, we should not remove it from root.
                     //
                     if (previousValue !== undefined && previousValue[$changes]) {
-                        this[$changes].root?.remove(previousValue[$changes]);
+                        changeTree.root?.remove(previousValue[$changes]);
                     }
                     // flag the change for encoding.
-                    this.constructor[$track](this[$changes], fieldIndex, exports.OPERATION.ADD);
+                    this.constructor[$track](changeTree, fieldIndex, exports.OPERATION.ADD);
                     //
                     // call setParent() recursively for this and its child
                     // structures.
                     //
-                    if (value[$changes]) {
-                        value[$changes].setParent(this, this[$changes].root, metadata[field].index);
-                    }
+                    value[$changes]?.setParent(this, changeTree.root, fieldIndex);
                 }
                 else if (previousValue !== undefined) {
                     //
@@ -2699,20 +2947,22 @@
             const parentClass = Object.getPrototypeOf(constructor);
             const parentMetadata = parentClass[Symbol.metadata];
             const metadata = (constructor[Symbol.metadata] ??= Object.assign({}, constructor[Symbol.metadata], parentMetadata ?? Object.create(null)));
-            if (!metadata[field]) {
-                //
-                // detect index for this field, considering inheritance
-                //
-                metadata[field] = {
-                    type: undefined,
-                    index: (metadata[-1] // current structure already has fields defined
-                        ?? (parentMetadata && parentMetadata[-1]) // parent structure has fields defined
-                        ?? -1) + 1 // no fields defined
-                };
-            }
-            metadata[field].deprecated = true;
+            const fieldIndex = metadata[field];
+            // if (!metadata[field]) {
+            //     //
+            //     // detect index for this field, considering inheritance
+            //     //
+            //     metadata[field] = {
+            //         type: undefined,
+            //         index: (metadata[$numFields] // current structure already has fields defined
+            //             ?? (parentMetadata && parentMetadata[$numFields]) // parent structure has fields defined
+            //             ?? -1) + 1 // no fields defined
+            //     }
+            // }
+            metadata[fieldIndex].deprecated = true;
             if (throws) {
-                metadata[field].descriptor = {
+                metadata[$descriptors] ??= {};
+                metadata[$descriptors][field] = {
                     get: function () { throw new Error(`${field} is deprecated.`); },
                     set: function (value) { },
                     enumerable: false,
@@ -2720,8 +2970,8 @@
                 };
             }
             // flag metadata[field] as non-enumerable
-            Object.defineProperty(metadata, field, {
-                value: metadata[field],
+            Object.defineProperty(metadata, fieldIndex, {
+                value: metadata[fieldIndex],
                 enumerable: false,
                 configurable: true
             });
@@ -2733,6 +2983,37 @@
         }
         return target;
     }
+    function schema(fields, name, inherits = Schema) {
+        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'];
+                }
+                if (field['view'] !== undefined) {
+                    viewTagFields[fieldName] = (typeof (field['view']) === "boolean")
+                        ? DEFAULT_VIEW_TAG
+                        : field['view'];
+                }
+            }
+        }
+        const klass = Metadata.setFields(class extends inherits {
+            constructor(...args) {
+                args[0] = Object.assign({}, defaultValues, args[0]);
+                super(...args);
+            }
+        }, fields);
+        for (let fieldName in viewTagFields) {
+            view(viewTagFields[fieldName])(klass.prototype, fieldName);
+        }
+        if (name) {
+            Object.defineProperty(klass, "name", { value: name });
+        }
+        klass.extends = (fields, name) => schema(fields, name, klass);
+        return klass;
+    }
 
     function getIndent(level) {
         return (new Array(level).fill(0)).map((_, i) => (i === level - 1) ? `└─ ` : `   `).join("");
@@ -2743,15 +3024,18 @@
             ops: {},
             refs: []
         };
-        $root.changes.forEach((operations, changeTree) => {
+        // for (const refId in $root.changes) {
+        $root.changes.forEach(changeTree => {
+            const changes = changeTree.indexedOperations;
             dump.refs.push(`refId#${changeTree.refId}`);
-            operations.forEach((op, index) => {
+            for (const index in changes) {
+                const op = changes[index];
                 const opName = exports.OPERATION[op];
                 if (!dump.ops[opName]) {
                     dump.ops[opName] = 0;
                 }
                 dump.ops[exports.OPERATION[op]]++;
-            });
+            }
         });
         return dump;
     }
@@ -2777,6 +3061,7 @@
     class Schema {
         static { this[_a$2] = encodeSchemaOperation; }
         static { this[_b$2] = decodeSchemaOperation; }
+        // public [$changes]: ChangeTree;
         /**
          * Assign the property descriptors required to track changes on this instance.
          * @param instance
@@ -2787,35 +3072,7 @@
                 enumerable: false,
                 writable: true
             });
-            const metadata = instance.constructor[Symbol.metadata];
-            // Define property descriptors
-            for (const field in metadata) {
-                if (metadata[field].descriptor) {
-                    // for encoder
-                    Object.defineProperty(instance, `_${field}`, {
-                        value: undefined,
-                        writable: true,
-                        enumerable: false,
-                        configurable: true,
-                    });
-                    Object.defineProperty(instance, field, metadata[field].descriptor);
-                }
-                else {
-                    // for decoder
-                    Object.defineProperty(instance, field, {
-                        value: undefined,
-                        writable: true,
-                        enumerable: true,
-                        configurable: true,
-                    });
-                }
-                // Object.defineProperty(instance, field, {
-                //     ...instance.constructor[Symbol.metadata][field].descriptor
-                // });
-                // if (args[0]?.hasOwnProperty(field)) {
-                //     instance[field] = args[0][field];
-                // }
-            }
+            Object.defineProperties(instance, instance.constructor[Symbol.metadata]?.[$descriptors] || {});
         }
         static is(type) {
             return typeof (type[Symbol.metadata]) === "object";
@@ -2839,7 +3096,7 @@
          */
         static [$filter](ref, index, view) {
             const metadata = ref.constructor[Symbol.metadata];
-            const tag = metadata[metadata[index]].tag;
+            const tag = metadata[index]?.tag;
             if (view === undefined) {
                 // shared pass/encode: encode if doesn't have a tag
                 return tag === undefined;
@@ -2860,12 +3117,16 @@
         }
         // allow inherited classes to have a constructor
         constructor(...args) {
+            //
+            // inline
+            // Schema.initialize(this);
+            //
             Schema.initialize(this);
             //
             // Assign initial values
             //
             if (args[0]) {
-                this.assign(args[0]);
+                Object.assign(this, args[0]);
             }
         }
         assign(props) {
@@ -2879,7 +3140,8 @@
          * @param operation OPERATION to perform (detected automatically)
          */
         setDirty(property, operation) {
-            this[$changes].change(this.constructor[Symbol.metadata][property].index, operation);
+            const metadata = this.constructor[Symbol.metadata];
+            this[$changes].change(metadata[metadata[property]].index, operation);
         }
         clone() {
             const cloned = new (this.constructor);
@@ -2888,7 +3150,9 @@
             // TODO: clone all properties, not only annotated ones
             //
             // for (const field in this) {
-            for (const field in metadata) {
+            for (const fieldIndex in metadata) {
+                // const field = metadata[metadata[fieldIndex]].name;
+                const field = metadata[fieldIndex].name;
                 if (typeof (this[field]) === "object" &&
                     typeof (this[field]?.clone) === "function") {
                     // deep clone
@@ -2902,10 +3166,11 @@
             return cloned;
         }
         toJSON() {
-            const metadata = this.constructor[Symbol.metadata];
             const obj = {};
-            for (const fieldName in metadata) {
-                const field = metadata[fieldName];
+            const metadata = this.constructor[Symbol.metadata];
+            for (const index in metadata) {
+                const field = metadata[index];
+                const fieldName = field.name;
                 if (!field.deprecated && this[fieldName] !== null && typeof (this[fieldName]) !== "undefined") {
                     obj[fieldName] = (typeof (this[fieldName]['toJSON']) === "function")
                         ? this[fieldName]['toJSON']()
@@ -2918,17 +3183,19 @@
             this[$changes].discardAll();
         }
         [$getByIndex](index) {
-            return this[this.constructor[Symbol.metadata][index]];
+            const metadata = this.constructor[Symbol.metadata];
+            return this[metadata[index].name];
         }
         [$deleteByIndex](index) {
-            this[this.constructor[Symbol.metadata][index]] = undefined;
+            const metadata = this.constructor[Symbol.metadata];
+            this[metadata[index].name] = undefined;
         }
         static debugRefIds(instance, jsonContents = true, level = 0) {
             const ref = instance;
             const changeTree = ref[$changes];
             const contents = (jsonContents) ? ` - ${JSON.stringify(ref.toJSON())}` : "";
             let output = "";
-            output += `${getIndent(level)}${ref.constructor.name} (${ref[$changes].refId})${contents}\n`;
+            output += `${getIndent(level)}${ref.constructor.name} (refId: ${ref[$changes].refId})${contents}\n`;
             changeTree.forEachChild((childChangeTree) => output += this.debugRefIds(childChangeTree.ref, jsonContents, level + 1));
             return output;
         }
@@ -2946,30 +3213,40 @@
             const changeSetName = (isEncodeAll) ? "allChanges" : "changes";
             let output = `${instance.constructor.name} (${changeTree.refId}) -> .${changeSetName}:\n`;
             function dumpChangeSet(changeSet) {
-                Array.from(changeSet)
-                    .sort((a, b) => a[0] - b[0])
-                    .forEach(([index, operation]) => output += `- [${index}]: ${exports.OPERATION[operation]} (${JSON.stringify(changeTree.getValue(index, isEncodeAll))})\n`);
+                changeSet.operations
+                    .filter(op => op)
+                    .forEach((index) => {
+                    const operation = changeTree.indexedOperations[index];
+                    console.log({ index, operation });
+                    output += `- [${index}]: ${exports.OPERATION[operation]} (${JSON.stringify(changeTree.getValue(Number(index), isEncodeAll))})\n`;
+                });
             }
             dumpChangeSet(changeSet);
             // display filtered changes
-            if (!isEncodeAll && changeTree.filteredChanges?.size > 0) {
+            if (!isEncodeAll &&
+                changeTree.filteredChanges &&
+                (changeTree.filteredChanges.operations).filter(op => op).length > 0) {
                 output += `${instance.constructor.name} (${changeTree.refId}) -> .filteredChanges:\n`;
                 dumpChangeSet(changeTree.filteredChanges);
             }
             // display filtered changes
-            if (isEncodeAll && changeTree.allFilteredChanges?.size > 0) {
+            if (isEncodeAll &&
+                changeTree.allFilteredChanges &&
+                (changeTree.allFilteredChanges.operations).filter(op => op).length > 0) {
                 output += `${instance.constructor.name} (${changeTree.refId}) -> .allFilteredChanges:\n`;
                 dumpChangeSet(changeTree.allFilteredChanges);
             }
             return output;
         }
-        static debugChangesDeep(ref) {
+        static debugChangesDeep(ref, changeSetName = "changes") {
             let output = "";
             const rootChangeTree = ref[$changes];
+            const root = rootChangeTree.root;
             const changeTrees = new Map();
             let totalInstances = 0;
             let totalOperations = 0;
-            for (const [changeTree, changes] of (rootChangeTree.root.changes.entries())) {
+            for (const [refId, changes] of Object.entries(root[changeSetName])) {
+                const changeTree = root.changeTrees[refId];
                 let includeChangeTree = false;
                 let parentChangeTrees = [];
                 let parentChangeTree = changeTree.parent?.[$changes];
@@ -2988,7 +3265,7 @@
                 }
                 if (includeChangeTree) {
                     totalInstances += 1;
-                    totalOperations += changes.size;
+                    totalOperations += Object.keys(changes).length;
                     changeTrees.set(changeTree, parentChangeTrees.reverse());
                 }
             }
@@ -3006,12 +3283,13 @@
                         visitedParents.add(parentChangeTree);
                     }
                 });
-                const changes = changeTree.changes;
+                const changes = changeTree.indexedOperations;
                 const level = parentChangeTrees.length;
                 const indent = getIndent(level);
                 const parentIndex = (level > 0) ? `(${changeTree.parentIndex}) ` : "";
-                output += `${indent}${parentIndex}${changeTree.ref.constructor.name} (refId: ${changeTree.refId}) - changes: ${changes.size}\n`;
-                for (const [index, operation] of changes) {
+                output += `${indent}${parentIndex}${changeTree.ref.constructor.name} (refId: ${changeTree.refId}) - changes: ${Object.keys(changes).length}\n`;
+                for (const index in changes) {
+                    const operation = changes[index];
                     output += `${getIndent(level + 1)}${exports.OPERATION[operation]}: ${index}\n`;
                 }
             }
@@ -3045,6 +3323,7 @@
             this.$indexes = new Map();
             this.$refId = 0;
             this[$changes] = new ChangeTree(this);
+            this[$changes].indexes = {};
             if (initialValues) {
                 initialValues.forEach((v) => this.add(v));
             }
@@ -3200,6 +3479,7 @@
             this.$indexes = new Map();
             this.$refId = 0;
             this[$changes] = new ChangeTree(this);
+            this[$changes].indexes = {};
             if (initialValues) {
                 initialValues.forEach((v) => this.add(v));
             }
@@ -3355,6 +3635,8 @@
     OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
     PERFORMANCE OF THIS SOFTWARE.
     ***************************************************************************** */
+    /* global Reflect, Promise, SuppressedError, Symbol */
+
 
     function __decorate(decorators, target, key, desc) {
         var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -3368,37 +3650,135 @@
         return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
     };
 
+    function spliceOne(arr, index) {
+        // manually splice an array
+        if (index === -1 || index >= arr.length) {
+            return false;
+        }
+        const len = arr.length - 1;
+        for (let i = index; i < len; i++) {
+            arr[i] = arr[i + 1];
+        }
+        arr.length = len;
+        return true;
+    }
+
+    class Root {
+        constructor(types) {
+            this.types = types;
+            this.nextUniqueId = 0;
+            this.refCount = {};
+            this.changeTrees = {};
+            // all changes
+            this.allChanges = [];
+            this.allFilteredChanges = []; // TODO: do not initialize it if filters are not used
+            // pending changes to be encoded
+            this.changes = [];
+            this.filteredChanges = []; // TODO: do not initialize it if filters are not used
+        }
+        getNextUniqueId() {
+            return this.nextUniqueId++;
+        }
+        add(changeTree) {
+            // FIXME: move implementation of `ensureRefId` to `Root` class
+            changeTree.ensureRefId();
+            const isNewChangeTree = (this.changeTrees[changeTree.refId] === undefined);
+            if (isNewChangeTree) {
+                this.changeTrees[changeTree.refId] = changeTree;
+            }
+            const previousRefCount = this.refCount[changeTree.refId];
+            if (previousRefCount === 0) {
+                //
+                // When a ChangeTree is re-added, it means that it was previously removed.
+                // We need to re-add all changes to the `changes` map.
+                //
+                const ops = changeTree.allChanges.operations;
+                let len = ops.length;
+                while (len--) {
+                    changeTree.indexedOperations[ops[len]] = exports.OPERATION.ADD;
+                    setOperationAtIndex(changeTree.changes, len);
+                }
+            }
+            this.refCount[changeTree.refId] = (previousRefCount || 0) + 1;
+            return isNewChangeTree;
+        }
+        remove(changeTree) {
+            const refCount = (this.refCount[changeTree.refId]) - 1;
+            if (refCount <= 0) {
+                //
+                // Only remove "root" reference if it's the last reference
+                //
+                changeTree.root = undefined;
+                delete this.changeTrees[changeTree.refId];
+                this.removeChangeFromChangeSet("allChanges", changeTree);
+                this.removeChangeFromChangeSet("changes", changeTree);
+                if (changeTree.isFiltered || changeTree.isPartiallyFiltered) {
+                    this.removeChangeFromChangeSet("allFilteredChanges", changeTree);
+                    this.removeChangeFromChangeSet("filteredChanges", changeTree);
+                }
+                this.refCount[changeTree.refId] = 0;
+            }
+            else {
+                this.refCount[changeTree.refId] = refCount;
+            }
+            changeTree.forEachChild((child, _) => this.remove(child));
+            return refCount;
+        }
+        removeChangeFromChangeSet(changeSetName, changeTree) {
+            const changeSet = this[changeSetName];
+            const index = changeSet.indexOf(changeTree);
+            if (index !== -1) {
+                spliceOne(changeSet, index);
+                // changeSet[index] = undefined;
+            }
+        }
+        clear() {
+            this.changes.length = 0;
+        }
+    }
+
     class Encoder {
         static { this.BUFFER_SIZE = 8 * 1024; } // 8KB
-        constructor(root) {
+        constructor(state) {
             this.sharedBuffer = Buffer.allocUnsafeSlow(Encoder.BUFFER_SIZE);
-            this.setRoot(root);
             //
             // TODO: cache and restore "Context" based on root schema
             // (to avoid creating a new context for every new room)
             //
-            this.context = new TypeContext(root.constructor);
+            this.context = new TypeContext(state.constructor);
+            this.root = new Root(this.context);
+            this.setState(state);
             // console.log(">>>>>>>>>>>>>>>> Encoder types");
             // this.context.schemas.forEach((id, schema) => {
             //     console.log("type:", id, schema.name, Object.keys(schema[Symbol.metadata]));
             // });
         }
-        setRoot(state) {
-            this.root = new Root();
+        setState(state) {
             this.state = state;
-            state[$changes].setRoot(this.root);
+            this.state[$changes].setRoot(this.root);
         }
-        encode(it = { offset: 0 }, view, bytes = this.sharedBuffer, changeTrees = this.root.changes) {
-            const initialOffset = it.offset; // cache current offset in case we need to resize the buffer
-            const isEncodeAll = this.root.allChanges === changeTrees;
+        encode(it = { offset: 0 }, view, buffer = this.sharedBuffer, changeSetName = "changes", isEncodeAll = changeSetName === "allChanges", initialOffset = it.offset // cache current offset in case we need to resize the buffer
+        ) {
             const hasView = (view !== undefined);
             const rootChangeTree = this.state[$changes];
-            const changeTreesIterator = changeTrees.entries();
-            for (const [changeTree, changes] of changeTreesIterator) {
+            const shouldDiscardChanges = !isEncodeAll && !hasView;
+            const changeTrees = this.root[changeSetName];
+            for (let i = 0, numChangeTrees = changeTrees.length; i < numChangeTrees; i++) {
+                const changeTree = changeTrees[i];
+                // // Root#removeChangeFromChangeSet() is now removing instead of setting to "undefined"
+                // if (changeTree === undefined) { continue; }
+                const operations = changeTree[changeSetName];
                 const ref = changeTree.ref;
-                const ctor = ref['constructor'];
+                const ctor = ref.constructor;
                 const encoder = ctor[$encoder];
                 const filter = ctor[$filter];
+                const metadata = ctor[Symbol.metadata];
+                // try { throw new Error(); } catch (e) {
+                //     // only print if not coming from Reflection.ts
+                //     if (!e.stack.includes("src/Reflection.ts")) {
+                //         console.log("ChangeTree:", { refId: changeTree.refId, ref: ref.constructor.name });
+                //     }
+                // }
                 if (hasView) {
                     if (!view.items.has(changeTree)) {
                         view.invisible.add(changeTree);
@@ -3409,12 +3789,18 @@
                     }
                 }
                 // skip root `refId` if it's the first change tree
-                if (it.offset !== initialOffset || changeTree !== rootChangeTree) {
-                    bytes[it.offset++] = SWITCH_TO_STRUCTURE & 255;
-                    number$1(bytes, changeTree.refId, it);
+                // (unless it "hasView", which will need to revisit the root)
+                if (hasView || it.offset > initialOffset || changeTree !== rootChangeTree) {
+                    buffer[it.offset++] = SWITCH_TO_STRUCTURE & 255;
+                    number$1(buffer, changeTree.refId, it);
                 }
-                const changesIterator = changes.entries();
-                for (const [fieldIndex, operation] of changesIterator) {
+                for (let j = 0, numChanges = operations.operations.length; j < numChanges; j++) {
+                    const fieldIndex = operations.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];
                     //
                     // first pass (encodeAll), identify "filtered" operations without encoding them
                     // they will be encoded per client, based on their view.
@@ -3422,93 +3808,127 @@
                     // TODO: how can we optimize filtering out "encode all" operations?
                     // TODO: avoid checking if no view tags were defined
                     //
-                    if (filter && !filter(ref, fieldIndex, view)) {
-                        // console.log("SKIP FIELD:", { ref: changeTree.ref.constructor.name, fieldIndex, })
+                    if (fieldIndex === undefined || operation === undefined || (filter && !filter(ref, fieldIndex, view))) {
                         // console.log("ADD AS INVISIBLE:", fieldIndex, changeTree.ref.constructor.name)
                         // view?.invisible.add(changeTree);
                         continue;
                     }
-                    // console.log("WILL ENCODE", {
-                    //     ref: changeTree.ref.constructor.name,
-                    //     fieldIndex,
-                    //     operation: OPERATION[operation],
-                    // });
-                    encoder(this, bytes, changeTree, fieldIndex, operation, it, isEncodeAll, hasView);
+                    // try { throw new Error(); } catch (e) {
+                    //     // only print if not coming from Reflection.ts
+                    //     if (!e.stack.includes("src/Reflection.ts")) {
+                    //         console.log("WILL ENCODE", {
+                    //             ref: changeTree.ref.constructor.name,
+                    //             fieldIndex,
+                    //             operation: OPERATION[operation],
+                    //         });
+                    //     }
+                    // }
+                    // console.log("encode...", { ref: changeTree.ref.constructor.name, refId: changeTree.refId, fieldIndex, operation });
+                    encoder(this, buffer, changeTree, fieldIndex, operation, it, isEncodeAll, hasView, metadata);
+                }
+                if (shouldDiscardChanges) {
+                    changeTree.discard();
+                    // Not a new instance anymore
+                    changeTree.isNew = false;
                 }
             }
-            if (it.offset > bytes.byteLength) {
-                const newSize = getNextPowerOf2(this.sharedBuffer.byteLength * 2);
-                console.warn("@colyseus/schema encode buffer overflow. Current buffer size: " + bytes.byteLength + ", encoding offset: " + it.offset + ", new size: " + newSize);
+            if (it.offset > buffer.byteLength) {
+                const newSize = getNextPowerOf2(buffer.byteLength * 2);
+                console.warn(`@colyseus/schema buffer overflow. Encoded state is higher than default BUFFER_SIZE. Use the following to increase default BUFFER_SIZE:
+
+    import { Encoder } from "@colyseus/schema";
+    Encoder.BUFFER_SIZE = ${Math.round(newSize / 1024)} * 1024; // ${Math.round(newSize / 1024)} KB
+`);
                 //
                 // resize buffer and re-encode (TODO: can we avoid re-encoding here?)
                 //
-                this.sharedBuffer = Buffer.allocUnsafeSlow(newSize);
-                return this.encode({ offset: initialOffset }, view);
+                buffer = Buffer.allocUnsafeSlow(newSize);
+                // assign resized buffer to local sharedBuffer
+                if (buffer === this.sharedBuffer) {
+                    this.sharedBuffer = buffer;
+                }
+                return this.encode({ offset: initialOffset }, view, buffer, changeSetName, isEncodeAll);
             }
             else {
-                //
-                // only clear changes after making sure buffer resize is not required.
-                //
-                if (!isEncodeAll && !hasView) {
-                    //
-                    // FIXME: avoid iterating over change trees twice.
-                    //
-                    this.onEndEncode(changeTrees);
-                }
-                // return bytes;
-                return bytes.slice(0, it.offset);
+                // //
+                // // only clear changes after making sure buffer resize is not required.
+                // //
+                // if (shouldClearChanges) {
+                //     //
+                //     // FIXME: avoid iterating over change trees twice.
+                //     //
+                //     this.onEndEncode(changeTrees);
+                // }
+                return buffer.subarray(0, it.offset);
             }
         }
-        encodeAll(it = { offset: 0 }) {
-            // console.log(`encodeAll(), this.$root.allChanges (${this.$root.allChanges.size})`);
-            // Array.from(this.$root.allChanges.entries()).map((item) => {
-            //     console.log("->", item[0].refId, item[0].ref.toJSON());
-            // });
-            return this.encode(it, undefined, this.sharedBuffer, this.root.allChanges);
+        encodeAll(it = { offset: 0 }, buffer = this.sharedBuffer) {
+            // console.log(`\nencodeAll(), this.root.allChanges (${(Object.keys(this.root.allChanges).length)})`);
+            // this.debugChanges("allChanges");
+            return this.encode(it, undefined, buffer, "allChanges", true);
         }
         encodeAllView(view, sharedOffset, it, bytes = this.sharedBuffer) {
             const viewOffset = it.offset;
-            // console.log(`encodeAllView(), this.$root.allFilteredChanges (${this.$root.allFilteredChanges.size})`);
-            // this.debugAllFilteredChanges();
+            // console.log(`\nencodeAllView(), this.root.allFilteredChanges (${(Object.keys(this.root.allFilteredChanges).length)})`);
+            // this.debugChanges("allFilteredChanges");
+            // console.log("\n\nENCODE ALL FOR VIEW...\n\n")
             // try to encode "filtered" changes
-            this.encode(it, view, bytes, this.root.allFilteredChanges);
+            this.encode(it, view, bytes, "allFilteredChanges", true, viewOffset);
             return Buffer.concat([
-                bytes.slice(0, sharedOffset),
-                bytes.slice(viewOffset, it.offset)
+                bytes.subarray(0, sharedOffset),
+                bytes.subarray(viewOffset, it.offset)
             ]);
         }
-        // debugAllFilteredChanges() {
-        //     Array.from(this.$root.allFilteredChanges.entries()).map((item) => {
-        //         console.log("->", { refId: item[0].refId }, item[0].ref.toJSON());
-        //         if (Array.isArray(item[0].ref.toJSON())) {
-        //             item[1].forEach((op, key) => {
-        //                 console.log("  ->", { key, op: OPERATION[op] });
-        //             })
-        //         }
-        //     });
-        // }
+        debugChanges(field) {
+            const rootChangeSet = (typeof (field) === "string")
+                ? this.root[field]
+                : field;
+            rootChangeSet.forEach((changeTree) => {
+                const changeSet = changeTree[field];
+                const metadata = changeTree.ref.constructor[Symbol.metadata];
+                console.log("->", { ref: changeTree.ref.constructor.name, refId: changeTree.refId, changes: Object.keys(changeSet).length });
+                for (const index in changeSet) {
+                    const op = changeSet[index];
+                    console.log("  ->", {
+                        index,
+                        field: metadata?.[index],
+                        op: exports.OPERATION[op],
+                    });
+                }
+            });
+        }
         encodeView(view, sharedOffset, it, bytes = this.sharedBuffer) {
             const viewOffset = it.offset;
-            // try to encode "filtered" changes
-            this.encode(it, view, bytes, this.root.filteredChanges);
+            // console.log(`\nencodeView(), view.changes (${view.changes.size})`);
+            // this.debugChanges(view.changes);
+            // console.log(`\nencodeView(), this.root.filteredChanges (${this.root.filteredChanges.size})`);
+            // this.debugChanges("filteredChanges");
             // encode visibility changes (add/remove for this view)
-            const viewChangesIterator = view.changes.entries();
-            for (const [changeTree, changes] of viewChangesIterator) {
-                if (changes.size === 0) {
-                    // FIXME: avoid having empty changes if no changes were made
-                    // console.log("changes.size === 0", changeTree.ref.constructor.name);
+            const refIds = Object.keys(view.changes);
+            // console.log("ENCODE VIEW:", refIds);
+            for (let i = 0, numRefIds = refIds.length; i < numRefIds; i++) {
+                const refId = refIds[i];
+                const changes = view.changes[refId];
+                const changeTree = this.root.changeTrees[refId];
+                if (changeTree === undefined ||
+                    Object.keys(changes).length === 0 // FIXME: avoid having empty changes if no changes were made
+                ) {
+                    // console.log("changes.size === 0, skip", changeTree.ref.constructor.name);
                     continue;
                 }
                 const ref = changeTree.ref;
-                const ctor = ref['constructor'];
+                const ctor = ref.constructor;
                 const encoder = ctor[$encoder];
+                const metadata = ctor[Symbol.metadata];
                 bytes[it.offset++] = SWITCH_TO_STRUCTURE & 255;
                 number$1(bytes, changeTree.refId, it);
-                const changesIterator = changes.entries();
-                for (const [fieldIndex, operation] of changesIterator) {
+                const keys = Object.keys(changes);
+                for (let i = 0, numChanges = keys.length; i < numChanges; i++) {
+                    const key = keys[i];
+                    const operation = changes[key];
                     // isEncodeAll = false
                     // hasView = true
-                    encoder(this, bytes, changeTree, fieldIndex, operation, it, false, true);
+                    encoder(this, bytes, changeTree, Number(key), operation, it, false, true, metadata);
                 }
             }
             //
@@ -3516,51 +3936,64 @@
             // (to allow re-using StateView's for multiple clients)
             //
             // clear "view" changes after encoding
-            view.changes.clear();
+            view.changes = {};
+            // console.log("FILTERED CHANGES:", this.root.filteredChanges);
+            // try to encode "filtered" changes
+            this.encode(it, view, bytes, "filteredChanges", false, viewOffset);
             return Buffer.concat([
-                bytes.slice(0, sharedOffset),
-                bytes.slice(viewOffset, it.offset)
+                bytes.subarray(0, sharedOffset),
+                bytes.subarray(viewOffset, it.offset)
             ]);
         }
         onEndEncode(changeTrees = this.root.changes) {
-            const changeTreesIterator = changeTrees.entries();
-            for (const [changeTree, _] of changeTreesIterator) {
-                changeTree.endEncode();
-            }
+            // changeTrees.forEach(function(changeTree) {
+            //     changeTree.endEncode();
+            // });
+            // for (const refId in changeTrees) {
+            //     const changeTree = this.root.changeTrees[refId];
+            //     changeTree.endEncode();
+            //     // changeTree.changes.clear();
+            //     // // ArraySchema and MapSchema have a custom "encode end" method
+            //     // changeTree.ref[$onEncodeEnd]?.();
+            //     // // Not a new instance anymore
+            //     // delete changeTree[$isNew];
+            // }
         }
         discardChanges() {
+            // console.log("DISCARD CHANGES!");
             // discard shared changes
-            if (this.root.changes.size > 0) {
-                this.onEndEncode(this.root.changes);
-                this.root.changes.clear();
+            let length = this.root.changes.length;
+            if (length > 0) {
+                while (length--) {
+                    this.root.changes[length]?.endEncode();
+                }
+                this.root.changes.length = 0;
             }
             // discard filtered changes
-            if (this.root.filteredChanges.size > 0) {
-                this.onEndEncode(this.root.filteredChanges);
-                this.root.filteredChanges.clear();
+            length = this.root.filteredChanges.length;
+            if (length > 0) {
+                while (length--) {
+                    this.root.filteredChanges[length]?.endEncode();
+                }
+                this.root.filteredChanges.length = 0;
             }
         }
         tryEncodeTypeId(bytes, baseType, targetType, it) {
             const baseTypeId = this.context.getTypeId(baseType);
             const targetTypeId = this.context.getTypeId(targetType);
+            if (targetTypeId === undefined) {
+                console.warn(`@colyseus/schema WARNING: Class "${targetType.name}" is not registered on TypeRegistry - Please either tag the class with @entity or define a @type() field.`);
+                return;
+            }
             if (baseTypeId !== targetTypeId) {
                 bytes[it.offset++] = TYPE_ID & 255;
                 number$1(bytes, targetTypeId, it);
             }
         }
-    }
-
-    function spliceOne(arr, index) {
-        // manually splice an array
-        if (index === -1 || index >= arr.length) {
-            return false;
-        }
-        const len = arr.length - 1;
-        for (let i = index; i < len; i++) {
-            arr[i] = arr[i + 1];
+        get hasChanges() {
+            return (this.root.changes.length > 0 ||
+                this.root.filteredChanges.length > 0);
         }
-        arr.length = len;
-        return true;
     }
 
     class DecodingWarning extends Error {
@@ -3641,8 +4074,9 @@
                 // Ensure child schema instances have their references removed as well.
                 //
                 if (Metadata.isValidInstance(ref)) {
-                    const metadata = ref['constructor'][Symbol.metadata];
-                    for (const field in metadata) {
+                    const metadata = ref.constructor[Symbol.metadata];
+                    for (const index in metadata) {
+                        const field = metadata[index].name;
                         const childRefId = typeof (ref[field]) === "object" && this.refIds.get(ref[field]);
                         if (childRefId) {
                             this.removeRef(childRefId);
@@ -3689,21 +4123,21 @@
     class Decoder {
         constructor(root, context) {
             this.currentRefId = 0;
-            this.setRoot(root);
+            this.setState(root);
             this.context = context || new TypeContext(root.constructor);
             // console.log(">>>>>>>>>>>>>>>> Decoder types");
             // this.context.schemas.forEach((id, schema) => {
             //     console.log("type:", id, schema.name, Object.keys(schema[Symbol.metadata]));
             // });
         }
-        setRoot(root) {
+        setState(root) {
             this.state = root;
-            this.$root = new ReferenceTracker();
-            this.$root.addRef(0, root);
+            this.root = new ReferenceTracker();
+            this.root.addRef(0, root);
         }
         decode(bytes, it = { offset: 0 }, ref = this.state) {
             const allChanges = [];
-            const $root = this.$root;
+            const $root = this.root;
             const totalBytes = bytes.byteLength;
             let decoder = ref['constructor'][$decoder];
             this.currentRefId = 0;
@@ -3723,7 +4157,7 @@
                     }
                     ref[$onDecodeEnd]?.();
                     ref = nextRef;
-                    decoder = ref['constructor'][$decoder];
+                    decoder = ref.constructor[$decoder];
                     continue;
                 }
                 const result = decoder(this, bytes, it, ref, allChanges);
@@ -3784,7 +4218,7 @@
                     previousValue: value
                 });
                 if (needRemoveRef) {
-                    this.$root.removeRef(this.$root.refIds.get(value));
+                    this.root.removeRef(this.root.refIds.get(value));
                 }
             });
         }
@@ -3824,14 +4258,27 @@
             super(...arguments);
             this.types = new ArraySchema();
         }
-        static encode(instance, context) {
-            if (!context) {
-                context = new TypeContext(instance.constructor);
-            }
+        /**
+         * Encodes the TypeContext of an Encoder into a buffer.
+         *
+         * @param encoder Encoder instance
+         * @param it
+         * @returns
+         */
+        static encode(encoder, it = { offset: 0 }) {
+            const context = encoder.context;
             const reflection = new Reflection();
-            const encoder = new Encoder(reflection);
+            const reflectionEncoder = new Encoder(reflection);
+            // rootType is usually the first schema passed to the Encoder
+            // (unless it inherits from another schema)
+            const rootType = context.schemas.get(encoder.state.constructor);
+            if (rootType > 0) {
+                reflection.rootType = rootType;
+            }
             const buildType = (currentType, metadata) => {
-                for (const fieldName in metadata) {
+                for (const fieldIndex in metadata) {
+                    const index = Number(fieldIndex);
+                    const fieldName = metadata[index].name;
                     // skip fields from parent classes
                     if (!Object.prototype.hasOwnProperty.call(metadata, fieldName)) {
                         continue;
@@ -3839,7 +4286,7 @@
                     const field = new ReflectionField();
                     field.name = fieldName;
                     let fieldType;
-                    const type = metadata[fieldName].type;
+                    const type = metadata[index].type;
                     if (typeof (type) === "string") {
                         fieldType = type;
                     }
@@ -3881,66 +4328,335 @@
                 }
                 buildType(type, klass[Symbol.metadata]);
             }
-            const it = { offset: 0 };
-            const buf = encoder.encodeAll(it);
+            const buf = reflectionEncoder.encodeAll(it);
             return Buffer.from(buf, 0, it.offset);
         }
+        /**
+         * Decodes the TypeContext from a buffer into a Decoder instance.
+         *
+         * @param bytes Reflection.encode() output
+         * @param it
+         * @returns Decoder instance
+         */
         static decode(bytes, it) {
             const reflection = new Reflection();
             const reflectionDecoder = new Decoder(reflection);
             reflectionDecoder.decode(bytes, it);
-            const context = new TypeContext();
-            const schemaTypes = reflection.types.reduce((types, reflectionType) => {
-                const parentKlass = types[reflectionType.extendsId] || Schema;
-                const schema = class _ extends parentKlass {
+            const typeContext = new TypeContext();
+            // 1st pass, initialize metadata + inheritance
+            reflection.types.forEach((reflectionType) => {
+                const parentClass = typeContext.get(reflectionType.extendsId) ?? Schema;
+                const schema = class _ extends parentClass {
                 };
-                // const _metadata = Object.create(_classSuper[Symbol.metadata] ?? null);
-                const _metadata = parentKlass && parentKlass[Symbol.metadata] || Object.create(null);
-                Object.defineProperty(schema, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 // register for inheritance support
                 TypeContext.register(schema);
-                const typeid = reflectionType.id;
-                types[typeid] = schema;
-                context.add(schema, typeid);
-                return types;
+                // // for inheritance support
+                // Metadata.initialize(schema);
+                typeContext.add(schema, reflectionType.id);
             }, {});
-            reflection.types.forEach((reflectionType) => {
-                const schemaType = schemaTypes[reflectionType.id];
-                const metadata = schemaType[Symbol.metadata];
-                const parentKlass = reflection.types[reflectionType.extendsId];
-                const parentFieldIndex = parentKlass && parentKlass.fields.length || 0;
+            // define fields
+            const addFields = (metadata, reflectionType, parentFieldIndex) => {
                 reflectionType.fields.forEach((field, i) => {
                     const fieldIndex = parentFieldIndex + i;
                     if (field.referencedType !== undefined) {
                         let fieldType = field.type;
-                        let refType = schemaTypes[field.referencedType];
+                        let refType = typeContext.get(field.referencedType);
                         // map or array of primitive type (-1)
                         if (!refType) {
                             const typeInfo = field.type.split(":");
                             fieldType = typeInfo[0];
-                            refType = typeInfo[1];
+                            refType = typeInfo[1]; // string
                         }
                         if (fieldType === "ref") {
-                            // type(refType)(schemaType.prototype, field.name);
                             Metadata.addField(metadata, fieldIndex, field.name, refType);
                         }
                         else {
-                            // type({ [fieldType]: refType } as DefinitionType)(schemaType.prototype, field.name);
                             Metadata.addField(metadata, fieldIndex, field.name, { [fieldType]: refType });
                         }
                     }
                     else {
-                        // type(field.type as PrimitiveType)(schemaType.prototype, field.name);
                         Metadata.addField(metadata, fieldIndex, field.name, field.type);
                     }
                 });
+            };
+            // 2nd pass, set fields
+            reflection.types.forEach((reflectionType) => {
+                const schema = typeContext.get(reflectionType.id);
+                // for inheritance support
+                const metadata = Metadata.initialize(schema);
+                const inheritedTypes = [];
+                let parentType = reflectionType;
+                do {
+                    inheritedTypes.push(parentType);
+                    parentType = reflection.types.find((t) => t.id === parentType.extendsId);
+                } while (parentType);
+                let parentFieldIndex = 0;
+                inheritedTypes.reverse().forEach((reflectionType) => {
+                    // add fields from all inherited classes
+                    // TODO: refactor this to avoid adding fields from parent classes
+                    addFields(metadata, reflectionType, parentFieldIndex);
+                    parentFieldIndex += reflectionType.fields.length;
+                });
             });
-            return new (schemaTypes[0])();
+            const state = new (typeContext.get(reflection.rootType || 0))();
+            return new Decoder(state, typeContext);
         }
     }
     __decorate([
         type([ReflectionType])
     ], Reflection.prototype, "types", void 0);
+    __decorate([
+        type("number")
+    ], Reflection.prototype, "rootType", void 0);
+
+    function getDecoderStateCallbacks(decoder) {
+        const $root = decoder.root;
+        const callbacks = $root.callbacks;
+        const onAddCalls = new WeakMap();
+        let currentOnAddCallback;
+        decoder.triggerChanges = function (allChanges) {
+            const uniqueRefIds = new Set();
+            for (let i = 0, l = allChanges.length; i < l; i++) {
+                const change = allChanges[i];
+                const refId = change.refId;
+                const ref = change.ref;
+                const $callbacks = callbacks[refId];
+                if (!$callbacks) {
+                    continue;
+                }
+                //
+                // trigger onRemove on child structure.
+                //
+                if ((change.op & exports.OPERATION.DELETE) === exports.OPERATION.DELETE &&
+                    change.previousValue instanceof Schema) {
+                    const deleteCallbacks = callbacks[$root.refIds.get(change.previousValue)]?.[exports.OPERATION.DELETE];
+                    for (let i = deleteCallbacks?.length - 1; i >= 0; i--) {
+                        deleteCallbacks[i]();
+                    }
+                }
+                if (ref instanceof Schema) {
+                    //
+                    // Handle schema instance
+                    //
+                    if (!uniqueRefIds.has(refId)) {
+                        // trigger onChange
+                        const replaceCallbacks = $callbacks?.[exports.OPERATION.REPLACE];
+                        for (let i = replaceCallbacks?.length - 1; i >= 0; i--) {
+                            replaceCallbacks[i]();
+                            // try {
+                            // } catch (e) {
+                            //     console.error(e);
+                            // }
+                        }
+                    }
+                    if ($callbacks.hasOwnProperty(change.field)) {
+                        const fieldCallbacks = $callbacks[change.field];
+                        for (let i = fieldCallbacks?.length - 1; i >= 0; i--) {
+                            fieldCallbacks[i](change.value, change.previousValue);
+                            // try {
+                            // } catch (e) {
+                            //     console.error(e);
+                            // }
+                        }
+                    }
+                }
+                else {
+                    //
+                    // Handle collection of items
+                    //
+                    if ((change.op & exports.OPERATION.DELETE) === exports.OPERATION.DELETE) {
+                        //
+                        // FIXME: `previousValue` should always be available.
+                        //
+                        if (change.previousValue !== undefined) {
+                            // triger onRemove
+                            const deleteCallbacks = $callbacks[exports.OPERATION.DELETE];
+                            for (let i = deleteCallbacks?.length - 1; i >= 0; i--) {
+                                deleteCallbacks[i](change.previousValue, change.dynamicIndex ?? change.field);
+                            }
+                        }
+                        // Handle DELETE_AND_ADD operations
+                        if ((change.op & exports.OPERATION.ADD) === exports.OPERATION.ADD) {
+                            const addCallbacks = $callbacks[exports.OPERATION.ADD];
+                            for (let i = addCallbacks?.length - 1; i >= 0; i--) {
+                                addCallbacks[i](change.value, change.dynamicIndex ?? change.field);
+                            }
+                        }
+                    }
+                    else if ((change.op & exports.OPERATION.ADD) === exports.OPERATION.ADD && change.previousValue === undefined) {
+                        // triger onAdd
+                        const addCallbacks = $callbacks[exports.OPERATION.ADD];
+                        for (let i = addCallbacks?.length - 1; i >= 0; i--) {
+                            addCallbacks[i](change.value, change.dynamicIndex ?? change.field);
+                        }
+                    }
+                    // trigger onChange
+                    if (change.value !== change.previousValue) {
+                        const replaceCallbacks = $callbacks[exports.OPERATION.REPLACE];
+                        for (let i = replaceCallbacks?.length - 1; i >= 0; i--) {
+                            replaceCallbacks[i](change.value, change.dynamicIndex ?? change.field);
+                        }
+                    }
+                }
+                uniqueRefIds.add(refId);
+            }
+        };
+        function getProxy(metadataOrType, context) {
+            let metadata = context.instance?.constructor[Symbol.metadata] || metadataOrType;
+            let isCollection = ((context.instance && typeof (context.instance['forEach']) === "function") ||
+                (metadataOrType && typeof (metadataOrType[Symbol.metadata]) === "undefined"));
+            if (metadata && !isCollection) {
+                const onAddListen = function (ref, prop, callback, immediate) {
+                    // immediate trigger
+                    if (immediate &&
+                        context.instance[prop] !== undefined &&
+                        !onAddCalls.has(currentOnAddCallback) // Workaround for https://github.com/colyseus/schema/issues/147
+                    ) {
+                        callback(context.instance[prop], undefined);
+                    }
+                    return $root.addCallback($root.refIds.get(ref), prop, callback);
+                };
+                /**
+                 * Schema instances
+                 */
+                return new Proxy({
+                    listen: function listen(prop, callback, immediate = true) {
+                        if (context.instance) {
+                            return onAddListen(context.instance, prop, callback, immediate);
+                        }
+                        else {
+                            // collection instance not received yet
+                            let detachCallback = () => { };
+                            context.onInstanceAvailable((ref, existing) => {
+                                detachCallback = onAddListen(ref, prop, callback, immediate && existing && !onAddCalls.has(currentOnAddCallback));
+                            });
+                            return () => detachCallback();
+                        }
+                    },
+                    onChange: function onChange(callback) {
+                        return $root.addCallback($root.refIds.get(context.instance), exports.OPERATION.REPLACE, callback);
+                    },
+                    //
+                    // TODO: refactor `bindTo()` implementation.
+                    // There is room for improvement.
+                    //
+                    bindTo: function bindTo(targetObject, properties) {
+                        if (!properties) {
+                            properties = Object.keys(metadata).map((index) => metadata[index].name);
+                        }
+                        return $root.addCallback($root.refIds.get(context.instance), exports.OPERATION.REPLACE, () => {
+                            properties.forEach((prop) => targetObject[prop] = context.instance[prop]);
+                        });
+                    }
+                }, {
+                    get(target, prop) {
+                        const metadataField = metadata[metadata[prop]];
+                        if (metadataField) {
+                            const instance = context.instance?.[prop];
+                            const onInstanceAvailable = ((callback) => {
+                                const unbind = $(context.instance).listen(prop, (value, _) => {
+                                    callback(value, false);
+                                    // FIXME: by "unbinding" the callback here,
+                                    // it will not support when the server
+                                    // re-instantiates the instance.
+                                    //
+                                    unbind?.();
+                                }, false);
+                                // has existing value
+                                if ($root.refIds.get(instance) !== undefined) {
+                                    callback(instance, true);
+                                }
+                            });
+                            return getProxy(metadataField.type, {
+                                // make sure refId is available, otherwise need to wait for the instance to be available.
+                                instance: ($root.refIds.get(instance) && instance),
+                                parentInstance: context.instance,
+                                onInstanceAvailable,
+                            });
+                        }
+                        else {
+                            // accessing the function
+                            return target[prop];
+                        }
+                    },
+                    has(target, prop) { return metadata[prop] !== undefined; },
+                    set(_, _1, _2) { throw new Error("not allowed"); },
+                    deleteProperty(_, _1) { throw new Error("not allowed"); },
+                });
+            }
+            else {
+                /**
+                 * Collection instances
+                 */
+                const onAdd = function (ref, callback, immediate) {
+                    // Trigger callback on existing items
+                    if (immediate) {
+                        ref.forEach((v, k) => callback(v, k));
+                    }
+                    return $root.addCallback($root.refIds.get(ref), exports.OPERATION.ADD, (value, key) => {
+                        onAddCalls.set(callback, true);
+                        currentOnAddCallback = callback;
+                        callback(value, key);
+                        onAddCalls.delete(callback);
+                        currentOnAddCallback = undefined;
+                    });
+                };
+                const onRemove = function (ref, callback) {
+                    return $root.addCallback($root.refIds.get(ref), exports.OPERATION.DELETE, callback);
+                };
+                return new Proxy({
+                    onAdd: function (callback, immediate = true) {
+                        //
+                        // https://github.com/colyseus/schema/issues/147
+                        // If parent instance has "onAdd" registered, avoid triggering immediate callback.
+                        //
+                        if (context.instance) {
+                            return onAdd(context.instance, callback, immediate && !onAddCalls.has(currentOnAddCallback));
+                        }
+                        else if (context.onInstanceAvailable) {
+                            // collection instance not received yet
+                            let detachCallback = () => { };
+                            context.onInstanceAvailable((ref, existing) => {
+                                detachCallback = onAdd(ref, callback, immediate && existing && !onAddCalls.has(currentOnAddCallback));
+                            });
+                            return () => detachCallback();
+                        }
+                    },
+                    onRemove: function (callback) {
+                        if (context.onInstanceAvailable) {
+                            // collection instance not received yet
+                            let detachCallback = () => { };
+                            context.onInstanceAvailable((ref) => {
+                                detachCallback = onRemove(ref, callback);
+                            });
+                            return () => detachCallback();
+                        }
+                        else if (context.instance) {
+                            return onRemove(context.instance, callback);
+                        }
+                    },
+                }, {
+                    get(target, prop) {
+                        if (!target[prop]) {
+                            throw new Error(`Can't access '${prop}' through callback proxy. access the instance directly.`);
+                        }
+                        return target[prop];
+                    },
+                    has(target, prop) { return target[prop] !== undefined; },
+                    set(_, _1, _2) { throw new Error("not allowed"); },
+                    deleteProperty(_, _1) { throw new Error("not allowed"); },
+                });
+            }
+        }
+        function $(instance) {
+            return getProxy(undefined, { instance });
+        }
+        return $;
+    }
+
+    function getRawChangesCallback(decoder, callback) {
+        decoder.triggerChanges = callback;
+    }
 
     class StateView {
         constructor() {
@@ -3956,31 +4672,32 @@
              * Manual "ADD" operations for changes per ChangeTree, specific to this view.
              * (This is used to force encoding a property, even if it was not changed)
              */
-            this.changes = new Map();
+            this.changes = {};
         }
         // TODO: allow to set multiple tags at once
-        add(obj, tag = DEFAULT_VIEW_TAG) {
+        add(obj, tag = DEFAULT_VIEW_TAG, checkIncludeParent = true) {
             if (!obj[$changes]) {
                 console.warn("StateView#add(), invalid object:", obj);
                 return this;
             }
-            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
+            // FIXME: ArraySchema/MapSchema do not have metadata
             const metadata = obj.constructor[Symbol.metadata];
-            // add parent ChangeTree's, if they are invisible to this view
-            // TODO: REFACTOR addParent()
-            this.addParent(changeTree, tag);
+            const changeTree = obj[$changes];
+            this.items.add(changeTree);
+            // add parent ChangeTree's
+            // - if it was invisible to this view
+            // - if it were previously filtered out
+            if (checkIncludeParent && changeTree.parent) {
+                this.addParent(changeTree.parent[$changes], changeTree.parentIndex, tag);
+            }
             //
             // TODO: when adding an item of a MapSchema, the changes may not
             // be set (only the parent's changes are set)
             //
-            let changes = this.changes.get(changeTree);
+            let changes = this.changes[changeTree.refId];
             if (changes === undefined) {
-                changes = new Map();
-                this.changes.set(changeTree, changes);
+                changes = {};
+                this.changes[changeTree.refId] = changes;
             }
             // set tag
             if (tag !== DEFAULT_VIEW_TAG) {
@@ -3996,82 +4713,76 @@
                     tags = this.tags.get(changeTree);
                 }
                 tags.add(tag);
-                // console.log("BY TAG:", tag);
                 // Ref: add tagged properties
-                metadata?.[-3]?.[tag]?.forEach((index) => {
+                metadata?.[$fieldIndexesByViewTag]?.[tag]?.forEach((index) => {
                     if (changeTree.getChange(index) !== exports.OPERATION.DELETE) {
-                        changes.set(index, exports.OPERATION.ADD);
+                        changes[index] = exports.OPERATION.ADD;
                     }
                 });
             }
             else {
-                // console.log("DEFAULT TAG", changeTree.allChanges);
-                // // add default tag properties
-                // metadata?.[-3]?.[DEFAULT_VIEW_TAG]?.forEach((index) => {
-                //     if (changeTree.getChange(index) !== OPERATION.DELETE) {
-                //         changes.set(index, OPERATION.ADD);
-                //     }
-                // });
-                const allChangesSet = (changeTree.isFiltered || changeTree.isPartiallyFiltered)
+                const isInvisible = this.invisible.has(changeTree);
+                const changeSet = (changeTree.isFiltered || changeTree.isPartiallyFiltered)
                     ? changeTree.allFilteredChanges
                     : changeTree.allChanges;
-                const it = allChangesSet.keys();
-                const isInvisible = this.invisible.has(changeTree);
-                for (const index of it) {
-                    if ((isInvisible || metadata?.[metadata?.[index]].tag === tag) &&
-                        changeTree.getChange(index) !== exports.OPERATION.DELETE) {
-                        changes.set(index, exports.OPERATION.ADD);
+                for (let i = 0, len = changeSet.operations.length; i < len; i++) {
+                    const index = changeSet.operations[i];
+                    if (index === undefined) {
+                        continue;
+                    } // skip "undefined" indexes
+                    const op = changeTree.indexedOperations[index];
+                    const tagAtIndex = metadata?.[index].tag;
+                    if ((isInvisible || // if "invisible", include all
+                        tagAtIndex === undefined || // "all change" with no tag
+                        tagAtIndex === tag // tagged property
+                    ) &&
+                        op !== exports.OPERATION.DELETE) {
+                        changes[index] = op;
                     }
                 }
             }
-            // TODO: avoid unnecessary iteration here
-            while (changeTree.parent &&
-                (changeTree = changeTree.parent[$changes]) &&
-                (changeTree.isFiltered || changeTree.isPartiallyFiltered)) {
-                this.items.add(changeTree);
-            }
+            // Add children of this ChangeTree to this view
+            changeTree.forEachChild((change, index) => {
+                // Do not ADD children that don't have the same tag
+                if (metadata && metadata[index].tag !== tag) {
+                    return;
+                }
+                this.add(change.ref, tag, false);
+            });
             return this;
         }
-        addParent(changeTree, tag) {
-            const parentRef = changeTree.parent;
-            if (!parentRef) {
-                return;
+        addParent(changeTree, parentIndex, tag) {
+            // view must have all "changeTree" parent tree
+            this.items.add(changeTree);
+            // add parent's parent
+            const parentChangeTree = changeTree.parent?.[$changes];
+            if (parentChangeTree && (parentChangeTree.isFiltered || parentChangeTree.isPartiallyFiltered)) {
+                this.addParent(parentChangeTree, changeTree.parentIndex, tag);
             }
-            const parentChangeTree = parentRef[$changes];
-            const parentIndex = changeTree.parentIndex;
-            if (!this.invisible.has(parentChangeTree)) {
-                // parent is already available, no need to add it!
+            // parent is already available, no need to add it!
+            if (!this.invisible.has(changeTree)) {
                 return;
             }
-            this.addParent(parentChangeTree, tag);
             // add parent's tag properties
-            if (parentChangeTree.getChange(parentIndex) !== exports.OPERATION.DELETE) {
-                let parentChanges = this.changes.get(parentChangeTree);
-                if (parentChanges === undefined) {
-                    parentChanges = new Map();
-                    this.changes.set(parentChangeTree, parentChanges);
+            if (changeTree.getChange(parentIndex) !== exports.OPERATION.DELETE) {
+                let changes = this.changes[changeTree.refId];
+                if (changes === undefined) {
+                    changes = {};
+                    this.changes[changeTree.refId] = changes;
                 }
-                // console.log("add parent change", {
-                //     parentIndex,
-                //     parentChanges,
-                //     parentChange: (
-                //         parentChangeTree.getChange(parentIndex) &&
-                //         OPERATION[parentChangeTree.getChange(parentIndex)]
-                //     ),
-                // })
                 if (!this.tags) {
                     this.tags = new WeakMap();
                 }
                 let tags;
-                if (!this.tags.has(parentChangeTree)) {
+                if (!this.tags.has(changeTree)) {
                     tags = new Set();
-                    this.tags.set(parentChangeTree, tags);
+                    this.tags.set(changeTree, tags);
                 }
                 else {
-                    tags = this.tags.get(parentChangeTree);
+                    tags = this.tags.get(changeTree);
                 }
                 tags.add(tag);
-                parentChanges.set(parentIndex, exports.OPERATION.ADD);
+                changes[parentIndex] = exports.OPERATION.ADD;
             }
         }
         remove(obj, tag = DEFAULT_VIEW_TAG) {
@@ -4083,32 +4794,32 @@
             this.items.delete(changeTree);
             const ref = changeTree.ref;
             const metadata = ref.constructor[Symbol.metadata];
-            let changes = this.changes.get(changeTree);
+            let changes = this.changes[changeTree.refId];
             if (changes === undefined) {
-                changes = new Map();
-                this.changes.set(changeTree, changes);
+                changes = {};
+                this.changes[changeTree.refId] = changes;
             }
             if (tag === DEFAULT_VIEW_TAG) {
                 // parent is collection (Map/Array)
                 const parent = changeTree.parent;
                 if (!Metadata.isValidInstance(parent)) {
                     const parentChangeTree = parent[$changes];
-                    let changes = this.changes.get(parentChangeTree);
+                    let changes = this.changes[parentChangeTree.refId];
                     if (changes === undefined) {
-                        changes = new Map();
-                        this.changes.set(parentChangeTree, changes);
+                        changes = {};
+                        this.changes[parentChangeTree.refId] = changes;
                     }
                     // DELETE / DELETE BY REF ID
-                    changes.set(changeTree.parentIndex, exports.OPERATION.DELETE);
+                    changes[changeTree.parentIndex] = exports.OPERATION.DELETE;
                 }
                 else {
                     // delete all "tagged" properties.
-                    metadata[-2].forEach((index) => changes.set(index, exports.OPERATION.DELETE));
+                    metadata[$viewFieldIndexes].forEach((index) => changes[index] = exports.OPERATION.DELETE);
                 }
             }
             else {
                 // delete only tagged properties
-                metadata[-3][tag].forEach((index) => changes.set(index, exports.OPERATION.DELETE));
+                metadata[$fieldIndexesByViewTag][tag].forEach((index) => changes[index] = exports.OPERATION.DELETE);
             }
             // remove tag
             if (this.tags && this.tags.has(changeTree)) {
@@ -4166,10 +4877,11 @@
     exports.encode = encode;
     exports.encodeKeyValueOperation = encodeArray;
     exports.encodeSchemaOperation = encodeSchemaOperation;
+    exports.getDecoderStateCallbacks = getDecoderStateCallbacks;
+    exports.getRawChangesCallback = getRawChangesCallback;
     exports.registerType = registerType;
+    exports.schema = schema;
     exports.type = type;
     exports.view = view;
 
-    Object.defineProperty(exports, '__esModule', { value: true });
-
 }));