Merge pull request #11400 from Uzlopak/improve-aggregate-isOperator

impr: isOperator
Automattic · Feb 15, 2022 · 0221233 · 0221233
2 parents 96c067e + ea9d7fc
commit 0221233
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/aggregate.js b/lib/aggregate.js
@@ -1100,13 +1100,13 @@ if (Symbol.asyncIterator != null) {
  */
 
 function isOperator(obj) {
-  if (typeof obj !== 'object') {
+  if (typeof obj !== 'object' || obj === null) {
     return false;
   }
 
   const k = Object.keys(obj);
 
-  return k.length === 1 && k.some(key => { return key[0] === '$'; });
+  return k.length === 1 && k[0][0] === '$';
 }
 
 /*!

diff --git a/lib/helpers/query/isOperator.js b/lib/helpers/query/isOperator.js
@@ -7,5 +7,8 @@ const specialKeys = new Set([
 ]);
 
 module.exports = function isOperator(path) {
-  return path.startsWith('$') && !specialKeys.has(path);
-};
+  return (
+    path[0] === '$' &&
+    !specialKeys.has(path)
+  );
+};