@sv443-network/coreutils 3.0.2 → 3.0.4

package/dist/CoreUtils.mjs

@@ -496,7 +496,6 @@ var DataStore = class {
    * @param opts The options for this DataStore instance
    */
   constructor(opts) {
-    var _a;
     this.id = opts.id;
     this.formatVersion = opts.formatVersion;
     this.defaultData = opts.defaultData;
@@ -505,16 +504,9 @@ var DataStore = class {
     this.migrations = opts.migrations;
     if (opts.migrateIds)
       this.migrateIds = Array.isArray(opts.migrateIds) ? opts.migrateIds : [opts.migrateIds];
-    this.encodeData = opts.encodeData;
-    this.decodeData = opts.decodeData;
     this.engine = typeof opts.engine === "function" ? opts.engine() : opts.engine;
     this.options = opts;
-    if (typeof opts.compressionFormat === "undefined")
-      this.compressionFormat = opts.compressionFormat = ((_a = opts.encodeData) == null ? void 0 : _a[0]) ?? "deflate-raw";
-    if (typeof opts.compressionFormat === "string") {
-      this.encodeData = [opts.compressionFormat, async (data) => await compress(data, opts.compressionFormat, "string")];
-      this.decodeData = [opts.compressionFormat, async (data) => await compress(data, opts.compressionFormat, "string")];
-    } else if ("encodeData" in opts && "decodeData" in opts && Array.isArray(opts.encodeData) && Array.isArray(opts.decodeData)) {
+    if ("encodeData" in opts && "decodeData" in opts && Array.isArray(opts.encodeData) && Array.isArray(opts.decodeData)) {
       this.encodeData = [opts.encodeData[0], opts.encodeData[1]];
       this.decodeData = [opts.decodeData[0], opts.decodeData[1]];
       this.compressionFormat = opts.encodeData[0] ?? null;
@@ -522,9 +514,17 @@ var DataStore = class {
       this.encodeData = void 0;
       this.decodeData = void 0;
       this.compressionFormat = null;
-    } else
-      throw new TypeError("Either `compressionFormat` or `encodeData` and `decodeData` have to be set and valid, but not all three at a time. Please refer to the documentation for more info.");
-    this.engine.setDataStoreOptions(opts);
+    } else {
+      const fmt = typeof opts.compressionFormat === "string" ? opts.compressionFormat : "deflate-raw";
+      this.compressionFormat = fmt;
+      this.encodeData = [fmt, async (data) => await compress(data, fmt, "string")];
+      this.decodeData = [fmt, async (data) => await decompress(data, fmt, "string")];
+    }
+    this.engine.setDataStoreOptions({
+      id: this.id,
+      encodeData: this.encodeData,
+      decodeData: this.decodeData
+    });
   }
   //#region loadData
   /**
@@ -549,8 +549,8 @@ var DataStore = class {
           migrateFmt(`_uucfg-${this.id}`, `__ds-${this.id}-dat`, oldData);
           if (!isNaN(oldVer))
             migrateFmt(`_uucfgver-${this.id}`, `__ds-${this.id}-ver`, oldVer);
-          if (typeof oldEnc === "boolean")
-            migrateFmt(`_uucfgenc-${this.id}`, `__ds-${this.id}-enf`, oldEnc === true ? this.compressionFormat ?? null : null);
+          if (typeof oldEnc === "boolean" || oldEnc === "true" || oldEnc === "false" || typeof oldEnc === "number" || oldEnc === "0" || oldEnc === "1")
+            migrateFmt(`_uucfgenc-${this.id}`, `__ds-${this.id}-enf`, [0, "0", true, "true"].includes(oldEnc) ? this.compressionFormat ?? null : null);
           else {
             promises.push(this.engine.setValue(`__ds-${this.id}-enf`, this.compressionFormat));
             promises.push(this.engine.deleteValue(`_uucfgenc-${this.id}`));
@@ -572,7 +572,7 @@ var DataStore = class {
       }
       const storedData = storedDataRaw ?? JSON.stringify(this.defaultData);
       const encodingFmt = String(await this.engine.getValue(`__ds-${this.id}-enf`, null));
-      const isEncoded = encodingFmt !== "null" && encodingFmt !== "false";
+      const isEncoded = encodingFmt !== "null" && encodingFmt !== "false" && encodingFmt !== "0" && encodingFmt !== "" && encodingFmt !== null;
       let saveData = false;
       if (isNaN(storedFmtVer)) {
         await this.engine.setValue(`__ds-${this.id}-ver`, storedFmtVer = this.formatVersion);
@@ -679,7 +679,7 @@ var DataStore = class {
       }
     }
     await Promise.allSettled([
-      this.engine.setValue(`__ds-${this.id}-dat`, await this.engine.serializeData(newData)),
+      this.engine.setValue(`__ds-${this.id}-dat`, await this.engine.serializeData(newData, this.encodingEnabled())),
       this.engine.setValue(`__ds-${this.id}-ver`, lastFmtVer),
       this.engine.setValue(`__ds-${this.id}-enf`, this.compressionFormat)
     ]);
@@ -708,7 +708,7 @@ var DataStore = class {
         return;
       const parsed = await this.engine.deserializeData(data, isEncoded);
       await Promise.allSettled([
-        this.engine.setValue(`__ds-${this.id}-dat`, await this.engine.serializeData(parsed)),
+        this.engine.setValue(`__ds-${this.id}-dat`, await this.engine.serializeData(parsed, this.encodingEnabled())),
         this.engine.setValue(`__ds-${this.id}-ver`, fmtVer),
         this.engine.setValue(`__ds-${this.id}-enf`, this.compressionFormat),
         this.engine.deleteValue(`__ds-${id}-dat`),