feat: add support for regexp flags in matches (rql)

Author: 0xfede

src/mongo/rql.ts

@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 
 const rqlParser = require('rql/parser').parseQuery;
 
-export default function(query: any, opts: any, data: string) {
+export default function (query: any, opts: any, data: string) {
   return _rqlToMongo(query, opts, rqlParser(data));
 }
 
@@ -19,15 +19,15 @@ function _rqlToMongo(query: any, opts: any, data: any) {
         query = _rqlToMongo(query, opts, data.args[0]);
       } else if (_.find(data.args, (i: any) => i.name === 'or' || i.name === 'and')) {
         query.$and = [];
-        _.each(data.args, function(i) {
+        _.each(data.args, function (i) {
           let _p = _rqlToMongo({}, opts, i);
           if (_p) query.$and.push(_p);
         });
         if (query.$and.length === 1) {
           query = query.$and[0];
         }
       } else {
-        _.each(data.args, function(i) {
+        _.each(data.args, function (i) {
           query = _rqlToMongo(query, opts, i);
         });
       }
@@ -37,7 +37,7 @@ function _rqlToMongo(query: any, opts: any, data: any) {
         query = _rqlToMongo(query, opts, data.args[0]);
       } else {
         query.$or = [];
-        _.each(data.args, function(i) {
+        _.each(data.args, function (i) {
           let _p = _rqlToMongo({}, opts, i);
           if (_p) query.$or.push(_p);
         });
@@ -65,7 +65,7 @@ function _rqlToMongo(query: any, opts: any, data: any) {
       query[data.args[0]] = { $ne: data.args[1] };
       break;
     case 'matches':
-      query[data.args[0]] = new RegExp(data.args[1]);
+      query[data.args[0]] = new RegExp(data.args[1], data.args[2]);
       break;
 
     case 'sort':

test/ts/rql.test.ts

@@ -5,21 +5,21 @@ import rql from '../../dist/mongo/rql';
 chai.should();
 chai.use(spies);
 
-describe('rql', function() {
-  it('should parse "in"', function() {
+describe('rql', function () {
+  it('should parse "in"', function () {
     let query = rql({}, {}, 'in(x,a,b,c)');
     query.x.should.deep.equal({ $in: ['a', 'b', 'c'] });
   });
 
-  it('should parse "contains"', function() {
+  it('should parse "contains"', function () {
     let query = rql({}, {}, 'contains(x,aaa)');
     query.x.should.equal('aaa');
 
     query = rql({}, {}, 'contains(x,aaa,bbb,ccc)');
     query.x.should.deep.equal(['aaa', 'bbb', 'ccc']);
   });
 
-  it('should parse "and"', function() {
+  it('should parse "and"', function () {
     let query1 = rql({}, {}, 'and(eq(x,b))');
     let query2 = rql({}, {}, 'eq(x,b)');
     query1.should.deep.equal(query2);
@@ -32,7 +32,7 @@ describe('rql', function() {
     query5.should.deep.equal({ x: 'b' });
   });
 
-  it('should parse "or"', function() {
+  it('should parse "or"', function () {
     let query1 = rql({}, {}, 'or(eq(x,b))');
     let query2 = rql({}, {}, 'eq(x,b)');
     query1.should.deep.equal(query2);
@@ -45,54 +45,58 @@ describe('rql', function() {
     query5.should.deep.equal({ x: 'b' });
   });
 
-  it('should parse "eq"', function() {
+  it('should parse "eq"', function () {
     let query = rql({}, {}, 'eq(x,a)');
     query.should.deep.equal({ x: 'a' });
   });
 
-  it('should parse "lt"', function() {
+  it('should parse "lt"', function () {
     let query = rql({}, {}, 'lt(x,a)');
     query.should.deep.equal({ x: { $lt: 'a' } });
   });
 
-  it('should parse "le"', function() {
+  it('should parse "le"', function () {
     let query = rql({}, {}, 'le(x,a)');
     query.should.deep.equal({ x: { $lte: 'a' } });
   });
 
-  it('should parse "gt"', function() {
+  it('should parse "gt"', function () {
     let query = rql({}, {}, 'gt(x,a)');
     query.should.deep.equal({ x: { $gt: 'a' } });
   });
 
-  it('should parse "ge"', function() {
+  it('should parse "ge"', function () {
     let query = rql({}, {}, 'ge(x,a)');
     query.should.deep.equal({ x: { $gte: 'a' } });
   });
 
-  it('should parse "ne"', function() {
+  it('should parse "ne"', function () {
     let query = rql({}, {}, 'ne(x,a)');
     query.should.deep.equal({ x: { $ne: 'a' } });
   });
 
-  it('should parse "matches"', function() {
+  it('should parse "matches"', function () {
     let query = rql({}, {}, 'matches(x,a)');
     query.should.deep.equal({ x: /a/ });
+    query = rql({}, {}, 'matches(x,a,i)');
+    query.should.deep.equal({ x: /a/i });
+    query = rql({}, {}, 'matches(x,a,ig)');
+    query.should.deep.equal({ x: /a/gi });
   });
 
-  it('should parse "sort"', function() {
+  it('should parse "sort"', function () {
     let opts: any = {};
     rql({}, opts, 'sort(a,b)');
     opts.sort.should.deep.equal(['a', 'b']);
   });
 
-  it('should parse "select"', function() {
+  it('should parse "select"', function () {
     let opts: any = {};
     rql({}, opts, 'select(a,b)');
     opts.fields.should.deep.equal(['a', 'b']);
   });
 
-  it('should parse "limit"', function() {
+  it('should parse "limit"', function () {
     let opts: any = {};
     rql({}, opts, 'limit(a,b)');
     opts.skip.should.equal('a');