@colyseus/schema 3.0.0 → 3.0.2

package/lib/Encoder.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Encoder = void 0;
-const annotations_1 = require("./annotations");
-const consts_1 = require("./changes/consts");
-const encode = require("./encoding/encode");
-const spec_1 = require("./spec");
-const ChangeTree_1 = require("./changes/ChangeTree");
-class Encoder {
-    constructor(root) {
-        this.setRoot(root);
-        //
-        // TODO: cache and restore "Context" based on root schema
-        // (to avoid creating a new context for each new room)
-        //
-        this.context = new annotations_1.TypeContext(root.constructor);
-        // console.log(">>>>>>>>>>>>>>>> Encoder types");
-        // this.context.schemas.forEach((id, schema) => {
-        //     console.log("type:", id, schema.name, Object.keys(schema[Symbol.metadata]));
-        // });
-    }
-    setRoot(root) {
-        this.$root = new ChangeTree_1.Root();
-        this.root = root;
-        root[consts_1.$changes].setRoot(this.$root);
-    }
-    encode(encodeAll = false, bytes = [], useFilters = false) {
-        const rootChangeTree = this.root[consts_1.$changes];
-        // const changeTrees: ChangeTracker[] = Array.from(this.$root['currentQueue']);
-        const changeTrees = this.$root.changes;
-        const numChangeTrees = changeTrees.length;
-        // let numChangeTrees = 1;
-        // console.log("--------------------- ENCODE ----------------");
-        // console.log("Encode order:", changeTrees.map((c) => c.ref['constructor'].name));
-        for (let i = 0; i < numChangeTrees; i++) {
-            const changeTree = changeTrees[i];
-            const ref = changeTree.ref;
-            // Generate unique refId for the ChangeTree.
-            changeTree.ensureRefId();
-            // root `refId` is skipped.
-            if (changeTree !== rootChangeTree &&
-                (changeTree.changed || encodeAll)) {
-                encode.uint8(bytes, spec_1.SWITCH_TO_STRUCTURE);
-                encode.number(bytes, changeTree.refId);
-            }
-            const changes = (encodeAll)
-                ? changeTree.allChanges.values()
-                : changeTree.changes.values();
-            let change;
-            while (!(change = changes.next()).done) {
-                const operation = (encodeAll)
-                    ? spec_1.OPERATION.ADD
-                    : change.value.op;
-                const fieldIndex = (encodeAll)
-                    ? change.value
-                    : change.value.index;
-                const encoder = ref['constructor'][consts_1.$encoder];
-                encoder(this, bytes, changeTree, fieldIndex, operation);
-            }
-            if (!encodeAll && !useFilters) {
-                changeTree.discard();
-            }
-        }
-        return bytes;
-    }
-    encodeAll(useFilters) {
-        return this.encode(true, [], useFilters);
-    }
-    tryEncodeTypeId(bytes, baseType, targetType) {
-        const baseTypeId = this.context.getTypeId(baseType);
-        const targetTypeId = this.context.getTypeId(targetType);
-        if (baseTypeId !== targetTypeId) {
-            encode.uint8(bytes, spec_1.TYPE_ID);
-            encode.number(bytes, targetTypeId);
-        }
-    }
-}
-exports.Encoder = Encoder;
-//# sourceMappingURL=Encoder.js.map

