@wmfs/json-to-vuelidate 1.22.1 → 1.24.0

package/CHANGELOG.md

@@ -1,3 +1,42 @@
+# [1.24.0](https://github.com/wmfs/json-to-vuelidate/compare/v1.23.0...v1.24.0) (2022-01-25)
+
+
+### 🛠 Builds
+
+* **deps-dev:** update dependency mocha to v9.1.4 ([656944c](https://github.com/wmfs/json-to-vuelidate/commit/656944c937c202d005de92dce768d377ff945a69))
+* **deps-dev:** update dependency mocha to v9.2.0 ([c2b27c8](https://github.com/wmfs/json-to-vuelidate/commit/c2b27c82651e0cb76427e34d9195edfc0251800a))
+* **deps-dev:** update dependency semantic-release to v19 ([3086076](https://github.com/wmfs/json-to-vuelidate/commit/30860760fd8db420b3a8ddc75b1618b72b089f1b))
+* **deps:** update dependency google-libphonenumber to v3.2.26 ([cfd1c95](https://github.com/wmfs/json-to-vuelidate/commit/cfd1c9581ddd32e847651ce639c925bb18aa7494))
+
+# [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)
 
 

package/lib/index.js

@@ -116,7 +116,7 @@ function parse (val, key) {
             return false
           }
 
-          return !mValue.isBefore(mMin)
+          return mMin.isBefore(mValue, 'day') || mMin.isSame(mValue, 'day')
         }
         break
       }
@@ -131,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.1",
+  "version": "1.24.0",
   "author": "West Midlands Fire Service",
   "keywords": [
     "tymly",
@@ -9,9 +9,9 @@
   ],
   "main": "./lib/index.js",
   "dependencies": {
-    "vuelidate": "0.7.6",
+    "vuelidate": "0.7.7",
     "lodash.template": "4.5.0",
-    "google-libphonenumber": "3.2.21",
+    "google-libphonenumber": "3.2.26",
     "moment": "2.29.1"
   },
   "devDependencies": {
@@ -21,12 +21,12 @@
     "codecov": "3.8.3",
     "conventional-changelog-metahub": "4.0.1",
     "cz-conventional-changelog": "3.3.0",
-    "mocha": "9.1.3",
+    "mocha": "9.2.0",
     "nyc": "15.1.0",
-    "semantic-release": "18.0.0",
+    "semantic-release": "19.0.2",
     "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

@@ -76,37 +76,29 @@ describe('Test the vuelidate converter', function () {
     expect(vuelidate.min3DaysAgo.minimumDate).to.be.a('function')
   })
 
-  it('test the validation function for minimum date', () => {
-    const fn = vuelidate.min3DaysAgo.minimumDate
-
-    const oneWeekAgo = moment().subtract(7, 'day')
-    const today = moment()
-    const tomorrow = moment().add(1, 'day')
-
-    const oneWeekAgoResult = fn(oneWeekAgo)
-    expect(oneWeekAgoResult).to.eql(false)
-
-    const todayResult = fn(today)
-    expect(todayResult).to.eql(true)
-
-    const tomorrowResult = fn(tomorrow)
-    expect(tomorrowResult).to.eql(true)
+  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))
+    }
   })
 
-  it('test the validation function for maximum date', () => {
-    const fn = vuelidate.dateOfBirth.maximumDate
-
-    const yesterday = moment().subtract(1, 'day')
-    const today = moment()
-    const tomorrow = moment().add(1, 'day')
-
-    const yesterdayResult = fn(yesterday)
-    expect(yesterdayResult).to.eql(true)
-
-    const todayResult = fn(today)
-    expect(todayResult).to.eql(false)
-
-    const tomorrowResult = fn(tomorrow)
-    expect(tomorrowResult).to.eql(false)
+  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))
+    }
   })
 })