@ztimson/utils 0.24.11 → 0.25.0

package/dist/cache.d.ts

@@ -52,12 +52,12 @@ export declare class Cache<K extends string | number | symbol, T> {
     /**
      * Remove all keys from cache
      */
-    clear(): void;
+    clear(): this;
     /**
      * Delete an item from the cache
      * @param {K} key Item's primary key
      */
-    delete(key: K): void;
+    delete(key: K): this;
     /**
      * Return cache as an array of key-value pairs
      * @return {[K, T][]} Key-value pairs array
@@ -67,13 +67,13 @@ export declare class Cache<K extends string | number | symbol, T> {
      * Manually expire a cached item
      * @param {K} key Key to expire
      */
-    expire(key: K): void;
+    expire(key: K): this;
     /**
      * Get item from the cache
      * @param {K} key Key to lookup
      * @return {T} Cached item
      */
-    get(key: K, expired?: boolean): T | null;
+    get(key: K, expired?: boolean): CachedValue<T> | null;
     /**
      * Get a list of cached keys
      * @return {K[]} Array of keys

package/dist/color.d.ts

@@ -3,4 +3,4 @@
  * @param {string} background Color to compare against
  * @return {"white" | "black"} Color with the most contrast
  */
-export declare function blackOrWhite(background: string): 'white' | 'black';
+export declare function contrast(background: string): 'white' | 'black';

package/dist/index.cjs

@@ -65,7 +65,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
             extras.push(arg);
             continue;
           }
