@ztimson/utils 0.27.8 → 0.27.10

package/dist/index.d.ts

@@ -9,6 +9,7 @@ export * from './files';
 export * from './emitter';
 export * from './errors';
 export * from './http';
+export * from './json';
 export * from './jwt';
 export * from './logger';
 export * from './math';

package/dist/index.mjs

@@ -117,6 +117,27 @@ ${opts.message || this.desc}`;
 `;
   }
 }
+function JSONAttemptParse(json, fallback) {
+  try {
+    return JSON.parse(json);
+  } catch {
+    return fallback ?? json;
+  }
+}
+function JSONSerialize(obj) {
+  if (typeof obj == "object" && obj != null) return JSONSanitize(obj);
+  return obj;
+}
+function JSONSanitize(obj, space) {
+  const cache = [];
+  return JSON.stringify(obj, (key, value) => {
+    if (typeof value === "object" && value !== null) {
+      if (cache.includes(value)) return "[Circular]";
+      cache.push(value);
+    }
+    return value;
+  }, space);
+}
 function applyDeltas(base, ...deltas) {
   function applyDelta(base2, delta) {
     if (delta === null) return null;
@@ -161,6 +182,9 @@ function clean(obj, undefinedOnly = false) {
   return obj;
 }
 function deepCopy(value) {
+  if (value == null) return value;
+  const t = typeof value;
+  if (t === "string" || t === "number" || t === "boolean" || t === "function") return value;
   try {
     return structuredClone(value);
   } catch {
@@ -270,27 +294,6 @@ function mixin(target, constructors) {
 function objectMap(obj, fn2) {
   return Object.entries(obj).map(([key, value]) => [key, fn2(key, value)]).reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
 }
-function JSONAttemptParse(json) {
-  try {
-    return JSON.parse(json);
-  } catch {
-    return json;
-  }
-}
-function JSONSerialize(obj) {
-  if (typeof obj == "object" && obj != null) return JSONSanitize(obj);
-  return obj;
-}
-function JSONSanitize(obj, space) {
-  const cache = [];
-  return JSON.stringify(obj, (key, value) => {
-    if (typeof value === "object" && value !== null) {
-      if (cache.includes(value)) return "[Circular]";
-      cache.push(value);
-    }
-    return value;
-  }, space);
-}
 class ASet extends Array {
   /** Number of elements in set */
   get size() {
@@ -463,10 +466,7 @@ class Cache {
     __publicField(this, "complete", false);
     /** Await initial loading */
     __publicField(this, "loading", new Promise((r) => this._loading = r));
-    /**
-     * Get all cached items
-     * @return {T[]} Array of items
-     */
+    /** Get all cached items */
     __publicField(this, "values", this.all);
     var _a, _b, _c, _d;
     this.key = key;
@@ -514,6 +514,7 @@ class Cache {
     if (value[this.key] === void 0) throw new Error(`${this.key.toString()} Doesn't exist on ${JSON.stringify(value, null, 2)}`);
     return value[this.key];
   }
+  /** Save item to storage */
   save(key) {
     var _a, _b;
     const persists = this.options.persistentStorage;
@@ -567,9 +568,6 @@ class Cache {
   }
   /**
    * Add a new item to the cache. Like set, but finds key automatically
-   * @param {T} value Item to add to cache
-   * @param {number | undefined} ttl Override default expiry
-   * @return {this}
    */
   add(value, ttl = this.ttl) {
     const key = this.getKey(value);
@@ -578,9 +576,6 @@ class Cache {
   }
   /**
    * Add several rows to the cache
-   * @param {T[]} rows Several items that will be cached using the default key
-   * @param complete Mark cache as complete & reliable, defaults to true
-   * @return {this}
    */
   addAll(rows, complete = true) {
     this.clear();
@@ -588,9 +583,7 @@ class Cache {
     this.complete = complete;
     return this;
   }
-  /**
-   * Remove all keys from cache
-   */
+  /** Remove all keys */
   clear() {
     this.complete = false;
     for (const [k, t] of this.timers) clearTimeout(t);
@@ -600,10 +593,7 @@ class Cache {
     this.save();
     return this;
   }
-  /**
-   * Delete an item from the cache
-   * @param {K} key Item's primary key
-   */
+  /** Delete a cached item */
   delete(key) {
     this.clearTimer(key);
     const idx = this.lruOrder.indexOf(key);
@@ -612,10 +602,7 @@ class Cache {
     this.save(key);
     return this;
   }
-  /**
-   * Return cache as an array of key-value pairs
-   * @return {[K, T][]} Key-value pairs array
-   */
+  /** Return entries as array */
   entries(expired) {
     const out = [];
     for (const [k, v] of this.store.entries()) {
@@ -624,10 +611,7 @@ class Cache {
     }
     return out;
   }
-  /**
-   * Manually expire a cached item
-   * @param {K} key Key to expire
-   */
+  /** Manually expire a cached item */
   expire(key) {
     this.complete = false;
     if (this.options.expiryPolicy == "keep") {
@@ -640,12 +624,7 @@ class Cache {
     } else this.delete(key);
     return this;
   }
-  /**
-   * Find the first cached item to match a filter
-   * @param {Partial<T>} filter Partial item to match
-   * @param {Boolean} expired Include expired items, defaults to false
-   * @returns {T | undefined} Cached item or undefined if nothing matched
-   */
+  /** Find first matching item */
   find(filter, expired) {
     for (const v of this.store.values()) {
       const row = v;
@@ -653,24 +632,16 @@ class Cache {
     }
     return void 0;
   }
-  /**
-   * Get item from the cache
-   * @param {K} key Key to lookup
-   * @param expired Include expired items
-   * @return {T} Cached item
-   */
+  /** Get cached item by key */
   get(key, expired) {
     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;
+    const isExpired = raw == null ? void 0 : raw._expired;
+    if (expired || !isExpired) return deepCopy(raw);
     return null;
   }
-  /**
-   * Get a list of cached keys
-   * @return {K[]} Array of keys
-   */
+  /** Return list of keys */
   keys(expired) {
     const out = [];
     for (const [k, v] of this.store.entries()) {
@@ -679,10 +650,7 @@ class Cache {
     }
     return out;
   }
-  /**
-   * Get map of cached items
-   * @return {Record<K, T>}
-   */
+  /** Return map of key → item */
   map(expired) {
     const copy = {};
     for (const [k, v] of this.store.entries()) {
@@ -691,13 +659,7 @@ class Cache {
     }
     return copy;
   }
-  /**
-   * Add an item to the cache manually specifying the key
-   * @param {K} key Key item will be cached under
-   * @param {T} value Item to cache
-   * @param {number | undefined} ttl Override default expiry in seconds
-   * @return {this}
-   */
+  /** Add item manually specifying the key */
   set(key, value, ttl = this.options.ttl) {
     if (this.options.expiryPolicy == "keep") delete value._expired;
     this.clearTimer(key);
@@ -708,7 +670,7 @@ class Cache {
       const t = setTimeout(() => {
         this.expire(key);
         this.save(key);
-      }, (ttl || 0) * 1e3);
+      }, ttl * 1e3);
       this.timers.set(key, t);
     }
     return this;
@@ -2422,7 +2384,7 @@ class MemoryStorage {
   }
 }
 memoryStorage.MemoryStorage = MemoryStorage;
-(function(exports) {
+(function(exports$1) {
   var __createBinding = commonjsGlobal && commonjsGlobal.__createBinding || (Object.create ? function(o, m, k, k2) {
     if (k2 === void 0) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -2436,12 +2398,12 @@ memoryStorage.MemoryStorage = MemoryStorage;
     if (k2 === void 0) k2 = k;
     o[k2] = m[k];
   });
-  var __exportStar = commonjsGlobal && commonjsGlobal.__exportStar || function(m, exports2) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p)) __createBinding(exports2, m, p);
+  var __exportStar = commonjsGlobal && commonjsGlobal.__exportStar || function(m, exports$12) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$12, p)) __createBinding(exports$12, m, p);
   };
-  Object.defineProperty(exports, "__esModule", { value: true });
-  __exportStar(persist$1, exports);
-  __exportStar(memoryStorage, exports);
+  Object.defineProperty(exports$1, "__esModule", { value: true });
+  __exportStar(persist$1, exports$1);
+  __exportStar(memoryStorage, exports$1);
 })(dist);
 export {
   ASet,