Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/lib/isAlpha.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function isAlpha(_str, locale = 'en-US', options = {}) {
if (ignore instanceof RegExp) {
str = str.replace(ignore, '');
} else if (typeof ignore === 'string') {
str = str.replace(new RegExp(`[${ignore.replace(/[-[\]{}()*+?.,\\^$|#\\s]/g, '\\$&')}]`, 'g'), ''); // escape regex for ignore
str = str.replace(new RegExp(`[${ignore.replace(/[-[\]{}()*+?.,\\^$|#]/g, '\\$&')}]`, 'g'), ''); // escape regex for ignore
} else {
throw new Error('ignore should be instance of a String or RegExp');
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/isAlphanumeric.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function isAlphanumeric(_str, locale = 'en-US', options = {}) {
if (ignore instanceof RegExp) {
str = str.replace(ignore, '');
} else if (typeof ignore === 'string') {
str = str.replace(new RegExp(`[${ignore.replace(/[-[\]{}()*+?.,\\^$|#\\s]/g, '\\$&')}]`, 'g'), ''); // escape regex for ignore
str = str.replace(new RegExp(`[${ignore.replace(/[-[\]{}()*+?.,\\^$|#]/g, '\\$&')}]`, 'g'), ''); // escape regex for ignore
} else {
throw new Error('ignore should be instance of a String or RegExp');
}
Expand Down
27 changes: 27 additions & 0 deletions test/literal-ignore.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import assert from 'assert';
import validator from '../index';

['isAlpha', 'isAlphanumeric'].forEach((method) => {
describe(`${method} literal ignored characters`, () => {
it('does not treat an ignored s as whitespace', () => {
[' ', '\t', '\n', '\r', '\u00a0'].forEach((space) => {
assert.strictEqual(validator[method](`ab${space}cd`, 'en-US', { ignore: 's' }), false);
});
});

it('removes a literal s outside the selected alphabet', () => {
assert.strictEqual(validator[method]('\u0430s\u0431', 'ru-RU', { ignore: 's' }), true);
});

it('continues to escape regular expression metacharacters', () => {
const ignore = '-[]{}()*+?.,\\^$|#';
assert.strictEqual(validator[method](`ab${ignore}cd`, 'en-US', { ignore }), true);
});

it('only ignores whitespace when explicitly requested', () => {
assert.strictEqual(validator[method]('ab cd', 'en-US', { ignore: ' ' }), true);
assert.strictEqual(validator[method]('ab\tcd', 'en-US', { ignore: ' ' }), false);
assert.strictEqual(validator[method]('ab\tcd', 'en-US', { ignore: /\s/g }), true);
});
});
});
Loading