Support regular expression matches

Introduce an operator (~=) to perform matches using regular expressions: {country: "US"} country ~= "^(US|CA)"
turp1twin · Mar 5, 2015 · e446ae9 · e446ae9
1 parent fa299f8
commit e446ae9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -86,6 +86,7 @@ x < y | Less than
 x <= y | Less than or equal to
 x > y | Greater than
 x >= y | Greater than or equal to
+x ~= y | Regular expression match
 x in (a, b, c) | Equivalent to (x == a or x == b or x == c)
 x not in (a, b, c) | Equivalent to (x != a and x != b and x != c)
 

diff --git a/filtrex.js b/filtrex.js
@@ -89,6 +89,7 @@ function filtrexParser() {
                 ['\\,', 'return ",";'],
                 ['==', 'return "==";'],
                 ['\\!=', 'return "!=";'],
+                ['\\~=', 'return "~=";'],
                 ['>=', 'return ">=";'],
                 ['<=', 'return "<=";'],
                 ['<', 'return "<";'],
@@ -120,7 +121,7 @@ function filtrexParser() {
             ['left', 'or'],
             ['left', 'and'],
             ['left', 'in'],
-            ['left', '==', '!='],
+            ['left', '==', '!=', '~='],
             ['left', '<', '<=', '>', '>='],
             ['left', '+', '-'],
             ['left', '*', '/', '%'],
@@ -146,6 +147,7 @@ function filtrexParser() {
                 ['not e'  , code(['Number(!', 2, ')'])],
                 ['e == e' , code(['Number(', 1, '==', 3, ')'])],
                 ['e != e' , code(['Number(', 1, '!=', 3, ')'])],
+                ['e ~= e' , code(['RegExp(', 3, ').test(', 1, ')'])],
                 ['e < e'  , code(['Number(', 1, '<' , 3, ')'])],
                 ['e <= e' , code(['Number(', 1, '<=', 3, ')'])],
                 ['e > e'  , code(['Number(', 1, '> ', 3, ')'])],

diff --git a/src/filtrex.js b/src/filtrex.js
@@ -89,6 +89,7 @@ function filtrexParser() {
                 ['\\,', 'return ",";'],
                 ['==', 'return "==";'],
                 ['\\!=', 'return "!=";'],
+                ['\\~=', 'return "~=";'],
                 ['>=', 'return ">=";'],
                 ['<=', 'return "<=";'],
                 ['<', 'return "<";'],
@@ -120,7 +121,7 @@ function filtrexParser() {
             ['left', 'or'],
             ['left', 'and'],
             ['left', 'in'],
-            ['left', '==', '!='],
+            ['left', '==', '!=', '~='],
             ['left', '<', '<=', '>', '>='],
             ['left', '+', '-'],
             ['left', '*', '/', '%'],
@@ -146,6 +147,7 @@ function filtrexParser() {
                 ['not e'  , code(['Number(!', 2, ')'])],
                 ['e == e' , code(['Number(', 1, '==', 3, ')'])],
                 ['e != e' , code(['Number(', 1, '!=', 3, ')'])],
+                ['e ~= e' , code(['RegExp(', 3, ').test(', 1, ')'])],
                 ['e < e'  , code(['Number(', 1, '<' , 3, ')'])],
                 ['e <= e' , code(['Number(', 1, '<=', 3, ')'])],
                 ['e > e'  , code(['Number(', 1, '> ', 3, ')'])],

diff --git a/test/filtrex-test.html b/test/filtrex-test.html
@@ -104,6 +104,11 @@
         eq(1, compileExpression('foo not in ("aa", "bb")')({foo:'cc'}));
     },
 
+    'regexp test': function() {
+        eq(1, compileExpression('foo ~= "^[hH]ello"')({foo:'hello'}));
+        eq(0, compileExpression('foo ~= "^[hH]ello"')({foo:'bye'}));
+    },
+
     'a ? b : c': function() {
         eq(4, compileExpression('1 > 2 ? 3 : 4')());
         eq(3, compileExpression('1 < 2 ? 3 : 4')());