s2cfgtojson 3.2.2 → 3.2.4

package/Struct.mts

@@ -21,7 +21,7 @@ const INTERNAL_PROPS = new Set([
   "filter",
   "map",
   "toString",
-]);
+] satisfies Array<keyof Struct>);
 
 /**
  * This file is part of the Stalker 2 Modding Tools project.
@@ -94,17 +94,21 @@ export class Struct {
     return Struct.fromString(this.toString())[0] as this;
   }
 
-  entries(): [keyof this, (typeof this)[keyof this]][] {
-    return Object.entries(this).filter(([key]) => !INTERNAL_PROPS.has(key)) as [
-      keyof this,
-      (typeof this)[keyof this],
-    ][];
+  entries<
+    K extends Exclude<keyof this, Internal>,
+    V extends (typeof this)[K],
+  >() {
+    return Object.entries(this).filter(
+      ([key]) => !INTERNAL_PROPS.has(key as any),
+    ) as [K, V][];
   }
 
   forEach<K extends Exclude<keyof this, Internal>, V extends (typeof this)[K]>(
-    callback: ([key, value]: [K, V]) => void,
+    callback: ([key, value]: [K, V], i: number, arr: [K, V][]) => void,
   ): void {
-    this.entries().forEach(([key, value]) => callback([key as K, value as V]));
+    this.entries().forEach(([key, value], i, arr) =>
+      callback([key as K, value as V], i, arr as any),
+    );
   }
 
   /**
@@ -112,11 +116,11 @@ export class Struct {
    * @param callback
    */
   filter<K extends Exclude<keyof this, Internal>, V extends (typeof this)[K]>(
-    callback: ([key, value]: [K, V]) => boolean,
+    callback: ([key, value]: [K, V], i: number, arr: [K, V][]) => boolean,
   ): Partial<this> & Struct {
     const clone = this.clone();
-    clone.entries().forEach(([key, value]) => {
-      if (!callback([key as K, value as V])) {
+    clone.entries().forEach(([key, value], i, arr) => {
+      if (!callback([key as K, value as V], i, arr as any)) {
         delete clone[key];
       }
     });
@@ -128,11 +132,11 @@ export class Struct {
    * @param callback
    */
   map<K extends Exclude<keyof this, Internal>, V extends (typeof this)[K]>(
-    callback: ([key, value]: [K, V]) => V,
+    callback: ([key, value]: [K, V], i: number, arr: [K, V][]) => V,
   ): this {
     const clone = this.clone();
-    clone.entries().forEach(([key, value]) => {
-      clone[key] = callback([key as K, value as V]);
+    clone.entries().forEach(([key, value], i, arr) => {
+      clone[key] = callback([key as K, value as V], i, arr as any);
     });
     return clone;
   }
@@ -154,8 +158,7 @@ export class Struct {
 
     text += "\n";
     // Add all keys
-    text += Object.entries(this)
-      .filter(([key]) => !INTERNAL_PROPS.has(key))
+    text += this.entries()
       .map(([key, value]) => {
         const nameAlreadyRendered =
           value instanceof Struct && value.__internal__.rawName;
@@ -165,7 +168,7 @@ export class Struct {
         let equalsOrColon = "";
         let spaceOrNoSpace = "";
         if (!nameAlreadyRendered) {
-          keyOrIndex = renderKeyName(key, useAsterisk) + " ";
+          keyOrIndex = renderKeyName(key as string, useAsterisk) + " ";
           equalsOrColon = value instanceof Struct ? ":" : "=";
           spaceOrNoSpace = value === "" ? "" : " ";
         }

package/Struct.test.mts

@@ -318,6 +318,4 @@ struct.end`;
 // noinspection JSUnusedLocalSymbols
 const MyRank: ERank = "ERank::Experienced, ERank::Veteran, ERank::Master";
 // noinspection BadExpressionStatementJS
-(({}) as ArmorPrototype["MeshGenerator"]).forEach(([_k, e]) => {
-  e.Cost *= 2;
-});
+({}) as ArmorPrototype["MeshGenerator"];

package/package.json

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