-          const value = argDef.default === false ? true : argDef.default === true ? false : queue.splice(queue.findIndex((q) => q[0] != "-"), 1)[0] || argDef.default;
+          const value = combined[1] != null ? combined[1] : argDef.default === false ? true : argDef.default === true ? false : queue.splice(queue.findIndex((q) => q[0] != "-"), 1)[0] || argDef.default;
           if (value == null) parsed["_error"].push(`Option missing value: ${argDef.name || combined[0]}`);
           parsed[argDef.name] = value;
         } else {
@@ -124,7 +124,7 @@ ${opts.message || this.desc}`;
   function clean(obj, undefinedOnly = false) {
     if (obj == null) throw new Error("Cannot clean a NULL value");
     if (Array.isArray(obj)) {
-      obj = obj.filter((o) => o != null);
+      obj = obj.filter((o) => undefinedOnly ? o !== void 0 : o != null);
     } else {
       Object.entries(obj).forEach(([key, value]) => {
         if (undefinedOnly && value === void 0 || !undefinedOnly && value == null) delete obj[key];
@@ -175,7 +175,6 @@ ${opts.message || this.desc}`;
       for (const key of Object.keys(obj)) {
         const propName = parent ? `${parent}.${key}` : key;
         if (typeof obj[key] === "object" && obj[key] != null && !Array.isArray(obj[key])) {
-          console.log(propName);
           flattenObj(obj[key], propName, result);
         } else {
           result[propName] = obj[key];
@@ -231,55 +230,15 @@ ${opts.message || this.desc}`;
     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 addUnique(array, el) {
-    if (array.indexOf(el) === -1) array.push(el);
-    return array;
-  }
-  function arrayDiff(a, b) {
-    return makeUnique([
-      ...a.filter((v1) => !b.includes((v2) => isEqual(v1, v2))),
-      ...b.filter((v1) => !a.includes((v2) => isEqual(v1, v2)))
-    ]);
-  }
-  function caseInsensitiveSort(prop) {
-    return function(a, b) {
-      const aVal = dotNotation(a, prop);
-      const bVal = dotNotation(b, prop);
-      if (typeof aVal !== "string" || typeof bVal !== "string") return 1;
-      return aVal.toLowerCase().localeCompare(bVal.toLowerCase());
-    };
-  }
-  function findByProp(prop, value) {
-    return (v) => isEqual(dotNotation(v, prop), value);
-  }
-  function flattenArr(arr, result = []) {
-    arr.forEach((el) => Array.isArray(el) ? flattenArr(el, result) : result.push(el));
-    return result;
-  }
-  function sortByProp(prop, reverse = false) {
-    return function(a, b) {
-      const aVal = dotNotation(a, prop);
-      const bVal = dotNotation(b, prop);
-      if (typeof aVal == "number" && typeof bVal == "number")
-        return (reverse ? -1 : 1) * (aVal - bVal);
-      if (aVal > bVal) return reverse ? -1 : 1;
-      if (aVal < bVal) return reverse ? 1 : -1;
-      return 0;
-    };
-  }
-  function makeUnique(arr) {
-    for (let i = arr.length - 1; i >= 0; i--) {
-      if (arr.slice(0, i).find((n) => isEqual(n, arr[i]))) arr.splice(i, 1);
-    }
-    return arr;
-  }
-  function makeArray(value) {
-    return Array.isArray(value) ? value : [value];
-  }
   class ASet extends Array {
     /** Number of elements in set */
     get size() {
@@ -395,6 +354,48 @@ ${opts.message || this.desc}`;
       return new ASet([...this, ...set]);
     }
   }
+  function addUnique(array, el) {
+    if (array.indexOf(el) === -1) array.push(el);
+    return array;
+  }
+  function arrayDiff(a, b) {
+    return new ASet(a).symmetricDifference(new ASet(b));
+  }
+  function caseInsensitiveSort(prop) {
+    return function(a, b) {
+      const aVal = dotNotation(a, prop);
+      const bVal = dotNotation(b, prop);
+      if (typeof aVal !== "string" || typeof bVal !== "string") return 1;
+      return aVal.toLowerCase().localeCompare(bVal.toLowerCase());
+    };
+  }
+  function findByProp(prop, value) {
+    return (v) => isEqual(dotNotation(v, prop), value);
+  }
+  function flattenArr(arr, result = []) {
+    arr.forEach((el) => Array.isArray(el) ? flattenArr(el, result) : result.push(el));
+    return result;
+  }
+  function sortByProp(prop, reverse = false) {
+    return function(a, b) {
+      const aVal = dotNotation(a, prop);
+      const bVal = dotNotation(b, prop);
+      if (typeof aVal == "number" && typeof bVal == "number")
+        return (reverse ? -1 : 1) * (aVal - bVal);
+      if (aVal > bVal) return reverse ? -1 : 1;
+      if (aVal < bVal) return reverse ? 1 : -1;
+      return 0;
+    };
+  }
+  function makeUnique(arr) {
+    for (let i = arr.length - 1; i >= 0; i--) {
+      if (arr.slice(0, i).find((n) => isEqual(n, arr[i]))) arr.splice(i, 1);
+    }
+    return arr;
+  }
+  function makeArray(value) {
+    return Array.isArray(value) ? value : [value];
+  }
   class Cache {
     /**
      * Create new cache
@@ -479,6 +480,7 @@ ${opts.message || this.desc}`;
     clear() {
       this.complete = false;
       this.store = {};
+      return this;
     }
     /**
      * Delete an item from the cache
@@ -487,6 +489,7 @@ ${opts.message || this.desc}`;
     delete(key) {
       delete this.store[key];
       this.save();
+      return this;
     }
     /**
      * Return cache as an array of key-value pairs
@@ -503,6 +506,7 @@ ${opts.message || this.desc}`;
       this.complete = false;
       if (this.options.expiryPolicy == "keep") this.store[key]._expired = true;
       else this.delete(key);
+      return this;
     }
     /**
      * Get item from the cache
@@ -540,20 +544,20 @@ ${opts.message || this.desc}`;
      * @return {this}
      */
     set(key, value, ttl = this.options.ttl) {
-      if (this.options.expiryPolicy == "keep") delete this.store[key]._expired;
+      if (this.options.expiryPolicy == "keep") delete value._expired;
       this.store[key] = value;
       this.save();
       if (ttl) setTimeout(() => {
         this.expire(key);
         this.save();
-      }, ttl * 1e3);
+      }, (ttl || 0) * 1e3);
       return this;
     }
   }
