s2cfgtojson 3.3.0 → 3.4.0

package/Struct.mts

@@ -156,7 +156,11 @@ export class Struct {
     if (typeof obj === "object" && !!obj) {
       const instance = new Struct();
       Object.entries(obj).forEach(([key, value]) => {
-        instance[key] = Struct.fromJson(value);
+        if (key === "__internal__") {
+          instance[key] = new Refs(value);
+        } else {
+          instance[key] = Struct.fromJson(value);
+        }
       });
       return instance as any;
     }
@@ -164,6 +168,20 @@ export class Struct {
     return obj as any;
   }
 
+  toJson<T extends object>() {
+    const obj = {};
+    Object.entries(this).forEach(([key, value]) => {
+      if (value instanceof Struct) {
+        obj[key] = value.toJson();
+      } else if (value instanceof Refs) {
+        obj[key] = { ...value };
+      } else {
+        obj[key] = value;
+      }
+    });
+    return obj as T;
+  }
+
   toString(): string {
     if (!(this.__internal__ instanceof Refs)) {
       this.__internal__ = new Refs(this.__internal__);

package/Struct.test.mts

@@ -31,11 +31,15 @@ class TradePrototype extends Struct {
 class TradeGenerators extends Struct {
   __internal__ = new Refs({
     isArray: true,
+    rawName: "TradeGenerators",
     //useAsterisk: true, this option is not supported for now
   });
   "0" = new TradeGenerator();
 }
 class TradeGenerator extends Struct {
+  __internal__ = {
+    rawName: "0",
+  };
   BuyLimitations = new BuyLimitations();
 }
 
@@ -270,7 +274,7 @@ struct.end`;
       expect(a.TradeGenerators[0].BuyLimitations[0]).toBe("EItemType::Weapon");
       expect(a.TradeGenerators[0].BuyLimitations[1]).toBe("EItemType::Armor");
       a.TradeGenerators[0].BuyLimitations.forEach(([k]) => {
-        a.TradeGenerators[0].BuyLimitations[k] = "forEach";
+        a.TradeGenerators[0].BuyLimitations[k] = "forEach" as any;
       });
       expect(a.TradeGenerators[0].BuyLimitations[0]).toBe("forEach");
       expect(a.TradeGenerators[0].BuyLimitations[1]).toBe("forEach");
@@ -321,6 +325,31 @@ struct.end`;
     });
   });
 
+  describe("toJson", () => {
+    test("1", () => {
+      const struct = new TradePrototype();
+      expect(struct.toJson()).toEqual({
+        __internal__: {
+          rawName: "TradersDontBuyWeaponsArmor",
+          isRoot: true,
+          refurl: "../TradePrototypes.cfg",
+          refkey: 0,
+        },
+        TradeGenerators: {
+          __internal__: { rawName: "TradeGenerators", isArray: true },
+          "0": {
+            __internal__: { rawName: "0" },
+            BuyLimitations: {
+              __internal__: { rawName: "BuyLimitations", isArray: true },
+              "0": "EItemType::Weapon",
+              "1": "EItemType::Armor",
+            },
+          },
+        },
+      });
+    });
+  });
+
   describe("fromJson", () => {
     test("1", () => {
       const json = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s2cfgtojson",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "Converts Stalker 2 Cfg file into POJOs",
   "keywords": [
     "stalker",