s2cfgtojson 3.0.0 → 3.0.2

package/Struct.mts

@@ -22,13 +22,16 @@ export abstract class Struct implements IStruct {
   /**
    * Creates a new struct instance.
    */
-  constructor(parentOrRaw?: string | Struct) {
+  constructor(parentOrRaw?: string | Struct | object) {
     if (parentOrRaw instanceof Struct) {
       Object.assign(this, parentOrRaw.clone());
     }
     if (typeof parentOrRaw === "string") {
       Object.assign(this, Struct.fromString(parentOrRaw)[0]);
     }
+    if (typeof parentOrRaw === "object" && parentOrRaw !== null) {
+      Object.assign(this, parentOrRaw);
+    }
   }
 
   fork(clone = false) {
@@ -233,7 +236,7 @@ function walk(lines: string[]) {
   return roots;
 }
 
-function parseKey(key: string, parent: Struct, index: number) {
+export function parseKey(key: string, parent: Struct, index: number) {
   let normKey: string | number = key;
 
   if (key.startsWith("[") && key.endsWith("]")) {

package/Struct.test.mts

@@ -5,6 +5,7 @@ import {
   pad,
   IStruct,
   Struct,
+  ArmorPrototype,
 } from "./Struct.mjs";
 import fs from "node:fs";
 
@@ -259,3 +260,5 @@ struct.end`;
 
 // noinspection JSUnusedLocalSymbols
 const MyRank: ERank = "ERank::Experienced, ERank::Veteran, ERank::Master";
+// noinspection BadExpressionStatementJS
+(({}) as ArmorPrototype).Protection;

package/package.json

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

package/types.mts

@@ -66,6 +66,7 @@ import {
   ERequiredSquadMembers,
   EMeshSubType,
 } from "./enums.mjs";
+import { Struct } from "./Struct.mjs";
 
 export type Internal = "__internal__";
 export type IStruct = {
@@ -84,28 +85,19 @@ export interface DefaultEntries {
 }
 
 export type Value = string | boolean | number;
-
 export type Entries = Record<string | number, Value>;
-
-export type GetTsType<E extends IStruct> = {
-  [key in Exclude<keyof E, Internal>]: E[key] extends IStruct
-    ? GetTsType<E[key]>
-    : E[key];
-};
-type RKey<In> = Exclude<keyof In, keyof DefaultEntries>;
-
 export type GetStructType<In> =
   In extends Array<any>
-    ? IStruct & { [key in number]: GetStructType<In[key]> }
+    ? Struct & { [key in number]: GetStructType<In[key]> }
     : In extends Record<any, any>
-      ? IStruct & { [key in RKey<In>]: GetStructType<In[key]> }
+      ? Struct & { [key in keyof In]: GetStructType<In[key]> }
       : In extends string
         ? In
         : In extends number
           ? number
           : In extends boolean
             ? boolean
-            : never;
+            : In;
 
 export type ArmorPrototype = GetStructType<{
   SID: string;