@gaialabs/core 0.2.7 → 0.2.9

package/dist/index.cjs

@@ -1897,8 +1897,8 @@ var TableEntry = class {
 	location;
 	object;
 	constructor(location) {
-		this.location = location ?? void 0;
-		if (this.location === void 0) throw new Error("Location is required");
+		if (typeof location !== "number") throw new Error("Location is required");
+		this.location = location;
 	}
 };
 
@@ -2678,7 +2678,7 @@ var DbStringType = class {
 		}, {});
 		this.dictionaryLookup = Object.values(this.dictionaries).flatMap((y) => y.entries.map((z, ix) => ({
 			text: z,
-			id: (y.command ?? 0) | (y.base ?? 0 + ix)
+			id: (y.command ?? 0) << 8 | (y.base ?? 0 + ix)
 		}))).sort((a, b) => b.text.length - a.text.length);
 	}
 };
@@ -3354,6 +3354,7 @@ var QuintetLZ = class QuintetLZ {
 		let srcIx = srcPosition ?? 0;
 		let dstIx = 0;
 		if (!srcLen) srcLen = srcData.length - srcIx;
+		let endIx = srcIx + srcLen;
 		const outputBuffer = new Uint8Array(srcLen * 2);
 		outputBuffer[dstIx++] = srcLen & 255;
 		outputBuffer[dstIx++] = srcLen >> 8 & 255;
@@ -3363,28 +3364,38 @@ var QuintetLZ = class QuintetLZ {
 		* @returns Tuple of [startByte, length]
 		*/
 		const getCommand = () => {
-			const maxLen = Math.min(srcLen - srcIx, 17);
+			const maxLen = Math.min(endIx - srcIx, 17);
 			if (maxLen < 2) return [0, 0];
 			let startByte = 0;
 			let bestLen = 0;
-			let bx = offset;
-			for (let i = 0; i < 256; i++, bx = bx + 1 & 255) {
+			let baseIndex = offset;
+			for (let i = 0; i < 256; i++, baseIndex = baseIndex + 1 & 255) {
 				let size = 0;
-				let bix = bx;
-				while (size < maxLen && dictionary[bix] === srcData[srcIx + size]) {
-					bix = bix + 1 & 255;
-					if (bix === offset) bix = bx;
+				let currentIndex = baseIndex;
+				let sourceIndex = srcIx;
+				let isEnd = false;
+				while (size < maxLen) {
+					if (isEnd) {
+						if (srcData[sourceIndex++] !== srcData[srcIx + size]) break;
+					} else if (dictionary[currentIndex] !== srcData[sourceIndex++]) break;
+					else {
+						currentIndex = currentIndex + 1 & 255;
+						if (currentIndex === offset) {
+							sourceIndex = srcIx;
+							isEnd = true;
+						}
+					}
 					size++;
 				}
 				if (size > bestLen) {
-					startByte = bx;
+					startByte = baseIndex;
 					bestLen = size;
 					if (bestLen >= maxLen) break;
 				}
 			}
 			return [startByte, bestLen];
 		};
-		while (srcIx < srcLen) {
+		while (srcIx < endIx) {
 			const [cmdStart, cmdLen] = getCommand();
 			if (cmdLen >= 2) {
 				bitStream.writeBit(false);
@@ -4431,6 +4442,7 @@ var BlockReader = class {
 	* Resolves a single object and its references
 	*/
 	resolveObject(obj, isBranch) {
+		if (obj === void 0 || obj === null) return;
 		if (typeof obj === "string") return;
 		if (Array.isArray(obj)) {
 			for (const o of obj) this.resolveObject(o, isBranch);
@@ -4448,7 +4460,15 @@ var BlockReader = class {
 			this.resolveInclude(obj.location, isBranch);
 			return;
 		}
-		if (obj && typeof obj === "object") {
+		if (obj instanceof TableEntry) {
+			this.resolveObject(obj.object, isBranch);
+			return;
+		}
+		if (obj instanceof Op) {
+			this.resolveOperationObject(obj);
+			return;
+		}
+		if (typeof obj === "object") {
 			if ("string" in obj && "type" in obj) {
 				this._stringReader.resolveString(obj, isBranch);
 				return;
@@ -4457,14 +4477,6 @@ var BlockReader = class {
 				this.resolveObject(obj.parts, isBranch);
 				return;
 			}
-			if ("location" in obj && "object" in obj) {
-				this.resolveObject(obj.object, isBranch);
-				return;
-			}
-			if ("code" in obj && "operands" in obj) {
-				this.resolveOperationObject(obj);
-				return;
-			}
 		}
 	}
 	/**
@@ -4574,8 +4586,9 @@ var RomLayout = class RomLayout {
 							this.sfxFiles.unshift(newFile);
 							file.rawData = file.rawData.slice(0, end);
 							file.size -= offset;
+							offset = 0;
 						}
-						remain = 0;
+						remain = RomProcessingConstants.PAGE_SIZE;
 						break;
 					} else remain -= file.size;
 				}
@@ -4688,7 +4701,7 @@ var RomProcessor = class RomProcessor {
 			asmFiles.push(file);
 			conditionFiles.push(file.name);
 		}
-		for (const file of asmFiles) if (!file.parts) {
+		for (const file of asmFiles) {
 			const { blocks, includes, reqBank } = new Assembler(this.writer.root, file.textData, conditionFiles).parseAssembly();
 			file.parts = blocks;
 			file.includes = includes;
@@ -4937,7 +4950,7 @@ var RomWriter = class {
 				while (true) if (Array.isArray(currentObj)) {
 					for (const obj of currentObj) processObject(obj, parentOp);
 					break;
-				} else if (this.isTableEntry(currentObj)) {
+				} else if (currentObj instanceof TableEntry) {
 					currentObj = currentObj.object;
 					continue;
 				} else if (currentObj instanceof Op) {
@@ -5257,6 +5270,7 @@ var DbRootUtils = class {
 			return acc;
 		}, {});
 		const extLookup = {};
+		const fileTypeLookup = {};
 		const fileTypes = Object.entries(module.fileTypes).reduce((acc, x) => {
 			const fileType = x[1];
 			const name = x[0];
@@ -5265,11 +5279,35 @@ var DbRootUtils = class {
 				name
 			});
 			extLookup[type.extension] = type;
+			fileTypeLookup[type.type] = type;
 			acc[name] = type;
 			return acc;
 		}, {});
 		const cfg = module.config;
 		const compression = cfg.compression ? CompressionAlgorithms[cfg.compression]() : void 0;
+		const baseRomChunks = module.baseRomFiles ?? module.supaBaseRomFiles?.map((file) => {
+			const chunkFile = new ChunkFile(file.name, 0, 0, fileTypeLookup[file.type]);
+			if (file.isText) {
+				chunkFile.textData = file.text ?? void 0;
+				chunkFile.size = file.text?.length ?? 0;
+			} else {
+				chunkFile.rawData = file.data;
+				chunkFile.size = file.data?.length ?? 0;
+			}
+			return chunkFile;
+		});
+		const projectChunks = module.projectFiles ?? module.supaProjectFiles?.map((file) => {
+			const chunkFile = new ChunkFile(file.name, 0, 0, fileTypeLookup[file.type]);
+			chunkFile.group = file.module ?? void 0;
+			if (file.isText) {
+				chunkFile.textData = file.text ?? void 0;
+				chunkFile.size = file.text?.length ?? 0;
+			} else {
+				chunkFile.rawData = file.data;
+				chunkFile.size = file.data?.length ?? 0;
+			}
+			return chunkFile;
+		});
 		return {
 			headers: module.headers.map((h) => new DbHeader(h)),
 			mnemonics: module.mnemonics,
@@ -5298,7 +5336,9 @@ var DbRootUtils = class {
 			stringDelimiterLookup,
 			compression,
 			groups: groupLookup,
-			scenes: sceneLookup
+			scenes: sceneLookup,
+			baseRomFiles: baseRomChunks,
+			projectFiles: projectChunks
 		};
 	}
 	static async applyFolder(root, folderPath, sourceFiles = []) {
@@ -5597,9 +5637,17 @@ var StringProcessor = class {
 		const cmdLookup = stringType.commands;
 		let currentLayer = stringType.layers[0];
 		let lastCmd = null;
+		let fullMatch = false;
 		for (const entry of dictionary) {
 			let index;
-			while ((index = str.indexOf(entry.text)) >= 0) str = str.substring(0, index) + `[${entry.id.toString(16).toUpperCase()}]` + str.substring(index + entry.text.length);
+			while ((index = str.indexOf(entry.text)) >= 0) {
+				if (index === 0 && str.length === entry.text.length) {
+					fullMatch = true;
+					break;
+				}
+				str = str.substring(0, index) + `[${entry.id.toString(16).toUpperCase()}]` + str.substring(index + entry.text.length);
+			}
+			if (fullMatch) break;
 		}
 		for (let x = 0; x < str.length; x++) {
 			const c = str[x];
@@ -6822,7 +6870,7 @@ async function fromSupabaseByProject(projectName, branchId) {
 		});
 		const baseRomBranch = branchData.baseRomBranch;
 		const projectFiles = await loadProjectFiles(branchData.id);
-		await loadBaseRomFiles(baseRomBranch.id);
+		const baseRomFiles = await loadBaseRomFiles(baseRomBranch.id);
 		fileQueryTime = performance.now() - branchStart - branchQueryTime;
 		const totalTime = performance.now() - startTime;
 		const stats = {
@@ -6833,6 +6881,8 @@ async function fromSupabaseByProject(projectName, branchId) {
 		};
 		console.log("Project ROM load stats:", stats);
 		return {
+			supaProjectFiles: projectFiles,
+			supaBaseRomFiles: baseRomFiles,
 			mnemonics: baseRomBranch.gameRomBranch.mnemonics,
 			overrides: baseRomBranch.gameRomBranch.overrides,
 			rewrites: baseRomBranch.gameRomBranch.rewrites,
@@ -7142,16 +7192,15 @@ var RomGenerator = class {
 	sourceData = new Uint8Array();
 	constructor(projectName, crc) {
 		this.projectName = projectName;
-		this.crc = crc ?? 0;
+		this.crc = crc;
 	}
 	async validateAndDownload(sourceData) {
-		if (crc32_buffer(sourceData) === this.crc) {
-			const moduleData = await fromSupabaseByProject(this.projectName);
-			this.dbRoot = DbRootUtils.fromGameModule(moduleData);
-			this.sourceData = sourceData;
-			return true;
-		}
-		return false;
+		const calc = crc32_buffer(sourceData);
+		if (this.crc !== calc) return false;
+		const moduleData = await fromSupabaseByProject(this.projectName);
+		this.dbRoot = DbRootUtils.fromGameModule(moduleData);
+		this.sourceData = sourceData;
+		return true;
 	}
 	async generateProject(modules, manualFiles, unshiftManualFiles = false) {
 		if (!this.dbRoot) throw new Error("Database not initialized");