s2cfgtojson 3.2.1 → 3.2.3

package/Struct.mts

@@ -102,9 +102,11 @@ export class Struct {
   }
 
   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 +114,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 +130,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;
   }

package/Struct.test.mts

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

package/package.json

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

package/types.mts

@@ -107,7 +107,7 @@ export interface DefaultEntries {
 
 export type GetStructType<In> =
   In extends Array<any>
-    ? Struct & { [key in keyof In]: GetStructType<In[key]> }
+    ? Struct & { [key: `${number}`]: GetStructType<In[typeof key]> }
     : In extends Record<any, any>
       ? Struct & { [key in keyof In]: GetStructType<In[key]> }
       : In extends string