@ztimson/utils 0.24.2 → 0.24.3

package/dist/index.cjs

@@ -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;
@@ -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;