Comparing version 0.0.20 to 0.0.21
@@ -6,5 +6,13 @@ "use strict"; | ||
}); | ||
var _keys = require("babel-runtime/core-js/object/keys"); | ||
var _keys2 = _interopRequireDefault(_keys); | ||
exports.default = formatValidationMessage; | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
function formatValidationMessage(message, values) { | ||
return Object.keys(values).reduce(function (mess, key) { | ||
return (0, _keys2.default)(values).reduce(function (mess, key) { | ||
return mess.replace("{" + key + "}", values[key]); | ||
@@ -11,0 +19,0 @@ }, message); |
@@ -7,6 +7,22 @@ 'use strict'; | ||
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; | ||
var _stringify = require('babel-runtime/core-js/json/stringify'); | ||
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); | ||
var _stringify2 = _interopRequireDefault(_stringify); | ||
var _extends2 = require('babel-runtime/helpers/extends'); | ||
var _extends3 = _interopRequireDefault(_extends2); | ||
var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray'); | ||
var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); | ||
var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck'); | ||
var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); | ||
var _createClass2 = require('babel-runtime/helpers/createClass'); | ||
var _createClass3 = _interopRequireDefault(_createClass2); | ||
var _validator = require('validator'); | ||
@@ -34,6 +50,2 @@ | ||
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } | ||
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } | ||
function getDates(beforeIn, afterIn) { | ||
@@ -79,3 +91,3 @@ var before = new Date(beforeIn.toString()); | ||
_classCallCheck(this, ValidationUnit); | ||
(0, _classCallCheck3.default)(this, ValidationUnit); | ||
@@ -92,3 +104,3 @@ for (var _len = arguments.length, existing = Array(_len), _key = 0; _key < _len; _key++) { | ||
}).reduce(function (list, existingRuleList) { | ||
return [].concat(_toConsumableArray(list), _toConsumableArray(existingRuleList)); | ||
return [].concat((0, _toConsumableArray3.default)(list), (0, _toConsumableArray3.default)(existingRuleList)); | ||
}, []).reduce(function (finalRules, rule) { | ||
@@ -101,3 +113,3 @@ var hasEquivalent = finalRules.some(function (existingRule) { | ||
} | ||
return [].concat(_toConsumableArray(finalRules), [rule]); | ||
return [].concat((0, _toConsumableArray3.default)(finalRules), [rule]); | ||
}, []); | ||
@@ -119,3 +131,3 @@ | ||
_createClass(ValidationUnit, [{ | ||
(0, _createClass3.default)(ValidationUnit, [{ | ||
key: 'remove', | ||
@@ -250,3 +262,3 @@ value: function remove(name) { | ||
this.rules = [].concat(_toConsumableArray(this.rules), [{ forced: forced, generator: generator, name: name, isAsync: isAsync }]); | ||
this.rules = [].concat((0, _toConsumableArray3.default)(this.rules), [{ forced: forced, generator: generator, name: name, isAsync: isAsync }]); | ||
return new ValidationUnit(this); | ||
@@ -443,3 +455,3 @@ } | ||
var computedOptions = _extends({}, defaultCurrencyOptions, options); | ||
var computedOptions = (0, _extends3.default)({}, defaultCurrencyOptions, options); | ||
var symbol = computedOptions.require_symbol ? computedOptions.symbol : ''; | ||
@@ -449,3 +461,3 @@ var symbolStart = computedOptions.symbol_after_digits ? '' : symbol; | ||
var notOrIs = computedOptions.require_symbol ? 'is' : 'not'; | ||
var formattedExtra = (0, _formatValidationMessage2.default)(extraInfoMessage, _extends({}, computedOptions, { notOrIs: notOrIs })); | ||
var formattedExtra = (0, _formatValidationMessage2.default)(extraInfoMessage, (0, _extends3.default)({}, computedOptions, { notOrIs: notOrIs })); | ||
var extraInfo = computedOptions.include_extra_info ? formattedExtra : ''; | ||
@@ -456,3 +468,3 @@ var thousands_separator = computedOptions.thousands_separator; | ||
var format = symbolStart + '1' + thousands_separator + '000' + decimal_separator + '00' + symbolEnd; | ||
var messageWithFormat = (0, _formatValidationMessage2.default)(message, _extends({ format: format, extraInfo: extraInfo }, computedOptions)).trim(); | ||
var messageWithFormat = (0, _formatValidationMessage2.default)(message, (0, _extends3.default)({ format: format, extraInfo: extraInfo }, computedOptions)).trim(); | ||
return this.setValidatorRequirement('isCurrency', messageWithFormat, computedOptions); | ||
@@ -564,3 +576,3 @@ } | ||
var formattedMessage = (0, _formatValidationMessage2.default)(message, { values: JSON.stringify(values) }); | ||
var formattedMessage = (0, _formatValidationMessage2.default)(message, { values: (0, _stringify2.default)(values) }); | ||
return this.setValidatorRequirement('isIn', formattedMessage, values); | ||
@@ -670,3 +682,2 @@ } | ||
}]); | ||
return ValidationUnit; | ||
@@ -673,0 +684,0 @@ }(); |
@@ -7,4 +7,18 @@ 'use strict'; | ||
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); | ||
var _keys = require('babel-runtime/core-js/object/keys'); | ||
var _keys2 = _interopRequireDefault(_keys); | ||
var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray'); | ||
var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); | ||
var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck'); | ||
var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); | ||
var _createClass2 = require('babel-runtime/helpers/createClass'); | ||
var _createClass3 = _interopRequireDefault(_createClass2); | ||
var _ValidationUnit = require('./ValidationUnit'); | ||
@@ -16,9 +30,5 @@ | ||
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } | ||
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } | ||
var Valour = function () { | ||
function Valour() { | ||
_classCallCheck(this, Valour); | ||
(0, _classCallCheck3.default)(this, Valour); | ||
@@ -29,3 +39,3 @@ this.forms = {}; | ||
_createClass(Valour, [{ | ||
(0, _createClass3.default)(Valour, [{ | ||
key: 'getForm', | ||
@@ -49,3 +59,3 @@ value: function getForm(name) { | ||
var callbacks = this.getCallbacks(name); | ||
this.callbacks[name] = [].concat(_toConsumableArray(callbacks), [callback]); | ||
this.callbacks[name] = [].concat((0, _toConsumableArray3.default)(callbacks), [callback]); | ||
} | ||
@@ -76,3 +86,3 @@ }, { | ||
var form = this.getForm(formName); | ||
return Object.keys(form).some(function (key) { | ||
return (0, _keys2.default)(form).some(function (key) { | ||
return form[key].valid !== undefined; | ||
@@ -87,3 +97,3 @@ }); | ||
this.forms[name] = Object.keys(config).reduce(function (dest, ruleKey) { | ||
this.forms[name] = (0, _keys2.default)(config).reduce(function (dest, ruleKey) { | ||
dest[ruleKey] = new _ValidationUnit2.default(config[ruleKey]); | ||
@@ -106,3 +116,3 @@ return dest; | ||
var form = this.getForm(name); | ||
Object.keys(config).forEach(function (key) { | ||
(0, _keys2.default)(config).forEach(function (key) { | ||
form[key] = new _ValidationUnit2.default(_this.getRuleByName(form, key), config[key]); | ||
@@ -116,3 +126,3 @@ }); | ||
var form = this.getForm(name); | ||
return Object.keys(form).reduce(function (result, key) { | ||
return (0, _keys2.default)(form).reduce(function (result, key) { | ||
result[key] = form[key].getState(); | ||
@@ -145,3 +155,3 @@ return result; | ||
var form = this.getForm(name); | ||
Object.keys(form).forEach(function (key) { | ||
(0, _keys2.default)(form).forEach(function (key) { | ||
if (data[key] === undefined && !force) { | ||
@@ -162,3 +172,3 @@ return; | ||
var result = this.getResult(name); | ||
return !Object.keys(result).some(function (key) { | ||
return !(0, _keys2.default)(result).some(function (key) { | ||
return !result[key].valid; | ||
@@ -171,3 +181,3 @@ }); | ||
var form = this.getForm(name); | ||
Object.keys(form).forEach(function (key) { | ||
(0, _keys2.default)(form).forEach(function (key) { | ||
if (data[key] === undefined) { | ||
@@ -193,3 +203,3 @@ return; | ||
var form = this.getForm(formName); | ||
this.forms[formName] = Object.keys(form).reduce(function (newForm, key) { | ||
this.forms[formName] = (0, _keys2.default)(form).reduce(function (newForm, key) { | ||
if (key !== fieldName) { | ||
@@ -207,3 +217,2 @@ newForm[key] = form[key]; | ||
}]); | ||
return Valour; | ||
@@ -210,0 +219,0 @@ }(); |
{ | ||
"name": "valour", | ||
"version": "0.0.20", | ||
"version": "0.0.21", | ||
"description": "Simple javascript validation for any application", | ||
@@ -23,4 +23,6 @@ "main": "lib/valour.js", | ||
"dependencies": { | ||
"babel-runtime": "^6.6.1", | ||
"lodash": "^4.5.0", | ||
"validator": "^4.2.1" | ||
"validator": "^4.2.1", | ||
"promise": "^7.1.1" | ||
}, | ||
@@ -32,2 +34,3 @@ "devDependencies": { | ||
"babel-plugin-array-includes": "^2.0.3", | ||
"babel-plugin-transform-runtime": "^6.6.0", | ||
"babel-preset-es2015": "^6.6.0", | ||
@@ -39,5 +42,4 @@ "babel-preset-stage-2": "^6.5.0", | ||
"mocha": "^2.2.5", | ||
"promise": "^7.1.1", | ||
"validator": "^4.0.5" | ||
} | ||
} |
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
794
0
38576
4
+ Addedbabel-runtime@^6.6.1
+ Addedpromise@^7.1.1
+ Addedasap@2.0.6(transitive)
+ Addedbabel-runtime@6.26.0(transitive)
+ Addedcore-js@2.6.12(transitive)
+ Addedpromise@7.3.1(transitive)
+ Addedregenerator-runtime@0.11.1(transitive)