s2cfgtojson 1.0.2 → 1.0.4

package/Struct.mts

@@ -68,9 +68,11 @@ export abstract class Struct<T extends Entries = {}> {
     if (Struct.isNumber(Struct.extractKeyFromBrackets(name))) {
       return `_${name.match(/\[(\d+)]/)[1]}`; // Special case for indexed structs
     }
-    const replacer = (text: string) =>
-      text.replace(/\W/g, "_").replace(/_+/g, "_").replace(/^_/, "");
-    return `${replacer(name[0]).replace(/\d/, "")}${replacer(name.slice(1))}`;
+    return name
+      .replace(/\W/g, "_")
+      .replace(/^\d+/, "_")
+      .replace(/_+/g, "_")
+      .replace(/^_+/, "");
   }
 
   static createDynamicClass = (name: string): new () => Struct =>
@@ -150,17 +152,18 @@ export abstract class Struct<T extends Entries = {}> {
   ): IntendedType[] {
     const lines = text.trim().split("\n");
 
-    const parseHead = (line: string): Struct => {
+    const parseHead = (line: string, index: number): Struct => {
       const match = line.match(
         /^(.*)\s*:\s*struct\.begin\s*({\s*((refurl|refkey|bskipref)\s*(=.+)?)\s*})?/,
       );
       if (!match) {
         throw new Error(`Invalid struct head: ${line}`);
       }
-      let name = Struct.parseStructName(match[1].trim());
+      let name =
+        Struct.parseStructName(match[1].trim()) || `UnnamedStruct${index}`;
 
       const dummy = new (Struct.createDynamicClass(name))();
-      dummy._id = match[1];
+      dummy._id = match[1].trim();
       if (match[3]) {
         const refs = match[3]
           .split(";")
@@ -187,7 +190,10 @@ export abstract class Struct<T extends Entries = {}> {
         throw new Error(`Invalid key-value pair: ${line}`);
       }
       const key = match[1].trim();
-      const value = match[3].trim();
+      let value: string | number = match[3].trim();
+      try {
+        value = JSON.parse(value);
+      } catch (e) {}
       Struct.addEntry(parent, key, value, index);
     };
     let index = 0;
@@ -202,7 +208,7 @@ export abstract class Struct<T extends Entries = {}> {
         }
         const current = stack[stack.length - 1];
         if (line.includes("struct.begin")) {
-          const newStruct = parseHead(line);
+          const newStruct = parseHead(line, index);
           if (current) {
             const key = Struct.renderStructName(newStruct.constructor.name);
             Struct.addEntry(current, key, newStruct, index);

package/package.json

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