@ztimson/utils 0.26.13 → 0.26.15

package/dist/index.mjs

@@ -2024,8 +2024,8 @@ class PathEventEmitter {
 function search(rows, search2, regex, transform = (r) => r) {
   if (!rows) return [];
   return rows.filter((r) => {
-    const value = transform(r);
     if (!search2) return true;
+    const value = transform(r);
     if (regex) {
       return !!Object.values(value).filter((v) => {
         try {
@@ -2035,7 +2035,7 @@ function search(rows, search2, regex, transform = (r) => r) {
         }
       }).length;
     } else {
-      return logicTest(r, search2);
+      return logicTest(value, search2);
     }
   });
 }
@@ -2047,9 +2047,9 @@ function logicTest(target, condition) {
         return a == b;
       case "!=":
         return a != b;
-      case "+":
+      case "+=":
         return a == null ? void 0 : a.toString().includes(b);
-      case "-":
+      case "-=":
         return !(a == null ? void 0 : a.toString().includes(b));
       case ">":
         return a > b;
@@ -2067,7 +2067,7 @@ function logicTest(target, condition) {
   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);
+      const prop = /(\S+)\s*(==?|!=|\+=|-=|>=|>|<=|<)\s*(\S+)/g.exec(p2);
       if (prop) {
         const key = Object.keys(target).find((k) => k.toLowerCase() == prop[1].toLowerCase());
         return evalBoolean(dotNotation(target, key || prop[1]), prop[2], JSONAttemptParse(prop[3]));