async-validator - npm Package Compare versions

Comparing version 1.3.5 to 1.3.7

lib/index.js

@@ -9,5 +9,7 @@ 'use strict';
 
+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');
 
-var _util2 = _interopRequireDefault(_util);
+var util = _interopRequireWildcard(_util);
 
@@ -190,3 +192,3 @@ var _validator = require('./validator/');
             } else {
-              errors = [options.error(rule, _util2['default'].format(options.messages.required, rule.field))];
+              errors = [options.error(rule, util.format(options.messages.required, rule.field))];
             }
@@ -224,3 +226,3 @@ return doIt(null, errors);
     if (typeof rule.validator !== 'function' && rule.type && !_validator2['default'].hasOwnProperty(rule.type)) {
-      throw new Error(_util2['default'].format('Unknown rule type %s', rule.type));
+      throw new Error(util.format('Unknown rule type %s', rule.type));
     }
@@ -227,0 +229,0 @@ return rule.type || 'string';

lib/messages.js

@@ -22,2 +22,3 @@ 'use strict';
     number: '%s is not a %s',
+    date: '%s is not a %s',
     boolean: '%s is not a %s',
@@ -24,0 +25,0 @@ integer: '%s is not an %s',

lib/rule/enum.js

@@ -7,7 +7,7 @@ 'use strict';
 
-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; } }
 
 var _util = require('../util');
 
-var _util2 = _interopRequireDefault(_util);
+var util = _interopRequireWildcard(_util);
 
@@ -30,3 +30,3 @@ var ENUM = 'enum';
   if (rule[ENUM].indexOf(value) === -1) {
-    errors.push(_util2['default'].format(options.messages[ENUM], rule.fullField, rule[ENUM].join(', ')));
+    errors.push(util.format(options.messages[ENUM], rule.fullField, rule[ENUM].join(', ')));
   }
@@ -33,0 +33,0 @@ }

lib/rule/pattern.js

@@ -7,7 +7,7 @@ 'use strict';
 
-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; } }
 
 var _util = require('../util');
 
-var _util2 = _interopRequireDefault(_util);
+var util = _interopRequireWildcard(_util);
 
