Format code with prettier

Author: larsvankleef

.prettierrc

@@ -0,0 +1,17 @@
+{
+  "arrowParens": "avoid",
+  "bracketSpacing": true,
+  "htmlWhitespaceSensitivity": "css",
+  "insertPragma": false,
+  "jsxBracketSameLine": false,
+  "jsxSingleQuote": false,
+  "printWidth": 80,
+  "proseWrap": "always",
+  "quoteProps": "as-needed",
+  "requirePragma": false,
+  "semi": false,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "all",
+  "useTabs": false
+}

README.md

@@ -7,8 +7,9 @@ const rules = {
   fields: {
     email: {
       validator: () => {
-        return email(value) && length(value, { max: 75 })
+        return length(value, { max: 75 }) && email(value)
       },
+      message: 'The given email address is invalid',
     },
     password: {
       validator: () => {

package.json

@@ -11,6 +11,7 @@
     "test:open": "open coverage/lcov-report/index.html"
   },
   "devDependencies": {
-    "jest": "^26.2.2"
+    "jest": "^26.2.2",
+    "prettier": "^2.0.5"
   }
 }

src/__tests__/validate.test.js

@@ -6,9 +6,13 @@ it('initializes', () => {
   const fields = {}
   const rules = {}
 
-  validate(fields, {
-    rules,
-  }, callback)
+  validate(
+    fields,
+    {
+      rules,
+    },
+    callback,
+  )
 })
 
 it('calls the correct validation checks and calls them with the current value', () => {
@@ -17,7 +21,7 @@ it('calls the correct validation checks and calls them with the current value',
 
   const fields = {
     email,
-    password
+    password,
   }
 
   const emailValidator = jest.fn(() => true)
@@ -26,12 +30,12 @@ it('calls the correct validation checks and calls them with the current value',
   const rules = {
     fields: {
       email: {
-        validator: emailValidator
+        validator: emailValidator,
       },
       password: {
-        validator: passwordValidator
-      }
-    }
+        validator: passwordValidator,
+      },
+    },
   }
 
   const { valid } = validate(fields, {
@@ -53,17 +57,18 @@ it('shows a message when a field is entered but there are no rules for it', () =
   const { valid, results } = validate(fields, {
     rules: {
       fields: {},
-    }
+    },
   })
 
-  const expected = [
-    {
-      field: 'email',
-      valid: false,
-      message: 'No validation rules for field email',
-    }
-  ]
-
   expect(valid).toEqual(false)
-  expect(results).toEqual(expected)
+  expect(results).toMatchInlineSnapshot(`
+    Array [
+      Object {
+        "field": "email",
+        "message": "No validation rules for field 'email'",
+        "valid": false,
+        "value": "[email protected]",
+      },
+    ]
+  `)
 })

src/validate.js

@@ -1,36 +1,48 @@
-function validate (fields, { rules }) {
+function validate(fields, { rules }) {
   if (isEmpty(fields)) {
     return { valid: false, results: [] }
   }
 
   const checked = []
 
-  Object.keys(fields).forEach((field) => {
+  Object.keys(fields).forEach(field => {
     const rule = rules.fields[field]
 
     if (!rule) {
-      checked.push({ field, valid: false, message: `No validation rules for field ${field}`})
+      checked.push({
+        field,
+        value: fields[field],
+        valid: false,
+        message: `No validation rules for field '${field}'`,
+      })
       return
     }
 
     if (rule.validator(fields[field])) {
-      checked.push({ field, valid: true, message: '' })
+      checked.push({ field, value: fields[field], valid: true, message: '' })
     } else {
-      checked.push({ field, valid: false, message: rules.fields[field].message || 'Validation failed for field' })
+      checked.push({
+        field,
+        value: fields[field],
+        valid: false,
+        message:
+          rules.fields[field].message ||
+          `Validation failed for field '${field}'`,
+      })
     }
   })
 
   return {
-    valid: checked.every((current) => current.valid === true),
-    results: checked
+    valid: checked.every(current => current.valid === true),
+    results: checked,
   }
 }
 
 function isEmpty(obj) {
-  return Object.keys(obj).length === 0;
+  return Object.keys(obj).length === 0
 }
 
 module.exports = {
   validate,
-  ...require('./validation/index.js')
+  ...require('./validation/index.js'),
 }

src/validation/__tests__/length.test.js

@@ -4,15 +4,15 @@ const string = 'string'
 
 it('checks for the length of a min value', () => {
   const result = length(string, {
-    min: 4
+    min: 4,
   })
 
   expect(result).toEqual(true)
 })
 
 it('checks for the length of a max value', () => {
   const result = length(string, {
-    max: 7
+    max: 7,
   })
 
   expect(result).toEqual(true)
@@ -37,7 +37,7 @@ it('returns false when the max length is not reached', () => {
 it('works with a min and a max value', () => {
   const result = length('strings', {
     min: 4,
-    max: 5
+    max: 5,
   })
 
   expect(result).toEqual(false)

src/validation/index.js

@@ -1,4 +1,4 @@
-function number (x, { max, min } = {}) {
+function number(x, { max, min } = {}) {
   if (min || max) {
     if (Number(x) === x) {
       if (x >= min && x <= max) return true
@@ -7,19 +7,19 @@ function number (x, { max, min } = {}) {
     }
   }
 
-  if (Number(x) === x && (min === undefined && max === undefined)) {
+  if (Number(x) === x && min === undefined && max === undefined) {
     return true
   }
 
   return false
 }
 
-function email (x) {
+function email(x) {
   const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
   return emailRegex.test(x)
 }
 
-function length (x, { min, max }) {
+function length(x, { min, max }) {
   const length = x.length
 
   if (length >= min && length <= max) return true

yarn.lock

@@ -2684,6 +2684,11 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
+prettier@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
+  integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
+
 pretty-format@^26.2.0:
   version "26.2.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.2.0.tgz#83ecc8d7de676ff224225055e72bd64821cec4f1"