s2cfgtojson 3.2.3 → 3.2.5

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,11 +94,13 @@ 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]>(
@@ -156,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;
@@ -167,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 === "" ? "" : " ";
         }
@@ -238,7 +239,11 @@ function parseHead(line: string, index: number): Struct {
 
   const dummy = createDynamicClassInstance(match[1].trim(), index);
   if (match[3]) {
-    Object.assign(dummy.__internal__, new Refs(match[3]));
+    const parsed = new Refs(match[3]);
+    dummy.__internal__.refurl = parsed.refurl;
+    dummy.__internal__.refkey = parsed.refkey;
+    dummy.__internal__.bskipref = parsed.bskipref;
+    dummy.__internal__.bpatch = parsed.bpatch;
   }
 
   return dummy as Struct;

package/Struct.test.mts

@@ -79,6 +79,7 @@ struct.end`,
     test("1", () => {
       const instance = createDynamicClassInstance("DynamicClass");
       expect(instance).toBeInstanceOf(Struct);
+      expect(instance.__internal__.rawName).toBe("DynamicClass");
       expect(instance.toString()).toBe(
         `DynamicClass : struct.begin\n\nstruct.end`,
       );
@@ -318,6 +319,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.3",
+  "version": "3.2.5",
   "description": "Converts Stalker 2 Cfg file into POJOs",
   "keywords": [
     "stalker",