s2cfgtojson 2.2.13 → 2.3.0

package/Struct.test.mts

@@ -1,34 +1,40 @@
 import { describe, test, expect } from "vitest";
-import { Struct } from "./Struct.mjs";
+import { createDynamicClassInstance, ERank, pad, Struct } from "./Struct.mjs";
+import fs from "node:fs";
 
 class ChimeraHPFix extends Struct {
-  _id = "ChimeraHPFix";
-  bskipref = true;
-  entries = { MaxHP: 750 };
-  isRoot = true;
+  __internal__ = {
+    rawName: "ChimeraHPFix",
+    bskipref: true,
+  };
+
+  MaxHP = 750;
 }
 class TradePrototype extends Struct {
-  _id = "TradersDontBuyWeaponsArmor";
-  refurl = "../TradePrototypes.cfg";
-  refkey = 0;
-  isRoot = true;
-  entries = { TradeGenerators: new TradeGenerators() };
+  __internal__ = {
+    rawName: "TradersDontBuyWeaponsArmor",
+    refurl: "../TradePrototypes.cfg",
+    refkey: 0,
+  };
+
+  TradeGenerators = new TradeGenerators();
 }
 class TradeGenerators extends Struct {
-  _id = "TradeGenerators";
-  entries = { "*": new TradeGenerator() };
+  "*" = new TradeGenerator();
 }
 class TradeGenerator extends Struct {
-  _id = "TradeGenerator";
-  entries = { BuyLimitations: new BuyLimitations() };
+  BuyLimitations = new BuyLimitations();
 }
