@colyseus/schema 3.0.71 → 3.0.73

package/build/cjs/index.js

@@ -3524,7 +3524,15 @@ function schema(fieldsAndMethods, name, inherits = Schema) {
                     // Collection: Set → new SetSchema()
                     defaultValues[fieldName] = new SetSchema();
                 }
-                else if (value['type'] !== undefined && Schema.is(value['type'])) ;
+                else if (value['type'] !== undefined && Schema.is(value['type'])) {
+                    // Direct Schema type: Type → new 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 {
                 defaultValues[fieldName] = value['default'];
@@ -3533,8 +3541,12 @@ function schema(fieldsAndMethods, name, inherits = Schema) {
         else if (typeof (value) === "function") {
             if (Schema.is(value)) {
                 // Direct Schema type: Type → new Type()
-                // TODO: should we auto-initialize Schema instances, in case their initialize() method is not defined?
-                // 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 {
@@ -3561,14 +3573,27 @@ 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') {
+                super(Object.assign({}, getDefaultValues(), getParentProps(args[0] || {})));
                 methods.initialize.apply(this, args);
             }
+            else {
+                super(Object.assign({}, getDefaultValues(), args[0] || {}));
+            }
         }
     }, fields);
     // Store the getDefaultValues function on the class for inheritance