async-validator
Advanced tools
Comparing version 1.5.1 to 1.6.0
# History | ||
---- | ||
## 1.6.0 / 2016-03-30 | ||
- support defaultField | ||
## 1.5.0 / 2016-02-02 | ||
@@ -5,0 +9,0 @@ |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
@@ -9,3 +9,3 @@ }); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; | ||
@@ -22,8 +22,10 @@ var _util = require('./util'); | ||
var _lodashMergewith = require('lodash.mergewith'); | ||
var _lodash = require('lodash.mergewith'); | ||
var _lodashMergewith2 = _interopRequireDefault(_lodashMergewith); | ||
var _lodash2 = _interopRequireDefault(_lodash); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
function mergeCustomizer(objValue, srcValue) { | ||
if (typeof objValue !== 'object') { | ||
if ((typeof objValue === 'undefined' ? 'undefined' : _typeof(objValue)) !== 'object') { | ||
return srcValue; | ||
@@ -48,3 +50,3 @@ } | ||
if (_messages) { | ||
this._messages = (0, _lodashMergewith2['default'])((0, _messages2.newMessages)(), _messages, mergeCustomizer); | ||
this._messages = (0, _lodash2["default"])((0, _messages2.newMessages)(), _messages, mergeCustomizer); | ||
} | ||
@@ -57,8 +59,8 @@ return this._messages; | ||
} | ||
if (typeof rules !== 'object' || Array.isArray(rules)) { | ||
if ((typeof rules === 'undefined' ? 'undefined' : _typeof(rules)) !== 'object' || Array.isArray(rules)) { | ||
throw new Error('Rules must be an object'); | ||
} | ||
this.rules = {}; | ||
var z = undefined; | ||
var item = undefined; | ||
var z = void 0; | ||
var item = void 0; | ||
for (z in rules) { | ||
@@ -71,6 +73,7 @@ if (rules.hasOwnProperty(z)) { | ||
}, | ||
validate: function validate(source_, o, oc) { | ||
validate: function validate(source_) { | ||
var _this = this; | ||
if (o === undefined) o = {}; | ||
var o = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; | ||
var oc = arguments[2]; | ||
@@ -88,4 +91,4 @@ var source = source_; | ||
function complete(results) { | ||
var i = undefined; | ||
var field = undefined; | ||
var i = void 0; | ||
var field = void 0; | ||
var errors = []; | ||
@@ -123,3 +126,3 @@ var fields = {}; | ||
} | ||
(0, _lodashMergewith2['default'])(messages, options.messages, mergeCustomizer); | ||
(0, _lodash2["default"])(messages, options.messages, mergeCustomizer); | ||
options.messages = messages; | ||
@@ -131,4 +134,4 @@ } else { | ||
options.error = _rule.error; | ||
var arr = undefined; | ||
var value = undefined; | ||
var arr = void 0; | ||
var value = void 0; | ||
var series = {}; | ||
@@ -173,5 +176,11 @@ var keys = options.keys || Object.keys(this.rules); | ||
var rule = data.rule; | ||
var deep = (rule.type === 'object' || rule.type === 'array') && typeof rule.fields === 'object'; | ||
var deep = (rule.type === 'object' || rule.type === 'array') && (_typeof(rule.fields) === 'object' || _typeof(rule.defaultField) === 'object'); | ||
deep = deep && (rule.required || !rule.required && data.value); | ||
rule.field = data.field; | ||
function addFullfield(key, schema) { | ||
return _extends({}, schema, { | ||
fullField: rule.fullField + '.' + key | ||
}); | ||
} | ||
function cb() { | ||
@@ -208,7 +217,16 @@ var e = arguments.length <= 0 || arguments[0] === undefined ? [] : arguments[0]; | ||
} | ||
var fieldsSchema = data.rule.fields; | ||
var fieldsSchema = {}; | ||
if (rule.defaultField) { | ||
for (var k in data.value) { | ||
if (data.value.hasOwnProperty(k)) { | ||
fieldsSchema[k] = rule.defaultField; | ||
} | ||
} | ||
} | ||
fieldsSchema = _extends({}, fieldsSchema, data.rule.fields); | ||
for (var f in fieldsSchema) { | ||
if (fieldsSchema.hasOwnProperty(f)) { | ||
var fieldSchema = fieldsSchema[f]; | ||
fieldSchema.fullField = rule.fullField + '.' + f; | ||
var fieldSchema = Array.isArray(fieldsSchema[f]) ? fieldsSchema[f] : [fieldsSchema[f]]; | ||
fieldsSchema[f] = fieldSchema.map(addFullfield.bind(null, f)); | ||
} | ||
@@ -237,3 +255,3 @@ } | ||
} | ||
if (typeof rule.validator !== 'function' && rule.type && !_validator2['default'].hasOwnProperty(rule.type)) { | ||
if (typeof rule.validator !== 'function' && rule.type && !_validator2["default"].hasOwnProperty(rule.type)) { | ||
throw new Error((0, _util.format)('Unknown rule type %s', rule.type)); | ||
@@ -247,3 +265,3 @@ } | ||
} | ||
return _validator2['default'][rule.type] || false; | ||
return _validator2["default"][rule.type] || false; | ||
} | ||
@@ -256,3 +274,3 @@ }; | ||
} | ||
_validator2['default'][type] = validator; | ||
_validator2["default"][type] = validator; | ||
}; | ||
@@ -262,3 +280,3 @@ | ||
exports['default'] = Schema; | ||
exports["default"] = Schema; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
exports.newMessages = newMessages; | ||
function newMessages() { | ||
return { | ||
'default': 'Validation error on field %s', | ||
"default": 'Validation error on field %s', | ||
required: '%s is required', | ||
'enum': '%s must be one of %s', | ||
"enum": '%s must be one of %s', | ||
whitespace: '%s cannot be empty', | ||
@@ -26,5 +25,5 @@ date: { | ||
date: '%s is not a %s', | ||
boolean: '%s is not a %s', | ||
"boolean": '%s is not a %s', | ||
integer: '%s is not an %s', | ||
float: '%s is not a %s', | ||
"float": '%s is not a %s', | ||
regexp: '%s is not a valid %s', | ||
@@ -64,3 +63,2 @@ email: '%s is not a valid %s', | ||
var messages = newMessages(); | ||
exports.messages = messages; | ||
var messages = exports.messages = newMessages(); |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } } | ||
var _util = require('../util'); | ||
@@ -13,2 +11,4 @@ | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } } | ||
var ENUM = 'enum'; | ||
@@ -34,3 +34,3 @@ | ||
exports['default'] = enumerable; | ||
exports["default"] = enumerable; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
exports['default'] = { | ||
exports["default"] = { | ||
required: require('./required'), | ||
@@ -11,5 +11,5 @@ whitespace: require('./whitespace'), | ||
range: require('./range'), | ||
'enum': require('./enum'), | ||
"enum": require('./enum'), | ||
pattern: require('./pattern') | ||
}; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } } | ||
var _util = require('../util'); | ||
@@ -13,2 +11,4 @@ | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } } | ||
/** | ||
@@ -33,3 +33,3 @@ * Rule for validating a regular expression pattern. | ||
exports['default'] = pattern; | ||
exports["default"] = pattern; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } } | ||
var _util = require('../util'); | ||
@@ -13,2 +11,4 @@ | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } } | ||
/** | ||
@@ -63,3 +63,3 @@ * Rule for validating minimum and maximum allowed values. | ||
exports['default'] = range; | ||
exports["default"] = range; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } } | ||
var _util = require('../util'); | ||
@@ -13,2 +11,4 @@ | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } } | ||
/** | ||
@@ -31,3 +31,3 @@ * Rule for validating required fields. | ||
exports['default'] = required; | ||
exports["default"] = required; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } } | ||
var _util = require('../util'); | ||
@@ -19,2 +17,8 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } } | ||
/* eslint max-len:0 */ | ||
var pattern = { | ||
@@ -30,3 +34,3 @@ email: /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/, | ||
}, | ||
float: function float(value) { | ||
"float": function float(value) { | ||
return types.number(value) && !types.integer(value); | ||
@@ -57,3 +61,3 @@ }, | ||
object: function object(value) { | ||
return typeof value === 'object' && !types.array(value); | ||
return (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && !types.array(value); | ||
}, | ||
@@ -87,3 +91,3 @@ method: function method(value) { | ||
if (rule.required && value === undefined) { | ||
(0, _required2['default'])(rule, value, source, errors, options); | ||
(0, _required2["default"])(rule, value, source, errors, options); | ||
return; | ||
@@ -98,3 +102,3 @@ } | ||
// straight typeof check | ||
} else if (ruleType && typeof value !== rule.type) { | ||
} else if (ruleType && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) !== rule.type) { | ||
errors.push(util.format(options.messages.types[ruleType], rule.fullField, rule.type)); | ||
@@ -104,3 +108,3 @@ } | ||
exports['default'] = type; | ||
exports["default"] = type; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } } | ||
var _util = require('../util'); | ||
@@ -13,2 +11,4 @@ | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } } | ||
/** | ||
@@ -31,3 +31,3 @@ * Rule for validating whitespace. | ||
exports['default'] = whitespace; | ||
exports["default"] = whitespace; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
@@ -5,0 +5,0 @@ }); |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -33,6 +33,6 @@ * Validates an array. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options, 'array'); | ||
_rule2["default"].required(rule, value, source, errors, options, 'array'); | ||
if (!(0, _util.isEmptyValue)(value, 'array')) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2['default'].range(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
_rule2["default"].range(rule, value, source, errors, options); | ||
} | ||
@@ -43,3 +43,3 @@ } | ||
exports['default'] = array; | ||
exports["default"] = array; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _util = require('../util'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -33,5 +33,5 @@ * Validates a boolean. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (value !== undefined) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
} | ||
@@ -42,3 +42,3 @@ } | ||
exports['default'] = boolean; | ||
exports["default"] = boolean; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
function date(rule, value, callback, source, options) { | ||
@@ -25,7 +25,7 @@ // console.log('integer rule called %j', rule); | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (!(0, _util.isEmptyValue)(value)) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
if (value) { | ||
_rule2['default'].range(rule, value.getTime(), source, errors, options); | ||
_rule2["default"].range(rule, value.getTime(), source, errors, options); | ||
} | ||
@@ -37,3 +37,3 @@ } | ||
exports['default'] = date; | ||
exports["default"] = date; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
var ENUM = 'enum'; | ||
@@ -35,5 +35,5 @@ | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (value) { | ||
_rule2['default'][ENUM](rule, value, source, errors, options); | ||
_rule2["default"][ENUM](rule, value, source, errors, options); | ||
} | ||
@@ -44,3 +44,3 @@ } | ||
exports['default'] = enumerable; | ||
exports["default"] = enumerable; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -33,6 +33,6 @@ * Validates a number is a floating point number. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (value !== undefined) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2['default'].range(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
_rule2["default"].range(rule, value, source, errors, options); | ||
} | ||
@@ -43,3 +43,3 @@ } | ||
exports['default'] = floatFn; | ||
exports["default"] = floatFn; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
exports['default'] = { | ||
exports["default"] = { | ||
string: require('./string'), | ||
method: require('./method'), | ||
number: require('./number'), | ||
boolean: require('./boolean'), | ||
"boolean": require('./boolean'), | ||
regexp: require('./regexp'), | ||
integer: require('./integer'), | ||
'float': require('./float'), | ||
"float": require('./float'), | ||
array: require('./array'), | ||
object: require('./object'), | ||
'enum': require('./enum'), | ||
"enum": require('./enum'), | ||
pattern: require('./pattern'), | ||
@@ -18,0 +18,0 @@ email: require('./type'), |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -33,6 +33,6 @@ * Validates a number is an integer. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (value !== undefined) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2['default'].range(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
_rule2["default"].range(rule, value, source, errors, options); | ||
} | ||
@@ -43,3 +43,3 @@ } | ||
exports['default'] = integer; | ||
exports["default"] = integer; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -33,5 +33,5 @@ * Validates a function. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (value !== undefined) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
} | ||
@@ -42,3 +42,3 @@ } | ||
exports['default'] = method; | ||
exports["default"] = method; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -33,6 +33,6 @@ * Validates a number. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (value !== undefined) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2['default'].range(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
_rule2["default"].range(rule, value, source, errors, options); | ||
} | ||
@@ -43,3 +43,3 @@ } | ||
exports['default'] = number; | ||
exports["default"] = number; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -33,5 +33,5 @@ * Validates an object. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (value !== undefined) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
} | ||
@@ -42,3 +42,3 @@ } | ||
exports['default'] = object; | ||
exports["default"] = object; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -36,5 +36,5 @@ * Validates a regular expression pattern. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (!(0, _util.isEmptyValue)(value, 'string')) { | ||
_rule2['default'].pattern(rule, value, source, errors, options); | ||
_rule2["default"].pattern(rule, value, source, errors, options); | ||
} | ||
@@ -45,3 +45,3 @@ } | ||
exports['default'] = pattern; | ||
exports["default"] = pattern; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -33,5 +33,5 @@ * Validates the regular expression type. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options); | ||
_rule2["default"].required(rule, value, source, errors, options); | ||
if (!(0, _util.isEmptyValue)(value)) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
} | ||
@@ -42,3 +42,3 @@ } | ||
exports['default'] = regexp; | ||
exports["default"] = regexp; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
/** | ||
@@ -33,9 +33,9 @@ * Performs validation for string types. | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options, 'string'); | ||
_rule2["default"].required(rule, value, source, errors, options, 'string'); | ||
if (!(0, _util.isEmptyValue)(value, 'string')) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2['default'].range(rule, value, source, errors, options); | ||
_rule2['default'].pattern(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
_rule2["default"].range(rule, value, source, errors, options); | ||
_rule2["default"].pattern(rule, value, source, errors, options); | ||
if (rule.whitespace === true) { | ||
_rule2['default'].whitespace(rule, value, source, errors, options); | ||
_rule2["default"].whitespace(rule, value, source, errors, options); | ||
} | ||
@@ -47,3 +47,3 @@ } | ||
exports['default'] = string; | ||
exports["default"] = string; | ||
module.exports = exports['default']; |
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
var _rule = require('../rule/'); | ||
@@ -15,2 +13,4 @@ | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
function type(rule, value, callback, source, options) { | ||
@@ -24,5 +24,5 @@ var ruleType = rule.type; | ||
} | ||
_rule2['default'].required(rule, value, source, errors, options, ruleType); | ||
_rule2["default"].required(rule, value, source, errors, options, ruleType); | ||
if (!(0, _util.isEmptyValue)(value, ruleType)) { | ||
_rule2['default'].type(rule, value, source, errors, options); | ||
_rule2["default"].type(rule, value, source, errors, options); | ||
} | ||
@@ -33,3 +33,3 @@ } | ||
exports['default'] = type; | ||
exports["default"] = type; | ||
module.exports = exports['default']; |
{ | ||
"name": "async-validator", | ||
"version": "1.5.1", | ||
"version": "1.6.0", | ||
"description": "validate form asynchronous", | ||
@@ -30,3 +30,3 @@ "keywords": [ | ||
"gh-pages": "rc-tools run gh-pages", | ||
"start": "rc-server", | ||
"start": "rc-tools run server", | ||
"pub": "rc-tools run pub", | ||
@@ -36,4 +36,5 @@ "lint": "rc-tools run lint", | ||
"saucelabs": "rc-tools run saucelabs", | ||
"browser-test": "rc-tools run browser-test", | ||
"browser-test-cover": "rc-tools run browser-test-cover" | ||
"test": "rc-tools run test", | ||
"chrome-test": "rc-tools run chrome-test", | ||
"coverage": "rc-tools run coverage" | ||
}, | ||
@@ -43,4 +44,3 @@ "devDependencies": { | ||
"pre-commit": "1.x", | ||
"rc-server": "3.x", | ||
"rc-tools": "4.x" | ||
"rc-tools": "5.x" | ||
}, | ||
@@ -51,4 +51,4 @@ "pre-commit": [ | ||
"dependencies": { | ||
"lodash.mergewith": "^4.0.3" | ||
"lodash.mergewith": "4.x" | ||
} | ||
} |
@@ -131,3 +131,3 @@ # async-validator | ||
* `string`: Must be of type `string`. | ||
* `string`: Must be of type `string`. `This is the default type.` | ||
* `number`: Must be of type `number`. | ||
@@ -243,2 +243,18 @@ * `boolean`: Must be of type `boolean`. | ||
#### defaultField | ||
The `defaultField` property can be used with the `array` or `object` type for validating all values of the container. | ||
It may be an `object` or `array` containing validation rules. For example: | ||
```javascript | ||
var descriptor = { | ||
urls: { | ||
type: "array", required: true, | ||
defaultField: {type: "url"} | ||
} | ||
} | ||
``` | ||
Note that `defaultField` is expanded to `fields`, see [deep rules](#deep-rules). | ||
#### Transform | ||
@@ -325,5 +341,19 @@ | ||
## Test Case | ||
``` | ||
npm test | ||
npm run chrome-test | ||
``` | ||
## Coverage | ||
``` | ||
npm run coverage | ||
``` | ||
open coverage/ dir | ||
## License | ||
Everything is [MIT](http://en.wikipedia.org/wiki/MIT_License). |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
54685
3
1153
356
Updatedlodash.mergewith@4.x