@colyseus/schema 5.0.20 → 5.0.21

package/build/index.js

@@ -1415,6 +1415,10 @@
                 });
             }
             for (const field in fields) {
+                // metadata inherits the parent's, so this also catches a redeclared parent field
+                if (metadata[field] !== undefined) {
+                    throw new Error(`@colyseus/schema: Duplicate '${field}' definition on '${constructor.name || "(anonymous)"}'.`);
+                }
                 Metadata.defineField(constructor, metadata, fieldIndex, field, fields[field]);
                 fieldIndex++;
             }
@@ -7279,6 +7283,9 @@
     /**
      * Define a Schema class declaratively.
      *
+     * `initialize()` acts as the constructor: a class created with `.extend()`
+     * inherits the parent's unless it defines its own.
+     *
      * @example
      * import { schema, t } from '@colyseus/schema';
      *
@@ -7439,8 +7446,11 @@
             return parentProps;
         };
         const hasInitialize = typeof methods.initialize === "function";
-        /** @codegen-ignore */
-        const klass = Metadata.setFields(class extends inherits {
+        // Like a constructor: the most-derived initialize() runs once, own or
+        // inherited from a schema() parent. A custom base's initialize() is not
+        // picked up — the constructor type only sees the fields map.
+        const initialize = methods.initialize ?? inherits._initialize;
+        const klass = class extends inherits {
             constructor(...args) {
                 const props = args[0];
                 if (props === undefined) {
@@ -7455,13 +7465,20 @@
                     // `initialize()` owns the schema fields, so only parent props flow up.
                     super(Object.assign(getDefaultValues(), hasInitialize ? getParentProps(props) : props));
                 }
-                // Only call initialize() on the exact target class, not parents.
-                if (hasInitialize && new.target === klass) {
-                    methods.initialize.apply(this, args);
+                // Only on the exact target class — parents' constructors skip it.
+                if (initialize && new.target === klass) {
+                    initialize.apply(this, args);
                 }
             }
-        }, fields);
+        };
+        // named before setFields so a duplicate-field error can say which class
+        if (name) {
+            Object.defineProperty(klass, "name", { value: name });
+        }
+        /** @codegen-ignore */
+        Metadata.setFields(klass, fields);
         klass._getDefaultValues = getDefaultValues;
+        klass._initialize = initialize;
         Object.assign(klass.prototype, methods);
         for (const fieldName in viewTagFields) {
             view(viewTagFields[fieldName])(klass.prototype, fieldName);
@@ -7493,9 +7510,6 @@
                 metadata[metadata[fieldName]].optional = true;
             }
         }
-        if (name) {
-            Object.defineProperty(klass, "name", { value: name });
-        }
         klass.extend = (childFields, childName) => schema(childFields, childName, klass);
         return klass;
     }

package/build/index.mjs

@@ -1409,6 +1409,10 @@ const Metadata = {
             });
         }
         for (const field in fields) {
+            // metadata inherits the parent's, so this also catches a redeclared parent field
+            if (metadata[field] !== undefined) {
+                throw new Error(`@colyseus/schema: Duplicate '${field}' definition on '${constructor.name || "(anonymous)"}'.`);
+            }
             Metadata.defineField(constructor, metadata, fieldIndex, field, fields[field]);
             fieldIndex++;
         }
@@ -7273,6 +7277,9 @@ function makeAutoDefaultFactory(rawType) {
 /**
  * Define a Schema class declaratively.
  *
+ * `initialize()` acts as the constructor: a class created with `.extend()`
+ * inherits the parent's unless it defines its own.
+ *
  * @example
  * import { schema, t } from '@colyseus/schema';
  *
@@ -7433,8 +7440,11 @@ function schema(fieldsAndMethods, name, inherits = Schema) {
         return parentProps;
     };
     const hasInitialize = typeof methods.initialize === "function";
-    /** @codegen-ignore */
-    const klass = Metadata.setFields(class extends inherits {
+    // Like a constructor: the most-derived initialize() runs once, own or
+    // inherited from a schema() parent. A custom base's initialize() is not
+    // picked up — the constructor type only sees the fields map.
+    const initialize = methods.initialize ?? inherits._initialize;
+    const klass = class extends inherits {
         constructor(...args) {
             const props = args[0];
             if (props === undefined) {
@@ -7449,13 +7459,20 @@ function schema(fieldsAndMethods, name, inherits = Schema) {
                 // `initialize()` owns the schema fields, so only parent props flow up.
                 super(Object.assign(getDefaultValues(), hasInitialize ? getParentProps(props) : props));
             }
-            // Only call initialize() on the exact target class, not parents.
-            if (hasInitialize && new.target === klass) {
-                methods.initialize.apply(this, args);
+            // Only on the exact target class — parents' constructors skip it.
+            if (initialize && new.target === klass) {
+                initialize.apply(this, args);
             }
         }
-    }, fields);
+    };
+    // named before setFields so a duplicate-field error can say which class
+    if (name) {
+        Object.defineProperty(klass, "name", { value: name });
+    }
+    /** @codegen-ignore */
+    Metadata.setFields(klass, fields);
     klass._getDefaultValues = getDefaultValues;
+    klass._initialize = initialize;
     Object.assign(klass.prototype, methods);
     for (const fieldName in viewTagFields) {
         view(viewTagFields[fieldName])(klass.prototype, fieldName);
@@ -7487,9 +7504,6 @@ function schema(fieldsAndMethods, name, inherits = Schema) {
             metadata[metadata[fieldName]].optional = true;
         }
     }
-    if (name) {
-        Object.defineProperty(klass, "name", { value: name });
-    }
     klass.extend = (childFields, childName) => schema(childFields, childName, klass);
     return klass;
 }