Skip to content

Commit

Permalink
fix parser failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
289Adam289 committed Jan 28, 2025
1 parent f6c73f6 commit 8a53425
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 20 deletions.
16 changes: 5 additions & 11 deletions src/libs/SearchParser/searchParser.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,15 @@ function peg$parse(input, options) {
var peg$c35 = "<=";
var peg$c36 = "<";

var peg$r0 = /^[^ \t\r\n\xA0]/;
var peg$r0 = /^[^ \t\r\n]/;
var peg$r1 = /^[:=]/;
var peg$r2 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
var peg$r3 = /^["\u201C-\u201D]/;
var peg$r4 = /^[^"\u201D\u201C\r\n]/;
var peg$r5 = /^[^ ,\t\n\r\xA0]/;
var peg$r6 = /^[ \t\r\n\xA0]/;

var peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], true, false);
var peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n"], true, false);
var peg$e1 = peg$otherExpectation("key");
var peg$e2 = peg$otherExpectation("default key");
var peg$e3 = peg$literalExpectation(",", false);
Expand Down Expand Up @@ -314,17 +314,11 @@ function peg$parse(input, options) {
var peg$f2 = function(key, op, value) {
updateDefaultValues(key, value);
};
var peg$f3 = function(value) { //handle no-breaking space
let word
var peg$f3 = function(value) {
if (Array.isArray(value)) {
word = value.join("")
}else{
word = value
return buildFilter("eq", "keyword", value.join(""));
}
if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
return buildFilter("eq", "keyword", word.slice(1, -1));
}
return buildFilter("eq", "keyword", word);
return buildFilter("eq", "keyword", value);
};
var peg$f4 = function(field, op, values) {
return buildFilter(op, field, values);
Expand Down
12 changes: 3 additions & 9 deletions src/libs/SearchParser/searchParser.peggy
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,11 @@ defaultFilter
}

freeTextFilter
= _ value:(quotedString / [^ \t\r\n\xA0]+) _ { //handle no-breaking space
let word
= _ value:(quotedString / [^ \t\r\n]+) _ {
if (Array.isArray(value)) {
word = value.join("")
}else{
word = value
return buildFilter("eq", "keyword", value.join(""));
}
if (word.startsWith('"') && word.endsWith('"') && word.length >= 2) {
return buildFilter("eq", "keyword", word.slice(1, -1));
}
return buildFilter("eq", "keyword", word);
return buildFilter("eq", "keyword", value);
}

standardFilter
Expand Down

0 comments on commit 8a53425

Please sign in to comment.