+
 class BuyLimitations extends Struct {
-  _id = "BuyLimitations";
-  entries = { [0]: "EItemType::Weapon", [1]: "EItemType::Armor" };
+  [0] = "EItemType::Weapon";
+  [1] = "EItemType::Armor";
 }
 
 describe("Struct", () => {
   test("toString()", () => {
+    const c = new ChimeraHPFix();
+    expect(c.MaxHP).toBe(750);
     expect(new ChimeraHPFix().toString()).toBe(
       `ChimeraHPFix : struct.begin {bskipref}
    MaxHP = 750
@@ -50,23 +56,16 @@ struct.end`,
   });
 
   test("pad()", () => {
-    expect(Struct.pad("test")).toBe("   test");
-    expect(Struct.pad(Struct.pad("test"))).toBe("      test");
+    expect(pad("test")).toBe("   test");
+    expect(pad(pad("test"))).toBe("      test");
   });
 
-  describe("toTs()", () => {
+  describe("createDynamicClassInstance", () => {
     test("1", () => {
-      expect(new TradePrototype().toTs()).toBe(
-        JSON.stringify({
-          TradeGenerators: {
-            "*": {
-              BuyLimitations: {
-                "0": "EItemType::Weapon",
-                "1": "EItemType::Armor",
-              },
-            },
-          },
-        }),
+      const instance = createDynamicClassInstance("DynamicClass");
+      expect(instance).toBeInstanceOf(Struct);
+      expect(instance.toString()).toBe(
+        `DynamicClass : struct.begin\n\nstruct.end`,
       );
     });
   });
@@ -197,15 +196,60 @@ struct.end`;
          N5 = .1f
          N6 = -2.22f
        struct.end`;
-      const str = Struct.fromString<Struct<{ [key: `N${number}`]: number }>>(
+      const str = Struct.fromString<Struct & { [key: `N${number}`]: number }>(
         dynamicItemGeneratorText,
       );
-      expect(str[0].entries.N1).toBe(0.1);
-      expect(str[0].entries.N2).toBe(1);
-      expect(str[0].entries.N3).toBe(0);
-      expect(str[0].entries.N4).toBe(0.1);
-      expect(str[0].entries.N5).toBe(0.1);
-      expect(str[0].entries.N6).toBe(-2.22);
+      expect(str[0].N1).toBe(0.1);
+      expect(str[0].N2).toBe(1);
+      expect(str[0].N3).toBe(0);
+      expect(str[0].N4).toBe(0.1);
+      expect(str[0].N5).toBe(0.1);
+      expect(str[0].N6).toBe(-2.22);
+    });
+
+    test("5", () => {
+      const testCfg = fs.readFileSync("./test.cfg", "utf-8").trim();
+      const structs = Struct.fromString(testCfg);
+      expect(structs.map((s) => s.toString()).join("\n")).toBe(testCfg);
+    });
+  });
+
+  describe("fork", () => {
+    test("1", () => {
+      const a = new TradePrototype();
+      const b = a.fork() as TradePrototype;
+
+      expect(a === b).toBe(false);
+      b.TradeGenerators = new TradeGenerators().fork();
+      expect(b.toString()).toBe(
+        "TradersDontBuyWeaponsArmor : struct.begin {bpatch}\n" +
+          "   TradeGenerators : struct.begin {bpatch}\n" +
+          "   struct.end\n" +
+          "struct.end",
+      );
+    });
+  });
+
+  describe("clone", () => {
+    test("1", () => {
+      const a = new TradePrototype();
+      const b = a.clone() as TradePrototype;
+
+      expect(a === b).toBe(false);
+      expect(a.toString()).toBe(b.toString());
+    });
+  });
+
+  describe("removeNode", () => {
+    test("1", () => {
+      const a = new TradePrototype().fork(true);
+      expect(a.TradeGenerators[0].BuyLimitations[0]).toBe("EItemType::Weapon");
+      expect(a.TradeGenerators[0].BuyLimitations[1]).toBe("EItemType::Armor");
+      a.TradeGenerators[0].BuyLimitations.removeNode(0);
+      expect(a.TradeGenerators[0].BuyLimitations[0]).toBe("removenode");
     });
   });
 });
+
+// noinspection JSUnusedLocalSymbols
+const MyRank: ERank = "ERank::Experienced, ERank::Veteran, ERank::Master";

package/enums.mts

@@ -1605,13 +1605,28 @@ export type ERadiationPreset = `ERadiationPreset::${
   | "Strong"
   | "Topaz"}`;
 
-export type _ERank =
-  `ERank::${"Experienced" | "Master" | "Newbie" | "Veteran"}`;
+type Newbie = "ERank::Newbie";
+type Experienced = "ERank::Experienced";
+type Veteran = "ERank::Veteran";
+type Master = "ERank::Master";
+type Permutations2<A, B> = A extends string
+  ? B extends string
+    ? A | B | `${A}, ${B}`
+    : A
+  : never;
+
+type Permutations3<A, B, C> = A extends string
+  ? B extends string
+    ? C extends string
+      ? Permutations2<A, B> | Permutations2<B, C> | `${A}, ${B}, ${C}`
+      : Permutations2<A, B>
+    : A
+  : never;
+
 export type ERank =
-  | _ERank
-  | `${_ERank}, ${_ERank}`
-  | `${_ERank}, ${_ERank}, ${_ERank}`
-  | `${_ERank}, ${_ERank}, ${_ERank}, ${_ERank}`;
+  | Permutations3<Newbie, Experienced, Veteran>
+  | Permutations3<Experienced, Veteran, Master>
+  | `${Newbie}, ${Experienced}, ${Veteran}, ${Master}`;
 
 export type ERegion = `ERegion::${
   | "Bolota"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "s2cfgtojson",
-  "version": "2.2.13",
-  "description": "Converts Stalker 2 Cfg file into a POJO",
+  "version": "2.3.0",
+  "description": "Converts Stalker 2 Cfg file into POJOs",
   "keywords": [
     "stalker",
     "unrealengine",
@@ -27,9 +27,10 @@
     "test": "vitest"
   },
   "devDependencies": {
-    "vitest": "^3.2.4",
+    "@types/node": "^24.5.2",
+    "prettier": "^3.6.2",
     "typescript": "^5.8.3",
-    "prettier": "^3.6.2"
+    "vitest": "^3.2.4"
   },
   "engines": {
     "node": ">=24"