@colyseus/schema 3.0.0-alpha.35 → 3.0.0-alpha.37

package/build/umd/index.js

@@ -77,6 +77,102 @@
         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.init(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);
+            });
+            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);
+                }
+            }
+        }
+    }
+
     const Metadata = {
         addField(metadata, index, name, type, descriptor) {
             if (index > 64) {
@@ -161,17 +257,42 @@
             metadata[$fieldIndexesByViewTag][tag].push(index);
         },
         setFields(target, fields) {
-            const metadata = (target.prototype.constructor[Symbol.metadata] ??= {});
-            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, parentMetadata);
+            // 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];
                 // 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));
-                index++;
+                Metadata.addField(metadata, fieldIndex, field, type, getPropertyDescriptor(`_${field}`, fieldIndex, type, complexTypeKlass));
+                fieldIndex++;
             }
+            return target;
         },
         isDeprecated(metadata, field) {
             return metadata[field].deprecated === true;
@@ -2479,102 +2600,6 @@
     }
     registerType("map", { constructor: MapSchema });
 
-    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.init(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);
-            });
-            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);
-                }
-            }
-        }
-    }
-
     const DEFAULT_VIEW_TAG = -1;
     /**
      * [See documentation](https://docs.colyseus.io/state/schema/)
@@ -3872,11 +3897,19 @@
         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);
             }
         }
+        get hasChanges() {
+            return (this.root.changes.length > 0 ||
+                this.root.filteredChanges.length > 0);
+        }
     }
 
     class DecodingWarning extends Error {
@@ -4141,10 +4174,16 @@
             super(...arguments);
             this.types = new ArraySchema();
         }
-        static encode(instance, context, it = { offset: 0 }) {
-            context ??= new TypeContext(instance.constructor);
+        /**
+         * Encodes the TypeContext of an Encoder into a buffer.
+         *
+         * @param context TypeContext instance
+         * @param it
+         * @returns
+         */
+        static encode(context, it = { offset: 0 }) {
             const reflection = new Reflection();
-            const encoder = new Encoder(reflection);
+            const reflectionEncoder = new Encoder(reflection);
             const buildType = (currentType, metadata) => {
                 for (const fieldIndex in metadata) {
                     const index = Number(fieldIndex);
@@ -4198,9 +4237,16 @@
                 }
                 buildType(type, klass[Symbol.metadata]);
             }
-            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);
@@ -4246,8 +4292,8 @@
                     }
                 });
             });
