s2cfgtojson 2.1.6 → 2.2.7

package/Struct.mts

@@ -1,5 +1,6 @@
 const defaultEntries = new Set(["_isArray", "_useAsterisk"]);
 export * from "./types.mts";
+export * from "./enums.mts";
 import { DefaultEntries, Value, Entries, Struct as IStruct } from "./types.mts";
 
 /**
@@ -210,12 +211,15 @@ export abstract class Struct<T extends Entries = {}> implements IStruct<T> {
         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];
+          // understand +- 0.1f / 1. / 0.f / .1 / .1f -> ((\d*)\.?(\d+)|(\d+)\.?(\d*))f?
+          const matches = value.match(/^(-?)(\d*)\.?(\d*)f?$/);
+          const minus = matches[1];
+          const first = matches[2];
+          const second = matches[3];
           if (first || second) {
-            value = parseFloat(`${first || 0}${second ? `.${second}` : ""}`);
+            value = parseFloat(
+              `${minus ? "-" : ""}${first || 0}${second ? `.${second}` : ""}`,
+            );
           } else {
             value = JSON.parse(value);
           }

package/Struct.test.mts

@@ -195,15 +195,17 @@ struct.end`;
          N3 = 0.f 
          N4 = .1 
          N5 = .1f
+         N6 = -2.22f
        struct.end`;
-      const str = Struct.fromString<
-        Struct<{ N1: number; N2: number; N3: number; N4: number; N5: number }>
-      >(dynamicItemGeneratorText);
+      const str = Struct.fromString<Struct<{ [key: `N${number}`]: number }>>(
+        dynamicItemGeneratorText,
+      );
       expect(str[0].entries.N1).toBe(0.1);
       expect(str[0].entries.N2).toBe(1);
       expect(str[0].entries.N3).toBe(0);
       expect(str[0].entries.N4).toBe(0.1);
       expect(str[0].entries.N5).toBe(0.1);
+      expect(str[0].entries.N6).toBe(-2.22);
     });
   });
 });