s2cfgtojson 2.1.1 → 2.1.3

package/Struct.mts

@@ -1,33 +1,12 @@
-export type Value = Omit<Struct, "toTs"> | string | boolean | number;
 const defaultEntries = new Set(["_isArray", "_useAsterisk"]);
-type DefaultEntries = { _isArray?: boolean; _useAsterisk?: boolean };
-export type Entries = Record<string | number, Value> & DefaultEntries;
-
-export type GetTsType<In extends Struct, E = In["entries"]> = {
-  [key in Exclude<keyof E, keyof DefaultEntries>]: E[key] extends Struct
-    ? GetTsType<E[key]>
-    : E[key];
-};
-type RKey<In> = Exclude<keyof In, keyof DefaultEntries>;
-
-export type GetStructType<In> =
-  In extends Array<any>
-    ? Struct<{ [key: number]: GetStructType<In[number]> }>
-    : In extends Record<any, any>
-      ? Struct<{ [key in RKey<In>]: GetStructType<In[key]> }>
-      : In extends string
-        ? string
-        : In extends number
-          ? number
-          : In extends boolean
-            ? boolean
-            : never;
+export * from "./types.mts";
+import { DefaultEntries, Value, Entries, Struct as IStruct } from "./types.mts";
 
 /**
  * This file is part of the Stalker 2 Modding Tools project.
  * This is a base class for all structs.
  */
-export abstract class Struct<T extends Entries = {}> {
+export abstract class Struct<T extends Entries = {}> implements IStruct<T> {
   isRoot?: boolean;
   refurl?: string;
   refkey?: string | number;
@@ -226,18 +205,22 @@ export abstract class Struct<T extends Entries = {}> {
         throw new Error(`Invalid key-value pair: ${line}`);
       }
       const key = match[1].trim();
-      let value: string | number = match[3].trim();
-      try {
-        // understand 0.1f / 1. / 0.f / .1 / .1f -> ((\d*)\.?(\d+)|(\d+)\.?(\d*))f?
-        const matches = value.match(/^(\d*)\.?(\d*)f?$/);
-        const first = matches[1];
-        const second = matches[2];
-        if (first || second) {
-          value = parseFloat(`${first || 0}${second ? `.${second}` : ""}`);
-        } else {
-          value = JSON.parse(value);
-        }
-      } catch (e) {}
+      let value: string | number | boolean = match[3].trim();
+      if (value === "true" || value === "false") {
+        value = value === "true";
+      } else {
+        try {
+          // understand 0.1f / 1. / 0.f / .1 / .1f -> ((\d*)\.?(\d+)|(\d+)\.?(\d*))f?
+          const matches = value.match(/^(\d*)\.?(\d*)f?$/);
+          const first = matches[1];
+          const second = matches[2];
+          if (first || second) {
+            value = parseFloat(`${first || 0}${second ? `.${second}` : ""}`);
+          } else {
+            value = JSON.parse(value);
+          }
+        } catch (e) {}
+      }
       Struct.addEntry(parent, key, value, index);
     };
     let index = 0;

package/Struct.test.mts

@@ -83,13 +83,13 @@ struct.end`,
    TriggeredCooldowns : struct.begin
       [0] : struct.begin
          CooldownTag = Ability.Cooldown.RunAttack
-         Duration = 50.f
+         Duration = 50
       struct.end
    struct.end
    Effects : struct.begin
       [0] : struct.begin
          EffectPrototypeSID = MutantMediumAttackCameraShake
-         Chance = 1.f
+         Chance = 1
       struct.end
    struct.end
 struct.end`;
@@ -129,8 +129,8 @@ struct.end`;
             [0] : struct.begin
                ItemPrototypeSID = DutyArmor_3_U1
                Weight = 1
-               MinDurability = 1.
-               MaxDurability = 1.
+               MinDurability = 1
+               MaxDurability = 1
             struct.end
          struct.end
       struct.end
@@ -176,8 +176,8 @@ struct.end`;
             [0] : struct.begin
                ItemPrototypeSID = DutyMask_1
                Weight = 2
-               MinDurability = 1.
-               MaxDurability = 1.
+               MinDurability = 1
+               MaxDurability = 1
             struct.end
          struct.end
       struct.end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s2cfgtojson",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Converts Stalker 2 Cfg file into a POJO",
   "keywords": [
     "stalker",