@gaialabs/core 0.2.11 → 0.2.12

package/dist/index.mjs

@@ -1246,6 +1246,7 @@ let MemberType = /* @__PURE__ */ function(MemberType) {
 	MemberType["Address"] = "Address";
 	MemberType["Binary"] = "Binary";
 	MemberType["Code"] = "Code";
+	MemberType["Branch"] = "Branch";
 	MemberType["Location"] = "Location";
 	return MemberType;
 }({});
@@ -1986,6 +1987,7 @@ var ReferenceManager = class {
 	}
 	createTypeName(type, location) {
 		let name = type.toLowerCase();
+		if (name === "branch") name = "loc";
 		while (name.length > 0 && BlockReaderConstants.POINTER_CHARACTERS.includes(name[0])) name = name.substring(1) + "_list";
 		return `${name}_${location.toString(16).toUpperCase().padStart(6, "0")}`;
 	}
@@ -2363,6 +2365,7 @@ var AddressingModeHandler = class {
 	}
 	handlePCRelativeMode(operands, nextAddress, reg, isLong) {
 		const relative = isLong ? nextAddress + this._dataReader.readShort() : nextAddress + this._dataReader.readSByte();
+		this._blockReader._referenceManager.tryAddStruct(relative, "Branch");
 		this._blockReader.updateRegisterState(relative, reg);
 		operands.push(new LocationWrapper(relative, isLong ? AddressType.WRelative : AddressType.Relative));
 	}
