@ztimson/utils 0.27.4 → 0.27.6

package/dist/index.mjs

@@ -452,17 +452,19 @@ class Cache {
    * @param options
    */
   constructor(key, options = {}) {
-    __publicField(this, "store", {});
+    __publicField(this, "_loading");
+    __publicField(this, "store", /* @__PURE__ */ new Map());
+    __publicField(this, "timers", /* @__PURE__ */ new Map());
+    __publicField(this, "lruOrder", []);
     /** Whether cache is complete */
     __publicField(this, "complete", false);
-    __publicField(this, "_loading");
     /** Await initial loading */
     __publicField(this, "loading", new Promise((r) => this._loading = r));
     /**
      * Get all cached items
      * @return {T[]} Array of items
      */
-    __publicField(this, "values", this.all());
+    __publicField(this, "values", this.all);
     var _a, _b, _c, _d;
     this.key = key;
     this.options = options;
@@ -474,14 +476,18 @@ class Cache {
           const persists = this.options.persistentStorage;
           const table = await persists.storage.createTable({ name: persists.key, key: this.key });
           const rows = await table.getAll();
-          Object.assign(this.store, rows.reduce((acc, row) => ({ ...acc, [this.getKey(row)]: row }), {}));
+          for (const row of rows) this.store.set(this.getKey(row), row);
           this._loading();
         })();
       } else if (((_d = (_c = this.options.persistentStorage) == null ? void 0 : _c.storage) == null ? void 0 : _d.getItem) != void 0) {
-        const stored = this.options.persistentStorage.storage.getItem(this.options.persistentStorage.key);
-        if (stored != null) try {
-          Object.assign(this.store, JSON.parse(stored));
-        } catch {
+        const { storage, key: key2 } = this.options.persistentStorage;
+        const stored = storage.getItem(key2);
+        if (stored != null) {
+          try {
+            const obj = JSON.parse(stored);
+            for (const k of Object.keys(obj)) this.store.set(k, obj[k]);
+          } catch {
+          }
         }
         this._loading();
       }
@@ -511,26 +517,50 @@ class Cache {
     if (!!(persists == null ? void 0 : persists.storage)) {
       if (((_a = persists.storage) == null ? void 0 : _a.database) != void 0) {
         persists.storage.createTable({ name: persists.key, key: this.key }).then((table) => {
-          if (key) {
-            const value = this.get(key);
+          if (key !== void 0) {
+            const value = this.get(key, true);
             if (value != null) table.set(value, key);
             else table.delete(key);
           } else {
             table.clear();
-            this.all().forEach((row) => table.add(row));
+            this.all(true).forEach((row) => table.add(row));
           }
         });
       } else if (((_b = persists.storage) == null ? void 0 : _b.setItem) != void 0) {
-        persists.storage.setItem(persists.storage.key, JSONSanitize(this.all(true)));
+        const obj = {};
+        for (const [k, v] of this.store.entries()) obj[k] = v;
+        persists.storage.setItem(persists.key, JSONSanitize(obj));
       }
     }
   }
+  clearTimer(key) {
+    const t = this.timers.get(key);
+    if (t) {
+      clearTimeout(t);
+      this.timers.delete(key);
+    }
+  }
+  touchLRU(key) {
+    if (!this.options.sizeLimit || this.options.sizeLimit <= 0) return;
+    const idx = this.lruOrder.indexOf(key);
+    if (idx >= 0) this.lruOrder.splice(idx, 1);
+    this.lruOrder.push(key);
+    while (this.lruOrder.length > (this.options.sizeLimit || 0)) {
+      const lru = this.lruOrder.shift();
+      if (lru !== void 0) this.delete(lru);
+    }
+  }
   /**
    * Get all cached items
    * @return {T[]} Array of items
    */
   all(expired) {
-    return deepCopy(Object.values(this.store).filter((v) => expired || !v._expired));
+    const out = [];
+    for (const v of this.store.values()) {
+      const val = v;
+      if (expired || !(val == null ? void 0 : val._expired)) out.push(deepCopy(val));
+    }
+    return out;
   }
   /**
    * Add a new item to the cache. Like set, but finds key automatically
@@ -560,7 +590,10 @@ class Cache {
    */
   clear() {
     this.complete = false;
-    this.store = {};
+    for (const [k, t] of this.timers) clearTimeout(t);
+    this.timers.clear();
+    this.lruOrder = [];
+    this.store.clear();
     this.save();
     return this;
   }
@@ -569,7 +602,10 @@ class Cache {
    * @param {K} key Item's primary key
    */
   delete(key) {
-    delete this.store[key];
+    this.clearTimer(key);
+    const idx = this.lruOrder.indexOf(key);
+    if (idx >= 0) this.lruOrder.splice(idx, 1);
+    this.store.delete(key);
     this.save(key);
     return this;
   }
@@ -578,7 +614,12 @@ class Cache {
    * @return {[K, T][]} Key-value pairs array
    */
   entries(expired) {
-    return deepCopy(Object.entries(this.store).filter((v) => expired || !(v == null ? void 0 : v._expired)));
+    const out = [];
+    for (const [k, v] of this.store.entries()) {
+      const val = v;
+      if (expired || !(val == null ? void 0 : val._expired)) out.push([k, deepCopy(val)]);
+    }
+    return out;
   }
   /**
    * Manually expire a cached item
@@ -587,8 +628,12 @@ class Cache {
   expire(key) {
     this.complete = false;
     if (this.options.expiryPolicy == "keep") {
-      this.store[key]._expired = true;
-      this.save(key);
+      const v = this.store.get(key);
+      if (v) {
+        v._expired = true;
+        this.store.set(key, v);
+        this.save(key);
+      }
     } else this.delete(key);
     return this;
   }
@@ -599,7 +644,11 @@ class Cache {
    * @returns {T | undefined} Cached item or undefined if nothing matched
    */
   find(filter, expired) {
-    return Object.values(this.store).find((row) => (expired || !row._expired) && includes(row, filter));
+    for (const v of this.store.values()) {
+      const row = v;
+      if ((expired || !row._expired) && includes(row, filter)) return deepCopy(row);
+    }
+    return void 0;
   }
   /**
    * Get item from the cache
@@ -608,7 +657,10 @@ class Cache {
    * @return {T} Cached item
    */
   get(key, expired) {
-    const cached = deepCopy(this.store[key] ?? null);
+    const raw = this.store.get(key);
+    if (raw == null) return null;
+    const cached = deepCopy(raw);
+    this.touchLRU(key);
     if (expired || !(cached == null ? void 0 : cached._expired)) return cached;
     return null;
   }
@@ -617,17 +669,23 @@ class Cache {
    * @return {K[]} Array of keys
    */
   keys(expired) {
-    return Object.keys(this.store).filter((k) => expired || !this.store[k]._expired);
+    const out = [];
+    for (const [k, v] of this.store.entries()) {
+      const val = v;
+      if (expired || !(val == null ? void 0 : val._expired)) out.push(k);
+    }
+    return out;
   }
   /**
    * Get map of cached items
    * @return {Record<K, T>}
    */
   map(expired) {
-    const copy = deepCopy(this.store);
-    if (!expired) Object.keys(copy).forEach((k) => {
-      if (copy[k]._expired) delete copy[k];
-    });
+    const copy = {};
+    for (const [k, v] of this.store.entries()) {
+      const val = v;
+      if (expired || !(val == null ? void 0 : val._expired)) copy[k] = deepCopy(val);
+    }
     return copy;
   }
   /**
@@ -639,12 +697,17 @@ class Cache {
    */
   set(key, value, ttl = this.options.ttl) {
     if (this.options.expiryPolicy == "keep") delete value._expired;
-    this.store[key] = value;
+    this.clearTimer(key);
+    this.store.set(key, value);
+    this.touchLRU(key);
     this.save(key);
-    if (ttl) setTimeout(() => {
-      this.expire(key);
-      this.save(key);
-    }, (ttl || 0) * 1e3);
+    if (ttl) {
+      const t = setTimeout(() => {
+        this.expire(key);
+        this.save(key);
+      }, (ttl || 0) * 1e3);
+      this.timers.set(key, t);
+    }
     return this;
   }
 }
@@ -1817,6 +1880,28 @@ function compareVersions(target, vs) {
   const [vMajor, vMinor, vPatch] = vs.split(".").map((v) => +v.replace(/[^0-9]/g, ""));
   return tMajor > vMajor || tMinor > vMinor || tPatch > vPatch ? 1 : tMajor < vMajor || tMinor < vMinor || tPatch < vPatch ? -1 : 0;
 }
+function consoleInterceptor(out = console, map) {
+  const stderr = [], stdout = [];
+  const cWrapper = (type) => (...args) => {
+    if (out) out[type](...args);
+    if (type == "error") stderr.push(...args);
+    else stdout.push(...args);
+  };
+  return {
+    debug: (map == null ? void 0 : map.debug) != "none" ? cWrapper((map == null ? void 0 : map.debug) || "debug") : () => {
+    },
+    log: (map == null ? void 0 : map.log) != "none" ? cWrapper((map == null ? void 0 : map.log) || "log") : () => {
+    },
+    info: (map == null ? void 0 : map.info) != "none" ? cWrapper((map == null ? void 0 : map.info) || "info") : () => {
+    },
+    warn: (map == null ? void 0 : map.warn) != "none" ? cWrapper((map == null ? void 0 : map.warn) || "warn") : () => {
+    },
+    error: (map == null ? void 0 : map.error) != "none" ? cWrapper((map == null ? void 0 : map.error) || "error") : () => {
+    },
+    stderr,
+    stdout
+  };
+}
 function escapeRegex(value) {
   return value.replace(/[.*+?^${}()|\[\]\\]/g, "\\$&");
 }
@@ -2403,6 +2488,7 @@ export {
   caseInsensitiveSort,
   clean,
   compareVersions,
+  consoleInterceptor,
   contrast,
   createJwt,
   dayOfWeek,