-            // @ts-ignore
-            return new (typeContext.get(0))();
+            const state = new (typeContext.get(0))();
+            return new Decoder(state, typeContext);
         }
     }
     __decorate([

package/lib/Metadata.d.ts

@@ -38,7 +38,7 @@ export declare const Metadata: {
     setTag(metadata: Metadata, fieldName: string, tag: number): void;
     setFields(target: any, fields: {
         [field: string]: DefinitionType;
-    }): void;
+    }): any;
     isDeprecated(metadata: any, field: string): boolean;
     init(klass: any): void;
     initialize(constructor: any, parentMetadata?: Metadata): Metadata;

package/lib/Metadata.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Metadata = void 0;
 const annotations_1 = require("./annotations");
+const Schema_1 = require("./Schema");
 const registry_1 = require("./types/registry");
 const symbols_1 = require("./types/symbols");
+const TypeContext_1 = require("./types/TypeContext");
 exports.Metadata = {
     addField(metadata, index, name, type, descriptor) {
         if (index > 64) {
@@ -88,17 +90,42 @@ exports.Metadata = {
         metadata[symbols_1.$fieldIndexesByViewTag][tag].push(index);
     },
     setFields(target, fields) {
-        const metadata = (target.prototype.constructor[Symbol.metadata] ??= {});
-        let index = 0;
+        // for inheritance support
+        const constructor = target.prototype.constructor;
+        TypeContext_1.TypeContext.register(constructor);
+        const parentClass = Object.getPrototypeOf(constructor);
+        const parentMetadata = parentClass && parentClass[Symbol.metadata];
+        const metadata = exports.Metadata.initialize(constructor, parentMetadata);
+        // Use Schema's methods if not defined in the class
+        if (!constructor[symbols_1.$track]) {
+            constructor[symbols_1.$track] = Schema_1.Schema[symbols_1.$track];
+        }
+        if (!constructor[symbols_1.$encoder]) {
+            constructor[symbols_1.$encoder] = Schema_1.Schema[symbols_1.$encoder];
+        }
+        if (!constructor[symbols_1.$decoder]) {
+            constructor[symbols_1.$decoder] = Schema_1.Schema[symbols_1.$decoder];
+        }
+        if (!constructor.prototype.toJSON) {
+            constructor.prototype.toJSON = Schema_1.Schema.prototype.toJSON;
+        }
+        //
+        // detect index for this field, considering inheritance
+        //
+        let fieldIndex = metadata[symbols_1.$numFields] // current structure already has fields defined
+            ?? (parentMetadata && parentMetadata[symbols_1.$numFields]) // parent structure has fields defined
+            ?? -1; // no fields defined
+        fieldIndex++;
         for (const field in fields) {
             const type = fields[field];
             // FIXME: this code is duplicated from @type() annotation
             const complexTypeKlass = (Array.isArray(type))
                 ? (0, registry_1.getType)("array")
                 : (typeof (Object.keys(type)[0]) === "string") && (0, registry_1.getType)(Object.keys(type)[0]);
-            exports.Metadata.addField(metadata, index, field, type, (0, annotations_1.getPropertyDescriptor)(`_${field}`, index, type, complexTypeKlass));
-            index++;
+            exports.Metadata.addField(metadata, fieldIndex, field, type, (0, annotations_1.getPropertyDescriptor)(`_${field}`, fieldIndex, type, complexTypeKlass));
+            fieldIndex++;
         }
+        return target;
     },
     isDeprecated(metadata, field) {
         return metadata[field].deprecated === true;

package/lib/Metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../src/Metadata.ts"],"names":[],"mappings":"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","sourcesContent":["import { getPropertyDescriptor, type DefinitionType } from \"./annotations\";\nimport { getType } from \"./types/registry\";\nimport { $descriptors, $fieldIndexesByViewTag, $numFields, $refTypeFieldIndexes, $viewFieldIndexes } from \"./types/symbols\";\n\nexport type MetadataField = {\n    type: DefinitionType,\n    name: string,\n    index: number,\n    tag?: number,\n    unreliable?: boolean,\n    deprecated?: boolean,\n};\n\nexport type Metadata =\n    { [$numFields]: number; } & // number of fields\n    { [$viewFieldIndexes]: number[]; } & // all field indexes with \"view\" tag\n    { [$fieldIndexesByViewTag]: {[tag: number]: number[]}; } & // field indexes by \"view\" tag\n    { [$refTypeFieldIndexes]: number[]; } & // all field indexes containing Ref types (Schema, ArraySchema, MapSchema, etc)\n    { [field: number]: MetadataField; } & // index => field name\n    { [field: string]: number; } & // field name => field metadata\n    { [$descriptors]: { [field: string]: PropertyDescriptor } }  // property descriptors\n\nexport const Metadata = {\n\n    addField(metadata: any, index: number, name: string, type: DefinitionType, descriptor?: PropertyDescriptor) {\n        if (index > 64) {\n            throw new Error(`Can't define field '${name}'.\\nSchema instances may only have up to 64 fields.`);\n        }\n\n        metadata[index] = Object.assign(\n            metadata[index] || {}, // avoid overwriting previous field metadata (@owned / @deprecated)\n            {\n                type: (Array.isArray(type))\n                    ? { array: type[0] }\n                    : type,\n                index,\n                name,\n            }\n        );\n\n        // create \"descriptors\" map\n        metadata[$descriptors] ??= {};\n\n        if (descriptor) {\n            // for encoder\n            metadata[$descriptors][name] = descriptor;\n            metadata[$descriptors][`_${name}`] = {\n                value: undefined,\n                writable: true,\n                enumerable: false,\n                configurable: true,\n            };\n        } else {\n            // for decoder\n            metadata[$descriptors][name] = {\n                value: undefined,\n                writable: true,\n                enumerable: true,\n                configurable: true,\n            };\n        }\n\n        // map -1 as last field index\n        Object.defineProperty(metadata, $numFields, {\n            value: index,\n            enumerable: false,\n            configurable: true\n        });\n\n        // map field name => index (non enumerable)\n        Object.defineProperty(metadata, name, {\n            value: index,\n            enumerable: false,\n            configurable: true,\n        });\n\n        // if child Ref/complex type, add to -4\n        if (typeof (metadata[index].type) !== \"string\") {\n            if (metadata[$refTypeFieldIndexes] === undefined) {\n                Object.defineProperty(metadata, $refTypeFieldIndexes, {\n                    value: [],\n                    enumerable: false,\n                    configurable: true,\n                });\n            }\n            metadata[$refTypeFieldIndexes].push(index);\n        }\n    },\n\n    setTag(metadata: Metadata, fieldName: string, tag: number) {\n        const index = metadata[fieldName];\n        const field = metadata[index];\n\n        // add 'tag' to the field\n        field.tag = tag;\n\n        if (!metadata[$viewFieldIndexes]) {\n            // -2: all field indexes with \"view\" tag\n            Object.defineProperty(metadata, $viewFieldIndexes, {\n                value: [],\n                enumerable: false,\n                configurable: true\n            });\n\n            // -3: field indexes by \"view\" tag\n            Object.defineProperty(metadata, $fieldIndexesByViewTag, {\n                value: {},\n                enumerable: false,\n                configurable: true\n            });\n        }\n\n        metadata[$viewFieldIndexes].push(index);\n\n        if (!metadata[$fieldIndexesByViewTag][tag]) {\n            metadata[$fieldIndexesByViewTag][tag] = [];\n        }\n\n        metadata[$fieldIndexesByViewTag][tag].push(index);\n    },\n\n    setFields(target: any, fields: { [field: string]: DefinitionType }) {\n        const metadata = (target.prototype.constructor[Symbol.metadata] ??= {});\n\n        let index = 0;\n        for (const field in fields) {\n            const type = fields[field];\n\n            // FIXME: this code is duplicated from @type() annotation\n            const complexTypeKlass = (Array.isArray(type))\n                ? getType(\"array\")\n                : (typeof(Object.keys(type)[0]) === \"string\") && getType(Object.keys(type)[0]);\n\n            Metadata.addField(\n                metadata,\n                index,\n                field,\n                type,\n                getPropertyDescriptor(`_${field}`, index, type, complexTypeKlass)\n            );\n\n            index++;\n        }\n    },\n\n    isDeprecated(metadata: any, field: string) {\n        return metadata[field].deprecated === true;\n    },\n\n    init(klass: any) {\n        //\n        // Used only to initialize an empty Schema (Encoder#constructor)\n        // TODO: remove/refactor this...\n        //\n        const metadata = {};\n        klass[Symbol.metadata] = metadata;\n        Object.defineProperty(metadata, $numFields, {\n            value: 0,\n            enumerable: false,\n            configurable: true,\n        });\n    },\n\n    initialize(constructor: any, parentMetadata?: Metadata) {\n        let metadata: Metadata = constructor[Symbol.metadata] ?? Object.create(null);\n\n        // make sure inherited classes have their own metadata object.\n        if (constructor[Symbol.metadata] === parentMetadata) {\n            metadata = Object.create(null);\n\n            if (parentMetadata) {\n                // assign parent metadata to current\n                Object.assign(metadata, parentMetadata);\n\n                for (let i = 0; i <= parentMetadata[$numFields]; i++) {\n                    const fieldName = parentMetadata[i].name;\n                    Object.defineProperty(metadata, fieldName, {\n                        value: parentMetadata[fieldName],\n                        enumerable: false,\n                        configurable: true,\n                    });\n                }\n\n                Object.defineProperty(metadata, $numFields, {\n                    value: parentMetadata[$numFields],\n                    enumerable: false,\n                    configurable: true,\n                    writable: true,\n                });\n            }\n        }\n\n        constructor[Symbol.metadata] = metadata;\n\n        return metadata;\n    },\n\n    isValidInstance(klass: any) {\n        return (\n            klass.constructor[Symbol.metadata] &&\n            Object.prototype.hasOwnProperty.call(klass.constructor[Symbol.metadata], $numFields) as boolean\n        );\n    },\n\n    getFields(klass: any) {\n        const metadata: Metadata = klass[Symbol.metadata];\n        const fields = {};\n        for (let i = 0; i <= metadata[$numFields]; i++) {\n            fields[metadata[i].name] = metadata[i].type;\n        }\n        return fields;\n    }\n}"]}
+{"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../src/Metadata.ts"],"names":[],"mappings":"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","sourcesContent":["import { getPropertyDescriptor, type DefinitionType } from \"./annotations\";\nimport { Schema } from \"./Schema\";\nimport { getType } from \"./types/registry\";\nimport { $decoder, $descriptors, $encoder, $fieldIndexesByViewTag, $numFields, $refTypeFieldIndexes, $track, $viewFieldIndexes } from \"./types/symbols\";\nimport { TypeContext } from \"./types/TypeContext\";\n\nexport type MetadataField = {\n    type: DefinitionType,\n    name: string,\n    index: number,\n    tag?: number,\n    unreliable?: boolean,\n    deprecated?: boolean,\n};\n\nexport type Metadata =\n    { [$numFields]: number; } & // number of fields\n    { [$viewFieldIndexes]: number[]; } & // all field indexes with \"view\" tag\n    { [$fieldIndexesByViewTag]: {[tag: number]: number[]}; } & // field indexes by \"view\" tag\n    { [$refTypeFieldIndexes]: number[]; } & // all field indexes containing Ref types (Schema, ArraySchema, MapSchema, etc)\n    { [field: number]: MetadataField; } & // index => field name\n    { [field: string]: number; } & // field name => field metadata\n    { [$descriptors]: { [field: string]: PropertyDescriptor } }  // property descriptors\n\nexport const Metadata = {\n\n    addField(metadata: any, index: number, name: string, type: DefinitionType, descriptor?: PropertyDescriptor) {\n        if (index > 64) {\n            throw new Error(`Can't define field '${name}'.\\nSchema instances may only have up to 64 fields.`);\n        }\n\n        metadata[index] = Object.assign(\n            metadata[index] || {}, // avoid overwriting previous field metadata (@owned / @deprecated)\n            {\n                type: (Array.isArray(type))\n                    ? { array: type[0] }\n                    : type,\n                index,\n                name,\n            }\n        );\n\n        // create \"descriptors\" map\n        metadata[$descriptors] ??= {};\n\n        if (descriptor) {\n            // for encoder\n            metadata[$descriptors][name] = descriptor;\n            metadata[$descriptors][`_${name}`] = {\n                value: undefined,\n                writable: true,\n                enumerable: false,\n                configurable: true,\n            };\n        } else {\n            // for decoder\n            metadata[$descriptors][name] = {\n                value: undefined,\n                writable: true,\n                enumerable: true,\n                configurable: true,\n            };\n        }\n\n        // map -1 as last field index\n        Object.defineProperty(metadata, $numFields, {\n            value: index,\n            enumerable: false,\n            configurable: true\n        });\n\n        // map field name => index (non enumerable)\n        Object.defineProperty(metadata, name, {\n            value: index,\n            enumerable: false,\n            configurable: true,\n        });\n\n        // if child Ref/complex type, add to -4\n        if (typeof (metadata[index].type) !== \"string\") {\n            if (metadata[$refTypeFieldIndexes] === undefined) {\n                Object.defineProperty(metadata, $refTypeFieldIndexes, {\n                    value: [],\n                    enumerable: false,\n                    configurable: true,\n                });\n            }\n            metadata[$refTypeFieldIndexes].push(index);\n        }\n    },\n\n    setTag(metadata: Metadata, fieldName: string, tag: number) {\n        const index = metadata[fieldName];\n        const field = metadata[index];\n\n        // add 'tag' to the field\n        field.tag = tag;\n\n        if (!metadata[$viewFieldIndexes]) {\n            // -2: all field indexes with \"view\" tag\n            Object.defineProperty(metadata, $viewFieldIndexes, {\n                value: [],\n                enumerable: false,\n                configurable: true\n            });\n\n            // -3: field indexes by \"view\" tag\n            Object.defineProperty(metadata, $fieldIndexesByViewTag, {\n                value: {},\n                enumerable: false,\n                configurable: true\n            });\n        }\n\n        metadata[$viewFieldIndexes].push(index);\n\n        if (!metadata[$fieldIndexesByViewTag][tag]) {\n            metadata[$fieldIndexesByViewTag][tag] = [];\n        }\n\n        metadata[$fieldIndexesByViewTag][tag].push(index);\n    },\n\n    setFields(target: any, fields: { [field: string]: DefinitionType }) {\n        // for inheritance support\n        const constructor = target.prototype.constructor;\n        TypeContext.register(constructor);\n\n        const parentClass = Object.getPrototypeOf(constructor);\n        const parentMetadata = parentClass && parentClass[Symbol.metadata];\n        const metadata = Metadata.initialize(constructor, parentMetadata);\n\n        // Use Schema's methods if not defined in the class\n        if (!constructor[$track]) { constructor[$track] = Schema[$track]; }\n        if (!constructor[$encoder]) { constructor[$encoder] = Schema[$encoder]; }\n        if (!constructor[$decoder]) { constructor[$decoder] = Schema[$decoder]; }\n        if (!constructor.prototype.toJSON) { constructor.prototype.toJSON = Schema.prototype.toJSON; }\n\n        //\n        // detect index for this field, considering inheritance\n        //\n        let fieldIndex = metadata[$numFields] // current structure already has fields defined\n            ?? (parentMetadata && parentMetadata[$numFields]) // parent structure has fields defined\n            ?? -1; // no fields defined\n\n        fieldIndex++;\n\n        for (const field in fields) {\n            const type = fields[field];\n\n            // FIXME: this code is duplicated from @type() annotation\n            const complexTypeKlass = (Array.isArray(type))\n                ? getType(\"array\")\n                : (typeof(Object.keys(type)[0]) === \"string\") && getType(Object.keys(type)[0]);\n\n            Metadata.addField(\n                metadata,\n                fieldIndex,\n                field,\n                type,\n                getPropertyDescriptor(`_${field}`, fieldIndex, type, complexTypeKlass)\n            );\n\n            fieldIndex++;\n        }\n\n        return target;\n    },\n\n    isDeprecated(metadata: any, field: string) {\n        return metadata[field].deprecated === true;\n    },\n\n    init(klass: any) {\n        //\n        // Used only to initialize an empty Schema (Encoder#constructor)\n        // TODO: remove/refactor this...\n        //\n        const metadata = {};\n        klass[Symbol.metadata] = metadata;\n        Object.defineProperty(metadata, $numFields, {\n            value: 0,\n            enumerable: false,\n            configurable: true,\n        });\n    },\n\n    initialize(constructor: any, parentMetadata?: Metadata) {\n        let metadata: Metadata = constructor[Symbol.metadata] ?? Object.create(null);\n\n        // make sure inherited classes have their own metadata object.\n        if (constructor[Symbol.metadata] === parentMetadata) {\n            metadata = Object.create(null);\n\n            if (parentMetadata) {\n                // assign parent metadata to current\n                Object.assign(metadata, parentMetadata);\n\n                for (let i = 0; i <= parentMetadata[$numFields]; i++) {\n                    const fieldName = parentMetadata[i].name;\n                    Object.defineProperty(metadata, fieldName, {\n                        value: parentMetadata[fieldName],\n                        enumerable: false,\n                        configurable: true,\n                    });\n                }\n\n                Object.defineProperty(metadata, $numFields, {\n                    value: parentMetadata[$numFields],\n                    enumerable: false,\n                    configurable: true,\n                    writable: true,\n                });\n            }\n        }\n\n        constructor[Symbol.metadata] = metadata;\n\n        return metadata;\n    },\n\n    isValidInstance(klass: any) {\n        return (\n            klass.constructor[Symbol.metadata] &&\n            Object.prototype.hasOwnProperty.call(klass.constructor[Symbol.metadata], $numFields) as boolean\n        );\n    },\n\n    getFields(klass: any) {\n        const metadata: Metadata = klass[Symbol.metadata];\n        const fields = {};\n        for (let i = 0; i <= metadata[$numFields]; i++) {\n            fields[metadata[i].name] = metadata[i].type;\n        }\n        return fields;\n    }\n}"]}

package/lib/Reflection.d.ts

@@ -1,6 +1,7 @@
 import { TypeContext } from "./types/TypeContext";
 import { ArraySchema } from "./types/custom/ArraySchema";
 import { Iterator } from "./encoding/decode";
+import { Decoder } from "./decoder/Decoder";
 import { Schema } from "./Schema";
 /**
  * Reflection
@@ -17,6 +18,20 @@ export declare class ReflectionType extends Schema {
 }
 export declare class Reflection extends Schema {
     types: ArraySchema<ReflectionType>;
-    static encode(instance: Schema, context?: TypeContext, it?: Iterator): Buffer;
-    static decode<T extends Schema = Schema>(bytes: Buffer, it?: Iterator): T;
+    /**
+     * Encodes the TypeContext of an Encoder into a buffer.
+     *
+     * @param context TypeContext instance
+     * @param it
+     * @returns
+     */
+    static encode(context: TypeContext, it?: Iterator): Buffer;
+    /**
+     * Decodes the TypeContext from a buffer into a Decoder instance.
+     *
+     * @param bytes Reflection.encode() output
+     * @param it
+     * @returns Decoder instance
+     */
+    static decode<T extends Schema = Schema>(bytes: Buffer, it?: Iterator): Decoder<T>;
 }

package/lib/Reflection.js

@@ -50,10 +50,16 @@ class Reflection extends Schema_1.Schema {
         super(...arguments);
         this.types = new ArraySchema_1.ArraySchema();
     }
-    static encode(instance, context, it = { offset: 0 }) {
-        context ??= new TypeContext_1.TypeContext(instance.constructor);
+    /**
+     * Encodes the TypeContext of an Encoder into a buffer.
+     *
+     * @param context TypeContext instance
+     * @param it
+     * @returns
+     */
+    static encode(context, it = { offset: 0 }) {
         const reflection = new Reflection();
-        const encoder = new Encoder_1.Encoder(reflection);
+        const reflectionEncoder = new Encoder_1.Encoder(reflection);
         const buildType = (currentType, metadata) => {
             for (const fieldIndex in metadata) {
                 const index = Number(fieldIndex);
@@ -107,9 +113,16 @@ class Reflection extends Schema_1.Schema {
             }
             buildType(type, klass[Symbol.metadata]);
         }
-        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_1.Decoder(reflection);
@@ -155,8 +168,8 @@ class Reflection extends Schema_1.Schema {
                 }
             });
         });
