s2cfgtojson 3.0.4 → 3.1.0

package/Struct.mts

@@ -62,10 +62,63 @@ export class Struct {
     return this;
   }
 
+  addNode(value: any, key?: string | number): this {
+    if (this.__internal__.isArray !== true) {
+      throw new Error("Cannot add node to non-array struct.");
+    }
+    if (key === undefined) {
+      const nextIndex = Object.keys(this)
+        .map((k) => parseInt(k))
+        .filter((k) => !isNaN(k))
+        .sort((a, b) => a - b)
+        .pop();
+      this[nextIndex !== undefined ? nextIndex + 1 : 0] = value;
+    } else {
+      this[key] = value;
+    }
+    return this;
+  }
+
   clone() {
     return Struct.fromString(this.toString())[0] as this;
   }
 
+  forEach(callback: ([key, value]) => void): void {
+    Object.entries(this)
+      .filter(([key]) => key !== "__internal__")
+      .forEach(callback);
+  }
+
+  /**
+   * Filters the struct entries based on a callback function. Returns a copy.
+   * @param callback
+   */
+  filter(callback: ([key, value]) => boolean): Partial<this> & Struct {
+    const clone = this.clone();
+    Object.entries(clone)
+      .filter(([key]) => key !== "__internal__")
+      .forEach(([key, value]) => {
+        if (!callback([key, value])) {
+          delete clone[key];
+        }
+      });
+    return clone;
+  }
+
+  /**
+   * Maps the struct entries based on a callback function. Returns a copy.
+   * @param callback
+   */
+  map(callback: ([key, value]) => typeof value): this {
+    const clone = this.clone();
+    Object.entries(clone)
+      .filter(([key]) => key !== "__internal__")
+      .forEach(([key, value]) => {
+        clone[key] = callback([key, value]);
+      });
+    return clone;
+  }
+
   toString(): string {
     if (!(this.__internal__ instanceof Refs)) {
       this.__internal__ = new Refs(this.__internal__);
@@ -117,7 +170,7 @@ export class Refs implements DefaultEntries {
   isArray?: boolean;
   useAsterisk?: boolean;
 
-  constructor(ref?: string | object) {
+  constructor(ref?: string | Refs) {
     if (typeof ref === "string") {
       ref
         .split(";")
@@ -151,7 +204,7 @@ export class Refs implements DefaultEntries {
 }
 
 const structHeadRegex = new RegExp(
-  `^(.*)\\s*:\\s*struct\\.begin\\s*({\\s*((${KEYWORDS.join("|")})\\s*(=.+)?)\\s*})?`,
+  `^\s*(.*)\\s*:\\s*struct\\.begin\\s*({\\s*((${KEYWORDS.join("|")})\\s*(=.+)?)\\s*})?`,
 );
 
 function parseHead(line: string, index: number): Struct {

package/Struct.test.mts

@@ -5,6 +5,7 @@ import {
   pad,
   Struct,
   ArmorPrototype,
+  Refs,
 } from "./Struct.mjs";
 import fs from "node:fs";
 
@@ -26,13 +27,21 @@ class TradePrototype extends Struct {
   TradeGenerators = new TradeGenerators();
 }
 class TradeGenerators extends Struct {
-  "*" = new TradeGenerator();
+  __internal__ = new Refs({
+    isArray: true,
+    useAsterisk: true,
+  });
+  "0" = new TradeGenerator();
 }
 class TradeGenerator extends Struct {
   BuyLimitations = new BuyLimitations();
 }
 
 class BuyLimitations extends Struct {
+  __internal__ = new Refs({
+    rawName: "BuyLimitations",
+    isArray: true,
+  });
   [0] = "EItemType::Weapon";
   [1] = "EItemType::Armor";
 }
@@ -236,6 +245,55 @@ struct.end`;
     });
   });
 
+  describe("addNode", () => {
+    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.addNode("EItemType::Artifact");
+      expect(a.TradeGenerators[0].BuyLimitations[2]).toBe(
+        "EItemType::Artifact",
+      );
+    });
+  });
+
+  describe("forEach", () => {
+    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.forEach(([k]) => {
+        a.TradeGenerators[0].BuyLimitations[k] = "forEach";
+      });
+      expect(a.TradeGenerators[0].BuyLimitations[0]).toBe("forEach");
+      expect(a.TradeGenerators[0].BuyLimitations[1]).toBe("forEach");
+    });
+  });
+
+  describe("filter", () => {
+    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");
+      const b = a.TradeGenerators[0].BuyLimitations.filter(([k]) => k === "0");
+      expect(b[0]).toBe("EItemType::Weapon");
+      expect(b[1]).toBeUndefined();
+    });
+  });
+
+  describe("map", () => {
+    test("1", () => {
+      const a = new TradePrototype();
+      expect(a.TradeGenerators[0].BuyLimitations[0]).toBe("EItemType::Weapon");
+      expect(a.TradeGenerators[0].BuyLimitations[1]).toBe("EItemType::Armor");
+      const b = a.TradeGenerators[0].BuyLimitations.map(
+        ([k, v]) => `${v}-mapped-${k}`,
+      );
+      expect(b[0]).toBe("EItemType::Weapon-mapped-0");
+      expect(b[1]).toBe("EItemType::Armor-mapped-1");
+    });
+  });
+
   describe("clone", () => {
     test("1", () => {
       const a = new TradePrototype();

package/package.json

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

package/types.mts

@@ -756,7 +756,7 @@ export type DynamicItemGenerator = GetStructType<{
       Category: EItemGenerationCategory;
       PlayerRank: ERank;
       bAllowSameCategoryGeneration: boolean;
-      ReputationThreshold: string;
+      ReputationThreshold: number;
       RefreshTime: string;
       PossibleItems: {
         ItemPrototypeSID: string;