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

package/build/cjs/index.js

@@ -115,7 +115,7 @@ class TypeContext {
         // 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;
@@ -131,6 +131,14 @@ class TypeContext {
         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]) {
@@ -169,6 +177,13 @@ class TypeContext {
     }
 }
 
+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) {
@@ -176,9 +191,7 @@ const 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,
         });
@@ -285,11 +298,15 @@ const 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))
                 ? 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;
@@ -322,16 +339,6 @@ const Metadata = {
                 // assign parent metadata to current
                 //
                 Object.setPrototypeOf(metadata, parentMetadata);
-                // Object.keys(parentMetadata).forEach((fieldIndex) => {
-                //     const index = Number(fieldIndex);
-                //     const field = parentMetadata[index];
-                //     metadata[index] = field;
-                //     // Object.defineProperty(metadata, field.name, {
-                //     //     value: index,
-                //     //     enumerable: false,
-                //     //     configurable: true,
-                //     // });
-                // });
                 // $numFields
                 Object.defineProperty(metadata, $numFields, {
                     value: parentMetadata[$numFields],
@@ -1140,7 +1147,6 @@ const encodeSchemaOperation = function (encoder, bytes, changeTree, index, opera
         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);
@@ -1215,7 +1221,8 @@ const encodeArray = function (encoder, bytes, changeTree, field, operation, it,
     // 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
@@ -1693,6 +1700,10 @@ const decodeArray = function (decoder, bytes, it, ref, allChanges) {
         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);
@@ -2968,6 +2979,37 @@ function defineTypes(target, fields, options) {
     }
     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("");
@@ -4215,13 +4257,20 @@ class Reflection extends 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(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);
@@ -4345,13 +4394,16 @@ class Reflection extends Schema {
                 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;
@@ -4824,6 +4876,7 @@ exports.encodeSchemaOperation = encodeSchemaOperation;
 exports.getDecoderStateCallbacks = getDecoderStateCallbacks;
 exports.getRawChangesCallback = getRawChangesCallback;
 exports.registerType = registerType;
+exports.schema = schema;
 exports.type = type;
 exports.view = view;
 //# sourceMappingURL=index.js.map