Skip to content

fix(dataset): isolate regexp state between filter rows #21829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WhyTan00 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(dataset): isolate regexp state between filter rows #21829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/util/conditionalExpression.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,9 @@ class RegExpEvaluator implements FilterComparator {

constructor(rVal: unknown) {
// Support condVal: RegExp | string
// Keep the evaluator's lastIndex separate from the caller's regexp.
const condValue = this._condVal = isString(rVal) ? new RegExp(rVal)
: isRegExp(rVal) ? rVal as RegExp
: isRegExp(rVal) ? new RegExp(rVal)
: null;
if (condValue == null) {
let errMsg = '';
Expand All @@ -188,6 +189,8 @@ class RegExpEvaluator implements FilterComparator {
}

evaluate(lVal: unknown): boolean {
// Global and sticky regexps must test each data value independently.
this._condVal.lastIndex = 0;
const type = typeof lVal;
return isString(type) ? this._condVal.test(lVal as string)
: isNumber(type) ? this._condVal.test(lVal + '')
Expand Down
159 changes: 159 additions & 0 deletions test/ut/spec/data/filterTransformRegExp.test.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.