Add spaces to regex for relational operators. #612
Conversation
Since gt is now interpreted as a string, it was removed from the invalid filters test.
|
I think all the letter-based operators need this space - for example I can type I think you were right to exclude the symbol operators - so |
shammamah-zz
force-pushed
the
text-comparison-operators
branch
from
969a97b to
f29e9bc
Compare
Co-Authored-By: Marc-André Rivet <Marc-Andre-Rivet@users.noreply.github.com>
| }, LEXEME_BASE); | ||
|
|
||
| export const lessThan: IUnboundedLexeme = R.merge({ | ||
| evaluate: relationalEvaluator(([op, exp]) => op < exp), | ||
| subType: RelationalOperator.LessThan, | ||
| regexp: /^(<|lt)/i | ||
| regexp: /^(<|lt\s)/i | ||
| }, LEXEME_BASE); | ||
|
|
||
| export const notEqual: IUnboundedLexeme = R.merge({ | ||
| evaluate: relationalEvaluator(([op, exp]) => op !== exp), | ||
| subType: RelationalOperator.NotEqual, | ||
| regexp: /^(!=|ne)/i |
There was a problem hiding this comment.
ne should also have \s
| @@ -67,19 +67,19 @@ export const equal: IUnboundedLexeme = R.merge({ | |||
| op === exp | |||
| ), | |||
| subType: RelationalOperator.Equal, | |||
| regexp: /^(=|eq)/i | |||
| regexp: /^(=|eq\s)/i | |||
There was a problem hiding this comment.
And the other ones :)
|
Needs changelog entry |
Co-Authored-By: Marc-André Rivet <Marc-Andre-Rivet@users.noreply.github.com>
|
@shammamah The percy diffs are interesting.. looks like there’s an extra space in the filter string now. Possibly a side effect of the new selector? There’s code that destructures/restructures that request from the individual column fragments. I suspect the new space is added somewhere in those steps. |
|
There’s a “transform” on the lexemes that might need to be updated on the relational operators to take the (double?) space into account. |
This reverts commit aae4907.
shammamah-zz
force-pushed
the
text-comparison-operators
branch
from
475d999 to
355be90
Compare
| @@ -57,7 +57,8 @@ export const contains: IUnboundedLexeme = R.merge({ | |||
| op.toString().indexOf(exp.toString()) !== -1 | |||
| ), | |||
| subType: RelationalOperator.Contains, | |||
| regexp: /^(contains)/i | |||
| regexp: /^((contains)(?=\s|$))/i, | |||
There was a problem hiding this comment.
I had some browser support concerns but turns out lookahead is widely supported and not an issue. Lookbehind is not https://caniuse.com/#feat=js-regexp-lookbehind
Closes #563.