Merge pull request #1 from hckrnews/feature/validate-sub-arrays

Validate sub array's

README.md

@@ -68,10 +68,36 @@ const personSchema = {
         postalCode: "string",
         city: "string",
         country: "string"
+    },
+    companies:  {
+        name: "string",
+        website: "?string"
     }
 };
 ```
 
+Example valid data for the person schema:
+```javascript
+const personObj = {
+    name: "James",
+    age: 25,
+    siblings: ["Johnnathan"],
+    metaData: {},
+    active: true,
+    address: {
+        street: "Streetname",
+        number: 1,
+        postalCode: "1234AB",
+        city: "City",
+        country: "Somewehere"
+    },
+    companies: [
+        { name: "Example company 1", website: "https://hckr.news" }
+        { name: "Example company 2" }
+    ]
+}
+```
+
 Available types:
 * string
 * array

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hckrnews/validator",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "description": "Object validator",
     "main": "src/validator.js",
     "files": [
@@ -14,17 +14,17 @@
     },
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/w3nl/validator.git"
+        "url": "git+https://github.com/hckrnews/validator.git"
     },
     "author": {
         "name": "Pieter Wigboldus",
         "url": "https://hckr.news/"
     },
     "license": "AGPL-3.0",
     "bugs": {
-        "url": "https://github.com/w3nl/validator/issues"
+        "url": "https://github.com/hckrnews/validator/issues"
     },
-    "homepage": "https://github.com/w3nl/validator#readme",
+    "homepage": "https://github.com/hckrnews/validator#readme",
     "devDependencies": {
         "@babel/core": "^7.8.4",
         "@babel/preset-env": "^7.8.4",

src/schemas/company.js

@@ -0,0 +1,4 @@
+export default {
+    name: "string",
+    website: "?string"
+};

src/schemas/person.js

@@ -1,10 +1,12 @@
 import addressSchema from "./address.js";
+import companySchema from "./company.js";
 
 export default {
     name: "string",
     age: "number",
     siblings: "array",
     metaData: "?object",
     active: "boolean",
-    address: addressSchema
+    address: addressSchema,
+    companies: companySchema
 };

src/validator.js

@@ -53,9 +53,17 @@ export class Validator {
                 }
 
                 if (!types.hasOwnProperty(fieldType)) {
-                    const validator = new Validator(fieldType);
+                    if (value.constructor == Array) {
+                        return value.every(item => {
+                            const validator = new Validator(fieldType);
 
-                    return validator.validate(value);
+                            return validator.validate(item);
+                        });
+                    } else {
+                        const validator = new Validator(fieldType);
+
+                        return validator.validate(value);
+                    }
                 }
 
                 const type = types[fieldType];

tests/unit/validator.spec.js

@@ -66,7 +66,8 @@ const testCases = [
                 postalCode: "1234AB",
                 city: "City",
                 country: "Somewehere"
-            }
+            },
+            companies: [{ name: "Example", website: "https://hckr.news" }]
         },
         schema: personSchema,
         expectedValue: true
@@ -84,7 +85,8 @@ const testCases = [
                 postalCode: "1234AB",
                 city: "City",
                 country: "Somewehere"
-            }
+            },
+            companies: [{ name: "Example 1" }, { name: "Example 2" }]
         },
         schema: personSchema,
         expectedValue: true