s2cfgtojson 2.3.0 → 3.0.1

package/Struct.mts

@@ -1,6 +1,6 @@
 export * from "./types.mts";
 export * from "./enums.mts";
-import { DefaultEntries, Struct as IStruct, Value } from "./types.mts";
+import { DefaultEntries, IStruct, Value } from "./types.mts";
 
 const TAB = "   ";
 const WILDCARD = "_wildcard";

package/Struct.test.mts

@@ -1,5 +1,11 @@
 import { describe, test, expect } from "vitest";
-import { createDynamicClassInstance, ERank, pad, Struct } from "./Struct.mjs";
+import {
+  createDynamicClassInstance,
+  ERank,
+  pad,
+  IStruct,
+  Struct,
+} from "./Struct.mjs";
 import fs from "node:fs";
 
 class ChimeraHPFix extends Struct {
@@ -196,7 +202,7 @@ struct.end`;
          N5 = .1f
          N6 = -2.22f
        struct.end`;
-      const str = Struct.fromString<Struct & { [key: `N${number}`]: number }>(
+      const str = Struct.fromString<IStruct & { [key: `N${number}`]: number }>(
         dynamicItemGeneratorText,
       );
       expect(str[0].N1).toBe(0.1);

package/package.json

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

package/types.mts

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