s2cfgtojson 3.0.3 → 3.0.5

package/Struct.mts

@@ -1,6 +1,6 @@
 export * from "./types.mts";
 export * from "./enums.mts";
-import { DefaultEntries, IStruct, Value } from "./types.mts";
+import { DefaultEntries } from "./types.mts";
 
 const TAB = "   ";
 const WILDCARD = "_wildcard";
@@ -16,7 +16,7 @@ const REMOVE_NODE = "removenode";
  * This file is part of the Stalker 2 Modding Tools project.
  * This is a base class for all structs.
  */
-export class Struct implements IStruct {
+export class Struct {
   __internal__: Refs = new Refs();
 
   /**
@@ -103,10 +103,8 @@ export class Struct implements IStruct {
     return text;
   }
 
-  static fromString<IntendedType extends Partial<Struct> = Struct>(
-    text: string,
-  ): IntendedType[] {
-    return walk(text.trim().split("\n")) as IntendedType[];
+  static fromString<IntendedType>(text: string): (IntendedType & Struct)[] {
+    return walk(text.trim().split("\n")) as any[];
   }
 }
 
@@ -259,7 +257,7 @@ export function parseKey(key: string, parent: Struct, index: number) {
   return normKey;
 }
 
-function parseValue(value: string): Value {
+function parseValue(value: string): string | number | boolean {
   if (value === "true" || value === "false") {
     return value === "true";
   }
@@ -274,10 +272,8 @@ function parseValue(value: string): Value {
         `${minus ? "-" : ""}${first || 0}${second ? `.${second}` : ""}`,
       );
     }
-    return JSON.parse(value);
-  } catch (e) {
-    return value;
-  }
+  } catch (e) {}
+  return value;
 }
 
 function renderStructName(name: string): string {

package/Struct.test.mts

@@ -3,7 +3,6 @@ import {
   createDynamicClassInstance,
   ERank,
   pad,
-  IStruct,
   Struct,
   ArmorPrototype,
 } from "./Struct.mjs";
@@ -203,7 +202,7 @@ struct.end`;
          N5 = .1f
          N6 = -2.22f
        struct.end`;
-      const str = Struct.fromString<IStruct & { [key: `N${number}`]: number }>(
+      const str = Struct.fromString<{ [key: `N${number}`]: number }>(
         dynamicItemGeneratorText,
       );
       expect(str[0].N1).toBe(0.1);

package/package.json

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

package/types.mts

@@ -69,10 +69,21 @@ import {
 import { Struct } from "./Struct.mjs";
 
 export type Internal = "__internal__";
-export type IStruct = {
-  [k in Internal]: DefaultEntries;
+
+export type DeeplyPartial<T> = {
+  [P in keyof T]?: T[P] extends Array<infer U>
+    ? Array<DeeplyPartial<U>>
+    : T[P] extends ReadonlyArray<infer U>
+      ? ReadonlyArray<DeeplyPartial<U>>
+      : T[P] extends object
+        ? DeeplyPartial<T[P]>
+        : T[P];
 };
 
+export type DeeplyPartialStruct<T> = DeeplyPartial<
+  T extends Struct ? Omit<T, Internal> : T
+>;
+
 export interface DefaultEntries {
   rawName?: string;
   refurl?: string;
@@ -84,8 +95,6 @@ export interface DefaultEntries {
   useAsterisk?: boolean;
 }
 
-export type Value = string | boolean | number;
-export type Entries = Record<string | number, Value>;
 export type GetStructType<In> =
   In extends Array<any>
     ? Struct & { [key in number]: GetStructType<In[key]> }
@@ -747,7 +756,7 @@ export type DynamicItemGenerator = GetStructType<{
       Category: EItemGenerationCategory;
       PlayerRank: ERank;
       bAllowSameCategoryGeneration: boolean;
-      ReputationThreshold: string;
+      ReputationThreshold: number;
       RefreshTime: string;
       PossibleItems: {
         ItemPrototypeSID: string;