Merge pull request #51 from hckrnews/feature/add-url-validation

Add url and date validation
trojs · Nov 24, 2020 · bca39cd · bca39cd
2 parents c6c656e + 574bb19
commit bca39cd
Show file tree

Hide file tree

Showing 8 changed files with 11,509 additions and 1,570 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [10.x, 12.x, 14.x]
 
     steps:
     - uses: actions/checkout@v1

diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ node_js:
     - "10"
     - "12"
     - "14"
-    - "15"
 before_script:
     - npm run lint
     - npm run cpd

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hckrnews/validator",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "description": "Object validator",
     "main": "src/validator.js",
     "files": [
@@ -28,7 +28,7 @@
     "devDependencies": {
         "@babel/core": "^7.12.3",
         "@babel/preset-env": "^7.12.1",
-        "@hckrnews/eslint-config": "^0.2.0",
+        "@hckrnews/eslint-config": "^1.0.1",
         "babel-eslint": "^10.1.0",
         "babel-jest": "^25.5.1",
         "codecov": "^3.8.1",

diff --git a/src/schemas/company.js b/src/schemas/company.js
@@ -1,4 +1,4 @@
 export default {
     name: 'string',
-    '?website': 'string',
+    '?website': 'url',
 };
diff --git a/src/schemas/person.js b/src/schemas/person.js
@@ -4,6 +4,7 @@ import companySchema from './company';
 export default {
     name: String,
     age: Number,
+    birthDay: Date,
     siblings: Array,
     '?metaData': Object,
     active: Boolean,

diff --git a/src/validator.js b/src/validator.js
@@ -4,6 +4,8 @@ const types = {
     object: Object,
     number: Number,
     boolean: Boolean,
+    url: URL,
+    date: Date,
 };
 
 /**

diff --git a/tests/unit/validator.spec.js b/tests/unit/validator.spec.js
@@ -63,6 +63,7 @@ const testCases = [
         input: {
             name: 'James',
             age: 25,
+            birthDay: new Date('1982-12-24'),
             siblings: ['Johnnathan'],
             metaData: {},
             active: true,
@@ -73,7 +74,9 @@ const testCases = [
                 city: 'City',
                 country: 'Somewehere',
             },
-            companies: [{ name: 'Example', website: 'https://hckr.news' }],
+            companies: [
+                { name: 'Example', website: new URL('https://hckr.news') },
+            ],
         },
         schema: personSchema,
         expectedValue: true,
@@ -84,6 +87,7 @@ const testCases = [
         input: {
             name: 'James',
             age: 25,
+            birthDay: new Date('1982-12-24'),
             siblings: ['Johnnathan'],
             active: true,
             address: {
@@ -104,6 +108,7 @@ const testCases = [
         input: {
             name: 'James',
             age: 25,
+            birthDay: new Date('1982-12-24'),
             active: true,
         },
         schema: personSchema,
@@ -122,6 +127,7 @@ const testCases = [
         expectedErrors: [
             ['name', String],
             ['age', Number],
+            ['birthDay', Date],
             ['siblings', Array],
             ['?metaData', Object],
             ['active', Boolean],
@@ -150,6 +156,7 @@ const testCaseArrays = [
             {
                 name: 'James',
                 age: 25,
+                birthDay: new Date('1982-12-24'),
                 siblings: ['Johnnathan'],
                 active: true,
                 address: {
@@ -171,6 +178,7 @@ const testCaseArrays = [
             {
                 name: 'James',
                 age: 25,
+                birthDay: new Date('1982-12-24'),
                 active: true,
             },
         ],
@@ -183,6 +191,7 @@ const testCaseArrays = [
             {
                 name: 'James',
                 age: 25,
+                birthDay: new Date('1982-12-24'),
                 siblings: ['Johnnathan'],
                 active: true,
                 address: {
@@ -208,6 +217,7 @@ const testCaseArrays = [
         input: {
             name: 'James',
             age: 25,
+            birthDay: new Date('1982-12-24'),
             siblings: ['Johnnathan'],
             active: true,
             address: {