@budibase/backend-core 2.29.30 → 2.30.1

package/dist/index.js

@@ -54481,6 +54481,9 @@ var RangeOperator = /* @__PURE__ */ ((RangeOperator2) => {
   RangeOperator2["RANGE"] = "range";
   return RangeOperator2;
 })(RangeOperator || {});
+function isLogicalSearchOperator(value) {
+  return value === "$and" /* AND */ || value === "$or" /* OR */;
+}
 
 // ../types/src/sdk/db.ts
 var isDocument = (doc) => {
@@ -55252,6 +55255,7 @@ var buildQuery = (filter) => {
           high: value
         };
       }
+    } else if (isLogicalSearchOperator(queryOperator)) {
     } else if (query[queryOperator] && operator !== "onEmptyFilter") {
       if (type === "boolean") {
         if (queryOperator === "equal" && value === false) {
@@ -55321,14 +55325,15 @@ var runQuery = (docs, query) => {
   }
   const match = (type, test) => (doc) => {
     for (const [key, testValue] of Object.entries(query[type] || {})) {
-      const result = test(deepGet(doc, removeKeyNumbering(key)), testValue);
+      const valueToCheck = isLogicalSearchOperator(type) ? doc : deepGet(doc, removeKeyNumbering(key));
+      const result = test(valueToCheck, testValue);
       if (query.allOr && result) {
         return true;
       } else if (!query.allOr && !result) {
         return false;
       }
     }
-    return true;
+    return !query.allOr;
   };
   const stringMatch = match(
     "string" /* STRING */,
@@ -55483,6 +55488,39 @@ var runQuery = (docs, query) => {
     }
   );
   const containsAny = match("containsAny" /* CONTAINS_ANY */, _contains("some"));
+  const and = match(
+    "$and" /* AND */,
+    (docValue, conditions) => {
+      if (!conditions.length) {
+        return false;
+      }
+      for (const condition of conditions) {
+        const matchesCondition = runQuery([docValue], condition);
+        if (!matchesCondition.length) {
+          return false;
+        }
+      }
+      return true;
+    }
+  );
+  const or = match(
+    "$or" /* OR */,
+    (docValue, conditions) => {
+      if (!conditions.length) {
+        return false;
+      }
+      for (const condition of conditions) {
+        const matchesCondition = runQuery([docValue], {
+          ...condition,
+          allOr: true
+        });
+        if (matchesCondition.length) {
+          return true;
+        }
+      }
+      return false;
+    }
+  );
   const docMatch = (doc) => {
     const filterFunctions = {
       string: stringMatch,
@@ -55495,7 +55533,9 @@ var runQuery = (docs, query) => {
       oneOf,
       contains,
       containsAny,
-      notContains
+      notContains,
+      ["$and" /* AND */]: and,
+      ["$or" /* OR */]: or
     };
     const results = Object.entries(query || {}).filter(
       ([key, value]) => !["allOr", "onEmptyFilter"].includes(key) && value && Object.keys(value).length > 0
@@ -67995,6 +68035,22 @@ var InternalBuilder = class {
         });
       }
     };
+    if (filters.$and) {
+      const { $and } = filters;
+      query = query.where((x) => {
+        for (const condition of $and.conditions) {
+          x = this.addFilters(x, condition, opts);
+        }
+      });
+    }
+    if (filters.$or) {
+      const { $or } = filters;
+      query = query.where((x) => {
+        for (const condition of $or.conditions) {
+          x = this.addFilters(x, { ...condition, allOr: true }, opts);
+        }
+      });
+    }
     if (filters.oneOf) {
       const fnc = allOr ? "orWhereIn" : "whereIn";
       iterate(