package/lib/Encoder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Encoder.js","sourceRoot":"","sources":["../src/Encoder.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Schema } from \"./Schema\";\nimport { TypeContext } from \"./annotations\";\nimport { $changes, $encoder } from \"./changes/consts\";\n\nimport * as encode from \"./encoding/encode\";\nimport { SWITCH_TO_STRUCTURE, TYPE_ID, OPERATION } from './spec';\nimport { ChangeOperation, ChangeTracker, Root } from \"./changes/ChangeTree\";\nimport { encodeKeyValueOperation, encodeSchemaOperation } from \"./changes/EncodeOperation\";\n\nexport class Encoder<T extends Schema = any> {\n    context: TypeContext;\n\n    root: T;\n    $root: Root;\n\n    constructor(root: T) {\n        this.setRoot(root);\n\n        //\n        // TODO: cache and restore \"Context\" based on root schema\n        // (to avoid creating a new context for each new room)\n        //\n        this.context = new TypeContext(root.constructor as typeof Schema);\n\n        // console.log(\">>>>>>>>>>>>>>>> Encoder types\");\n        // this.context.schemas.forEach((id, schema) => {\n        //     console.log(\"type:\", id, schema.name, Object.keys(schema[Symbol.metadata]));\n        // });\n    }\n\n    protected setRoot(root: T) {\n        this.$root = new Root();\n        this.root = root;\n        root[$changes].setRoot(this.$root);\n    }\n\n    encode(\n        encodeAll = false,\n        bytes: number[] = [],\n        useFilters: boolean = false,\n    ) {\n        const rootChangeTree = this.root[$changes];\n\n        // const changeTrees: ChangeTracker[] = Array.from(this.$root['currentQueue']);\n        const changeTrees: ChangeTracker[] = this.$root.changes;\n        const numChangeTrees = changeTrees.length;\n        // let numChangeTrees = 1;\n\n        // console.log(\"--------------------- ENCODE ----------------\");\n        // console.log(\"Encode order:\", changeTrees.map((c) => c.ref['constructor'].name));\n        for (let i = 0; i < numChangeTrees; i++) {\n            const changeTree = changeTrees[i];\n            const ref = changeTree.ref;\n\n            // Generate unique refId for the ChangeTree.\n            changeTree.ensureRefId();\n\n            // root `refId` is skipped.\n            if (\n                changeTree !== rootChangeTree &&\n                (changeTree.changed || encodeAll)\n            ) {\n                encode.uint8(bytes, SWITCH_TO_STRUCTURE);\n                encode.number(bytes, changeTree.refId);\n            }\n\n            const changes: IterableIterator<ChangeOperation | number> = (encodeAll)\n                ? changeTree.allChanges.values()\n                : changeTree.changes.values();\n\n            let change: IteratorResult<ChangeOperation | number>;\n            while (!(change = changes.next()).done) {\n                const operation = (encodeAll)\n                    ? OPERATION.ADD\n                    : change.value.op;\n\n                const fieldIndex = (encodeAll)\n                    ? change.value\n                    : change.value.index;\n\n                const encoder = ref['constructor'][$encoder];\n                encoder(this, bytes, changeTree, fieldIndex, operation);\n            }\n\n            if (!encodeAll && !useFilters) {\n                changeTree.discard();\n            }\n        }\n\n        return bytes;\n    }\n\n    encodeAll (useFilters?: boolean) {\n        return this.encode(true, [], useFilters);\n    }\n\n    tryEncodeTypeId (bytes: number[], baseType: typeof Schema, targetType: typeof Schema) {\n        const baseTypeId = this.context.getTypeId(baseType);\n        const targetTypeId = this.context.getTypeId(targetType);\n\n        if (baseTypeId !== targetTypeId) {\n            encode.uint8(bytes, TYPE_ID);\n            encode.number(bytes, targetTypeId);\n        }\n    }\n\n}"]}

package/lib/bench_encode.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/bench_encode.js

@@ -1,130 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const nanoid_1 = require("nanoid");
-const _1 = require(".");
-class Attribute extends _1.Schema {
-}
-__decorate([
-    (0, _1.type)("string")
-], Attribute.prototype, "name", void 0);
-__decorate([
-    (0, _1.type)("number")
-], Attribute.prototype, "value", void 0);
-class Item extends _1.Schema {
-    constructor() {
-        super(...arguments);
-        this.attributes = new _1.ArraySchema();
-    }
-}
-__decorate([
-    (0, _1.type)("number")
-], Item.prototype, "price", void 0);
-__decorate([
-    (0, _1.type)([Attribute])
-], Item.prototype, "attributes", void 0);
-class Position extends _1.Schema {
-}
-__decorate([
-    (0, _1.type)("number")
-], Position.prototype, "x", void 0);
-__decorate([
-    (0, _1.type)("number")
-], Position.prototype, "y", void 0);
-class Player extends _1.Schema {
-    constructor() {
-        super(...arguments);
-        this.position = new Position();
-        this.items = new _1.MapSchema();
-    }
-}
-__decorate([
-    (0, _1.type)(Position)
-], Player.prototype, "position", void 0);
-__decorate([
-    (0, _1.type)({ map: Item })
-], Player.prototype, "items", void 0);
-class State extends _1.Schema {
-    constructor() {
-        super(...arguments);
-        this.players = new _1.MapSchema();
-    }
-}
-__decorate([
-    (0, _1.type)({ map: Player })
-], State.prototype, "players", void 0);
-__decorate([
-    (0, _1.type)("string")
-], State.prototype, "currentTurn", void 0);
-const state = new State();
-_1.Encoder.BUFFER_SIZE = 4096 * 4096;
-const encoder = new _1.Encoder(state);
-let now = Date.now();
-// for (let i = 0; i < 10000; i++) {
-//     const player = new Player();
-//     state.players.set(`p-${nanoid()}`, player);
-//
-//     player.position.x = (i + 1) * 100;
-//     player.position.y = (i + 1) * 100;
-//     for (let j = 0; j < 10; j++) {
-//         const item = new Item();
-//         player.items.set(`item-${j}`, item);
-//         item.price = (i + 1) * 50;
-//         for (let k = 0; k < 5; k++) {
-//             const attr = new Attribute();
-//             attr.name = `Attribute ${k}`;
-//             attr.value = k;
-//             item.attributes.push(attr);
-//         }
-//     }
-// }
-// console.log("time to make changes:", Date.now() - now);
-// measure time to .encodeAll()
-now = Date.now();
-// for (let i = 0; i < 1000; i++) {
-//     encoder.encodeAll();
-// }
-// console.log(Date.now() - now);
-const total = 100;
-const allEncodes = Date.now();
-let avgTimeToEncode = 0;
-let avgTimeToMakeChanges = 0;
-for (let i = 0; i < total; i++) {
-    now = Date.now();
-    for (let j = 0; j < 50; j++) {
-        const player = new Player();
-        state.players.set(`p-${(0, nanoid_1.nanoid)()}`, player);
-        player.position.x = (j + 1) * 100;
-        player.position.y = (j + 1) * 100;
-        for (let k = 0; k < 10; k++) {
-            const item = new Item();
-            item.price = (j + 1) * 50;
-            for (let l = 0; l < 5; l++) {
-                const attr = new Attribute();
-                attr.name = `Attribute ${l}`;
-                attr.value = l;
-                item.attributes.push(attr);
-            }
-            player.items.set(`item-${k}`, item);
-        }
-    }
-    const timeToMakeChanges = Date.now() - now;
-    console.log("time to make changes:", timeToMakeChanges);
-    avgTimeToMakeChanges += timeToMakeChanges;
-    now = Date.now();
-    encoder.encode();
-    encoder.discardChanges();
-    const timeToEncode = Date.now() - now;
-    console.log("time to encode:", timeToEncode);
-    avgTimeToEncode += timeToEncode;
-}
-console.log("avg time to encode:", (avgTimeToEncode) / total);
-console.log("avg time to make changes:", (avgTimeToMakeChanges) / total);
-console.log("time for all encodes:", Date.now() - allEncodes);
-console.log(Array.from(encoder.encodeAll()).length, "bytes");
-//# sourceMappingURL=bench_encode.js.map

