[Types] rename _getError by _getErrorInvalidValue

jeanclaudeyalap · jeanclaudeyalap · commit 8bc284961861 · 2018-09-06T08:44:05.000+02:00
diff --git a/dist/routes/Route.js b/dist/routes/Route.js
@@ -156,10 +156,6 @@ var Route = (_temp = _class = function () {
      */
 
     this.koaRouter = new _koaRouter3.default();
-    /**
-     * @ignore
-     */
-    this.privateKeyInParamsRoute = ['__force', '__func'];
     // This Variable are set by RouteDecorators
     this.routes;
     this.routeBase;
diff --git a/dist/types/TypeAny.js b/dist/types/TypeAny.js
@@ -37,9 +37,9 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _i18n = require('i18n-2');
+var _i18n2 = require('i18n-2');
 
-var _i18n2 = _interopRequireDefault(_i18n);
+var _i18n3 = _interopRequireDefault(_i18n2);
 
 var _path = require('path');
 
@@ -77,15 +77,17 @@ var TypeAny = exports.TypeAny = function () {
     }), (0, _defineProperty3.default)(_errorMessages, this._TypeError.INVALID_TYPE, function () {
       return _this._i18n.__('Expected type %s', _this._type);
     }), (0, _defineProperty3.default)(_errorMessages, this._TypeError.INVALID_VALUE, function () {
-      return _this._i18n.__('Invalid field');
+      return _this._getErrorInvalidValue.apply(_this, arguments);
     }), _errorMessages);
     this._isRequired = false;
     this._notNull = false;
     this._default = undefined;
     this._value = null;
 
