@colyseus/schema 3.0.62 → 3.0.63

package/lib/v3_bench.js.map

@@ -1 +1 @@
-{"version":3,"file":"v3_bench.js","sourceRoot":"","sources":["../src/v3_bench.ts"],"names":[],"mappings":"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","sourcesContent":["import { Schema, type, MapSchema, ArraySchema, Reflection, Encoder, Decoder } from \"./index\";\n\n// globalThis.interval = setInterval(() => {}, 1000);\n\n// class Item extends Schema {\n//     @type(\"string\") name: string;\n// }\n\n// class RootState extends Schema {\n//     @type([Item]) items = new ArraySchema<Item>();\n// }\n// const state = new RootState();\n// state.items.push(new Item().assign({ name: \"hello\" }));\n\n// console.log(\"Encoded:\", state.encode());\n\nclass Vec3 extends Schema {\n    @type(\"number\") x: number;\n    @type(\"number\") y: number;\n    @type(\"number\") z: number;\n}\n\nclass Base extends Schema {}\n\nclass Entity extends Schema {\n    @type(Vec3) position = new Vec3().assign({ x: 0, y: 0, z: 0 });\n}\n\nclass Player extends Entity {\n    @type(Vec3) rotation = new Vec3().assign({ x: 0, y: 0, z: 0 });\n    @type(\"string\") secret: string = \"private info only for this player\";\n}\n\nclass State extends Schema {\n    // @type({ map: Base }) players = new MapSchema<Entity>();\n    @type(\"number\") num: number = 0;\n    @type(\"string\") str = \"Hello world!\";\n    // @type(Entity) entity = new Player().assign({\n    //     position: new Vec3().assign({ x: 1, y: 2, z: 3 }),\n    //     rotation: new Vec3().assign({ x: 4, y: 5, z: 6 }),\n    // });\n    @type({ map: Entity }) entities = new MapSchema();\n}\n\nconst state = new State();\n\nstate.entities.set(\"one\", new Player().assign({\n  position: new Vec3().assign({ x: 1, y: 2, z: 3 }),\n  rotation: new Vec3().assign({ x: 1, y: 2, z: 3 }),\n}));\n\nstate.entities.set(\"two\", new Player().assign({\n  position: new Vec3().assign({ x: 4, y: 5, z: 6 }),\n  rotation: new Vec3().assign({ x: 7, y: 8, z: 9 }),\n}));\n\nconst encoder = new Encoder(state);\nlet encoded = encoder.encode();\nconsole.log(`(${encoded.length})`, [...encoded]);\n\nglobalThis.perform = function() {\n    for (let i = 0; i < 500000; i++) {\n        encoder.encodeAll();\n    }\n}\n\nfunction logTime(label: string, callback: Function) {\n    const time = Date.now();\n    for (let i = 0; i < 500000; i++) {\n        callback();\n    }\n    console.log(`${label}:`, Date.now() - time);\n}\nlogTime(\"encode time\", () => encoder.encodeAll());\n\nconst decoder = new Decoder(new State());\nlogTime(\"decode time\", () => decoder.decode(encoded));\n\n// const time = Date.now();\n// console.profile();\n// for (let i = 0; i < 300000; i++) {\n//   state.encodeAll();\n// }\n// console.profileEnd();\n// console.log(\"encode time:\", Date.now() - time);\n\n// const decoded = Reflection.decode(Reflection.encode(state));\n// decoded.decode(encoded);\n//\n// console.log(decoded.toJSON());\n//\n// const rotation = state.entity.rotation;\n// rotation.x = 100;\n//\n// encoded = state.encode();\n// console.log({encoded});\n//\n// decoded.decode(encoded);\n// console.log(decoded.toJSON());\n\n// const time = Date.now();\n// for (let i = 0; i < 300000; i++) {\n//   const state = new State();\n//   state.encode();\n// }\n// console.log(\"encode time:\", Date.now() - time);\n\n"]}
+{"version":3,"file":"v3_bench.js","sourceRoot":"","sources":["../src/v3_bench.ts"],"names":[],"mappings":";;;;;;;;AAAA,mCAA6F;AAE7F,qDAAqD;AAErD,8BAA8B;AAC9B,oCAAoC;AACpC,IAAI;AAEJ,mCAAmC;AACnC,qDAAqD;AACrD,IAAI;AACJ,iCAAiC;AACjC,0DAA0D;AAE1D,2CAA2C;AAE3C,MAAM,IAAK,SAAQ,cAAM;CAIxB;AAHmB;IAAf,IAAA,YAAI,EAAC,QAAQ,CAAC;+BAAW;AACV;IAAf,IAAA,YAAI,EAAC,QAAQ,CAAC;+BAAW;AACV;IAAf,IAAA,YAAI,EAAC,QAAQ,CAAC;+BAAW;AAG9B,MAAM,IAAK,SAAQ,cAAM;CAAG;AAE5B,MAAM,MAAO,SAAQ,cAAM;IAA3B;;QACgB,aAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC;CAAA;AADe;IAAX,IAAA,YAAI,EAAC,IAAI,CAAC;wCAAoD;AAGnE,MAAM,MAAO,SAAQ,MAAM;IAA3B;;QACgB,aAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/C,WAAM,GAAW,mCAAmC,CAAC;IACzE,CAAC;CAAA;AAFe;IAAX,IAAA,YAAI,EAAC,IAAI,CAAC;wCAAoD;AAC/C;IAAf,IAAA,YAAI,EAAC,QAAQ,CAAC;sCAAsD;AAGzE,MAAM,KAAM,SAAQ,cAAM;IAA1B;;QACI,0DAA0D;QAC1C,QAAG,GAAW,CAAC,CAAC;QAChB,QAAG,GAAG,cAAc,CAAC;QACrC,+CAA+C;QAC/C,yDAAyD;QACzD,yDAAyD;QACzD,MAAM;QACiB,aAAQ,GAAG,IAAI,iBAAS,EAAE,CAAC;IACtD,CAAC;CAAA;AAPmB;IAAf,IAAA,YAAI,EAAC,QAAQ,CAAC;kCAAiB;AAChB;IAAf,IAAA,YAAI,EAAC,QAAQ,CAAC;kCAAsB;AAKd;IAAtB,IAAA,YAAI,EAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;uCAA4B;AAGtD,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;AAE1B,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,MAAM,EAAE,CAAC,MAAM,CAAC;IAC5C,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;IACjD,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;CAClD,CAAC,CAAC,CAAC;AAEJ,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,MAAM,EAAE,CAAC,MAAM,CAAC;IAC5C,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;IACjD,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;CAClD,CAAC,CAAC,CAAC;AAEJ,MAAM,OAAO,GAAG,IAAI,eAAO,CAAC,KAAK,CAAC,CAAC;AACnC,IAAI,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AAC/B,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;AAEhD,UAAkB,CAAC,OAAO,GAAG;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9B,OAAO,CAAC,SAAS,EAAE,CAAC;IACxB,CAAC;AACL,CAAC,CAAA;AAED,SAAS,OAAO,CAAC,KAAa,EAAE,QAAkB;IAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9B,QAAQ,EAAE,CAAC;IACf,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;AAChD,CAAC;AACD,OAAO,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AAElD,MAAM,OAAO,GAAG,IAAI,eAAO,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;AACzC,OAAO,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtD,2BAA2B;AAC3B,qBAAqB;AACrB,qCAAqC;AACrC,uBAAuB;AACvB,IAAI;AACJ,wBAAwB;AACxB,kDAAkD;AAElD,+DAA+D;AAC/D,2BAA2B;AAC3B,EAAE;AACF,iCAAiC;AACjC,EAAE;AACF,0CAA0C;AAC1C,oBAAoB;AACpB,EAAE;AACF,4BAA4B;AAC5B,0BAA0B;AAC1B,EAAE;AACF,2BAA2B;AAC3B,iCAAiC;AAEjC,2BAA2B;AAC3B,qCAAqC;AACrC,+BAA+B;AAC/B,oBAAoB;AACpB,IAAI;AACJ,kDAAkD","sourcesContent":["import { Schema, type, MapSchema, ArraySchema, Reflection, Encoder, Decoder } from \"./index\";\n\n// globalThis.interval = setInterval(() => {}, 1000);\n\n// class Item extends Schema {\n//     @type(\"string\") name: string;\n// }\n\n// class RootState extends Schema {\n//     @type([Item]) items = new ArraySchema<Item>();\n// }\n// const state = new RootState();\n// state.items.push(new Item().assign({ name: \"hello\" }));\n\n// console.log(\"Encoded:\", state.encode());\n\nclass Vec3 extends Schema {\n    @type(\"number\") x: number;\n    @type(\"number\") y: number;\n    @type(\"number\") z: number;\n}\n\nclass Base extends Schema {}\n\nclass Entity extends Schema {\n    @type(Vec3) position = new Vec3().assign({ x: 0, y: 0, z: 0 });\n}\n\nclass Player extends Entity {\n    @type(Vec3) rotation = new Vec3().assign({ x: 0, y: 0, z: 0 });\n    @type(\"string\") secret: string = \"private info only for this player\";\n}\n\nclass State extends Schema {\n    // @type({ map: Base }) players = new MapSchema<Entity>();\n    @type(\"number\") num: number = 0;\n    @type(\"string\") str = \"Hello world!\";\n    // @type(Entity) entity = new Player().assign({\n    //     position: new Vec3().assign({ x: 1, y: 2, z: 3 }),\n    //     rotation: new Vec3().assign({ x: 4, y: 5, z: 6 }),\n    // });\n    @type({ map: Entity }) entities = new MapSchema();\n}\n\nconst state = new State();\n\nstate.entities.set(\"one\", new Player().assign({\n  position: new Vec3().assign({ x: 1, y: 2, z: 3 }),\n  rotation: new Vec3().assign({ x: 1, y: 2, z: 3 }),\n}));\n\nstate.entities.set(\"two\", new Player().assign({\n  position: new Vec3().assign({ x: 4, y: 5, z: 6 }),\n  rotation: new Vec3().assign({ x: 7, y: 8, z: 9 }),\n}));\n\nconst encoder = new Encoder(state);\nlet encoded = encoder.encode();\nconsole.log(`(${encoded.length})`, [...encoded]);\n\n(globalThis as any).perform = function(): void {\n    for (let i = 0; i < 500000; i++) {\n        encoder.encodeAll();\n    }\n}\n\nfunction logTime(label: string, callback: Function) {\n    const time = Date.now();\n    for (let i = 0; i < 500000; i++) {\n        callback();\n    }\n    console.log(`${label}:`, Date.now() - time);\n}\nlogTime(\"encode time\", () => encoder.encodeAll());\n\nconst decoder = new Decoder(new State());\nlogTime(\"decode time\", () => decoder.decode(encoded));\n\n// const time = Date.now();\n// console.profile();\n// for (let i = 0; i < 300000; i++) {\n//   state.encodeAll();\n// }\n// console.profileEnd();\n// console.log(\"encode time:\", Date.now() - time);\n\n// const decoded = Reflection.decode(Reflection.encode(state));\n// decoded.decode(encoded);\n//\n// console.log(decoded.toJSON());\n//\n// const rotation = state.entity.rotation;\n// rotation.x = 100;\n//\n// encoded = state.encode();\n// console.log({encoded});\n//\n// decoded.decode(encoded);\n// console.log(decoded.toJSON());\n\n// const time = Date.now();\n// for (let i = 0; i < 300000; i++) {\n//   const state = new State();\n//   state.encode();\n// }\n// console.log(\"encode time:\", Date.now() - time);\n\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/schema",
-  "version": "3.0.62",
+  "version": "3.0.63",
   "description": "Binary state serializer with delta encoding for games",
   "bin": {
     "schema-codegen": "bin/schema-codegen",
@@ -81,7 +81,7 @@
     "ts-node": "^10.9.2",
     "tslib": "^2.1.0",
     "tsx": "^3.13.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.9.3"
   },
   "nyc": {
     "extension": [

package/src/Metadata.ts

@@ -22,7 +22,7 @@ export type Metadata =
     { [field: string]: number; } & // field name => field metadata
     { [$descriptors]: { [field: string]: PropertyDescriptor } }  // property descriptors
 
-export function getNormalizedType(type: DefinitionType): DefinitionType  {
+export function getNormalizedType(type: any): DefinitionType  {
     if (Array.isArray(type)) {
         return { array: getNormalizedType(type[0]) };
 
@@ -308,7 +308,7 @@ export const Metadata = {
 
     getFields(klass: any) {
         const metadata: Metadata = klass[Symbol.metadata];
-        const fields = {};
+        const fields: any = {};
         for (let i = 0; i <= metadata[$numFields]; i++) {
             fields[metadata[i].name] = metadata[i].type;
         }

package/src/Reflection.ts

@@ -117,11 +117,11 @@ export class Reflection extends Schema {
                         } else {
                             fieldType = Object.keys(field.type)[0];
 
-                            if (typeof (field.type[fieldType]) === "string") {
-                                fieldType += ":" + field.type[fieldType]; // array:string
+                            if (typeof (field.type[fieldType as keyof typeof field.type]) === "string") {
+                                fieldType += ":" + field.type[fieldType as keyof typeof field.type]; // array:string
 
                             } else {
-                                childTypeSchema = field.type[fieldType];
+                                childTypeSchema = field.type[fieldType as keyof typeof field.type];
                             }
                         }
 
@@ -145,7 +145,8 @@ export class Reflection extends Schema {
         }
 
         const buf = reflectionEncoder.encodeAll(it);
-        return Buffer.from(buf, 0, it.offset);
+        return buf.slice(0, it.offset)
+        // return Buffer.from(buf, 0, it.offset);
     }
 
     /**

package/src/Schema.ts

@@ -1,9 +1,9 @@
 import { OPERATION } from './encoding/spec';
 import { DEFAULT_VIEW_TAG, type DefinitionType } from "./annotations";
 
-import { NonFunctionPropNames, ToJSON } from './types/HelperTypes';
+import { AssignableProps, NonFunctionPropNames, ToJSON } from './types/HelperTypes';
 
-import { ChangeSet, ChangeSetName, ChangeTree, Ref } from './encoder/ChangeTree';
+import { ChangeSet, ChangeSetName, ChangeTree, IRef, Ref } from './encoder/ChangeTree';
 import { $changes, $decoder, $deleteByIndex, $descriptors, $encoder, $filter, $getByIndex, $track } from './types/symbols';
 import { StateView } from './encoder/StateView';
 
@@ -11,13 +11,14 @@ import { encodeSchemaOperation } from './encoder/EncodeOperation';
 import { decodeSchemaOperation } from './decoder/DecodeOperation';
 
 import type { Decoder } from './decoder/Decoder';
-import type { Metadata } from './Metadata';
+import type { Metadata, MetadataField } from './Metadata';
 import { getIndent } from './utils';
 
 /**
  * Schema encoder / decoder
  */
-export class Schema {
+export class Schema<C = any> implements IRef {
+    static [Symbol.metadata]: Metadata;
     static [$encoder] = encodeSchemaOperation;
     static [$decoder] = decodeSchemaOperation;
 
@@ -36,9 +37,7 @@ export class Schema {
     }
 
     static is(type: DefinitionType) {
-        return typeof(type[Symbol.metadata]) === "object";
-        // const metadata = type[Symbol.metadata];
-        // return metadata && Object.prototype.hasOwnProperty.call(metadata, -1);
+        return typeof((type as typeof Schema)[Symbol.metadata]) === "object";
     }
 
     /**
@@ -58,7 +57,7 @@ export class Schema {
      * - Then, the encoder iterates over all "owned" properties per instance and encodes them.
      */
     static [$filter] (ref: Schema, index: number, view: StateView) {
-        const metadata: Metadata = ref.constructor[Symbol.metadata];
+        const metadata: Metadata = (ref.constructor as typeof Schema)[Symbol.metadata];
         const tag = metadata[index]?.tag;
 
         if (view === undefined) {
@@ -81,7 +80,7 @@ export class Schema {
     }
 
     // allow inherited classes to have a constructor
-    constructor(...args: any[]) {
+    constructor(arg?: C) {
         //
         // inline
         // Schema.initialize(this);
@@ -91,14 +90,14 @@ export class Schema {
         //
         // Assign initial values
         //
-        if (args[0]) {
-            Object.assign(this, args[0]);
+        if (arg) {
+            Object.assign(this, arg);
         }
     }
 
-    public assign(
-        props: { [prop in NonFunctionPropNames<this>]?: this[prop] } | ToJSON<this>,
-    ) {
+    public assign<T extends Partial<this>>(
+        props: AssignableProps<T>,
+    ): this {
         Object.assign(this, props);
         return this;
     }
@@ -110,7 +109,7 @@ export class Schema {
      * @param operation OPERATION to perform (detected automatically)
      */
     public setDirty<K extends NonFunctionPropNames<this>>(property: K | number, operation?: OPERATION) {
-        const metadata: Metadata = this.constructor[Symbol.metadata];
+        const metadata: Metadata = (this.constructor as typeof Schema)[Symbol.metadata];
         this[$changes].change(
             metadata[metadata[property as string]].index,
             operation
@@ -119,22 +118,21 @@ export class Schema {
 
     clone (): this {
         const cloned = new ((this as any).constructor);
-        const metadata: Metadata = this.constructor[Symbol.metadata];
+        const metadata: Metadata = (this.constructor as typeof Schema)[Symbol.metadata];
 
         //
         // TODO: clone all properties, not only annotated ones
         //
         // for (const field in this) {
         for (const fieldIndex in metadata) {
-            // const field = metadata[metadata[fieldIndex]].name;
-            const field = metadata[fieldIndex as any as number].name;
+            const field = metadata[fieldIndex as any as number].name as keyof this;
 
             if (
                 typeof (this[field]) === "object" &&
-                typeof (this[field]?.clone) === "function"
+                typeof ((this[field] as any)?.clone) === "function"
             ) {
                 // deep clone
-                cloned[field] = this[field].clone();
+                cloned[field] = (this[field] as any).clone();
 
             } else {
                 // primitive values
@@ -145,11 +143,11 @@ export class Schema {
         return cloned;
     }
 
-    toJSON () {
-        const obj: unknown = {};
+    toJSON (this: any) {
+        const obj: any = {};
         const metadata = this.constructor[Symbol.metadata];
         for (const index in metadata) {
-            const field = metadata[index];
+            const field = metadata[index] as MetadataField;
             const fieldName = field.name;
             if (!field.deprecated && this[fieldName] !== null && typeof (this[fieldName]) !== "undefined") {
                 obj[fieldName] = (typeof (this[fieldName]['toJSON']) === "function")
@@ -168,14 +166,14 @@ export class Schema {
         this[$changes].discardAll();
     }
 
-    protected [$getByIndex](index: number) {
-        const metadata: Metadata = this.constructor[Symbol.metadata];
-        return this[metadata[index].name];
+    [$getByIndex](index: number): any {
+        const metadata: Metadata = (this.constructor as typeof Schema)[Symbol.metadata];
+        return this[metadata[index].name as keyof this];
     }
 
-    protected [$deleteByIndex](index: number) {
-        const metadata: Metadata = this.constructor[Symbol.metadata];
-        this[metadata[index].name] = undefined;
+    [$deleteByIndex](index: number): void {
+        const metadata: Metadata = (this.constructor as typeof Schema)[Symbol.metadata];
+        this[metadata[index].name as keyof this] = undefined;
     }
 
     /**
@@ -185,7 +183,7 @@ export class Schema {
      * @param showContents display JSON contents of the instance
      * @returns
      */
-    static debugRefIds(ref: Ref, showContents: boolean = false, level: number = 0, decoder?: Decoder, keyPrefix: string = "") {
+    static debugRefIds<T extends Schema>(ref: T, showContents: boolean = false, level: number = 0, decoder?: Decoder, keyPrefix: string = "") {
         const contents = (showContents) ? ` - ${JSON.stringify(ref.toJSON())}` : "";
         const changeTree: ChangeTree = ref[$changes];
 
@@ -201,18 +199,18 @@ export class Schema {
 
         changeTree.forEachChild((childChangeTree, indexOrKey) => {
             let key = indexOrKey;
-            if (typeof indexOrKey === 'number' && ref['$indexes']) {
+            if (typeof indexOrKey === 'number' && (ref as any)['$indexes']) {
                 // MapSchema
-                key = ref['$indexes'].get(indexOrKey) ?? indexOrKey;
+                key = (ref as any)['$indexes'].get(indexOrKey) ?? indexOrKey;
             }
-            const keyPrefix = (ref['forEach'] !== undefined && key !== undefined) ? `["${key}"]: ` : "";
+            const keyPrefix = ((ref as any)['forEach'] !== undefined && key !== undefined) ? `["${key}"]: ` : "";
             output += this.debugRefIds(childChangeTree.ref, showContents, level + 1, decoder, keyPrefix);
         });
 
         return output;
     }
 
-    static debugRefIdEncodingOrder(ref: Ref, changeSet: ChangeSetName = 'allChanges') {
+    static debugRefIdEncodingOrder<T extends Ref>(ref: T, changeSet: ChangeSetName = 'allChanges') {
         let encodeOrder: number[] = [];
         let current = ref[$changes].root[changeSet].next;
         while (current) {
@@ -236,7 +234,7 @@ export class Schema {
      * @param isEncodeAll Return "full encode" instead of current change set.
      * @returns
      */
-    static debugChanges(instance: Ref, isEncodeAll: boolean = false) {
+    static debugChanges<T extends Ref>(instance: T, isEncodeAll: boolean = false) {
         const changeTree: ChangeTree = instance[$changes];
 
         const changeSet = (isEncodeAll) ? changeTree.allChanges : changeTree.changes;
@@ -278,7 +276,7 @@ export class Schema {
         return output;
     }
 
-    static debugChangesDeep(ref: Ref, changeSetName: "changes" | "allChanges" | "allFilteredChanges" | "filteredChanges" = "changes") {
+    static debugChangesDeep<T extends Schema>(ref: T, changeSetName: "changes" | "allChanges" | "allFilteredChanges" | "filteredChanges" = "changes") {
         let output = "";
 
         const rootChangeTree: ChangeTree = ref[$changes];
@@ -290,7 +288,7 @@ export class Schema {
 
         // TODO: FIXME: this method is not working as expected
         for (const [refId, changes] of Object.entries(root[changeSetName])) {
-            const changeTree = root.changeTrees[refId];
+            const changeTree = root.changeTrees[refId as any as number];
             if (!changeTree) { continue; }
 
             let includeChangeTree = false;

package/src/annotations.ts

@@ -8,8 +8,7 @@ import { TypeDefinition, getType } from "./types/registry";
 import { OPERATION } from "./encoding/spec";
 import { TypeContext } from "./types/TypeContext";
 import { assertInstanceType, assertType } from "./encoding/assert";
-import type { Ref } from "./encoder/ChangeTree";
-import type { DefinedSchemaType, InferValueType } from "./types/HelperTypes";
+import type { InferValueType, InferSchemaInstanceType, AssignableProps, IsNever } from "./types/HelperTypes";
 import { CollectionSchema } from "./types/custom/CollectionSchema";
 import { SetSchema } from "./types/custom/SetSchema";
 
@@ -48,8 +47,8 @@ export interface TypeOptions {
 
 export const DEFAULT_VIEW_TAG = -1;
 
-export function entity(constructor) {
-    TypeContext.register(constructor);
+export function entity(constructor: any): any {
+    TypeContext.register(constructor as typeof Schema);
     return constructor;
 }
 
@@ -366,9 +365,9 @@ export function getPropertyDescriptor(
     complexTypeKlass: TypeDefinition,
 ) {
     return {
-        get: function () { return this[fieldCached]; },
+        get: function (this: Schema) { return this[fieldCached as keyof Schema]; },
         set: function (this: Schema, value: any) {
-            const previousValue = this[fieldCached] ?? undefined;
+            const previousValue = this[fieldCached as keyof Schema] ?? undefined;
 
             // skip if value is the same as cached.
             if (value === previousValue) { return; }
@@ -388,6 +387,11 @@ export function getPropertyDescriptor(
                         value = new MapSchema(value);
                     }
 
+                    // // automaticallty transform Array into SetSchema
+                    // if (complexTypeKlass.constructor === SetSchema && !(value instanceof SetSchema)) {
+                    //     value = new SetSchema(value);
+                    // }
+
                     value[$childType] = type;
 
                 } else if (typeof (type) !== "string") {
@@ -404,17 +408,17 @@ export function getPropertyDescriptor(
                 //
                 if (previousValue !== undefined && previousValue[$changes]) {
                     changeTree.root?.remove(previousValue[$changes]);
-                    this.constructor[$track](changeTree, fieldIndex, OPERATION.DELETE_AND_ADD);
+                    (this.constructor as typeof Schema)[$track](changeTree, fieldIndex, OPERATION.DELETE_AND_ADD);
 
                 } else {
-                    this.constructor[$track](changeTree, fieldIndex, OPERATION.ADD);
+                    (this.constructor as typeof Schema)[$track](changeTree, fieldIndex, OPERATION.ADD);
                 }
 
                 //
                 // call setParent() recursively for this and its child
                 // structures.
                 //
-                (value as Ref)[$changes]?.setParent(this, changeTree.root, fieldIndex);
+                value[$changes]?.setParent(this, changeTree.root, fieldIndex);
 
             } else if (previousValue !== undefined) {
                 //
@@ -423,7 +427,7 @@ export function getPropertyDescriptor(
                 this[$changes].delete(fieldIndex);
             }
 
-            this[fieldCached] = value;
+            this[fieldCached as keyof Schema] = value;
         },
 
         enumerable: true,
@@ -492,18 +496,67 @@ export function defineTypes(
     return target;
 }
 
-export interface SchemaWithExtends<T extends Definition, P extends typeof Schema> extends DefinedSchemaType<T, P> {
-    extends: <T2 extends Definition>(
-        fields: T2,
+// Helper type to extract InitProps from initialize method
+// Supports both single object parameter and multiple parameters
+// If no initialize method is specified, use AssignableProps for field initialization
+type ExtractInitProps<T> = T extends { initialize: (props: infer P) => void }
+    ? P extends object
+        ? P
+        : never
+    : T extends { initialize: (...args: infer P) => void }
+        ? P extends readonly []
+            ? never
+            : P
+        : T extends Definition
+            ? AssignableProps<InferSchemaInstanceType<T>>
+            : never;
+
+// Helper type to determine if InitProps should be required
+type IsInitPropsRequired<T> = T extends { initialize: (props: any) => void }
+    ? true
+    : T extends { initialize: (...args: any[]) => void }
+        ? true
+        : false;
+
+export interface SchemaWithExtends<T extends Definition, P extends typeof Schema, > {
+    extends: <T2 extends Definition = Definition>(
+        fields: T2 & ThisType<InferSchemaInstanceType<T & T2>>,
         name?: string
-    ) => SchemaWithExtends<T & T2, typeof this>;
+    ) => SchemaWithExtendsConstructor<T & T2, ExtractInitProps<T2>, P>;
+}
+
+/**
+ * Get the type of the schema defined via `schema({...})` method.
+ *
+ * @example
+ * const Entity = schema({
+ *     x: "number",
+ *     y: "number",
+ * });
+ * type Entity = SchemaType<typeof Entity>;
+ */
+export type SchemaType<T extends {'~type': any}> = T['~type'];
+
+export interface SchemaWithExtendsConstructor<
+    T extends Definition,
+    InitProps,
+    P extends typeof Schema
+> extends SchemaWithExtends<T, P> {
+    '~type': InferSchemaInstanceType<T>;
+    new (...args: [InitProps] extends [never] ? [] : InitProps extends readonly any[] ? InitProps : IsInitPropsRequired<T> extends true ? [InitProps] : [InitProps?]): InferSchemaInstanceType<T> & InstanceType<P>;
+    prototype: InferSchemaInstanceType<T> & InstanceType<P> & {
+        initialize(...args: [InitProps] extends [never] ? [] : InitProps extends readonly any[] ? InitProps : [InitProps]): void;
+    };
 }
 
-export function schema<T extends Definition, P extends typeof Schema = typeof Schema>(
-    fieldsAndMethods: T,
+export function schema<
+    T extends Record<string, DefinitionType>,
+    P extends typeof Schema = typeof Schema
+>(
+    fieldsAndMethods: T & ThisType<InferSchemaInstanceType<T>>,
     name?: string,
     inherits: P = Schema as P
-): SchemaWithExtends<T, P> {
+): SchemaWithExtendsConstructor<T, ExtractInitProps<T>, P> {
     const fields: any = {};
     const methods: any = {};
 
@@ -511,7 +564,7 @@ export function schema<T extends Definition, P extends typeof Schema = typeof Sc
     const viewTagFields: any = {};
 
     for (let fieldName in fieldsAndMethods) {
-        const value = fieldsAndMethods[fieldName] as DefinitionType;
+        const value: any = fieldsAndMethods[fieldName] as DefinitionType;
         if (typeof (value) === "object") {
             if (value['view'] !== undefined) {
                 viewTagFields[fieldName] = (typeof (value['view']) === "boolean")
@@ -565,39 +618,49 @@ export function schema<T extends Definition, P extends typeof Schema = typeof Sc
 
     const getDefaultValues = () => {
         const defaults: any = {};
+
+        // use current class default values
         for (const fieldName in defaultValues) {
             const defaultValue = defaultValues[fieldName];
-            // If the default value has a clone method, use it to get a fresh instance
             if (defaultValue && typeof defaultValue.clone === 'function') {
+                // complex, cloneable values, e.g. Schema, ArraySchema, MapSchema, CollectionSchema, SetSchema
                 defaults[fieldName] = defaultValue.clone();
             } else {
-                // Otherwise, use the value as-is (for primitives and non-cloneable objects)
+                // primitives and non-cloneable values
                 defaults[fieldName] = defaultValue;
             }
         }
         return defaults;
     };
 
-    const klass = Metadata.setFields<any>(class extends inherits {
-        constructor (...args: any[]) {
-            args[0] = Object.assign({}, getDefaultValues(), args[0]);
-            super(...args);
+    /** @codegen-ignore */
+    const klass = Metadata.setFields<any>(class extends (inherits as any) {
+        constructor(...args: any[]) {
+            super(Object.assign({}, getDefaultValues(), args[0] || {}));
+
+            // call initialize method
+            if (methods.initialize && typeof methods.initialize === 'function') {
+                methods.initialize.apply(this, args);
+            }
         }
-    }, fields) as SchemaWithExtends<T, P>;
+    }, fields) as SchemaWithExtendsConstructor<T, ExtractInitProps<T>, P>;
+
+    // Store the getDefaultValues function on the class for inheritance
+    (klass as any)._getDefaultValues = getDefaultValues;
+
+    // Add methods to the prototype
+    Object.assign(klass.prototype, methods);
 
     for (let fieldName in viewTagFields) {
         view(viewTagFields[fieldName])(klass.prototype, fieldName);
     }
 
-    for (let methodName in methods) {
-        klass.prototype[methodName] = methods[methodName];
-    }
-
     if (name) {
         Object.defineProperty(klass, "name", { value: name });
     }
 
-    klass.extends = (fields, name) => schema(fields, name, klass);
+    klass.extends = <T2 extends Definition = Definition>(fields: T2, name?: string) =>
+        schema<T2>(fields, name, klass as any) as SchemaWithExtendsConstructor<T & T2, ExtractInitProps<T2>, P>;
 
     return klass;
 }

package/src/codegen/api.ts

@@ -57,7 +57,7 @@ export function generate(targetId: string, options: GenerateOptions) {
 
 function recursiveFiles(dir: string): string[] {
     const files = fs.readdirSync(dir, { withFileTypes: true });
-    let collect = [];
+    let collect: string[] = [];
     files.forEach(file => {
         const filename = path.resolve(dir, file.name);
         file.isDirectory() ? collect.push(...recursiveFiles(filename)) : collect.push(filename);

package/src/codegen/argv.ts

@@ -2,12 +2,12 @@
  * @author Ethan Davis
  * https://github.com/ethanent/gar
  */
-export default (sargs): any => {
-	let props = {}
-	let lones = []
+export default (sargs: string[]): any => {
+	let props: any = {}
+	let lones: any = []
 
-	const convertIfApplicable = (value) => (isNaN(value) ? (value.toString().toLowerCase() === 'true' ? true : (value.toString().toLowerCase() === 'false' ? false : value)) : Number(value))
-	const removeStartHyphens = (value) => value.replace(/^\-+/g, '')
+	const convertIfApplicable = (value: any) => (isNaN(value) ? (value.toString().toLowerCase() === 'true' ? true : (value.toString().toLowerCase() === 'false' ? false : value)) : Number(value))
+	const removeStartHyphens = (value: string) => value.replace(/^\-+/g, '')
 
 	for (let i = 0; i < sargs.length; i++) {
 		const equalsIndex = sargs[i].indexOf('=')

package/src/codegen/cli.ts

@@ -1,7 +1,7 @@
 import argv from "./argv";
 import { generate } from "./api";
 
-const supportedTargets = {
+const supportedTargets: Record<string, string> = {
     csharp: 'generate for C#/Unity',
     cpp: 'generate for C++',
     haxe: 'generate for Haxe',

package/src/codegen/languages/cpp.ts

@@ -1,7 +1,7 @@
 import { Class, Property, File, getCommentHeader, getInheritanceTree, Context } from "../types";
 import { GenerateOptions } from "../api";
 
-const typeMaps = {
+const typeMaps: { [key: string]: string } = {
     "string": "string",
     "number": "varint_t",
     "boolean": "bool",
@@ -17,7 +17,7 @@ const typeMaps = {
     "float64": "float64_t",
 }
 
-const typeInitializer = {
+const typeInitializer: { [key: string]: string } = {
     "string": '""',
     "number": "0",
     "boolean": "false",
@@ -37,11 +37,12 @@ const typeInitializer = {
  * C++ Code Generator
  */
 
-const capitalize = (s) => {
+const capitalize = (s: string) => {
     if (typeof s !== 'string') return ''
     return s.charAt(0).toUpperCase() + s.slice(1);
 }
-const distinct = (value, index, self) => self.indexOf(value) === index;
+const distinct = (value: string, index: number, self: string[]) =>
+    self.indexOf(value) === index;
 
 export function generate (context: Context, options: GenerateOptions): File[] {
     return context.classes.map(klass => ({

package/src/codegen/languages/csharp.ts

@@ -9,7 +9,7 @@ import {
 import { GenerateOptions } from "../api";
 import { Context } from "../types";
 
-const typeMaps = {
+const typeMaps: { [key: string]: string } = {
     "string": "string",
     "number": "float",
     "boolean": "bool",
@@ -28,7 +28,7 @@ const typeMaps = {
 /**
  * C# Code Generator
  */
-const capitalize = (s) => {
+const capitalize = (s: string) => {
     if (typeof s !== 'string') return ''
     return s.charAt(0).toUpperCase() + s.slice(1);
 }

package/src/codegen/languages/haxe.ts

@@ -1,7 +1,7 @@
 import { Class, Property, File, getCommentHeader, Context } from "../types";
 import { GenerateOptions } from "../api";
 
-const typeMaps = {
+const typeMaps: { [key: string]: string } = {
     "string": "String",
     "number": "Dynamic",
     "boolean": "Bool",
@@ -17,7 +17,7 @@ const typeMaps = {
     "float64": "Float",
 }
 
-const typeInitializer = {
+const typeInitializer: { [key: string]: string } = {
     "string": '""',
     "number": "0",
     "boolean": "false",

package/src/codegen/languages/java.ts

@@ -1,7 +1,7 @@
 import { Class, Property, File, getCommentHeader, Context } from "../types";
 import { GenerateOptions } from "../api";
 
-const typeMaps = {
+const typeMaps: { [key: string]: string } = {
     "string": "String",
     "number": "float",
     "boolean": "boolean",
@@ -17,7 +17,7 @@ const typeMaps = {
     "float64": "double",
 }
 
-const typeInitializer = {
+const typeInitializer: { [key: string]: string } = {
     "string": '""',
     "number": "0",
     "boolean": "false",