package/lib/bench_encode.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"bench_encode.js","sourceRoot":"","sources":["../src/bench_encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { nanoid } from \"nanoid\";\nimport { Schema, type, MapSchema, ArraySchema, Encoder } from \".\";\n\nclass Attribute extends Schema {\n    @type(\"string\") name: string;\n    @type(\"number\") value: number;\n}\n\nclass Item extends Schema {\n    @type(\"number\") price: number;\n    @type([ Attribute ]) attributes = new ArraySchema<Attribute>();\n}\n\nclass Position extends Schema {\n    @type(\"number\") x: number;\n    @type(\"number\") y: number;\n}\n\nclass Player extends Schema {\n    @type(Position) position = new Position();\n    @type({ map: Item }) items = new MapSchema<Item>();\n}\n\nclass State extends Schema {\n    @type({ map: Player }) players = new MapSchema<Player>();\n    @type(\"string\") currentTurn;\n}\n\nconst state = new State();\n\nEncoder.BUFFER_SIZE = 4096 * 4096;\nconst encoder = new Encoder(state);\n\n\nlet now = Date.now();\n\n// for (let i = 0; i < 10000; i++) {\n//     const player = new Player();\n//     state.players.set(`p-${nanoid()}`, player);\n//\n//     player.position.x = (i + 1) * 100;\n//     player.position.y = (i + 1) * 100;\n//     for (let j = 0; j < 10; j++) {\n//         const item = new Item();\n//         player.items.set(`item-${j}`, item);\n//         item.price = (i + 1) * 50;\n//         for (let k = 0; k < 5; k++) {\n//             const attr = new Attribute();\n//             attr.name = `Attribute ${k}`;\n//             attr.value = k;\n//             item.attributes.push(attr);\n//         }\n//     }\n// }\n// console.log(\"time to make changes:\", Date.now() - now);\n\n\n// measure time to .encodeAll()\n\nnow = Date.now();\n// for (let i = 0; i < 1000; i++) {\n//     encoder.encodeAll();\n// }\n// console.log(Date.now() - now);\n\nconst total = 100;\nconst allEncodes = Date.now();\n\nlet avgTimeToEncode = 0;\nlet avgTimeToMakeChanges = 0;\n\nfor (let i = 0; i < total; i++) {\n    now = Date.now();\n    for (let j = 0; j < 50; j++) {\n        const player = new Player();\n        state.players.set(`p-${nanoid()}`, player);\n\n        player.position.x = (j + 1) * 100;\n        player.position.y = (j + 1) * 100;\n        for (let k = 0; k < 10; k++) {\n            const item = new Item();\n            item.price = (j + 1) * 50;\n            for (let l = 0; l < 5; l++) {\n                const attr = new Attribute();\n                attr.name = `Attribute ${l}`;\n                attr.value = l;\n                item.attributes.push(attr);\n            }\n            player.items.set(`item-${k}`, item);\n        }\n    }\n    const timeToMakeChanges = Date.now() - now;\n    console.log(\"time to make changes:\", timeToMakeChanges);\n    avgTimeToMakeChanges += timeToMakeChanges;\n\n    now = Date.now();\n    encoder.encode();\n    encoder.discardChanges();\n\n    const timeToEncode = Date.now() - now;\n    console.log(\"time to encode:\", timeToEncode);\n    avgTimeToEncode += timeToEncode;\n}\nconsole.log(\"avg time to encode:\", (avgTimeToEncode) / total);\nconsole.log(\"avg time to make changes:\", (avgTimeToMakeChanges) / total);\nconsole.log(\"time for all encodes:\", Date.now() - allEncodes);\n\nconsole.log(Array.from(encoder.encodeAll()).length, \"bytes\");\n"]}

