refactor: move string parsing logic a separate function

Author: Hans Kristian Flaatten

index.js

@@ -100,6 +100,14 @@ module.exports.prototype.customAfter = function(field) {
   };
 };
 
+module.exports.prototype.parseString = function(string) {
+  if (!isNaN(string)) {
+    return parseFloat(string, 10);
+  } else {
+    return string;
+  }
+};
+
 module.exports.prototype.parse = function(query) {
   var op, val;
   var res = {};
@@ -138,17 +146,16 @@ module.exports.prototype.parse = function(query) {
           res[key] = {$in: val.filter(function(element) {
             return element[0] !== '!';
           }).map(function(element) {
-            return isNaN(element) ? element : parseFloat(element, 10);
-          })};
+            return this.parseString(element);
+          }.bind(this))};
 
         // $nin query
         } else {
           res[key] = {$nin: val.filter(function(element) {
             return element[0] === '!';
           }).map(function(element) {
-            element = element.substr(1);
-            return isNaN(element) ? element : parseFloat(element, 10);
-          })};
+            return this.parseString(element.substr(1));
+          }.bind(this))};
         }
       }
 
@@ -173,7 +180,7 @@ module.exports.prototype.parse = function(query) {
         switch (op) {
           case '!':
             if (val) {
-              return { $ne: isNaN(val) ? val : parseFloat(val, 10) };
+              return { $ne: this.parseString(val) };
             } else {
               return { $exists: false };
             }
@@ -193,9 +200,9 @@ module.exports.prototype.parse = function(query) {
                 return { $regex: val, $options: 'i' };
             }
         }
-      })();
+      }.bind(this))();
     } else {
-      res[key] = isNaN(val) ? val : parseFloat(val, 10);
+      res[key] = this.parseString(val);
     }
   }
   return res;