@colyseus/schema 4.0.13 → 4.0.14

package/src/codegen/languages/lua.ts

@@ -1,6 +1,8 @@
 import { Class, Property, File, getCommentHeader, getInheritanceTree, Context } from "../types.js";
 import { GenerateOptions } from "../api.js";
 
+export const name = "LUA";
+
 /**
     TODO:
     - Support inheritance
@@ -23,9 +25,14 @@ const typeMaps: { [key: string]: string } = {
     "float64": "number",
 }
 
+const COMMON_IMPORTS = `local schema = require 'colyseus.serializer.schema.schema'`;
+
 const distinct = (value: string, index: number, self: string[]) =>
     self.indexOf(value) === index;
 
+/**
+ * Generate individual files for each class
+ */
 export function generate (context: Context, options: GenerateOptions): File[] {
     return context.classes.map(klass => ({
         name: klass.name + ".lua",
@@ -33,6 +40,49 @@ export function generate (context: Context, options: GenerateOptions): File[] {
     }));
 }
 
+/**
+ * Generate a single bundled file containing all classes
+ */
+export function renderBundle(context: Context, options: GenerateOptions): File {
+    const fileName = options.namespace ? `${options.namespace}.lua` : "schema.lua";
+
+    const classBodies = context.classes.map(klass => generateClassBody(klass));
+    const classNames = context.classes.map(klass => `    ${klass.name} = ${klass.name},`).join("\n");
+
+    const content = `${getCommentHeader().replace(/\/\//mg, "--")}
+
+${COMMON_IMPORTS}
+
+${classBodies.join("\n\n")}
+
+return {
+${classNames}
+}
+`;
+
+    return { name: fileName, content };
+}
+
+/**
+ * Generate just the class body (without requires) for bundling
+ */
+function generateClassBody(klass: Class): string {
+    // Inheritance support
+    const inherits = (klass.extends !== "Schema")
+        ? `, ${klass.extends}`
+        : "";
+
+    return `---@class ${klass.name}: ${klass.extends}
+${klass.properties.map(prop => `---@field ${prop.name} ${getLUATypeAnnotation(prop)}`).join("\n")}
+local ${klass.name} = schema.define({
+${klass.properties.map(prop => generatePropertyDeclaration(prop)).join(",\n")},
+    ["_fields_by_index"] = { ${klass.properties.map(prop => `"${prop.name}"`).join(", ")} },
+}${inherits})`;
+}
+
+/**
+ * Generate a complete class file with requires (for individual file mode)
+ */
 function generateClass(klass: Class, namespace: string, allClasses: Class[]) {
     const allRefs: Property[] = [];
     klass.properties.forEach(property => {
@@ -44,28 +94,20 @@ function generateClass(klass: Class, namespace: string, allClasses: Class[]) {
         }
     });
 
-    // Inheritance support
-    const inherits = (klass.extends !== "Schema")
-        ? `, ${klass.extends}`
-        : "";
+    const localRequires = allRefs.
+        filter(ref => ref.childType && typeMaps[ref.childType] === undefined).
+        map(ref => ref.childType).
+        concat(getInheritanceTree(klass, allClasses, false).map(klass => klass.name)).
+        filter(distinct).
+        map(childType => `local ${childType} = require '${(namespace ? `${namespace}.` : '')}${childType}'`).
+        join("\n");
 
     return `${getCommentHeader().replace(/\/\//mg, "--")}
 
-local schema = require 'colyseus.serializer.schema.schema'
-${allRefs.
-    filter(ref => ref.childType && typeMaps[ref.childType] === undefined).
-    map(ref => ref.childType).
-    concat(getInheritanceTree(klass, allClasses, false).map(klass => klass.name)).
-    filter(distinct).
-    map(childType => `local ${childType} = require '${(namespace ? `${namespace}.` : '')}${childType}'`).
-    join("\n")}
+${COMMON_IMPORTS}
+${localRequires}
 
----@class ${klass.name}: ${klass.extends}
-${klass.properties.map(prop => `---@field ${prop.name} ${getLUATypeAnnotation(prop)}`).join("\n")}
-local ${klass.name} = schema.define({
-${klass.properties.map(prop => generatePropertyDeclaration(prop)).join(",\n")},
-    ["_fields_by_index"] = { ${klass.properties.map(prop => `"${prop.name}"`).join(", ")} },
-}${inherits})
+${generateClassBody(klass)}
 
 return ${klass.name}
 `;

package/src/codegen/languages/ts.ts

@@ -1,6 +1,8 @@
 import { Class, Property, File, getCommentHeader, getInheritanceTree, Context, Interface } from "../types.js";
 import { GenerateOptions } from "../api.js";
 
+export const name = "TypeScript";
+
 const typeMaps: { [key: string]: string } = {
     "string": "string",
     "number": "number",
@@ -17,9 +19,14 @@ const typeMaps: { [key: string]: string } = {
     "float64": "number",
 }
 
+const COMMON_IMPORTS = `import { Schema, type, ArraySchema, MapSchema, SetSchema, DataChange } from '@colyseus/schema';`;
+
 const distinct = (value: string, index: number, self: string[]) =>
     self.indexOf(value) === index;
 
+/**
+ * Generate individual files for each class/interface
+ */
 export function generate (context: Context, options: GenerateOptions): File[] {
     return [
         ...context.classes.map(structure => ({
@@ -33,6 +40,49 @@ export function generate (context: Context, options: GenerateOptions): File[] {
     ];
 }
 
+/**
+ * Generate a single bundled file containing all classes and interfaces
+ */
+export function renderBundle(context: Context, options: GenerateOptions): File {
+    const fileName = options.namespace ? `${options.namespace}.ts` : "schema.ts";
+
+    // Collect all class bodies
+    const classBodies = context.classes.map(klass => generateClassBody(klass));
+
+    // Collect all interface bodies
+    const interfaceBodies = context.interfaces.map(iface => generateInterfaceBody(iface));
+
+    const content = `${getCommentHeader()}
+
+${COMMON_IMPORTS}
+
+${classBodies.join("\n\n")}
+${interfaceBodies.length > 0 ? "\n" + interfaceBodies.join("\n\n") : ""}`;
+
+    return { name: fileName, content };
+}
+
+/**
+ * Generate just the class body (without imports) for bundling
+ */
+function generateClassBody(klass: Class): string {
+    return `export class ${klass.name} extends ${klass.extends} {
+${klass.properties.map(prop => `    ${generateProperty(prop)}`).join("\n")}
+}`;
+}
+
+/**
+ * Generate just the interface body (without imports) for bundling
+ */
+function generateInterfaceBody(iface: Interface): string {
+    return `export interface ${iface.name} {
+${iface.properties.map(prop => `    ${prop.name}: ${prop.type};`).join("\n")}
+}`;
+}
+
+/**
+ * Generate a complete class file with imports (for individual file mode)
+ */
 function generateClass(klass: Class, namespace: string, allClasses: Class[]) {
     const allRefs: Property[] = [];
     klass.properties.forEach(property => {
@@ -44,20 +94,20 @@ function generateClass(klass: Class, namespace: string, allClasses: Class[]) {
         }
     });
 
+    const localImports = allRefs.
+        filter(ref => ref.childType && typeMaps[ref.childType] === undefined).
+        map(ref => ref.childType).
+        concat(getInheritanceTree(klass, allClasses, false).map(klass => klass.name)).
+        filter(distinct).
+        map(childType => `import { ${childType} } from './${childType}'`).
+        join("\n");
+
     return `${getCommentHeader()}
 
-import { Schema, type, ArraySchema, MapSchema, SetSchema, DataChange } from '@colyseus/schema';
-${allRefs.
-    filter(ref => ref.childType && typeMaps[ref.childType] === undefined).
-    map(ref => ref.childType).
-    concat(getInheritanceTree(klass, allClasses, false).map(klass => klass.name)).
-    filter(distinct).
-    map(childType => `import { ${childType} } from './${childType}'`).
-    join("\n")}
+${COMMON_IMPORTS}
+${localImports}
 
-export class ${klass.name} extends ${klass.extends} {
-${klass.properties.map(prop => `    ${generateProperty(prop)}`).join("\n")}
-}
+${generateClassBody(klass)}
 `;
 }
 
@@ -120,11 +170,12 @@ function generateProperty(prop: Property) {
 }
 
 
+/**
+ * Generate a complete interface file with header (for individual file mode)
+ */
 function generateInterface(structure: Interface, namespace: string, allClasses: Class[]) {
     return `${getCommentHeader()}
 
-export interface ${structure.name} {
-${structure.properties.map(prop => `    ${prop.name}: ${prop.type};`).join("\n")}
-}
+${generateInterfaceBody(structure)}
 `;
 }

package/src/codegen/types.ts

@@ -166,6 +166,21 @@ export interface File {
     content: string;
 }
 
+/**
+ * Structured file representation for code generation.
+ * Separates imports, local references, and body content to enable
+ * clean bundling without string parsing.
+ */
+export interface GeneratedFile {
+    name: string;
+    /** External imports (e.g., "@colyseus/schema", "Colyseus.Schema") */
+    imports: string[];
+    /** References to other generated classes (used for imports in non-bundle mode) */
+    localRefs: string[];
+    /** The class/interface/enum definition body (without imports or namespace wrapper) */
+    body: string;
+}
+
 export function getInheritanceTree(klass: Class, allClasses: Class[], includeSelf: boolean = true) {
     let currentClass = klass;
     let inheritanceTree: Class[] = [];