package/lib/changes/ChangeSet.d.ts

@@ -1,12 +0,0 @@
-import { OPERATION } from "../spec";
-import { ChangeOperation } from "./ChangeTree";
-export declare class ChangeSet {
-    changes: {
-        [index: number]: ChangeOperation;
-    };
-    changed: boolean;
-    allChanges: Set<number>;
-    change(index: number, operation?: OPERATION): void;
-    discardAll(): void;
-    setParent(...args: any[]): void;
-}

package/lib/changes/ChangeSet.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeSet = void 0;
-const spec_1 = require("../spec");
-class ChangeSet {
-    changes = {};
-    changed = false;
-    allChanges = new Set();
-    // definition: SchemaDefinition;
-    change(index, operation = spec_1.OPERATION.ADD) {
-        const previousChange = this.changes[index];
-        if (!previousChange ||
-            previousChange.op === spec_1.OPERATION.DELETE ||
-            previousChange.op === spec_1.OPERATION.TOUCH // (mazmorra.io's BattleAction issue)
-        ) {
-            this.changes[index] = {
-                op: (!previousChange)
-                    ? operation
-                    : (previousChange.op === spec_1.OPERATION.DELETE)
-                        ? spec_1.OPERATION.DELETE_AND_ADD
-                        : operation,
-                index
-            };
-        }
-        this.allChanges.add(index);
-        this.changed = true;
-    }
-    discardAll() {
-        this.changes = {};
-    }
-    setParent(...args) {
-    }
-}
-exports.ChangeSet = ChangeSet;
-//# sourceMappingURL=ChangeSet.js.map

package/lib/changes/ChangeSet.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChangeSet.js","sourceRoot":"","sources":["../../src/changes/ChangeSet.ts"],"names":[],"mappings":";;;AAAA,kCAAoC;AAIpC,MAAa,SAAS;IAClB,OAAO,GAAyC,EAAE,CAAC;IACnD,OAAO,GAAY,KAAK,CAAC;IACzB,UAAU,GAAgB,IAAI,GAAG,EAAE,CAAC;IACpC,gCAAgC;IAEhC,MAAM,CAAC,KAAa,EAAE,YAAuB,gBAAS,CAAC,GAAG;QACtD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE3C,IACI,CAAC,cAAc;YACf,cAAc,CAAC,EAAE,KAAK,gBAAS,CAAC,MAAM;YACtC,cAAc,CAAC,EAAE,KAAK,gBAAS,CAAC,KAAK,CAAC,qCAAqC;UAC7E,CAAC;YACC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG;gBAClB,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC;oBACjB,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,KAAK,gBAAS,CAAC,MAAM,CAAC;wBACtC,CAAC,CAAC,gBAAS,CAAC,cAAc;wBAC1B,CAAC,CAAC,SAAS;gBACnB,KAAK;aACR,CAAC;QACN,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,UAAU;QACN,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,SAAS,CAAC,GAAG,IAAW;IACxB,CAAC;CAEJ;AApCD,8BAoCC","sourcesContent":["import { OPERATION } from \"../spec\";\nimport { SchemaDefinition } from \"../annotations\";\nimport { ChangeOperation, Ref } from \"./ChangeTree\";\n\nexport class ChangeSet {\n    changes: { [index: number]: ChangeOperation } = {};\n    changed: boolean = false;\n    allChanges: Set<number> = new Set();\n    // definition: SchemaDefinition;\n\n    change(index: number, operation: OPERATION = OPERATION.ADD) {\n        const previousChange = this.changes[index];\n\n        if (\n            !previousChange ||\n            previousChange.op === OPERATION.DELETE ||\n            previousChange.op === OPERATION.TOUCH // (mazmorra.io's BattleAction issue)\n        ) {\n            this.changes[index] = {\n                op: (!previousChange)\n                    ? operation\n                    : (previousChange.op === OPERATION.DELETE)\n                        ? OPERATION.DELETE_AND_ADD\n                        : operation,\n                index\n            };\n        }\n\n        this.allChanges.add(index);\n\n        this.changed = true;\n    }\n\n    discardAll() {\n        this.changes = {};\n    }\n\n    setParent(...args: any[]) {\n    }\n\n}"]}

