@gaialabs/core 0.2.14 → 0.2.15

package/dist/index.mjs

@@ -936,7 +936,7 @@ var RomDataReader = class {
 	romData;
 	position;
 	offset;
-	constructor(romData, offset = 0) {
+	constructor(romData, offset) {
 		if (!romData) throw new Error("romData cannot be null");
 		this.romData = romData;
 		this.position = 0;
@@ -1130,6 +1130,7 @@ let AddressType = /* @__PURE__ */ function(AddressType) {
 	AddressType["Relative"] = "Relative";
 	AddressType["WRelative"] = "WRelative";
 	AddressType["Location"] = "Location";
+	AddressType["OddLocation"] = "OddLocation";
 	return AddressType;
 }({});
 /**
@@ -1220,6 +1221,7 @@ var Address = class Address {
 			case "@": return AddressType.Address;
 			case "*": return AddressType.WBank;
 			case "%": return AddressType.Location;
+			case "!": return AddressType.OddLocation;
 			default: return AddressType.Unknown;
 		}
 	}
@@ -1230,6 +1232,7 @@ var Address = class Address {
 			case AddressType.Address: return "@";
 			case AddressType.WBank: return "*";
 			case AddressType.Location: return "%";
+			case AddressType.OddLocation: return "!";
 			default: return null;
 		}
 	}
@@ -1674,6 +1677,7 @@ var ChunkFile = class {
 	scene;
 	base;
 	referenceManager;
+	isFile;
 	constructor(type, name, size = 0, location = 0) {
 		this.type = type;
 		this.name = name;
@@ -1681,6 +1685,7 @@ var ChunkFile = class {
 		this.location = location;
 		this.mnemonics = {};
 		this.compressed = type.compressed;
+		this.isFile = !type.isBlock;
 	}
 	enrichWithRawDataFromDbFile(file, rom, compression) {
 		this.upper = file.upper ?? this.upper;
@@ -1689,7 +1694,8 @@ var ChunkFile = class {
 		this.base = file.base ?? this.type.base ?? this.base;
 		this.group = file.group ?? this.group;
 		this.scene = file.scene ?? this.scene;
-		this.compressed = file.compressed;
+		this.compressed = file.compressed ?? this.type.compressed ?? this.compressed;
+		this.isFile = true;
 		let start = this.location;
 		let header = null;
 		const fileType = this.type;
@@ -1715,6 +1721,8 @@ var ChunkFile = class {
 	enrichWithAsmBlocksFromDbBlock(block, memoryMode) {
 		this.group = block.group;
 		this.scene = block.scene;
+		this.base = block.base;
+		this.isFile = false;
 		this.parts = [];
 		this.size = 0;
 		if (!block.parts?.length) throw new Error(`Block ${block.name} has no parts`);
@@ -1932,14 +1940,23 @@ var ReferenceManager = class {
 		this.root = root;
 	}
 	tryGetStruct(location) {
-		const chunkType = this.structTable.get(location);
+		let chunkType = this.structTable.get(location);
+		const found = chunkType !== void 0;
+		let isSoft;
+		if (chunkType) if (chunkType[0] === "~") {
+			isSoft = true;
+			chunkType = chunkType.substring(1);
+		} else isSoft = false;
 		return {
-			found: chunkType !== void 0,
-			chunkType
+			found,
+			chunkType,
+			isSoft
 		};
 	}
 	tryAddStruct(location, chunkType) {
-		if (this.structTable.has(location)) return false;
+		const existingStruct = this.tryGetStruct(location);
+		const isSoft = chunkType[0] === "~";
+		if (existingStruct.isSoft === false || existingStruct.found && isSoft) return false;
 		this.structTable.set(location, chunkType);
 		return true;
 	}
@@ -1947,14 +1964,23 @@ var ReferenceManager = class {
 		return this.structTable.has(location);
 	}
 	tryGetName(location) {
-		const referenceName = this.nameTable.get(location);
+		let referenceName = this.nameTable.get(location);
+		const found = referenceName !== void 0;
+		let isSoft;
+		if (referenceName) if (referenceName[0] === "~") {
+			isSoft = true;
+			referenceName = referenceName.substring(1);
+		} else isSoft = false;
 		return {
-			found: referenceName !== void 0,
-			referenceName
+			found,
+			referenceName,
+			isSoft
 		};
 	}
 	tryAddName(location, referenceName) {
-		if (this.nameTable.has(location)) return false;
+		const existingName = this.tryGetName(location);
+		const isSoft = referenceName[0] === "~";
+		if (existingName.isSoft === false || existingName.found && isSoft) return false;
 		this.nameTable.set(location, referenceName);
 		return true;
 	}
@@ -1975,6 +2001,7 @@ var ReferenceManager = class {
 	}
 	createTypeName(type, location) {
 		let name = type.toLowerCase();
+		if (type[0] === "~") name = name.substring(1);
 		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")}`;
@@ -1995,8 +2022,8 @@ var ReferenceManager = class {
 	}
 	resolveName(location, type, isBranch) {
 		const prefix = Address.codeFromType(type);
-		let name = null;
-		let label = null;
+		let name;
+		let label;
 		let resolvedLocation = location;
 		const rewrite = this.root.rewrites[location];
 		if (rewrite !== void 0) {
@@ -2004,7 +2031,7 @@ var ReferenceManager = class {
 			resolvedLocation = result.location;
 			label = result.label;
 		}
-		name = this.nameTable.get(resolvedLocation) || null;
+		name = this.tryGetName(resolvedLocation).referenceName;
 		if (!name) name = isBranch ? this.createBranchLabel(resolvedLocation) : this.findClosestReference(resolvedLocation) || this.createFallbackName(resolvedLocation);
 		return `${prefix || ""}${name}${label || ""}`;
 	}
@@ -2027,8 +2054,8 @@ var ReferenceManager = class {
 		const offset = location - rewrite;
 		const cmd = offset < 0 ? "-" : "+";
 		const absOffset = Math.abs(offset);
-		let label = null;
-		if (this.structTable.get(rewrite) === BlockReaderConstants.WIDE_STRING_TYPE) {
+		let label;
+		if (this.tryGetStruct(rewrite).chunkType === BlockReaderConstants.WIDE_STRING_TYPE) {
 			this.markerTable.set(rewrite, absOffset);
 			this.markerTable.set(location, absOffset);
 			label = cmd === "-" ? BlockReaderConstants.NEGATIVE_MARKER_FORMAT : BlockReaderConstants.MARKER_FORMAT;
@@ -2041,7 +2068,7 @@ var ReferenceManager = class {
 	processClosestMatch(location, closestName, closestLocation, closestDistance) {
 		if (!closestName || closestLocation === null) return null;
 		let result = closestName;
-		if (this.structTable.get(closestLocation) === BlockReaderConstants.WIDE_STRING_TYPE) {
+		if (this.tryGetStruct(closestLocation).chunkType === BlockReaderConstants.WIDE_STRING_TYPE) {
 			this.markerTable.set(closestLocation, closestDistance);
 			this.markerTable.set(location, closestDistance);
 			result += BlockReaderConstants.MARKER_FORMAT;
@@ -2109,7 +2136,7 @@ var StackOperations = class {
 				break;
 			case "RTL":
 			case "RTS":
-				this._blockReader._referenceManager.tryAddStruct(this._blockReader._romDataReader.position, "Code");
+				this._blockReader._referenceManager.tryAddStruct(this._blockReader._romDataReader.position, "~Code");
 				break;
 		}
 	}
@@ -2366,7 +2393,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._referenceManager.tryAddStruct(relative, "~Branch");
 		this._blockReader.updateRegisterState(relative, reg);
 		operands.push(new LocationWrapper(relative, isLong ? AddressType.WRelative : AddressType.Relative));
 	}
@@ -2397,7 +2424,7 @@ var AddressingModeHandler = class {
 			if (isJump) {
 				const type = isIndexedIndirect ? "&Code" : "Code";
 				const name = this._blockReader.noteType(wrapper.location, type, isPush, registers);
-				if (mnemonic === "JMP") this._blockReader._referenceManager.tryAddStruct(this._dataReader.position, "Code");
+				if (mnemonic === "JMP") this._blockReader._referenceManager.tryAddStruct(this._dataReader.position, "~Code");
 				if (isPush) {
 					operands.push(`&${name}-1`);
 					return;
@@ -3148,27 +3175,33 @@ var TypeParser = class {
 		this._stringReader = blockReader._stringReader;
 		this._stringTypes = blockReader._root.stringTypes;
 	}
-	parseType(typeName, reg, depth, bank) {
-		if (typeName[0] === "&") return this.parseLocation(this._romDataReader.readUShort(), bank, typeName.substring(1), AddressType.Offset);
-		if (typeName[0] === "@") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), typeName.substring(1), AddressType.Address);
-		if (typeName[0] === "%") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), typeName.substring(1), AddressType.Location);
-		const isFixed = typeName[typeName.length - 1] === ")";
-		let fixedTypeName = typeName;
-		let fixedSize = 0;
-		if (isFixed) {
-			const startIx = typeName.indexOf("(");
-			fixedTypeName = typeName.substring(0, startIx);
-			fixedSize = parseInt(typeName.substring(startIx + 1, typeName.length - 1), 10);
+	parseType(typeName, reg, depth, bank, single) {
+		const objects = [];
+		const arrayIx = typeName.indexOf("[");
+		const arrayCount = arrayIx !== -1 ? parseInt(typeName.substring(arrayIx + 1, typeName.length - 1), 16) : 0;
+		const arrayTypeName = arrayIx !== -1 ? typeName.substring(0, arrayIx) : typeName;
+		if (arrayCount > 0) {
+			for (let i = 0; i < arrayCount; i++) objects.push(this.parseType(arrayTypeName, reg, depth + 1, bank, true));
+			return objects;
 		}
+		const isSoft = arrayTypeName[0] === "~";
+		const realTypeName = isSoft ? arrayTypeName.substring(1) : arrayTypeName;
+		const fixedIx = realTypeName.indexOf("(");
+		const fixedSize = fixedIx !== -1 ? parseInt(realTypeName.substring(fixedIx + 1, realTypeName.length - 1), 16) : 0;
+		const fixedTypeName = fixedIx !== -1 ? realTypeName.substring(0, fixedIx) : realTypeName;
 		const stringType = this._stringTypes[fixedTypeName];
 		if (stringType) return this._stringReader.parseString(stringType, fixedSize);
+		if (fixedTypeName[0] === "&") return this.parseLocation(this._romDataReader.readUShort(), bank, fixedTypeName.substring(1), AddressType.Offset, isSoft);
+		if (fixedTypeName[0] === "@") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), fixedTypeName.substring(1), AddressType.Address, isSoft);
+		if (fixedTypeName[0] === "%") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), fixedTypeName.substring(1), AddressType.Location, isSoft);
+		if (fixedTypeName[0] === "!") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), fixedTypeName.substring(1), AddressType.OddLocation, isSoft);
 		const mType = this.tryParseMemberType(fixedTypeName);
 		if (mType !== null) switch (mType) {
 			case MemberType.Byte: return new Byte(this._romDataReader.readByte());
 			case MemberType.Word: return new Word(this.parseWordSafe());
-			case MemberType.Offset: return this.parseLocation(this._romDataReader.readUShort(), bank, null, AddressType.Offset);
-			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.Offset: return this.parseLocation(this._romDataReader.readUShort(), bank, null, AddressType.Offset, isSoft);
+			case MemberType.Address: return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), null, AddressType.Address, isSoft);
+			case MemberType.Location: return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), null, AddressType.Location, isSoft);
 			case MemberType.Binary: return this.parseBinary(fixedSize);
 			case MemberType.Code:
 			case MemberType.Branch: return this.parseCode(reg);
@@ -3179,8 +3212,8 @@ var TypeParser = class {
 		const delimiter = parentType.delimiter;
 		const discOffset = parentType.discriminator;
 		const discLogic = parentType.discriminatorLogic;
+		const discSize = parentType.discriminatorSize ?? 1;
 		const nullValue = parentType.null;
-		const objects = [];
 		if (delimiter === void 0 && this._blockReader.delimiterReached(nullValue)) {
 			objects.push({
 				name: parentType.name,
@@ -3199,12 +3232,17 @@ var TypeParser = class {
 			else {
 				if (discOffset !== void 0) {
 					const discPosition = this._romDataReader.position + discOffset;
-					const desc = this._romDataReader.romData[discPosition];
-					targetType = Object.values(this._blockReader._root.structs).find((x) => x.parent === fixedTypeName && (discLogic === "&" ? ((x.discriminator ?? 0) & desc) !== 0 : x.discriminator === desc)) || parentType;
-					if (discOffset === 0 && parentType != targetType && discLogic === "=") this._romDataReader.position++;
+					const disc = this._romDataReader.romData[discPosition];
+					const disc16 = this._romDataReader.romData[discPosition + 1] << 8 | disc;
+					const matchedStruct = Object.values(this._blockReader._root.structs).find((x) => x.parent === fixedTypeName && (discLogic === "&" ? ((x.discriminator ?? 0) & disc) !== 0 : (x.discriminator ?? 0) >= 256 ? x.discriminator === disc16 : x.discriminator === disc));
+					targetType = matchedStruct || parentType;
+					if (discOffset === 0 && parentType != targetType && discLogic === "=") {
+						this._romDataReader.position++;
+						if (discSize > 1 || (matchedStruct?.discriminator ?? 0) >= 256) this._romDataReader.position++;
+					}
 				}
 				const types = targetType.types;
-				if (types && types.length > 0) {
+				if (types) {
 					const memberCount = types.length;
 					const prevPosition = this._romDataReader.position;
 					const parts = new Array(memberCount);
@@ -3213,7 +3251,10 @@ var TypeParser = class {
 						parts
 					};
 					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++;
+					if (discOffset !== void 0 && discOffset === this._romDataReader.position - prevPosition && types?.length > 0) {
+						this._romDataReader.position++;
+						if (discSize > 1) this._romDataReader.position++;
+					}
 					objects.push(def);
 				} else this._romDataReader.position++;
 			}
@@ -3227,9 +3268,11 @@ var TypeParser = class {
 			}
 			if (!this._blockReader.partCanContinue()) break;
 			if (nullValue !== void 0) break;
+			if (single) break;
 		}
 		if (delReached && depth === 0) this._referenceManager.tryAddStruct(this._romDataReader.position, typeName);
-		return objects;
+		if (single) return objects[0];
+		else return objects;
 	}
 	tryParseMemberType(memberTypeName) {
 		const upperName = memberTypeName.toUpperCase();
@@ -3250,22 +3293,41 @@ var TypeParser = class {
 		for (let i = 0; i < len; i++) outBuffer[i] = this._romDataReader.romData[startPosition + i];
 		return outBuffer;
 	}
-	parseLocation(offset, bank, typeName, addrType) {
-		if ((bank === void 0 || bank === null) && offset === 0) return new Word(offset);
-		offset -= this._romDataReader.offset;
+	parseLocation(offset, bank, typeName, addrType, isSoft = false) {
+		if ((bank === void 0 || bank === null) && (offset === 0 || offset === 65535)) return new Word(offset);
+		const hasOffset = this._romDataReader.offset !== void 0;
+		if (hasOffset) offset -= this._romDataReader.offset;
 		let adrs;
 		let loc;
-		if (addrType === AddressType.Location || this._romDataReader.offset) loc = offset | bank << 16;
-		else {
+		if (addrType === AddressType.Location || hasOffset) {
+			loc = offset | bank << 16;
+			if (hasOffset && !this._blockReader._currentChunk.isFile) loc += this._blockReader._currentChunk.location;
+		} else {
+			if (addrType === AddressType.OddLocation) {
+				const bankFlag = this._blockReader._root.config.cpuMode === CpuMode.Fast ? 128 : 0;
+				const bankReal = this._romDataReader.position >> 16;
+				const isVeryOdd = !this._blockReader._root.config.oddLocationBase || bankReal < this._blockReader._root.config.oddLocationBase;
+				const bankBase = (isVeryOdd ? 64 : 0) + bankReal | bankFlag;
+				const bankMax = this._romDataReader.romData.length >> 16 | bankFlag;
+				const bankSpan = isVeryOdd ? 0 : (64 | bankFlag) - bankMax;
+				const hiOffset = offset >> 8 & 127;
+				const hiAdjust = (hiOffset ^ (offset >> 8 | bank << 8)) << 1 | 128 | hiOffset;
+				const hiBank = (hiAdjust >> 8) + bankBase;
+				offset = (hiAdjust & 255) << 8 | offset & 255;
+				bank = hiBank;
+				if (hiBank >= bankMax) {
+					bank += bankSpan;
+					offset &= 32767;
+				}
+			}
 			adrs = new Address(bank ?? Address.resolveBank(this._romDataReader.position, this._blockReader._root.config.memoryMode), offset, this._blockReader._root.config.memoryMode);
 			if (!adrs.isROM) return adrs;
 			loc = adrs.toLocation();
 		}
-		if (typeName && (this._romDataReader.offset || !this._blockReader._root.rewrites[loc])) {
-			const oldStruct = this._referenceManager.structTable.get(loc);
-			if (!oldStruct || oldStruct === "Branch") this._referenceManager.structTable.set(loc, typeName);
+		if (typeName && (hasOffset || !this._blockReader._root.rewrites[loc])) {
+			this._referenceManager.tryAddStruct(loc, isSoft ? "~" + typeName : typeName);
 			const referenceName = `${typeName.toLowerCase()}_${loc.toString(16).toUpperCase().padStart(6, "0")}`;
-			this._referenceManager.tryAddName(loc, referenceName);
+			this._referenceManager.tryAddName(loc, isSoft ? "~" + referenceName : referenceName);
 		}
 		return new LocationWrapper(loc, addrType);
 	}
@@ -3275,8 +3337,8 @@ var TypeParser = class {
 		while (this._romDataReader.position < this._blockReader._partEnd) {
 			if (first) first = false;
 			else {
-				const struct = this._referenceManager.structTable.get(this._romDataReader.position);
-				if (struct && struct !== "Branch") break;
+				const struct = this._referenceManager.tryGetStruct(this._romDataReader.position);
+				if (struct.found && struct.chunkType !== "Branch") break;
 			}
 			if (reg) this._blockReader.hydrateRegisters(reg);
 			const op = this._blockReader._asmReader.parseAsm(reg);
@@ -3516,13 +3578,13 @@ var BlockReader = class {
 	* Notes a type at a location and manages chunk references
 	*/
 	noteType(loc, type, silent = false, reg) {
-		const oldStruct = this._referenceManager.structTable.get(loc);
-		if (!oldStruct || oldStruct === "Branch") this._referenceManager.structTable.set(loc, type);
+		const isSoft = type[0] === "~";
+		this._referenceManager.tryAddStruct(loc, type);
 		const nameResult = this._referenceManager.tryGetName(loc);
 		let name;
 		if (!nameResult.found) {
 			name = this._referenceManager.createTypeName(type, loc);
-			this._referenceManager.tryAddName(loc, name);
+			this._referenceManager.tryAddName(loc, isSoft ? "~" + name : name);
 		} else name = nameResult.referenceName;
 		if (!silent && type === BlockReaderConstants.CODE_TYPE && reg) this.updateRegisterState(loc, reg);
 		return name;
@@ -3624,7 +3686,7 @@ var BlockReader = class {
 	*/
 	processNewEntry(current, reg, bank, last) {
 		let res = this._typeParser.parseType(current, reg, 0, bank);
-		if (BlockReaderConstants.POINTER_CHARACTERS.includes(current[0]) && !Array.isArray(res)) res = [res];
+		if (current.indexOf("[") !== -1 || BlockReaderConstants.POINTER_CHARACTERS.includes(current[0]) && !Array.isArray(res)) res = [res];
 		last.object = res;
 	}
 	/**
@@ -3713,6 +3775,7 @@ var BlockReader = class {
 			if (!chunkFile.type.isBlock) continue;
 			chunkFile.referenceManager = this._referenceManager;
 			this._currentChunk = chunkFile;
+			this._romDataReader.offset = chunkFile.base;
 			for (const asmBlock of chunkFile.parts || []) {
 				this._currentAsmBlock = asmBlock;
 				this.processPart(asmBlock);
@@ -3728,7 +3791,7 @@ var BlockReader = class {
 			chunkFile.parts = [asmBlock];
 			this._currentAsmBlock = asmBlock;
 			this._referenceManager = chunkFile.referenceManager = new ReferenceManager(this._root);
-			this._romDataReader = new RomDataReader(chunkFile.rawData, chunkFile.base ?? 0);
+			this._romDataReader = new RomDataReader(chunkFile.rawData, chunkFile.base);
 			this._typeParser = new TypeParser(this);
 			this.processPart(asmBlock);
 		}
@@ -4597,7 +4660,7 @@ var RomWriter = class RomWriter {
 			}
 		} else if (file.parts && file.parts.length > 0) {
 			if (file.parts[0].location !== file.location && (file.location || 0) !== 0) throw new Error("Assembly was not based properly");
-			RomWriter.parseAssembly(this.root, file.parts, fileLookup, file.includeLookup, this.outBuffer, void 0);
+			RomWriter.parseAssembly(this.root, file.parts, fileLookup, file.includeLookup, this.outBuffer, file.base);
 		}
 		return pos - start;
 	}
@@ -4612,6 +4675,7 @@ var RomWriter = class RomWriter {
 	static parseAssembly(root, blocks, fileLookup, includeLookup, outBuffer, addrOffset) {
 		if (!blocks) throw new Error("Assembly has not been parsed");
 		let bix = 0;
+		const rootLoc = blocks[0].location;
 		for (const block of blocks) {
 			let position = block.location;
 			const objList = block.objList;
@@ -4699,8 +4763,10 @@ var RomWriter = class RomWriter {
 							break;
 						} else markerOffset += RomProcessingConstants.getSize(part);
 					}
-					if (addrOffset !== void 0) loc += addrOffset;
-					else if (!isRelative && type !== AddressType.Location) loc = Address.fromLocation(loc, root.config.memoryMode, root.config.cpuMode).toInt();
+					if (addrOffset !== void 0) {
+						loc += addrOffset;
+						if (fileLookup?.size) loc -= rootLoc;
+					} else if (!isRelative && type !== AddressType.Location) loc = Address.fromLocation(loc, root.config.memoryMode, root.config.cpuMode).toInt();
 					switch (type) {
 						case AddressType.Offset:
 						case AddressType.WRelative:
@@ -4815,7 +4881,7 @@ var RomProcessor = class RomProcessor {
 				for (const b of file.parts) if (b.label) file.includeLookup.set(b.label.toUpperCase(), b);
 				file.rawData = void 0;
 				file.rawData = new Uint8Array(ChunkFileUtils.calculateSize(file));
-				RomWriter.parseAssembly(this.writer.root, file.parts, dummyMap, file.includeLookup, file.rawData, file.type.base ?? 0);
+				RomWriter.parseAssembly(this.writer.root, file.parts, dummyMap, file.includeLookup, file.rawData, file.type.base);
 			}
 		}
 		for (const file of allFiles) if (file.compressed === true && canCompress) if (this.writer.root.config.uncompress) file.compressed = false;
@@ -5566,6 +5632,7 @@ var DbBlock = class {
 	transforms;
 	postProcess;
 	order;
+	base;
 	constructor(data) {
 		this.name = data.name ?? "";
 		this.movable = data.movable ?? false;
@@ -5577,6 +5644,7 @@ var DbBlock = class {
 		this.transforms = data.transforms ?? [];
 		this.postProcess = data.postProcess ?? void 0;
 		this.order = data.order ?? void 0;
+		this.base = data.base ?? void 0;
 		if (!this.name) throw new Error("Name is required");
 	}
 };
@@ -5648,6 +5716,7 @@ var DbStruct = class {
 	delimiter;
 	discriminator;
 	discriminatorLogic;
+	discriminatorSize;
 	null;
 	constructor(data) {
 		this.name = data.name ?? "";
@@ -5656,6 +5725,7 @@ var DbStruct = class {
 		this.delimiter = data.delimiter ?? void 0;
 		this.discriminator = data.discriminator ?? void 0;
 		this.discriminatorLogic = data.discriminatorLogic ?? (this.discriminator !== void 0 ? "=" : void 0);
+		this.discriminatorSize = data.discriminatorSize ?? void 0;
 		this.null = data.null ?? void 0;
 		if (!this.name) throw new Error("Name is required");
 	}