@wmfs/json-to-vuelidate 1.21.0 → 1.22.3

package/CHANGELOG.md

@@ -1,3 +1,67 @@
+## [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)
+
+
+### ✨ Features
+
+* accept minimum date and maximum date conditions ([0874fb9](https://github.com/wmfs/json-to-vuelidate/commit/0874fb9682a06144a1de800f005454978967efd2))
+
+
+### 🛠 Builds
+
+* **deps-dev:** bump codecov from 3.8.2 to 3.8.3 ([bdc99f5](https://github.com/wmfs/json-to-vuelidate/commit/bdc99f5a494fdc73a0cc5d2af3342cd9823e28aa))
+* **deps-dev:** bump mocha from 9.0.0 to 9.0.1 ([ce3af3a](https://github.com/wmfs/json-to-vuelidate/commit/ce3af3a91fade4eb31e52c22102a71cf51b87765))
+* **deps-dev:** bump mocha from 9.0.1 to 9.0.2 ([98f1a0b](https://github.com/wmfs/json-to-vuelidate/commit/98f1a0baa7ef8df39d29757302143670dd770166))
+* **deps-dev:** bump mocha from 9.0.2 to 9.0.3 ([0606aa5](https://github.com/wmfs/json-to-vuelidate/commit/0606aa50207b52089d426405211a88cbe1167bb5))
+* **deps-dev:** bump semantic-release from 17.4.3 to 17.4.4 ([8a194a7](https://github.com/wmfs/json-to-vuelidate/commit/8a194a70ecc1637240ee8b43b3453520ef736bd7))
+* **deps-dev:** update dependency [@semantic-release](https://github.com/semantic-release)/changelog to v6 ([8316cdd](https://github.com/wmfs/json-to-vuelidate/commit/8316cdd04dc1236caa185265404eccdc20322ef1))
+* **deps-dev:** update dependency [@semantic-release](https://github.com/semantic-release)/git to v10 ([0a1054d](https://github.com/wmfs/json-to-vuelidate/commit/0a1054dbee6e78bc82f3832405ed15c84e04411f))
+* **deps-dev:** update dependency [@semantic-release](https://github.com/semantic-release)/git to v9.0.1 ([4d3bd51](https://github.com/wmfs/json-to-vuelidate/commit/4d3bd51d14c098e41753c8012fde303922cf545e))
+* **deps-dev:** update dependency mocha to v9.1.0 ([64f713c](https://github.com/wmfs/json-to-vuelidate/commit/64f713c629a0ae2b6210a2a3c00f71b1fe5c0381))
+* **deps-dev:** update dependency mocha to v9.1.1 ([399a620](https://github.com/wmfs/json-to-vuelidate/commit/399a620afc572bc0687b3610f406e536211a3dbd))
+* **deps-dev:** update dependency mocha to v9.1.2 ([1cdd405](https://github.com/wmfs/json-to-vuelidate/commit/1cdd40586cfbac2161daaea34cb27af2012f8725))
+* **deps-dev:** update dependency mocha to v9.1.3 ([ba794f5](https://github.com/wmfs/json-to-vuelidate/commit/ba794f5f4f4116e348829972fb4c0bf163a652e1))
+* **deps-dev:** update dependency semantic-release to v17.4.5 ([1a092e0](https://github.com/wmfs/json-to-vuelidate/commit/1a092e0c2459fdeb9324f3d486cae3e45cc1786b))
+* **deps-dev:** update dependency semantic-release to v17.4.6 ([01c56c7](https://github.com/wmfs/json-to-vuelidate/commit/01c56c759d4d59adbac5e83463a84a22a4b9db3e))
+* **deps-dev:** update dependency semantic-release to v17.4.7 ([7775707](https://github.com/wmfs/json-to-vuelidate/commit/777570759878e478d1d48af64303b6ab4c5b119d))
+* **deps-dev:** update dependency semantic-release to v18 ([9becb66](https://github.com/wmfs/json-to-vuelidate/commit/9becb66e3fb1a869d852381ace22cd3a89e03877))
+* **deps-dev:** update dependency standard to v16.0.4 ([e669ec4](https://github.com/wmfs/json-to-vuelidate/commit/e669ec48703797c6db5fd3b59721e74b580efc5d))
+
+
+### ♻️ Chores
+
+* add renovate config [ch6600] ([59769a7](https://github.com/wmfs/json-to-vuelidate/commit/59769a781465e1c3afc681f2a6bb3260c5794b30))
+
 # [1.21.0](https://github.com/wmfs/json-to-vuelidate/compare/v1.20.1...v1.21.0) (2021-06-08)
 
 

package/lib/index.js

@@ -1,6 +1,9 @@
 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 = {}
@@ -79,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
@@ -98,16 +98,43 @@ function parse (val, key) {
         break
       case 'maximum.$':
         result.maximum = function (value) {
-          if (value === undefined || value === null || value === '') {
+          if (isNotDefined(value)) return true
+
+          const result = parseTemplate('${' + attributeValue + '}', this)
+
+          return value <= +result
+        }
+        break
+      case 'minimumDate': {
+        result.minimumDate = function (value) {
+          if (isNotDefined(value)) return true
+
+          const mValue = moment(value)
+          const mMin = moment(attributeValue)
+
+          if (!mValue || !mValue.isValid() || !mMin || !mMin.isValid()) {
             return false
           }
 
-          const compiled = template('${' + attributeValue + '}')
-          const result = compiled(this)
+          return mMin.isBefore(mValue, 'day') || mMin.isSame(mValue, 'day')
+        }
+        break
+      }
+      case 'maximumDate': {
+        result.maximumDate = function (value) {
+          if (isNotDefined(value)) return true
 
-          return value <= +result
+          const mValue = moment(value)
+          const mMax = moment(attributeValue)
+
+          if (!mValue || !mValue.isValid() || !mMax || !mMax.isValid()) {
+            return false
+          }
+
+          return mValue.isBefore(mMax, 'day') || mValue.isSame(mMax, 'day')
         }
         break
+      }
       case 'minLength':
         result.minLength = validators.minLength(attributeValue)
         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.21.0",
+  "version": "1.22.3",
   "author": "West Midlands Fire Service",
   "keywords": [
     "tymly",
@@ -11,21 +11,22 @@
   "dependencies": {
     "vuelidate": "0.7.6",
     "lodash.template": "4.5.0",
-    "google-libphonenumber": "3.2.21"
+    "google-libphonenumber": "3.2.21",
+    "moment": "2.29.1"
   },
   "devDependencies": {
     "babel-register": "6.26.0",
     "babel-preset-env": "1.7.0",
     "chai": "4.3.4",
-    "codecov": "3.8.2",
+    "codecov": "3.8.3",
     "conventional-changelog-metahub": "4.0.1",
     "cz-conventional-changelog": "3.3.0",
-    "mocha": "9.0.0",
+    "mocha": "9.1.3",
     "nyc": "15.1.0",
-    "semantic-release": "17.4.3",
-    "standard": "16.0.3",
-    "@semantic-release/changelog": "5.0.1",
-    "@semantic-release/git": "9.0.0"
+    "semantic-release": "18.0.0",
+    "standard": "16.0.4",
+    "@semantic-release/changelog": "6.0.0",
+    "@semantic-release/git": "10.0.0"
   },
   "scripts": {
     "lint": "standard",

package/renovate.json

@@ -0,0 +1,26 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "dependencyDashboard": true,
+  "enabledManagers": ["npm"],
+  "packageRules": [
+    {
+      "matchDepTypes": ["devDependencies"],
+      "automerge": true,
+      "semanticCommitType": "build",
+      "semanticCommitScope": "deps-dev",
+      "labels": ["devDependencies"]
+    },
+    {
+      "matchDepTypes": ["dependencies"],
+      "semanticCommitType": "build",
+      "semanticCommitScope": "deps",
+      "labels": ["dependencies"],
+      "reviewers": ["team:tymly-reviewers"]
+    }
+  ],
+    "vulnerabilityAlerts": {
+    "labels": ["security"]
+  }
+}

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,47 @@ 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')
+  })
+
+  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 threeDaysAgo = moment().subtract(3, 'days')
+
+    const oneWeekAgoResult = fn(oneWeekAgo)
+    expect(oneWeekAgoResult).to.eql(false)
+
+    const threeDaysAgoResult = fn(threeDaysAgo)
+    expect(threeDaysAgoResult).to.eql(true)
+
+    const todayResult = fn(today)
+    expect(todayResult).to.eql(true)
+
+    const tomorrowResult = fn(tomorrow)
+    expect(tomorrowResult).to.eql(true)
+  })
+
+  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(true)
+
+    const tomorrowResult = fn(tomorrow)
+    expect(tomorrowResult).to.eql(false)
   })
 })