@wmfs/json-to-vuelidate 1.22.0 → 1.23.0

package/CHANGELOG.md

@@ -1,3 +1,49 @@
+# [1.23.0](https://github.com/wmfs/json-to-vuelidate/compare/v1.22.3...v1.23.0) (2021-12-09)
+
+
+### 🛠 Builds
+
+* **deps-dev:** update dependency semantic-release to v18.0.1 ([4fed5c6](https://github.com/wmfs/json-to-vuelidate/commit/4fed5c6439b66e3de4d339f30954dcc9edb149ac))
+* **deps-dev:** update semantic-release monorepo ([8ca62db](https://github.com/wmfs/json-to-vuelidate/commit/8ca62dbb892ff384edb65ee1936f82e324a851bb))
+* **deps:** update dependency vuelidate to v0.7.7 ([aedd1af](https://github.com/wmfs/json-to-vuelidate/commit/aedd1af0bf754447ec98f35eaf09904cb0576e9d))
+
+
+### 🚨 Tests
+
+* better labels for comparing min/max dates ([ccc5f43](https://github.com/wmfs/json-to-vuelidate/commit/ccc5f434c4ae9142ade2c7c62db7bf65a8915df9))
+* enhance tests for min/max dates ([72ea867](https://github.com/wmfs/json-to-vuelidate/commit/72ea867adeaf4487927b33ae50fe894c6c030bb7))
+
+## [1.22.3](https://github.com/wmfs/json-to-vuelidate/compare/v1.22.2...v1.22.3) (2021-10-27)
+
+
+### 🐛 Bug Fixes
+
+* compare dates to be inclusive and precise to the day ([10fb6aa](https://github.com/wmfs/json-to-vuelidate/commit/10fb6aa3e512704d40915f6591a4000368bff49c))
+
+## [1.22.2](https://github.com/wmfs/json-to-vuelidate/compare/v1.22.1...v1.22.2) (2021-10-27)
+
+
+### 🐛 Bug Fixes
+
+* simpler logic of comparing min/max dates ([f1d1a2e](https://github.com/wmfs/json-to-vuelidate/commit/f1d1a2e632858f631a4f6785ea2ce6398da6c505))
+
+## [1.22.1](https://github.com/wmfs/json-to-vuelidate/compare/v1.22.0...v1.22.1) (2021-10-18)
+
+
+### 🐛 Bug Fixes
+
+* if undefined then return true because nothing to validate ([a49a51c](https://github.com/wmfs/json-to-vuelidate/commit/a49a51ce8a70bbcd6373b0ef51f205a1605ea3ac))
+
+
+### 📦 Code Refactoring
+
+* simplify re-used functions ([9661070](https://github.com/wmfs/json-to-vuelidate/commit/96610707dfa9323391dfd60a8c73a9fe602148ce))
+
+
+### 🚨 Tests
+
+* add tests for min/max date validations ([c33de28](https://github.com/wmfs/json-to-vuelidate/commit/c33de2858257bcf6b2e37c3a72220fe765a8b2ef))
+
 # [1.22.0](https://github.com/wmfs/json-to-vuelidate/compare/v1.21.0...v1.22.0) (2021-10-18)
 
 

package/lib/index.js

@@ -2,6 +2,8 @@ const validators = require('vuelidate/lib/validators')
 const template = require('lodash.template')
 const phoneUtil = require('google-libphonenumber').PhoneNumberUtil.getInstance()
 const moment = require('moment')
+const isNotDefined = value => value === undefined || value === null || value === ''
+const parseTemplate = (_template, data) => template(_template)(data)
 
 module.exports = function (json) {
   const result = {}
@@ -80,14 +82,11 @@ function parse (val, key) {
         }
         break
       case 'required':
-        if (attributeValue) {
-          result.required = validators.required
-        }
+        if (attributeValue) result.required = validators.required
         break
       case 'requiredIf':
         result.requiredIf = validators.requiredIf(function () {
-          const compiled = template('${' + attributeValue + '}')
-          const result = compiled(this)
+          const result = parseTemplate('${' + attributeValue + '}', this)
           return result === 'true'
         })
         break
@@ -99,21 +98,16 @@ function parse (val, key) {
         break
       case 'maximum.$':
         result.maximum = function (value) {
-          if (value === undefined || value === null || value === '') {
-            return false
-          }
+          if (isNotDefined(value)) return true
 
-          const compiled = template('${' + attributeValue + '}')
-          const result = compiled(this)
+          const result = parseTemplate('${' + attributeValue + '}', this)
 
           return value <= +result
         }
         break
       case 'minimumDate': {
         result.minimumDate = function (value) {
-          if (value === undefined || value === null || value === '') {
-            return false
-          }
+          if (isNotDefined(value)) return true
 
           const mValue = moment(value)
           const mMin = moment(attributeValue)
@@ -122,15 +116,13 @@ function parse (val, key) {
             return false
           }
 
-          return !mValue.isBefore(mMin)
+          return mMin.isBefore(mValue, 'day') || mMin.isSame(mValue, 'day')
         }
         break
       }
       case 'maximumDate': {
         result.maximumDate = function (value) {
-          if (value === undefined || value === null || value === '') {
-            return false
-          }
+          if (isNotDefined(value)) return true
 
           const mValue = moment(value)
           const mMax = moment(attributeValue)
@@ -139,7 +131,7 @@ function parse (val, key) {
             return false
           }
 
-          return !mValue.isAfter(mMax)
+          return mValue.isBefore(mMax, 'day') || mValue.isSame(mMax, 'day')
         }
         break
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wmfs/json-to-vuelidate",
   "description": "Takes in a JSON object and products an object of vuelidate expressions.",
-  "version": "1.22.0",
+  "version": "1.23.0",
   "author": "West Midlands Fire Service",
   "keywords": [
     "tymly",
@@ -9,7 +9,7 @@
   ],
   "main": "./lib/index.js",
   "dependencies": {
-    "vuelidate": "0.7.6",
+    "vuelidate": "0.7.7",
     "lodash.template": "4.5.0",
     "google-libphonenumber": "3.2.21",
     "moment": "2.29.1"
@@ -23,10 +23,10 @@
     "cz-conventional-changelog": "3.3.0",
     "mocha": "9.1.3",
     "nyc": "15.1.0",
-    "semantic-release": "18.0.0",
+    "semantic-release": "18.0.1",
     "standard": "16.0.4",
-    "@semantic-release/changelog": "6.0.0",
-    "@semantic-release/git": "10.0.0"
+    "@semantic-release/changelog": "6.0.1",
+    "@semantic-release/git": "10.0.1"
   },
   "scripts": {
     "lint": "standard",

package/test/test.js

@@ -2,6 +2,7 @@
 
 const converter = require('./../lib/')
 const expect = require('chai').expect
+const moment = require('moment')
 
 const JSON = {
   numberBetween5And10: {
@@ -36,12 +37,20 @@ const JSON = {
         required: true
       }
     }
+  },
+  dateOfBirth: {
+    maximumDate: new Date()
+  },
+  min3DaysAgo: {
+    minimumDate: moment().subtract(3, 'days').format('YYYY/MM/DD')
   }
 }
 
 describe('Test the vuelidate converter', function () {
+  let vuelidate
+
   it('Convert some JSON', () => {
-    const vuelidate = converter(JSON)
+    vuelidate = converter(JSON)
 
     console.log('\n------\n', vuelidate)
     expect(vuelidate.numberBetween5And10.between).to.be.a('function')
@@ -61,5 +70,35 @@ describe('Test the vuelidate converter', function () {
 
     expect(vuelidate.list.required).to.be.a('function')
     expect(vuelidate.apiLookup.params.apiLookupList.required).to.be.a('function')
+
+    expect(vuelidate.dateOfBirth.maximumDate).to.be.a('function')
+
+    expect(vuelidate.min3DaysAgo.minimumDate).to.be.a('function')
+  })
+
+  const dates = [
+    ['1 year ago', moment().subtract(1, 'year'), false, true],
+    ['7 days ago', moment().subtract(7, 'day'), false, true],
+    ['4 days ago', moment().subtract(4, 'day'), false, true],
+    ['3 days ago', moment().subtract(3, 'day'), true, true],
+    ['yesterday', moment().subtract(1, 'day'), true, true],
+    ['today', moment(), true, true],
+    ['tomorrow', moment().add(1, 'day'), true, false],
+    ['3 days ahead', moment().add(3, 'day'), true, false],
+    ['4 days ahead', moment().add(4, 'day'), true, false],
+    ['7 days ahead', moment().add(7, 'day'), true, false],
+    ['1 year ahead', moment().add(1, 'year'), true, false]
+  ]
+
+  describe('Test the validation function for minimum date', () => {
+    for (const [label, date, minResult] of dates) {
+      it(`${label}, should${minResult ? '' : ' not'} be after 3 days ago`, () => expect(vuelidate.min3DaysAgo.minimumDate(date)).to.eql(minResult))
+    }
+  })
+
+  describe('Test the validation function for maximum date', () => {
+    for (const [label, date, , maxResult] of dates) {
+      it(`${label}, should${maxResult ? '' : ' not'} be before today`, () => expect(vuelidate.dateOfBirth.maximumDate(date)).to.eql(maxResult))
+    }
   })
 })