package/lib/changes/ChangeTree.d.ts

@@ -1,53 +0,0 @@
-import { OPERATION } from "../spec";
-import { Schema } from "../Schema";
-import { FilterChildrenCallback } from "../annotations";
-import { MapSchema } from "../types/MapSchema";
-import { ArraySchema } from "../types/ArraySchema";
-import { CollectionSchema } from "../types/CollectionSchema";
-import { SetSchema } from "../types/SetSchema";
-import { ReferenceTracker } from "./ReferenceTracker";
-export type Ref = Schema | ArraySchema | MapSchema | CollectionSchema | SetSchema;
-export interface ChangeOperation {
-    op: OPERATION;
-    index: number;
-}
-export interface FieldCache {
-    beginIndex: number;
-    endIndex: number;
-}
-export declare class ChangeTree {
-    ref: Ref;
-    refId: number;
-    root?: ReferenceTracker;
-    parent?: Ref;
-    parentIndex?: number;
-    indexes: {
-        [index: string]: any;
-    };
-    changed: boolean;
-    changes: Map<number, ChangeOperation>;
-    allChanges: Set<number>;
-    caches: {
-        [field: number]: number[];
-    };
-    currentCustomOperation: number;
-    constructor(ref: Ref, parent?: Ref, root?: ReferenceTracker);
-    setParent(parent: Ref, root?: ReferenceTracker, parentIndex?: number): void;
-    operation(op: ChangeOperation): void;
-    change(fieldName: string | number, operation?: OPERATION): void;
-    touch(fieldName: string | number): void;
-    touchParents(): void;
-    getType(index?: number): any;
-    getChildrenFilter(): FilterChildrenCallback;
-    getValue(index: number): any;
-    delete(fieldName: string | number): void;
-    discard(changed?: boolean, discardAll?: boolean): void;
-    /**
-     * Recursively discard all changes from this, and child structures.
-     */
-    discardAll(): void;
-    cache(field: number, cachedBytes: number[]): void;
-    clone(): ChangeTree;
-    ensureRefId(): void;
-    protected assertValidIndex(index: number, fieldName: string | number): void;
-}

package/lib/changes/ChangeTree.js