-    this._getError = function () {
-      return _this._i18n.__('Invalid field');
+    this._getErrorInvalidValue = function (_ref2) {
+      var _i18n = _ref2._i18n;
+
+      return _i18n.__('Invalid field');
     };
 
     this._getDescription = function () {
@@ -100,14 +102,14 @@ var TypeAny = exports.TypeAny = function () {
       locales: ['en', 'fr'],
       extension: '.json'
     }, i18n);
-    this._i18n = new _i18n2.default(this._i18nConfig);
+    this._i18n = new _i18n3.default(this._i18nConfig);
   }
 
   (0, _createClass3.default)(TypeAny, [{
     key: 'clone',
     value: function clone() {
       var clone = (0, _assign2.default)((0, _create2.default)((0, _getPrototypeOf2.default)(this)), this);
-      clone._i18n = new _i18n2.default(this._i18nConfig);
+      clone._i18n = new _i18n3.default(this._i18nConfig);
       return clone;
     }
   }, {
diff --git a/dist/types/TypeArray.js b/dist/types/TypeArray.js
@@ -49,7 +49,7 @@ var TypeArray = function (_TypeAny) {
 
     _this._tSingle = false;
 
-    _this._getError = function (_ref, key) {
+    _this._getErrorInvalidValue = function (_ref, key) {
       var _i18n = _ref._i18n;
 
       if (key === 'type') return _i18n.__('Should be an array');
@@ -81,8 +81,7 @@ var TypeArray = function (_TypeAny) {
       return '' + msgError + paramMsg + '.';
     };
 
-    _this._errorMessages[_this._TypeError.INVALID_VALUE] = _this._getError;
-    _this._errorMessages[_this._TypeError.INVALID_TYPE] = _this._getError;
+    _this._errorMessages[_this._TypeError.INVALID_TYPE] = _this._getErrorInvalidValue;
     return _this;
   } // the array's maximum allowed length
   // the array's exact allowed length
diff --git a/dist/types/TypeBinary.js b/dist/types/TypeBinary.js
@@ -49,7 +49,7 @@ var TypeBinary = function (_TypeAny) {
 
     var _this = (0, _possibleConstructorReturn3.default)(this, (TypeBinary.__proto__ || (0, _getPrototypeOf2.default)(TypeBinary)).call(this, (0, _extends3.default)({}, params, { type: 'binary' })));
 
-    _this._getError = function (_ref, key) {
+    _this._getErrorInvalidValue = function (_ref, key) {
       var _i18n = _ref._i18n;
 
       key = _this._errorKey || key;
@@ -80,7 +80,6 @@ var TypeBinary = function (_TypeAny) {
       return '' + msgError + paramMsg + '.';
     };
 
-    _this._errorMessages[_this._TypeError.INVALID_VALUE] = _this._getError;
     return _this;
   } // the buffer's minimum allowed length
   // the desired encoding of buffer
diff --git a/dist/types/TypeBoolean.js b/dist/types/TypeBoolean.js
@@ -59,7 +59,7 @@ var TypeBoolean = exports.TypeBoolean = function (_TypeAny) {
     _this._falsyValues = ['false'];
     _this._insensitive = true;
 
-    _this._getError = function (_ref) {
+    _this._getErrorInvalidValue = function (_ref) {
       var _i18n = _ref._i18n;
 
       return _i18n.__('Should be a boolean');
@@ -72,7 +72,6 @@ var TypeBoolean = exports.TypeBoolean = function (_TypeAny) {
       return prefix + 'a boolean or one of: (' + _utils.utils.joinWithCote(valideValue, ', ') + ').';
     };
 
-    _this._errorMessages[_this._TypeError.INVALID_VALUE] = _this._getError;
     return _this;
   } // Specifies additional values to be considered as 'falsy'
 
diff --git a/dist/types/TypeDate.js b/dist/types/TypeDate.js
@@ -53,7 +53,7 @@ var TypeDate = function (_TypeAny) {
 
     var _this = (0, _possibleConstructorReturn3.default)(this, (TypeDate.__proto__ || (0, _getPrototypeOf2.default)(TypeDate)).call(this, (0, _extends3.default)({}, params, { type: 'date' })));
 
-    _this._getError = function (_ref, key) {
+    _this._getErrorInvalidValue = function (_ref, key) {
       var _i18n = _ref._i18n,
           _max = _ref._max,
           _min = _ref._min;
@@ -85,7 +85,6 @@ var TypeDate = function (_TypeAny) {
       return '' + msgError + paramMsg + '.';
     };
 
-    _this._errorMessages[_this._TypeError.INVALID_VALUE] = _this._getError;
     return _this;
   } // earliest possible date
   // the date's input format
diff --git a/dist/types/TypeEnum.js b/dist/types/TypeEnum.js
@@ -56,7 +56,7 @@ var TypeEnum = exports.TypeEnum = function (_TypeAny) {
     _this._insensitive = true;
     _this._number = true;
 
-    _this._getError = function (_ref) {
+    _this._getErrorInvalidValue = function (_ref) {
       var _i18n = _ref._i18n;
 
       return _i18n.__('Should be one of %s', _utils.utils.joinWithCote(_this._oneOf, ', '));
@@ -68,7 +68,6 @@ var TypeEnum = exports.TypeEnum = function (_TypeAny) {
       return prefix + 'one of: (' + _utils.utils.joinWithCote(_this._oneOf, ', ') + ').';
     };
 
-    _this._errorMessages[_this._TypeError.INVALID_VALUE] = _this._getError;
     return _this;
   }
 
diff --git a/dist/types/TypeNumber.js b/dist/types/TypeNumber.js
@@ -55,7 +55,7 @@ var TypeNumber = exports.TypeNumber = function (_TypeAny) {
     _this._positive = false;
     _this._negative = false;
 
-    _this._getError = function (_ref, key) {
+    _this._getErrorInvalidValue = function (_ref, key) {
       var _i18n = _ref._i18n;
 
       key = _this._errorKey || key;
@@ -112,7 +112,6 @@ var TypeNumber = exports.TypeNumber = function (_TypeAny) {
       return Math[type](nb * Math.pow(10, nbDigit)) / Math.pow(10, nbDigit);
     };
 
-    _this._errorMessages[_this._TypeError.INVALID_VALUE] = _this._getError;
     return _this;
   } // Specifies the maximum number of decimal places where:
   // Requires the number to be positive.
diff --git a/dist/types/TypeObject.js b/dist/types/TypeObject.js
@@ -53,7 +53,7 @@ var TypeObject = exports.TypeObject = function (_TypeAny) {
     _this._schema = {};
     _this._errors = {};
 
-    _this._getError = function (_ref, key, keyError, msg) {
+    _this._getErrorInvalidValue = function (_ref, key, keyError, msg) {
       var _i18n = _ref._i18n;
 
       if (key === 'add') return _this._errorWithKey ? keyError + ': ' + msg : msg;
@@ -66,7 +66,6 @@ var TypeObject = exports.TypeObject = function (_TypeAny) {
       return prefix + 'an object';
     };
 
-    _this._errorMessages[_this._TypeError.INVALID_VALUE] = _this._getError;
     return _this;
   }
 
diff --git a/dist/types/TypeOneOf.js b/dist/types/TypeOneOf.js
@@ -49,7 +49,7 @@ var TypeOneOf = exports.TypeOneOf = function (_TypeAny) {
     _this._types = [];
     _this._errors = [];
 
-    _this._getError = function (_ref) {
+    _this._getErrorInvalidValue = function (_ref) {
       var _i18n = _ref._i18n;
 
       return _i18n.__('Invalid type');
@@ -88,7 +88,6 @@ var TypeOneOf = exports.TypeOneOf = function (_TypeAny) {
       return prefix + 'either ' + msgs.join(' OR ') + '.';
     };
 
-    _this._errorMessages[_this._TypeError.INVALID_VALUE] = _this._getError;
     return _this;
   }
 
diff --git a/dist/types/TypeString.js b/dist/types/TypeString.js
@@ -51,7 +51,7 @@ var TypeString = function (_TypeAny) {
     _this._tUppercase = false;
     _this._tLowercase = false;
 
-    _this._getError = function (_ref, key) {
+    _this._getErrorInvalidValue = function (_ref, key) {
       var _i18n = _ref._i18n;
 
       key = _this._errorKey || key;
@@ -84,7 +84,6 @@ var TypeString = function (_TypeAny) {
       return '' + msgError + _this._generateParamDescription(paramsDesc, ' with') + '.';
     };
 
-    _this._errorMessages[_this._TypeError.INVALID_VALUE] = _this._getError;
     return _this;
   }
 
diff --git a/src/types/TypeAny.js b/src/types/TypeAny.js
@@ -30,7 +30,7 @@ export class TypeAny {
     [this._TypeError.REQUIRED]: () => this._i18n.__('Is required'),
     [this._TypeError.IS_NULL]: () => this._i18n.__('Cannot be null'),
     [this._TypeError.INVALID_TYPE]: () => this._i18n.__('Expected type %s', this._type),
-    [this._TypeError.INVALID_VALUE]: () => this._i18n.__('Invalid field'),
+    [this._TypeError.INVALID_VALUE]: (...rest) => this._getErrorInvalidValue(...rest),
   };
   // options
   _isRequired = false;
@@ -70,8 +70,8 @@ export class TypeAny {
     return this;
   }
 
-  _getError = () => {
-    return this._i18n.__('Invalid field');
+  _getErrorInvalidValue = ({ _i18n }) => {
+    return _i18n.__('Invalid field');
   };
 
   _getDescription = (prefix = 'It should be') => {
diff --git a/src/types/TypeArray.js b/src/types/TypeArray.js
@@ -12,11 +12,10 @@ export class TypeArray extends TypeAny {
 
   constructor(params = {}) {
     super({ ...params, type: 'Array' });
-    this._errorMessages[this._TypeError.INVALID_VALUE] = this._getError;
-    this._errorMessages[this._TypeError.INVALID_TYPE] = this._getError;
+    this._errorMessages[this._TypeError.INVALID_TYPE] = this._getErrorInvalidValue;
   }
 
-  _getError = ({ _i18n }, key) => {
+  _getErrorInvalidValue = ({ _i18n }, key) => {
     if (key === 'type') return _i18n.__('Should be an array');
     if (key === 'length') return _i18n.__('Expected %d items', this._length);
     if (key === 'min') return _i18n.__('Less than %d items', this._min);
diff --git a/src/types/TypeBinary.js b/src/types/TypeBinary.js
@@ -8,10 +8,9 @@ export class TypeBinary extends TypeAny {
 
   constructor(params = {}) {
     super({ ...params, type: 'binary' });
-    this._errorMessages[this._TypeError.INVALID_VALUE] = this._getError;
   }
 
-  _getError = ({ _i18n }, key) => {
+  _getErrorInvalidValue = ({ _i18n }, key) => {
     key = this._errorKey || key;
     this._errorKey = key;
 
diff --git a/src/types/TypeBoolean.js b/src/types/TypeBoolean.js
@@ -10,10 +10,9 @@ export class TypeBoolean extends TypeAny {
 
   constructor(params = {}) {
     super({ ...params, type: 'boolean' });
-    this._errorMessages[this._TypeError.INVALID_VALUE] = this._getError;
   }
 
-  _getError = ({ _i18n }) => {
+  _getErrorInvalidValue = ({ _i18n }) => {
     return _i18n.__('Should be a boolean');
   };
 
diff --git a/src/types/TypeDate.js b/src/types/TypeDate.js
@@ -12,10 +12,9 @@ export class TypeDate extends TypeAny {
 
   constructor(params = {}) {
     super({ ...params, type: 'date' });
-    this._errorMessages[this._TypeError.INVALID_VALUE] = this._getError;
   }
 
-  _getError = ({ _i18n, _max, _min }, key) => {
+  _getErrorInvalidValue = ({ _i18n, _max, _min }, key) => {
     key = this._errorKey || key;
     this._errorKey = key;
 
diff --git a/src/types/TypeEnum.js b/src/types/TypeEnum.js
@@ -8,10 +8,9 @@ export class TypeEnum extends TypeAny {
 
   constructor(params = {}) {
     super({ ...params, type: 'enum' });
-    this._errorMessages[this._TypeError.INVALID_VALUE] = this._getError;
   }
 
-  _getError = ({ _i18n }) => {
+  _getErrorInvalidValue = ({ _i18n }) => {
     return _i18n.__('Should be one of %s', utils.joinWithCote(this._oneOf, ', '));
   };
 
diff --git a/src/types/TypeNumber.js b/src/types/TypeNumber.js
@@ -13,10 +13,9 @@ export class TypeNumber extends TypeAny {
 
   constructor(params = {}) {
     super({ ...params, type: 'number' });
-    this._errorMessages[this._TypeError.INVALID_VALUE] = this._getError;
   }
 
-  _getError = ({ _i18n }, key) => {
+  _getErrorInvalidValue = ({ _i18n }, key) => {
     key = this._errorKey || key;
     this._errorKey = key;
 
diff --git a/src/types/TypeObject.js b/src/types/TypeObject.js
@@ -7,11 +7,9 @@ export class TypeObject extends TypeAny {
 
   constructor(params = {}) {
     super({ ...params, type: 'object' });
-
-    this._errorMessages[this._TypeError.INVALID_VALUE] = this._getError;
   }
 
-  _getError = ({ _i18n }, key, keyError, msg) => {
+  _getErrorInvalidValue = ({ _i18n }, key, keyError, msg) => {
     if (key === 'add') return this._errorWithKey ? `${keyError}: ${msg}` : msg;
     return _i18n.__('Is not an object');
   };
diff --git a/src/types/TypeOneOf.js b/src/types/TypeOneOf.js
@@ -6,10 +6,9 @@ export class TypeOneOf extends TypeAny {
 
   constructor(params = {}) {
     super({ ...params, type: 'oneOf' });
-    this._errorMessages[this._TypeError.INVALID_VALUE] = this._getError;
   }
 
-  _getError = ({ _i18n }) => {
+  _getErrorInvalidValue = ({ _i18n }) => {
     return _i18n.__('Invalid type');
   };
 
diff --git a/src/types/TypeString.js b/src/types/TypeString.js
@@ -14,10 +14,9 @@ export class TypeString extends TypeAny {
 
   constructor(params = {}) {
     super({ ...params, type: 'string' });
-    this._errorMessages[this._TypeError.INVALID_VALUE] = this._getError;
   }
 
-  _getError = ({ _i18n }, key) => {
+  _getErrorInvalidValue = ({ _i18n }, key) => {
     key = this._errorKey || key;
     this._errorKey = key;
 
