@gaialabs/core 0.2.3 → 0.2.4

package/dist/index.d.cts

@@ -624,6 +624,7 @@ declare class DbStringCommand {
   types: string[];
   delimiter?: number;
   halt: boolean;
+  dictionary?: DbStringDictionary;
   constructor(data: Partial<DbStringCommand>);
 }
 /**
@@ -631,7 +632,10 @@ declare class DbStringCommand {
  * Converted from GaiaLib/Database/DbStringLayer.cs
  */
 interface DbStringLayer {
-  base: number;
+  base?: number;
+  range?: number;
+  on?: number;
+  shift?: string;
   map: string[];
 }
 declare class DbStringDictionary {
@@ -650,8 +654,6 @@ declare class DbStringType {
   name: string;
   delimiter: string;
   terminator: number;
-  shiftType?: string;
-  characterMap: string[];
   commands: Record<string, DbStringCommand>;
   commandLookup: Record<number, DbStringCommand>;
   layers: DbStringLayer[];
@@ -1513,12 +1515,11 @@ declare class StringProcessor {
   private readonly root;
   private readonly stringCharLookup;
   private readonly testRegex;
+  private inShift;
   constructor(context: AssemblerContext);
   consumeString(typeChar: string): void;
   private flushBuffer;
   private processString;
-  private applyLayers;
-  private applyMap;
   private processStringCommand;
 }
 //#endregion

package/dist/index.d.mts

@@ -624,6 +624,7 @@ declare class DbStringCommand {
   types: string[];
   delimiter?: number;
   halt: boolean;
+  dictionary?: DbStringDictionary;
   constructor(data: Partial<DbStringCommand>);
 }
 /**
@@ -631,7 +632,10 @@ declare class DbStringCommand {
  * Converted from GaiaLib/Database/DbStringLayer.cs
  */
 interface DbStringLayer {
-  base: number;
+  base?: number;
+  range?: number;
+  on?: number;
+  shift?: string;
   map: string[];
 }
 declare class DbStringDictionary {
@@ -650,8 +654,6 @@ declare class DbStringType {
   name: string;
   delimiter: string;
   terminator: number;
-  shiftType?: string;
-  characterMap: string[];
   commands: Record<string, DbStringCommand>;
   commandLookup: Record<number, DbStringCommand>;
   layers: DbStringLayer[];
@@ -1513,12 +1515,11 @@ declare class StringProcessor {
   private readonly root;
   private readonly stringCharLookup;
   private readonly testRegex;
+  private inShift;
   constructor(context: AssemblerContext);
   consumeString(typeChar: string): void;
   private flushBuffer;
   private processString;
-  private applyLayers;
-  private applyMap;
   private processStringCommand;
 }
 //#endregion

package/dist/index.mjs

@@ -1790,12 +1790,14 @@ var DbStringCommand = class {
 	types;
 	delimiter;
 	halt;
+	dictionary;
 	constructor(data) {
 		this.id = data.id ?? void 0;
 		this.name = data.name ?? "";
 		this.types = data.types ?? [];
 		this.delimiter = data.delimiter ?? void 0;
 		this.halt = data.halt ?? false;
+		this.dictionary = data.dictionary ?? void 0;
 		if (!this.id && this.id !== 0) throw new Error("Id is required");
 		if (!this.name) throw new Error("Name is required");
 	}
@@ -1826,8 +1828,6 @@ var DbStringType = class {
 	name;
 	delimiter;
 	terminator;
-	shiftType;
-	characterMap;
 	commands;
 	commandLookup;
 	layers;
@@ -1838,8 +1838,6 @@ var DbStringType = class {
 		this.name = data.name ?? "";
 		this.delimiter = data.delimiter ?? "";
 		this.terminator = data.terminator ?? 0;
-		this.shiftType = data.shiftType ?? void 0;
-		this.characterMap = data.characterMap;
 		this.commands = data.commands ?? {};
 		this.layers = data.layers ?? [];
 		this.greedyTerminator = data.greedyTerminator ?? false;
@@ -1855,7 +1853,7 @@ var DbStringType = class {
 		if (!this.name) throw new Error("Name is required");
 		if (!this.delimiter) throw new Error("Delimiter is required");
 		if (!this.terminator && this.terminator !== 0) throw new Error("Terminator is required");
-		if (!this.characterMap) throw new Error("Character map is required");
+		if (!this.layers.length) throw new Error("Layers are required");
 	}
 };
 /**
@@ -3350,14 +3348,17 @@ var TypeParser = class {
 					name: targetType.name,
 					parts
 				};
-				for (let i = 0; i < memberCount; i++) parts[i] = this.parseType(types[i], null, depth + 1, bank);
+				for (let i = 0; i < memberCount; i++) parts[i] = this.parseType(types[i], reg, depth + 1, bank);
 				if (discOffset !== void 0 && discOffset === this._romDataReader.position - prevPosition) this._romDataReader.position++;
 				objects.push(def);
 			}
 			let checkPosition = startPosition;
-			while (++checkPosition < this._romDataReader.position) if (this._referenceManager.containsStruct(checkPosition)) {
-				this._romDataReader.position = checkPosition;
-				break;
+			while (++checkPosition < this._romDataReader.position) {
+				const struct = this._referenceManager.tryGetStruct(checkPosition);
+				if (struct.found && struct.chunkType !== "Code") {
+					this._romDataReader.position = checkPosition;
+					break;
+				}
 			}
 			if (!this._blockReader.partCanContinue()) break;
 		}
@@ -4437,10 +4438,16 @@ var DbRootUtils = class {
 				return acc$1;
 			}, {});
 			const dictionaries = Object.entries(stringType.dictionaries ?? {}).reduce((acc$1, y) => {
-				acc$1[y[0]] = new DbStringDictionary({
+				const dictionary = new DbStringDictionary({
 					...y[1],
 					name: y[0]
 				});
+				acc$1[y[0]] = dictionary;
+				if (dictionary.command !== void 0) commands[dictionary.command] = new DbStringCommand({
+					id: dictionary.command,
+					name: dictionary.name,
+					dictionary
+				});
 				return acc$1;
 			}, {});
 			const st = new DbStringType({
@@ -4621,7 +4628,8 @@ var StringReader = class StringReader {
 		this._romDataReader = blockReader._romDataReader;
 	}
 	resolveCommand(cmd, builder) {
-		if (cmd.types && cmd.types.length > 0) {
+		if (cmd.dictionary) builder.push(cmd.dictionary.entries[this._romDataReader.readByte() - (cmd.dictionary.base ?? 0)]);
+		else if (cmd.types && cmd.types.length > 0) {
 			builder.push(`[${cmd.name}`);
 			let first = true;
 			for (const t of cmd.types) {
@@ -4664,8 +4672,8 @@ var StringReader = class StringReader {
 		const dictionaries = stringType.dictionaries;
 		const builder = [];
 		const strLoc = this._romDataReader.position;
-		const map = stringType.characterMap;
 		const terminator = stringType.terminator;
+		let currentLayer = stringType.layers[0];
 		do {
 			const c = this._romDataReader.readByte();
 			if (c === terminator) {
@@ -4684,8 +4692,25 @@ var StringReader = class StringReader {
 					break;
 				}
 				if (!found) {
-					const index = DbStringTypeUtils.getShiftDown(stringType.shiftType)(c);
-					if (index >= 0 && index < map.length) builder.push(map[index]);
+					for (const layer of stringType.layers) if (layer.on !== void 0) {
+						if (c === layer.on) {
+							currentLayer = layer;
+							found = true;
+							break;
+						}
+					} else if (c >= (layer.base ?? 0) && c <= (layer.range ?? 255)) {
+						let index = c - (layer.base ?? 0);
+						if (index >= 0 && index < layer.map.length) {
+							if (layer.shift) index = DbStringTypeUtils.getShiftDown(layer.shift)(index);
+							builder.push(layer.map[index]);
+							found = true;
+							break;
+						}
+					}
+				}
+				if (!found) {
+					const index = currentLayer.shift ? DbStringTypeUtils.getShiftDown(currentLayer.shift)(c) : c - (currentLayer.base ?? 0);
+					if (index >= 0 && index < currentLayer.map.length) builder.push(currentLayer.map[index]);
 					else builder.push(`[${c.toString(16).toUpperCase()}]`);
 				}
 			}
@@ -4748,6 +4773,7 @@ var StringProcessor = class {
 	root;
 	stringCharLookup;
 	testRegex;
+	inShift = false;
 	constructor(context) {
 		this.context = context;
 		this.root = context.root;
@@ -4799,6 +4825,7 @@ var StringProcessor = class {
 		const stringType = this.stringCharLookup[typeChar];
 		const dictionary = stringType.dictionaryLookup;
 		const cmdLookup = stringType.commands;
+		let currentLayer = stringType.layers[0];
 		let lastCmd = null;
 		for (const entry of dictionary) {
 			let index;
@@ -4834,7 +4861,21 @@ var StringProcessor = class {
 				}
 			}
 			lastCmd = null;
-			if (this.applyLayers(c, stringType)) continue;
+			let found = false;
+			for (const layer of stringType.layers) {
+				for (let i = 0, len = layer.map.length; i < len; i++) if (c === layer.map[i]) {
+					if (layer.on !== void 0 && currentLayer !== layer) {
+						this.memBuffer.push(layer.on);
+						currentLayer = layer;
+					}
+					let value = i + (layer.base ?? 0);
+					if (layer.shift) value = DbStringTypeUtils.getShiftUp(layer.shift)(value);
+					this.memBuffer.push(value);
+					found = true;
+					break;
+				}
+				if (found) break;
+			}
 		}
 		if (this.fixedStr) {
 			let count = this.fixedStr - this.totalSize;
@@ -4842,23 +4883,6 @@ var StringProcessor = class {
 		} else if (lastCmd === null || !lastCmd.halt) this.memBuffer.push(stringType.terminator);
 		this.flushBuffer(stringType, true);
 	}
-	applyLayers(c, stringType) {
-		if (this.applyMap(c, stringType.characterMap, DbStringTypeUtils.getShiftUp(stringType.shiftType))) return true;
-		if (stringType.layers) {
-			for (const layer of stringType.layers) if (this.applyMap(c, layer.map, (x) => x + layer.base)) return true;
-		}
-		return false;
-	}
-	applyMap(c, map, shift) {
-		for (let i = 0, len = map.length; i < len; i++) {
-			const v = map[i];
-			if (v != null && c === v[0]) {
-				this.memBuffer.push(shift(i));
-				return true;
-			}
-		}
-		return false;
-	}
 	processStringCommand(cmd, stringType, parts) {
 		const hasPointer = cmd.types.includes(MemberType.Address) || cmd.types.includes(MemberType.Offset);
 		if (hasPointer) this.flushBuffer(stringType, true);