s2cfgtojson 7.0.7 → 7.0.9

package/Struct.mts

@@ -11,10 +11,10 @@ export type Internal =
   | "forEach"
   | "filter"
   | "map"
-  | "fromJson"
   | "toJson"
-  | "toString"
-  | "fromString";
+  | "toString";
+
+export type InternalPlus = Internal | "fromString" | "fromJson";
 
 export interface DefaultEntries {
   bpatch?: boolean;
@@ -33,8 +33,8 @@ export type GetStructType<In> =
     ? Struct & { [key: `${number}`]: GetStructType<In[typeof key]> }
     : In extends Record<any, any>
       ? Struct & {
-          [key in keyof In]: key extends "__internal__"
-            ? Refs
+          [key in keyof In]: key extends Internal
+            ? Struct[key]
             : GetStructType<In[key]>;
         }
       : In extends string
@@ -90,7 +90,7 @@ const REF_INTERNAL_PROPS_INV = new Map(
  * This file is part of the Stalker 2 Modding Tools project.
  * This is a base class for all structs.
  */
-export class Struct {
+export class Struct implements Record<Internal, any> {
   __internal__: Refs = new Refs();
 
   /**
@@ -174,7 +174,7 @@ export class Struct {
   }
 
   entries<
-    K extends Exclude<keyof this, Internal>,
+    K extends Exclude<keyof this, InternalPlus>,
     V extends (typeof this)[K],
   >() {
     return Object.entries(this).filter(
@@ -182,9 +182,10 @@ export class Struct {
     ) as [K, V][];
   }
 
-  forEach<K extends Exclude<keyof this, Internal>, V extends (typeof this)[K]>(
-    callback: ([key, value]: [K, V], i: number, arr: [K, V][]) => void,
-  ): void {
+  forEach<
+    K extends Exclude<keyof this, InternalPlus>,
+    V extends (typeof this)[K],
+  >(callback: ([key, value]: [K, V], i: number, arr: [K, V][]) => void): void {
     this.entries().forEach(([key, value], i, arr) =>
       callback([key as K, value as V], i, arr as any),
     );
@@ -195,7 +196,7 @@ export class Struct {
    * @param callback
    */
   filter<
-    K extends Exclude<keyof this, Internal>,
+    K extends Exclude<keyof this, InternalPlus>,
     V extends (typeof this)[K],
     S extends this,
   >(callback: (value: [K, V], index: number, array: [K, V][]) => boolean): S {
@@ -212,7 +213,7 @@ export class Struct {
    * Maps the struct entries based on a callback function. Returns a copy.
    * @param callback
    */
-  map<K extends Exclude<keyof this, Internal>, V extends (typeof this)[K]>(
+  map<K extends Exclude<keyof this, InternalPlus>, V extends (typeof this)[K]>(
     callback: ([key, value]: [K, V], i: number, arr: [K, V][]) => V,
   ): this {
     const clone = this.clone();

package/Struct.test.mts

@@ -6,6 +6,8 @@ import {
   Struct,
   ArmorPrototype,
   Refs,
+  QuestNodePrototypeRandom,
+  QuestNodePrototypeLaunchers,
 } from "./Struct.mjs";
 import fs from "node:fs";
 
@@ -481,3 +483,6 @@ struct.end`);
 const MyRank: ERank = "ERank::Experienced, ERank::Veteran, ERank::Master";
 // noinspection BadExpressionStatementJS
 ({}) as ArmorPrototype["MeshGenerator"];
+
+(new Struct() as QuestNodePrototypeRandom).Launchers =
+  {} as QuestNodePrototypeLaunchers;

package/package.json

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

package/types.mts

@@ -207,6 +207,7 @@ import {
   ScenarioGroup,
   SID,
   StringArray,
+  VariableValue,
   WeaponShootDistance,
   WeatherSelection,
 } from "./utility-types.mts";
@@ -3957,7 +3958,7 @@ export type DialogPrototypeConditionsItemItem = GetStructType<{
   TargetPlaceholder: string;
   TargetPoint: AIGlobalRelativeLocation;
   Trigger: string;
-  VariableValue: boolean;
+  VariableValue: VariableValue;
   Weather: EWeather;
   WithEquipped: boolean;
   WithInventory: boolean;
@@ -3974,7 +3975,7 @@ export type DialogPrototypeDialogActionsItem = GetStructType<{
   DialogActionParam: DialogPrototypeMoney;
   GlobalVariablePrototypeSID: string;
   ItemsCount: DialogPrototypeMoney;
-  VariableValue: number;
+  VariableValue: VariableValue;
   WithEquipped: boolean;
 }>;
 
@@ -4010,14 +4011,14 @@ export type DialogPrototypeGestureTiming = GetStructType<(number | string)[]>;
 
 export type DialogPrototypeItemPrototypeSID = GetStructType<{
   VariableType: EGlobalVariableType;
-  VariableValue: string;
+  VariableValue: VariableValue;
 }>;
 
 export type DialogPrototypeLocalizedSequences = StringArray;
 
 export type DialogPrototypeMoney = GetStructType<{
   VariableType: EGlobalVariableType;
-  VariableValue: number;
+  VariableValue: VariableValue;
 }>;
 
 export type DialogPrototypeNextDialogOptions = GetStructType<
@@ -5218,7 +5219,7 @@ export type InfotopicPrototypeBlockingGlobalVariables = GetStructType<
 
 export type InfotopicPrototypeBlockingGlobalVariablesItem = GetStructType<{
   GlobalVariablePrototypeSID: string;
-  GlobalVariableValue: number;
+  GlobalVariableValue: VariableValue;
 }>;
 
 export type InfotopicPrototypeBlockingNPCs = GetStructType<{
@@ -8550,7 +8551,7 @@ export type QuestNodePrototypeConditionsItemItem = GetStructType<{
   TargetPoint: AIGlobalRelativeLocation;
   ThreatAwareness: EThreatAwareness;
   Trigger: string;
-  VariableValue: boolean;
+  VariableValue: VariableValue;
   Weather: EWeather;
   WithBodyArmor: boolean;
   WithEquipped: boolean;
@@ -9652,7 +9653,7 @@ export type QuestNodePrototypeSetGlobalVariable = GetStructType<{
   QuestSID: string;
   Repeatable: boolean;
   SID: string;
-  VariableValue: boolean;
+  VariableValue: VariableValue;
 }>;
 
 export type QuestNodePrototypeSetHubOwner = GetStructType<{

package/utility-types.mts

@@ -29,6 +29,7 @@ export type Caliber =
   | "AVOG"
   | "None";
 
+export type VariableValue = boolean | number | string;
 export type WeaponShootDistance = "Long" | "Medium" | "Short";
 export type SID = string;
 export type Rank = "Newbie" | "Experienced" | "Veteran" | "Master";