@sv443-network/userutils 10.0.2 → 10.0.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @sv443-network/userutils
 
+## 10.0.4
+
+### Patch Changes
+
+- 13159d8: Updated CoreUtils to fix underlying encoding and decoding inconsistencies.
+
+## 10.0.3
+
+### Patch Changes
+
+- d7d3bea: Fixed decoding step when migrating DataStore data.
+
 ## 10.0.2
 
 ### Patch Changes

package/dist/UserUtils.cjs

@@ -114,7 +114,7 @@ __export(lib_exports, {
 });
 module.exports = __toCommonJS(lib_exports);
 
-// node_modules/.pnpm/@sv443-network+coreutils@3.0.2/node_modules/@sv443-network/coreutils/dist/CoreUtils.mjs
+// node_modules/.pnpm/@sv443-network+coreutils@3.0.4/node_modules/@sv443-network/coreutils/dist/CoreUtils.mjs
 function bitSetHas(bitSet, checkVal) {
   return (bitSet & checkVal) === checkVal;
 }
@@ -598,7 +598,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;
@@ -607,16 +606,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;
@@ -624,9 +616,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
   /**
@@ -651,8 +651,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}`));
@@ -674,7 +674,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);
@@ -781,7 +781,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)
     ]);
@@ -810,7 +810,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`),

package/dist/UserUtils.mjs

@@ -1,4 +1,4 @@
-// node_modules/.pnpm/@sv443-network+coreutils@3.0.2/node_modules/@sv443-network/coreutils/dist/CoreUtils.mjs
+// node_modules/.pnpm/@sv443-network+coreutils@3.0.4/node_modules/@sv443-network/coreutils/dist/CoreUtils.mjs
 function bitSetHas(bitSet, checkVal) {
   return (bitSet & checkVal) === checkVal;
 }
@@ -482,7 +482,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;
@@ -491,16 +490,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;
@@ -508,9 +500,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
   /**
@@ -535,8 +535,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}`));
@@ -558,7 +558,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);
@@ -665,7 +665,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)
     ]);
@@ -694,7 +694,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`),

package/dist/UserUtils.umd.js

@@ -183,7 +183,7 @@ __export(lib_exports, {
 });
 module.exports = __toCommonJS(lib_exports);
 
-// node_modules/.pnpm/@sv443-network+coreutils@3.0.2/node_modules/@sv443-network/coreutils/dist/CoreUtils.mjs
+// node_modules/.pnpm/@sv443-network+coreutils@3.0.4/node_modules/@sv443-network/coreutils/dist/CoreUtils.mjs
 function bitSetHas(bitSet, checkVal) {
   return (bitSet & checkVal) === checkVal;
 }
@@ -681,40 +681,40 @@ var DataStore = class {
     __publicField(this, "cachedData");
     __publicField(this, "migrations");
     __publicField(this, "migrateIds", []);
-    var _a2, _b, _c;
-    var _a;
+    var _a, _b;
     this.id = opts.id;
     this.formatVersion = opts.formatVersion;
     this.defaultData = opts.defaultData;
-    this.memoryCache = Boolean((_a2 = opts.memoryCache) != null ? _a2 : true);
+    this.memoryCache = Boolean((_a = opts.memoryCache) != null ? _a : true);
     this.cachedData = this.memoryCache ? opts.defaultData : {};
     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 = (_b = (_a = opts.encodeData) == null ? void 0 : _a[0]) != null ? _b : "deflate-raw";
-    if (typeof opts.compressionFormat === "string") {
-      this.encodeData = [opts.compressionFormat, (data) => __async(this, null, function* () {
-        return yield compress(data, opts.compressionFormat, "string");
-      })];
-      this.decodeData = [opts.compressionFormat, (data) => __async(this, null, function* () {
-        return yield 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 = (_c = opts.encodeData[0]) != null ? _c : null;
+      this.compressionFormat = (_b = opts.encodeData[0]) != null ? _b : null;
     } else if (opts.compressionFormat === null) {
       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, (data) => __async(this, null, function* () {
+        return yield compress(data, fmt, "string");
+      })];
+      this.decodeData = [fmt, (data) => __async(this, null, function* () {
+        return yield decompress(data, fmt, "string");
+      })];
+    }
+    this.engine.setDataStoreOptions({
+      id: this.id,
+      encodeData: this.encodeData,
+      decodeData: this.decodeData
+    });
   }
   //#region loadData
   /**
@@ -741,8 +741,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 ? (_a = this.compressionFormat) != null ? _a : 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) ? (_a = this.compressionFormat) != null ? _a : null : null);
             else {
               promises.push(this.engine.setValue(`__ds-${this.id}-enf`, this.compressionFormat));
               promises.push(this.engine.deleteValue(`_uucfgenc-${this.id}`));
@@ -764,7 +764,7 @@ var DataStore = class {
         }
         const storedData = storedDataRaw != null ? storedDataRaw : JSON.stringify(this.defaultData);
         const encodingFmt = String(yield 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)) {
           yield this.engine.setValue(`__ds-${this.id}-ver`, storedFmtVer = this.formatVersion);
@@ -877,7 +877,7 @@ var DataStore = class {
         }
       }
       yield Promise.allSettled([
-        this.engine.setValue(`__ds-${this.id}-dat`, yield this.engine.serializeData(newData)),
+        this.engine.setValue(`__ds-${this.id}-dat`, yield this.engine.serializeData(newData, this.encodingEnabled())),
         this.engine.setValue(`__ds-${this.id}-ver`, lastFmtVer),
         this.engine.setValue(`__ds-${this.id}-enf`, this.compressionFormat)
       ]);
@@ -908,7 +908,7 @@ var DataStore = class {
           return;
         const parsed = yield this.engine.deserializeData(data, isEncoded);
         yield Promise.allSettled([
-          this.engine.setValue(`__ds-${this.id}-dat`, yield this.engine.serializeData(parsed)),
+          this.engine.setValue(`__ds-${this.id}-dat`, yield 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`),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sv443-network/userutils",
   "libName": "UserUtils",
-  "version": "10.0.2",
+  "version": "10.0.4",
   "description": "General purpose DOM/GreaseMonkey library that allows you to register listeners for when CSS selectors exist, intercept events, create persistent & synchronous data stores, modify the DOM more easily and much more",
   "main": "dist/UserUtils.mjs",
   "module": "dist/UserUtils.mjs",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/Sv443-Network/UserUtils",
   "dependencies": {
-    "@sv443-network/coreutils": "3.0.2",
+    "@sv443-network/coreutils": "3.0.4",
     "nanoevents": "9.1.0"
   },
   "devDependencies": {