@ztimson/utils 0.23.22 → 0.24.0

package/dist/index.mjs

@@ -1,6 +1,6 @@
 var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value2) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value: value2 }) : obj[key] = value2;
-var __publicField = (obj, key, value2) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value2);
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ArgParser {
   /**
    * Create a unix-like argument parser to extract flags from the argument list. Can also create help messages.
@@ -49,7 +49,7 @@ class ArgParser {
       let arg = queue.splice(0, 1)[0];
       if (arg[0] == "-") {
         if (arg[1] != "-" && arg.length > 2) {
-          queue = [...arg.substring(2).split("").map((a2) => `-${a2}`), ...queue];
+          queue = [...arg.substring(2).split("").map((a) => `-${a}`), ...queue];
           arg = `-${arg[1]}`;
         }
         const combined = arg.split("=");
@@ -61,9 +61,9 @@ class ArgParser {
           extras.push(arg);
           continue;
         }
-        const value2 = argDef.default === false ? true : argDef.default === true ? false : queue.splice(queue.findIndex((q) => q[0] != "-"), 1)[0] || argDef.default;
-        if (value2 == null) parsed["_error"].push(`Option missing value: ${argDef.name || combined[0]}`);
-        parsed[argDef.name] = value2;
+        const value = 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 {
         const c = this.commands.find((command) => command.name == arg);
         if (!!c) {
@@ -122,17 +122,17 @@ function clean(obj, undefinedOnly = false) {
   if (Array.isArray(obj)) {
     obj = obj.filter((o) => o != null);
   } else {
-    Object.entries(obj).forEach(([key, value2]) => {
-      if (undefinedOnly && value2 === void 0 || !undefinedOnly && value2 == null) delete obj[key];
+    Object.entries(obj).forEach(([key, value]) => {
+      if (undefinedOnly && value === void 0 || !undefinedOnly && value == null) delete obj[key];
     });
   }
   return obj;
 }
-function deepCopy(value2) {
+function deepCopy(value) {
   try {
-    return structuredClone(value2);
+    return structuredClone(value);
   } catch {
-    return JSON.parse(JSONSanitize(value2));
+    return JSON.parse(JSONSanitize(value));
   }
 }
 function deepMerge(target, ...sources) {
@@ -148,22 +148,22 @@ function deepMerge(target, ...sources) {
   });
   return target;
 }
-function dotNotation(obj, prop2, set) {
-  if (obj == null || !prop2) return void 0;
-  return prop2.split(/[.[\]]/g).filter((prop22) => prop22.length).reduce((obj2, prop22, i, arr) => {
-    if (prop22[0] == '"' || prop22[0] == "'") prop22 = prop22.slice(1, -1);
-    if (!(obj2 == null ? void 0 : obj2.hasOwnProperty(prop22))) {
+function dotNotation(obj, prop, set) {
+  if (obj == null || !prop) return void 0;
+  return prop.split(/[.[\]]/g).filter((prop2) => prop2.length).reduce((obj2, prop2, i, arr) => {
+    if (prop2[0] == '"' || prop2[0] == "'") prop2 = prop2.slice(1, -1);
+    if (!(obj2 == null ? void 0 : obj2.hasOwnProperty(prop2))) {
       if (set == void 0) return void 0;
-      obj2[prop22] = {};
+      obj2[prop2] = {};
     }
     if (set !== void 0 && i == arr.length - 1)
-      return obj2[prop22] = set;
-    return obj2[prop22];
+      return obj2[prop2] = set;
+    return obj2[prop2];
   }, obj);
 }
 function encodeQuery(data) {
   return Object.entries(data).map(
-    ([key, value2]) => encodeURIComponent(key) + "=" + encodeURIComponent(value2)
+    ([key, value]) => encodeURIComponent(key) + "=" + encodeURIComponent(value)
   ).join("&");
 }
 function flattenObj(obj, parent, result = {}) {
@@ -182,7 +182,7 @@ function flattenObj(obj, parent, result = {}) {
 }
 function formData(target) {
   const data = new FormData();
-  Object.entries(target).forEach(([key, value2]) => data.append(key, value2));
+  Object.entries(target).forEach(([key, value]) => data.append(key, value));
   return data;
 }
 function includes(target, values, allowMissing = false) {
@@ -196,13 +196,13 @@ function includes(target, values, allowMissing = false) {
   if (type == "function") return target.toString() == values.toString();
   return target == values;
 }
-function isEqual(a2, b2) {
-  const ta = typeof a2, tb = typeof b2;
-  if (ta != "object" || a2 == null || (tb != "object" || b2 == null))
-    return ta == "function" && tb == "function" ? a2.toString() == b2.toString() : a2 === b2;
-  const keys = Object.keys(a2);
-  if (keys.length != Object.keys(b2).length) return false;
-  return Object.keys(a2).every((key) => isEqual(a2[key], b2[key]));
+function isEqual(a, b) {
+  const ta = typeof a, tb = typeof b;
+  if (ta != "object" || a == null || (tb != "object" || b == null))
+    return ta == "function" && tb == "function" ? a.toString() == b.toString() : a === b;
+  const keys = Object.keys(a);
+  if (keys.length != Object.keys(b).length) return false;
+  return Object.keys(a).every((key) => isEqual(a[key], b[key]));
 }
 function mixin(target, constructors) {
   constructors.forEach((c) => {
@@ -227,39 +227,39 @@ function JSONSerialize(obj) {
   return obj;
 }
 function JSONSanitize(obj, space) {
-  return JSON.stringify(obj, (key, value2) => {
-    return value2;
+  return JSON.stringify(obj, (key, value) => {
+    return value;
   }, space);
 }
 function addUnique(array, el) {
   if (array.indexOf(el) === -1) array.push(el);
   return array;
 }
-function arrayDiff(a2, b2) {
+function arrayDiff(a, b) {
   return makeUnique([
-    ...a2.filter((v1) => !b2.includes((v2) => isEqual(v1, v2))),
-    ...b2.filter((v1) => !a2.includes((v2) => isEqual(v1, v2)))
+    ...a.filter((v1) => !b.includes((v2) => isEqual(v1, v2))),
+    ...b.filter((v1) => !a.includes((v2) => isEqual(v1, v2)))
   ]);
 }
-function caseInsensitiveSort(prop2) {
-  return function(a2, b2) {
-    const aVal = dotNotation(a2, prop2);
-    const bVal = dotNotation(b2, prop2);
+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(prop2, value2) {
-  return (v2) => isEqual(dotNotation(v2, prop2), value2);
+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(prop2, reverse = false) {
-  return function(a2, b2) {
-    const aVal = dotNotation(a2, prop2);
-    const bVal = dotNotation(b2, prop2);
+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;
@@ -273,8 +273,8 @@ function makeUnique(arr) {
   }
   return arr;
 }
-function makeArray(value2) {
-  return Array.isArray(value2) ? value2 : [value2];
+function makeArray(value) {
+  return Array.isArray(value) ? value : [value];
 }
 class ASet extends Array {
   /** Number of elements in set */
@@ -387,7 +387,6 @@ class ASet extends Array {
 class Cache {
   /**
    * Create new cache
-   *
    * @param {keyof T} key Default property to use as primary key
    * @param options
    */
@@ -397,7 +396,6 @@ class Cache {
     __publicField(this, "complete", false);
     /**
      * Get all cached items
-     *
      * @return {T[]} Array of items
      */
     __publicField(this, "values", this.all());
@@ -415,24 +413,23 @@ class Cache {
       }
     }
     return new Proxy(this, {
-      get: (target, prop2) => {
-        if (prop2 in target) return target[prop2];
-        return deepCopy(target.store[prop2]);
+      get: (target, prop) => {
+        if (prop in target) return target[prop];
+        return deepCopy(target.store[prop]);
       },
-      set: (target, prop2, value2) => {
-        if (prop2 in target) target[prop2] = value2;
-        else this.set(prop2, value2);
+      set: (target, prop, value) => {
+        if (prop in target) target[prop] = value;
+        else this.set(prop, value);
         return true;
       }
     });
   }
-  getKey(value2) {
+  getKey(value) {
     if (!this.key) throw new Error("No key defined");
-    return value2[this.key];
+    return value[this.key];
   }
   /**
    * Get all cached items
-   *
    * @return {T[]} Array of items
    */
   all() {
@@ -440,25 +437,24 @@ 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(value2, ttl = this.ttl) {
-    const key = this.getKey(value2);
-    this.set(key, value2, ttl);
+  add(value, ttl = this.ttl) {
+    const key = this.getKey(value);
+    this.set(key, value, ttl);
     return this;
   }
   /**
    * 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(rows2, complete = true) {
-    rows2.forEach((r2) => this.add(r2));
+  addAll(rows, complete = true) {
+    this.clear();
+    rows.forEach((r) => this.add(r));
     this.complete = complete;
     return this;
   }
@@ -470,7 +466,6 @@ class Cache {
   }
   /**
    * Delete an item from the cache
-   *
    * @param {K} key Item's primary key
    */
   delete(key) {
@@ -495,7 +490,6 @@ class Cache {
   }
   /**
    * Get a list of cached keys
-   *
    * @return {K[]} Array of keys
    */
   keys() {
@@ -503,7 +497,6 @@ class Cache {
   }
   /**
    * Get map of cached items
-   *
    * @return {Record<K, T>}
    */
   map() {
@@ -511,14 +504,13 @@ class Cache {
   }
   /**
    * 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}
    */
-  set(key, value2, ttl = this.options.ttl) {
-    this.store[key] = value2;
+  set(key, value, ttl = this.options.ttl) {
+    this.store[key] = value;
     if (this.options.storageKey && this.options.storage)
       this.options.storage.setItem(this.options.storageKey, JSON.stringify(this.store));
     if (ttl) setTimeout(() => {
@@ -531,8 +523,8 @@ class Cache {
 function blackOrWhite(background) {
   const exploded = background == null ? void 0 : background.match(background.length >= 6 ? /\w\w/g : /\w/g);
   if (!exploded) return "black";
-  const [r2, g, b2] = exploded.map((hex) => parseInt(hex, 16));
-  const luminance = (0.299 * r2 + 0.587 * g + 0.114 * b2) / 255;
+  const [r, g, b] = exploded.map((hex) => parseInt(hex, 16));
+  const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
   return luminance > 0.5 ? "black" : "white";
 }
 const LETTER_LIST = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -609,16 +601,16 @@ function strSplice(str, start, deleteCount, insert = "") {
   const after = str.slice(start + deleteCount);
   return before + insert + after;
 }
-function matchAll(value2, regex2) {
-  if (typeof regex2 === "string") {
-    regex2 = new RegExp(regex2, "g");
+function matchAll(value, regex) {
+  if (typeof regex === "string") {
+    regex = new RegExp(regex, "g");
   }
-  if (!regex2.global) {
+  if (!regex.global) {
     throw new TypeError("Regular expression must be global.");
   }
   let ret = [];
   let match;
-  while ((match = regex2.exec(value2)) !== null) {
+  while ((match = regex.exec(value)) !== null) {
     ret.push(match);
   }
   return ret;
@@ -646,11 +638,11 @@ function parseUrl(url) {
   return groups;
 }
 function md5(d) {
-  var r2 = M(V(Y(X(d), 8 * d.length)));
-  return r2.toLowerCase();
+  var r = M(V(Y(X(d), 8 * d.length)));
+  return r.toLowerCase();
 }
 function M(d) {
-  for (var _, m = "0123456789ABCDEF", f = "", r2 = 0; r2 < d.length; r2++) _ = d.charCodeAt(r2), f += m.charAt(_ >>> 4 & 15) + m.charAt(15 & _);
+  for (var _, m = "0123456789ABCDEF", f = "", r = 0; r < d.length; r++) _ = d.charCodeAt(r), f += m.charAt(_ >>> 4 & 15) + m.charAt(15 & _);
   return f;
 }
 function X(d) {
@@ -664,26 +656,26 @@ function V(d) {
 }
 function Y(d, _) {
   d[_ >> 5] |= 128 << _ % 32, d[14 + (_ + 64 >>> 9 << 4)] = _;
-  for (var m = 1732584193, f = -271733879, r2 = -1732584194, i = 271733878, n = 0; n < d.length; n += 16) {
-    var h = m, t = f, g = r2, e = i;
-    f = md5_ii(f = md5_ii(f = md5_ii(f = md5_ii(f = md5_hh(f = md5_hh(f = md5_hh(f = md5_hh(f = md5_gg(f = md5_gg(f = md5_gg(f = md5_gg(f = md5_ff(f = md5_ff(f = md5_ff(f = md5_ff(f, r2 = md5_ff(r2, i = md5_ff(i, m = md5_ff(m, f, r2, i, d[n + 0], 7, -680876936), f, r2, d[n + 1], 12, -389564586), m, f, d[n + 2], 17, 606105819), i, m, d[n + 3], 22, -1044525330), r2 = md5_ff(r2, i = md5_ff(i, m = md5_ff(m, f, r2, i, d[n + 4], 7, -176418897), f, r2, d[n + 5], 12, 1200080426), m, f, d[n + 6], 17, -1473231341), i, m, d[n + 7], 22, -45705983), r2 = md5_ff(r2, i = md5_ff(i, m = md5_ff(m, f, r2, i, d[n + 8], 7, 1770035416), f, r2, d[n + 9], 12, -1958414417), m, f, d[n + 10], 17, -42063), i, m, d[n + 11], 22, -1990404162), r2 = md5_ff(r2, i = md5_ff(i, m = md5_ff(m, f, r2, i, d[n + 12], 7, 1804603682), f, r2, d[n + 13], 12, -40341101), m, f, d[n + 14], 17, -1502002290), i, m, d[n + 15], 22, 1236535329), r2 = md5_gg(r2, i = md5_gg(i, m = md5_gg(m, f, r2, i, d[n + 1], 5, -165796510), f, r2, d[n + 6], 9, -1069501632), m, f, d[n + 11], 14, 643717713), i, m, d[n + 0], 20, -373897302), r2 = md5_gg(r2, i = md5_gg(i, m = md5_gg(m, f, r2, i, d[n + 5], 5, -701558691), f, r2, d[n + 10], 9, 38016083), m, f, d[n + 15], 14, -660478335), i, m, d[n + 4], 20, -405537848), r2 = md5_gg(r2, i = md5_gg(i, m = md5_gg(m, f, r2, i, d[n + 9], 5, 568446438), f, r2, d[n + 14], 9, -1019803690), m, f, d[n + 3], 14, -187363961), i, m, d[n + 8], 20, 1163531501), r2 = md5_gg(r2, i = md5_gg(i, m = md5_gg(m, f, r2, i, d[n + 13], 5, -1444681467), f, r2, d[n + 2], 9, -51403784), m, f, d[n + 7], 14, 1735328473), i, m, d[n + 12], 20, -1926607734), r2 = md5_hh(r2, i = md5_hh(i, m = md5_hh(m, f, r2, i, d[n + 5], 4, -378558), f, r2, d[n + 8], 11, -2022574463), m, f, d[n + 11], 16, 1839030562), i, m, d[n + 14], 23, -35309556), r2 = md5_hh(r2, i = md5_hh(i, m = md5_hh(m, f, r2, i, d[n + 1], 4, -1530992060), f, r2, d[n + 4], 11, 1272893353), m, f, d[n + 7], 16, -155497632), i, m, d[n + 10], 23, -1094730640), r2 = md5_hh(r2, i = md5_hh(i, m = md5_hh(m, f, r2, i, d[n + 13], 4, 681279174), f, r2, d[n + 0], 11, -358537222), m, f, d[n + 3], 16, -722521979), i, m, d[n + 6], 23, 76029189), r2 = md5_hh(r2, i = md5_hh(i, m = md5_hh(m, f, r2, i, d[n + 9], 4, -640364487), f, r2, d[n + 12], 11, -421815835), m, f, d[n + 15], 16, 530742520), i, m, d[n + 2], 23, -995338651), r2 = md5_ii(r2, i = md5_ii(i, m = md5_ii(m, f, r2, i, d[n + 0], 6, -198630844), f, r2, d[n + 7], 10, 1126891415), m, f, d[n + 14], 15, -1416354905), i, m, d[n + 5], 21, -57434055), r2 = md5_ii(r2, i = md5_ii(i, m = md5_ii(m, f, r2, i, d[n + 12], 6, 1700485571), f, r2, d[n + 3], 10, -1894986606), m, f, d[n + 10], 15, -1051523), i, m, d[n + 1], 21, -2054922799), r2 = md5_ii(r2, i = md5_ii(i, m = md5_ii(m, f, r2, i, d[n + 8], 6, 1873313359), f, r2, d[n + 15], 10, -30611744), m, f, d[n + 6], 15, -1560198380), i, m, d[n + 13], 21, 1309151649), r2 = md5_ii(r2, i = md5_ii(i, m = md5_ii(m, f, r2, i, d[n + 4], 6, -145523070), f, r2, d[n + 11], 10, -1120210379), m, f, d[n + 2], 15, 718787259), i, m, d[n + 9], 21, -343485551), m = safe_add(m, h), f = safe_add(f, t), r2 = safe_add(r2, g), i = safe_add(i, e);
+  for (var m = 1732584193, f = -271733879, r = -1732584194, i = 271733878, n = 0; n < d.length; n += 16) {
+    var h = m, t = f, g = r, e = i;
+    f = md5_ii(f = md5_ii(f = md5_ii(f = md5_ii(f = md5_hh(f = md5_hh(f = md5_hh(f = md5_hh(f = md5_gg(f = md5_gg(f = md5_gg(f = md5_gg(f = md5_ff(f = md5_ff(f = md5_ff(f = md5_ff(f, r = md5_ff(r, i = md5_ff(i, m = md5_ff(m, f, r, i, d[n + 0], 7, -680876936), f, r, d[n + 1], 12, -389564586), m, f, d[n + 2], 17, 606105819), i, m, d[n + 3], 22, -1044525330), r = md5_ff(r, i = md5_ff(i, m = md5_ff(m, f, r, i, d[n + 4], 7, -176418897), f, r, d[n + 5], 12, 1200080426), m, f, d[n + 6], 17, -1473231341), i, m, d[n + 7], 22, -45705983), r = md5_ff(r, i = md5_ff(i, m = md5_ff(m, f, r, i, d[n + 8], 7, 1770035416), f, r, d[n + 9], 12, -1958414417), m, f, d[n + 10], 17, -42063), i, m, d[n + 11], 22, -1990404162), r = md5_ff(r, i = md5_ff(i, m = md5_ff(m, f, r, i, d[n + 12], 7, 1804603682), f, r, d[n + 13], 12, -40341101), m, f, d[n + 14], 17, -1502002290), i, m, d[n + 15], 22, 1236535329), r = md5_gg(r, i = md5_gg(i, m = md5_gg(m, f, r, i, d[n + 1], 5, -165796510), f, r, d[n + 6], 9, -1069501632), m, f, d[n + 11], 14, 643717713), i, m, d[n + 0], 20, -373897302), r = md5_gg(r, i = md5_gg(i, m = md5_gg(m, f, r, i, d[n + 5], 5, -701558691), f, r, d[n + 10], 9, 38016083), m, f, d[n + 15], 14, -660478335), i, m, d[n + 4], 20, -405537848), r = md5_gg(r, i = md5_gg(i, m = md5_gg(m, f, r, i, d[n + 9], 5, 568446438), f, r, d[n + 14], 9, -1019803690), m, f, d[n + 3], 14, -187363961), i, m, d[n + 8], 20, 1163531501), r = md5_gg(r, i = md5_gg(i, m = md5_gg(m, f, r, i, d[n + 13], 5, -1444681467), f, r, d[n + 2], 9, -51403784), m, f, d[n + 7], 14, 1735328473), i, m, d[n + 12], 20, -1926607734), r = md5_hh(r, i = md5_hh(i, m = md5_hh(m, f, r, i, d[n + 5], 4, -378558), f, r, d[n + 8], 11, -2022574463), m, f, d[n + 11], 16, 1839030562), i, m, d[n + 14], 23, -35309556), r = md5_hh(r, i = md5_hh(i, m = md5_hh(m, f, r, i, d[n + 1], 4, -1530992060), f, r, d[n + 4], 11, 1272893353), m, f, d[n + 7], 16, -155497632), i, m, d[n + 10], 23, -1094730640), r = md5_hh(r, i = md5_hh(i, m = md5_hh(m, f, r, i, d[n + 13], 4, 681279174), f, r, d[n + 0], 11, -358537222), m, f, d[n + 3], 16, -722521979), i, m, d[n + 6], 23, 76029189), r = md5_hh(r, i = md5_hh(i, m = md5_hh(m, f, r, i, d[n + 9], 4, -640364487), f, r, d[n + 12], 11, -421815835), m, f, d[n + 15], 16, 530742520), i, m, d[n + 2], 23, -995338651), r = md5_ii(r, i = md5_ii(i, m = md5_ii(m, f, r, i, d[n + 0], 6, -198630844), f, r, d[n + 7], 10, 1126891415), m, f, d[n + 14], 15, -1416354905), i, m, d[n + 5], 21, -57434055), r = md5_ii(r, i = md5_ii(i, m = md5_ii(m, f, r, i, d[n + 12], 6, 1700485571), f, r, d[n + 3], 10, -1894986606), m, f, d[n + 10], 15, -1051523), i, m, d[n + 1], 21, -2054922799), r = md5_ii(r, i = md5_ii(i, m = md5_ii(m, f, r, i, d[n + 8], 6, 1873313359), f, r, d[n + 15], 10, -30611744), m, f, d[n + 6], 15, -1560198380), i, m, d[n + 13], 21, 1309151649), r = md5_ii(r, i = md5_ii(i, m = md5_ii(m, f, r, i, d[n + 4], 6, -145523070), f, r, d[n + 11], 10, -1120210379), m, f, d[n + 2], 15, 718787259), i, m, d[n + 9], 21, -343485551), m = safe_add(m, h), f = safe_add(f, t), r = safe_add(r, g), i = safe_add(i, e);
   }
-  return Array(m, f, r2, i);
+  return Array(m, f, r, i);
 }
-function md5_cmn(d, _, m, f, r2, i) {
-  return safe_add(bit_rol(safe_add(safe_add(_, d), safe_add(f, i)), r2), m);
+function md5_cmn(d, _, m, f, r, i) {
+  return safe_add(bit_rol(safe_add(safe_add(_, d), safe_add(f, i)), r), m);
 }
-function md5_ff(d, _, m, f, r2, i, n) {
-  return md5_cmn(_ & m | ~_ & f, d, _, r2, i, n);
+function md5_ff(d, _, m, f, r, i, n) {
+  return md5_cmn(_ & m | ~_ & f, d, _, r, i, n);
 }
-function md5_gg(d, _, m, f, r2, i, n) {
-  return md5_cmn(_ & f | m & ~f, d, _, r2, i, n);
+function md5_gg(d, _, m, f, r, i, n) {
+  return md5_cmn(_ & f | m & ~f, d, _, r, i, n);
 }
-function md5_hh(d, _, m, f, r2, i, n) {
-  return md5_cmn(_ ^ m ^ f, d, _, r2, i, n);
+function md5_hh(d, _, m, f, r, i, n) {
+  return md5_cmn(_ ^ m ^ f, d, _, r, i, n);
 }
-function md5_ii(d, _, m, f, r2, i, n) {
-  return md5_cmn(m ^ (_ | ~f), d, _, r2, i, n);
+function md5_ii(d, _, m, f, r, i, n) {
+  return md5_cmn(m ^ (_ | ~f), d, _, r, i, n);
 }
 function safe_add(d, _) {
   var m = (65535 & d) + (65535 & _);
@@ -716,20 +708,20 @@ function fromCsv(csv, hasHeaders = true) {
     columns.push(current.trim());
     return columns.map((col) => col.replace(/^"|"$/g, "").replace(/""/g, '"'));
   }
-  const rows2 = [];
+  const rows = [];
   let currentRow = "", inQuotes = false;
   for (const char of csv.replace(/\r\n/g, "\n")) {
     if (char === '"') inQuotes = !inQuotes;
     if (char === "\n" && !inQuotes) {
-      rows2.push(currentRow.trim());
+      rows.push(currentRow.trim());
       currentRow = "";
     } else currentRow += char;
   }
-  if (currentRow) rows2.push(currentRow.trim());
-  let headers = hasHeaders ? rows2.splice(0, 1)[0] : null;
+  if (currentRow) rows.push(currentRow.trim());
+  let headers = hasHeaders ? rows.splice(0, 1)[0] : null;
   if (headers) headers = (_a = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g)) == null ? void 0 : _a.map((h) => h.trim());
-  return rows2.map((r2) => {
-    const props = parseLine(r2);
+  return rows.map((r) => {
+    const props = parseLine(r);
     const h = headers || Array(props.length).fill(null).map((_, i) => {
       let letter = "";
       const first = i / 26;
@@ -749,18 +741,18 @@ function toCsv(target, flatten = true) {
   return [
     headers.join(","),
     ...t.map((row) => headers.map((h) => {
-      const value2 = dotNotation(row, h);
-      if (value2 == null) return "";
-      if (typeof value2 == "object") return `"${JSONSanitize(value2).replaceAll('"', '""')}"`;
-      if (typeof value2 == "string" && /[\n",]/g.test(value2)) return `"${value2.replaceAll('"', '""')}"`;
-      return value2;
+      const value = dotNotation(row, h);
+      if (value == null) return "";
+      if (typeof value == "object") return `"${JSONSanitize(value).replaceAll('"', '""')}"`;
+      if (typeof value == "string" && /[\n",]/g.test(value)) return `"${value.replaceAll('"', '""')}"`;
+      return value;
     }).join(","))
   ].join("\n");
 }
 class PromiseProgress extends Promise {
   constructor(executor) {
     super((resolve, reject) => executor(
-      (value2) => resolve(value2),
+      (value) => resolve(value),
       (reason) => reject(reason),
       (progress) => this.progress = progress
     ));
@@ -770,10 +762,10 @@ class PromiseProgress extends Promise {
   get progress() {
     return this._progress;
   }
-  set progress(p2) {
-    if (p2 == this._progress) return;
-    this._progress = p2;
-    this.listeners.forEach((l) => l(p2));
+  set progress(p) {
+    if (p == this._progress) return;
+    this._progress = p;
+    this.listeners.forEach((l) => l(p));
   }
   static from(promise) {
     if (promise instanceof PromiseProgress) return promise;
@@ -781,7 +773,7 @@ class PromiseProgress extends Promise {
   }
   from(promise) {
     const newPromise = PromiseProgress.from(promise);
-    this.onProgress((p2) => newPromise.progress = p2);
+    this.onProgress((p) => newPromise.progress = p);
     return newPromise;
   }
   onProgress(callback) {
@@ -801,14 +793,14 @@ class PromiseProgress extends Promise {
 }
 function adjustedInterval(cb, ms) {
   let cancel = false, timeout = null;
-  const p2 = async () => {
+  const p = async () => {
     if (cancel) return;
     const start = (/* @__PURE__ */ new Date()).getTime();
     await cb();
     const end = (/* @__PURE__ */ new Date()).getTime();
-    timeout = setTimeout(() => p2(), ms - (end - start) || 1);
+    timeout = setTimeout(() => p(), ms - (end - start) || 1);
   };
-  p2();
+  p();
   return () => {
     cancel = true;
     if (timeout) clearTimeout(timeout);
@@ -878,7 +870,7 @@ function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(
     const minutes = offset % 60;
     return (offset > 0 ? "-" : "") + `${hours}:${minutes.toString().padStart(2, "0")}`;
   }
-  if (typeof date == "number" || typeof date == "string") date = new Date(date);
+  if (typeof date == "number" || typeof date == "string" || date == null) date = new Date(date);
   let t;
   if (tz == null) tz = -(date.getTimezoneOffset() / 60);
   t = timezones.find((t2) => isNaN(tz) ? t2[0] == tz : t2[1] == tz);
@@ -934,12 +926,12 @@ function downloadFile(blob, name) {
   URL.revokeObjectURL(url);
 }
 function downloadUrl(href, name) {
-  const a2 = document.createElement("a");
-  a2.href = href;
-  a2.download = name || href.split("/").pop();
-  document.body.appendChild(a2);
-  a2.click();
-  document.body.removeChild(a2);
+  const a = document.createElement("a");
+  a.href = href;
+  a.download = name || href.split("/").pop();
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
 }
 function fileBrowser(options = {}) {
   return new Promise((res) => {
@@ -980,7 +972,7 @@ function uploadWithProgress(options) {
     xhr.addEventListener("error", () => rej(JSONAttemptParse(xhr.responseText)));
     xhr.addEventListener("timeout", () => rej({ error: "Request timed out" }));
     xhr.open("POST", options.url);
-    Object.entries(options.headers || {}).forEach(([key, value2]) => xhr.setRequestHeader(key, value2));
+    Object.entries(options.headers || {}).forEach(([key, value]) => xhr.setRequestHeader(key, value));
     xhr.send(formData2);
   });
 }
@@ -1314,7 +1306,7 @@ const _Http = class _Http {
 __publicField(_Http, "interceptors", {});
 __publicField(_Http, "headers", {});
 let Http = _Http;
-function jwtDecode(token) {
+function decodeJwt(token) {
   const base64 = token.split(".")[1].replace(/-/g, "+").replace(/_/g, "/");
   return JSONAttemptParse(decodeURIComponent(atob(base64).split("").map(function(c) {
     return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
@@ -1410,9 +1402,9 @@ const _Logger = class _Logger extends TypedEmitter {
 __publicField(_Logger, "LOG_LEVEL", 4);
 let Logger = _Logger;
 function dec2Frac(num) {
-  const gcd = (a2, b2) => {
-    if (b2 < 1e-7) return a2;
-    return gcd(b2, ~~(a2 % b2));
+  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);
@@ -1434,8 +1426,8 @@ function gravatar(email, def = "mp") {
   if (!email) return "";
   return `https://www.gravatar.com/avatar/${md5(email)}?d=${def}`;
 }
-function escapeRegex(value2) {
-  return value2.replace(/[.*+?^${}()|\[\]\\]/g, "\\$&");
+function escapeRegex(value) {
+  return value.replace(/[.*+?^${}()|\[\]\\]/g, "\\$&");
 }
 function PE(str, ...args) {
   const combined = [];
@@ -1470,15 +1462,15 @@ class PathEvent {
     __publicField(this, "methods");
     var _a;
     if (typeof Event == "object") return Object.assign(this, Event);
-    let [p2, scope, method] = Event.replaceAll(/\/{2,}/g, "/").split(":");
+    let [p, scope, method] = Event.replaceAll(/\/{2,}/g, "/").split(":");
     if (!method) method = scope || "*";
-    if (p2 == "*" || !p2 && method == "*") {
-      p2 = "";
+    if (p == "*" || !p && method == "*") {
+      p = "";
       method = "*";
     }
-    let temp = p2.split("/").filter((p22) => !!p22);
+    let temp = p.split("/").filter((p2) => !!p2);
     this.module = ((_a = temp.splice(0, 1)[0]) == null ? void 0 : _a.toLowerCase()) || "";
-    this.fullPath = p2;
+    this.fullPath = p;
     this.path = temp.join("/");
     this.name = temp.pop() || "";
     this.methods = new ASet(method.split(""));
@@ -1487,43 +1479,43 @@ class PathEvent {
   get all() {
     return this.methods.has("*");
   }
-  set all(v2) {
-    v2 ? new ASet(["*"]) : this.methods.delete("*");
+  set all(v) {
+    v ? new ASet(["*"]) : this.methods.delete("*");
   }
   /** None specified */
   get none() {
     return this.methods.has("n");
   }
-  set none(v2) {
-    v2 ? this.methods = new ASet(["n"]) : this.methods.delete("n");
+  set none(v) {
+    v ? this.methods = new ASet(["n"]) : this.methods.delete("n");
   }
   /** Create method specified */
   get create() {
     return !this.methods.has("n") && (this.methods.has("*") || this.methods.has("c"));
   }
-  set create(v2) {
-    v2 ? this.methods.delete("n").add("c") : this.methods.delete("c");
+  set create(v) {
+    v ? this.methods.delete("n").add("c") : this.methods.delete("c");
   }
   /** Read method specified */
   get read() {
     return !this.methods.has("n") && (this.methods.has("*") || this.methods.has("r"));
   }
-  set read(v2) {
-    v2 ? this.methods.delete("n").add("r") : this.methods.delete("r");
+  set read(v) {
+    v ? this.methods.delete("n").add("r") : this.methods.delete("r");
   }
   /** Update method specified */
   get update() {
     return !this.methods.has("n") && (this.methods.has("*") || this.methods.has("u"));
   }
-  set update(v2) {
-    v2 ? this.methods.delete("n").add("u") : this.methods.delete("u");
+  set update(v) {
+    v ? this.methods.delete("n").add("u") : this.methods.delete("u");
   }
   /** Delete method specified */
   get delete() {
     return !this.methods.has("n") && (this.methods.has("*") || this.methods.has("d"));
   }
-  set delete(v2) {
-    v2 ? this.methods.delete("n").add("d") : this.methods.delete("d");
+  set delete(v) {
+    v ? this.methods.delete("n").add("d") : this.methods.delete("d");
   }
   /**
    * Combine multiple  events into one parsed object. Longest path takes precedent, but all subsequent methods are
@@ -1534,14 +1526,14 @@ class PathEvent {
    */
   static combine(...paths) {
     let hitNone = false;
-    const combined = paths.map((p2) => new PathEvent(p2)).toSorted((p1, p2) => {
+    const combined = paths.map((p) => new PathEvent(p)).toSorted((p1, p2) => {
       const l1 = p1.fullPath.length, l2 = p2.fullPath.length;
       return l1 < l2 ? 1 : l1 > l2 ? -1 : 0;
-    }).reduce((acc, p2) => {
-      if (p2.none) hitNone = true;
-      if (!acc) return p2;
+    }).reduce((acc, p) => {
+      if (p.none) hitNone = true;
+      if (!acc) return p;
       if (hitNone) return acc;
-      acc.methods = [...acc.methods, ...p2.methods];
+      acc.methods = [...acc.methods, ...p.methods];
       return acc;
     }, null);
     combined.methods = new ASet(combined.methods);
@@ -1572,12 +1564,12 @@ class PathEvent {
   static has(target, ...has) {
     const parsedRequired = makeArray(has).map((pe) => new PathEvent(pe));
     const parsedTarget = makeArray(target).map((pe) => new PathEvent(pe));
-    return !!parsedRequired.find((r2) => {
-      if (!r2.fullPath && r2.all) return true;
-      const filtered = parsedTarget.filter((p2) => r2.fullPath.startsWith(p2.fullPath));
+    return !!parsedRequired.find((r) => {
+      if (!r.fullPath && r.all) return true;
+      const filtered = parsedTarget.filter((p) => r.fullPath.startsWith(p.fullPath));
       if (!filtered.length) return false;
       const combined = PathEvent.combine(...filtered);
-      return !combined.none && (combined.all || r2.all) || combined.methods.intersection(r2.methods).length;
+      return !combined.none && (combined.all || r.all) || combined.methods.intersection(r.methods).length;
     });
   }
   /**
@@ -1616,10 +1608,10 @@ class PathEvent {
    * @return {string} String representation of Event
    */
   static toString(path, methods) {
-    let p2 = makeArray(path).filter((p22) => p22 != null).join("/");
-    p2 = p2 == null ? void 0 : p2.trim().replaceAll(/\/{2,}/g, "/").replaceAll(/(^\/|\/$)/g, "");
-    if (methods == null ? void 0 : methods.length) p2 += `:${makeArray(methods).map((m) => m.toLowerCase()).join("")}`;
-    return p2;
+    let p = makeArray(path).filter((p2) => p2 != null).join("/");
+    p = p == null ? void 0 : p.trim().replaceAll(/\/{2,}/g, "/").replaceAll(/(^\/|\/$)/g, "");
+    if (methods == null ? void 0 : methods.length) p += `:${makeArray(methods).map((m) => m.toLowerCase()).join("")}`;
+    return p;
   }
   /**
    * Filter a set of paths based on this event
@@ -1667,36 +1659,57 @@ class PathEventEmitter {
     emitter.on("*", (event, ...args) => this.emit(event, ...args));
   }
 }
-function search(rows, search, regex, transform = (r2) => r2) {
+function search(rows, search2, regex, transform = (r) => r) {
   if (!rows) return [];
   return rows.filter((r) => {
     const value = transform(r);
-    if (!search) return true;
+    if (!search2) return true;
     if (regex) {
-      return !!Object.values(value).filter((v2) => {
+      return !!Object.values(value).filter((v) => {
         try {
-          return RegExp(search, "gm").test(v2.toString());
+          return RegExp(search2, "gm").test(v.toString());
         } catch {
           return false;
         }
       }).length;
+    } else {
+      return testCondition(search2, r);
     }
-    const or = search.split("||").map((p2) => p2.trim()).filter((p2) => !!p2);
-    return -1 != or.findIndex((p) => {
-      const and = p.split("&&").map((p2) => p2.trim()).filter((p2) => !!p2);
-      return and.filter((p) => {
-        const prop = /(\w+)\s*(==?|!=|>=|>|<=|<)\s*(\w+)/g.exec(p);
-        if (prop) {
-          const a = JSON.stringify(JSONAttemptParse(dotNotation(value, prop[1])));
-          const operator = prop[2] == "=" ? "==" : prop[2];
-          const b = JSON.stringify(JSONAttemptParse(prop[3]));
-          return eval(`${a} ${operator} ${b}`);
-        }
-        const v = Object.values(value).join("");
-        if (/[A-Z]/g.test(search)) return v.includes(p);
-        return v.toLowerCase().includes(p);
-      }).length == and.length;
-    });
+  });
+}
+function testCondition(condition, row) {
+  const evalBoolean = (a, op, b) => {
+    switch (op) {
+      case "=":
+      case "==":
+        return a == b;
+      case "!=":
+        return a != b;
+      case ">":
+        return a > b;
+      case ">=":
+        return a >= b;
+      case "<":
+        return a < b;
+      case "<=":
+        return a <= b;
+      default:
+        return false;
+    }
+  };
+  const or = condition.split("||").map((p) => p.trim()).filter((p) => !!p);
+  return -1 != or.findIndex((p) => {
+    const and = p.split("&&").map((p2) => p2.trim()).filter((p2) => !!p2);
+    return and.filter((p2) => {
+      const prop = /(\S+)\s*(==?|!=|>=|>|<=|<)\s*(\S+)/g.exec(p2);
+      if (prop) {
+        const key = Object.keys(row).find((k) => k.toLowerCase() == prop[1].toLowerCase());
+        return evalBoolean(dotNotation(row, key || prop[1]), prop[2], JSONAttemptParse(prop[3]));
+      }
+      const v = Object.values(row).map((v2) => typeof v2 == "object" && v2 != null ? JSON.stringify(v2) : v2).join("");
+      if (/[A-Z]/g.test(condition)) return v.includes(p2);
+      return v.toLowerCase().includes(p2);
+    }).length == and.length;
   });
 }
 function typeKeys() {
@@ -1747,6 +1760,7 @@ export {
   caseInsensitiveSort,
   clean,
   dec2Frac,
+  decodeJwt,
   deepCopy,
   deepMerge,
   dotNotation,
@@ -1771,7 +1785,6 @@ export {
   insertAt,
   instantInterval,
   isEqual,
-  jwtDecode,
   kebabCase,
   makeArray,
   makeUnique,
@@ -1790,6 +1803,7 @@ export {
   snakeCase,
   sortByProp,
   strSplice,
+  testCondition,
   timeUntil,
   timestampFilename,
   toCsv,