@ztimson/utils 0.24.1 → 0.24.3

package/dist/index.mjs

@@ -906,15 +906,15 @@ function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(
   };
   return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, (token) => tokens[token]);
 }
-function instantInterval(fn, interval) {
-  fn();
-  return setInterval(fn, interval);
+function instantInterval(fn2, interval) {
+  fn2();
+  return setInterval(fn2, interval);
 }
 function sleep(ms) {
   return new Promise((res) => setTimeout(res, ms));
 }
-async function sleepWhile(fn, checkInterval = 100) {
-  while (await fn()) await sleep(checkInterval);
+async function sleepWhile(fn2, checkInterval = 100) {
+  while (await fn2()) await sleep(checkInterval);
 }
 function timeUntil(date) {
   return (date instanceof Date ? date.getTime() : date) - (/* @__PURE__ */ new Date()).getTime();
@@ -1225,16 +1225,16 @@ const _Http = class _Http {
       defaults.interceptors.forEach((i) => _Http.addInterceptor(i));
     }
   }
-  static addInterceptor(fn) {
+  static addInterceptor(fn2) {
     const key = Object.keys(_Http.interceptors).length.toString();
-    _Http.interceptors[key] = fn;
+    _Http.interceptors[key] = fn2;
     return () => {
       _Http.interceptors[key] = null;
     };
   }
-  addInterceptor(fn) {
+  addInterceptor(fn2) {
     const key = Object.keys(this.interceptors).length.toString();
-    this.interceptors[key] = fn;
+    this.interceptors[key] = fn2;
     return () => {
       this.interceptors[key] = null;
     };
@@ -1265,8 +1265,8 @@ const _Http = class _Http {
           body: opts.body
         }).then(async (resp) => {
           var _a2, _b;
-          for (let fn of [...Object.values(_Http.interceptors), ...Object.values(this.interceptors)]) {
-            await new Promise((res2) => fn(resp, () => res2()));
+          for (let fn2 of [...Object.values(_Http.interceptors), ...Object.values(this.interceptors)]) {
+            await new Promise((res2) => fn2(resp, () => res2()));
           }
           const contentLength = resp.headers.get("Content-Length");
           const total = contentLength ? parseInt(contentLength, 10) : 0;
@@ -1422,9 +1422,9 @@ function fracToDec(frac) {
   split = split.pop().split("/");
   return whole + Number(split[0]) / Number(split[1]);
 }
-function asyncFunction(args, fn) {
+function fn(args, fn2, async = false) {
   const keys = Object.keys(args);
-  return new Function(...keys, `return (async (${keys.join(",")}) => { ${fn} })(${keys.join(",")})`)(...keys.map((k) => args[k]));
+  return new Function(...keys, `return (${async ? "async " : ""}(${keys.join(",")}) => { ${fn2} })(${keys.join(",")})`)(...keys.map((k) => args[k]));
 }
 function gravatar(email, def = "mp") {
   if (!email) return "";
@@ -1439,7 +1439,7 @@ function PE(str, ...args) {
     if (str[i]) combined.push(str[i]);
     if (args[i]) combined.push(args[i]);
   }
-  return new PathEvent(combined.join(""));
+  return new PathEvent(combined.join("/"));
 }
 function PES(str, ...args) {
   let combined = [];
@@ -1498,28 +1498,28 @@ class PathEvent {
     return !this.methods.has("n") && (this.methods.has("*") || this.methods.has("c"));
   }
   set create(v) {
-    v ? this.methods.delete("n").add("c") : this.methods.delete("c");
+    v ? this.methods.delete("n").delete("*").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(v) {
-    v ? this.methods.delete("n").add("r") : this.methods.delete("r");
+    v ? this.methods.delete("n").delete("*").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(v) {
-    v ? this.methods.delete("n").add("u") : this.methods.delete("u");
+    v ? this.methods.delete("n").delete("*").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(v) {
-    v ? this.methods.delete("n").add("d") : this.methods.delete("d");
+    v ? this.methods.delete("n").delete("*").add("d") : this.methods.delete("d");
   }
   /**
    * Combine multiple  events into one parsed object. Longest path takes precedent, but all subsequent methods are
@@ -1677,11 +1677,11 @@ function search(rows, search2, regex, transform = (r) => r) {
         }
       }).length;
     } else {
-      return testCondition(search2, r);
+      return logicTest(r, search2);
     }
   });
 }
-function testCondition(condition, row) {
+function logicTest(target, condition) {
   const evalBoolean = (a, op, b) => {
     switch (op) {
       case "=":
@@ -1707,10 +1707,10 @@ function testCondition(condition, row) {
     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 key = Object.keys(target).find((k) => k.toLowerCase() == prop[1].toLowerCase());
+        return evalBoolean(dotNotation(target, 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("");
+      const v = Object.values(target).map(JSONSerialize).join("");
       if (/[A-Z]/g.test(condition)) return v.includes(p2);
       return v.toLowerCase().includes(p2);
     }).length == and.length;
@@ -1759,7 +1759,6 @@ export {
   addUnique,
   adjustedInterval,
   arrayDiff,
-  asyncFunction,
   blackOrWhite,
   camelCase,
   caseInsensitiveSort,
@@ -1779,6 +1778,7 @@ export {
   findByProp,
   flattenArr,
   flattenObj,
+  fn,
   formData,
   formatBytes,
   formatDate,
@@ -1791,6 +1791,7 @@ export {
   instantInterval,
   isEqual,
   kebabCase,
+  logicTest,
   makeArray,
   makeUnique,
   matchAll,
@@ -1808,7 +1809,6 @@ export {
   snakeCase,
   sortByProp,
   strSplice,
-  testCondition,
   timeUntil,
   timestampFilename,
   toCsv,