@ztimson/utils 0.24.1 → 0.24.3

package/dist/index.cjs

@@ -910,15 +910,15 @@ ${opts.message || this.desc}`;
     };
     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();
@@ -1229,16 +1229,16 @@ ${opts.message || this.desc}`;
         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;
       };
@@ -1269,8 +1269,8 @@ ${opts.message || this.desc}`;
             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;
@@ -1426,9 +1426,9 @@ ${opts.message || this.desc}`;
     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 "";
@@ -1443,7 +1443,7 @@ ${opts.message || this.desc}`;
       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 = [];
@@ -1502,28 +1502,28 @@ ${opts.message || this.desc}`;
       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
@@ -1681,11 +1681,11 @@ ${opts.message || this.desc}`;
           }
         }).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 "=":
@@ -1711,10 +1711,10 @@ ${opts.message || this.desc}`;
       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;
@@ -1762,7 +1762,6 @@ ${opts.message || this.desc}`;
   exports2.addUnique = addUnique;
   exports2.adjustedInterval = adjustedInterval;
   exports2.arrayDiff = arrayDiff;
-  exports2.asyncFunction = asyncFunction;
   exports2.blackOrWhite = blackOrWhite;
   exports2.camelCase = camelCase;
   exports2.caseInsensitiveSort = caseInsensitiveSort;
@@ -1782,6 +1781,7 @@ ${opts.message || this.desc}`;
   exports2.findByProp = findByProp;
   exports2.flattenArr = flattenArr;
   exports2.flattenObj = flattenObj;
+  exports2.fn = fn;
   exports2.formData = formData;
   exports2.formatBytes = formatBytes;
   exports2.formatDate = formatDate;
@@ -1794,6 +1794,7 @@ ${opts.message || this.desc}`;
   exports2.instantInterval = instantInterval;
   exports2.isEqual = isEqual;
   exports2.kebabCase = kebabCase;
+  exports2.logicTest = logicTest;
   exports2.makeArray = makeArray;
   exports2.makeUnique = makeUnique;
   exports2.matchAll = matchAll;
@@ -1811,7 +1812,6 @@ ${opts.message || this.desc}`;
   exports2.snakeCase = snakeCase;
   exports2.sortByProp = sortByProp;
   exports2.strSplice = strSplice;
-  exports2.testCondition = testCondition;
   exports2.timeUntil = timeUntil;
   exports2.timestampFilename = timestampFilename;
   exports2.toCsv = toCsv;