s2cfgtojson 4.4.0 → 4.5.0

package/Struct.mts

@@ -345,7 +345,8 @@ export function createDynamicClassInstance<T extends Struct = Struct>(
   rawName: string,
   index?: number,
 ): T {
-  const name = parseStructName(rawName) || `UnnamedStruct${index}`;
+  const parsedName = parseStructName(rawName) || `UnnamedStruct${index}`;
+  const name = makeSafeClassName(parsedName);
   return new (new Function(
     "parent",
     "Refs",
@@ -492,6 +493,59 @@ function parseStructName(name: string): string {
     .replace(/^_+/, "");
 }
 
+const RESERVED_IDENTIFIERS = new Set([
+  "break",
+  "case",
+  "catch",
+  "class",
+  "const",
+  "continue",
+  "debugger",
+  "default",
+  "delete",
+  "do",
+  "else",
+  "export",
+  "extends",
+  "finally",
+  "for",
+  "function",
+  "if",
+  "import",
+  "in",
+  "instanceof",
+  "new",
+  "return",
+  "super",
+  "switch",
+  "this",
+  "throw",
+  "try",
+  "typeof",
+  "var",
+  "void",
+  "while",
+  "with",
+  "yield",
+  "enum",
+  "await",
+  "implements",
+  "package",
+  "protected",
+  "static",
+  "interface",
+  "private",
+  "public",
+  "let",
+]);
+
+function makeSafeClassName(name: string): string {
+  if (!/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name) || RESERVED_IDENTIFIERS.has(name)) {
+    return `_${name}`;
+  }
+  return name;
+}
+
 function maybeMinifyKey(key: string, minify: boolean) {
   return minify &&
     (INTERNAL_PROPS.has(key as any) || REF_INTERNAL_PROPS.has(key as any))

package/Struct.test.mts

@@ -91,6 +91,14 @@ struct.end`,
         `DynamicClass : struct.begin\n\nstruct.end`,
       );
     });
+
+    test("reserved keyword name", () => {
+      const instance = createDynamicClassInstance("default");
+      instance.__internal__.isRoot = true;
+
+      expect(instance).toBeInstanceOf(Struct);
+      expect(instance.toString()).toBe(`default : struct.begin\n\nstruct.end`);
+    });
   });
 
   describe("fromString()", () => {

package/package.json

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

package/readme.md

@@ -53,7 +53,7 @@ BasePhantomAttack : struct.begin {refkey=BaseAttackAbility}
 struct.end
 `;
 const parsed = Struct.fromString(configText)[0];
-console.log(parsed.entries.TriggeredCooldowns);
+console.log(parsed.TriggeredCooldowns);
 ```
 
 ---