fix: handle whitespace at the end of the query

gajus · Oct 2, 2022 · a14e8c3 · a14e8c3
1 parent 32620de
commit a14e8c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/grammar.ne b/src/grammar.ne
@@ -1,6 +1,6 @@
 @preprocessor typescript
 
-main -> _ logical_expression {% (data) => data[1] %}
+main -> _ logical_expression _ {% (data) => data[1] %}
 
 # Whitespace: `_` is optional, `__` is mandatory.
 _  -> whitespace_character:* {% (data) => data[0].length %}

diff --git a/src/grammar.ts b/src/grammar.ts
@@ -34,7 +34,7 @@ interface Grammar {
 const grammar: Grammar = {
   Lexer: undefined,
   ParserRules: [
-    {"name": "main", "symbols": ["_", "logical_expression"], "postprocess": (data) => data[1]},
+    {"name": "main", "symbols": ["_", "logical_expression", "_"], "postprocess": (data) => data[1]},
     {"name": "_$ebnf$1", "symbols": []},
     {"name": "_$ebnf$1", "symbols": ["_$ebnf$1", "whitespace_character"], "postprocess": (d) => d[0].concat([d[1]])},
     {"name": "_", "symbols": ["_$ebnf$1"], "postprocess": (data) => data[0].length},

diff --git a/test/liqe/parse.ts b/test/liqe/parse.ts
@@ -151,7 +151,7 @@ test('foo with whitespace at the start', (t) => {
 });
 
 test('foo with whitespace at the end', (t) => {
-  t.deepEqual(parse('foo'), {
+  t.deepEqual(parse('foo '), {
     expression: {
       location: {
         end: 3,