diff --git a/README.md b/README.md index 1833bbc86..d92811cfe 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Here is a list of the validators currently available. Validator | Description --------------------------------------- | -------------------------------------- -***contains(str, seed)*** | check if the string contains the seed. +**contains(str, seed [, options ])** | check if the string contains the seed.

`options` is an object that defaults to `{ ignoreCase: false}`.
`ignoreCase` specified whether the case of the substring be same or not. **equals(str, comparison)** | check if the string matches the comparison. **isAfter(str [, date])** | check if the string is a date that's after the specified date (defaults to now). **isAlpha(str [, locale])** | check if the string contains only letters (a-zA-Z).

Locale is one of `['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE', 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR', 'fa-IR', 'he', 'hu-HU', 'it-IT', 'ku-IQ', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sl-SI', 'sk-SK', 'sr-RS', 'sr-RS@latin', 'sv-SE', 'tr-TR', 'uk-UA']`) and defaults to `en-US`. Locale list is `validator.isAlphaLocales`. diff --git a/es/lib/contains.js b/es/lib/contains.js index 10bd66860..663b96718 100644 --- a/es/lib/contains.js +++ b/es/lib/contains.js @@ -1,6 +1,11 @@ import assertString from './util/assertString'; import toString from './util/toString'; -export default function contains(str, elem) { +import merge from './util/merge'; +var defaulContainsOptions = { + ignoreCase: false +}; +export default function contains(str, elem, options) { assertString(str); - return str.indexOf(toString(elem)) >= 0; + options = merge(options, defaulContainsOptions); + return options.ignoreCase ? str.toLowerCase().indexOf(toString(elem).toLowerCase()) >= 0 : str.indexOf(toString(elem)) >= 0; } \ No newline at end of file diff --git a/lib/contains.js b/lib/contains.js index b02fda2cd..c67e0c726 100644 --- a/lib/contains.js +++ b/lib/contains.js @@ -9,11 +9,18 @@ var _assertString = _interopRequireDefault(require("./util/assertString")); var _toString = _interopRequireDefault(require("./util/toString")); +var _merge = _interopRequireDefault(require("./util/merge")); + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function contains(str, elem) { +var defaulContainsOptions = { + ignoreCase: false +}; + +function contains(str, elem, options) { (0, _assertString.default)(str); - return str.indexOf((0, _toString.default)(elem)) >= 0; + options = (0, _merge.default)(options, defaulContainsOptions); + return options.ignoreCase ? str.toLowerCase().indexOf((0, _toString.default)(elem).toLowerCase()) >= 0 : str.indexOf((0, _toString.default)(elem)) >= 0; } module.exports = exports.default; diff --git a/src/lib/contains.js b/src/lib/contains.js index fd8c578de..ec083fa18 100644 --- a/src/lib/contains.js +++ b/src/lib/contains.js @@ -1,7 +1,15 @@ import assertString from './util/assertString'; import toString from './util/toString'; +import merge from './util/merge'; -export default function contains(str, elem) { +const defaulContainsOptions = { + ignoreCase: false, +}; + +export default function contains(str, elem, options) { assertString(str); - return str.indexOf(toString(elem)) >= 0; + options = merge(options, defaulContainsOptions); + return options.ignoreCase ? + str.toLowerCase().indexOf(toString(elem).toLowerCase()) >= 0 : + str.indexOf(toString(elem)) >= 0; } diff --git a/test/validators.js b/test/validators.js index 6688139cf..0caf824fd 100755 --- a/test/validators.js +++ b/test/validators.js @@ -3520,6 +3520,15 @@ describe('Validators', () => { valid: ['foo', 'foobar', 'bazfoo'], invalid: ['bar', 'fobar'], }); + + test({ + validator: 'contains', + args: ['foo', { + ignoreCase: true, + }], + valid: ['Foo', 'FOObar', 'BAZfoo'], + invalid: ['bar', 'fobar', 'baxoof'], + }); }); it('should validate strings against a pattern', () => {