fix(parser): apply custom functions before general array logic

Turistforeningen · Jul 27, 2016 · 3fcc0b7 · 3fcc0b7
1 parent 43c15d4
commit 3fcc0b7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -230,6 +230,12 @@ module.exports.prototype.parse = function parse(query) {
       return;
     }
 
+    // custom functions
+    if (typeof this.custom[key] === 'function') {
+      this.custom[key].apply(null, [res, val]);
+      return;
+    }
+
     // array key
     if (val instanceof Array) {
       if (this.ops.indexOf('$in') >= 0 && val.length > 0) {
@@ -267,12 +273,8 @@ module.exports.prototype.parse = function parse(query) {
       return;
     }
 
-    // custom functions
-    if (typeof this.custom[key] === 'function') {
-      this.custom[key](res, val);
-
     // field exists query
-    } else if (!val) {
+    if (!val) {
       res[key] = { $exists: true };
 
     // query operators

diff --git a/test.js b/test.js
@@ -886,5 +886,23 @@ describe('parse()', () => {
         },
       });
     });
+
+    it('returns custom function query', () => {
+      mqs = new MongoQS({
+        custom: {
+          assigned: (query, input) => {
+            query['assigned.users._id'] = {
+              $in: input.map(id => parseInt(id, 10)),
+            };
+          },
+        },
+      });
+
+      assert.deepEqual(mqs.parse({
+        assigned: ['1111', '2222']
+      }), {
+        'assigned.users._id': { $in: [1111, 2222] },
+      });
+    });
   });
 });