s2cfgtojson 2.0.1 → 2.0.3

package/Struct.mts

@@ -1,4 +1,5 @@
 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;
 
@@ -10,7 +11,13 @@ export type GetTsType<In extends Struct, E = In["entries"]> = {
 export type GetStructType<In extends Record<string | number, any>> = Struct<{
   [key in Exclude<keyof In, keyof DefaultEntries>]: In[key] extends In
     ? GetStructType<In[key]>
-    : In[key];
+    : In[key] extends string
+      ? string
+      : In[key] extends number
+        ? number
+        : In[key] extends boolean
+          ? boolean
+          : In[key];
 }>;
 
 /**
@@ -125,13 +132,15 @@ export abstract class Struct<T extends Entries = {}> {
     const collect = (struct: Struct) => {
       const obj = {};
       if (struct.entries) {
-        Object.entries(struct.entries).forEach(([key, value]) => {
-          if (value instanceof Struct) {
-            obj[key] = collect(value);
-          } else {
-            obj[key] = value;
-          }
-        });
+        Object.entries(struct.entries)
+          .filter(([key]) => !defaultEntries.has(key))
+          .forEach(([key, value]) => {
+            if (value instanceof Struct) {
+              obj[key] = collect(value);
+            } else {
+              obj[key] = value;
+            }
+          });
       }
       return obj;
     };

package/package.json

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