@colyseus/schema 4.0.5 → 4.0.7

package/build/index.js

@@ -933,7 +933,11 @@
                     });
                 }
             }
-            constructor[Symbol.metadata] = metadata;
+            Object.defineProperty(constructor, Symbol.metadata, {
+                value: metadata,
+                writable: false,
+                configurable: true
+            });
             return metadata;
         },
         isValidInstance(klass) {
@@ -3555,7 +3559,12 @@
                     }
                     else if (value['type'] !== undefined && Schema.is(value['type'])) {
                         // Direct Schema type: Type → new Type()
-                        defaultValues[fieldName] = new value['type']();
+                        if (!value['type'].prototype.initialize || value['type'].prototype.initialize.length === 0) {
+                            // only auto-initialize Schema instances if:
+                            // - they don't have an initialize method
+                            // - or initialize method doesn't accept any parameters
+                            defaultValues[fieldName] = new value['type']();
+                        }
                     }
                 }
                 else {
@@ -3565,7 +3574,12 @@
             else if (typeof (value) === "function") {
                 if (Schema.is(value)) {
                     // Direct Schema type: Type → new Type()
-                    defaultValues[fieldName] = new value();
+                    if (!value.prototype.initialize || value.prototype.initialize.length === 0) {
+                        // only auto-initialize Schema instances if:
+                        // - they don't have an initialize method
+                        // - or initialize method doesn't accept any parameters
+                        defaultValues[fieldName] = new value();
+                    }
                     fields[fieldName] = getNormalizedType(value);
                 }
                 else {
@@ -3592,13 +3606,32 @@
             }
             return defaults;
         };
+        const getParentProps = (props) => {
+            const fieldNames = Object.keys(fields);
+            const parentProps = {};
+            for (const key in props) {
+                if (!fieldNames.includes(key)) {
+                    parentProps[key] = props[key];
+                }
+            }
+            return parentProps;
+        };
         /** @codegen-ignore */
         const klass = Metadata.setFields(class extends inherits {
             constructor(...args) {
-                super(Object.assign({}, getDefaultValues(), args[0] || {}));
                 // call initialize method
                 if (methods.initialize && typeof methods.initialize === 'function') {
-                    methods.initialize.apply(this, args);
+                    super(Object.assign({}, getDefaultValues(), getParentProps(args[0] || {})));
+                    /**
+                     * only call initialize() in the current class, not the parent ones.
+                     * see "should not call initialize automatically when creating an instance of inherited Schema"
+                     */
+                    if (new.target === klass) {
+                        methods.initialize.apply(this, args);
+                    }
+                }
+                else {
+                    super(Object.assign({}, getDefaultValues(), args[0] || {}));
                 }
             }
         }, fields);

package/build/index.mjs

@@ -927,7 +927,11 @@ const Metadata = {
                 });
             }
         }
-        constructor[Symbol.metadata] = metadata;
+        Object.defineProperty(constructor, Symbol.metadata, {
+            value: metadata,
+            writable: false,
+            configurable: true
+        });
         return metadata;
     },
     isValidInstance(klass) {
@@ -3549,7 +3553,12 @@ function schema(fieldsAndMethods, name, inherits = Schema) {
                 }
                 else if (value['type'] !== undefined && Schema.is(value['type'])) {
                     // Direct Schema type: Type → new Type()
-                    defaultValues[fieldName] = new value['type']();
+                    if (!value['type'].prototype.initialize || value['type'].prototype.initialize.length === 0) {
+                        // only auto-initialize Schema instances if:
+                        // - they don't have an initialize method
+                        // - or initialize method doesn't accept any parameters
+                        defaultValues[fieldName] = new value['type']();
+                    }
                 }
             }
             else {
@@ -3559,7 +3568,12 @@ function schema(fieldsAndMethods, name, inherits = Schema) {
         else if (typeof (value) === "function") {
             if (Schema.is(value)) {
                 // Direct Schema type: Type → new Type()
-                defaultValues[fieldName] = new value();
+                if (!value.prototype.initialize || value.prototype.initialize.length === 0) {
+                    // only auto-initialize Schema instances if:
+                    // - they don't have an initialize method
+                    // - or initialize method doesn't accept any parameters
+                    defaultValues[fieldName] = new value();
+                }
                 fields[fieldName] = getNormalizedType(value);
             }
             else {
@@ -3586,13 +3600,32 @@ function schema(fieldsAndMethods, name, inherits = Schema) {
         }
         return defaults;
     };
+    const getParentProps = (props) => {
+        const fieldNames = Object.keys(fields);
+        const parentProps = {};
+        for (const key in props) {
+            if (!fieldNames.includes(key)) {
+                parentProps[key] = props[key];
+            }
+        }
+        return parentProps;
+    };
     /** @codegen-ignore */
     const klass = Metadata.setFields(class extends inherits {
         constructor(...args) {
-            super(Object.assign({}, getDefaultValues(), args[0] || {}));
             // call initialize method
             if (methods.initialize && typeof methods.initialize === 'function') {
-                methods.initialize.apply(this, args);
+                super(Object.assign({}, getDefaultValues(), getParentProps(args[0] || {})));
+                /**
+                 * only call initialize() in the current class, not the parent ones.
+                 * see "should not call initialize automatically when creating an instance of inherited Schema"
+                 */
+                if (new.target === klass) {
+                    methods.initialize.apply(this, args);
+                }
+            }
+            else {
+                super(Object.assign({}, getDefaultValues(), args[0] || {}));
             }
         }
     }, fields);