@etothepii/satisfactory-file-parser 3.3.0 → 4.0.0

package/build/parser/satisfactory/save/toc-blob.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TOCBlob = void 0;
+const parser_error_1 = require("../../error/parser.error");
+const SaveComponent_1 = require("../types/objects/SaveComponent");
+const SaveEntity_1 = require("../types/objects/SaveEntity");
+const level_to_destroyed_actors_map_1 = require("./level-to-destroyed-actors-map");
+const object_references_list_1 = require("./object-references-list");
+const save_custom_version_1 = require("./save-custom-version");
+var TOCBlob;
+(function (TOCBlob) {
+    function SkipOver(reader) {
+        const tocBlobBinaryLength = reader.readInt32();
+        if (reader.context.saveVersion.header >= save_custom_version_1.SaveCustomVersion.UnrealEngine5) {
+            reader.readInt32Zero();
+        }
+        const posBeforeTOCBlob = reader.getBufferPosition();
+        reader.skipBytes(tocBlobBinaryLength);
+        return {
+            position: posBeforeTOCBlob,
+            length: tocBlobBinaryLength
+        };
+    }
+    TOCBlob.SkipOver = SkipOver;
+    function Read(reader, objectsList) {
+        let countObjectHeaders = reader.readInt32();
+        const batchSize = 10000;
+        let readObjectHeadersCount = 0;
+        while (readObjectHeadersCount < countObjectHeaders) {
+            objectsList.push(...ReadNObjectHeaders(reader, Math.min(batchSize, countObjectHeaders - readObjectHeadersCount)));
+            readObjectHeadersCount += Math.min(batchSize, countObjectHeaders - readObjectHeadersCount);
+        }
+    }
+    TOCBlob.Read = Read;
+    function ReadNObjectHeaders(reader, count) {
+        let objects = [];
+        let objectsRead = 0;
+        for (; objectsRead < count; objectsRead++) {
+            let obj;
+            let objectType = reader.readInt32();
+            switch (objectType) {
+                case SaveEntity_1.SaveEntity.TypeID:
+                    obj = new SaveEntity_1.SaveEntity('', '', '', '');
+                    SaveEntity_1.SaveEntity.ParseHeader(reader, obj);
+                    break;
+                case SaveComponent_1.SaveComponent.TypeID:
+                    obj = new SaveComponent_1.SaveComponent('', '', '', '');
+                    SaveComponent_1.SaveComponent.ParseHeader(reader, obj);
+                    break;
+                default:
+                    throw new parser_error_1.CorruptSaveError('Unknown object type' + objectType);
+            }
+            objects.push(obj);
+        }
+        return objects;
+    }
+    TOCBlob.ReadNObjectHeaders = ReadNObjectHeaders;
+    function Write(writer, level, isPersistentLevel) {
+        const lenIndicatorTOCBlob = writer.getBufferPosition();
+        writer.writeInt32(0);
+        if (writer.context.saveVersion.header >= save_custom_version_1.SaveCustomVersion.UnrealEngine5) {
+            writer.writeInt32Zero();
+        }
+        const start = writer.getBufferPosition();
+        SerializeAllObjectHeaders(writer, level.objects);
+        if (level.writesDestroyedActorsInTOCBlob) {
+            if (isPersistentLevel) {
+                level_to_destroyed_actors_map_1.LevelToDestroyedActorsMap.write(writer, level.destroyedActorsMap ?? {});
+            }
+            else if (!isPersistentLevel) {
+                object_references_list_1.ObjectReferencesList.SerializeList(writer, level.collectables ?? []);
+            }
+        }
+        writer.writeBinarySizeFromPosition(lenIndicatorTOCBlob, start);
+    }
+    TOCBlob.Write = Write;
+    function SerializeAllObjectHeaders(writer, objects) {
+        writer.writeInt32(objects.length);
+        for (const obj of objects) {
+            switch (obj.type) {
+                case 'SaveEntity':
+                    writer.writeInt32(SaveEntity_1.SaveEntity.TypeID);
+                    SaveEntity_1.SaveEntity.SerializeHeader(writer, obj);
+                    break;
+                case 'SaveComponent':
+                    writer.writeInt32(SaveComponent_1.SaveComponent.TypeID);
+                    SaveComponent_1.SaveComponent.SerializeHeader(writer, obj);
+                    break;
+                default:
+                    throw new parser_error_1.UnimplementedError(`Unknown object type ${obj.type}. Not implemented.`);
+                    break;
+            }
+        }
+    }
+    TOCBlob.SerializeAllObjectHeaders = SerializeAllObjectHeaders;
+})(TOCBlob || (exports.TOCBlob = TOCBlob = {}));
+//# sourceMappingURL=toc-blob.js.map

