Merge pull request #5 from zishone/regex-options

Add regex options
Fizcko · May 25, 2020 · 8072fea · 8072fea
2 parents 08ae29d + 514c7b7
commit 8072fea
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/Readme.md b/Readme.md
@@ -78,7 +78,13 @@ try{
 
     // Like operator
     rsqlMongoDB('lastName=~do*');
-    //=> { "lastName": { $regex: "do*" } }
+    //=> { "lastName": { $regex: "do*", $options: "" } }
+
+    // Like operator with options
+    rsqlMongoDB('lastName=~do*=si');
+    //=> { "lastName": { $regex: "do*", $options: "si" } }
+    rsqlMongoDB('lastName=~"do=*"=si');
+    //=> { "lastName": { $regex: "do=*", $options: "si" } }
 
     // Exists operator
     rsqlMongoDB('childs=exists=true');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rsql-mongodb",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Converting RSQL queries to MongoDB queries",
   "main": "rsql-mongodb.js",
   "typings": "rsql-mongodb.ts",

diff --git a/rsql-mongodb.js b/rsql-mongodb.js
@@ -248,7 +248,8 @@ module.exports = function (input) {
 					mongoOperatorQuery[exp1] = { $nin: typedValues };
 					break;
 				case "=~":
-					mongoOperatorQuery[exp1] = { $regex: typedExp2 };
+					var expArr = exp2.split(/(=)(?=(?:[^"]|"[^"]*")*$)/g);
+					mongoOperatorQuery[exp1] = { $regex: setType(expArr[0]), $options: expArr[2] || "" };
 					break;
 				case "=exists=":
 					mongoOperatorQuery[exp1] = { $exists: typedExp2 };

diff --git a/test.js b/test.js
@@ -53,13 +53,15 @@ describe('rsql-mongodb', function () {
         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*" } });
+        expect(rsqlMongoDB('lastName=~do*')).to.deep.include({ "lastName": { $regex: "do*", $options: "" } });
+        expect(rsqlMongoDB('lastName=~do*=i')).to.deep.include({ "lastName": { $regex: "do*", $options: "i" } });
+        expect(rsqlMongoDB('lastName=~do*=mxs')).to.deep.include({ "lastName": { $regex: "do*", $options: "mxs" } });
+        expect(rsqlMongoDB('lastName=~"do=*"=mxs')).to.deep.include({ "lastName": { $regex: "do=*", $options: "mxs" } });
     });
     it("Test operator Exists ('=exists=')", function () {
         expect(rsqlMongoDB('childs=exists=true')).to.deep.include({ "childs": { $exists: true } });
         expect(rsqlMongoDB('childs=exists=false')).to.deep.include({ "childs": { $exists: false } });
         expect(rsqlMongoDB('childs=exists=true')).to.be.a('object');
-
     });
     it("Test logical operator AND (';')", function () {
         expect(rsqlMongoDB('firstName=="john";lastName=="doe"')).to.deep.include({ $and: [ { "firstName" : "john" } , { "lastName" : "doe" } ] });