-  function blackOrWhite(background) {
-    const exploded = background == null ? void 0 : background.match(background.length >= 6 ? /\w\w/g : /\w/g);
-    if (!exploded) return "black";
-    const [r, g, b] = exploded.map((hex) => parseInt(hex, 16));
+  function contrast(background) {
+    const exploded = background == null ? void 0 : background.match(background.length >= 6 ? /[0-9a-fA-F]{2}/g : /[0-9a-fA-F]/g);
+    if (!exploded || (exploded == null ? void 0 : exploded.length) < 3) return "black";
+    const [r, g, b] = exploded.map((hex) => parseInt(hex.length == 1 ? `${hex}${hex}` : hex, 16));
     const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
     return luminance > 0.5 ? "black" : "white";
   }
@@ -563,7 +567,7 @@ ${opts.message || this.desc}`;
   const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
   function camelCase(str) {
     const text = pascalCase(str);
-    return text[0].toLowerCase() + text.slice(1);
+    return !text ? "" : text[0].toLowerCase() + text.slice(1);
   }
   function formatBytes(bytes, decimals = 2) {
     if (bytes === 0) return "0 Bytes";
@@ -589,12 +593,9 @@ ${opts.message || this.desc}`;
     return text.toString().padEnd(length, char);
   }
   function pascalCase(str) {
+    var _a;
     if (!str) return "";
-    const text = str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, "").replaceAll(/[^a-zA-Z0-9]+(\w?)/g, (...args) => {
-      var _a;
-      return ((_a = args[1]) == null ? void 0 : _a.toUpperCase()) || "";
-    });
-    return text[0].toUpperCase() + text.slice(1);
+    return ((_a = str.match(/[a-zA-Z0-9]+/g)) == null ? void 0 : _a.map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join("")) ?? "";
   }
   function randomHex(length) {
     return Array(length).fill(null).map(() => Math.round(Math.random() * 15).toString(16)).join("");
@@ -1016,7 +1017,7 @@ ${opts.message || this.desc}`;
     }
     static off(event, listener) {
       const e = event.toString();
-      this.listeners[e] = (this.listeners[e] || []).filter((l) => l === listener);
+      this.listeners[e] = (this.listeners[e] || []).filter((l) => l != listener);
     }
     static on(event, listener) {
       var _a;
@@ -1039,7 +1040,7 @@ ${opts.message || this.desc}`;
       (this.listeners[event] || []).forEach((l) => l(...args));
     }
     off(event, listener) {
-      this.listeners[event] = (this.listeners[event] || []).filter((l) => l === listener);
+      this.listeners[event] = (this.listeners[event] || []).filter((l) => l != listener);
     }
     on(event, listener) {
       var _a;
@@ -1336,6 +1337,11 @@ ${opts.message || this.desc}`;
   __publicField(_Http, "interceptors", {});
   __publicField(_Http, "headers", {});
   let Http = _Http;
+  function createJwt(payload, signature = "unsigned") {
+    const header = Buffer.from(JSON.stringify({ alg: "HS256", typ: "JWT" })).toString("base64url");
+    const body = Buffer.from(JSON.stringify(payload)).toString("base64url");
+    return `${header}.${body}.${signature}`;
+  }
   function decodeJwt(token) {
     const base64 = token.split(".")[1].replace(/-/g, "+").replace(/_/g, "/");
     return JSONAttemptParse(decodeURIComponent(atob(base64).split("").map(function(c) {
@@ -1431,20 +1437,22 @@ ${opts.message || this.desc}`;
   };
   __publicField(_Logger, "LOG_LEVEL", 4);
   let Logger = _Logger;
