Issue 224 - Improve column id support for filtering

src/core/syntax-tree/lexicon.ts

@@ -33,22 +33,22 @@ const isPrime = (c: number) => {
 
 const operand = {
     resolve: (target: any, tree: ISyntaxTree) => {
-        if (/^('.*')|(".*")$/.test(tree.value)) {
+        if (/^(('([^'\\]|\\'|\\)+')|("([^"\\]|\\"|\\)+")|(`([^`\\]|\\`|\\)+`))$/.test(tree.value)) {
             return target[
                 tree.value.slice(1, tree.value.length - 1)
             ];
         } else if (/^(\w|[:.\-+])+$/.test(tree.value)) {
             return target[tree.value];
         }
     },
-    regexp: /^('([^()']|\\')+'|"([^()"]|\\")+"|(\w|[:.\-+])+)/
+    regexp: /^(('([^'\\]|\\'|\\)+')|("([^"\\]|\\"|\\)+")|(`([^`\\]|\\`|\\)+`)|(\w|[:.\-+])+)/
 };
 
 const expression = {
     resolve: (target: any, tree: ISyntaxTree) => {
-        if (/^('.*')|(".*")$/.test(tree.value)) {
+        if (/^(('([^'\\]|\\'|\\)+')|("([^"\\]|\\"|\\)+")|(`([^`\\]|\\`|\\)+`))$/.test(tree.value)) {
             return tree.value.slice(1, tree.value.length - 1);
-        } else if (/^\w+\(.*\)$/.test(tree.value)) {
+        } else if (/^(num|str)\(.*\)$/.test(tree.value)) {
             const res = tree.value.match(/^(\w+)\((.*)\)$/);
             if (res) {
                 const [, op, value] = res;
@@ -67,7 +67,7 @@ const expression = {
             return target[tree.value];
         }
     },
-    regexp: /^(((num|str)\([^()]*\))|'([^()']|\\')+'|"([^()"]|\\")+"|\w+)/
+    regexp: /^(((num|str)\([^()]*\))|('([^'\\]|\\'|\\)+')|("([^"\\]|\\"|\\)+")|(`([^`\\]|\\`|\\)+`)|(\w|[:.\-+])+)/
 };
 
 const lexicon: ILexeme[] = [

tests/cypress/tests/unit/syntactic_tree_test.ts

@@ -1,10 +1,10 @@
 import SyntaxTree from 'core/syntax-tree';
 
 describe('Syntax Tree', () => {
-    const data0 = { a: '0', b: '0', c: 0, d: null, 'a.dot': '0.dot', 'a-dot': '0-dot', a_dot: '0_dot', 'a+dot': '0+dot', 'a dot': '0 dot', 'a:dot': '0:dot', '_-6.:+** *@$': '0*dot' };
-    const data1 = { a: '1', b: '0', c: 1, d: 0, 'a.dot': '1.dot', 'a-dot': '1-dot', a_dot: '1_dot', 'a+dot': '1+dot', 'a dot': '1 dot', 'a:dot': '1:dot', '_-6.:+** *@$': '1*dot' };
-    const data2 = { a: '2', b: '1', c: 2, d: '', 'a.dot': '2.dot', 'a-dot': '2-dot', a_dot: '2_dot', 'a+dot': '2+dot', 'a dot': '2 dot', 'a:dot': '2:dot', '_-6.:+** *@$': '2*dot' };
-    const data3 = { a: '3', b: '1', c: 3, d: false, 'a.dot': '3.dot', 'a-dot': '3-dot', a_dot: '3_dot', 'a+dot': '3+dot', 'a dot': '3 dot', 'a:dot': '3:dot', '_-6.:+** *@$': '3*dot' };
+    const data0 = { a: '0', b: '0', c: 0, d: null, 'a.dot': '0.dot', 'a-dot': '0-dot', a_dot: '0_dot', 'a+dot': '0+dot', 'a dot': '0 dot', 'a:dot': '0:dot', '_-6.:+** *@$': '0*dot', '\'""\'': '0\'"dot' };
+    const data1 = { a: '1', b: '0', c: 1, d: 0, 'a.dot': '1.dot', 'a-dot': '1-dot', a_dot: '1_dot', 'a+dot': '1+dot', 'a dot': '1 dot', 'a:dot': '1:dot', '_-6.:+** *@$': '1*dot', '\'""\'': '1\'"dot' };
+    const data2 = { a: '2', b: '1', c: 2, d: '', 'a.dot': '2.dot', 'a-dot': '2-dot', a_dot: '2_dot', 'a+dot': '2+dot', 'a dot': '2 dot', 'a:dot': '2:dot', '_-6.:+** *@$': '2*dot', '\'""\'': '2\'"dot' };
+    const data3 = { a: '3', b: '1', c: 3, d: false, 'a.dot': '3.dot', 'a-dot': '3-dot', a_dot: '3_dot', 'a+dot': '3+dot', 'a dot': '3 dot', 'a:dot': '3:dot', '_-6.:+** *@$': '3*dot', '\'""\'': '3\'"dot' };
 
     describe('operands', () => {
         it('support arbitrary quoted column name', () => {
@@ -86,6 +86,16 @@ describe('Syntax Tree', () => {
             expect(tree.evaluate(data2)).to.equal(true);
             expect(tree.evaluate(data3)).to.equal(false);
         });
+
+        it('support nesting in quotes', () => {
+            const tree = new SyntaxTree(`\`'""'\` eq \`1'"dot\` || \`'""'\` eq \`2'"dot\``);
+
+            expect(tree.isValid).to.equal(true);
+            expect(tree.evaluate(data0)).to.equal(false);
+            expect(tree.evaluate(data1)).to.equal(true);
+            expect(tree.evaluate(data2)).to.equal(true);
+            expect(tree.evaluate(data3)).to.equal(false);
+        });
     });
 
     describe('&& and ||', () => {