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

package/build/umd/index.js

@@ -119,7 +119,7 @@
             // Workaround to allow using an empty Schema (with no `@type()` fields)
             //
             if (schema[Symbol.metadata] === undefined) {
-                Metadata.init(schema);
+                Metadata.initialize(schema);
             }
             this.schemas.set(schema, typeid);
             return true;
@@ -135,6 +135,14 @@
             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]) {
@@ -173,6 +181,13 @@
         }
     }
 
+    function getNormalizedType(type) {
+        return (Array.isArray(type))
+            ? { array: type[0] }
+            : (typeof (type['type']) !== "undefined")
+                ? type['type']
+                : type;
+    }
     const Metadata = {
         addField(metadata, index, name, type, descriptor) {
             if (index > 64) {
@@ -180,14 +195,16 @@
             }
             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,
                 name,
             });
             // create "descriptors" map
-            metadata[$descriptors] ??= {};
+            Object.defineProperty(metadata, $descriptors, {
+                value: metadata[$descriptors] || {},
+                enumerable: false,
+                configurable: true,
+            });
             if (descriptor) {
                 // for encoder
                 metadata[$descriptors][name] = descriptor;
@@ -262,7 +279,7 @@
             TypeContext.register(constructor);
             const parentClass = Object.getPrototypeOf(constructor);
             const parentMetadata = parentClass && parentClass[Symbol.metadata];
-            const metadata = Metadata.initialize(constructor, parentMetadata);
+            const metadata = Metadata.initialize(constructor);
             // Use Schema's methods if not defined in the class
             if (!constructor[$track]) {
                 constructor[$track] = Schema[$track];
@@ -285,11 +302,15 @@
             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, fieldIndex, field, type, getPropertyDescriptor(`_${field}`, fieldIndex, type, complexTypeKlass));
+                const childType = (complexTypeKlass)
+                    ? Object.values(type)[0]
+                    : normalizedType;
+                Metadata.addField(metadata, fieldIndex, field, type, getPropertyDescriptor(`_${field}`, fieldIndex, childType, complexTypeKlass));
                 fieldIndex++;
             }
             return target;
@@ -310,24 +331,52 @@
                 configurable: true,
             });
         },
