CHANGE array type validation by array field

Ryzii74 · Sep 12, 2016 · 1408a6c · 1408a6c
1 parent 2cbc336
commit 1408a6c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 35 deletions.
diff --git a/index.js b/index.js
@@ -40,6 +40,8 @@ function check(field, data, key) {
         }
     }
 
+    if (!Type(field, data, key)) return error(key, 'Wrong type of field!');
+
     if (field.array && data[key]) {
         var result = null;
 
@@ -51,8 +53,6 @@ function check(field, data, key) {
         if (result && !result.success) return error(key + '.' + i, result.error.text);
     }
 
-    if (!Type(field, data, key)) return error(key, 'Wrong type of field!');
-
     if (field.enum && field.enum.constructor && field.enum.constructor !== Array) return error(key, 'Wrong data for enum!');
     if (!Enum(field, data, key)) return error(key, 'Value is not part of enum!');
 

diff --git a/lib/type.js b/lib/type.js
@@ -1,12 +1,14 @@
 module.exports = function (field, data, key) {
-    if (field.type && data.hasOwnProperty(key)) {
+    if (!data.hasOwnProperty(key)) return true;
+
+    if (field.array) {
+        return data[key].constructor && data[key].constructor === Array;
+    }
+
+    if (field.type) {
         field.type = field.type.toLowerCase();
 
-        if (field.type === "array") {
-            if (data[key].constructor && data[key].constructor !== Array) return false;
-        } else {
-            if (typeof data[key] !== field.type) return false;
-        }
+        if (typeof data[key] !== field.type) return false;
     }
 
     return true;

diff --git a/test/array.js b/test/array.js
@@ -14,6 +14,23 @@ describe('Array', function() {
         expect(result.success).to.equal(true);
     });
 
+    it('field with array but not array type => error', function () {
+        var scheme = validator({
+            test : {
+                array : {
+                    type : "string"
+                }
+            }
+        });
+
+        var result = scheme.validate({ test : "123" });
+        expect(result).to.be.a("object");
+        expect(result.success).to.equal(false);
+        expect(result.error).to.be.a("object");
+        expect(result.error.key).to.equal("test");
+        expect(result.error.text).to.equal("Wrong type of field!");
+    });
+
     it('field with array and bad validation => error', function () {
         var scheme = validator({
             test : {

diff --git a/test/type.js b/test/type.js
@@ -29,21 +29,6 @@ describe('Type', function() {
         expect(result.error.text).to.equal("Wrong type of field!");
     });
 
-    it('field with type array and wrong type => error', function () {
-        var scheme = validator({
-            test : {
-                type : "array"
-            }
-        });
-
-        var result = scheme.validate({ test : {} });
-        expect(result).to.be.a("object");
-        expect(result.success).to.equal(false);
-        expect(result.error).to.be.a("object");
-        expect(result.error.key).to.equal("test");
-        expect(result.error.text).to.equal("Wrong type of field!");
-    });
-
     it('field with type and right type => success', function () {
         var scheme = validator({
             test : {
@@ -56,18 +41,6 @@ describe('Type', function() {
         expect(result.success).to.equal(true);
     });
 
-    it('field with type array and right type => success', function () {
-        var scheme = validator({
-            test : {
-                type : "array"
-            }
-        });
-
-        var result = scheme.validate({ test : [ {}, {} ] });
-        expect(result).to.be.a("object");
-        expect(result.success).to.equal(true);
-    });
-
     it('field type not case sensitive', function () {
         var scheme = validator({
             test : {