Comparing version 0.0.24 to 0.0.25
@@ -245,4 +245,4 @@ 'use strict'; | ||
ruleViolationStatuses.forEach(function (violationStatus) { | ||
var isValid = violationStatus.isValid; | ||
var rule = violationStatus.rule; | ||
var isValid = violationStatus.isValid, | ||
rule = violationStatus.rule; | ||
@@ -262,5 +262,5 @@ | ||
value: function getState() { | ||
var valid = this.valid; | ||
var messages = this.messages; | ||
var waiting = this.waiting; | ||
var valid = this.valid, | ||
messages = this.messages, | ||
waiting = this.waiting; | ||
@@ -290,6 +290,6 @@ valid = !this.shouldCheckValue(this.value) && this.valid === undefined ? true : valid; | ||
value: function forceRequirement(func, failureMessage) { | ||
var generator = arguments.length <= 2 || arguments[2] === undefined ? this.createPromiseGenerator(func, failureMessage) : arguments[2]; | ||
var generator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.createPromiseGenerator(func, failureMessage); | ||
var name = arguments[3]; | ||
var forced = arguments.length <= 4 || arguments[4] === undefined ? true : arguments[4]; | ||
var isAsync = arguments.length <= 5 || arguments[5] === undefined ? false : arguments[5]; | ||
var forced = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true; | ||
var isAsync = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false; | ||
@@ -346,3 +346,3 @@ this.rules = [].concat((0, _toConsumableArray3.default)(this.rules), [{ func: func, failureMessage: failureMessage, forced: forced, generator: generator, name: name, isAsync: isAsync }]); | ||
value: function isRequired() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} is required.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} is required.'; | ||
@@ -354,3 +354,3 @@ return this.setRequirement(requiredFunc, message, 'isRequired'); | ||
value: function isRequiredWhen(func) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} is required.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} is required.'; | ||
@@ -364,3 +364,3 @@ return this.setRequirement(function (val, allValues) { | ||
value: function isEmail() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be a valid email address.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be a valid email address.'; | ||
@@ -372,3 +372,3 @@ return this.setValidatorRequirement('isEmail', message); | ||
value: function contains(needle) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must contain "{needle}."' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must contain "{needle}."'; | ||
@@ -387,3 +387,3 @@ return this.setRequirement(function (val) { | ||
value: function equals(comparison) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must equal "{comparison}."' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must equal "{comparison}."'; | ||
@@ -402,3 +402,3 @@ return this.setRequirement(function (val) { | ||
value: function equalsOther(other) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be equal to {other}.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be equal to {other}.'; | ||
@@ -412,3 +412,3 @@ return this.setRequirement(function (val, others) { | ||
value: function removeEqualsOther(other) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be equal to {other}.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be equal to {other}.'; | ||
@@ -422,3 +422,3 @@ return this.setRequirement(function (val, others) { | ||
value: function isAfter(date) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be after {date}.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be after {date}.'; | ||
@@ -433,3 +433,3 @@ return this.setRequirement(function (val) { | ||
value: function isBefore(date) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be before {date}.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be before {date}.'; | ||
@@ -444,3 +444,3 @@ return this.setRequirement(function (val) { | ||
value: function isAlpha() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must use only alphabetical characters.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must use only alphabetical characters.'; | ||
@@ -452,3 +452,3 @@ return this.setValidatorRequirement('isAlpha', message); | ||
value: function isAlphanumeric() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must use only alphanumeric characters.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must use only alphanumeric characters.'; | ||
@@ -460,3 +460,3 @@ return this.setValidatorRequirement('isAlphanumeric', message); | ||
value: function isAscii() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must use only ASCII characters.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must use only ASCII characters.'; | ||
@@ -468,3 +468,3 @@ return this.setValidatorRequirement('isAscii', message); | ||
value: function isBase64() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be base64 encoded.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be base64 encoded.'; | ||
@@ -476,3 +476,3 @@ return this.setValidatorRequirement('isBase64', message); | ||
value: function isBoolean() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be a boolean value.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be a boolean value.'; | ||
@@ -484,3 +484,3 @@ return this.setValidatorRequirement('isBoolean', message); | ||
value: function isByteLength(min, max) { | ||
var message = arguments.length <= 2 || arguments[2] === undefined ? '{name} must have a minimum byte length of {min}.' : arguments[2]; | ||
var message = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '{name} must have a minimum byte length of {min}.'; | ||
@@ -492,3 +492,3 @@ return this.setValidatorRequirement('isByteLength', (0, _formatValidationMessage2.default)(message, { min: min, max: max }), min, max); | ||
value: function isCreditCard() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be a credit card number.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be a credit card number.'; | ||
@@ -500,5 +500,5 @@ return this.setValidatorRequirement('isCreditCard', message); | ||
value: function isCurrency() { | ||
var options = arguments.length <= 0 || arguments[0] === undefined ? defaultCurrencyOptions : arguments[0]; | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be in the format "{format}". {extraInfo}' : arguments[1]; | ||
var extraInfoMessage = arguments.length <= 2 || arguments[2] === undefined ? '(Currency symbol ({symbol}) {notOrIs} required.)' : arguments[2]; | ||
var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultCurrencyOptions; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be in the format "{format}". {extraInfo}'; | ||
var extraInfoMessage = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '(Currency symbol ({symbol}) {notOrIs} required.)'; | ||
@@ -512,4 +512,4 @@ var computedOptions = (0, _extends3.default)({}, defaultCurrencyOptions, options); | ||
var extraInfo = computedOptions.include_extra_info ? formattedExtra : ''; | ||
var thousands_separator = computedOptions.thousands_separator; | ||
var decimal_separator = computedOptions.decimal_separator; | ||
var thousands_separator = computedOptions.thousands_separator, | ||
decimal_separator = computedOptions.decimal_separator; | ||
@@ -523,3 +523,3 @@ var format = symbolStart + '1' + thousands_separator + '000' + decimal_separator + '00' + symbolEnd; | ||
value: function isDate() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be a date.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be a date.'; | ||
@@ -531,3 +531,3 @@ return this.setValidatorRequirement('isDate', message); | ||
value: function isDecimal() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must represent a decimal number.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must represent a decimal number.'; | ||
@@ -539,3 +539,3 @@ return this.setValidatorRequirement('isDecimal', message); | ||
value: function isDivisibleBy(number) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be divisible by {number}.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be divisible by {number}.'; | ||
@@ -547,4 +547,4 @@ return this.setValidatorRequirement('isDivisibleBy', (0, _formatValidationMessage2.default)(message, { number: number }), number); | ||
value: function isFQDN() { | ||
var options = arguments.length <= 0 || arguments[0] === undefined ? defaultFqdnOptions : arguments[0]; | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be a fully qualified domain name.' : arguments[1]; | ||
var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultFqdnOptions; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be a fully qualified domain name.'; | ||
@@ -556,3 +556,3 @@ return this.setValidatorRequirement('isFQDN', message, options); | ||
value: function isFloat(options) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be a float.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be a float.'; | ||
@@ -564,3 +564,3 @@ return this.setValidatorRequirement('isFloat', message, options); | ||
value: function isFullWidth() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must contain fullwidth characters.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must contain fullwidth characters.'; | ||
@@ -572,3 +572,3 @@ return this.setValidatorRequirement('isFullWidth', message); | ||
value: function isHalfWidth() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must contain halfwidth characters.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must contain halfwidth characters.'; | ||
@@ -580,3 +580,3 @@ return this.setValidatorRequirement('isHalfWidth', message); | ||
value: function isVariableWidth() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must contain fullwidth and halfwidth characters.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must contain fullwidth and halfwidth characters.'; | ||
@@ -588,3 +588,3 @@ return this.setValidatorRequirement('isVariableWidth', message); | ||
value: function isHexColor() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be a hex color.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be a hex color.'; | ||
@@ -596,3 +596,3 @@ return this.setValidatorRequirement('isHexColor', message); | ||
value: function isHexadecimal() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be a hexadecimal number.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be a hexadecimal number.'; | ||
@@ -604,3 +604,3 @@ return this.setValidatorRequirement('isHexadecimal', message); | ||
value: function isIP(version) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be an IP address.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be an IP address.'; | ||
@@ -612,3 +612,3 @@ return this.setValidatorRequirement('isIP', message, version); | ||
value: function isISBN(version) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be an ISBN.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be an ISBN.'; | ||
@@ -620,3 +620,3 @@ return this.setValidatorRequirement('isISBN', message, version); | ||
value: function isISIN() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be an ISIN.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be an ISIN.'; | ||
@@ -628,3 +628,3 @@ return this.setValidatorRequirement('isISIN', message); | ||
value: function isISO8601() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be an ISO6801 date.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be an ISO6801 date.'; | ||
@@ -636,3 +636,3 @@ return this.setValidatorRequirement('isISO8601', message); | ||
value: function isIn(values) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be contained in {values}.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be contained in {values}.'; | ||
@@ -645,3 +645,3 @@ var formattedMessage = (0, _formatValidationMessage2.default)(message, { values: (0, _stringify2.default)(values) }); | ||
value: function isInt(options) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be an integer.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be an integer.'; | ||
@@ -653,3 +653,3 @@ return this.setValidatorRequirement('isInt', message, options); | ||
value: function isJSON() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be JSON.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be JSON.'; | ||
@@ -661,3 +661,3 @@ return this.setValidatorRequirement('isJSON', message); | ||
value: function isLength(min, max) { | ||
var message = arguments.length <= 2 || arguments[2] === undefined ? '{name} must be at least {min} characters.' : arguments[2]; | ||
var message = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '{name} must be at least {min} characters.'; | ||
@@ -670,3 +670,3 @@ var formattedMessage = (0, _formatValidationMessage2.default)(message, { min: min, max: max }); | ||
value: function isLowercase() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be lowercase.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be lowercase.'; | ||
@@ -678,3 +678,3 @@ return this.setValidatorRequirement('isLowercase', message); | ||
value: function isUppercase() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be uppercase.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be uppercase.'; | ||
@@ -686,4 +686,4 @@ return this.setValidatorRequirement('isUppercase', message); | ||
value: function isMobilePhone() { | ||
var locale = arguments.length <= 0 || arguments[0] === undefined ? 'en-US' : arguments[0]; | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be a phone number.' : arguments[1]; | ||
var locale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'en-US'; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be a phone number.'; | ||
@@ -695,3 +695,3 @@ return this.setValidatorRequirement('isMobilePhone', message, locale); | ||
value: function isMongoId() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be a MongoDB id.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be a MongoDB id.'; | ||
@@ -703,3 +703,3 @@ return this.setValidatorRequirement('isMongoId', message); | ||
value: function isMultibyte() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must contain multibyte characters.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must contain multibyte characters.'; | ||
@@ -711,3 +711,3 @@ return this.setValidatorRequirement('isMultibyte', message); | ||
value: function isNumeric() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be numeric.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be numeric.'; | ||
@@ -719,3 +719,3 @@ return this.setValidatorRequirement('isNumeric', message); | ||
value: function isSurrogatePair() { | ||
var message = arguments.length <= 0 || arguments[0] === undefined ? '{name} must be a surrogate pair.' : arguments[0]; | ||
var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '{name} must be a surrogate pair.'; | ||
@@ -727,3 +727,3 @@ return this.setValidatorRequirement('isSurrogatePair', message); | ||
value: function isURL(options) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be a url.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be a url.'; | ||
@@ -735,3 +735,3 @@ return this.setValidatorRequirement('isURL', message, options); | ||
value: function isUUID(version) { | ||
var message = arguments.length <= 1 || arguments[1] === undefined ? '{name} must be a UUID.' : arguments[1]; | ||
var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '{name} must be a UUID.'; | ||
@@ -743,3 +743,3 @@ return this.setValidatorRequirement('isUUID', message, version); | ||
value: function matches(pattern, modifiers) { | ||
var message = arguments.length <= 2 || arguments[2] === undefined ? '{name} must match {pattern}.' : arguments[2]; | ||
var message = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '{name} must match {pattern}.'; | ||
@@ -746,0 +746,0 @@ var formattedMessage = (0, _formatValidationMessage2.default)(message, { pattern: pattern }); |
@@ -89,3 +89,3 @@ 'use strict'; | ||
value: function register(name) { | ||
var config = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; | ||
var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; | ||
var callback = arguments[2]; | ||
@@ -107,3 +107,3 @@ | ||
var config = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; | ||
var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; | ||
var callback = arguments[2]; | ||
@@ -139,3 +139,3 @@ | ||
var force = arguments.length <= 2 || arguments[2] === undefined ? false : arguments[2]; | ||
var force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false; | ||
@@ -160,5 +160,7 @@ var callbackTimeout; | ||
value: function runValidationSync(name, data) { | ||
var force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false; | ||
var form = this.getForm(name); | ||
(0, _keys2.default)(form).forEach(function (key) { | ||
if (data[key] === undefined) { | ||
if (data[key] === undefined && !force) { | ||
return; | ||
@@ -175,2 +177,7 @@ } | ||
}, { | ||
key: 'forceValidationSync', | ||
value: function forceValidationSync(name, data) { | ||
this.runValidationSync(name, data, true); | ||
} | ||
}, { | ||
key: 'isValid', | ||
@@ -191,5 +198,5 @@ value: function isValid(name) { | ||
} | ||
var _data$key = data[key]; | ||
var valid = _data$key.valid; | ||
var messages = _data$key.messages; | ||
var _data$key = data[key], | ||
valid = _data$key.valid, | ||
messages = _data$key.messages; | ||
@@ -196,0 +203,0 @@ form[key].setState(valid, messages); |
{ | ||
"name": "valour", | ||
"version": "0.0.24", | ||
"version": "0.0.25", | ||
"description": "Simple javascript validation for any application", | ||
@@ -5,0 +5,0 @@ "main": "lib/valour.js", |
40231
843