Merge pull request #3 from Fizcko/develop

Add like operator. Resolve #2

Author: Fizcko

Readme.md

@@ -31,6 +31,9 @@ It's a query language that introduces basic and logical operators. This is perfe
 - AND : ;
 - OR : ,
 
+#### Additionals operators
+- Like : =~ (to match regex values)
+
 ###### NOTE
 Parenthesized expression can be used to define the precedence.
 
@@ -72,6 +75,10 @@ try{
     rsqlMongoDB('childs=out=(1,2,3)');
     //=> { "childs": { $nin: [1,2,3] } }
 
+    // Like operator
+    rsqlMongoDB('lastName=~do*');
+    //=> { "lastName": { $regex: "do*" } }
+
     // Groups
     rsqlMongoDB('(firstName=="john";lastName=="doe"),(firstName==janne;lastName==doe)');
     //=> { $or: [ { $and: [ { "firstName" : "john" } , { "lastName" : "doe" } ] } , { $and: [ { "firstName" : "janne" } , { "lastName" : "doe" } ] } ] }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsql-mongodb",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "description": "Converting RSQL queries to MongoDB queries",
   "main": "rsql-mongodb.js",
   "typings": "rsql-mongodb.ts",
@@ -36,8 +36,8 @@
   ],
   "devDependencies": {
     "chai": "4.2.0",
-    "coveralls": "3.0.4",
-    "mocha": "6.1.4",
+    "coveralls": "3.0.5",
+    "mocha": "6.2.0",
     "nyc": "14.1.1"
   }
 }

rsql-mongodb.js

@@ -193,7 +193,7 @@ module.exports = function (input) {
 			}
 
 			// Split the query
-			var rsqlOperators = /(.*)(==|!=|=gt=|=ge=|=lt=|=le=|=in=|=out=)(.*)/g;
+			var rsqlOperators = /(.*)(==|!=|=gt=|=ge=|=lt=|=le=|=in=|=out=|=~)(.*)/g;
 			var rsqlQuery = rsqlOperators.exec(outputTab[i]);
 
 			try {
@@ -247,6 +247,9 @@ module.exports = function (input) {
 					}
 					mongoOperatorQuery[exp1] = { $nin: typedValues };
 					break;
+				case "=~":
+					mongoOperatorQuery[exp1] = { $regex: typedExp2 };
+					break;
 				default:
 					throw "Operator not supported."
 			}

test.js

@@ -52,6 +52,9 @@ describe('rsql-mongodb', function () {
         expect(rsqlMongoDB('childs=out=("1","2","3")')).to.deep.include({ "childs": { $nin: ["1","2","3"] } });
         expect(rsqlMongoDB('childs=out=(1, 2, 3 )')).to.deep.include({ "childs": { $nin: [1,2,3] } });
     });
+    it("Test operator Like ('=~')", function () {
+        expect(rsqlMongoDB('lastName=~do*')).to.deep.include({ "lastName": { $regex: "do*" } });
+    });
     it("Test logical operator AND (';')", function () {
         expect(rsqlMongoDB('firstName=="john";lastName=="doe"')).to.deep.include({ $and: [ { "firstName" : "john" } , { "lastName" : "doe" } ] });
     });