@gaialabs/core 0.1.6 → 0.1.8

package/dist/index.d.mts

@@ -763,29 +763,19 @@ declare class AssemblerState {
 }
 
 declare class RomGenerator {
-    private readonly moduleLookup;
-    private readonly moduleList;
-    private readonly sourceData;
-    private readonly patchFiles;
-    private chunkFiles;
-    private asmFiles;
-    private dbRoot;
-    constructor(modules: string[], sourceData: Uint8Array);
-    generateProject(projectName: string): Promise<Uint8Array>;
-    private initializeDatabase;
-    private initializeChunks;
-    private writeScriptTexts;
-    private applyBaseRom;
+    readonly projectName?: string;
+    crc: number;
+    branchId: string;
+    dbRoot: DbRoot;
+    private sourceData;
+    constructor(projectName?: string);
+    initialize(): Promise<void>;
+    validateAndDownload(sourceData: Uint8Array): Promise<boolean>;
+    generateProject(modules: string[], manualFiles?: ChunkFile[]): Promise<Uint8Array>;
     private applyProjectInit;
-    private applySelectedModules;
     private assembleCodeFromText;
-    private applyCodePatches;
-    private calculateSizes;
-    private performLayout;
-    private rebaseAssemblies;
     private generateAsmIncludeLookups;
-    applyPatchFile(chunkFile: ChunkFile): void;
-    private generateBlockLookup;
+    applyPatchFile(chunkFile: ChunkFile, chunkFiles: ChunkFile[], asmFiles: ChunkFile[], patchFiles: ChunkFile[]): void;
     private writeRom;
 }
 

package/dist/index.d.ts

@@ -763,29 +763,19 @@ declare class AssemblerState {
 }
 
 declare class RomGenerator {
-    private readonly moduleLookup;
-    private readonly moduleList;
-    private readonly sourceData;
-    private readonly patchFiles;
-    private chunkFiles;
-    private asmFiles;
-    private dbRoot;
-    constructor(modules: string[], sourceData: Uint8Array);
-    generateProject(projectName: string): Promise<Uint8Array>;
-    private initializeDatabase;
-    private initializeChunks;
-    private writeScriptTexts;
-    private applyBaseRom;
+    readonly projectName?: string;
+    crc: number;
+    branchId: string;
+    dbRoot: DbRoot;
+    private sourceData;
+    constructor(projectName?: string);
+    initialize(): Promise<void>;
+    validateAndDownload(sourceData: Uint8Array): Promise<boolean>;
+    generateProject(modules: string[], manualFiles?: ChunkFile[]): Promise<Uint8Array>;
     private applyProjectInit;
-    private applySelectedModules;
     private assembleCodeFromText;
-    private applyCodePatches;
-    private calculateSizes;
-    private performLayout;
-    private rebaseAssemblies;
     private generateAsmIncludeLookups;
-    applyPatchFile(chunkFile: ChunkFile): void;
-    private generateBlockLookup;
+    applyPatchFile(chunkFile: ChunkFile, chunkFiles: ChunkFile[], asmFiles: ChunkFile[], patchFiles: ChunkFile[]): void;
     private writeRom;
 }
 

package/dist/index.js

