s2cfgtojson 2.0.3 → 2.1.0

package/Struct.mts

@@ -8,17 +8,20 @@ export type GetTsType<In extends Struct, E = In["entries"]> = {
     ? GetTsType<E[key]>
     : E[key];
 };
-export type GetStructType<In extends Record<string | number, any>> = Struct<{
-  [key in Exclude<keyof In, keyof DefaultEntries>]: In[key] extends In
-    ? GetStructType<In[key]>
-    : In[key] extends string
-      ? string
-      : In[key] extends number
-        ? number
-        : In[key] extends boolean
-          ? boolean
-          : In[key];
-}>;
+type RKey<In> = Exclude<keyof In, keyof DefaultEntries>;
+
+export type GetStructType<In> =
+  In extends Array<any>
+    ? Struct<{ [key: number]: GetStructType<In[number]> }>
+    : In extends Record<any, any>
+      ? Struct<{ [key in RKey<In>]: GetStructType<In[key]> }>
+      : In extends string
+        ? string
+        : In extends number
+          ? number
+          : In extends boolean
+            ? boolean
+            : never;
 
 /**
  * This file is part of the Stalker 2 Modding Tools project.
@@ -225,7 +228,15 @@ export abstract class Struct<T extends Entries = {}> {
       const key = match[1].trim();
       let value: string | number = match[3].trim();
       try {
-        value = JSON.parse(value);
+        // understand 0.1f / 1. / 0.f / .1 / .1f -> ((\d*)\.?(\d+)|(\d+)\.?(\d*))f?
+        const matches = value.match(/(\d*)\.?(\d*)f?/);
+        if (matches) {
+          const first = matches[1];
+          const second = matches[2];
+          value = parseFloat(`${first || 0}${second ? `.${second}` : ""}`);
+        } else {
+          value = JSON.parse(value);
+        }
       } catch (e) {}
       Struct.addEntry(parent, key, value, index);
     };

package/Struct.test.mts

@@ -187,5 +187,23 @@ struct.end`;
         dynamicItemGeneratorText,
       );
     });
+
+    test("4", () => {
+      const dynamicItemGeneratorText = `A : struct.begin
+         N1 = 0.1f 
+         N2 = 1. 
+         N3 = 0.f 
+         N4 = .1 
+         N5 = .1f
+       struct.end`;
+      const str = Struct.fromString<
+        Struct<{ N1: number; N2: number; N3: number; N4: number; N5: number }>
+      >(dynamicItemGeneratorText);
+      expect(str[0].entries.N1).toBe(0.1);
+      expect(str[0].entries.N2).toBe(1);
+      expect(str[0].entries.N3).toBe(0);
+      expect(str[0].entries.N4).toBe(0.1);
+      expect(str[0].entries.N5).toBe(0.1);
+    });
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s2cfgtojson",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "Converts Stalker 2 Cfg file into a POJO",
   "keywords": [
     "stalker",