Remove Array.isArray check, add // empty object validation in requireFilter (Automattic#14913)

Author: muazahmed-dev

lib/query.js

@@ -165,11 +165,28 @@ function Query(conditions, options, model, collection) {
   }
 }
 
-// Helper function to check empty/invalid filter
+// Helper function to check if an object is empty or contains only empty objects/arrays
+function isEmptyFilter(obj) {
+  if (obj == null) return true;
+  if (typeof obj !== 'object' || obj === null) return false;
+  if (Object.keys(obj).length === 0) return true;
+
+  // Check $and, $or, $nor arrays
+  for (const key of ['$and', '$or', '$nor']) {
+    if (Array.isArray(obj[key])) {
+      // If array is empty or all elements are empty objects, consider it empty
+      if (obj[key].length === 0 || obj[key].every(item => isEmptyFilter(item))) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+// Helper function to check for empty/invalid filter
 function checkRequireFilter(filter, options) {
-  if (options && options.requireFilter &&
-      (filter == null ||
-       (typeof filter === 'object' && filter !== null && !Array.isArray(filter) && Object.keys(filter).length === 0))) {
+  if (options && options.requireFilter && isEmptyFilter(filter)) {
     throw new Error('Empty or invalid filter not allowed with requireFilter enabled');
   }
 }