@budibase/shared-core 2.30.7 → 2.31.0

package/dist/filters.d.ts

@@ -17,6 +17,7 @@ export declare const getValidOperatorsForType: (fieldType: {
  * Operators which do not support empty strings as values
  */
 export declare const NoEmptyFilterStrings: (keyof SearchQueryFields)[];
+export declare function recurseLogicalOperators(filters: SearchFilters, fn: (f: SearchFilters) => SearchFilters): SearchFilters;
 /**
  * Removes any fields that contain empty strings that would cause inconsistent
  * behaviour with how backend tables are filtered (no value means no filter).

package/dist/index.js

@@ -10089,6 +10089,11 @@ var ArrayOperator = /* @__PURE__ */ ((ArrayOperator2) => {
   ArrayOperator2["ONE_OF"] = "oneOf";
   return ArrayOperator2;
 })(ArrayOperator || {});
+var LogicalOperator = /* @__PURE__ */ ((LogicalOperator2) => {
+  LogicalOperator2["AND"] = "$and";
+  LogicalOperator2["OR"] = "$or";
+  return LogicalOperator2;
+})(LogicalOperator || {});
 function isLogicalSearchOperator(value) {
   return value === "$and" /* AND */ || value === "$or" /* OR */;
 }
@@ -10402,6 +10407,7 @@ __export(filters_exports, {
   getValidOperatorsForType: () => getValidOperatorsForType,
   hasFilters: () => hasFilters,
   limit: () => limit,
+  recurseLogicalOperators: () => recurseLogicalOperators,
   removeKeyNumbering: () => removeKeyNumbering,
   runQuery: () => runQuery,
   search: () => search,
@@ -10631,6 +10637,16 @@ var NoEmptyFilterStrings = [
   OperatorOptions.ContainsAny.value,
   OperatorOptions.In.value
 ];
+function recurseLogicalOperators(filters, fn) {
+  for (const logical of Object.values(LogicalOperator)) {
+    if (filters[logical]) {
+      filters[logical].conditions = filters[logical].conditions.map(
+        (condition) => fn(condition)
+      );
+    }
+  }
+  return filters;
+}
 var cleanupQuery = (query) => {
   if (!query) {
     return query;
@@ -10653,6 +10669,7 @@ var cleanupQuery = (query) => {
       }
     }
   }
+  query = recurseLogicalOperators(query, cleanupQuery);
   return query;
 };
 function isEmptyArray(value) {
@@ -10835,6 +10852,7 @@ function fixupFilterArrays(filters) {
       }
     }
   }
+  recurseLogicalOperators(filters, fixupFilterArrays);
   return filters;
 }
 var search = (docs, query) => {