@gaialabs/core 0.2.8 → 0.2.9

package/dist/index.cjs

@@ -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);
@@ -4575,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;
 				}
@@ -5625,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];