@@ -3660,88 +3660,72 @@ var Assembler = class {
   }
 };
 var RomGenerator = class {
-  constructor(modules, sourceData) {
-    this.moduleLookup = /* @__PURE__ */ new Map();
-    this.moduleList = ["jp-viper", "title-enhanced"];
-    this.patchFiles = [];
-    this.chunkFiles = [];
-    this.asmFiles = [];
+  constructor(projectName) {
+    this.crc = 0;
+    this.branchId = "";
+    //private chunkFiles: ChunkFile[] = [];
+    //private asmFiles: ChunkFile[] = [];
     this.dbRoot = {};
-    this.sourceData = sourceData;
-    this.moduleList = modules;
-    const crc = shared.crc32_buffer(this.sourceData);
-    if (crc !== 473450688) {
-      throw new Error("CRC mismatch, please provide the correct ROM");
-    }
-  }
-  async generateProject(projectName) {
-    await this.initializeDatabase(projectName);
-    const reader = this.initializeChunks();
-    this.writeScriptTexts(reader);
-    this.applyBaseRom();
-    this.applyProjectInit();
-    this.applySelectedModules();
-    this.assembleCodeFromText();
-    this.applyCodePatches();
-    this.calculateSizes();
-    this.performLayout();
-    this.rebaseAssemblies();
-    this.generateAsmIncludeLookups();
-    const blockLookup = this.generateBlockLookup();
-    const outRom = await this.writeRom(blockLookup);
-    return outRom;
-  }
-  //Grab structures from supabase
-  async initializeDatabase(projectName) {
-    this.dbRoot = await shared.DbRootUtils.fromSupabaseProject({ projectName });
+    this.sourceData = new Uint8Array();
+    this.projectName = projectName;
+  }
+  async initialize() {
+    var projectData = await shared.summaryFromSupabaseByProject(this.projectName);
+    this.crc = projectData.project.baseRom.gameRom.crc;
+    this.branchId = projectData.id;
+  }
+  async validateAndDownload(sourceData) {
+    const calc = shared.crc32_buffer(sourceData);
+    if (calc === this.crc) {
+      this.dbRoot = await shared.DbRootUtils.fromSupabaseProject(this.projectName, this.branchId);
+      this.sourceData = sourceData;
+      return true;
+    }
+    return false;
   }
-  //Read graph from rom
-  initializeChunks() {
+  async generateProject(modules, manualFiles) {
+    if (!this.dbRoot) throw new Error("Database not initialized");
+    if (!this.sourceData) throw new Error("Source data not initialized");
     const reader = new BlockReader(this.sourceData, this.dbRoot);
-    this.chunkFiles = reader.analyzeAndResolve();
-    this.asmFiles = this.chunkFiles.filter((b) => b.type === shared.BinType.Assembly);
-    return reader;
-  }
-  //Convert blocks to text
-  writeScriptTexts(reader) {
+    const chunkFiles = reader.analyzeAndResolve();
+    const asmFiles = chunkFiles.filter((b) => b.type === shared.BinType.Assembly);
+    const patchFiles = [];
     const writer = new BlockWriter(reader);
-    for (const block of this.asmFiles) {
-      block.textData = writer.generateAsm(block);
-    }
-  }
-  //Apply base rom files
-  applyBaseRom() {
-    for (const chunkFile of this.dbRoot.baseRomFiles) {
-      this.applyPatchFile(chunkFile);
-    }
+    for (const block of asmFiles) block.textData = writer.generateAsm(block);
+    for (const chunkFile of this.dbRoot.baseRomFiles) this.applyPatchFile(chunkFile, chunkFiles, asmFiles, patchFiles);
+    const moduleLookup = this.applyProjectInit(chunkFiles, asmFiles, patchFiles);
+    for (const module of modules) {
+      for (const file of moduleLookup.get(module)) this.applyPatchFile(file, chunkFiles, asmFiles, patchFiles);
+    }
+    for (const file of manualFiles ?? []) this.applyPatchFile(file, chunkFiles, asmFiles, patchFiles);
+    this.assembleCodeFromText(asmFiles);
+    RomProcessor.applyPatches(asmFiles, patchFiles);
+    for (const asm of chunkFiles) shared.ChunkFileUtils.calculateSize(asm);
+    const layout = new RomLayout(chunkFiles);
+    layout.organize();
+    for (const file of asmFiles) shared.ChunkFileUtils.rebase(file);
+    this.generateAsmIncludeLookups(asmFiles);
+    const blockLookup = /* @__PURE__ */ new Map();
+    for (const f of chunkFiles) blockLookup.set(f.name.toUpperCase(), f.location);
+    const outRom = await this.writeRom(blockLookup, this.dbRoot.entryPoints, chunkFiles, asmFiles);
+    return outRom;
   }
-  applyProjectInit() {
+  applyProjectInit(chunkFiles, asmFiles, patchFiles) {
+    const moduleLookup = /* @__PURE__ */ new Map();
     for (const chunkFile of this.dbRoot.projectFiles) {
       console.log(`Processing patch: ${chunkFile.name}`);
       if (chunkFile.group) {
         let modArray;
-        if (!this.moduleLookup.has(chunkFile.group)) {
-          this.moduleLookup.set(chunkFile.group, modArray = []);
-        } else {
-          modArray = this.moduleLookup.get(chunkFile.group);
-        }
+        if (!moduleLookup.has(chunkFile.group)) moduleLookup.set(chunkFile.group, modArray = []);
+        else modArray = moduleLookup.get(chunkFile.group);
         modArray.push(chunkFile);
-      } else {
-        this.applyPatchFile(chunkFile);
-      }
-    }
-  }
-  //Apply selected project modules
-  applySelectedModules() {
-    for (const module of this.moduleList) {
-      for (const file of this.moduleLookup.get(module)) {
-        this.applyPatchFile(file);
-      }
+      } else this.applyPatchFile(chunkFile, chunkFiles, asmFiles, patchFiles);
     }
+    return moduleLookup;
   }
   //Assemble code from script text
-  assembleCodeFromText() {
-    for (const block of this.asmFiles) {
+  assembleCodeFromText(asmFiles) {
+    for (const block of asmFiles) {
       const assembler = new Assembler(this.dbRoot, block.textData);
       const { blocks, includes, reqBank } = assembler.parseAssembly();
       block.parts = blocks;
@@ -3749,31 +3733,10 @@ var RomGenerator = class {
       block.bank = reqBank ?? void 0;
     }
   }
-  //Apply patches
-  applyCodePatches() {
-    RomProcessor.applyPatches(this.asmFiles, this.patchFiles);
-  }
-  //Calculate sizes
-  calculateSizes() {
-    for (const asm of this.chunkFiles) {
-      shared.ChunkFileUtils.calculateSize(asm);
-    }
-  }
-  // Assign locations
-  performLayout() {
-    const layout = new RomLayout(this.chunkFiles);
-    layout.organize();
-  }
-  // Rebase assemblies
-  rebaseAssemblies() {
-    for (const file of this.asmFiles) {
-      shared.ChunkFileUtils.rebase(file);
-    }
-  }
   // Build include lookup map per asm file
-  generateAsmIncludeLookups() {
-    for (const f of this.asmFiles) {
-      const includeBlocks = this.asmFiles.filter((x) => f.includes?.has(x.name.toUpperCase())).flatMap((x) => x.parts).filter((b) => !!b.label);
+  generateAsmIncludeLookups(asmFiles) {
+    for (const f of asmFiles) {
+      const includeBlocks = asmFiles.filter((x) => f.includes?.has(x.name.toUpperCase())).flatMap((x) => x.parts).filter((b) => !!b.label);
       f.includeLookup = /* @__PURE__ */ new Map();
       for (const b of includeBlocks) {
         if (b.label) f.includeLookup.set(b.label.toUpperCase(), b);
@@ -3783,43 +3746,33 @@ var RomGenerator = class {
       }
     }
   }
-  applyPatchFile(chunkFile) {
+  applyPatchFile(chunkFile, chunkFiles, asmFiles, patchFiles) {
     console.log(`Processing patch: ${chunkFile.name}`);
-    const existing = this.chunkFiles.find((x) => x.name === chunkFile.name);
+    const existing = chunkFiles.find((x) => x.name === chunkFile.name);
     if (chunkFile.type === shared.BinType.Patch || chunkFile.type === shared.BinType.Assembly) {
       if (existing) {
         existing.textData = chunkFile.textData;
       } else {
         if (chunkFile.type === shared.BinType.Patch) {
-          this.patchFiles.push(chunkFile);
+          patchFiles.push(chunkFile);
         }
-        this.asmFiles.push(chunkFile);
-        this.chunkFiles.push(chunkFile);
+        asmFiles.push(chunkFile);
+        chunkFiles.push(chunkFile);
       }
     } else {
       if (existing) {
         existing.rawData = chunkFile.rawData;
         existing.size = chunkFile.size;
       } else {
-        this.chunkFiles.push(chunkFile);
+        chunkFiles.push(chunkFile);
       }
     }
   }
-  // Create block lookup for resolving labels to locations
-  generateBlockLookup() {
-    const blockLookup = /* @__PURE__ */ new Map();
-    for (const f of this.chunkFiles) {
-      blockLookup.set(f.name.toUpperCase(), f.location);
-    }
-    return blockLookup;
-  }
-  async writeRom(blockLookup) {
-    const romWriter = new RomWriter(this.dbRoot.entryPoints, "GAIALABS", "01JG  ");
-    for (const file of this.chunkFiles) {
-      await romWriter.writeFile(file, blockLookup);
-    }
+  async writeRom(blockLookup, entryPoints, chunkFiles, asmFiles) {
+    const romWriter = new RomWriter(entryPoints, "GAIALABS", "01JG  ");
+    for (const file of chunkFiles) await romWriter.writeFile(file, blockLookup);
     romWriter.writeHeader();
-    romWriter.writeEntryPoints(this.asmFiles);
+    romWriter.writeEntryPoints(asmFiles);
     romWriter.writeChecksum();
     return romWriter.outBuffer;
   }