s2cfgtojson 3.3.0 → 3.5.0

package/Struct.mts

@@ -13,17 +13,33 @@ const KEYWORDS = [
   "bpatch", // allows patching only specific keys
 ];
 const REMOVE_NODE = "removenode";
-const INTERNAL_PROPS = new Set([
-  "__internal__",
-  "fork",
-  "removeNode",
-  "addNode",
-  "clone",
-  "forEach",
-  "filter",
-  "map",
-  "toString",
-] satisfies Array<keyof Struct>);
+const INTERNAL_PROPS = new Map([
+  ["__internal__", "_"],
+  ["fork", ""], // methods
+  ["removeNode", ""], // methods
+  ["addNode", ""], // methods
+  ["clone", ""], // methods
+  ["forEach", ""], // methods
+  ["filter", ""], // methods
+  ["map", ""], // methods
+  ["toString", ""], // methods
+] as const);
+const INTERNAL_PROPS_INV = new Map(
+  Array.from(INTERNAL_PROPS.entries()).map(([k, v]) => [v, k]),
+);
+const REF_INTERNAL_PROPS = new Map([
+  ["rawName", "w"],
+  ["refurl", "u"],
+  ["refkey", "k"],
+  ["bskipref", "s"],
+  ["bpatch", "p"],
+  ["isArray", "a"],
+  ["isRoot", "r"],
+  ["useAsterisk", "*"],
+] as const);
+const REF_INTERNAL_PROPS_INV = new Map(
+  Array.from(REF_INTERNAL_PROPS.entries()).map(([k, v]) => [v, k]),
+);
 
 /**
  * This file is part of the Stalker 2 Modding Tools project.
@@ -152,11 +168,27 @@ export class Struct {
     return clone;
   }
 
-  static fromJson<T>(obj: T): T extends object ? GetStructType<T> : T {
+  static fromJson<T>(
+    obj: T,
+    minified = false,
+  ): T extends object ? GetStructType<T> : T {
     if (typeof obj === "object" && !!obj) {
       const instance = new Struct();
       Object.entries(obj).forEach(([key, value]) => {
-        instance[key] = Struct.fromJson(value);
+        const nKey = fromMinifiedKey(key, minified);
+
+        if (nKey === "__internal__") {
+          instance[nKey] = new Refs(
+            Object.fromEntries(
+              Object.entries(value).map(([k, v]) => [
+                fromMinifiedKey(k, minified),
+                v,
+              ]),
+            ),
+          );
+        } else {
+          instance[nKey] = Struct.fromJson(value, minified);
+        }
       });
       return instance as any;
     }
@@ -164,6 +196,24 @@ export class Struct {
     return obj as any;
   }
 
+  toJson<T extends object>(minify = false): T {
+    const obj = {};
+
+    Object.entries(this).forEach(([key, value]) => {
+      let nKey = maybeMinifyKey(key, minify);
+      if (value instanceof Struct) {
+        obj[nKey] = value.toJson(minify);
+      } else if (value instanceof Refs) {
+        obj[nKey] = Object.fromEntries(
+          Object.entries(value).map(([k, v]) => [maybeMinifyKey(k, minify), v]),
+        );
+      } else {
+        obj[nKey] = value;
+      }
+    });
+    return obj as T;
+  }
+
   toString(): string {
     if (!(this.__internal__ instanceof Refs)) {
       this.__internal__ = new Refs(this.__internal__);
@@ -431,3 +481,19 @@ function parseStructName(name: string): string {
     .replace(/_+/g, "_")
     .replace(/^_+/, "");
 }
+
+function maybeMinifyKey(key: string, minify: boolean) {
+  return minify &&
+    (INTERNAL_PROPS.has(key as any) || REF_INTERNAL_PROPS.has(key as any))
+    ? INTERNAL_PROPS.get(key as any) || REF_INTERNAL_PROPS.get(key as any)
+    : key;
+}
+
+function fromMinifiedKey(key: string, minified: boolean) {
+  if (!minified) return key;
+  return (
+    INTERNAL_PROPS_INV.get(key as any) ||
+    REF_INTERNAL_PROPS_INV.get(key as any) ||
+    key
+  );
+}

package/Struct.test.mts

@@ -10,32 +10,36 @@ import {
 import fs from "node:fs";
 
 class ChimeraHPFix extends Struct {
-  __internal__ = {
+  __internal__ = new Refs({
     rawName: "ChimeraHPFix",
     isRoot: true,
     bskipref: true,
-  };
+  });
 
   MaxHP = 750;
 }
 class TradePrototype extends Struct {
-  __internal__ = {
+  __internal__ = new Refs({
     rawName: "TradersDontBuyWeaponsArmor",
     refurl: "../TradePrototypes.cfg",
     refkey: 0,
     isRoot: true,
-  };
+  });
 
   TradeGenerators = new TradeGenerators();
 }
 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__ = new Refs({
+    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,39 @@ 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",
+            },
+          },
+        },
+      });
+    });
+
+    test("2", () => {
+      const struct = new ChimeraHPFix();
+      expect(struct.toJson(true)).toEqual({
+        _: { w: "ChimeraHPFix", r: true, s: true },
+        MaxHP: 750,
+      });
+    });
+  });
+
   describe("fromJson", () => {
     test("1", () => {
       const json = {
@@ -367,6 +404,54 @@ struct.end`;
          struct.end
       struct.end
    struct.end
+struct.end`);
+    });
+
+    test("2", () => {
+      const json = {
+        _: { w: "Test", r: true },
+        MeshGenerator: {
+          _: { w: "MeshGenerator" },
+          Meshes: {
+            _: { w: "Meshes", a: true },
+            "0": {
+              _: { w: "0" },
+              MeshPath: "path/to/mesh",
+              Offset: {
+                _: { w: "Offset" },
+                X: 0,
+                Y: 0,
+                Z: 0,
+              },
+              Rotation: {
+                _: { w: "Rotation" },
+                Pitch: 0,
+                Yaw: 0,
+                Roll: 0,
+              },
+            },
+          },
+        },
+      };
+      const struct = Struct.fromJson(json, true);
+      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`);
     });
   });

package/package.json

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