ES6 refactor of validator-extras.js (#6082)

let, const, method shorthands, arrow functions, export

lib/utils/validator-extras.js

 'use strict';
 'use strict';
 
 
-var validator = require('validator')
-  , _ = require('lodash');
+const validator = require('validator');
+const _ = require('lodash');
 
 
-var extensions = {
-  extend: function(name, fn) {
+const extensions = {
+  extend(name, fn) {
     this[name] = fn;
     this[name] = fn;
 
 
     return this;
     return this;
   },
   },
-  notEmpty: function(str) {
+  notEmpty(str) {
     return !str.match(/^[\s\t\r\n]*$/);
     return !str.match(/^[\s\t\r\n]*$/);
   },
   },
-  len: function(str, min, max) {
+  len(str, min, max) {
     return this.isLength(str, min, max);
     return this.isLength(str, min, max);
   },
   },
-  isUrl: function(str) {
+  isUrl(str) {
     return this.isURL(str);
     return this.isURL(str);
   },
   },
-  isIPv6: function(str) {
+  isIPv6(str) {
     return this.isIP(str, 6);
     return this.isIP(str, 6);
   },
   },
-  isIPv4: function(str) {
+  isIPv4(str) {
     return this.isIP(str, 4);
     return this.isIP(str, 4);
   },
   },
-  notIn: function(str, values) {
+  notIn(str, values) {
     return !this.isIn(str, values);
     return !this.isIn(str, values);
   },
   },
-  regex: function(str, pattern, modifiers) {
+  regex(str, pattern, modifiers) {
     str += '';
     str += '';
     if (Object.prototype.toString.call(pattern).slice(8, -1) !== 'RegExp') {
     if (Object.prototype.toString.call(pattern).slice(8, -1) !== 'RegExp') {
       pattern = new RegExp(pattern, modifiers);
       pattern = new RegExp(pattern, modifiers);
     }
     }
     return str.match(pattern);
     return str.match(pattern);
   },
   },
-  notRegex: function(str, pattern, modifiers) {
+  notRegex(str, pattern, modifiers) {
     return !this.regex(str, pattern, modifiers);
     return !this.regex(str, pattern, modifiers);
   },
   },
-  isDecimal: function(str) {
+  isDecimal(str) {
     return str !== '' && str.match(/^(?:-?(?:[0-9]+))?(?:\.[0-9]*)?(?:[eE][\+\-]?(?:[0-9]+))?$/);
     return str !== '' && str.match(/^(?:-?(?:[0-9]+))?(?:\.[0-9]*)?(?:[eE][\+\-]?(?:[0-9]+))?$/);
   },
   },
-  min: function(str, val) {
-    var number = parseFloat(str);
+  min(str, val) {
+    const number = parseFloat(str);
     return isNaN(number) || number >= val;
     return isNaN(number) || number >= val;
   },
   },
-  max: function(str, val) {
-    var number = parseFloat(str);
+  max(str, val) {
+    const number = parseFloat(str);
     return isNaN(number) || number <= val;
     return isNaN(number) || number <= val;
   },
   },
-  not: function(str, pattern, modifiers) {
+  not(str, pattern, modifiers) {
     return this.notRegex(str, pattern, modifiers);
     return this.notRegex(str, pattern, modifiers);
   },
   },
-  contains: function(str, elem) {
+  contains(str, elem) {
     return str.indexOf(elem) >= 0 && !!elem;
     return str.indexOf(elem) >= 0 && !!elem;
   },
   },
-  notContains: function(str, elem) {
+  notContains(str, elem) {
     return !this.contains(str, elem);
     return !this.contains(str, elem);
   },
   },
-  is: function(str, pattern, modifiers) {
+  is(str, pattern, modifiers) {
     return this.regex(str, pattern, modifiers);
     return this.regex(str, pattern, modifiers);
   },
   },
 };
 };
-var extendModelValidations = function(modelInstance) {
-  var extensions = {
-        isImmutable: function(str, param, field) {
-          return (modelInstance.isNewRecord || modelInstance.dataValues[field] === modelInstance._previousDataValues[field]);
-        },
-      };
+exports.extensions = extensions;
 
 
-  _.forEach(extensions, function(extend, key) {
+function extendModelValidations(modelInstance) {
+  const extensions = {
+    isImmutable(str, param, field) {
+      return (modelInstance.isNewRecord || modelInstance.dataValues[field] === modelInstance._previousDataValues[field]);
+    },
+  };
+
+  _.forEach(extensions, (extend, key) => {
     validator[key] = extend;
     validator[key] = extend;
   });
   });
-};
+}
+exports.extendModelValidations = extendModelValidations;
 
 
 // Deprecate this.
 // Deprecate this.
 validator.notNull = function() {
 validator.notNull = function() {
@@ -79,12 +82,8 @@ validator.notNull = function() {
 };
 };
 
 
 // https://github.com/chriso/validator.js/blob/1.5.0/lib/validators.js
 // https://github.com/chriso/validator.js/blob/1.5.0/lib/validators.js
-_.forEach(extensions, function(extend, key) {
+_.forEach(extensions, (extend, key) => {
   validator[key] = extend;
   validator[key] = extend;
 });
 });
 
 
-module.exports = {
-  extensions: extensions,
-  extendModelValidations: extendModelValidations,
-  validator: validator,
-};
+exports.validator = validator;