package/build/parser/satisfactory/save/toc-blob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toc-blob.js","sourceRoot":"","sources":["../../../../src/parser/satisfactory/save/toc-blob.ts"],"names":[],"mappings":"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","sourcesContent":["import { ContextReader } from \"../../context/context-reader\";\nimport { ContextWriter } from \"../../context/context-writer\";\nimport { CorruptSaveError, UnimplementedError } from \"../../error/parser.error\";\nimport { SaveComponent } from \"../types/objects/SaveComponent\";\nimport { SaveEntity } from \"../types/objects/SaveEntity\";\nimport { Level } from \"./level\";\nimport { LevelToDestroyedActorsMap } from \"./level-to-destroyed-actors-map\";\nimport { ObjectReferencesList } from \"./object-references-list\";\nimport { SaveCustomVersion } from \"./save-custom-version\";\n\ntype BlobMarker = {\n    position: number;\n    length: number;\n}\n\n/**\n * Part of a level structure, containing object headers.\n */\nexport namespace TOCBlob {\n\n    export function SkipOver(reader: ContextReader): BlobMarker {\n        const tocBlobBinaryLength = reader.readInt32();\n        if (reader.context.saveVersion.header >= SaveCustomVersion.UnrealEngine5) {\n            reader.readInt32Zero();\n        }\n        const posBeforeTOCBlob = reader.getBufferPosition();\n        reader.skipBytes(tocBlobBinaryLength);\n\n        return {\n            position: posBeforeTOCBlob,\n            length: tocBlobBinaryLength\n        };\n    }\n\n\n    export function Read(reader: ContextReader, objectsList: (SaveEntity | SaveComponent)[]): void {\n        let countObjectHeaders = reader.readInt32();\n\n        // read in batches\n        const batchSize = 10000;\n        let readObjectHeadersCount = 0;\n        while (readObjectHeadersCount < countObjectHeaders) {\n            objectsList.push(...ReadNObjectHeaders(reader, Math.min(batchSize, countObjectHeaders - readObjectHeadersCount)));\n            readObjectHeadersCount += Math.min(batchSize, countObjectHeaders - readObjectHeadersCount);\n        }\n    }\n\n    export function ReadNObjectHeaders(reader: ContextReader, count: number): (SaveEntity | SaveComponent)[] {\n        let objects: (SaveEntity | SaveComponent)[] = [];\n        let objectsRead = 0;\n        for (; objectsRead < count; objectsRead++) {\n\n            let obj: SaveEntity | SaveComponent;\n            let objectType = reader.readInt32();\n            switch (objectType) {\n                case SaveEntity.TypeID:\n                    obj = new SaveEntity('', '', '', '');\n                    SaveEntity.ParseHeader(reader, obj);\n                    break;\n                case SaveComponent.TypeID:\n                    obj = new SaveComponent('', '', '', '');\n                    SaveComponent.ParseHeader(reader, obj);\n                    break;\n                default:\n                    throw new CorruptSaveError('Unknown object type' + objectType);\n            }\n            objects.push(obj);\n        }\n        return objects;\n    }\n\n    export function Write(writer: ContextWriter, level: Level, isPersistentLevel: boolean) {\n\n        const lenIndicatorTOCBlob = writer.getBufferPosition();\n        writer.writeInt32(0);\t// len indicator\n\n        if (writer.context.saveVersion.header >= SaveCustomVersion.UnrealEngine5) {\n            writer.writeInt32Zero();\n        }\n\n        const start = writer.getBufferPosition();\n        SerializeAllObjectHeaders(writer, level.objects);\n\n        if (level.writesDestroyedActorsInTOCBlob) {\n            if (isPersistentLevel) {\n                LevelToDestroyedActorsMap.write(writer, level.destroyedActorsMap ?? {});\n            } else if (!isPersistentLevel) {\n                ObjectReferencesList.SerializeList(writer, level.collectables ?? []);\n            }\n        }\n\n        // replace binary size from earlier for - object headers + collectables\n        writer.writeBinarySizeFromPosition(lenIndicatorTOCBlob, start);\n    }\n\n\n    export function SerializeAllObjectHeaders(writer: ContextWriter, objects: (SaveEntity | SaveComponent)[]): void {\n        writer.writeInt32(objects.length);\n        for (const obj of objects) {\n\n            switch (obj.type) {\n                case 'SaveEntity':\n                    writer.writeInt32(SaveEntity.TypeID);\n                    SaveEntity.SerializeHeader(writer, obj);\n                    break;\n                case 'SaveComponent':\n                    writer.writeInt32(SaveComponent.TypeID);\n                    SaveComponent.SerializeHeader(writer, obj);\n                    break;\n                default:\n                    throw new UnimplementedError(`Unknown object type ${(obj as unknown as any).type}. Not implemented.`);\n                    break;\n            }\n        }\n    }\n}"]}

package/build/parser/satisfactory/types/objects/SaveObject.d.ts

@@ -2,6 +2,8 @@ import { ContextReader } from '../../../context/context-reader';
 import { ContextWriter } from '../../../context/context-writer';
 import { PropertiesMap } from "../property/generic/AbstractBaseProperty";
 import { SpecialProperties } from '../property/special/SpecialProperties';