@@ -1,202 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeTree = void 0;
-const spec_1 = require("../spec");
-const Schema_1 = require("../Schema");
-class ChangeTree {
-    constructor(ref, parent, root) {
-        this.changed = false;
-        this.changes = new Map();
-        this.allChanges = new Set();
-        // cached indexes for filtering
-        this.caches = {};
-        this.currentCustomOperation = 0;
-        this.ref = ref;
-        this.setParent(parent, root);
-    }
-    setParent(parent, root, parentIndex) {
-        if (!this.indexes) {
-            this.indexes = (this.ref instanceof Schema_1.Schema)
-                ? this.ref['_definition'].indexes
-                : {};
-        }
-        this.parent = parent;
-        this.parentIndex = parentIndex;
-        // avoid setting parents with empty `root`
-        if (!root) {
-            return;
-        }
-        this.root = root;
-        //
-        // assign same parent on child structures
-        //
-        if (this.ref instanceof Schema_1.Schema) {
-            const definition = this.ref['_definition'];
-            for (let field in definition.schema) {
-                const value = this.ref[field];
-                if (value && value['$changes']) {
-                    const parentIndex = definition.indexes[field];
-                    value['$changes'].setParent(this.ref, root, parentIndex);
-                }
-            }
-        }
-        else if (typeof (this.ref) === "object") {
-            this.ref.forEach((value, key) => {
-                if (value instanceof Schema_1.Schema) {
-                    const changeTreee = value['$changes'];
-                    const parentIndex = this.ref['$changes'].indexes[key];
-                    changeTreee.setParent(this.ref, this.root, parentIndex);
-                }
-            });
-        }
-    }
-    operation(op) {
-        this.changes.set(--this.currentCustomOperation, op);
-    }
-    change(fieldName, operation = spec_1.OPERATION.ADD) {
-        const index = (typeof (fieldName) === "number")
-            ? fieldName
-            : this.indexes[fieldName];
-        this.assertValidIndex(index, fieldName);
-        const previousChange = this.changes.get(index);
-        if (!previousChange ||
-            previousChange.op === spec_1.OPERATION.DELETE ||
-            previousChange.op === spec_1.OPERATION.TOUCH // (mazmorra.io's BattleAction issue)
-        ) {
-            this.changes.set(index, {
-                op: (!previousChange)
-                    ? operation
-                    : (previousChange.op === spec_1.OPERATION.DELETE)
-                        ? spec_1.OPERATION.DELETE_AND_ADD
-                        : operation,
-                // : OPERATION.REPLACE,
-                index
-            });
-        }
-        this.allChanges.add(index);
-        this.changed = true;
-        this.touchParents();
-    }
-    touch(fieldName) {
-        const index = (typeof (fieldName) === "number")
-            ? fieldName
-            : this.indexes[fieldName];
-        this.assertValidIndex(index, fieldName);
-        if (!this.changes.has(index)) {
-            this.changes.set(index, { op: spec_1.OPERATION.TOUCH, index });
-        }
-        this.allChanges.add(index);
-        // ensure touch is placed until the $root is found.
-        this.touchParents();
-    }
-    touchParents() {
-        if (this.parent) {
-            this.parent['$changes'].touch(this.parentIndex);
-        }
-    }
-    getType(index) {
-        if (this.ref['_definition']) {
-            const definition = this.ref['_definition'];
-            return definition.schema[definition.fieldsByIndex[index]];
-        }
-        else {
-            const definition = this.parent['_definition'];
-            const parentType = definition.schema[definition.fieldsByIndex[this.parentIndex]];
-            //
-            // Get the child type from parent structure.
-            // - ["string"] => "string"
-            // - { map: "string" } => "string"
-            // - { set: "string" } => "string"
-            //
-            return Object.values(parentType)[0];
-        }
-    }
-    getChildrenFilter() {
-        const childFilters = this.parent['_definition'].childFilters;
-        return childFilters && childFilters[this.parentIndex];
-    }
-    //
-    // used during `.encode()`
-    //
-    getValue(index) {
-        return this.ref['getByIndex'](index);
-    }
-    delete(fieldName) {
-        const index = (typeof (fieldName) === "number")
-            ? fieldName
-            : this.indexes[fieldName];
-        if (index === undefined) {
-            console.warn(`@colyseus/schema ${this.ref.constructor.name}: trying to delete non-existing index: ${fieldName} (${index})`);
-            return;
-        }
-        const previousValue = this.getValue(index);
-        // console.log("$changes.delete =>", { fieldName, index, previousValue });
-        this.changes.set(index, { op: spec_1.OPERATION.DELETE, index });
-        this.allChanges.delete(index);
-        // delete cache
-        delete this.caches[index];
-        // remove `root` reference
-        if (previousValue && previousValue['$changes']) {
-            previousValue['$changes'].parent = undefined;
-        }
-        this.changed = true;
-        this.touchParents();
-    }
-    discard(changed = false, discardAll = false) {
-        //
-        // Map, Array, etc:
-        // Remove cached key to ensure ADD operations is unsed instead of
-        // REPLACE in case same key is used on next patches.
-        //
-        // TODO: refactor this. this is not relevant for Collection and Set.
-        //
-        if (!(this.ref instanceof Schema_1.Schema)) {
-            this.changes.forEach((change) => {
-                if (change.op === spec_1.OPERATION.DELETE) {
-                    const index = this.ref['getIndex'](change.index);
-                    delete this.indexes[index];
-                }
-            });
-        }
-        this.changes.clear();
-        this.changed = changed;
-        if (discardAll) {
-            this.allChanges.clear();
-        }
-        // re-set `currentCustomOperation`
-        this.currentCustomOperation = 0;
-    }
-    /**
-     * Recursively discard all changes from this, and child structures.
-     */
-    discardAll() {
-        this.changes.forEach((change) => {
-            const value = this.getValue(change.index);
-            if (value && value['$changes']) {
-                value['$changes'].discardAll();
-            }
-        });
-        this.discard();
-    }
-    // cache(field: number, beginIndex: number, endIndex: number) {
-    cache(field, cachedBytes) {
-        this.caches[field] = cachedBytes;
-    }
-    clone() {
-        return new ChangeTree(this.ref, this.parent, this.root);
-    }
-    ensureRefId() {
-        // skip if refId is already set.
-        if (this.refId !== undefined) {
-            return;
-        }
-        this.refId = this.root.getNextUniqueId();
-    }
-    assertValidIndex(index, fieldName) {
-        if (index === undefined) {
-            throw new Error(`ChangeTree: missing index for field "${fieldName}"`);
-        }
-    }
-}
-exports.ChangeTree = ChangeTree;
-//# sourceMappingURL=ChangeTree.js.map