@@ -28,3 +28,3 @@ /**
     if (!rule.pattern.test(value)) {
-      errors.push(_util2['default'].format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+      errors.push(util.format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
     }
@@ -31,0 +31,0 @@ }

lib/rule/range.js

@@ -7,7 +7,7 @@ 'use strict';
 
-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; } }
 
 var _util = require('../util');
 
-var _util2 = _interopRequireDefault(_util);
+var util = _interopRequireWildcard(_util);
 
@@ -52,10 +52,10 @@ /**
     if (val !== rule.len) {
-      errors.push(_util2['default'].format(options.messages[key].len, rule.fullField, rule.len));
+      errors.push(util.format(options.messages[key].len, rule.fullField, rule.len));
     }
   } else if (min && !max && val < rule.min) {
-    errors.push(_util2['default'].format(options.messages[key].min, rule.fullField, rule.min));
+    errors.push(util.format(options.messages[key].min, rule.fullField, rule.min));
   } else if (max && !min && val > rule.max) {
-    errors.push(_util2['default'].format(options.messages[key].max, rule.fullField, rule.max));
+    errors.push(util.format(options.messages[key].max, rule.fullField, rule.max));
   } else if (min && max && (val < rule.min || val > rule.max)) {
-    errors.push(_util2['default'].format(options.messages[key].range, rule.fullField, rule.min, rule.max));
+    errors.push(util.format(options.messages[key].range, rule.fullField, rule.min, rule.max));
   }
@@ -62,0 +62,0 @@ }

lib/rule/required.js

@@ -7,7 +7,7 @@ 'use strict';
 
-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; } }
 
 var _util = require('../util');
 
-var _util2 = _interopRequireDefault(_util);
+var util = _interopRequireWildcard(_util);
 
@@ -26,4 +26,4 @@ /**
 function required(rule, value, source, errors, options, type) {
-  if (rule.required && (!source.hasOwnProperty(rule.field) || _util2['default'].isEmptyValue(value, type))) {
-    errors.push(_util2['default'].format(options.messages.required, rule.fullField));
+  if (rule.required && (!source.hasOwnProperty(rule.field) || util.isEmptyValue(value, type))) {
+    errors.push(util.format(options.messages.required, rule.fullField));
   }
@@ -30,0 +30,0 @@ }

lib/rule/type.js

@@ -9,5 +9,7 @@ 'use strict';
 
+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');
 
-var _util2 = _interopRequireDefault(_util);
+var util = _interopRequireWildcard(_util);
 
@@ -90,7 +92,7 @@ var _required = require('./required');
     if (!types[ruleType](value)) {
-      errors.push(_util2['default'].format(options.messages.types[ruleType], rule.fullField, rule.type));
+      errors.push(util.format(options.messages.types[ruleType], rule.fullField, rule.type));
     }
     // straight typeof check
   } else if (ruleType && typeof value !== rule.type) {
-      errors.push(_util2['default'].format(options.messages.types[ruleType], rule.fullField, rule.type));
+      errors.push(util.format(options.messages.types[ruleType], rule.fullField, rule.type));
     }
@@ -97,0 +99,0 @@ }

lib/rule/whitespace.js

@@ -7,7 +7,7 @@ 'use strict';
 
-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; } }
 
 var _util = require('../util');
 
-var _util2 = _interopRequireDefault(_util);
+var util = _interopRequireWildcard(_util);
 
@@ -27,3 +27,3 @@ /**
   if (/^\s+$/.test(value) || value === '') {
-    errors.push(_util2['default'].format(options.messages.whitespace, rule.fullField));
+    errors.push(util.format(options.messages.whitespace, rule.fullField));
   }
@@ -30,0 +30,0 @@ }

lib/util.js

@@ -6,55 +6,54 @@ 'use strict';
 });
+exports.format = format;
+exports.isEmptyValue = isEmptyValue;
 var formatRegExp = /%[sdj%]/g;
 
-exports['default'] = {
-  format: function format() {
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
+function format() {
+  for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
 
-    var i = 1;
-    var f = args[0];
-    var len = args.length;
-    var str = String(f).replace(formatRegExp, function (x) {
-      if (x === '%%') {
-        return '%';
-      }
-      if (i >= len) {
-        return x;
-      }
-      switch (x) {
-        case '%s':
-          return String(args[i++]);
-        case '%d':
-          return Number(args[i++]);
-        case '%j':
-          try {
-            return JSON.stringify(args[i++]);
-          } catch (_) {
-            return '[Circular]';
-          }
-          break;
-        default:
-          return x;
-      }
-    });
-    for (var arg = args[i]; i < len; arg = args[++i]) {
-      str += ' ' + arg;
+  var i = 1;
+  var f = args[0];
+  var len = args.length;
+  var str = String(f).replace(formatRegExp, function (x) {
+    if (x === '%%') {
+      return '%';
     }
-    return str;
-  },
-
-  isEmptyValue: function isEmptyValue(value, type) {
-    if (value === undefined || value === null) {
-      return true;
+    if (i >= len) {
+      return x;
     }
-    if (type === 'array' && Array.isArray(value) && !value.length) {
-      return true;
+    switch (x) {
+      case '%s':
+        return String(args[i++]);
+      case '%d':
+        return Number(args[i++]);
+      case '%j':
+        try {
+          return JSON.stringify(args[i++]);
+        } catch (_) {
+          return '[Circular]';
+        }
+        break;
+      default:
+        return x;
     }
-    if (type === 'string' && typeof value === 'string' && !value) {
-      return true;
-    }
-    return false;
+  });
+  for (var arg = args[i]; i < len; arg = args[++i]) {
+    str += ' ' + arg;
   }
-};
-module.exports = exports['default'];
+  return str;
+}
+
+function isEmptyValue(value, type) {
+  if (value === undefined || value === null) {
+    return true;
+  }
+  if (type === 'array' && Array.isArray(value) && !value.length) {
+    return true;
+  }
+  if (type === 'string' && typeof value === 'string' && !value) {
+    return true;
+  }
+  return false;
+}

lib/validator/array.js

@@ -15,4 +15,2 @@ 'use strict';
 
-var _util2 = _interopRequireDefault(_util);
-
 /**
@@ -32,7 +30,7 @@ *  Validates an array.
   if (validate) {
-    if (_util2['default'].isEmptyValue(value, 'array') && !rule.required) {
+    if ((0, _util.isEmptyValue)(value, 'array') && !rule.required) {
       return callback();
     }
     _rule2['default'].required(rule, value, source, errors, options, 'array');
-    if (!_util2['default'].isEmptyValue(value, 'array')) {
+    if (!(0, _util.isEmptyValue)(value, 'array')) {
       _rule2['default'].type(rule, value, source, errors, options);
@@ -39,0 +37,0 @@ _rule2['default'].range(rule, value, source, errors, options);

lib/validator/date.js

@@ -13,2 +13,4 @@ 'use strict';
 
+var _util = require('../util');
+
 function date(rule, value, callback, source, options) {
@@ -20,9 +22,11 @@ // console.log('integer rule called %j', rule);
   if (validate) {
-    if (value === undefined && !rule.required) {
+    if ((0, _util.isEmptyValue)(value) && !rule.required) {
       return callback();
     }
     _rule2['default'].required(rule, value, source, errors, options);
-    if (value) {
+    if (!(0, _util.isEmptyValue)(value)) {
       _rule2['default'].type(rule, value, source, errors, options);
-      _rule2['default'].range(rule, value.getTime(), source, errors, options);
+      if (value) {
+        _rule2['default'].range(rule, value.getTime(), source, errors, options);
+      }
     }
@@ -29,0 +33,0 @@ }

lib/validator/pattern.js

@@ -15,4 +15,2 @@ 'use strict';
 
-var _util2 = _interopRequireDefault(_util);
-
 /**
@@ -35,7 +33,7 @@ *  Validates a regular expression pattern.
   if (validate) {
-    if (_util2['default'].isEmptyValue(value, 'string') && !rule.required) {
+    if ((0, _util.isEmptyValue)(value, 'string') && !rule.required) {
       return callback();
     }
     _rule2['default'].required(rule, value, source, errors, options);
-    if (!_util2['default'].isEmptyValue(value, 'string')) {
+    if (!(0, _util.isEmptyValue)(value, 'string')) {
       _rule2['default'].pattern(rule, value, source, errors, options);
@@ -42,0 +40,0 @@ }

lib/validator/regexp.js

@@ -13,2 +13,4 @@ 'use strict';
 
+var _util = require('../util');
+
 /**
@@ -28,7 +30,7 @@ *  Validates the regular expression type.
   if (validate) {
-    if (value === undefined && !rule.required) {
+    if ((0, _util.isEmptyValue)(value) && !rule.required) {
       return callback();
     }
     _rule2['default'].required(rule, value, source, errors, options);
-    if (value !== undefined) {
+    if (!(0, _util.isEmptyValue)(value)) {
       _rule2['default'].type(rule, value, source, errors, options);
@@ -35,0 +37,0 @@ }

lib/validator/string.js

@@ -15,4 +15,2 @@ 'use strict';
 
-var _util2 = _interopRequireDefault(_util);
-
 /**
@@ -32,7 +30,7 @@ *  Performs validation for string types.
   if (validate) {
-    if (_util2['default'].isEmptyValue(value, 'string') && !rule.required) {
+    if ((0, _util.isEmptyValue)(value, 'string') && !rule.required) {
       return callback();
     }
     _rule2['default'].required(rule, value, source, errors, options, 'string');
-    if (!_util2['default'].isEmptyValue(value, 'string')) {
+    if (!(0, _util.isEmptyValue)(value, 'string')) {
       _rule2['default'].type(rule, value, source, errors, options);
@@ -39,0 +37,0 @@ _rule2['default'].range(rule, value, source, errors, options);

package.json

 {
   "name": "async-validator",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "validate form asynchronous",
@@ -5,0 +5,0 @@ "keywords": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

50074

increased by2.32%

Lines of code

1018

increased by0.3%

No dependency changes