-  function dec2Frac(num) {
-    const gcd = (a, b) => {
-      if (b < 1e-7) return a;
-      return gcd(b, ~~(a % b));
-    };
-    const len = num.toString().length - 2;
-    let denominator = Math.pow(10, len);
-    let numerator = num * denominator;
-    const divisor = gcd(numerator, denominator);
-    numerator = ~~(numerator / divisor);
-    denominator = ~~(denominator / divisor);
-    const remainder = ~~(numerator / denominator);
-    numerator -= remainder * denominator;
-    return `${remainder ? remainder + " " : ""}${~~numerator}/${~~denominator}`;
+  function dec2Frac(num, maxDen = 1e3) {
+    let sign = Math.sign(num);
+    num = Math.abs(num);
+    if (Number.isInteger(num)) return sign * num + "";
+    let closest = { n: 0, d: 1, diff: Math.abs(num) };
+    for (let d = 1; d <= maxDen; d++) {
+      let n = Math.round(num * d);
+      let diff = Math.abs(num - n / d);
+      if (diff < closest.diff) {
+        closest = { n, d, diff };
+        if (diff < 1e-8) break;
+      }
+    }
+    let integer = Math.floor(closest.n / closest.d);
+    let numerator = closest.n - integer * closest.d;
+    return (sign < 0 ? "-" : "") + (integer ? integer + " " : "") + (numerator ? numerator + "/" + closest.d : "");
   }
   function fracToDec(frac) {
     let split = frac.split(" ");
@@ -1564,6 +1572,7 @@ ${opts.message || this.desc}`;
         const l1 = p1.fullPath.length, l2 = p2.fullPath.length;
         return l1 < l2 ? 1 : l1 > l2 ? -1 : 0;
       }).reduce((acc, p) => {
+        if (acc && !acc.fullPath.startsWith(p.fullPath)) return acc;
         if (p.none) hitNone = true;
         if (!acc) return p;
         if (hitNone) return acc;
@@ -1671,15 +1680,15 @@ ${opts.message || this.desc}`;
       this.prefix = prefix;
     }
     emit(event, ...args) {
-      const parsed = new PathEvent(`${this.prefix}/${typeof event == "string" ? event : event.toString()}`);
-      this.listeners.filter((l) => PathEvent.has(l[0], event)).forEach(async (l) => l[1](parsed, ...args));
+      const parsed = new PathEvent(`${this.prefix}/${new PathEvent(event).toString()}`);
+      this.listeners.filter((l) => PathEvent.has(l[0], `${this.prefix}/${event}`)).forEach(async (l) => l[1](parsed, ...args));
     }
     off(listener) {
       this.listeners = this.listeners.filter((l) => l[1] != listener);
     }
     on(event, listener) {
       makeArray(event).forEach((e) => this.listeners.push([
-        new PathEvent(`${this.prefix}/${typeof e == "string" ? event : event.toString()}`),
+        new PathEvent(`${this.prefix}/${new PathEvent(e).toString()}`),
         listener
       ]));
       return () => this.off(listener);
@@ -1750,9 +1759,6 @@ ${opts.message || this.desc}`;
       }).length == and.length;
     });
   }
-  function typeKeys() {
-    return Object.keys({});
-  }
   var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
   var dist = {};
   var persist$1 = {};
@@ -1962,10 +1968,11 @@ ${opts.message || this.desc}`;
   exports2.addUnique = addUnique;
   exports2.adjustedInterval = adjustedInterval;
   exports2.arrayDiff = arrayDiff;
-  exports2.blackOrWhite = blackOrWhite;
   exports2.camelCase = camelCase;
   exports2.caseInsensitiveSort = caseInsensitiveSort;
   exports2.clean = clean;
+  exports2.contrast = contrast;
+  exports2.createJwt = createJwt;
   exports2.dec2Frac = dec2Frac;
   exports2.decodeJwt = decodeJwt;
   exports2.deepCopy = deepCopy;
@@ -2015,7 +2022,6 @@ ${opts.message || this.desc}`;
   exports2.timeUntil = timeUntil;
   exports2.timestampFilename = timestampFilename;
   exports2.toCsv = toCsv;
-  exports2.typeKeys = typeKeys;
   exports2.uploadWithProgress = uploadWithProgress;
   exports2.validateEmail = validateEmail;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });