s2cfgtojson 1.0.3 → 2.0.0

package/Struct.mts

@@ -110,8 +110,21 @@ export abstract class Struct<T extends Entries = {}> {
     return text;
   }
 
-  toTs(): string {
-    return JSON.stringify(this, null, 2);
+  toTs(pretty = false): string {
+    const collect = (struct: Struct) => {
+      const obj = {};
+      if (struct.entries) {
+        Object.entries(struct.entries).forEach(([key, value]) => {
+          if (value instanceof Struct) {
+            obj[key] = collect(value);
+          } else {
+            obj[key] = value;
+          }
+        });
+      }
+      return obj;
+    };
+    return JSON.stringify(collect(this), null, pretty ? 2 : 0);
   }
 
   static addEntry(
@@ -163,7 +176,7 @@ export abstract class Struct<T extends Entries = {}> {
         Struct.parseStructName(match[1].trim()) || `UnnamedStruct${index}`;
 
       const dummy = new (Struct.createDynamicClass(name))();
-      dummy._id = match[1];
+      dummy._id = match[1].trim();
       if (match[3]) {
         const refs = match[3]
           .split(";")
@@ -190,7 +203,10 @@ export abstract class Struct<T extends Entries = {}> {
         throw new Error(`Invalid key-value pair: ${line}`);
       }
       const key = match[1].trim();
-      const value = match[3].trim();
+      let value: string | number = match[3].trim();
+      try {
+        value = JSON.parse(value);
+      } catch (e) {}
       Struct.addEntry(parent, key, value, index);
     };
     let index = 0;

package/Struct.test.mts

@@ -7,7 +7,7 @@ class ChimeraHPFix extends Struct {
   entries = { MaxHP: 750 };
   isRoot = true;
 }
-class TradersDontBuyWeaponsArmor extends Struct {
+class TradePrototype extends Struct {
   _id = "TradersDontBuyWeaponsArmor";
   refurl = "../TradePrototypes.cfg";
   refkey = 0;
@@ -35,7 +35,7 @@ describe("Struct", () => {
 struct.end`,
     );
 
-    expect(new TradersDontBuyWeaponsArmor().toString()).toBe(
+    expect(new TradePrototype().toString()).toBe(
       `TradersDontBuyWeaponsArmor : struct.begin {refurl=../TradePrototypes.cfg;refkey=[0]}
    TradeGenerators : struct.begin
       [*] : struct.begin
@@ -54,6 +54,23 @@ struct.end`,
     expect(Struct.pad(Struct.pad("test"))).toBe("      test");
   });
 
+  describe("toTs()", () => {
+    test("1", () => {
+      expect(new TradePrototype().toTs()).toBe(
+        JSON.stringify({
+          TradeGenerators: {
+            "*": {
+              BuyLimitations: {
+                "0": "EItemType::Weapon",
+                "1": "EItemType::Armor",
+              },
+            },
+          },
+        }),
+      );
+    });
+  });
+
   describe("fromString()", () => {
     test("1", () => {
       const chimeraText = new ChimeraHPFix().toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s2cfgtojson",
-  "version": "1.0.3",
+  "version": "2.0.0",
   "description": "Converts Stalker 2 Cfg file into a POJO",
   "keywords": [
     "stalker",