s2cfgtojson 3.2.5 → 3.2.7

package/Struct.mts

@@ -51,6 +51,9 @@ export class Struct {
       : createDynamicClassInstance(
           this.__internal__.rawName || this.constructor.name,
         );
+    patch.__internal__.isRoot = this.__internal__.isRoot;
+    patch.__internal__.isArray = this.__internal__.isArray;
+    patch.__internal__.useAsterisk = this.__internal__.useAsterisk;
 
     function markAsbPatch(s: Struct) {
       s.__internal__.bpatch = true;
@@ -146,7 +149,7 @@ export class Struct {
       this.__internal__ = new Refs(this.__internal__);
     }
 
-    let text: string = this.__internal__.rawName
+    let text: string = this.__internal__.isRoot
       ? `${this.__internal__.rawName} : `
       : "";
     text += "struct.begin";
@@ -161,7 +164,7 @@ export class Struct {
     text += this.entries()
       .map(([key, value]) => {
         const nameAlreadyRendered =
-          value instanceof Struct && value.__internal__.rawName;
+          value instanceof Struct && value.__internal__.isRoot;
         const useAsterisk =
           this.__internal__.isArray && this.__internal__.useAsterisk;
         let keyOrIndex = "";
@@ -192,6 +195,7 @@ export class Refs implements DefaultEntries {
   bskipref?: boolean;
   bpatch?: boolean;
   isArray?: boolean;
+  isRoot?: boolean;
   useAsterisk?: boolean;
 
   constructor(ref?: string | Refs) {
@@ -228,7 +232,7 @@ export class Refs implements DefaultEntries {
 }
 
 const structHeadRegex = new RegExp(
-  `^\s*(.*)\\s*:\\s*struct\\.begin\\s*({\\s*((${KEYWORDS.join("|")})\\s*(=.+)?)\\s*})?`,
+  `^\s*((.*)\\s*:)?\\s*struct\\.begin\\s*({\\s*((${KEYWORDS.join("|")})\\s*(=.+)?)\\s*})?`,
 );
 
 function parseHead(line: string, index: number): Struct {
@@ -237,9 +241,9 @@ function parseHead(line: string, index: number): Struct {
     throw new Error(`Invalid struct head: ${line}`);
   }
 
-  const dummy = createDynamicClassInstance(match[1].trim(), index);
+  const dummy = createDynamicClassInstance(match[2]?.trim() || "", index);
   if (match[3]) {
-    const parsed = new Refs(match[3]);
+    const parsed = new Refs(match[4]);
     dummy.__internal__.refurl = parsed.refurl;
     dummy.__internal__.refkey = parsed.refkey;
     dummy.__internal__.bskipref = parsed.bskipref;
@@ -303,6 +307,7 @@ function walk(lines: string[]) {
         );
         current[key] = newStruct;
       } else {
+        newStruct.__internal__.isRoot = true;
         roots.push(newStruct);
       }
       stack.push(newStruct);

package/Struct.test.mts

@@ -12,6 +12,7 @@ import fs from "node:fs";
 class ChimeraHPFix extends Struct {
   __internal__ = {
     rawName: "ChimeraHPFix",
+    isRoot: true,
     bskipref: true,
   };
 
@@ -22,6 +23,7 @@ class TradePrototype extends Struct {
     rawName: "TradersDontBuyWeaponsArmor",
     refurl: "../TradePrototypes.cfg",
     refkey: 0,
+    isRoot: true,
   };
 
   TradeGenerators = new TradeGenerators();
@@ -78,8 +80,9 @@ struct.end`,
   describe("createDynamicClassInstance", () => {
     test("1", () => {
       const instance = createDynamicClassInstance("DynamicClass");
+      instance.__internal__.isRoot = true;
+
       expect(instance).toBeInstanceOf(Struct);
-      expect(instance.__internal__.rawName).toBe("DynamicClass");
       expect(instance.toString()).toBe(
         `DynamicClass : struct.begin\n\nstruct.end`,
       );

package/package.json

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