co.validation 1.0.0-RC.7 → 2.2.0

package/lib/__tests__/component.valueValidation.js

@@ -39,6 +39,45 @@ describe('createValidation', () => {
       errors: undefined
     });
   });
+  it('supports custom', () => {
+    const biggerThanX = (value, allValues) => {
+      if (value < allValues.x) {
+        throw 'bigger';
+      }
+
+      return value;
+    };
+
+    expect((0, _.createValidation)({
+      type: 'custom',
+      validator: biggerThanX
+    })(5, {
+      x: 10
+    })).toEqual({
+      data: undefined,
+      errors: ['Error']
+    });
+    expect((0, _.createValidation)({
+      type: 'custom',
+      validator: biggerThanX,
+      getMessage: bigger => bigger
+    })(5, {
+      x: 10
+    })).toEqual({
+      data: undefined,
+      errors: ['bigger']
+    });
+    expect((0, _.createValidation)({
+      type: 'custom',
+      validator: biggerThanX,
+      getMessage: () => 'Required'
+    })(50, {
+      x: 10
+    })).toEqual({
+      data: 50,
+      errors: undefined
+    });
+  });
   it('supports equals', () => {
     expect((0, _.createValidation)({
       type: 'equals',
@@ -370,21 +409,21 @@ describe('createValidation', () => {
       type: 'boolean',
       getMessage: () => 'Boolean'
     })('true')).toEqual({
-      data: 'true',
+      data: true,
       errors: undefined
     });
     expect((0, _.createValidation)({
       type: 'boolean',
       getMessage: () => 'Boolean'
     })('false')).toEqual({
-      data: 'false',
+      data: false,
       errors: undefined
     });
     expect((0, _.createValidation)({
       type: 'boolean',
       getMessage: () => 'Boolean'
     })('FAlse')).toEqual({
-      data: 'FAlse',
+      data: false,
       errors: undefined
     });
     expect((0, _.createValidation)({

package/lib/__tests__/integration.registrationForm.js

@@ -83,17 +83,43 @@ const registrationFormValidation = (0, _.createValidation)({
     }
   }
 });
-describe('registrationFormValidation', () => {
-  it('single invalid item creates error without array', () => {
-    const validatedObject = {};
-    const validationResult = registrationFormValidation(validatedObject);
-    expect(validationResult.errors).toEqual({
-      firstName: ['Required'],
-      lastName: ['Required'],
-      email: ['Required'],
-      age: ['Required']
+const ukErrors = {
+  '##object': 'Має бути об\'єкт',
+  '##array': 'Має бути масив',
+  '##required': 'Обов\'язково',
+  '##equals': `Має дорівнювати {to}`,
+  '##maxLength': `Має бути {max} символів або менше`,
+  '##minLength': `Має бути принаймні {min} символів`,
+  '##number': 'Має бути число',
+  '##minValue': `Має бути принаймні {min}`,
+  '##maxValue': `Має бути не більше ніж {max}`,
+  '##email': 'Недійсний формат електронної пошти',
+  '##alphanumeric': 'Тільки буквено-цифрові символи',
+  '##string': 'Має бути рядок',
+  '##boolean': 'Має бути логічним значенням',
+  '##equalsToField': 'Має дорівнювати {field}',
+  '##regex': 'Недійсний формат',
+  '##custom': 'Помилка'
+};
+describe('registrationFormValidation in language=' + encodeURI, () => {
+  ['en', 'uk', 'en'].map(lang => {
+    it('single invalid item creates error without array in lang' + lang, () => {
+      if (lang === 'en') {
+        (0, _.resetDefaultMessages)();
+      } else {
+        (0, _.setDefaultMessages)(ukErrors);
+      }
+
+      const validatedObject = {};
+      const validationResult = registrationFormValidation(validatedObject);
+      expect(validationResult.errors).toEqual({
+        firstName: [lang === 'en' ? 'Required' : 'Обов\'язково'],
+        lastName: [lang === 'en' ? 'Required' : 'Обов\'язково'],
+        email: [lang === 'en' ? 'Required' : 'Обов\'язково'],
+        age: [lang === 'en' ? 'Required' : 'Обов\'язково']
+      });
+      expect(validationResult.data).toEqual(undefined);
     });
-    expect(validationResult.data).toEqual(undefined);
   });
   it('single invalid item creates error with empty array', () => {
     const validatedObject = {
@@ -147,32 +173,7 @@ describe('registrationFormValidation', () => {
         toys: [1, true, 'test']
       }]
     };
-    const validationResult = registrationFormValidation(validatedObject); // const result = {
-    //   "data": {
-    //     "firstName":"firstName",
-    //     "lastName":"lastName",
-    //     "email":"test@mail.com",
-    //     "hobbies":[{
-    //       "title":"title"
-    //     }, {
-    //       "title":"title",
-    //       "description":"description",
-    //       "toys":[1,true,"test"]
-    //     }]
-    //   },
-    //   "errors": {
-    //     "hobbies": [
-    //       ["Must be an object"],
-    //       null,
-    //       [{
-    //         "toys":[["Required"],null]
-    //       }],
-    //       [{"title":["Required"]}],
-    //       null
-    //     ]
-    //   }
-    // }
-
+    const validationResult = registrationFormValidation(validatedObject);
     expect(validationResult.data).toEqual({
       firstName: 'firstName',
       lastName: 'lastName',

package/lib/createValidation.js

@@ -20,6 +20,9 @@ const createValidation = rule => {
     case 'required':
       return (0, _validators.required)(rule);
 
+    case 'custom':
+      return (0, _validators.custom)(rule);
+
     case 'equals':
       return (0, _validators.equals)(rule);
 
@@ -97,7 +100,7 @@ const createArrayValidation = rule => {
 
     if (!Array.isArray(array)) {
       return {
-        errors: (0, _messageProcessor.default)(rule.getMessage, `Must be an array`, null, array)
+        errors: (0, _messageProcessor.default)(rule.getMessage, `##array`, null, array)
       };
     }
 
@@ -144,7 +147,7 @@ const createObjectValidation = rule => {
 
     if (!(0, _helpers.isPlainObject)(object)) {
       return {
-        errors: (0, _messageProcessor.default)(rule.getMessage, `Must be an object`, null, object)
+        errors: (0, _messageProcessor.default)(rule.getMessage, `##object`, null, object)
       };
     }
 

package/lib/index.js

@@ -9,10 +9,24 @@ Object.defineProperty(exports, "createValidation", {
     return _createValidation.default;
   }
 });
+Object.defineProperty(exports, "resetDefaultMessages", {
+  enumerable: true,
+  get: function () {
+    return _messageProcessor.resetDefaultMessages;
+  }
+});
+Object.defineProperty(exports, "setDefaultMessages", {
+  enumerable: true,
+  get: function () {
+    return _messageProcessor.setDefaultMessages;
+  }
+});
 exports.createReduxFormValidation = void 0;
 
 var _createValidation = _interopRequireDefault(require("./createValidation"));
 
+var _messageProcessor = require("./messageProcessor");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const createReduxFormValidation = rules => {

package/lib/messageProcessor.js

@@ -3,13 +3,45 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.resetDefaultMessages = exports.setDefaultMessages = void 0;
+const defaultDefaultMessages = {
+  '##object': 'Must be an object',
+  '##array': 'Must be an array',
+  '##required': 'Required',
+  '##equals': `Must be equal to {to}`,
+  '##maxLength': `Must be {max} characters or less`,
+  '##minLength': `Must be at least {min} characters`,
+  '##number': 'Must be a number',
+  '##minValue': `Must be at least {min}`,
+  '##maxValue': `Must be not more than {max}`,
+  '##email': 'Invalid email format',
+  '##alphanumeric': 'Only alphanumeric characters',
+  '##string': 'Must be a string',
+  '##boolean': 'Must be a boolean',
+  '##equalsToField': 'Must be equal to {field}',
+  '##regex': 'Invalid format',
+  '##custom': 'Error'
+};
+const currentDefaultMessages = { ...defaultDefaultMessages
+};
+
+const setDefaultMessages = defaultMessages => {
+  Object.assign(currentDefaultMessages, defaultMessages);
+};
+
+exports.setDefaultMessages = setDefaultMessages;
+
+const resetDefaultMessages = () => {
+  Object.assign(currentDefaultMessages, defaultDefaultMessages);
+};
+
+exports.resetDefaultMessages = resetDefaultMessages;
 
-var _default = (getMessage, defaultValue, stringFormatter, ...args) => {
+var _default = (getMessage, defaultValueCode, stringFormatter, ...args) => {
   let result = null;
 
   if (!getMessage) {
-    result = defaultValue;
+    result = currentDefaultMessages[defaultValueCode];
   } else if (typeof getMessage === 'function') {
     result = getMessage(...args);
 

package/lib/validators.js

@@ -3,18 +3,35 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.regex = exports.equalsToField = exports.boolean = exports.string = exports.alphanumeric = exports.email = exports.maxValue = exports.minValue = exports.number = exports.minLength = exports.maxLength = exports.equals = exports.required = void 0;
+exports.regex = exports.equalsToField = exports.boolean = exports.string = exports.alphanumeric = exports.email = exports.maxValue = exports.minValue = exports.number = exports.minLength = exports.maxLength = exports.equals = exports.required = exports.custom = void 0;
 
 var _messageProcessor = _interopRequireDefault(require("./messageProcessor"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const custom = ({
+  validator,
+  getMessage
+}) => (value, allValues) => {
+  try {
+    return {
+      data: validator(value, allValues)
+    };
+  } catch (e) {
+    return {
+      errors: (0, _messageProcessor.default)(getMessage, '##custom', null, e)
+    };
+  }
+};
+
+exports.custom = custom;
+
 const required = ({
   getMessage
 }) => value => value || typeof value === 'number' ? {
   data: value
 } : {
-  errors: (0, _messageProcessor.default)(getMessage, 'Required')
+  errors: (0, _messageProcessor.default)(getMessage, '##required')
 };
 
 exports.required = required;
@@ -25,7 +42,7 @@ const equals = ({
 }) => value => value === to ? {
   data: value
 } : {
-  errors: (0, _messageProcessor.default)(getMessage, `Must be equal to {to}`, string => string.replace(/{to}/g, to), to)
+  errors: (0, _messageProcessor.default)(getMessage, `##equals`, string => string.replace(/{to}/g, to), to)
 };
 
 exports.equals = equals;
@@ -35,7 +52,7 @@ const maxLength = ({
   getMessage
 }) => value => {
   return value && value.length > max ? {
-    errors: (0, _messageProcessor.default)(getMessage, `Must be {max} characters or less`, string => string.replace(/{max}/g, max), max)
+    errors: (0, _messageProcessor.default)(getMessage, `##maxLength`, string => string.replace(/{max}/g, max), max)
   } : {
     data: value
   };
@@ -47,7 +64,7 @@ const minLength = ({
   min,
   getMessage
 }) => value => value && value.length < min ? {
-  errors: (0, _messageProcessor.default)(getMessage, `Must be at least {min} characters`, string => string.replace(/{min}/g, min), min)
+  errors: (0, _messageProcessor.default)(getMessage, `##minLength`, string => string.replace(/{min}/g, min), min)
 } : {
   data: value
 };
@@ -57,7 +74,7 @@ exports.minLength = minLength;
 const number = ({
   getMessage
 }) => value => value && isNaN(Number(value)) ? {
-  errors: (0, _messageProcessor.default)(getMessage, 'Must be a number')
+  errors: (0, _messageProcessor.default)(getMessage, '##number')
 } : {
   data: value === null || value === undefined ? value : Number(value)
 };
@@ -68,7 +85,7 @@ const minValue = ({
   min,
   getMessage
 }) => value => value && value < min ? {
-  errors: (0, _messageProcessor.default)(getMessage, `Must be at least {min}`, string => string.replace(/{min}/g, min), min)
+  errors: (0, _messageProcessor.default)(getMessage, `##minValue`, string => string.replace(/{min}/g, min), min)
 } : {
   data: value
 };
@@ -79,7 +96,7 @@ const maxValue = ({
   max,
   getMessage
 }) => value => value && value > max ? {
-  errors: (0, _messageProcessor.default)(getMessage, `Must be not more than {max}`, string => string.replace(/{max}/g, max), max)
+  errors: (0, _messageProcessor.default)(getMessage, `##maxValue`, string => string.replace(/{max}/g, max), max)
 } : {
   data: value
 };
@@ -89,7 +106,7 @@ exports.maxValue = maxValue;
 const email = ({
   getMessage
 }) => value => value && !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(value) ? {
-  errors: (0, _messageProcessor.default)(getMessage, 'Invalid email format')
+  errors: (0, _messageProcessor.default)(getMessage, '##email')
 } : {
   data: value
 };
@@ -99,7 +116,7 @@ exports.email = email;
 const alphanumeric = ({
   getMessage
 }) => value => value && /[^a-zA-Z0-9]/i.test(value) ? {
-  errors: (0, _messageProcessor.default)(getMessage, 'Only alphanumeric characters')
+  errors: (0, _messageProcessor.default)(getMessage, '##alphanumeric')
 } : {
   data: value
 };
@@ -109,7 +126,7 @@ exports.alphanumeric = alphanumeric;
 const string = ({
   getMessage
 }) => value => value && typeof value !== 'string' ? {
-  errors: (0, _messageProcessor.default)(getMessage, 'Must be a string')
+  errors: (0, _messageProcessor.default)(getMessage, '##string')
 } : {
   data: value
 };
@@ -118,13 +135,20 @@ exports.string = string;
 
 const boolean = ({
   getMessage
-}) => value => value === undefined || value === null || typeof value === 'boolean' || typeof value === 'string' && {
+}) => value => value === undefined || value === null ? {
+  data: value
+} : typeof value === 'boolean' ? {
+  data: value
+} : typeof value === 'string' && {
   'true': true,
   'false': true
 }[value.toLowerCase()] ? {
-  data: value
+  data: {
+    'true': true,
+    'false': false
+  }[value.toLowerCase()]
 } : {
-  errors: (0, _messageProcessor.default)(getMessage, 'Must be a boolean')
+  errors: (0, _messageProcessor.default)(getMessage, '##boolean')
 };
 
 exports.boolean = boolean;
@@ -133,7 +157,7 @@ const equalsToField = ({
   field,
   getMessage
 }) => (value, allValues) => value !== allValues[field] ? {
-  errors: (0, _messageProcessor.default)(getMessage, `Must be equal to {field}`, string => string.replace(/{field}/g, field), field)
+  errors: (0, _messageProcessor.default)(getMessage, `##equalsToField`, string => string.replace(/{field}/g, field), field)
 } : {
   data: value
 };
@@ -144,7 +168,7 @@ const regex = ({
   regex,
   getMessage
 }) => value => value && !regex.test(value) ? {
-  errors: (0, _messageProcessor.default)(getMessage, 'Invalid format')
+  errors: (0, _messageProcessor.default)(getMessage, '##regex')
 } : {
   data: value
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "co.validation",
-  "version": "1.0.0-RC.7",
+  "version": "2.2.0",
   "description": "JSON based fluent validation for browser, node.js, redux-form and anything javascript compatible.",
   "main": "lib/index.js",
   "scripts": {