@colyseus/schema 3.0.72 → 3.0.74

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 {
@@ -3577,7 +3589,13 @@ function schema(fieldsAndMethods, name, inherits = Schema) {
             // call initialize method
             if (methods.initialize && typeof methods.initialize === 'function') {
                 super(Object.assign({}, getDefaultValues(), getParentProps(args[0] || {})));
-                methods.initialize.apply(this, args);
+                /**
+                 * 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] || {}));