s2cfgtojson 3.2.12 → 3.4.0

package/Struct.mts

@@ -1,6 +1,8 @@
+import { type } from "node:os";
+
 export * from "./types.mts";
 export * from "./enums.mts";
-import { DefaultEntries, Internal } from "./types.mts";
+import { DefaultEntries, GetStructType, Internal } from "./types.mts";
 
 const TAB = "   ";
 const WILDCARD = "_wildcard";
@@ -41,7 +43,7 @@ export class Struct {
       Object.assign(this, Struct.fromString(parentOrRaw)[0]);
     }
     if (typeof parentOrRaw === "object" && parentOrRaw !== null) {
-      Object.assign(this, parentOrRaw);
+      Object.assign(this, Struct.fromJson(parentOrRaw));
     }
   }
 
@@ -122,10 +124,8 @@ export class Struct {
   filter<
     K extends Exclude<keyof this, Internal>,
     V extends (typeof this)[K],
-    S extends [K, V],
-  >(
-    callback: (value: [K, V], index: number, array: [K, V][]) => value is S,
-  ): Record<K, V> & Struct {
+    S extends this,
+  >(callback: (value: [K, V], index: number, array: [K, V][]) => boolean): S {
     const clone = this.clone();
     clone.entries().forEach((entry, i, arr) => {
       if (!callback(entry as any, i, arr as any)) {
@@ -152,6 +152,36 @@ export class Struct {
     return clone;
   }
 
+  static fromJson<T>(obj: T): T extends object ? GetStructType<T> : T {
+    if (typeof obj === "object" && !!obj) {
+      const instance = new Struct();
+      Object.entries(obj).forEach(([key, value]) => {
+        if (key === "__internal__") {
+          instance[key] = new Refs(value);
+        } else {
+          instance[key] = Struct.fromJson(value);
+        }
+      });
+      return instance as any;
+    }
+
+    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,
-    useAsterisk: 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();
 }
 
@@ -61,7 +65,7 @@ struct.end`,
     expect(new TradePrototype().toString()).toBe(
       `TradersDontBuyWeaponsArmor : struct.begin {refurl=../TradePrototypes.cfg;refkey=[0]}
    TradeGenerators : struct.begin
-      [*] : struct.begin
+      [0] : struct.begin
          BuyLimitations : struct.begin
             [0] = EItemType::Weapon
             [1] = EItemType::Armor
@@ -254,7 +258,10 @@ struct.end`;
       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.addNode("EItemType::Artifact");
+      a.TradeGenerators[0].BuyLimitations.addNode(
+        "EItemType::Artifact",
+        undefined,
+      );
       expect(a.TradeGenerators[0].BuyLimitations[2]).toBe(
         "EItemType::Artifact",
       );
@@ -267,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");
@@ -317,6 +324,81 @@ struct.end`;
       expect(a.TradeGenerators[0].BuyLimitations[0]).toBe("removenode");
     });
   });
+
+  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 = {
+        __internal__: { rawName: "Test", isRoot: true },
+        MeshGenerator: {
+          __internal__: { rawName: "MeshGenerator" },
+          Meshes: {
+            __internal__: { rawName: "Meshes", isArray: true },
+            "0": {
+              __internal__: { rawName: "0" },
+              MeshPath: "path/to/mesh",
+              Offset: {
+                __internal__: { rawName: "Offset" },
+                X: 0,
+                Y: 0,
+                Z: 0,
+              },
+              Rotation: {
+                __internal__: { rawName: "Rotation" },
+                Pitch: 0,
+                Yaw: 0,
+                Roll: 0,
+              },
+            },
+          },
+        },
+      };
+      const struct = Struct.fromJson(json);
+      expect(struct.toString()).toBe(`Test : struct.begin
+   MeshGenerator : struct.begin
+      Meshes : struct.begin
+         [0] : struct.begin
+            MeshPath = path/to/mesh
+            Offset : struct.begin
+               X = 0
+               Y = 0
+               Z = 0
+            struct.end
+            Rotation : struct.begin
+               Pitch = 0
+               Yaw = 0
+               Roll = 0
+            struct.end
+         struct.end
+      struct.end
+   struct.end
+struct.end`);
+    });
+  });
 });
 
 // noinspection JSUnusedLocalSymbols

package/package.json

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