Added support for single character strings (#91)

ref #20 I -believe- this works all right. It's at the end of the rules so it should allow for matching on just about anything else practical, then allow us a chance at matching a single character string, before throwing a Lexical Error. I've added negation for all special chars except for + and - as you ought to be able to do 'post:a+other' and 'post:a-something'.
TryGhost · Oct 17, 2024 · 07cc8c1 · 07cc8c1
1 parent ca80ddf
commit 07cc8c1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/packages/nql-lang/dist/parser.js b/packages/nql-lang/dist/parser.js
diff --git a/packages/nql-lang/src/nql.l b/packages/nql-lang/src/nql.l
@@ -43,6 +43,7 @@ now(?=[-+]\d+[dwMyhms](?:{final}|$))                        { this.pushState('re
 '~^'                                                        return 'STARTSWITH';
 '~$'                                                        return 'ENDSWITH';
 '~'                                                         return 'CONTAINS';
+([a-zA-Z])(?![a-zA-Z'"\,\(\)\>\<=\[\]\~])                   return 'LITERAL';
 
 
 %%

diff --git a/packages/nql-lang/test/lexer.test.js b/packages/nql-lang/test/lexer.test.js
@@ -165,6 +165,17 @@ describe('Lexer', function () {
             (function () {
                 lex('my&valu\'e!');
             }).should.throw(lexicalError);
+            lex('a').should.eql([
+                {token: 'LITERAL', matched: 'a'}
+            ]);
+            lex('a-b').should.eql([
+                {token: 'LITERAL', matched: 'a-b'}
+            ]);
+            lex('a+bc').should.eql([
+                {token: 'LITERAL', matched: 'a'},
+                {token: 'AND', matched: '+'},
+                {token: 'LITERAL', matched: 'bc'}
+            ]);
         });
 
         it('should separate NOT at beginning of literal', function () {
@@ -180,9 +191,6 @@ describe('Lexer', function () {
         });
 
         it('should NOT permit special chars inside a literal', function () {
-            (function () {
-                lex('t+st');
-            }).should.throw(lexicalError);
             (function () {
                 lex('t,st');
             }).should.throw(lexicalError);

diff --git a/packages/nql-lang/test/parser.test.js b/packages/nql-lang/test/parser.test.js
@@ -627,5 +627,11 @@ describe('Parser', function () {
                 sinon.assert.calledTwice(relDateToAbsoluteSpy);
             });
         });
+
+        describe('Single character literals', function () {
+            it('can handle single character literals', function () {
+                parse('name:a').should.eql({name: 'a'});
+            });
+        });
     });
 });