-        initialize(constructor, parentMetadata) {
+        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 (constructor[Symbol.metadata] === parentMetadata) {
+            if (parentClass !== Schema && metadata === parentMetadata) {
                 metadata = Object.create(null);
                 if (parentMetadata) {
+                    //
                     // assign parent metadata to current
-                    Object.assign(metadata, parentMetadata);
-                    for (let i = 0; i <= parentMetadata[$numFields]; i++) {
-                        const fieldName = parentMetadata[i].name;
-                        Object.defineProperty(metadata, fieldName, {
-                            value: parentMetadata[fieldName],
+                    //
+                    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,
                         });
                     }
-                    Object.defineProperty(metadata, $numFields, {
-                        value: parentMetadata[$numFields],
+                    // $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,
@@ -1102,7 +1151,6 @@
             return;
         }
         const ref = changeTree.ref;
-        // const metadata: Metadata = ref.constructor[Symbol.metadata];
         const field = metadata[index];
         // TODO: inline this function call small performance gain
         encodeValue(encoder, bytes, metadata[index].type, ref[field.name], operation, it);
@@ -1177,7 +1225,8 @@
         // 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
@@ -1655,6 +1704,10 @@
             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);
@@ -2774,13 +2827,13 @@
             // for inheritance support
             TypeContext.register(constructor);
             const parentClass = Object.getPrototypeOf(constructor);
-            const parentMetadata = parentClass && parentClass[Symbol.metadata];
-            const metadata = Metadata.initialize(constructor, parentMetadata);
+            const parentMetadata = parentClass[Symbol.metadata];
+            const metadata = Metadata.initialize(constructor);
             let fieldIndex = metadata[field];
             /**
              * skip if descriptor already exists for this field (`@deprecated()`)
              */
-            if (metadata[fieldIndex]) {
+            if (metadata[fieldIndex] !== undefined) {
                 if (metadata[fieldIndex].deprecated) {
                     // do not create accessors for deprecated properties.
                     return;
@@ -2930,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("");
@@ -4177,13 +4261,20 @@
         /**
          * Encodes the TypeContext of an Encoder into a buffer.
          *
-         * @param context TypeContext instance
+         * @param encoder Encoder instance
          * @param it
          * @returns
          */
-        static encode(context, it = { offset: 0 }) {
+        static encode(encoder, it = { offset: 0 }) {
+            const context = encoder.context;
             const reflection = new 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 fieldIndex in metadata) {
                     const index = Number(fieldIndex);
@@ -4257,18 +4348,14 @@
                 const parentClass = typeContext.get(reflectionType.extendsId) ?? Schema;
                 const schema = class _ extends parentClass {
                 };
-                const parentMetadata = parentClass[Symbol.metadata];
                 // register for inheritance support
                 TypeContext.register(schema);
-                // for inheritance support
-                Metadata.initialize(schema, parentMetadata);
+                // // for inheritance support
+                // Metadata.initialize(schema);
                 typeContext.add(schema, reflectionType.id);
             }, {});
-            // 2nd pass, set fields
-            reflection.types.forEach((reflectionType) => {
-                const schemaType = typeContext.get(reflectionType.id);
-                const metadata = schemaType[Symbol.metadata];
-                const parentFieldIndex = 0;
+            // define fields
+            const addFields = (metadata, reflectionType, parentFieldIndex) => {
                 reflectionType.fields.forEach((field, i) => {
                     const fieldIndex = parentFieldIndex + i;
                     if (field.referencedType !== undefined) {
@@ -4291,14 +4378,36 @@
                         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;
+                });
             });
-            const state = new (typeContext.get(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;
@@ -4771,6 +4880,7 @@
     exports.getDecoderStateCallbacks = getDecoderStateCallbacks;
     exports.getRawChangesCallback = getRawChangesCallback;
     exports.registerType = registerType;
+    exports.schema = schema;
     exports.type = type;
     exports.view = view;
 

package/lib/Metadata.d.ts

@@ -1,4 +1,4 @@
-import { type DefinitionType } from "./annotations";
+import { DefinitionType } from "./annotations";
 import { $descriptors, $fieldIndexesByViewTag, $numFields, $refTypeFieldIndexes, $viewFieldIndexes } from "./types/symbols";
 export type MetadataField = {
     type: DefinitionType;
@@ -33,6 +33,7 @@ export type Metadata = {
         [field: string]: PropertyDescriptor;
     };
 };
+export declare function getNormalizedType(type: DefinitionType): DefinitionType;
 export declare const Metadata: {
     addField(metadata: any, index: number, name: string, type: DefinitionType, descriptor?: PropertyDescriptor): void;
     setTag(metadata: Metadata, fieldName: string, tag: number): void;
@@ -41,7 +42,7 @@ export declare const Metadata: {
     }): any;
     isDeprecated(metadata: any, field: string): boolean;
     init(klass: any): void;
-    initialize(constructor: any, parentMetadata?: Metadata): Metadata;
+    initialize(constructor: any): Metadata;
     isValidInstance(klass: any): boolean;
     getFields(klass: any): {};
 };

package/lib/Metadata.js

@@ -1,11 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Metadata = void 0;
+exports.getNormalizedType = getNormalizedType;
 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");
+function getNormalizedType(type) {
+    return (Array.isArray(type))
+        ? { array: type[0] }
+        : (typeof (type['type']) !== "undefined")
+            ? type['type']
+            : type;
+}
 exports.Metadata = {
     addField(metadata, index, name, type, descriptor) {
         if (index > 64) {
@@ -13,14 +21,16 @@ exports.Metadata = {
         }
         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,
             name,
         });
         // create "descriptors" map
-        metadata[symbols_1.$descriptors] ??= {};
+        Object.defineProperty(metadata, symbols_1.$descriptors, {
+            value: metadata[symbols_1.$descriptors] || {},
+            enumerable: false,
+            configurable: true,
+        });
         if (descriptor) {
             // for encoder
             metadata[symbols_1.$descriptors][name] = descriptor;
@@ -95,7 +105,7 @@ exports.Metadata = {
         TypeContext_1.TypeContext.register(constructor);
         const parentClass = Object.getPrototypeOf(constructor);
         const parentMetadata = parentClass && parentClass[Symbol.metadata];
-        const metadata = exports.Metadata.initialize(constructor, parentMetadata);
+        const metadata = exports.Metadata.initialize(constructor);
         // 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];
@@ -118,11 +128,15 @@ exports.Metadata = {
         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))
                 ? (0, registry_1.getType)("array")
                 : (typeof (Object.keys(type)[0]) === "string") && (0, registry_1.getType)(Object.keys(type)[0]);
-            exports.Metadata.addField(metadata, fieldIndex, field, type, (0, annotations_1.getPropertyDescriptor)(`_${field}`, fieldIndex, type, complexTypeKlass));
+            const childType = (complexTypeKlass)
+                ? Object.values(type)[0]
+                : normalizedType;
+            exports.Metadata.addField(metadata, fieldIndex, field, type, (0, annotations_1.getPropertyDescriptor)(`_${field}`, fieldIndex, childType, complexTypeKlass));
             fieldIndex++;
         }
         return target;
@@ -143,24 +157,52 @@ exports.Metadata = {
             configurable: true,
         });
     },
-    initialize(constructor, parentMetadata) {
+    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 (constructor[Symbol.metadata] === parentMetadata) {
+        if (parentClass !== Schema_1.Schema && metadata === parentMetadata) {
             metadata = Object.create(null);
             if (parentMetadata) {
+                //
                 // assign parent metadata to current
-                Object.assign(metadata, parentMetadata);
-                for (let i = 0; i <= parentMetadata[symbols_1.$numFields]; i++) {
-                    const fieldName = parentMetadata[i].name;
-                    Object.defineProperty(metadata, fieldName, {
-                        value: parentMetadata[fieldName],
+                //
+                Object.setPrototypeOf(metadata, parentMetadata);
+                // $numFields
+                Object.defineProperty(metadata, symbols_1.$numFields, {
+                    value: parentMetadata[symbols_1.$numFields],
+                    enumerable: false,
+                    configurable: true,
+                    writable: true,
+                });
+                // $viewFieldIndexes / $fieldIndexesByViewTag
+                if (parentMetadata[symbols_1.$viewFieldIndexes] !== undefined) {
+                    Object.defineProperty(metadata, symbols_1.$viewFieldIndexes, {
+                        value: [...parentMetadata[symbols_1.$viewFieldIndexes]],
                         enumerable: false,
                         configurable: true,
+                        writable: true,
+                    });
+                    Object.defineProperty(metadata, symbols_1.$fieldIndexesByViewTag, {
+                        value: { ...parentMetadata[symbols_1.$fieldIndexesByViewTag] },
+                        enumerable: false,
+                        configurable: true,
+                        writable: true,
                     });
                 }
-                Object.defineProperty(metadata, symbols_1.$numFields, {
-                    value: parentMetadata[symbols_1.$numFields],
+                // $refTypeFieldIndexes
+                if (parentMetadata[symbols_1.$refTypeFieldIndexes] !== undefined) {
+                    Object.defineProperty(metadata, symbols_1.$refTypeFieldIndexes, {
+                        value: [...parentMetadata[symbols_1.$refTypeFieldIndexes]],
+                        enumerable: false,
+                        configurable: true,
+                        writable: true,
+                    });
+                }
+                // $descriptors
+                Object.defineProperty(metadata, symbols_1.$descriptors, {
+                    value: { ...parentMetadata[symbols_1.$descriptors] },
                     enumerable: false,
                     configurable: true,
                     writable: true,

package/lib/Metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../src/Metadata.ts"],"names":[],"mappings":";;;AAAA,+CAA2E;AAC3E,qCAAkC;AAClC,+CAA2C;AAC3C,6CAAwJ;AACxJ,qDAAkD;AAoBrC,QAAA,QAAQ,GAAG;IAEpB,QAAQ,CAAC,QAAa,EAAE,KAAa,EAAE,IAAY,EAAE,IAAoB,EAAE,UAA+B;QACtG,IAAI,KAAK,GAAG,EAAE,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,qDAAqD,CAAC,CAAC;QACtG,CAAC;QAED,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,CAC3B,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,mEAAmE;QAC1F;YACI,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACvB,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE;gBACpB,CAAC,CAAC,IAAI;YACV,KAAK;YACL,IAAI;SACP,CACJ,CAAC;QAEF,2BAA2B;QAC3B,QAAQ,CAAC,sBAAY,CAAC,KAAK,EAAE,CAAC;QAE9B,IAAI,UAAU,EAAE,CAAC;YACb,cAAc;YACd,QAAQ,CAAC,sBAAY,CAAC,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;YAC1C,QAAQ,CAAC,sBAAY,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG;gBACjC,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,IAAI;gBACd,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,IAAI;aACrB,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,cAAc;YACd,QAAQ,CAAC,sBAAY,CAAC,CAAC,IAAI,CAAC,GAAG;gBAC3B,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,IAAI;gBACd,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,IAAI;aACrB,CAAC;QACN,CAAC;QAED,6BAA6B;QAC7B,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,oBAAU,EAAE;YACxC,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,2CAA2C;QAC3C,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,EAAE;YAClC,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,uCAAuC;QACvC,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC7C,IAAI,QAAQ,CAAC,8BAAoB,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC/C,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,8BAAoB,EAAE;oBAClD,KAAK,EAAE,EAAE;oBACT,UAAU,EAAE,KAAK;oBACjB,YAAY,EAAE,IAAI;iBACrB,CAAC,CAAC;YACP,CAAC;YACD,QAAQ,CAAC,8BAAoB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IAED,MAAM,CAAC,QAAkB,EAAE,SAAiB,EAAE,GAAW;QACrD,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAE9B,yBAAyB;QACzB,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;QAEhB,IAAI,CAAC,QAAQ,CAAC,2BAAiB,CAAC,EAAE,CAAC;YAC/B,wCAAwC;YACxC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,2BAAiB,EAAE;gBAC/C,KAAK,EAAE,EAAE;gBACT,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,IAAI;aACrB,CAAC,CAAC;YAEH,kCAAkC;YAClC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,gCAAsB,EAAE;gBACpD,KAAK,EAAE,EAAE;gBACT,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,IAAI;aACrB,CAAC,CAAC;QACP,CAAC;QAED,QAAQ,CAAC,2BAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAExC,IAAI,CAAC,QAAQ,CAAC,gCAAsB,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,QAAQ,CAAC,gCAAsB,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QAC/C,CAAC;QAED,QAAQ,CAAC,gCAAsB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,SAAS,CAAC,MAAW,EAAE,MAA2C;QAC9D,0BAA0B;QAC1B,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;QACjD,yBAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAElC,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,gBAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAElE,mDAAmD;QACnD,IAAI,CAAC,WAAW,CAAC,gBAAM,CAAC,EAAE,CAAC;YAAC,WAAW,CAAC,gBAAM,CAAC,GAAG,eAAM,CAAC,gBAAM,CAAC,CAAC;QAAC,CAAC;QACnE,IAAI,CAAC,WAAW,CAAC,kBAAQ,CAAC,EAAE,CAAC;YAAC,WAAW,CAAC,kBAAQ,CAAC,GAAG,eAAM,CAAC,kBAAQ,CAAC,CAAC;QAAC,CAAC;QACzE,IAAI,CAAC,WAAW,CAAC,kBAAQ,CAAC,EAAE,CAAC;YAAC,WAAW,CAAC,kBAAQ,CAAC,GAAG,eAAM,CAAC,kBAAQ,CAAC,CAAC;QAAC,CAAC;QACzE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAAC,WAAW,CAAC,SAAS,CAAC,MAAM,GAAG,eAAM,CAAC,SAAS,CAAC,MAAM,CAAC;QAAC,CAAC;QAE9F,EAAE;QACF,uDAAuD;QACvD,EAAE;QACF,IAAI,UAAU,GAAG,QAAQ,CAAC,oBAAU,CAAC,CAAC,+CAA+C;eAC9E,CAAC,cAAc,IAAI,cAAc,CAAC,oBAAU,CAAC,CAAC,CAAC,sCAAsC;eACrF,CAAC,CAAC,CAAC,CAAC,oBAAoB;QAE/B,UAAU,EAAE,CAAC;QAEb,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAE3B,yDAAyD;YACzD,MAAM,gBAAgB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC1C,CAAC,CAAC,IAAA,kBAAO,EAAC,OAAO,CAAC;gBAClB,CAAC,CAAC,CAAC,OAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,IAAI,IAAA,kBAAO,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEnF,gBAAQ,CAAC,QAAQ,CACb,QAAQ,EACR,UAAU,EACV,KAAK,EACL,IAAI,EACJ,IAAA,mCAAqB,EAAC,IAAI,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,CAAC,CACzE,CAAC;YAEF,UAAU,EAAE,CAAC;QACjB,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,YAAY,CAAC,QAAa,EAAE,KAAa;QACrC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,KAAU;QACX,EAAE;QACF,gEAAgE;QAChE,gCAAgC;QAChC,EAAE;QACF,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QAClC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,oBAAU,EAAE;YACxC,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;SACrB,CAAC,CAAC;IACP,CAAC;IAED,UAAU,CAAC,WAAgB,EAAE,cAAyB;QAClD,IAAI,QAAQ,GAAa,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE7E,8DAA8D;QAC9D,IAAI,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,cAAc,EAAE,CAAC;YAClD,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE/B,IAAI,cAAc,EAAE,CAAC;gBACjB,oCAAoC;gBACpC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;gBAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,oBAAU,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;oBACnD,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBACzC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,EAAE;wBACvC,KAAK,EAAE,cAAc,CAAC,SAAS,CAAC;wBAChC,UAAU,EAAE,KAAK;wBACjB,YAAY,EAAE,IAAI;qBACrB,CAAC,CAAC;gBACP,CAAC;gBAED,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,oBAAU,EAAE;oBACxC,KAAK,EAAE,cAAc,CAAC,oBAAU,CAAC;oBACjC,UAAU,EAAE,KAAK;oBACjB,YAAY,EAAE,IAAI;oBAClB,QAAQ,EAAE,IAAI;iBACjB,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAED,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QAExC,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,eAAe,CAAC,KAAU;QACtB,OAAO,CACH,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC;YAClC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,oBAAU,CAAY,CAClG,CAAC;IACN,CAAC;IAED,SAAS,CAAC,KAAU;QAChB,MAAM,QAAQ,GAAa,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,oBAAU,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA","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}"]}
+{"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../src/Metadata.ts"],"names":[],"mappings":"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","sourcesContent":["import { Definition, DefinitionType, getPropertyDescriptor } 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 function getNormalizedType(type: DefinitionType): DefinitionType  {\n    return (Array.isArray(type))\n        ? { array: type[0] }\n        : (typeof(type['type']) !== \"undefined\")\n            ? type['type']\n            : type;\n}\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: getNormalizedType(type),\n                index,\n                name,\n            }\n        );\n\n        // create \"descriptors\" map\n        Object.defineProperty(metadata, $descriptors, {\n            value: metadata[$descriptors] || {},\n            enumerable: false,\n            configurable: true,\n        });\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);\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            const normalizedType = getNormalizedType(type);\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            const childType = (complexTypeKlass)\n                ? Object.values(type)[0]\n                : normalizedType;\n\n            Metadata.addField(\n                metadata,\n                fieldIndex,\n                field,\n                type,\n                getPropertyDescriptor(`_${field}`, fieldIndex, childType, 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) {\n        const parentClass = Object.getPrototypeOf(constructor);\n        const parentMetadata: Metadata = parentClass[Symbol.metadata];\n\n        let metadata: Metadata = constructor[Symbol.metadata] ?? Object.create(null);\n\n        // make sure inherited classes have their own metadata object.\n        if (parentClass !== Schema && metadata === parentMetadata) {\n            metadata = Object.create(null);\n\n            if (parentMetadata) {\n                //\n                // assign parent metadata to current\n                //\n                Object.setPrototypeOf(metadata, parentMetadata);\n\n                // $numFields\n                Object.defineProperty(metadata, $numFields, {\n                    value: parentMetadata[$numFields],\n                    enumerable: false,\n                    configurable: true,\n                    writable: true,\n                });\n\n                // $viewFieldIndexes / $fieldIndexesByViewTag\n                if (parentMetadata[$viewFieldIndexes] !== undefined) {\n                    Object.defineProperty(metadata, $viewFieldIndexes, {\n                        value: [...parentMetadata[$viewFieldIndexes]],\n                        enumerable: false,\n                        configurable: true,\n                        writable: true,\n                    });\n                    Object.defineProperty(metadata, $fieldIndexesByViewTag, {\n                        value: { ...parentMetadata[$fieldIndexesByViewTag] },\n                        enumerable: false,\n                        configurable: true,\n                        writable: true,\n                    });\n                }\n\n                // $refTypeFieldIndexes\n                if (parentMetadata[$refTypeFieldIndexes] !== undefined) {\n                    Object.defineProperty(metadata, $refTypeFieldIndexes, {\n                        value: [...parentMetadata[$refTypeFieldIndexes]],\n                        enumerable: false,\n                        configurable: true,\n                        writable: true,\n                    });\n                }\n\n                // $descriptors\n                Object.defineProperty(metadata, $descriptors, {\n                    value: { ...parentMetadata[$descriptors] },\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,6 @@
-import { TypeContext } from "./types/TypeContext";
 import { ArraySchema } from "./types/custom/ArraySchema";
 import { Iterator } from "./encoding/decode";
+import { Encoder } from "./encoder/Encoder";
 import { Decoder } from "./decoder/Decoder";
 import { Schema } from "./Schema";
 /**
@@ -18,14 +18,15 @@ export declare class ReflectionType extends Schema {
 }
 export declare class Reflection extends Schema {
     types: ArraySchema<ReflectionType>;
+    rootType: number;
     /**
      * Encodes the TypeContext of an Encoder into a buffer.
      *
-     * @param context TypeContext instance
+     * @param encoder Encoder instance
      * @param it
      * @returns
      */
-    static encode(context: TypeContext, it?: Iterator): Buffer;
+    static encode(encoder: Encoder, it?: Iterator): Buffer;
     /**
      * Decodes the TypeContext from a buffer into a Decoder instance.
      *

package/lib/Reflection.js

@@ -53,13 +53,20 @@ class Reflection extends Schema_1.Schema {
     /**
      * Encodes the TypeContext of an Encoder into a buffer.
      *
-     * @param context TypeContext instance
+     * @param encoder Encoder instance
      * @param it
      * @returns
      */
-    static encode(context, it = { offset: 0 }) {
+    static encode(encoder, it = { offset: 0 }) {
+        const context = encoder.context;
         const reflection = new Reflection();
         const reflectionEncoder = new Encoder_1.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 fieldIndex in metadata) {
                 const index = Number(fieldIndex);
@@ -133,18 +140,14 @@ class Reflection extends Schema_1.Schema {
             const parentClass = typeContext.get(reflectionType.extendsId) ?? Schema_1.Schema;
             const schema = class _ extends parentClass {
             };
-            const parentMetadata = parentClass[Symbol.metadata];
             // register for inheritance support
             TypeContext_1.TypeContext.register(schema);
-            // for inheritance support
-            Metadata_1.Metadata.initialize(schema, parentMetadata);
+            // // for inheritance support
+            // Metadata.initialize(schema);
             typeContext.add(schema, reflectionType.id);
         }, {});
-        // 2nd pass, set fields
-        reflection.types.forEach((reflectionType) => {
-            const schemaType = typeContext.get(reflectionType.id);
-            const metadata = schemaType[Symbol.metadata];
-            const parentFieldIndex = 0;
+        // define fields
+        const addFields = (metadata, reflectionType, parentFieldIndex) => {
             reflectionType.fields.forEach((field, i) => {
                 const fieldIndex = parentFieldIndex + i;
                 if (field.referencedType !== undefined) {
@@ -167,8 +170,27 @@ class Reflection extends Schema_1.Schema {
                     Metadata_1.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_1.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;
+            });
         });
-        const state = new (typeContext.get(0))();
+        const state = new (typeContext.get(reflection.rootType || 0))();
         return new Decoder_1.Decoder(state, typeContext);
     }
 }
@@ -176,4 +198,7 @@ exports.Reflection = Reflection;
 __decorate([
     (0, annotations_1.type)([ReflectionType])
 ], Reflection.prototype, "types", void 0);
+__decorate([
+    (0, annotations_1.type)("number")
+], Reflection.prototype, "rootType", void 0);
 //# sourceMappingURL=Reflection.js.map