s2cfgtojson 1.0.4 → 2.0.1

package/Struct.mts

@@ -2,6 +2,17 @@ export type Value = Omit<Struct, "toTs"> | string | boolean | number;
 type DefaultEntries = { _isArray?: boolean; _useAsterisk?: boolean };
 export type Entries = Record<string | number, Value> & DefaultEntries;
 
+export type GetTsType<In extends Struct, E = In["entries"]> = {
+  [key in Exclude<keyof E, keyof DefaultEntries>]: E[key] extends Struct
+    ? GetTsType<E[key]>
+    : E[key];
+};
+export type GetStructType<In extends Record<string | number, any>> = Struct<{
+  [key in Exclude<keyof In, keyof DefaultEntries>]: In[key] extends In
+    ? GetStructType<In[key]>
+    : In[key];
+}>;
+
 /**
  * This file is part of the Stalker 2 Modding Tools project.
  * This is a base class for all structs.
@@ -110,8 +121,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(

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.4",
+  "version": "2.0.1",
   "description": "Converts Stalker 2 Cfg file into a POJO",
   "keywords": [
     "stalker",