@ztimson/utils 0.24.2 → 0.24.3

package/dist/index.mjs

@@ -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;
@@ -1791,6 +1791,7 @@ export {
   instantInterval,
   isEqual,
   kebabCase,
+  logicTest,
   makeArray,
   makeUnique,
   matchAll,
@@ -1808,7 +1809,6 @@ export {
   snakeCase,
   sortByProp,
   strSplice,
-  testCondition,
   timeUntil,
   timestampFilename,
   toCsv,