+import { FSaveObjectVersionData } from '../structs/binary/FSaveObjectVersionData';
+import { GUID } from '../structs/binary/GUID';
 export interface SaveObjectHeader {
     typePath: string;
     rootObject: string;
@@ -14,9 +16,11 @@ export declare abstract class SaveObject implements SaveObjectHeader {
     instanceName: string;
     flags?: number | undefined;
     properties: PropertiesMap;
+    guid?: GUID;
     specialProperties: SpecialProperties.AvailableSpecialPropertiesTypes;
     trailingData: number[];
     saveCustomVersion: number;
+    objectVersionData?: FSaveObjectVersionData;
     shouldMigrateObjectRefsToPersistent: boolean;
     constructor(typePath: string, rootObject: string, instanceName: string, flags?: number | undefined);
     protected static ParseHeader(reader: ContextReader, obj: SaveObject): void;

package/build/parser/satisfactory/types/objects/SaveObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SaveObject.d.ts","sourceRoot":"","sources":["../../../../../src/parser/satisfactory/types/objects/SaveObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAEzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,MAAM,WAAW,gBAAgB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,8BAAsB,UAAW,YAAW,gBAAgB;IASxC,QAAQ,EAAE,MAAM;IAAS,UAAU,EAAE,MAAM;IAAS,YAAY,EAAE,MAAM;IAAS,KAAK,CAAC,EAAE,MAAM;IAP3G,UAAU,EAAE,aAAa,CAAM;IAC/B,iBAAiB,EAAE,iBAAiB,CAAC,+BAA+B,CAAsC;IAC1G,YAAY,EAAE,MAAM,EAAE,CAAM;IAE5B,iBAAiB,EAAE,MAAM,CAAK;IAC9B,mCAAmC,EAAE,OAAO,CAAS;gBAEzC,QAAQ,EAAE,MAAM,EAAS,UAAU,EAAE,MAAM,EAAS,YAAY,EAAE,MAAM,EAAS,KAAK,CAAC,EAAE,MAAM,YAAA;IAIlH,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI;IAU1E,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI;WAUhE,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAiCzF,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI;CAM/D"}
+{"version":3,"file":"SaveObject.d.ts","sourceRoot":"","sources":["../../../../../src/parser/satisfactory/types/objects/SaveObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAEzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,8BAAsB,UAAW,YAAW,gBAAgB;IAWxC,QAAQ,EAAE,MAAM;IAAS,UAAU,EAAE,MAAM;IAAS,YAAY,EAAE,MAAM;IAAS,KAAK,CAAC,EAAE,MAAM;IAT3G,UAAU,EAAE,aAAa,CAAM;IAC/B,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,iBAAiB,EAAE,iBAAiB,CAAC,+BAA+B,CAAsC;IAC1G,YAAY,EAAE,MAAM,EAAE,CAAM;IAE5B,iBAAiB,EAAE,MAAM,CAAK;IAC9B,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;IAC3C,mCAAmC,EAAE,OAAO,CAAS;gBAEzC,QAAQ,EAAE,MAAM,EAAS,UAAU,EAAE,MAAM,EAAS,YAAY,EAAE,MAAM,EAAS,KAAK,CAAC,EAAE,MAAM,YAAA;IAIlH,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI;IAU1E,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI;WAUhE,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAuCzF,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI;CAc/D"}

package/build/parser/satisfactory/types/objects/SaveObject.js

@@ -5,6 +5,8 @@ const parser_error_1 = require("../../../error/parser.error");
 const save_custom_version_1 = require("../../save/save-custom-version");
 const PropertiesList_1 = require("../property/PropertiesList");
 const SpecialProperties_1 = require("../property/special/SpecialProperties");
+const FPropertyTag_1 = require("../structs/binary/FPropertyTag");
+const GUID_1 = require("../structs/binary/GUID");
 class SaveObject {
     constructor(typePath, rootObject, instanceName, flags) {
         this.typePath = typePath;
@@ -21,7 +23,7 @@ class SaveObject {
         obj.typePath = reader.readString();
         obj.rootObject = reader.readString();
         obj.instanceName = reader.readString();
-        if (reader.context.saveVersion >= save_custom_version_1.SaveCustomVersion.SerializeObjectFlags) {
+        if (reader.context.saveVersion.level >= save_custom_version_1.SaveCustomVersion.SerializeObjectFlags) {
             obj.flags = reader.readUint32();
         }
     }
@@ -29,16 +31,22 @@ class SaveObject {
         writer.writeString(obj.typePath);
         writer.writeString(obj.rootObject);
         writer.writeString(obj.instanceName);
-        if (writer.context.saveVersion >= save_custom_version_1.SaveCustomVersion.SerializeObjectFlags) {
+        if (writer.context.saveVersion.level >= save_custom_version_1.SaveCustomVersion.SerializeObjectFlags) {
             writer.writeUint32(obj.flags ?? 0);
         }
     }
     static ParseData(obj, length, reader, typePath) {
         const start = reader.getBufferPosition();
         let remainingSize = length;
+        if (FPropertyTag_1.FPropertyTag.IsCompletePropertyTagType(reader)) {
+            const serializationControl = reader.readByte();
+        }
         try {
             obj.properties = PropertiesList_1.PropertiesList.ParseList(reader);
-            reader.readInt32Zero();
+            const hasGuid = reader.readInt32() > 0;
+            if (hasGuid) {
+                obj.guid = GUID_1.GUID.read(reader);
+            }
             remainingSize = length - (reader.getBufferPosition() - start);
             obj.specialProperties = SpecialProperties_1.SpecialProperties.ParseClassSpecificSpecialProperties(reader, typePath, remainingSize);
         }
@@ -47,7 +55,6 @@ class SaveObject {
                 throw error;
             }
             else {
-                console.warn(error);
                 console.warn(`data of object ${obj.instanceName} could not be read fully. Trailing data will be filled with raw bytes.`);
             }
         }
@@ -67,8 +74,15 @@ class SaveObject {
         }
     }
     static SerializeData(writer, obj) {
+        if (FPropertyTag_1.FPropertyTag.IsCompletePropertyTagType(writer)) {
+            writer.writeByte(0);
+        }
         PropertiesList_1.PropertiesList.SerializeList(writer, obj.properties);
-        writer.writeInt32Zero();
+        const hasGuid = obj.guid !== undefined;
+        writer.writeInt32(hasGuid ? 1 : 0);
+        if (hasGuid) {
+            GUID_1.GUID.write(writer, obj.guid);
+        }
         SpecialProperties_1.SpecialProperties.SerializeClassSpecificSpecialProperties(writer, obj.typePath, obj.specialProperties);
         writer.writeBytesArray(obj.trailingData);
     }

package/build/parser/satisfactory/types/objects/SaveObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"SaveObject.js","sourceRoot":"","sources":["../../../../../src/parser/satisfactory/types/objects/SaveObject.ts"],"names":[],"mappings":";;;AAEA,8DAA0D;AAC1D,wEAAmE;AAEnE,+DAA4D;AAC5D,6EAA0E;AAS1E,MAAsB,UAAU;IAS/B,YAAmB,QAAgB,EAAS,UAAkB,EAAS,YAAoB,EAAS,KAAc;QAA/F,aAAQ,GAAR,QAAQ,CAAQ;QAAS,eAAU,GAAV,UAAU,CAAQ;QAAS,iBAAY,GAAZ,YAAY,CAAQ;QAAS,UAAK,GAAL,KAAK,CAAS;QAP3G,eAAU,GAAkB,EAAE,CAAC;QAC/B,sBAAiB,GAAsD,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;QAC1G,iBAAY,GAAa,EAAE,CAAC;QAE5B,sBAAiB,GAAW,CAAC,CAAC;QAC9B,wCAAmC,GAAY,KAAK,CAAC;IAI5D,CAAC;IAES,MAAM,CAAC,WAAW,CAAC,MAAqB,EAAE,GAAe;QAClE,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACnC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACrC,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAEvC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,IAAI,uCAAiB,CAAC,oBAAoB,EAAE,CAAC;YAC1E,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;IACF,CAAC;IAES,MAAM,CAAC,eAAe,CAAC,MAAqB,EAAE,GAAe;QACtE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAErC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,IAAI,uCAAiB,CAAC,oBAAoB,EAAE,CAAC;YAC1E,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;QACpC,CAAC;IACF,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,GAAe,EAAE,MAAc,EAAE,MAAqB,EAAE,QAAgB;QAC/F,MAAM,KAAK,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACzC,IAAI,aAAa,GAAG,MAAM,CAAC;QAE3B,IAAI,CAAC;YACJ,GAAG,CAAC,UAAU,GAAG,+BAAc,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAClD,MAAM,CAAC,aAAa,EAAE,CAAC;YAEvB,aAAa,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,KAAK,CAAC,CAAC;YAC9D,GAAG,CAAC,iBAAiB,GAAG,qCAAiB,CAAC,mCAAmC,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QAChH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;gBAChC,MAAM,KAAK,CAAC;YACb,CAAC;iBAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,YAAY,wEAAwE,CAAC,CAAC;YAC1H,CAAC;QACF,CAAC;QAED,aAAa,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,KAAK,CAAC,CAAC;QAC9D,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACvB,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;QAChE,CAAC;aAAM,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,IAAI,0BAAW,CAAC,aAAa,EAAE,6DAA6D,GAAG,CAAC,YAAY,2BAA2B,aAAa,EAAE,CAAC,CAAC;YACtK,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;gBAChC,MAAM,KAAK,CAAC;YACb,CAAC;iBAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpB,MAAM,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC;YAClC,CAAC;QACF,CAAC;IACF,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,MAAW,EAAE,GAAe;QACvD,+BAAc,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,qCAAiB,CAAC,uCAAuC,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACvG,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;CACD;AAxED,gCAwEC","sourcesContent":["import { ContextReader } from '../../../context/context-reader';\nimport { ContextWriter } from '../../../context/context-writer';\nimport { ParserError } from '../../../error/parser.error';\nimport { SaveCustomVersion } from '../../save/save-custom-version';\nimport { PropertiesMap } from \"../property/generic/AbstractBaseProperty\";\nimport { PropertiesList } from '../property/PropertiesList';\nimport { SpecialProperties } from '../property/special/SpecialProperties';\n\nexport interface SaveObjectHeader {\n\ttypePath: string;\n\trootObject: string;\n\tinstanceName: string;\n\tflags?: number;\n}\n\nexport abstract class SaveObject implements SaveObjectHeader {\n\n\tpublic properties: PropertiesMap = {};\n\tpublic specialProperties: SpecialProperties.AvailableSpecialPropertiesTypes = { type: 'EmptySpecialProperties' };\n\tpublic trailingData: number[] = [];\n\n\tpublic saveCustomVersion: number = 0;\n\tpublic shouldMigrateObjectRefsToPersistent: boolean = false;\n\n\tconstructor(public typePath: string, public rootObject: string, public instanceName: string, public flags?: number) {\n\n\t}\n\n\tprotected static ParseHeader(reader: ContextReader, obj: SaveObject): void {\n\t\tobj.typePath = reader.readString();\n\t\tobj.rootObject = reader.readString();\n\t\tobj.instanceName = reader.readString();\n\n\t\tif (reader.context.saveVersion >= SaveCustomVersion.SerializeObjectFlags) {\n\t\t\tobj.flags = reader.readUint32();\n\t\t}\n\t}\n\n\tprotected static SerializeHeader(writer: ContextWriter, obj: SaveObject): void {\n\t\twriter.writeString(obj.typePath);\n\t\twriter.writeString(obj.rootObject);\n\t\twriter.writeString(obj.instanceName);\n\n\t\tif (writer.context.saveVersion >= SaveCustomVersion.SerializeObjectFlags) {\n\t\t\twriter.writeUint32(obj.flags ?? 0);\n\t\t}\n\t}\n\n\tpublic static ParseData(obj: SaveObject, length: number, reader: ContextReader, typePath: string): void {\n\t\tconst start = reader.getBufferPosition();\n\t\tlet remainingSize = length;\n\n\t\ttry {\n\t\t\tobj.properties = PropertiesList.ParseList(reader);\n\t\t\treader.readInt32Zero();\n\n\t\t\tremainingSize = length - (reader.getBufferPosition() - start);\n\t\t\tobj.specialProperties = SpecialProperties.ParseClassSpecificSpecialProperties(reader, typePath, remainingSize);\n\t\t} catch (error) {\n\t\t\tif (reader.context.throwErrors) {\n\t\t\t\tthrow error;\n\t\t\t} else {\n\t\t\t\tconsole.warn(error);\n\t\t\t\tconsole.warn(`data of object ${obj.instanceName} could not be read fully. Trailing data will be filled with raw bytes.`);\n\t\t\t}\n\t\t}\n\n\t\tremainingSize = length - (reader.getBufferPosition() - start);\n\t\tif (remainingSize > 0) {\n\t\t\tobj.trailingData = Array.from(reader.readBytes(remainingSize));\n\t\t} else if (remainingSize < 0) {\n\t\t\tconst error = new ParserError('ParserError', `Unexpected. Read more bytes than are indicated for entity ${obj.instanceName}. bytes left to read is ${remainingSize}`);\n\t\t\tif (reader.context.throwErrors) {\n\t\t\t\tthrow error;\n\t\t\t} else {\n\t\t\t\tconsole.warn(error);\n\t\t\t\treader.skipBytes(-remainingSize);\n\t\t\t}\n\t\t}\n\t}\n\n\tpublic static SerializeData(writer: any, obj: SaveObject): void {\n\t\tPropertiesList.SerializeList(writer, obj.properties);\n\t\twriter.writeInt32Zero();\n\t\tSpecialProperties.SerializeClassSpecificSpecialProperties(writer, obj.typePath, obj.specialProperties);\n\t\twriter.writeBytesArray(obj.trailingData);\n\t}\n}\n"]}
+{"version":3,"file":"SaveObject.js","sourceRoot":"","sources":["../../../../../src/parser/satisfactory/types/objects/SaveObject.ts"],"names":[],"mappings":"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","sourcesContent":["import { ContextReader } from '../../../context/context-reader';\nimport { ContextWriter } from '../../../context/context-writer';\nimport { ParserError } from '../../../error/parser.error';\nimport { SaveCustomVersion } from '../../save/save-custom-version';\nimport { PropertiesMap } from \"../property/generic/AbstractBaseProperty\";\nimport { PropertiesList } from '../property/PropertiesList';\nimport { SpecialProperties } from '../property/special/SpecialProperties';\nimport { FPropertyTag } from '../structs/binary/FPropertyTag';\nimport { FSaveObjectVersionData } from '../structs/binary/FSaveObjectVersionData';\nimport { GUID } from '../structs/binary/GUID';\n\nexport interface SaveObjectHeader {\n\ttypePath: string;\n\trootObject: string;\n\tinstanceName: string;\n\tflags?: number;\n}\n\nexport abstract class SaveObject implements SaveObjectHeader {\n\n\tpublic properties: PropertiesMap = {};\n\tpublic guid?: GUID;\n\tpublic specialProperties: SpecialProperties.AvailableSpecialPropertiesTypes = { type: 'EmptySpecialProperties' };\n\tpublic trailingData: number[] = [];\n\n\tpublic saveCustomVersion: number = 0;\n\tpublic objectVersionData?: FSaveObjectVersionData;\n\tpublic shouldMigrateObjectRefsToPersistent: boolean = false;\n\n\tconstructor(public typePath: string, public rootObject: string, public instanceName: string, public flags?: number) {\n\n\t}\n\n\tprotected static ParseHeader(reader: ContextReader, obj: SaveObject): void {\n\t\tobj.typePath = reader.readString();\n\t\tobj.rootObject = reader.readString();\n\t\tobj.instanceName = reader.readString();\n\n\t\tif (reader.context.saveVersion.level >= SaveCustomVersion.SerializeObjectFlags) {\n\t\t\tobj.flags = reader.readUint32();\n\t\t}\n\t}\n\n\tprotected static SerializeHeader(writer: ContextWriter, obj: SaveObject): void {\n\t\twriter.writeString(obj.typePath);\n\t\twriter.writeString(obj.rootObject);\n\t\twriter.writeString(obj.instanceName);\n\n\t\tif (writer.context.saveVersion.level >= SaveCustomVersion.SerializeObjectFlags) {\n\t\t\twriter.writeUint32(obj.flags ?? 0);\n\t\t}\n\t}\n\n\tpublic static ParseData(obj: SaveObject, length: number, reader: ContextReader, typePath: string): void {\n\t\tconst start = reader.getBufferPosition();\n\t\tlet remainingSize = length;\n\n\t\tif (FPropertyTag.IsCompletePropertyTagType(reader)) {\n\t\t\tconst serializationControl = reader.readByte();\n\t\t}\n\n\t\ttry {\n\t\t\tobj.properties = PropertiesList.ParseList(reader);\n\t\t\tconst hasGuid = reader.readInt32() > 0;\n\t\t\tif (hasGuid) {\n\t\t\t\tobj.guid = GUID.read(reader);\n\t\t\t}\n\n\t\t\tremainingSize = length - (reader.getBufferPosition() - start);\n\t\t\tobj.specialProperties = SpecialProperties.ParseClassSpecificSpecialProperties(reader, typePath, remainingSize);\n\t\t} catch (error) {\n\t\t\tif (reader.context.throwErrors) {\n\t\t\t\tthrow error;\n\t\t\t} else {\n\t\t\t\tconsole.warn(`data of object ${obj.instanceName} could not be read fully. Trailing data will be filled with raw bytes.`);\n\t\t\t}\n\t\t}\n\n\t\tremainingSize = length - (reader.getBufferPosition() - start);\n\t\tif (remainingSize > 0) {\n\t\t\tobj.trailingData = Array.from(reader.readBytes(remainingSize));\n\t\t} else if (remainingSize < 0) {\n\t\t\tconst error = new ParserError('ParserError', `Unexpected. Read more bytes than are indicated for entity ${obj.instanceName}. bytes left to read is ${remainingSize}`);\n\t\t\tif (reader.context.throwErrors) {\n\t\t\t\tthrow error;\n\t\t\t} else {\n\t\t\t\tconsole.warn(error);\n\t\t\t\treader.skipBytes(-remainingSize);\n\t\t\t}\n\t\t}\n\t}\n\n\tpublic static SerializeData(writer: any, obj: SaveObject): void {\n\t\tif (FPropertyTag.IsCompletePropertyTagType(writer)) {\n\t\t\twriter.writeByte(0);\t// serializationControl\n\t\t}\n\n\t\tPropertiesList.SerializeList(writer, obj.properties);\n\t\tconst hasGuid = obj.guid !== undefined;\n\t\twriter.writeInt32(hasGuid ? 1 : 0);\n\t\tif (hasGuid) {\n\t\t\tGUID.write(writer, obj.guid!);\n\t\t}\n\t\tSpecialProperties.SerializeClassSpecificSpecialProperties(writer, obj.typePath, obj.specialProperties);\n\t\twriter.writeBytesArray(obj.trailingData);\n\t}\n}\n"]}

package/build/parser/satisfactory/types/property/PropertiesList.d.ts

@@ -2,9 +2,9 @@ import { ContextReader } from '../../../context/context-reader';
 import { ContextWriter } from '../../../context/context-writer';
 import { AbstractBaseProperty, PropertiesMap } from './generic/AbstractBaseProperty';
 export declare namespace PropertiesList {
-    const ParseList: (reader: ContextReader) => PropertiesMap;
-    const SerializeList: (writer: ContextWriter, properties: PropertiesMap) => void;
-    const ParseSingleProperty: (reader: ContextReader, propertyName: string) => AbstractBaseProperty;
-    const SerializeSingleProperty: (writer: ContextWriter, property: AbstractBaseProperty) => void;
+    function ParseList(reader: ContextReader): PropertiesMap;
+    function SerializeList(writer: ContextWriter, properties: PropertiesMap): void;
+    function ParseSingleProperty(reader: ContextReader): AbstractBaseProperty | null;
+    function SerializeSingleProperty(writer: ContextWriter, property: AbstractBaseProperty): void;
 }
 //# sourceMappingURL=PropertiesList.d.ts.map

package/build/parser/satisfactory/types/property/PropertiesList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PropertiesList.d.ts","sourceRoot":"","sources":["../../../../../src/parser/satisfactory/types/property/PropertiesList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAsBrF,yBAAiB,cAAc,CAAC;IAExB,MAAM,SAAS,WAAY,aAAa,KAAG,aAsBjD,CAAA;IAEM,MAAM,aAAa,WAAY,aAAa,cAAc,aAAa,KAAG,IAMhF,CAAA;IAEM,MAAM,mBAAmB,WAAY,aAAa,gBAAgB,MAAM,KAAG,oBAmJjF,CAAA;IAEM,MAAM,uBAAuB,WAAY,aAAa,YAAY,oBAAoB,KAAG,IA6H/F,CAAA;CACD"}
+{"version":3,"file":"PropertiesList.d.ts","sourceRoot":"","sources":["../../../../../src/parser/satisfactory/types/property/PropertiesList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAyBrF,yBAAiB,cAAc,CAAC;IAE/B,SAAgB,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAoB9D;IAED,SAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa,GAAG,IAAI,CAKpF;IAED,SAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,oBAAoB,GAAG,IAAI,CA4HtF;IAED,SAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAmGnG;CACD"}

package/build/parser/satisfactory/types/property/PropertiesList.js

@@ -2,156 +2,138 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropertiesList = void 0;
 const parser_error_1 = require("../../../error/parser.error");
-const ArrayProperty_1 = require("./generic/ArrayProperty/ArrayProperty");
+const FPropertyTag_1 = require("../structs/binary/FPropertyTag");
+const AbstractBaseProperty_1 = require("./generic/AbstractBaseProperty");
 const BoolProperty_1 = require("./generic/BoolProperty");
 const ByteProperty_1 = require("./generic/ByteProperty");
+const ArrayProperty_1 = require("./generic/containers/ArrayProperty");
+const MapProperty_1 = require("./generic/containers/MapProperty");
+const SetProperty_1 = require("./generic/containers/SetProperty");
+const StructProperty_1 = require("./generic/containers/StructProperty");
 const DoubleProperty_1 = require("./generic/DoubleProperty");
 const EnumProperty_1 = require("./generic/EnumProperty");
 const FloatProperty_1 = require("./generic/FloatProperty");
-const Int32Property_1 = require("./generic/Int32Property");
 const Int64Property_1 = require("./generic/Int64Property");
 const Int8Property_1 = require("./generic/Int8Property");
-const MapProperty_1 = require("./generic/MapProperty");
+const InterfaceProperty_1 = require("./generic/InterfaceProperty");
+const IntProperty_1 = require("./generic/IntProperty");
+const NameProperty_1 = require("./generic/NameProperty");
 const ObjectProperty_1 = require("./generic/ObjectProperty");
-const SetProperty_1 = require("./generic/SetProperty/SetProperty");
+const SingleProperty_1 = require("./generic/SingleProperty");
 const SoftObjectProperty_1 = require("./generic/SoftObjectProperty");
 const StrProperty_1 = require("./generic/StrProperty");
-const StructProperty_1 = require("./generic/StructProperty");
 const TextProperty_1 = require("./generic/TextProperty");
 const Uint32Property_1 = require("./generic/Uint32Property");
 const Uint64Property_1 = require("./generic/Uint64Property");
 const Uint8Property_1 = require("./generic/Uint8Property");
 var PropertiesList;
 (function (PropertiesList) {
-    PropertiesList.ParseList = (reader) => {
+    function ParseList(reader) {
         const properties = {};
-        let propertyName = reader.readString();
-        while (propertyName !== 'None') {
-            const parsedProperty = PropertiesList.ParseSingleProperty(reader, propertyName);
-            if (properties[propertyName]) {
-                if (!Array.isArray(properties[propertyName])) {
-                    properties[propertyName] = [properties[propertyName]];
+        let parsedProperty = PropertiesList.ParseSingleProperty(reader);
+        while (parsedProperty !== null) {
+            if (properties[parsedProperty.name]) {
+                if (!Array.isArray(properties[parsedProperty.name])) {
+                    properties[parsedProperty.name] = [properties[parsedProperty.name]];
                 }
-                properties[propertyName].push(parsedProperty);
+                properties[parsedProperty.name].push(parsedProperty);
             }
             else {
-                properties[propertyName] = parsedProperty;
+                properties[parsedProperty.name] = parsedProperty;
             }
-            propertyName = reader.readString();
+            parsedProperty = PropertiesList.ParseSingleProperty(reader);
         }
         return properties;
-    };
-    PropertiesList.SerializeList = (writer, properties) => {
+    }
+    PropertiesList.ParseList = ParseList;
+    function SerializeList(writer, properties) {
         for (const property of Object.values(properties).flatMap(val => Array.isArray(val) ? val : [val])) {
-            writer.writeString(property.name);
             PropertiesList.SerializeSingleProperty(writer, property);
         }
         writer.writeString('None');
-    };
-    PropertiesList.ParseSingleProperty = (reader, propertyName) => {
-        let currentProperty = {};
-        const propertyType = reader.readString();
-        const binarySize = reader.readInt32();
-        const index = reader.readInt32();
+    }
+    PropertiesList.SerializeList = SerializeList;
+    function ParseSingleProperty(reader) {
+        const tag = FPropertyTag_1.FPropertyTag.read(reader);
+        if (tag.propertyName === 'None') {
+            return null;
+        }
+        let property = AbstractBaseProperty_1.AbstractBaseProperty.CreateFromTag(tag);
         const before = reader.getBufferPosition();
-        let overhead = 0;
-        let subtype = '';
         try {
-            switch (propertyType) {
+            switch (property.propertyTagType.name) {
                 case 'BoolProperty':
-                    overhead = BoolProperty_1.BoolProperty.CalcOverhead(currentProperty);
-                    currentProperty = BoolProperty_1.BoolProperty.Parse(reader, propertyType, index);
+                    BoolProperty_1.BoolProperty.Parse(reader, property, tag);
                     break;
                 case 'ByteProperty':
-                    const type = reader.readString();
-                    overhead = ByteProperty_1.ByteProperty.CalcOverhead(currentProperty, type);
-                    currentProperty = ByteProperty_1.ByteProperty.Parse(reader, propertyType, index, type);
+                    ByteProperty_1.ByteProperty.Parse(reader, property, tag);
                     break;
                 case 'Int8Property':
-                    overhead = Int8Property_1.Int8Property.CalcOverhead(currentProperty);
-                    currentProperty = Int8Property_1.Int8Property.Parse(reader, propertyType, index);
+                    Int8Property_1.Int8Property.Parse(reader, property);
                     break;
                 case 'UInt8Property':
-                    overhead = Uint8Property_1.Uint8Property.CalcOverhead(currentProperty);
-                    currentProperty = Uint8Property_1.Uint8Property.Parse(reader, propertyType, index);
+                    Uint8Property_1.Uint8Property.Parse(reader, property);
                     break;
                 case 'IntProperty':
-                case 'Int32Property':
-                    overhead = Int32Property_1.Int32Property.CalcOverhead(currentProperty);
-                    currentProperty = Int32Property_1.Int32Property.Parse(reader, propertyType, index);
+                    IntProperty_1.IntProperty.Parse(reader, property);
                     break;
                 case 'UInt32Property':
-                    overhead = Uint32Property_1.Uint32Property.CalcOverhead(currentProperty);
-                    currentProperty = Uint32Property_1.Uint32Property.Parse(reader, propertyType, index);
+                    Uint32Property_1.Uint32Property.Parse(reader, property);
                     break;
                 case 'Int64Property':
-                    overhead = Int64Property_1.Int64Property.CalcOverhead(currentProperty);
-                    currentProperty = Int64Property_1.Int64Property.Parse(reader, propertyType, index);
+                    Int64Property_1.Int64Property.Parse(reader, property);
                     break;
                 case 'UInt64Property':
-                    overhead = Uint64Property_1.Uint64Property.CalcOverhead(currentProperty);
-                    currentProperty = Uint64Property_1.Uint64Property.Parse(reader, propertyType, index);
+                    Uint64Property_1.Uint64Property.Parse(reader, property);
                     break;
                 case 'SingleProperty':
+                    SingleProperty_1.SingleProperty.Parse(reader, property);
+                    break;
                 case 'FloatProperty':
-                    overhead = FloatProperty_1.FloatProperty.CalcOverhead(currentProperty);
-                    currentProperty = FloatProperty_1.FloatProperty.Parse(reader, propertyType, index);
+                    FloatProperty_1.FloatProperty.Parse(reader, property);
                     break;
                 case 'DoubleProperty':
-                    overhead = DoubleProperty_1.DoubleProperty.CalcOverhead(currentProperty);
-                    currentProperty = DoubleProperty_1.DoubleProperty.Parse(reader, propertyType, index);
+                    DoubleProperty_1.DoubleProperty.Parse(reader, property);
                     break;
                 case 'StrProperty':
+                    StrProperty_1.StrProperty.Parse(reader, property);
+                    break;
                 case 'NameProperty':
-                    overhead = StrProperty_1.StrProperty.CalcOverhead(currentProperty);
-                    currentProperty = StrProperty_1.StrProperty.Parse(reader, propertyType, index);
+                    NameProperty_1.NameProperty.Parse(reader, property);
                     break;
                 case 'ObjectProperty':
+                    ObjectProperty_1.ObjectProperty.Parse(reader, property);
+                    break;
                 case 'InterfaceProperty':
-                    overhead = ObjectProperty_1.ObjectProperty.CalcOverhead(currentProperty);
-                    currentProperty = ObjectProperty_1.ObjectProperty.Parse(reader, propertyType, index);
+                    InterfaceProperty_1.InterfaceProperty.Parse(reader, property);
                     break;
                 case 'SoftObjectProperty':
-                    overhead = SoftObjectProperty_1.SoftObjectProperty.CalcOverhead(currentProperty);
-                    currentProperty = SoftObjectProperty_1.SoftObjectProperty.Parse(reader, propertyType, index);
+                    SoftObjectProperty_1.SoftObjectProperty.Parse(reader, property);
                     break;
                 case 'EnumProperty':
-                    const name = reader.readString();
-                    overhead = EnumProperty_1.EnumProperty.CalcOverhead(currentProperty, name);
-                    currentProperty = EnumProperty_1.EnumProperty.Parse(reader, propertyType, name, index);
+                    EnumProperty_1.EnumProperty.Parse(reader, property, tag);
                     break;
                 case 'StructProperty':
-                    subtype = reader.readString();
-                    overhead = StructProperty_1.StructProperty.CalcOverhead(currentProperty, subtype);
-                    currentProperty = StructProperty_1.StructProperty.Parse(reader, propertyType, index, binarySize, subtype);
+                    StructProperty_1.StructProperty.Parse(reader, property, tag);
                     break;
                 case 'ArrayProperty':
-                    subtype = reader.readString();
-                    overhead = ArrayProperty_1.ArrayProperty.CalcOverhead(currentProperty, subtype);
-                    currentProperty = ArrayProperty_1.ArrayProperty.Parse(reader, propertyType, index, binarySize, subtype);
+                    ArrayProperty_1.ArrayProperty.Parse(reader, tag, property);
                     break;
                 case 'MapProperty':
-                    const keyType = reader.readString();
-                    const valueType = reader.readString();
-                    overhead = MapProperty_1.MapProperty.CalcOverhead(currentProperty, keyType, valueType);
-                    currentProperty = MapProperty_1.MapProperty.Parse(reader, propertyName, binarySize, keyType, valueType);
+                    MapProperty_1.MapProperty.Parse(reader, property);
                     break;
                 case 'TextProperty':
-                    overhead = TextProperty_1.TextProperty.CalcOverhead(currentProperty);
-                    currentProperty = TextProperty_1.TextProperty.Parse(reader, propertyType, index);
+                    TextProperty_1.TextProperty.Parse(reader, property);
                     break;
                 case 'SetProperty':
-                    subtype = reader.readString();
-                    overhead = SetProperty_1.SetProperty.CalcOverhead(currentProperty, subtype);
-                    currentProperty = SetProperty_1.SetProperty.Parse(reader, propertyType, index, propertyName, subtype);
+                    SetProperty_1.SetProperty.Parse(reader, property);
                     break;
                 default:
-                    throw new Error(`Unimplemented type ${propertyType}, at byte position ${reader.getBufferPosition()}`);
+                    throw new Error(`Unimplemented type ${property.propertyTagType.name}, at byte position ${reader.getBufferPosition()}`);
             }
-            currentProperty.name = propertyName;
-            const readBytes = reader.getBufferPosition() - before - overhead;
-            if (readBytes !== binarySize) {
-                throw new parser_error_1.ParserError('ParserError', `Property possibly corrupt. Read ${readBytes} bytes for ${propertyType} ${propertyName}, but ${binarySize} bytes were indicated.`);
+            const readBytes = reader.getBufferPosition() - before;
+            if (readBytes !== tag.binarySize) {
+                throw new parser_error_1.ParserError('ParserError', `Property possibly corrupt. Read ${readBytes} bytes for ${property.propertyTagType.name} ${property.name}, but ${tag.binarySize} bytes were indicated.`);
             }
         }
         catch (error) {
@@ -159,110 +141,87 @@ var PropertiesList;
                 throw error;
             }
             else {
-                console.warn(error);
-                console.warn(`property ${propertyName} of type ${propertyType} is therefore dumped as raw bytes.`);
+                console.warn(`property ${tag.propertyName} of type ${property.propertyTagType.name} is therefore dumped as raw bytes.`);
                 reader.skipBytes(before - reader.getBufferPosition());
-                currentProperty.rawBytes = Array.from(reader.readBytes(binarySize + overhead));
+                property.rawBytes = Array.from(reader.readBytes(tag.binarySize));
             }
         }
-        return currentProperty;
-    };
-    PropertiesList.SerializeSingleProperty = (writer, property) => {
+        return property;
+    }
+    PropertiesList.ParseSingleProperty = ParseSingleProperty;
+    function SerializeSingleProperty(writer, property) {
         if (property.rawBytes !== undefined) {
             writer.writeBytesArray(property.rawBytes);
             return;
         }
-        writer.writeString(property.ueType);
-        const lenIndicator = writer.getBufferPosition();
-        writer.writeInt32(0);
-        writer.writeInt32(property.index ?? 0);
+        const { binarySizeLocation } = FPropertyTag_1.FPropertyTag.writeFromProperty(writer, property);
         const start = writer.getBufferPosition();
-        let overhead = 0;
-        switch (property.ueType) {
+        switch (property.propertyTagType.name) {
             case 'BoolProperty':
-                overhead = BoolProperty_1.BoolProperty.CalcOverhead(property);
                 BoolProperty_1.BoolProperty.Serialize(writer, property);
                 break;
             case 'ByteProperty':
-                overhead = ByteProperty_1.ByteProperty.CalcOverhead(property, property.value.type);
                 ByteProperty_1.ByteProperty.Serialize(writer, property);
                 break;
             case 'Int8Property':
-                overhead = Int8Property_1.Int8Property.CalcOverhead(property);
                 Int8Property_1.Int8Property.Serialize(writer, property);
                 break;
             case 'UInt8Property':
-                overhead = Uint8Property_1.Uint8Property.CalcOverhead(property);
                 Uint8Property_1.Uint8Property.Serialize(writer, property);
                 break;
             case 'IntProperty':
-            case 'Int32Property':
-                overhead = Int32Property_1.Int32Property.CalcOverhead(property);
-                Int32Property_1.Int32Property.Serialize(writer, property);
+                IntProperty_1.IntProperty.Serialize(writer, property);
                 break;
             case 'UInt32Property':
-                overhead = Uint32Property_1.Uint32Property.CalcOverhead(property);
                 Uint32Property_1.Uint32Property.Serialize(writer, property);
                 break;
             case 'Int64Property':
-                overhead = Int64Property_1.Int64Property.CalcOverhead(property);
                 Int64Property_1.Int64Property.Serialize(writer, property);
                 break;
             case 'UInt64PRoperty':
-                overhead = Uint64Property_1.Uint64Property.CalcOverhead(property);
                 Uint64Property_1.Uint64Property.Serialize(writer, property);
                 break;
             case 'SingleProperty':
             case 'FloatProperty':
-                overhead = FloatProperty_1.FloatProperty.CalcOverhead(property);
                 FloatProperty_1.FloatProperty.Serialize(writer, property);
                 break;
             case 'DoubleProperty':
-                overhead = DoubleProperty_1.DoubleProperty.CalcOverhead(property);
                 DoubleProperty_1.DoubleProperty.Serialize(writer, property);
                 break;
             case 'StrProperty':
             case 'NameProperty':
-                overhead = StrProperty_1.StrProperty.CalcOverhead(property);
                 StrProperty_1.StrProperty.Serialize(writer, property);
                 break;
             case 'ObjectProperty':
             case 'InterfaceProperty':
-                overhead = ObjectProperty_1.ObjectProperty.CalcOverhead(property);
                 ObjectProperty_1.ObjectProperty.Serialize(writer, property);
                 break;
             case 'SoftObjectProperty':
-                overhead = SoftObjectProperty_1.SoftObjectProperty.CalcOverhead(property);
                 SoftObjectProperty_1.SoftObjectProperty.Serialize(writer, property);
                 break;
             case 'EnumProperty':
-                overhead = EnumProperty_1.EnumProperty.CalcOverhead(property, property.value.name);
                 EnumProperty_1.EnumProperty.Serialize(writer, property);
                 break;
             case 'StructProperty':
-                overhead = StructProperty_1.StructProperty.CalcOverhead(property, property.subtype);
                 StructProperty_1.StructProperty.Serialize(writer, property);
                 break;
             case 'ArrayProperty':
-                overhead = ArrayProperty_1.ArrayProperty.CalcOverhead(property, property.subtype);
                 ArrayProperty_1.ArrayProperty.Serialize(writer, property);
                 break;
             case 'MapProperty':
-                overhead = MapProperty_1.MapProperty.CalcOverhead(property, property.keyType, property.valueType);
                 MapProperty_1.MapProperty.Serialize(writer, property);
                 break;
             case 'TextProperty':
-                overhead = TextProperty_1.TextProperty.CalcOverhead(property);
                 TextProperty_1.TextProperty.Serialize(writer, property);
                 break;
             case 'SetProperty':
-                overhead = SetProperty_1.SetProperty.CalcOverhead(property, property.subtype);
                 SetProperty_1.SetProperty.Serialize(writer, property);
                 break;
             default:
-                throw new Error(`Unimplemented type ${property.type}`);
+                throw new Error(`Unimplemented type ${property.propertyTagType.name}`);
         }
-        writer.writeBinarySizeFromPosition(lenIndicator, start + overhead);
-    };
+        writer.writeBinarySizeFromPosition(binarySizeLocation, start);
+    }
+    PropertiesList.SerializeSingleProperty = SerializeSingleProperty;
 })(PropertiesList || (exports.PropertiesList = PropertiesList = {}));
 //# sourceMappingURL=PropertiesList.js.map