@budibase/shared-core 2.21.3 → 2.21.4

package/dist/index.js

@@ -5231,7 +5231,30 @@ var runLuceneQuery = (docs, query) => {
     }
   );
   const docMatch = (doc) => {
-    return stringMatch(doc) && fuzzyMatch(doc) && rangeMatch(doc) && equalMatch(doc) && notEqualMatch(doc) && emptyMatch(doc) && notEmptyMatch(doc) && oneOf(doc) && contains(doc) && containsAny(doc) && notContains(doc);
+    const filterFunctions = {
+      string: stringMatch,
+      fuzzy: fuzzyMatch,
+      range: rangeMatch,
+      equal: equalMatch,
+      notEqual: notEqualMatch,
+      empty: emptyMatch,
+      notEmpty: notEmptyMatch,
+      oneOf,
+      contains,
+      containsAny,
+      notContains
+    };
+    const activeFilterKeys = Object.entries(query || {}).filter(
+      ([key, value]) => !["allOr", "onEmptyFilter"].includes(key) && value && Object.keys(value).length > 0
+    ).map(([key]) => key);
+    const results = activeFilterKeys.map((filterKey) => {
+      return filterFunctions[filterKey]?.(doc) ?? false;
+    });
+    if (query.allOr) {
+      return results.some((result) => result === true);
+    } else {
+      return results.every((result) => result === true);
+    }
   };
   return docs.filter(docMatch);
 };