Merge pull request #417 from saplingjs/fix/use-wildcard-matcher

Use `matchWildcard` for Memory driver
saplingjs · Feb 21, 2022 · e166328 · e166328
2 parents 1cb6ee1 + 6ad95ce
commit e166328
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/drivers/db/Memory.js b/drivers/db/Memory.js
@@ -189,7 +189,7 @@ export default class Memory extends Interface {
 
 				/* If we have wildcards, build a regex */
 				if (String(value).includes('*')) {
-					return String(record[field]).match(new RegExp(`^${value.split('*').join('(.*)')}$`, 'gmi')) !== null;
+					return new Utils().matchWildcard(record[field], value);
 				}
 
 				/* Otherwise do a direct match */

diff --git a/lib/Utils.js b/lib/Utils.js
@@ -127,7 +127,7 @@ export default class Utils {
 	 */
 	matchWildcard(string, rule) {
 		const escapeRegex = string => string.replace(/([.*+?^=!:${}()|[\]/\\])/g, '\\$1');
-		return new RegExp(`^${String(rule).split('*').map(element => escapeRegex(element)).join('.*')}$`).test(String(string));
+		return new RegExp(`^${String(rule).split('*').map(element => escapeRegex(element)).join('.*')}$`, 'i').test(String(string));
 	}