@@ -2986,7 +2989,7 @@ var StringReader = class StringReader {
 		this._romDataReader = blockReader._romDataReader;
 	}
 	resolveCommand(cmd, builder) {
-		if (cmd.dictionary) builder.push(cmd.dictionary.entries[this._romDataReader.readByte() - (cmd.dictionary.base ?? 0)]);
+		if (cmd.dictionary) builder.push(`[${cmd.dictionary.commandName ?? cmd.dictionary.command?.toString(16).padEnd(2, "0").toUpperCase()}:${this._romDataReader.readByte().toString(16).padEnd(2, "0").toUpperCase()}]`);
 		else if (cmd.types && cmd.types.length > 0) {
 			builder.push(`[${cmd.name}`);
 			let first = true;
@@ -3027,7 +3030,7 @@ var StringReader = class StringReader {
 	}
 	parseString(stringType, fixedSize) {
 		const commands = stringType.commandLookup;
-		const dictionaries = stringType.dictionaries;
+		stringType.dictionaries;
 		const builder = [];
 		const strLoc = this._romDataReader.position;
 		const terminator = stringType.terminator;
@@ -3044,23 +3047,17 @@ var StringReader = class StringReader {
 				if (cmd.halt) break;
 			} else {
 				let found = false;
-				for (const dictionary of Object.values(dictionaries)) if (dictionary.base !== void 0 && c >= dictionary.base && c <= dictionary.range) {
-					builder.push(dictionary.entries[c - dictionary.base]);
-					found = true;
-					break;
-				}
-				if (!found) {
-					for (const layer of stringType.layers) if (layer.on !== void 0) {
-						if (c === layer.on) {
-							currentLayer = layer;
-							found = true;
-							break;
-						}
-					} else if (layer.base && c >= layer.base && c < layer.base + layer.map.length) {
-						builder.push(layer.map[c - layer.base]);
+				for (const layer of stringType.layers) if (layer.on !== void 0) {
+					if (c === layer.on) {
+						currentLayer = layer;
+						builder.push("[--]");
 						found = true;
 						break;
 					}
+				} else if (layer.base && c >= layer.base && c < layer.base + layer.map.length) {
+					builder.push(layer.map[c - layer.base]);
+					found = true;
+					break;
 				}
 				if (!found) {
 					let index = c - (currentLayer.base ?? 0);
@@ -3089,28 +3086,26 @@ var StringReader = class StringReader {
 		let str = sw.string;
 		let ix = indexOfAny(str, StringReader.STRING_REFERENCE_CHARACTERS);
 		while (ix >= 0) {
-			if (ix + 6 < str.length) {
-				const hexStr = str.substring(ix + 1, ix + 7);
-				const sloc = parseInt(hexStr, 16);
-				if (!isNaN(sloc)) {
-					if (new Address(sloc >> 16 & 255, sloc & 65535, this._blockReader._root.config.memoryMode).isROM) {
-						this._blockReader.resolveInclude(sloc, false);
-						const name = this._blockReader.resolveName(sloc, AddressType.Unknown, false);
-						const opix = indexOfAny(name, RomProcessingConstants.OPERATORS);
-						if (opix > 0) {
-							const offsetStr = name.substring(opix + 1);
-							let offset;
-							if (offsetStr === "M") offset = this._blockReader._referenceManager.markerTable.get(sloc) || 0;
-							else offset = parseInt(offsetStr, 16) || 0;
-							if (name[opix] === "-") offset = -offset;
-							name.substring(0, opix);
-							const target = sloc - offset;
-							const [isOutside, block, part] = ChunkFileUtils.isOutsideWithPart(this._blockReader._enrichedChunks, this._blockReader._currentChunk, sloc);
-							if (part != null) {
-								const entry = part.objList?.find((x) => typeof x === "object" && x !== null && "location" in x && "object" in x && x.location === target);
-								if (entry && entry.object) entry.object.marker = offset;
-							}
-						}
+			if (ix + 6 >= str.length) break;
+			const hexStr = str.substring(ix + 1, ix + 7);
+			const sloc = parseInt(hexStr, 16);
+			if (isNaN(sloc)) break;
+			if (new Address(sloc >> 16 & 255, sloc & 65535, this._blockReader._root.config.memoryMode).isROM) {
+				this._blockReader.resolveInclude(sloc, false);
+				const name = this._blockReader.resolveName(sloc, AddressType.Unknown, false);
+				const opix = indexOfAny(name, RomProcessingConstants.OPERATORS);
+				if (opix > 0) {
+					const offsetStr = name.substring(opix + 1);
+					let offset;
+					if (offsetStr === "M") offset = this._blockReader._referenceManager.markerTable.get(sloc) || 0;
+					else offset = parseInt(offsetStr, 16) || 0;
+					if (name[opix] === "-") offset = -offset;
+					name.substring(0, opix);
+					const target = sloc - offset;
+					const [isOutside, block, part] = ChunkFileUtils.isOutsideWithPart(this._blockReader._enrichedChunks, this._blockReader._currentChunk, sloc);
+					if (part != null) {
+						const entry = part.objList?.find((x) => typeof x === "object" && x !== null && "location" in x && "object" in x && x.location === target);
+						if (entry && entry.object) entry.object.marker = offset;
 					}
 				}
 			}
@@ -3160,7 +3155,8 @@ var TypeParser = class {
 			case MemberType.Address: return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), null, AddressType.Address);
 			case MemberType.Location: return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), null, AddressType.Location);
 			case MemberType.Binary: return this.parseBinary(fixedSize);
-			case MemberType.Code: return this.parseCode(reg);
+			case MemberType.Code:
+			case MemberType.Branch: return this.parseCode(reg);
 			default: throw new Error("Invalid member type");
 		}
 		const parentType = this._blockReader._root.structs[fixedTypeName];
@@ -3194,7 +3190,7 @@ var TypeParser = class {
 			let checkPosition = startPosition;
 			while (++checkPosition < this._romDataReader.position) {
 				const struct = this._referenceManager.tryGetStruct(checkPosition);
-				if (struct.found && struct.chunkType !== "Code") {
+				if (struct.found && struct.chunkType !== "Code" && struct.chunkType !== "Branch") {
 					this._romDataReader.position = checkPosition;
 					break;
 				}
@@ -3234,7 +3230,8 @@ var TypeParser = class {
 			loc = adrs.toLocation();
 		}
 		if (typeName && !this._blockReader._root.rewrites[loc]) {
-			this._referenceManager.tryAddStruct(loc, typeName);
+			const oldStruct = this._referenceManager.structTable.get(loc);
+			if (!oldStruct || oldStruct === "Branch") this._referenceManager.structTable.set(loc, typeName);
 			const referenceName = `${typeName.toLowerCase()}_${loc.toString(16).toUpperCase().padStart(6, "0")}`;
 			this._referenceManager.tryAddName(loc, referenceName);
 		}
@@ -3245,7 +3242,10 @@ var TypeParser = class {
 		let first = true;
 		while (this._romDataReader.position < this._blockReader._partEnd) {
 			if (first) first = false;
-			else if (this._referenceManager.containsStruct(this._romDataReader.position)) break;
+			else {
+				const struct = this._referenceManager.structTable.get(this._romDataReader.position);
+				if (struct && struct !== "Branch") break;
+			}
 			if (reg) this._blockReader.hydrateRegisters(reg);
 			const op = this._blockReader._asmReader.parseAsm(reg);
 			opList.push(op);
@@ -3492,7 +3492,8 @@ var BlockReader = class {
 	* Notes a type at a location and manages chunk references
 	*/
 	noteType(loc, type, silent = false, reg) {
-		this._referenceManager.tryAddStruct(loc, type);
+		const oldStruct = this._referenceManager.structTable.get(loc);
+		if (!oldStruct || oldStruct === "Branch") this._referenceManager.structTable.set(loc, type);
 		const nameResult = this._referenceManager.tryGetName(loc);
 		let name;
 		if (!nameResult.found) {
@@ -3532,10 +3533,12 @@ var BlockReader = class {
 		return this._romDataReader.position < this._partEnd && !this._referenceManager.containsStruct(this._romDataReader.position);
 	}
 	analyzeAndResolve() {
+		console.log("analyzeAndResolve started");
 		this.createChunkFilesFromDatabase();
 		this.initializeBlocksAndParts();
 		this.analyzeChunkFiles();
 		this.resolveReferences();
+		console.log("analyzeAndResolve complete");
 		return this._enrichedChunks;
 	}
 	/**
@@ -3545,6 +3548,7 @@ var BlockReader = class {
 	* Initializes blocks and parts with base references
 	*/
 	initializeBlocksAndParts() {
+		console.log("initializeBlocksAndParts");
 		for (const block of this._enrichedChunks) for (const part of block.parts || []) {
 			if (part.structName) this._referenceManager.tryAddStruct(part.location, part.structName);
 			if (part.label) this._referenceManager.tryAddName(part.location, part.label);
@@ -3599,6 +3603,7 @@ var BlockReader = class {
 	* Creates ChunkFile objects from database structure
 	*/
 	createChunkFilesFromDatabase() {
+		console.log("createChunkFilesFromDatabase");
 		this._enrichedChunks = [];
 		this.createChunkFilesFromSfx();
 		this.createChunkFilesFromDbFiles();
@@ -3672,6 +3677,7 @@ var BlockReader = class {
 	* Analyzes only assembly ChunkFiles (those with parts from DbBlocks)
 	*/
 	analyzeChunkFiles() {
+		console.log("analyzeChunkFiles");
 		const assemblyChunks = this._enrichedChunks.filter((chunk) => chunk.type.type === "Assembly");
 		for (const chunkFile of assemblyChunks) {
 			this._currentChunk = chunkFile;
@@ -3685,6 +3691,7 @@ var BlockReader = class {
 	* Resolves references in assembly ChunkFiles only
 	*/
 	resolveReferences() {
+		console.log("resolveReferences");
 		for (const chunkFile of this._enrichedChunks) {
 			this._currentChunk = chunkFile;
 			for (const asmBlock of chunkFile.parts || []) {
@@ -4112,10 +4119,10 @@ var BlockWriter = class {
 			let six = 0;
 			let mix = 0;
 			while (mix < marker) if (str[six] === "[") {
-				const eix = str.indexOf("]", ++six);
-				const parts = str.substring(six, eix).split(/[,: ]/);
+				const eix = str.indexOf("]", six);
+				const parts = str.substring(six + 1, eix).split(/[,: ]/);
 				const cmd = stringObj.type.commands[parts[0]];
-				if (cmd && cmd.types) for (const t of cmd.types) switch (t) {
+				if (cmd) for (const t of cmd.types) switch (t) {
 					case MemberType.Byte:
 						mix += 1;
 						break;
@@ -4132,6 +4139,7 @@ var BlockWriter = class {
 						break;
 					default: throw new Error("Unsupported member type");
 				}
+				else mix += parts.length - 1;
 				six = eix + 1;
 				mix++;
 			} else {
@@ -4140,6 +4148,18 @@ var BlockWriter = class {
 			}
 			str = str.substring(0, six) + "[::]" + str.substring(six);
 		}
+		const dictionaries = stringObj.type.dictionaries;
+		for (const dictionary of Object.values(dictionaries)) {
+			const commandName = `[${dictionary.commandName ?? dictionary.command?.toString(16).padEnd(2, "0").toUpperCase()}:`;
+			let cmdIx;
+			while ((cmdIx = str.indexOf(commandName)) >= 0) {
+				const endIx = str.indexOf("]", cmdIx);
+				const strIx = parseInt(str.substring(cmdIx + commandName.length, endIx), 16);
+				const newText = dictionary.entries[strIx];
+				str = str.substring(0, cmdIx) + newText + str.substring(endIx + 1);
+			}
+		}
+		str = str.replace(/\[--\]/g, "");
 		const sizeParam = stringObj.fixedSize ? `(${stringObj.fixedSize})` : "";
 		return [`${refChar}${str}${refChar}${sizeParam}`];
 	}
@@ -4376,12 +4396,13 @@ var RomProcessor = class RomProcessor {
 	constructor(writer) {
 		this.writer = writer;
 	}
-	async repack(allFiles) {
+	async repack(allFiles, modules) {
 		const patches = [];
 		const asmFiles = [];
 		const compression = this.writer.root.compression;
 		const canCompress = !!compression;
 		const conditionFiles = [];
+		if (modules) conditionFiles.push(...modules);
 		for (const file of allFiles) {
 			if (file.type.type === "Patch") patches.push(file);
 			else if (file.type.type !== "Assembly") {
@@ -4472,8 +4493,8 @@ var RomWriter = class {
 	constructor(root) {
 		this.root = root;
 	}
-	async repack(files) {
-		const masterLookup = await new RomProcessor(this).repack(files);
+	async repack(files, modules) {
+		const masterLookup = await new RomProcessor(this).repack(files, modules);
 		this.writeHeaders(masterLookup);
 		return this.outBuffer;
 	}
@@ -4961,7 +4982,6 @@ var StringProcessor = class {
 				break;
 			case MemberType.Offset:
 			case MemberType.Address:
-				this.flushBuffer(stringType, false);
 				this.context.currentBlock.objList.push(parts[pix]);
 				this.context.currentBlock.size += cmd.types[y] === MemberType.Offset ? 2 : 3;
 				break;
@@ -5628,21 +5648,18 @@ var DbStringCommand = class {
 	}
 };
 var DbStringDictionary = class {
-	base;
-	range;
 	command;
+	commandName;
 	name;
 	entries;
 	constructor(data) {
-		if (typeof data.base !== "number" && typeof data.command !== "number") throw new Error("Base or command is required");
+		if (typeof data.command !== "number") throw new Error("Command is required");
 		if (!data.name) throw new Error("Name is required");
 		if (!data.entries || data.entries.length === 0) throw new Error("Entries is required");
-		this.base = data.base ?? void 0;
-		this.range = data.range ?? 0;
 		this.command = data.command ?? void 0;
+		this.commandName = data.commandName ?? void 0;
 		this.name = data.name;
 		this.entries = data.entries;
-		if (this.base !== void 0) this.range = this.base + this.entries.length;
 	}
 };
 /**
@@ -5677,7 +5694,7 @@ var DbStringType = class {
 		}, {});
 		this.dictionaryLookup = Object.values(this.dictionaries).flatMap((y) => y.entries.map((z, ix) => ({
 			text: z,
-			id: (y.command ?? 0) << 8 | (y.base ?? 0 + ix)
+			id: (y.command ?? 0) << 8 | ix
 		}))).sort((a, b) => b.text.length - a.text.length);
 	}
 };
@@ -6139,7 +6156,7 @@ var DbRootUtils = class {
 			projectFiles: projectChunks
 		};
 	}
-	static async applyFolder(root, folderPath, sourceFiles = []) {
+	static async applyFolder(root, folderPath, sourceFiles = [], group) {
 		const chunkFiles = sourceFiles;
 		const folderEntries = await listDirectory(folderPath, { recursive: true });
 		for (const entry of folderEntries) {
@@ -6148,6 +6165,7 @@ var DbRootUtils = class {
 			if (!type) continue;
 			const existing = chunkFiles.find((x) => x.name === entry.name && x.type.type === type.type);
 			const chunkFile = existing ?? new ChunkFile(entry.name, 0, 0, type);
+			if (group) chunkFile.group = group;
 			if (chunkFile.type.type === "Assembly" || chunkFile.type.type === "Patch") {
 				const chunkData = await readFileAsText(entry.path);
 				chunkFile.textData = chunkData;
@@ -7178,6 +7196,20 @@ var RomGenerator = class {
 		this.projectName = projectName;
 		this.crc = crc;
 	}
+	async validateAndLoad(sourceData, gameModule, baseRomPath, modulePath) {
+		const calc = crc32_buffer(sourceData);
+		if (this.crc !== calc) return false;
+		this.dbRoot = DbRootUtils.fromGameModule(gameModule);
+		let moduleFiles = [];
+		for (const entry of await listDirectory(modulePath)) {
+			if (!entry.isDirectory) continue;
+			moduleFiles.push(...await DbRootUtils.applyFolder(this.dbRoot, entry.path, [], entry.name));
+		}
+		this.dbRoot.baseRomFiles = await DbRootUtils.applyFolder(this.dbRoot, baseRomPath);
+		this.dbRoot.projectFiles = moduleFiles;
+		this.sourceData = sourceData;
+		return true;
+	}
 	async validateAndDownload(sourceData) {
 		const calc = crc32_buffer(sourceData);
 		if (this.crc !== calc) return false;
@@ -7200,7 +7232,7 @@ var RomGenerator = class {
 		if (unshiftManualFiles) for (const file of manualFiles ?? []) this.applyPatchFile(file, chunkFiles, asmFiles, patchFiles);
 		for (const module of modules) for (const file of moduleLookup.get(module)) this.applyPatchFile(file, chunkFiles, asmFiles, patchFiles);
 		if (!unshiftManualFiles) for (const file of manualFiles ?? []) this.applyPatchFile(file, chunkFiles, asmFiles, patchFiles);
-		return await new RomWriter(this.dbRoot).repack(chunkFiles);
+		return await new RomWriter(this.dbRoot).repack(chunkFiles, modules);
 	}
 	applyProjectInit(chunkFiles, asmFiles, patchFiles) {
 		const moduleLookup = /* @__PURE__ */ new Map();