Rewrite to support requird values

Author: larsvankleef

README.md

@@ -1,20 +1,25 @@
 # Validate
 
 ```js
-const { validate, email, length } = require('validate')
+const { validate, email, length, required } = require('validate')
 
 const rules = {
   fields: {
     email: {
-      validator: () => {
+      validator: (value) => {
         return length(value, { max: 75 }) && email(value)
       },
       message: 'The given email address is invalid',
     },
     password: {
-      validator: () => {
+      validator: (value) => {
         return length(value, { min: 18, max: 45 })
       },
+    },
+    subscription: {
+      validator: (value) => {
+        return required(value)
+      }
     }
   }
 }

src/__tests__/validate.test.js

@@ -1,18 +1,30 @@
-const { validate } = require('../validate')
+const { validate, email, length, required } = require('../validate')
 
-it('initializes', () => {
-  const callback = jest.fn()
+const defaultRules = {
+  fields: {
+    email: {
+      validator: (value) => {
+        return length(value, { max: 75 }) && email(value)
+      },
+      message: 'The given email address is invalid',
+    },
+    password: {
+      validator: (value) => {
+        return length(value, { min: 4, max: 18 })
+      },
+    },
+    subscription: {
+      validator: (value) => {
+        return required(value)
+      }
+    }
+  }
+}
 
+it('initializes', () => {
   const fields = {}
   const rules = {}
-
-  validate(
-    fields,
-    {
-      rules,
-    },
-    callback,
-  )
+  validate( fields, { rules, } )
 })
 
 it('calls the correct validation checks and calls them with the current value', () => {
@@ -49,26 +61,14 @@ it('calls the correct validation checks and calls them with the current value',
   expect(passwordValidator).toBeCalledWith(password)
 })
 
-it('shows a message when a field is entered but there are no rules for it', () => {
+it('uses the given rules to validate against the fields', () => {
   const fields = {
-    email: '[email protected]',
+    email: '[email protected]',
+    password: 'password',
+    subscription: true
   }
 
-  const { valid, results } = validate(fields, {
-    rules: {
-      fields: {},
-    },
-  })
-
-  expect(valid).toEqual(false)
-  expect(results).toMatchInlineSnapshot(`
-    Array [
-      Object {
-        "field": "email",
-        "message": "No validation rules for field 'email'",
-        "valid": false,
-        "value": "[email protected]",
-      },
-    ]
-  `)
+  const rules = defaultRules
+  const { valid } = validate( fields, { rules, } )
+  expect(valid).toEqual(true)
 })

src/validate.js

@@ -3,22 +3,17 @@ function validate(fields, { rules }) {
     return { valid: false, results: [] }
   }
 
+  if (isEmpty(rules.fields)) {
+    return { valid: false, results: [] }
+  }
+
   const checked = []
 
-  Object.keys(fields).forEach(field => {
+  Object.keys(rules.fields).forEach((field) => {
+    const value = fields[field]
     const rule = rules.fields[field]
 
-    if (!rule) {
-      checked.push({
-        field,
-        value: fields[field],
-        valid: false,
-        message: `No validation rules for field '${field}'`,
-      })
-      return
-    }
-
-    if (rule.validator(fields[field])) {
+    if (rule.validator(value)) {
       checked.push({ field, value: fields[field], valid: true, message: '' })
     } else {
       checked.push({

src/validation/__tests__/required.test.js

@@ -0,0 +1,13 @@
+const { required } = require('../index')
+
+it('validates that the value is not undefined or null', () => {
+  expect(required(null)).toEqual(false)
+  expect(required(undefined)).toEqual(false)
+})
+
+it('validates to true when a string, number boolean or object is given', () => {
+  expect(required({ test: true })).toEqual(true)
+  expect(required('test')).toEqual(true)
+  expect(required(10)).toEqual(true)
+  expect(required(false)).toEqual(true)
+})

src/validation/index.js

@@ -29,8 +29,13 @@ function length(x, { min, max }) {
   return false
 }
 
+function required(x) {
+  return x !== undefined && x !== null
+}
+
 module.exports = {
   email,
   length,
   number,
+  required
 }