package/lib/changes/ChangeTree.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChangeTree.js","sourceRoot":"","sources":["../../src/changes/ChangeTree.ts"],"names":[],"mappings":"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","sourcesContent":["import { OPERATION } from \"../spec\";\nimport { Schema } from \"../Schema\";\nimport { SchemaDefinition, FilterChildrenCallback } from \"../annotations\";\n\nimport { MapSchema } from \"../types/MapSchema\";\nimport { ArraySchema } from \"../types/ArraySchema\";\nimport { CollectionSchema } from \"../types/CollectionSchema\";\nimport { SetSchema } from \"../types/SetSchema\";\nimport { ReferenceTracker } from \"./ReferenceTracker\";\n\nexport type Ref = Schema\n    | ArraySchema\n    | MapSchema\n    | CollectionSchema\n    | SetSchema;\n\nexport interface ChangeOperation {\n    op: OPERATION,\n    index: number,\n}\n\n//\n// FieldCache is used for @filter()\n//\nexport interface FieldCache {\n    beginIndex: number;\n    endIndex: number;\n}\n\n\nexport class ChangeTree {\n    ref: Ref;\n    refId: number;\n\n    root?: ReferenceTracker;\n\n    parent?: Ref;\n    parentIndex?: number;\n\n    indexes: {[index: string]: any};\n\n    changed: boolean = false;\n    changes = new Map<number, ChangeOperation>();\n    allChanges = new Set<number>();\n\n    // cached indexes for filtering\n    caches: {[field: number]: number[]} = {};\n\n    currentCustomOperation: number = 0;\n\n    constructor(ref: Ref, parent?: Ref, root?: ReferenceTracker) {\n        this.ref = ref;\n        this.setParent(parent, root);\n    }\n\n    setParent(\n        parent: Ref,\n        root?: ReferenceTracker,\n        parentIndex?: number,\n    ) {\n        if (!this.indexes) {\n            this.indexes = (this.ref instanceof Schema)\n                ? this.ref['_definition'].indexes\n                : {};\n        }\n\n        this.parent = parent;\n        this.parentIndex = parentIndex;\n\n        // avoid setting parents with empty `root`\n        if (!root) { return; }\n        this.root = root;\n\n        //\n        // assign same parent on child structures\n        //\n        if (this.ref instanceof Schema) {\n            const definition: SchemaDefinition = this.ref['_definition'];\n\n            for (let field in definition.schema) {\n                const value = this.ref[field];\n\n                if (value && value['$changes']) {\n                    const parentIndex = definition.indexes[field];\n\n                    (value['$changes'] as ChangeTree).setParent(\n                        this.ref,\n                        root,\n                        parentIndex,\n                    );\n                }\n            }\n\n        } else if (typeof (this.ref) === \"object\") {\n            this.ref.forEach((value, key) => {\n                if (value instanceof Schema) {\n                    const changeTreee = value['$changes'];\n                    const parentIndex = this.ref['$changes'].indexes[key];\n\n                    changeTreee.setParent(\n                        this.ref,\n                        this.root,\n                        parentIndex,\n                    );\n                }\n            });\n        }\n    }\n\n    operation(op: ChangeOperation) {\n        this.changes.set(--this.currentCustomOperation, op);\n    }\n\n    change(fieldName: string | number, operation: OPERATION = OPERATION.ADD) {\n        const index = (typeof (fieldName) === \"number\")\n            ? fieldName\n            : this.indexes[fieldName];\n\n        this.assertValidIndex(index, fieldName);\n\n        const previousChange = this.changes.get(index);\n\n        if (\n            !previousChange ||\n            previousChange.op === OPERATION.DELETE ||\n            previousChange.op === OPERATION.TOUCH // (mazmorra.io's BattleAction issue)\n        ) {\n            this.changes.set(index, {\n                op: (!previousChange)\n                    ? operation\n                    : (previousChange.op === OPERATION.DELETE)\n                        ? OPERATION.DELETE_AND_ADD\n                        : operation,\n                        // : OPERATION.REPLACE,\n                index\n            });\n        }\n\n        this.allChanges.add(index);\n\n        this.changed = true;\n        this.touchParents();\n    }\n\n    touch(fieldName: string | number) {\n        const index = (typeof (fieldName) === \"number\")\n            ? fieldName\n            : this.indexes[fieldName];\n\n        this.assertValidIndex(index, fieldName);\n\n        if (!this.changes.has(index)) {\n            this.changes.set(index, { op: OPERATION.TOUCH, index });\n        }\n\n        this.allChanges.add(index);\n\n        // ensure touch is placed until the $root is found.\n        this.touchParents();\n    }\n\n    touchParents() {\n        if (this.parent) {\n            (this.parent['$changes'] as ChangeTree).touch(this.parentIndex);\n        }\n    }\n\n    getType(index?: number) {\n        if (this.ref['_definition']) {\n            const definition = (this.ref as Schema)['_definition'];\n            return definition.schema[ definition.fieldsByIndex[index] ];\n\n        } else {\n            const definition = (this.parent as Schema)['_definition'];\n            const parentType = definition.schema[ definition.fieldsByIndex[this.parentIndex] ];\n\n            //\n            // Get the child type from parent structure.\n            // - [\"string\"] => \"string\"\n            // - { map: \"string\" } => \"string\"\n            // - { set: \"string\" } => \"string\"\n            //\n            return Object.values(parentType)[0];\n        }\n    }\n\n    getChildrenFilter(): FilterChildrenCallback {\n        const childFilters = (this.parent as Schema)['_definition'].childFilters;\n        return childFilters && childFilters[this.parentIndex];\n    }\n\n    //\n    // used during `.encode()`\n    //\n    getValue(index: number) {\n        return this.ref['getByIndex'](index);\n    }\n\n    delete(fieldName: string | number) {\n        const index = (typeof (fieldName) === \"number\")\n            ? fieldName\n            : this.indexes[fieldName];\n\n        if (index === undefined) {\n            console.warn(`@colyseus/schema ${this.ref.constructor.name}: trying to delete non-existing index: ${fieldName} (${index})`);\n            return;\n        }\n\n        const previousValue = this.getValue(index);\n        // console.log(\"$changes.delete =>\", { fieldName, index, previousValue });\n\n        this.changes.set(index, { op: OPERATION.DELETE, index });\n\n        this.allChanges.delete(index);\n\n        // delete cache\n        delete this.caches[index];\n\n        // remove `root` reference\n        if (previousValue && previousValue['$changes']) {\n            previousValue['$changes'].parent = undefined;\n        }\n\n        this.changed = true;\n        this.touchParents();\n    }\n\n    discard(changed: boolean = false, discardAll: boolean = false) {\n        //\n        // Map, Array, etc:\n        // Remove cached key to ensure ADD operations is unsed instead of\n        // REPLACE in case same key is used on next patches.\n        //\n        // TODO: refactor this. this is not relevant for Collection and Set.\n        //\n        if (!(this.ref instanceof Schema)) {\n            this.changes.forEach((change) => {\n                if (change.op === OPERATION.DELETE) {\n                    const index = this.ref['getIndex'](change.index)\n                    delete this.indexes[index];\n                }\n            });\n        }\n\n        this.changes.clear();\n        this.changed = changed;\n\n        if (discardAll) {\n            this.allChanges.clear();\n        }\n\n        // re-set `currentCustomOperation`\n        this.currentCustomOperation = 0;\n    }\n\n    /**\n     * Recursively discard all changes from this, and child structures.\n     */\n    discardAll() {\n        this.changes.forEach((change) => {\n            const value = this.getValue(change.index);\n\n            if (value && value['$changes']) {\n                value['$changes'].discardAll();\n            }\n        });\n\n        this.discard();\n    }\n\n    // cache(field: number, beginIndex: number, endIndex: number) {\n    cache(field: number, cachedBytes: number[]) {\n        this.caches[field] = cachedBytes;\n    }\n\n    clone() {\n        return new ChangeTree(this.ref, this.parent, this.root);\n    }\n\n    ensureRefId() {\n        // skip if refId is already set.\n        if (this.refId !== undefined) {\n            return;\n        }\n\n        this.refId = this.root.getNextUniqueId();\n    }\n\n    protected assertValidIndex(index: number, fieldName: string | number) {\n        if (index === undefined) {\n            throw new Error(`ChangeTree: missing index for field \"${fieldName}\"`);\n        }\n    }\n\n}\n"]}

package/lib/changes/DecodeOperation.d.ts

@@ -1,15 +0,0 @@
-import { OPERATION } from "../spec";
-import { DataChange, Schema } from "../Schema";
-import type { Ref } from "./ChangeTree";
-import type { Decoder } from "../Decoder";
-import * as decode from "../encoding/decode";
-export declare enum DecodeState {
-    DEFINITION_MISMATCH = 0
-}
-export type DecodeOperation<T extends Schema = any> = (decoder: Decoder<T>, bytes: number[], it: decode.Iterator, ref: Ref, allChanges: DataChange[]) => void;
-export declare function decodeValue(decoder: Decoder, operation: OPERATION, ref: Ref, index: number, type: any, bytes: number[], it: decode.Iterator, allChanges: DataChange[]): {
-    value: any;
-    previousValue: any;
-};
-export declare const decodeSchemaOperation: DecodeOperation;
-export declare const decodeKeyValueOperation: DecodeOperation;