chore: PouchDB-find validateSelector cleanup (#8915)

* chore: `var` -> `const`
* chore: extract object not null check
* chore: inline `export default`

Author: SourceR85

packages/node_modules/pouchdb-find/src/validateSelector.js

@@ -1,17 +1,21 @@
+function isNonNullObject(value) {
+  return typeof value === 'object' && value !== null;
+}
+
 // throws if the user is using the wrong query field value type
 function checkFieldValueType(name, value, isHttp) {
-  var message = '';
-  var received = value;
-  var addReceived = true;
-  if ([ '$in', '$nin', '$or', '$and', '$mod', '$nor', '$all' ].indexOf(name) !== -1) {
+  let message = '';
+  let received = value;
+  let addReceived = true;
+  if (['$in', '$nin', '$or', '$and', '$mod', '$nor', '$all'].indexOf(name) !== -1) {
     if (!Array.isArray(value)) {
       message = 'Query operator ' + name + ' must be an array.';
 
     }
   }
 
-  if ([ '$not', '$elemMatch', '$allMatch' ].indexOf(name) !== -1) {
-    if (!(!Array.isArray(value) && typeof value === 'object' && value !== null)) {
+  if (['$not', '$elemMatch', '$allMatch'].indexOf(name) !== -1) {
+    if (!(!Array.isArray(value) && isNonNullObject(value))) {
       message = 'Query operator ' + name + ' must be an object.';
     }
   }
@@ -21,8 +25,8 @@ function checkFieldValueType(name, value, isHttp) {
       message = 'Query operator $mod must be in the format [divisor, remainder], ' +
         'where divisor and remainder are both integers.';
     } else {
-      var divisor = value[0];
-      var mod = value[1];
+      const divisor = value[0];
+      const mod = value[1];
       if (divisor === 0) {
         message = 'Query operator $mod\'s divisor cannot be 0, cannot divide by zero.';
         addReceived = false;
@@ -44,8 +48,8 @@ function checkFieldValueType(name, value, isHttp) {
   }
 
   if (name === '$type') {
-    var allowed = [ 'null', 'boolean', 'number', 'string', 'array', 'object' ];
-    var allowedStr = '"' + allowed.slice(0, allowed.length - 1).join('", "') + '", or "' + allowed[allowed.length - 1] + '"';
+    const allowed = ['null', 'boolean', 'number', 'string', 'array', 'object'];
+    const allowedStr = '"' + allowed.slice(0, allowed.length - 1).join('", "') + '", or "' + allowed[allowed.length - 1] + '"';
     if (typeof value !== 'string') {
       message = 'Query operator $type must be a string. Supported values: ' + allowedStr + '.';
     } else if (allowed.indexOf(value) == -1) {
@@ -72,44 +76,36 @@ function checkFieldValueType(name, value, isHttp) {
 
   if (message) {
     if (addReceived) {
-
-      var type = received === null
-      ? ' '
-      : Array.isArray(received)
-      ? ' array'
-      : ' ' + typeof received;
-      var receivedStr = typeof received === 'object' && received !== null
-      ?  JSON.stringify(received, null, '\t')
-      : received;
+      const type = received === null
+        ? ' '
+        : Array.isArray(received)
+          ? ' array'
+          : ' ' + typeof received;
+      const receivedStr = isNonNullObject(received)
+        ? JSON.stringify(received, null, '\t')
+        : received;
 
       message += ' Received' + type + ': ' + receivedStr;
     }
     throw new Error(message);
   }
 }
 
-
-var requireValidation = [ '$all', '$allMatch', '$and', '$elemMatch', '$exists', '$in', '$mod', '$nin', '$nor', '$not', '$or', '$regex', '$size', '$type' ];
-
-var arrayTypeComparisonOperators = [ '$in', '$nin', '$mod', '$all'];
-
-var equalityOperators = [ '$eq', '$gt', '$gte', '$lt', '$lte' ];
+const requireValidation = ['$all', '$allMatch', '$and', '$elemMatch', '$exists', '$in', '$mod', '$nin', '$nor', '$not', '$or', '$regex', '$size', '$type'];
+const arrayTypeComparisonOperators = ['$in', '$nin', '$mod', '$all'];
+const equalityOperators = ['$eq', '$gt', '$gte', '$lt', '$lte'];
 
 // recursively walks down the a query selector validating any operators
-function validateSelector(input, isHttp) {
+export default function validateSelector(input, isHttp) {
   if (Array.isArray(input)) {
-    for (var entry of input) {
-      if (typeof entry === 'object' && entry !== null) {
+    for (const entry of input) {
+      if (isNonNullObject(entry)) {
         validateSelector(entry, isHttp);
       }
     }
-  } else {
-    var fields = Object.keys(input);
-
-    for (var i = 0; i < fields.length; i++) {
-      var key = fields[i];
-      var value = input[key];
-
+  }
+  else {
+    for (const [key, value] of Object.entries(input)) {
       if (requireValidation.indexOf(key) !== -1) {
         checkFieldValueType(key, value, isHttp);
       }
@@ -121,11 +117,9 @@ function validateSelector(input, isHttp) {
         // skip, their values are already valid
         continue;
       }
-      if (typeof value === 'object' && value !== null) {
+      if (isNonNullObject(value)) {
         validateSelector(value, isHttp);
       }
     }
   }
 }
-
-export default validateSelector;