@sv443-network/coreutils 2.0.3 → 3.0.0

package/dist/CoreUtils.umd.js

@@ -99,6 +99,7 @@ var lib_exports = {};
 __export(lib_exports, {
   BrowserStorageEngine: () => BrowserStorageEngine,
   ChecksumMismatchError: () => ChecksumMismatchError,
+  CustomError: () => CustomError,
   DataStore: () => DataStore,
   DataStoreEngine: () => DataStoreEngine,
   DataStoreSerializer: () => DataStoreSerializer,
@@ -107,6 +108,8 @@ __export(lib_exports, {
   FileStorageEngine: () => FileStorageEngine,
   MigrationError: () => MigrationError,
   NanoEmitter: () => NanoEmitter,
+  NetworkError: () => NetworkError,
+  ScriptContextError: () => ScriptContextError,
   ValidationError: () => ValidationError,
   abtoa: () => abtoa,
   atoab: () => atoab,
@@ -126,6 +129,7 @@ __export(lib_exports, {
   digitCount: () => digitCount,
   fetchAdvanced: () => fetchAdvanced,
   formatNumber: () => formatNumber,
+  getCallStack: () => getCallStack,
   getListLength: () => getListLength,
   hexToRgb: () => hexToRgb,
   insertValues: () => insertValues,
@@ -242,7 +246,7 @@ function roundFixed(num, fractionDigits) {
   const scale = __pow(10, fractionDigits);
   return Math.round(num * scale) / scale;
 }
-function valsWithin(a, b, dec = 10, withinRange = 0.5) {
+function valsWithin(a, b, dec = 1, withinRange = 0.5) {
   return Math.abs(roundFixed(a, dec) - roundFixed(b, dec)) <= withinRange;
 }
 
@@ -400,6 +404,52 @@ function randomId(length = 16, radix = 16, enhancedEntropy = false, randomCase =
   return arr.map((v) => caseArr[randRange(0, caseArr.length - 1, enhancedEntropy)] === 1 ? v.toUpperCase() : v).join("");
 }
 
+// lib/Errors.ts
+var DatedError = class extends Error {
+  constructor(message, options) {
+    super(message, options);
+    __publicField(this, "date");
+    this.name = this.constructor.name;
+    this.date = /* @__PURE__ */ new Date();
+  }
+};
+var ChecksumMismatchError = class extends DatedError {
+  constructor(message, options) {
+    super(message, options);
+    this.name = "ChecksumMismatchError";
+  }
+};
+var CustomError = class extends DatedError {
+  constructor(name, message, options) {
+    super(message, options);
+    this.name = name;
+  }
+};
+var MigrationError = class extends DatedError {
+  constructor(message, options) {
+    super(message, options);
+    this.name = "MigrationError";
+  }
+};
+var ValidationError = class extends DatedError {
+  constructor(message, options) {
+    super(message, options);
+    this.name = "ValidationError";
+  }
+};
+var ScriptContextError = class extends DatedError {
+  constructor(message, options) {
+    super(message, options);
+    this.name = "ScriptContextError";
+  }
+};
+var NetworkError = class extends DatedError {
+  constructor(message, options) {
+    super(message, options);
+    this.name = "NetworkError";
+  }
+};
+
 // lib/misc.ts
 function consumeGen(valGen) {
   return __async(this, null, function* () {
@@ -430,7 +480,7 @@ function fetchAdvanced(_0) {
       return res;
     } catch (err) {
       typeof id !== "undefined" && clearTimeout(id);
-      throw new Error("Error while calling fetch", { cause: err });
+      throw new NetworkError("Error while calling fetch", { cause: err });
     }
   });
 }
@@ -442,7 +492,7 @@ function pauseFor(time, signal, rejectOnAbort = false) {
     const timeout = setTimeout(() => res(), time);
     signal == null ? void 0 : signal.addEventListener("abort", () => {
       clearTimeout(timeout);
-      rejectOnAbort ? rej(new Error("The pause was aborted")) : res();
+      rejectOnAbort ? rej(new CustomError("AbortError", "The pause was aborted")) : res();
     });
   });
 }
@@ -477,14 +527,25 @@ function scheduleExit(code = 0, timeout = 0) {
   if (timeout < 0)
     throw new TypeError("Timeout must be a non-negative number");
   let exit;
-  if (typeof process !== "undefined" && "exit" in process)
+  if (typeof process !== "undefined" && "exit" in process && typeof process.exit === "function")
     exit = () => process.exit(code);
-  else if (typeof Deno !== "undefined" && "exit" in Deno)
+  else if (typeof Deno !== "undefined" && "exit" in Deno && typeof Deno.exit === "function")
     exit = () => Deno.exit(code);
   else
-    throw new Error("Cannot exit the process, no exit method available");
+    throw new ScriptContextError("Cannot exit the process, no exit method available");
   setTimeout(exit, timeout);
 }
+function getCallStack(asArray, lines = Infinity) {
+  var _a;
+  if (typeof lines !== "number" || isNaN(lines) || lines < 0)
+    throw new TypeError("lines parameter must be a non-negative number");
+  try {
+    throw new Error("This is to capture a stack trace with CoreUtils.getCallStack(). (If you see this somewhere, you can safely ignore it.)");
+  } catch (err) {
+    const stack = ((_a = err.stack) != null ? _a : "").split("\n").map((line) => line.trim()).slice(2, lines + 2);
+    return asArray !== false ? stack : stack.join("\n");
+  }
+}
 
 // lib/text.ts
 function autoPlural(term, num, pluralType = "auto") {
@@ -554,16 +615,18 @@ function joinArrayReadable(array, separators = ", ", lastSeparator = " and ") {
   return arr.join(separators) + lastItm;
 }
 function secsToTimeStr(seconds) {
-  if (seconds < 0)
-    throw new TypeError("Seconds must be a positive number");
-  const hours = Math.floor(seconds / 3600);
-  const minutes = Math.floor(seconds % 3600 / 60);
-  const secs = Math.floor(seconds % 60);
-  return [
-    hours ? hours + ":" : "",
-    String(minutes).padStart(minutes > 0 || hours > 0 ? 2 : 1, "0"),
+  const isNegative = seconds < 0;
+  const s = Math.abs(seconds);
+  if (isNaN(s) || !isFinite(s))
+    throw new TypeError("The seconds argument must be a valid number");
+  const hrs = Math.floor(s / 3600);
+  const mins = Math.floor(s % 3600 / 60);
+  const secs = Math.floor(s % 60);
+  return (isNegative ? "-" : "") + [
+    hrs ? hrs + ":" : "",
+    String(mins).padStart(mins > 0 || hrs > 0 ? 2 : 1, "0"),
     ":",
-    String(secs).padStart(secs > 0 || minutes > 0 || hours > 0 ? 2 : 1, "0")
+    String(secs).padStart(secs > 0 || mins > 0 || hrs > 0 || seconds === 0 ? 2 : 1, "0")
   ].join("");
 }
 function truncStr(input, length, endStr = "...") {
@@ -573,37 +636,10 @@ function truncStr(input, length, endStr = "...") {
   return finalStr.length > length ? finalStr.substring(0, length) : finalStr;
 }
 
-// lib/Errors.ts
-var DatedError = class extends Error {
-  constructor(message, options) {
-    super(message, options);
-    __publicField(this, "date");
-    this.name = this.constructor.name;
-    this.date = /* @__PURE__ */ new Date();
-  }
-};
-var ChecksumMismatchError = class extends DatedError {
-  constructor(message, options) {
-    super(message, options);
-    this.name = "ChecksumMismatchError";
-  }
-};
-var MigrationError = class extends DatedError {
-  constructor(message, options) {
-    super(message, options);
-    this.name = "MigrationError";
-  }
-};
-var ValidationError = class extends DatedError {
-  constructor(message, options) {
-    super(message, options);
-    this.name = "ValidationError";
-  }
-};
-
 // lib/DataStore.ts
 var dsFmtVer = 1;
 var DataStore = class {
+  //#region constructor
   /**
    * Creates an instance of DataStore to manage a sync & async database that is cached in memory and persistently saved across sessions.  
    * Supports migrating data from older versions to newer ones and populating the cache with default data if no persistent data is found.  
@@ -620,6 +656,7 @@ var DataStore = class {
     __publicField(this, "encodeData");
     __publicField(this, "decodeData");
     __publicField(this, "compressionFormat", "deflate-raw");
+    __publicField(this, "memoryCache", true);
     __publicField(this, "engine");
     __publicField(this, "options");
     /**
@@ -632,11 +669,12 @@ var DataStore = class {
     __publicField(this, "cachedData");
     __publicField(this, "migrations");
     __publicField(this, "migrateIds", []);
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.id = opts.id;
     this.formatVersion = opts.formatVersion;
     this.defaultData = opts.defaultData;
-    this.cachedData = opts.defaultData;
+    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];
@@ -645,7 +683,7 @@ var DataStore = class {
     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";
+      this.compressionFormat = opts.compressionFormat = (_c = (_b = opts.encodeData) == null ? void 0 : _b[0]) != null ? _c : "deflate-raw";
     if (typeof opts.compressionFormat === "string") {
       this.encodeData = [opts.compressionFormat, (data) => __async(this, null, function* () {
         return yield compress(data, opts.compressionFormat, "string");
@@ -656,7 +694,7 @@ var DataStore = class {
     } else 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 = (_d = opts.encodeData[0]) != null ? _d : null;
     } else if (opts.compressionFormat === null) {
       this.encodeData = void 0;
       this.decodeData = void 0;
@@ -665,7 +703,7 @@ var DataStore = class {
       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);
   }
-  //#region public
+  //#region loadData
   /**
    * Loads the data saved in persistent storage into the in-memory cache and also returns a copy of it.  
    * Automatically populates persistent storage with default data if it doesn't contain any data yet.  
@@ -673,32 +711,33 @@ var DataStore = class {
    */
   loadData() {
     return __async(this, null, function* () {
+      var _a;
       try {
         if (this.firstInit) {
           this.firstInit = false;
           const dsVer = Number(yield this.engine.getValue("__ds_fmt_ver", 0));
-          if (isNaN(dsVer) || dsVer < 1) {
-            const oldData = yield this.engine.getValue(`_uucfg-${this.id}`, null);
-            if (oldData) {
-              const oldVer = Number(yield this.engine.getValue(`_uucfgver-${this.id}`, NaN));
-              const oldEnc = yield this.engine.getValue(`_uucfgenc-${this.id}`, null);
-              const promises = [];
-              const migrateFmt = (oldKey, newKey, value) => {
-                promises.push(this.engine.setValue(newKey, value));
-                promises.push(this.engine.deleteValue(oldKey));
-              };
-              if (oldData)
-                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 ? Boolean(this.compressionFormat) || null : null);
-              else
-                promises.push(this.engine.setValue(`__ds-${this.id}-enf`, this.compressionFormat));
-              yield Promise.allSettled(promises);
+          const oldData = yield this.engine.getValue(`_uucfg-${this.id}`, null);
+          if (oldData) {
+            const oldVer = Number(yield this.engine.getValue(`_uucfgver-${this.id}`, NaN));
+            const oldEnc = yield this.engine.getValue(`_uucfgenc-${this.id}`, null);
+            const promises = [];
+            const migrateFmt = (oldKey, newKey, value) => {
+              promises.push(this.engine.setValue(newKey, value));
+              promises.push(this.engine.deleteValue(oldKey));
+            };
+            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);
+            else {
+              promises.push(this.engine.setValue(`__ds-${this.id}-enf`, this.compressionFormat));
+              promises.push(this.engine.deleteValue(`_uucfgenc-${this.id}`));
             }
-            yield this.engine.setValue("__ds_fmt_ver", dsFmtVer);
+            yield Promise.allSettled(promises);
           }
+          if (isNaN(dsVer) || dsVer < dsFmtVer)
+            yield this.engine.setValue("__ds_fmt_ver", dsFmtVer);
         }
         if (this.migrateIds.length > 0) {
           yield this.migrateId(this.migrateIds);
@@ -708,7 +747,7 @@ var DataStore = class {
         let storedFmtVer = Number(yield this.engine.getValue(`__ds-${this.id}-ver`, NaN));
         if (typeof storedDataRaw !== "string") {
           yield this.saveDefaultData();
-          return __spreadValues({}, this.defaultData);
+          return this.engine.deepCopy(this.defaultData);
         }
         const storedData = storedDataRaw != null ? storedDataRaw : JSON.stringify(this.defaultData);
         const encodingFmt = String(yield this.engine.getValue(`__ds-${this.id}-enf`, null));
@@ -723,7 +762,10 @@ var DataStore = class {
           parsed = yield this.runMigrations(parsed, storedFmtVer);
         if (saveData)
           yield this.setData(parsed);
-        return this.cachedData = this.engine.deepCopy(parsed);
+        if (this.memoryCache)
+          return this.cachedData = this.engine.deepCopy(parsed);
+        else
+          return this.engine.deepCopy(parsed);
       } catch (err) {
         console.warn("Error while parsing JSON data, resetting it to the default value.", err);
         yield this.saveDefaultData();
@@ -731,16 +773,22 @@ var DataStore = class {
       }
     });
   }
+  //#region getData
   /**
    * Returns a copy of the data from the in-memory cache.  
-   * Use {@linkcode loadData()} to get fresh data from persistent storage (usually not necessary since the cache should always exactly reflect persistent storage).
+   * Use {@linkcode loadData()} to get fresh data from persistent storage (usually not necessary since the cache should always exactly reflect persistent storage).  
+   * ⚠️ If `memoryCache` was set to `false` in the constructor options, this method will throw an error.
    */
   getData() {
+    if (!this.memoryCache)
+      throw new DatedError("In-memory cache is disabled for this DataStore instance, so getData() can't be used. Please use loadData() instead.");
     return this.engine.deepCopy(this.cachedData);
   }
+  //#region setData
   /** Saves the data synchronously to the in-memory cache and asynchronously to the persistent storage */
   setData(data) {
-    this.cachedData = data;
+    if (this.memoryCache)
+      this.cachedData = data;
     return new Promise((resolve) => __async(this, null, function* () {
       yield Promise.allSettled([
         this.engine.setValue(`__ds-${this.id}-dat`, yield this.engine.serializeData(data, this.encodingEnabled())),
@@ -750,10 +798,12 @@ var DataStore = class {
       resolve();
     }));
   }
+  //#region saveDefaultData
   /** Saves the default data passed in the constructor synchronously to the in-memory cache and asynchronously to persistent storage */
   saveDefaultData() {
     return __async(this, null, function* () {
-      this.cachedData = this.defaultData;
+      if (this.memoryCache)
+        this.cachedData = this.defaultData;
       yield Promise.allSettled([
         this.engine.setValue(`__ds-${this.id}-dat`, yield this.engine.serializeData(this.defaultData, this.encodingEnabled())),
         this.engine.setValue(`__ds-${this.id}-ver`, this.formatVersion),
@@ -761,6 +811,7 @@ var DataStore = class {
       ]);
     });
   }
+  //#region deleteData
   /**
    * Call this method to clear all persistently stored data associated with this DataStore instance, including the storage container (if supported by the DataStoreEngine).  
    * The in-memory cache will be left untouched, so you may still access the data with {@linkcode getData()}  
@@ -777,11 +828,12 @@ var DataStore = class {
       yield (_b = (_a = this.engine).deleteStorage) == null ? void 0 : _b.call(_a);
     });
   }
+  //#region encodingEnabled
   /** Returns whether encoding and decoding are enabled for this DataStore instance */
   encodingEnabled() {
     return Boolean(this.encodeData && this.decodeData) && this.compressionFormat !== null || Boolean(this.compressionFormat);
   }
-  //#region migrations
+  //#region runMigrations
   /**
    * Runs all necessary migration functions consecutively and saves the result to the in-memory cache and persistent storage and also returns it.  
    * This method is automatically called by {@linkcode loadData()} if the data format has changed since the last time the data was saved.  
@@ -816,9 +868,13 @@ var DataStore = class {
         this.engine.setValue(`__ds-${this.id}-ver`, lastFmtVer),
         this.engine.setValue(`__ds-${this.id}-enf`, this.compressionFormat)
       ]);
-      return this.cachedData = __spreadValues({}, newData);
+      if (this.memoryCache)
+        return this.cachedData = this.engine.deepCopy(newData);
+      else
+        return this.engine.deepCopy(newData);
     });
   }
+  //#region migrateId
   /**
    * Tries to migrate the currently saved persistent data from one or more old IDs to the ID set in the constructor.  
    * If no data exist for the old ID(s), nothing will be done, but some time may still pass trying to fetch the non-existent data.
@@ -864,7 +920,7 @@ var DataStoreEngine = class {
     this.dataStoreOptions = dataStoreOptions;
   }
   //#region serialization api
-  /** Serializes the given object to a string, optionally encoded with `options.encodeData` if {@linkcode useEncoding} is set to true */
+  /** Serializes the given object to a string, optionally encoded with `options.encodeData` if {@linkcode useEncoding} is not set to false and the `encodeData` and `decodeData` options are set */
   serializeData(data, useEncoding) {
     return __async(this, null, function* () {
       var _a, _b, _c, _d, _e;
@@ -915,7 +971,7 @@ var BrowserStorageEngine = class extends DataStoreEngine {
    * Creates an instance of `BrowserStorageEngine`.  
    *   
    * - ⚠️ Requires a DOM environment  
-   * - ⚠️ Don't reuse engines across multiple {@linkcode DataStore} instances
+   * - ⚠️ Don't reuse engine instances, always create a new one for each {@linkcode DataStore} instance
    */
   constructor(options) {
     super(options == null ? void 0 : options.dataStoreOptions);
@@ -957,7 +1013,7 @@ var FileStorageEngine = class extends DataStoreEngine {
    * Creates an instance of `FileStorageEngine`.  
    *   
    * - ⚠️ Requires Node.js or Deno with Node compatibility (v1.31+)  
-   * - ⚠️ Don't reuse engines across multiple {@linkcode DataStore} instances
+   * - ⚠️ Don't reuse engine instances, always create a new one for each {@linkcode DataStore} instance
    */
   constructor(options) {
     super(options == null ? void 0 : options.dataStoreOptions);
@@ -977,7 +1033,7 @@ var FileStorageEngine = class extends DataStoreEngine {
         if (!fs)
           fs = (_a = yield import("fs/promises")) == null ? void 0 : _a.default;
         if (!fs)
-          throw new DatedError("FileStorageEngine requires Node.js or Deno with Node compatibility (v1.31+)", { cause: new Error("'node:fs/promises' module not available") });
+          throw new ScriptContextError("FileStorageEngine requires Node.js or Deno with Node compatibility (v1.31+)", { cause: new DatedError("'node:fs/promises' module not available") });
         const path = typeof this.options.filePath === "string" ? this.options.filePath : this.options.filePath(this.dataStoreOptions.id);
         const data = yield fs.readFile(path, "utf-8");
         return data ? JSON.parse((_e = yield (_d = (_c = (_b = this.dataStoreOptions) == null ? void 0 : _b.decodeData) == null ? void 0 : _c[1]) == null ? void 0 : _d.call(_c, data)) != null ? _e : data) : void 0;
@@ -995,7 +1051,7 @@ var FileStorageEngine = class extends DataStoreEngine {
         if (!fs)
           fs = (_a = yield import("fs/promises")) == null ? void 0 : _a.default;
         if (!fs)
-          throw new DatedError("FileStorageEngine requires Node.js or Deno with Node compatibility (v1.31+)", { cause: new Error("'node:fs/promises' module not available") });
+          throw new ScriptContextError("FileStorageEngine requires Node.js or Deno with Node compatibility (v1.31+)", { cause: new DatedError("'node:fs/promises' module not available") });
         const path = typeof this.options.filePath === "string" ? this.options.filePath : this.options.filePath(this.dataStoreOptions.id);
         yield fs.mkdir(path.slice(0, path.lastIndexOf(path.includes("/") ? "/" : "\\")), { recursive: true });
         yield fs.writeFile(path, (_e = yield (_d = (_c = (_b = this.dataStoreOptions) == null ? void 0 : _b.encodeData) == null ? void 0 : _c[1]) == null ? void 0 : _d.call(_c, JSON.stringify(data))) != null ? _e : JSON.stringify(data, void 0, 2), "utf-8");
@@ -1062,9 +1118,9 @@ var FileStorageEngine = class extends DataStoreEngine {
         if (!fs)
           fs = (_a = yield import("fs/promises")) == null ? void 0 : _a.default;
         if (!fs)
-          throw new DatedError("FileStorageEngine requires Node.js or Deno with Node compatibility (v1.31+)", { cause: new Error("'node:fs/promises' module not available") });
+          throw new ScriptContextError("FileStorageEngine requires Node.js or Deno with Node compatibility (v1.31+)", { cause: new DatedError("'node:fs/promises' module not available") });
         const path = typeof this.options.filePath === "string" ? this.options.filePath : this.options.filePath(this.dataStoreOptions.id);
-        yield fs.unlink(path);
+        return yield fs.unlink(path);
       } catch (err) {
         console.error("Error deleting file:", err);
       }
@@ -1078,11 +1134,12 @@ var DataStoreSerializer = class _DataStoreSerializer {
     __publicField(this, "stores");
     __publicField(this, "options");
     if (!crypto || !crypto.subtle)
-      throw new Error("DataStoreSerializer has to run in a secure context (HTTPS) or in another environment that implements the subtleCrypto API!");
+      throw new ScriptContextError("DataStoreSerializer has to run in a secure context (HTTPS) or in another environment that implements the subtleCrypto API!");
     this.stores = stores;
     this.options = __spreadValues({
       addChecksum: true,
-      ensureIntegrity: true
+      ensureIntegrity: true,
+      remapIds: {}
     }, options);
   }
   /** Calculates the checksum of a string */
@@ -1101,9 +1158,11 @@ var DataStoreSerializer = class _DataStoreSerializer {
     return __async(this, null, function* () {
       var _a;
       const serData = [];
-      for (const storeInst of this.stores.filter((s) => typeof stores === "function" ? stores(s.id) : stores.includes(s.id))) {
+      const filteredStores = this.stores.filter((s) => typeof stores === "function" ? stores(s.id) : stores.includes(s.id));
+      for (const storeInst of filteredStores) {
         const encoded = Boolean(useEncoding && storeInst.encodingEnabled() && ((_a = storeInst.encodeData) == null ? void 0 : _a[1]));
-        const data = encoded ? yield storeInst.encodeData[1](JSON.stringify(storeInst.getData())) : JSON.stringify(storeInst.getData());
+        const rawData = storeInst.memoryCache ? storeInst.getData() : yield storeInst.loadData();
+        const data = encoded ? yield storeInst.encodeData[1](JSON.stringify(rawData)) : JSON.stringify(rawData);
         serData.push({
           id: storeInst.id,
           data,
@@ -1134,10 +1193,18 @@ var DataStoreSerializer = class _DataStoreSerializer {
       const deserStores = typeof data === "string" ? JSON.parse(data) : data;
       if (!Array.isArray(deserStores) || !deserStores.every(_DataStoreSerializer.isSerializedDataStoreObj))
         throw new TypeError("Invalid serialized data format! Expected an array of SerializedDataStore objects.");
-      for (const storeData of deserStores.filter((s) => typeof stores === "function" ? stores(s.id) : stores.includes(s.id))) {
-        const storeInst = this.stores.find((s) => s.id === storeData.id);
+      const resolveStoreId = (id) => {
+        var _a, _b;
+        return (_b = (_a = Object.entries(this.options.remapIds).find(([, v]) => v.includes(id))) == null ? void 0 : _a[0]) != null ? _b : id;
+      };
+      const matchesFilter = (id) => typeof stores === "function" ? stores(id) : stores.includes(id);
+      for (const storeData of deserStores) {
+        const effectiveId = resolveStoreId(storeData.id);
+        if (!matchesFilter(effectiveId))
+          continue;
+        const storeInst = this.stores.find((s) => s.id === effectiveId);
         if (!storeInst)
-          throw new Error(`DataStore instance with ID "${storeData.id}" not found! Make sure to provide it in the DataStoreSerializer constructor.`);
+          throw new DatedError(`Can't deserialize data because no DataStore instance with the ID "${effectiveId}" was found! Make sure to provide it in the DataStoreSerializer constructor.`);
         if (this.options.ensureIntegrity && typeof storeData.checksum === "string") {
           const checksum = yield this.calcChecksum(storeData.data);
           if (checksum !== storeData.checksum)
@@ -1319,11 +1386,12 @@ var NanoEmitter = class {
    * `callback` (required) is the function that will be called when the conditions are met.  
    *   
    * Set `once` to true to call the callback only once for the first event (or set of events) that match the criteria, then stop listening.  
-   * If `signal` is provided, the subscription will be aborted when the given signal is aborted.  
+   * If `signal` is provided, the subscription will be canceled when the given signal is aborted.  
    *   
    * If `oneOf` is used, the callback will be called when any of the matching events are emitted.  
    * If `allOf` is used, the callback will be called after all of the matching events are emitted at least once, then any time any of them are emitted.  
-   * You may use a combination of the above two options, but at least one of them must be provided.  
+   * If both `oneOf` and `allOf` are used together, the callback will be called when any of the `oneOf` events are emitted AND all of the `allOf` events have been emitted at least once.  
+   * At least one of `oneOf` or `allOf` must be provided.  
    *   
    * @returns Returns a function that can be called to unsubscribe all listeners created by this call. Alternatively, pass an `AbortSignal` to all options objects to achieve the same effect or for finer control.
    */
@@ -1350,6 +1418,8 @@ var NanoEmitter = class {
       } = optsWithDefaults;
       if (signal == null ? void 0 : signal.aborted)
         return unsubAll;
+      if (oneOf.length === 0 && allOf.length === 0)
+        throw new TypeError("NanoEmitter.onMulti(): Either `oneOf` or `allOf` or both must be provided in the options");
       const curEvtUnsubs = [];
       const checkUnsubAllEvt = (force = false) => {
         if (!(signal == null ? void 0 : signal.aborted) && !force)
@@ -1359,34 +1429,31 @@ var NanoEmitter = class {
         curEvtUnsubs.splice(0, curEvtUnsubs.length);
         this.eventUnsubscribes = this.eventUnsubscribes.filter((u) => !curEvtUnsubs.includes(u));
       };
+      const allOfEmitted = /* @__PURE__ */ new Set();
+      const allOfConditionMet = () => allOf.length === 0 || allOfEmitted.size === allOf.length;
       for (const event of oneOf) {
         const unsub = this.events.on(event, ((...args) => {
           checkUnsubAllEvt();
-          callback(event, ...args);
-          if (once)
-            checkUnsubAllEvt(true);
+          if (allOfConditionMet()) {
+            callback(event, ...args);
+            if (once)
+              checkUnsubAllEvt(true);
+          }
         }));
         curEvtUnsubs.push(unsub);
       }
-      const allOfEmitted = /* @__PURE__ */ new Set();
-      const checkAllOf = (event, ...args) => {
-        checkUnsubAllEvt();
-        allOfEmitted.add(event);
-        if (allOfEmitted.size === allOf.length) {
-          callback(event, ...args);
-          if (once)
-            checkUnsubAllEvt(true);
-        }
-      };
       for (const event of allOf) {
         const unsub = this.events.on(event, ((...args) => {
           checkUnsubAllEvt();
-          checkAllOf(event, ...args);
+          allOfEmitted.add(event);
+          if (allOfConditionMet() && (oneOf.length === 0 || oneOf.includes(event))) {
+            callback(event, ...args);
+            if (once)
+              checkUnsubAllEvt(true);
+          }
         }));
         curEvtUnsubs.push(unsub);
       }
-      if (oneOf.length === 0 && allOf.length === 0)
-        throw new TypeError("NanoEmitter.onMulti(): Either `oneOf` or `allOf` or both must be provided in the options");
       allUnsubs.push(() => checkUnsubAllEvt(true));
     }
     return unsubAll;