@colyseus/schema 3.0.53 → 3.0.54

package/lib/types/TypeContext.js

@@ -95,15 +95,7 @@ class TypeContext {
             if (typeof (fieldType) === "string") {
                 continue;
             }
-            if (Array.isArray(fieldType)) {
-                const type = fieldType[0];
-                // skip primitive types
-                if (type === "string") {
-                    continue;
-                }
-                this.discoverTypes(type, klass, index, parentHasViewTag || fieldHasViewTag);
-            }
-            else if (typeof (fieldType) === "function") {
+            if (typeof (fieldType) === "function") {
                 this.discoverTypes(fieldType, klass, index, parentHasViewTag || fieldHasViewTag);
             }
             else {

package/lib/types/TypeContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"TypeContext.js","sourceRoot":"","sources":["../../src/types/TypeContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { Metadata } from \"../Metadata\";\nimport { Schema } from \"../Schema\";\nimport { $viewFieldIndexes } from \"./symbols\";\n\nexport class TypeContext {\n    types: { [id: number]: typeof Schema; } = {};\n    schemas = new Map<typeof Schema, number>();\n\n    hasFilters: boolean = false;\n    parentFiltered: {[typeIdAndParentIndex: string]: boolean} = {};\n\n    /**\n     * For inheritance support\n     * Keeps track of which classes extends which. (parent -> children)\n     */\n    static inheritedTypes = new Map<typeof Schema, Set<typeof Schema>>();\n    static cachedContexts = new Map<typeof Schema, TypeContext>();\n\n    static register(target: typeof Schema) {\n        const parent = Object.getPrototypeOf(target);\n        if (parent !== Schema) {\n            let inherits = TypeContext.inheritedTypes.get(parent);\n            if (!inherits) {\n                inherits = new Set<typeof Schema>();\n                TypeContext.inheritedTypes.set(parent, inherits);\n            }\n            inherits.add(target);\n        }\n    }\n\n    static cache (rootClass: typeof Schema) {\n        let context = TypeContext.cachedContexts.get(rootClass);\n        if (!context) {\n            context = new TypeContext(rootClass);\n            TypeContext.cachedContexts.set(rootClass, context);\n        }\n        return context;\n    }\n\n    constructor(rootClass?: typeof Schema) {\n        if (rootClass) {\n            this.discoverTypes(rootClass);\n        }\n    }\n\n    has(schema: typeof Schema) {\n        return this.schemas.has(schema);\n    }\n\n    get(typeid: number) {\n        return this.types[typeid];\n    }\n\n    add(schema: typeof Schema, typeid = this.schemas.size) {\n        // skip if already registered\n        if (this.schemas.has(schema)) {\n            return false;\n        }\n\n        this.types[typeid] = schema;\n\n        //\n        // Workaround to allow using an empty Schema (with no `@type()` fields)\n        //\n        if (schema[Symbol.metadata] === undefined) {\n            Metadata.initialize(schema);\n        }\n\n        this.schemas.set(schema, typeid);\n        return true;\n    }\n\n    getTypeId(klass: typeof Schema) {\n        return this.schemas.get(klass);\n    }\n\n    private discoverTypes(klass: typeof Schema, parentType?: typeof Schema, parentIndex?: number, parentHasViewTag?: boolean) {\n        if (parentHasViewTag) {\n            this.registerFilteredByParent(klass, parentType, parentIndex);\n        }\n\n        // skip if already registered\n        if (!this.add(klass)) { return; }\n\n        // add classes inherited from this base class\n        TypeContext.inheritedTypes.get(klass)?.forEach((child) => {\n            this.discoverTypes(child, parentType, parentIndex, parentHasViewTag);\n        });\n\n        // add parent classes\n        let parent: any = klass;\n        while (\n            (parent = Object.getPrototypeOf(parent)) &&\n            parent !== Schema && // stop at root (Schema)\n            parent !== Function.prototype // stop at root (non-Schema)\n        ) {\n            this.discoverTypes(parent);\n        }\n\n        const metadata: Metadata = (klass[Symbol.metadata] ??= {});\n\n        // if any schema/field has filters, mark \"context\" as having filters.\n        if (metadata[$viewFieldIndexes]) {\n            this.hasFilters = true;\n        }\n\n        for (const fieldIndex in metadata) {\n            const index = fieldIndex as any as number;\n\n            const fieldType = metadata[index].type;\n            const fieldHasViewTag = (metadata[index].tag !== undefined);\n\n            if (typeof (fieldType) === \"string\") {\n                continue;\n            }\n\n            if (Array.isArray(fieldType)) {\n                const type = fieldType[0];\n\n                // skip primitive types\n                if (type === \"string\") {\n                    continue;\n                }\n\n                this.discoverTypes(type as typeof Schema, klass, index, parentHasViewTag || fieldHasViewTag);\n\n            } else if (typeof (fieldType) === \"function\") {\n                this.discoverTypes(fieldType as typeof Schema, klass, index, parentHasViewTag || fieldHasViewTag);\n\n            } else {\n                const type = Object.values(fieldType)[0];\n\n                // skip primitive types\n                if (typeof (type) === \"string\") {\n                    continue;\n                }\n\n                this.discoverTypes(type as typeof Schema, klass, index, parentHasViewTag || fieldHasViewTag);\n            }\n        }\n    }\n\n    /**\n     * Keep track of which classes have filters applied.\n     * Format: `${typeid}-${parentTypeid}-${parentIndex}`\n     */\n    private registerFilteredByParent(schema: typeof Schema, parentType?: typeof Schema, parentIndex?: number) {\n        const typeid = this.schemas.get(schema) ?? this.schemas.size;\n\n        let key = `${typeid}`;\n        if (parentType) { key += `-${this.schemas.get(parentType)}`; }\n\n        key += `-${parentIndex}`;\n        this.parentFiltered[key] = true;\n    }\n\n    debug() {\n        let parentFiltered = \"\";\n\n        for (const key in this.parentFiltered) {\n            const keys: number[] = key.split(\"-\").map(Number);\n            const fieldIndex = keys.pop();\n\n            parentFiltered += `\\n\\t\\t`;\n            parentFiltered += `${key}: ${keys.reverse().map((id, i) => {\n                const klass = this.types[id];\n                const metadata: Metadata = klass[Symbol.metadata];\n                let txt = klass.name;\n                if (i === 0) { txt += `[${metadata[fieldIndex].name}]`; }\n                return `${txt}`;\n            }).join(\" -> \")}`;\n        }\n\n        return `TypeContext ->\\n` +\n            `\\tSchema types: ${this.schemas.size}\\n` +\n            `\\thasFilters: ${this.hasFilters}\\n` +\n            `\\tparentFiltered:${parentFiltered}`;\n    }\n\n}\n"]}
+{"version":3,"file":"TypeContext.js","sourceRoot":"","sources":["../../src/types/TypeContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { Metadata } from \"../Metadata\";\nimport { Schema } from \"../Schema\";\nimport { $viewFieldIndexes } from \"./symbols\";\n\nexport class TypeContext {\n    types: { [id: number]: typeof Schema; } = {};\n    schemas = new Map<typeof Schema, number>();\n\n    hasFilters: boolean = false;\n    parentFiltered: {[typeIdAndParentIndex: string]: boolean} = {};\n\n    /**\n     * For inheritance support\n     * Keeps track of which classes extends which. (parent -> children)\n     */\n    static inheritedTypes = new Map<typeof Schema, Set<typeof Schema>>();\n    static cachedContexts = new Map<typeof Schema, TypeContext>();\n\n    static register(target: typeof Schema) {\n        const parent = Object.getPrototypeOf(target);\n        if (parent !== Schema) {\n            let inherits = TypeContext.inheritedTypes.get(parent);\n            if (!inherits) {\n                inherits = new Set<typeof Schema>();\n                TypeContext.inheritedTypes.set(parent, inherits);\n            }\n            inherits.add(target);\n        }\n    }\n\n    static cache (rootClass: typeof Schema) {\n        let context = TypeContext.cachedContexts.get(rootClass);\n        if (!context) {\n            context = new TypeContext(rootClass);\n            TypeContext.cachedContexts.set(rootClass, context);\n        }\n        return context;\n    }\n\n    constructor(rootClass?: typeof Schema) {\n        if (rootClass) {\n            this.discoverTypes(rootClass);\n        }\n    }\n\n    has(schema: typeof Schema) {\n        return this.schemas.has(schema);\n    }\n\n    get(typeid: number) {\n        return this.types[typeid];\n    }\n\n    add(schema: typeof Schema, typeid = this.schemas.size) {\n        // skip if already registered\n        if (this.schemas.has(schema)) {\n            return false;\n        }\n\n        this.types[typeid] = schema;\n\n        //\n        // Workaround to allow using an empty Schema (with no `@type()` fields)\n        //\n        if (schema[Symbol.metadata] === undefined) {\n            Metadata.initialize(schema);\n        }\n\n        this.schemas.set(schema, typeid);\n        return true;\n    }\n\n    getTypeId(klass: typeof Schema) {\n        return this.schemas.get(klass);\n    }\n\n    private discoverTypes(klass: typeof Schema, parentType?: typeof Schema, parentIndex?: number, parentHasViewTag?: boolean) {\n        if (parentHasViewTag) {\n            this.registerFilteredByParent(klass, parentType, parentIndex);\n        }\n\n        // skip if already registered\n        if (!this.add(klass)) { return; }\n\n        // add classes inherited from this base class\n        TypeContext.inheritedTypes.get(klass)?.forEach((child) => {\n            this.discoverTypes(child, parentType, parentIndex, parentHasViewTag);\n        });\n\n        // add parent classes\n        let parent: any = klass;\n        while (\n            (parent = Object.getPrototypeOf(parent)) &&\n            parent !== Schema && // stop at root (Schema)\n            parent !== Function.prototype // stop at root (non-Schema)\n        ) {\n            this.discoverTypes(parent);\n        }\n\n        const metadata: Metadata = (klass[Symbol.metadata] ??= {});\n\n        // if any schema/field has filters, mark \"context\" as having filters.\n        if (metadata[$viewFieldIndexes]) {\n            this.hasFilters = true;\n        }\n\n        for (const fieldIndex in metadata) {\n            const index = fieldIndex as any as number;\n\n            const fieldType = metadata[index].type;\n            const fieldHasViewTag = (metadata[index].tag !== undefined);\n\n            if (typeof (fieldType) === \"string\") {\n                continue;\n            }\n\n            if (typeof (fieldType) === \"function\") {\n                this.discoverTypes(fieldType as typeof Schema, klass, index, parentHasViewTag || fieldHasViewTag);\n\n            } else {\n                const type = Object.values(fieldType)[0];\n\n                // skip primitive types\n                if (typeof (type) === \"string\") {\n                    continue;\n                }\n\n                this.discoverTypes(type as typeof Schema, klass, index, parentHasViewTag || fieldHasViewTag);\n            }\n        }\n    }\n\n    /**\n     * Keep track of which classes have filters applied.\n     * Format: `${typeid}-${parentTypeid}-${parentIndex}`\n     */\n    private registerFilteredByParent(schema: typeof Schema, parentType?: typeof Schema, parentIndex?: number) {\n        const typeid = this.schemas.get(schema) ?? this.schemas.size;\n\n        let key = `${typeid}`;\n        if (parentType) { key += `-${this.schemas.get(parentType)}`; }\n\n        key += `-${parentIndex}`;\n        this.parentFiltered[key] = true;\n    }\n\n    debug() {\n        let parentFiltered = \"\";\n\n        for (const key in this.parentFiltered) {\n            const keys: number[] = key.split(\"-\").map(Number);\n            const fieldIndex = keys.pop();\n\n            parentFiltered += `\\n\\t\\t`;\n            parentFiltered += `${key}: ${keys.reverse().map((id, i) => {\n                const klass = this.types[id];\n                const metadata: Metadata = klass[Symbol.metadata];\n                let txt = klass.name;\n                if (i === 0) { txt += `[${metadata[fieldIndex].name}]`; }\n                return `${txt}`;\n            }).join(\" -> \")}`;\n        }\n\n        return `TypeContext ->\\n` +\n            `\\tSchema types: ${this.schemas.size}\\n` +\n            `\\thasFilters: ${this.hasFilters}\\n` +\n            `\\tparentFiltered:${parentFiltered}`;\n    }\n\n}\n"]}

package/lib/types/registry.d.ts

@@ -5,6 +5,9 @@ export interface TypeDefinition {
     encode?: (bytes: BufferLike, value: any, it: Iterator) => any;
     decode?: (bytes: BufferLike, it: Iterator) => any;
 }
+export declare const registeredTypes: {
+    [identifier: string]: TypeDefinition;
+};
 export declare function registerType(identifier: string, definition: TypeDefinition): void;
 export declare function getIdentifier(klass: any): string;
 export declare function getType(identifier: string): TypeDefinition;

package/lib/types/registry.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.registeredTypes = void 0;
 exports.registerType = registerType;
 exports.getIdentifier = getIdentifier;
 exports.getType = getType;
@@ -7,12 +8,12 @@ exports.defineCustomTypes = defineCustomTypes;
 const annotations_1 = require("../annotations");
 const encode_1 = require("../encoding/encode");
 const decode_1 = require("../encoding/decode");
-const registeredTypes = {};
+exports.registeredTypes = {};
 const identifiers = new Map();
 function registerType(identifier, definition) {
     if (definition.constructor) {
         identifiers.set(definition.constructor, identifier);
-        registeredTypes[identifier] = definition;
+        exports.registeredTypes[identifier] = definition;
     }
     if (definition.encode) {
         encode_1.encode[identifier] = definition.encode;
@@ -25,7 +26,7 @@ function getIdentifier(klass) {
     return identifiers.get(klass);
 }
 function getType(identifier) {
-    return registeredTypes[identifier];
+    return exports.registeredTypes[identifier];
 }
 function defineCustomTypes(types) {
     for (const identifier in types) {

package/lib/types/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/types/registry.ts"],"names":[],"mappings":";;AAaA,oCAQC;AAED,sCAEC;AAED,0BAEC;AAED,8CAMC;AArCD,gDAAsD;AACtD,+CAAwD;AACxD,+CAAsD;AAQtD,MAAM,eAAe,GAA4C,EAAE,CAAC;AACpE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAe,CAAC;AAE3C,SAAgB,YAAY,CAAC,UAAkB,EAAE,UAA0B;IACvE,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;QACzB,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACpD,eAAe,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;IAC7C,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QAAC,eAAM,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;IAAC,CAAC;IAClE,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QAAC,eAAM,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;IAAC,CAAC;AACtE,CAAC;AAED,SAAgB,aAAa,CAAC,KAAU;IACpC,OAAO,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,OAAO,CAAC,UAAkB;IACtC,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;AACvC,CAAC;AAED,SAAgB,iBAAiB,CAA4C,KAAQ;IACjF,KAAK,MAAM,UAAU,IAAI,KAAK,EAAE,CAAC;QAC7B,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,CAAC,CAAU,EAAE,EAAE,CAAC,IAAA,kBAAI,EAAC,CAAmB,CAAC,CAAC;AACrD,CAAC","sourcesContent":["import { DefinitionType, type } from \"../annotations\";\nimport { BufferLike, encode } from \"../encoding/encode\";\nimport { decode, Iterator } from \"../encoding/decode\";\n\nexport interface TypeDefinition {\n    constructor?: any,\n    encode?: (bytes: BufferLike, value: any, it: Iterator) => any;\n    decode?: (bytes: BufferLike, it: Iterator) => any;\n}\n\nconst registeredTypes: {[identifier: string] : TypeDefinition} = {};\nconst identifiers = new Map<any, string>();\n\nexport function registerType(identifier: string, definition: TypeDefinition) {\n    if (definition.constructor) {\n        identifiers.set(definition.constructor, identifier);\n        registeredTypes[identifier] = definition;\n    }\n\n    if (definition.encode) { encode[identifier] = definition.encode; }\n    if (definition.decode) { decode[identifier] = definition.decode; }\n}\n\nexport function getIdentifier(klass: any): string {\n    return identifiers.get(klass);\n}\n\nexport function getType(identifier: string): TypeDefinition {\n    return registeredTypes[identifier];\n}\n\nexport function defineCustomTypes<T extends {[key: string]: TypeDefinition}>(types: T) {\n    for (const identifier in types) {\n        registerType(identifier, types[identifier]);\n    }\n\n    return (t: keyof T) => type(t as DefinitionType);\n}"]}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/types/registry.ts"],"names":[],"mappings":";;;AAcA,oCAQC;AAED,sCAEC;AAED,0BAEC;AAED,8CAMC;AAtCD,gDAAsD;AACtD,+CAAwD;AACxD,+CAAsD;AAQzC,QAAA,eAAe,GAA4C,EAAE,CAAC;AAE3E,MAAM,WAAW,GAAG,IAAI,GAAG,EAAe,CAAC;AAE3C,SAAgB,YAAY,CAAC,UAAkB,EAAE,UAA0B;IACvE,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;QACzB,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACpD,uBAAe,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;IAC7C,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QAAC,eAAM,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;IAAC,CAAC;IAClE,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QAAC,eAAM,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;IAAC,CAAC;AACtE,CAAC;AAED,SAAgB,aAAa,CAAC,KAAU;IACpC,OAAO,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,OAAO,CAAC,UAAkB;IACtC,OAAO,uBAAe,CAAC,UAAU,CAAC,CAAC;AACvC,CAAC;AAED,SAAgB,iBAAiB,CAA4C,KAAQ;IACjF,KAAK,MAAM,UAAU,IAAI,KAAK,EAAE,CAAC;QAC7B,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,CAAC,CAAU,EAAE,EAAE,CAAC,IAAA,kBAAI,EAAC,CAAmB,CAAC,CAAC;AACrD,CAAC","sourcesContent":["import { DefinitionType, type } from \"../annotations\";\nimport { BufferLike, encode } from \"../encoding/encode\";\nimport { decode, Iterator } from \"../encoding/decode\";\n\nexport interface TypeDefinition {\n    constructor?: any,\n    encode?: (bytes: BufferLike, value: any, it: Iterator) => any;\n    decode?: (bytes: BufferLike, it: Iterator) => any;\n}\n\nexport const registeredTypes: {[identifier: string] : TypeDefinition} = {};\n\nconst identifiers = new Map<any, string>();\n\nexport function registerType(identifier: string, definition: TypeDefinition) {\n    if (definition.constructor) {\n        identifiers.set(definition.constructor, identifier);\n        registeredTypes[identifier] = definition;\n    }\n\n    if (definition.encode) { encode[identifier] = definition.encode; }\n    if (definition.decode) { decode[identifier] = definition.decode; }\n}\n\nexport function getIdentifier(klass: any): string {\n    return identifiers.get(klass);\n}\n\nexport function getType(identifier: string): TypeDefinition {\n    return registeredTypes[identifier];\n}\n\nexport function defineCustomTypes<T extends {[key: string]: TypeDefinition}>(types: T) {\n    for (const identifier in types) {\n        registerType(identifier, types[identifier]);\n    }\n\n    return (t: keyof T) => type(t as DefinitionType);\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/schema",
-  "version": "3.0.53",
+  "version": "3.0.54",
   "description": "Binary state serializer with delta encoding for games",
   "bin": {
     "schema-codegen": "bin/schema-codegen",

package/src/Metadata.ts

@@ -1,6 +1,6 @@
 import { DefinitionType, getPropertyDescriptor } from "./annotations";
 import { Schema } from "./Schema";
-import { getType } from "./types/registry";
+import { getType, registeredTypes } from "./types/registry";
 import { $decoder, $descriptors, $encoder, $fieldIndexesByViewTag, $numFields, $refTypeFieldIndexes, $track, $viewFieldIndexes } from "./types/symbols";
 import { TypeContext } from "./types/TypeContext";
 
@@ -23,18 +23,48 @@ export type Metadata =
     { [$descriptors]: { [field: string]: PropertyDescriptor } }  // property descriptors
 
 export function getNormalizedType(type: DefinitionType): DefinitionType  {
-    return (Array.isArray(type))
-        ? { array: type[0] }
-        : (typeof(type['type']) !== "undefined")
-            ? type['type']
-            : type;
+    if (Array.isArray(type)) {
+        return { array: getNormalizedType(type[0]) };
+
+    } else if (typeof (type['type']) !== "undefined") {
+        return type['type'];
+
+    } else if (isTSEnum(type)) {
+        // Detect TS Enum type (either string or number)
+        return Object.keys(type).every(key => typeof type[key] === "string")
+            ? "string"
+            : "number";
+
+    } else if (typeof type === "object" && type !== null) {
+        // Handle collection types
+        const collectionType = Object.keys(type).find(k => registeredTypes[k] !== undefined);
+        if (collectionType) {
+            type[collectionType] = getNormalizedType(type[collectionType]);
+            return type;
+        }
+    }
+    return type;
 }
 
-// TODO: see test: "should support TypeScript enums"
 function isTSEnum(_enum: any) {
+    if (typeof _enum === 'function' && _enum[Symbol.metadata]) {
+        return false;
+    }
+
     const keys = Object.keys(_enum);
     const numericFields = keys.filter(k => /\d+/.test(k));
-    return (numericFields.length === (keys.length / 2) && _enum[_enum[numericFields[0]]] == numericFields[0]);
+
+    // Check for number enum (has numeric keys and reverse mapping)
+    if (numericFields.length > 0 && numericFields.length === (keys.length / 2) && _enum[_enum[numericFields[0]]] == numericFields[0]) {
+        return true;
+    }
+
+    // Check for string enum (all values are strings and keys match values)
+    if (keys.length > 0 && keys.every(key => typeof _enum[key] === 'string' && _enum[key] === key)) {
+        return true;
+    }
+
+    return false;
 }
 
 export const Metadata = {
@@ -163,16 +193,14 @@ export const Metadata = {
         fieldIndex++;
 
         for (const field in fields) {
-            const type = fields[field];
+            const type = getNormalizedType(fields[field]);
 
             // FIXME: this code is duplicated from @type() annotation
-            const complexTypeKlass = (Array.isArray(type))
-                ? getType("array")
-                : (typeof(Object.keys(type)[0]) === "string") && getType(Object.keys(type)[0]);
+            const complexTypeKlass = typeof(Object.keys(type)[0]) === "string" && getType(Object.keys(type)[0]);
 
             const childType = (complexTypeKlass)
                 ? Object.values(type)[0]
-                : getNormalizedType(type);
+                : type;
 
             Metadata.addField(
                 metadata,

package/src/annotations.ts

@@ -2,7 +2,7 @@ import "./symbol.shim";
 import { Schema } from './Schema';
 import { ArraySchema } from './types/custom/ArraySchema';
 import { MapSchema } from './types/custom/MapSchema';
-import { Metadata } from "./Metadata";
+import { getNormalizedType, Metadata } from "./Metadata";
 import { $changes, $childType, $descriptors, $numFields, $track } from "./types/symbols";
 import { TypeDefinition, getType } from "./types/registry";
 import { OPERATION } from "./encoding/spec";
@@ -285,6 +285,9 @@ export function type (
             throw new Error(`${constructor.name}: @type() reference provided for "${field}" is undefined. Make sure you don't have any circular dependencies.`);
         }
 
+        // Normalize type (enum/collection/etc)
+        type = getNormalizedType(type);
+
         // for inheritance support
         TypeContext.register(constructor);
 
@@ -339,9 +342,7 @@ export function type (
             );
 
         } else {
-            const complexTypeKlass = (Array.isArray(type))
-                ? getType("array")
-                : (typeof(Object.keys(type)[0]) === "string") && getType(Object.keys(type)[0]);
+            const complexTypeKlass = typeof(Object.keys(type)[0]) === "string" && getType(Object.keys(type)[0]);
 
             const childType = (complexTypeKlass)
                 ? Object.values(type)[0]
@@ -517,10 +518,12 @@ export function schema<T extends Definition, P extends typeof Schema = typeof Sc
                     ? DEFAULT_VIEW_TAG
                     : value['view'];
             }
-            fields[fieldName] = value;
+
+            fields[fieldName] = getNormalizedType(value);
 
             // If no explicit default provided, handle automatic instantiation for collection types
             if (!Object.prototype.hasOwnProperty.call(value, 'default')) {
+                // TODO: remove Array.isArray() check. Use ['array'] !== undefined only.
                 if (Array.isArray(value) || value['array'] !== undefined) {
                     // Collection: Array → new ArraySchema()
                     defaultValues[fieldName] = new ArraySchema();
@@ -550,13 +553,13 @@ export function schema<T extends Definition, P extends typeof Schema = typeof Sc
             if (Schema.is(value)) {
                 // Direct Schema type: Type → new Type()
                 defaultValues[fieldName] = new value();
-                fields[fieldName] = value;
+                fields[fieldName] = getNormalizedType(value);
             } else {
                 methods[fieldName] = value;
             }
 
         } else {
-            fields[fieldName] = value;
+            fields[fieldName] = getNormalizedType(value);
         }
     }
 

package/src/types/HelperTypes.ts

@@ -28,25 +28,34 @@ export type InferValueType<T extends DefinitionType> =
     : T extends "float64" ? number
     : T extends "boolean" ? boolean
 
+    // Handle { type: ... } patterns
     : T extends { type: infer ChildType extends Constructor } ? InstanceType<ChildType>
-    : T extends { type: infer ChildType extends PrimitiveType } ? ChildType
+    : T extends { type: Array<infer ChildType> } ? (ChildType extends Record<string | number, string | number> ? ChildType[keyof ChildType][] : ChildType[]) // TS ENUM
+    : T extends { type: { map: infer ChildType } } ? (ChildType extends Record<string | number, string | number> ? MapSchema<ChildType[keyof ChildType]> : MapSchema<ChildType>) // TS ENUM
+    : T extends { type: { set: infer ChildType } } ? (ChildType extends Record<string | number, string | number> ? SetSchema<ChildType[keyof ChildType]> : SetSchema<ChildType>) // TS ENUM
+    : T extends { type: { collection: infer ChildType } } ? (ChildType extends Record<string | number, string | number> ? CollectionSchema<ChildType[keyof ChildType]> : CollectionSchema<ChildType>) // TS ENUM
+    : T extends { type: infer ChildType } ? (ChildType extends Record<string | number, string | number> ? ChildType[keyof ChildType] : ChildType) // TS ENUM
 
+    // Handle direct array patterns
     : T extends Array<infer ChildType extends Constructor> ? InstanceType<ChildType>[]
-    : T extends Array<infer ChildType extends RawPrimitiveType> ? ChildType[]
+    : T extends Array<infer ChildType> ? (ChildType extends Record<string | number, string | number> ? ChildType[keyof ChildType][] : ChildType[]) // TS ENUM
 
+    // Handle collection object patterns
     : T extends { array: infer ChildType extends Constructor } ? InstanceType<ChildType>[]
-    : T extends { array: infer ChildType extends PrimitiveType } ? ChildType[]
+    : T extends { array: infer ChildType } ? (ChildType extends Record<string | number, string | number> ? ChildType[keyof ChildType][] : ChildType[]) // TS ENUM
 
     : T extends { map: infer ChildType extends Constructor } ? MapSchema<InstanceType<ChildType>>
-    : T extends { map: infer ChildType extends PrimitiveType } ? MapSchema<ChildType>
+    : T extends { map: infer ChildType } ? (ChildType extends Record<string | number, string | number> ? MapSchema<ChildType[keyof ChildType]> : MapSchema<ChildType>) // TS ENUM
 
     : T extends { set: infer ChildType extends Constructor } ? SetSchema<InstanceType<ChildType>>
-    : T extends { set: infer ChildType extends PrimitiveType } ? SetSchema<ChildType>
+    : T extends { set: infer ChildType } ? (ChildType extends Record<string | number, string | number> ? SetSchema<ChildType[keyof ChildType]> : SetSchema<ChildType>) // TS ENUM
 
     : T extends { collection: infer ChildType extends Constructor } ? CollectionSchema<InstanceType<ChildType>>
-    : T extends { collection: infer ChildType extends PrimitiveType } ? CollectionSchema<ChildType>
+    : T extends { collection: infer ChildType } ? (ChildType extends Record<string | number, string | number> ? CollectionSchema<ChildType[keyof ChildType]> : CollectionSchema<ChildType>) // TS ENUM
 
+    // Handle direct types
     : T extends Constructor ? InstanceType<T>
+    : T extends Record<string | number, string | number> ? T[keyof T] // TS ENUM
     : T extends PrimitiveType ? T
 
     : never;

package/src/types/TypeContext.ts

@@ -114,17 +114,7 @@ export class TypeContext {
                 continue;
             }
 
-            if (Array.isArray(fieldType)) {
-                const type = fieldType[0];
-
-                // skip primitive types
-                if (type === "string") {
-                    continue;
-                }
-
-                this.discoverTypes(type as typeof Schema, klass, index, parentHasViewTag || fieldHasViewTag);
-
-            } else if (typeof (fieldType) === "function") {
+            if (typeof (fieldType) === "function") {
                 this.discoverTypes(fieldType as typeof Schema, klass, index, parentHasViewTag || fieldHasViewTag);
 
             } else {

package/src/types/registry.ts

@@ -8,7 +8,8 @@ export interface TypeDefinition {
     decode?: (bytes: BufferLike, it: Iterator) => any;
 }
 
-const registeredTypes: {[identifier: string] : TypeDefinition} = {};
+export const registeredTypes: {[identifier: string] : TypeDefinition} = {};
+
 const identifiers = new Map<any, string>();
 
 export function registerType(identifier: string, definition: TypeDefinition) {