-        // @ts-ignore
-        return new (typeContext.get(0))();
+        const state = new (typeContext.get(0))();
+        return new Decoder_1.Decoder(state, typeContext);
     }
 }
 exports.Reflection = Reflection;

package/lib/Reflection.js.map

@@ -1 +1 @@
-{"version":3,"file":"Reflection.js","sourceRoot":"","sources":["../src/Reflection.ts"],"names":[],"mappings":"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","sourcesContent":["import { type, PrimitiveType, DefinitionType } from \"./annotations\";\nimport { TypeContext } from \"./types/TypeContext\";\nimport { Metadata } from \"./Metadata\";\nimport { ArraySchema } from \"./types/custom/ArraySchema\";\nimport { Iterator } from \"./encoding/decode\";\nimport { Encoder } from \"./encoder/Encoder\";\nimport { Decoder } from \"./decoder/Decoder\";\nimport { Schema } from \"./Schema\";\n\n/**\n * Reflection\n */\nexport class ReflectionField extends Schema {\n    @type(\"string\") name: string;\n    @type(\"string\") type: string;\n    @type(\"number\") referencedType: number;\n}\n\nexport class ReflectionType extends Schema {\n    @type(\"number\") id: number;\n    @type(\"number\") extendsId: number;\n    @type([ ReflectionField ]) fields = new ArraySchema<ReflectionField>();\n}\n\nexport class Reflection extends Schema {\n    @type([ ReflectionType ]) types: ArraySchema<ReflectionType> = new ArraySchema<ReflectionType>();\n\n    static encode(instance: Schema, context?: TypeContext, it: Iterator = { offset: 0 }) {\n        context ??= new TypeContext(instance.constructor as typeof Schema);\n\n        const reflection = new Reflection();\n        const encoder = new Encoder(reflection);\n\n        const buildType = (currentType: ReflectionType, metadata: Metadata) => {\n            for (const fieldIndex in metadata) {\n                const index = Number(fieldIndex);\n                const fieldName = metadata[index].name;\n\n                // skip fields from parent classes\n                if (!Object.prototype.hasOwnProperty.call(metadata, fieldName)) {\n                    continue;\n                }\n\n                const field = new ReflectionField();\n                field.name = fieldName;\n\n                let fieldType: string;\n\n                const type = metadata[index].type;\n\n                if (typeof (type) === \"string\") {\n                    fieldType = type;\n\n                } else {\n                    let childTypeSchema: typeof Schema;\n\n                    //\n                    // TODO: refactor below.\n                    //\n                    if (Schema.is(type)) {\n                        fieldType = \"ref\";\n                        childTypeSchema = type as typeof Schema;\n\n                    } else {\n                        fieldType = Object.keys(type)[0];\n\n                        if (typeof(type[fieldType]) === \"string\") {\n                            fieldType += \":\" + type[fieldType]; // array:string\n\n                        } else {\n                            childTypeSchema = type[fieldType];\n                        }\n                    }\n\n                    field.referencedType = (childTypeSchema)\n                        ? context.getTypeId(childTypeSchema)\n                        : -1;\n                }\n\n                field.type = fieldType;\n                currentType.fields.push(field);\n            }\n\n            reflection.types.push(currentType);\n        }\n\n        for (let typeid in context.types) {\n            const klass = context.types[typeid];\n            const type = new ReflectionType();\n            type.id = Number(typeid);\n\n            // support inheritance\n            const inheritFrom = Object.getPrototypeOf(klass);\n            if (inheritFrom !== Schema) {\n                type.extendsId = context.schemas.get(inheritFrom);\n            }\n\n            buildType(type, klass[Symbol.metadata]);\n        }\n\n        const buf = encoder.encodeAll(it);\n        return Buffer.from(buf, 0, it.offset);\n    }\n\n    static decode<T extends Schema = Schema>(bytes: Buffer, it?: Iterator): T {\n        const reflection = new Reflection();\n\n        const reflectionDecoder = new Decoder(reflection);\n        reflectionDecoder.decode(bytes, it);\n\n        const typeContext = new TypeContext();\n\n        // 1st pass, initialize metadata + inheritance\n        reflection.types.forEach((reflectionType) => {\n            const parentClass: typeof Schema = typeContext.get(reflectionType.extendsId) ?? Schema;\n            const schema: typeof Schema = class _ extends parentClass {};\n\n            const parentMetadata = parentClass[Symbol.metadata];\n\n            // register for inheritance support\n            TypeContext.register(schema);\n\n            // for inheritance support\n            Metadata.initialize(schema, parentMetadata);\n\n            typeContext.add(schema, reflectionType.id);\n        }, {});\n\n        // 2nd pass, set fields\n        reflection.types.forEach((reflectionType) => {\n            const schemaType = typeContext.get(reflectionType.id);\n            const metadata = schemaType[Symbol.metadata];\n\n            const parentFieldIndex = 0;\n\n            reflectionType.fields.forEach((field, i) => {\n                const fieldIndex = parentFieldIndex + i;\n\n                if (field.referencedType !== undefined) {\n                    let fieldType = field.type;\n                    let refType: PrimitiveType = typeContext.get(field.referencedType);\n\n                    // map or array of primitive type (-1)\n                    if (!refType) {\n                        const typeInfo = field.type.split(\":\");\n                        fieldType = typeInfo[0];\n                        refType = typeInfo[1] as PrimitiveType; // string\n                    }\n\n                    if (fieldType === \"ref\") {\n                        Metadata.addField(metadata, fieldIndex, field.name, refType);\n\n                    } else {\n                        Metadata.addField(metadata, fieldIndex, field.name, { [fieldType]: refType } as DefinitionType);\n                    }\n\n                } else {\n                    Metadata.addField(metadata, fieldIndex, field.name, field.type as PrimitiveType);\n                }\n            });\n        });\n\n        // @ts-ignore\n        return new (typeContext.get(0))();\n    }\n}\n"]}
+{"version":3,"file":"Reflection.js","sourceRoot":"","sources":["../src/Reflection.ts"],"names":[],"mappings":"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","sourcesContent":["import { type, PrimitiveType, DefinitionType } from \"./annotations\";\nimport { TypeContext } from \"./types/TypeContext\";\nimport { Metadata } from \"./Metadata\";\nimport { ArraySchema } from \"./types/custom/ArraySchema\";\nimport { Iterator } from \"./encoding/decode\";\nimport { Encoder } from \"./encoder/Encoder\";\nimport { Decoder } from \"./decoder/Decoder\";\nimport { Schema } from \"./Schema\";\n\n/**\n * Reflection\n */\nexport class ReflectionField extends Schema {\n    @type(\"string\") name: string;\n    @type(\"string\") type: string;\n    @type(\"number\") referencedType: number;\n}\n\nexport class ReflectionType extends Schema {\n    @type(\"number\") id: number;\n    @type(\"number\") extendsId: number;\n    @type([ ReflectionField ]) fields = new ArraySchema<ReflectionField>();\n}\n\nexport class Reflection extends Schema {\n    @type([ ReflectionType ]) types: ArraySchema<ReflectionType> = new ArraySchema<ReflectionType>();\n\n    /**\n     * Encodes the TypeContext of an Encoder into a buffer.\n     *\n     * @param context TypeContext instance\n     * @param it\n     * @returns\n     */\n    static encode(context: TypeContext, it: Iterator = { offset: 0 }) {\n        const reflection = new Reflection();\n        const reflectionEncoder = new Encoder(reflection);\n\n        const buildType = (currentType: ReflectionType, metadata: Metadata) => {\n            for (const fieldIndex in metadata) {\n                const index = Number(fieldIndex);\n                const fieldName = metadata[index].name;\n\n                // skip fields from parent classes\n                if (!Object.prototype.hasOwnProperty.call(metadata, fieldName)) {\n                    continue;\n                }\n\n                const field = new ReflectionField();\n                field.name = fieldName;\n\n                let fieldType: string;\n\n                const type = metadata[index].type;\n\n                if (typeof (type) === \"string\") {\n                    fieldType = type;\n\n                } else {\n                    let childTypeSchema: typeof Schema;\n\n                    //\n                    // TODO: refactor below.\n                    //\n                    if (Schema.is(type)) {\n                        fieldType = \"ref\";\n                        childTypeSchema = type as typeof Schema;\n\n                    } else {\n                        fieldType = Object.keys(type)[0];\n\n                        if (typeof(type[fieldType]) === \"string\") {\n                            fieldType += \":\" + type[fieldType]; // array:string\n\n                        } else {\n                            childTypeSchema = type[fieldType];\n                        }\n                    }\n\n                    field.referencedType = (childTypeSchema)\n                        ? context.getTypeId(childTypeSchema)\n                        : -1;\n                }\n\n                field.type = fieldType;\n                currentType.fields.push(field);\n            }\n\n            reflection.types.push(currentType);\n        }\n\n        for (let typeid in context.types) {\n            const klass = context.types[typeid];\n            const type = new ReflectionType();\n            type.id = Number(typeid);\n\n            // support inheritance\n            const inheritFrom = Object.getPrototypeOf(klass);\n            if (inheritFrom !== Schema) {\n                type.extendsId = context.schemas.get(inheritFrom);\n            }\n\n            buildType(type, klass[Symbol.metadata]);\n        }\n\n        const buf = reflectionEncoder.encodeAll(it);\n        return Buffer.from(buf, 0, it.offset);\n    }\n\n    /**\n     * Decodes the TypeContext from a buffer into a Decoder instance.\n     *\n     * @param bytes Reflection.encode() output\n     * @param it\n     * @returns Decoder instance\n     */\n    static decode<T extends Schema = Schema>(bytes: Buffer, it?: Iterator): Decoder<T> {\n        const reflection = new Reflection();\n\n        const reflectionDecoder = new Decoder(reflection);\n        reflectionDecoder.decode(bytes, it);\n\n        const typeContext = new TypeContext();\n\n        // 1st pass, initialize metadata + inheritance\n        reflection.types.forEach((reflectionType) => {\n            const parentClass: typeof Schema = typeContext.get(reflectionType.extendsId) ?? Schema;\n            const schema: typeof Schema = class _ extends parentClass {};\n\n            const parentMetadata = parentClass[Symbol.metadata];\n\n            // register for inheritance support\n            TypeContext.register(schema);\n\n            // for inheritance support\n            Metadata.initialize(schema, parentMetadata);\n\n            typeContext.add(schema, reflectionType.id);\n        }, {});\n\n        // 2nd pass, set fields\n        reflection.types.forEach((reflectionType) => {\n            const schemaType = typeContext.get(reflectionType.id);\n            const metadata = schemaType[Symbol.metadata];\n\n            const parentFieldIndex = 0;\n\n            reflectionType.fields.forEach((field, i) => {\n                const fieldIndex = parentFieldIndex + i;\n\n                if (field.referencedType !== undefined) {\n                    let fieldType = field.type;\n                    let refType: PrimitiveType = typeContext.get(field.referencedType);\n\n                    // map or array of primitive type (-1)\n                    if (!refType) {\n                        const typeInfo = field.type.split(\":\");\n                        fieldType = typeInfo[0];\n                        refType = typeInfo[1] as PrimitiveType; // string\n                    }\n\n                    if (fieldType === \"ref\") {\n                        Metadata.addField(metadata, fieldIndex, field.name, refType);\n\n                    } else {\n                        Metadata.addField(metadata, fieldIndex, field.name, { [fieldType]: refType } as DefinitionType);\n                    }\n\n                } else {\n                    Metadata.addField(metadata, fieldIndex, field.name, field.type as PrimitiveType);\n                }\n            });\n        });\n\n        const state: T = new (typeContext.get(0) as unknown as any)();\n\n        return new Decoder<T>(state, typeContext);\n    }\n}\n"]}

package/lib/annotations.d.ts

@@ -21,7 +21,7 @@ export interface TypeOptions {
     manual?: boolean;
 }
 export declare const DEFAULT_VIEW_TAG = -1;
-export declare function entity(constructor: any, context: ClassDecoratorContext): any;
+export declare function entity(constructor: any): any;
 /**
  * [See documentation](https://docs.colyseus.io/state/schema/)
  *

package/lib/annotations.js

@@ -18,11 +18,8 @@ const spec_1 = require("./encoding/spec");
 const TypeContext_1 = require("./types/TypeContext");
 const assert_1 = require("./encoding/assert");
 exports.DEFAULT_VIEW_TAG = -1;
-function entity(constructor, context) {
-    if (!constructor._definition) {
-        // for inheritance support
-        TypeContext_1.TypeContext.register(constructor);
-    }
+function entity(constructor) {
+    TypeContext_1.TypeContext.register(constructor);
     return constructor;
 }
 /**