rebuild

Author: jquense

lib/mixed.js

@@ -20,6 +20,18 @@ function runValidations(validations, endEarly, value, path) {
   return endEarly ? Promise.all(validations) : _.collectErrors(validations, value, path);
 }
 
+function extractTestParams(name, message, test, useCallback) {
+  var opts = name;
+
+  if (typeof message === 'function') test = message, message = locale.default;
+
+  if (typeof name === 'string' || name === null) opts = { name: name, test: test, message: message, useCallback: useCallback, exclusive: false };
+
+  if (typeof opts.test !== 'function') throw new TypeError('`test` is a required parameters');
+
+  return opts;
+}
+
 module.exports = SchemaType;
 
 function SchemaType() {
@@ -247,17 +259,9 @@ SchemaType.prototype = {
    * the previous tests are removed and further tests of the same name will replace each other.
    */
   test: function test(name, message, _test, useCallback) {
-    var opts = name,
+    var opts = extractTestParams(name, message, _test, useCallback),
         next = this.clone();
 
-    if (typeof name === 'string') {
-      if (typeof message === 'function') _test = message, message = name, name = null;
-
-      opts = { name: name, test: _test, message: message, useCallback: useCallback, exclusive: false };
-    }
-
-    if (typeof opts.message !== 'string' || typeof opts.test !== 'function') throw new TypeError('`message` and `test` are required parameters');
-
     var validate = createValidation(opts);
 
     var isExclusive = opts.exclusive || opts.name && next._exclusive[opts.name] === true;

lib/util/createValidation.js

@@ -40,9 +40,9 @@ function createErrorFactory(_ref) {
     var type = _ref2$type === undefined ? opts.name : _ref2$type;
     var params = _ref2.params;
 
-    params = resolveParams(opts.params, params, resolve);
+    params = _extends({ path: path, value: value, label: label }, resolveParams(opts.params, params, resolve));
 
-    return _extends(new ValidationError(formatError(message, _extends({ path: path, value: value, label: label }, params)), value, path, type), { params: params });
+    return _extends(new ValidationError(typeof message === 'string' ? formatError(message, params) : message, value, path, type), { params: params });
   };
 }
 

lib/util/validation-error.js

@@ -58,17 +58,4 @@ ValidationError.formatError = function (message, params) {
   };
 
   return arguments.length === 1 ? fn : fn(params);
-};
-
-ValidationError.prototype.toJSON = function () {
-  var _ref2;
-
-  if (this.inner.length) return this.inner.reduce(function (list, e) {
-    list[e.path] = (list[e.path] || (list[e.path] = [])).concat(e.toJSON());
-    return list;
-  }, {});
-
-  if (this.path) return _ref2 = {}, _ref2[this.path] = { errors: this.errors, path: this.path, type: this.type }, _ref2;
-
-  return err.errors;
 };