|
|
@@ -1396,37 +1396,44 @@
|
|
|
}
|
|
|
|
|
|
if (typeof value === 'string' || typeof value === 'number') {
|
|
|
- const largerSmallerEqualsRegex = /(?:(<=|=>|=<|>=|>|<)(?:\s+)?(\d+)?|(\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm
|
|
|
- let matches = largerSmallerEqualsRegex.exec(s);
|
|
|
+ if (this.options.strictSearch) {
|
|
|
+ if ((`${value}`).toLowerCase() === s) {
|
|
|
+ return true
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ const largerSmallerEqualsRegex = /(?:(<=|=>|=<|>=|>|<)(?:\s+)?(\d+)?|(\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm
|
|
|
+ let matches = largerSmallerEqualsRegex.exec(s);
|
|
|
+ let comperationCheck = false;
|
|
|
|
|
|
- if (matches !== null) {
|
|
|
+ if (matches !== null) {
|
|
|
let operator = matches[1] || matches[5] + 'l'
|
|
|
let comperationValue = matches[2] || matches[3]
|
|
|
|
|
|
switch(operator) {
|
|
|
- case '>':
|
|
|
- case '<l':
|
|
|
- return Number.parseInt(value) > Number.parseInt(comperationValue);
|
|
|
- case '<':
|
|
|
- case '>l':
|
|
|
- return Number.parseInt(value) < Number.parseInt(comperationValue);
|
|
|
- case '<=':
|
|
|
- case '=<':
|
|
|
- case '>=l':
|
|
|
- case '=>l':
|
|
|
- return Number.parseInt(value) <= Number.parseInt(comperationValue);
|
|
|
- case '>=':
|
|
|
- case '=>':
|
|
|
- case '<=l':
|
|
|
- case '=<l':
|
|
|
- return Number.parseInt(value) >= Number.parseInt(comperationValue);
|
|
|
+ case '>':
|
|
|
+ case '<l':
|
|
|
+ comperationCheck = Number.parseInt(value) > Number.parseInt(comperationValue);
|
|
|
+ break;
|
|
|
+ case '<':
|
|
|
+ case '>l':
|
|
|
+ comperationCheck = Number.parseInt(value) < Number.parseInt(comperationValue);
|
|
|
+ break;
|
|
|
+ case '<=':
|
|
|
+ case '=<':
|
|
|
+ case '>=l':
|
|
|
+ case '=>l':
|
|
|
+ comperationCheck = Number.parseInt(value) <= Number.parseInt(comperationValue);
|
|
|
+ break;
|
|
|
+ case '>=':
|
|
|
+ case '=>':
|
|
|
+ case '<=l':
|
|
|
+ case '=<l':
|
|
|
+ comperationCheck = Number.parseInt(value) >= Number.parseInt(comperationValue);
|
|
|
+ break;
|
|
|
}
|
|
|
- } else if (this.options.strictSearch) {
|
|
|
- if ((`${value}`).toLowerCase() === s) {
|
|
|
- return true
|
|
|
}
|
|
|
- } else {
|
|
|
- if ((`${value}`).toLowerCase().includes(s)) {
|
|
|
+
|
|
|
+ if (comperationCheck || (`${value}`).toLowerCase().includes(s)) {
|
|
|
return true
|
|
|
}
|
|
|
}
|