co.validation 1.0.0-RC.6 → 2.1.0

package/lib/__tests__/component.arrayValidation.js

@@ -71,6 +71,20 @@ describe('createValidation', () => {
     }]);
     expect(validationResult.data).toEqual([]);
   });
+  it('list of numbers stays list of numbers', () => {
+    const validatedObject = [0, 1, 2];
+    const validationResult = (0, _.createValidation)({
+      type: 'array',
+      itemRule: {
+        type: 'all',
+        validators: [{
+          type: 'number'
+        }]
+      }
+    })(validatedObject);
+    expect(validationResult.errors).toEqual(undefined);
+    expect(validationResult.data).toEqual(validatedObject);
+  });
   it('single valid item stays in data', () => {
     const validatedObject = [{
       login: 'hey'

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/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);
 
@@ -114,7 +117,7 @@ const createArrayValidation = rule => {
         resultErrors.push(null);
       }
 
-      if (validationResult.data) {
+      if (validationResult.data !== null && validationResult.data !== undefined) {
         resultData.push(validationResult.data);
       }
     });

package/lib/validators.js

@@ -3,12 +3,29 @@
 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, 'Error', null, e)
+    };
+  }
+};
+
+exports.custom = custom;
+
 const required = ({
   getMessage
 }) => value => value || typeof value === 'number' ? {
@@ -118,11 +135,18 @@ 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')
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "co.validation",
-  "version": "1.0.0-RC.6",
+  "version": "2.1.0",
   "description": "JSON based fluent validation for browser, node.js, redux-form and anything javascript compatible.",
   "main": "lib/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "keywords": [
     "validation"
   ],
-  "author": "collaboracia",
+  "author": "Collaboracia OÜ",
   "license": "ISC",
   "devDependencies": {
     "@babel/cli": "^7.4.4",