Move typeof check earlier to also fix enums with undefined data

geraintluff · Dec 7, 2015 · 2b60d74 · 2b60d74
1 parent 83cffaa
commit 2b60d74
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/source/basic.js b/source/basic.js
@@ -1,4 +1,7 @@
 ValidatorContext.prototype.validateBasic = function validateBasic(data, schema, dataPointerPath) {
+        if (typeof data === "undefined") {
+                return null;
+        }
 	var error;
 	if (error = this.validateType(data, schema, dataPointerPath)) {
 		return error.prefixWith(null, "type");
@@ -14,9 +17,6 @@ ValidatorContext.prototype.validateType = function validateType(data, schema) {
 		return null;
 	}
 	var dataType = typeof data;
-	if (dataType === "undefined") {
-		return null;
-	}
 	if (data === null) {
 		dataType = "null";
 	} else if (Array.isArray(data)) {

diff --git a/test/all_concat.js b/test/all_concat.js
diff --git a/tv4.js b/tv4.js
@@ -717,6 +717,9 @@ function recursiveCompare(A, B) {
 }
 
 ValidatorContext.prototype.validateBasic = function validateBasic(data, schema, dataPointerPath) {
+        if (typeof data === "undefined") {
+                return null;
+        }
 	var error;
 	if (error = this.validateType(data, schema, dataPointerPath)) {
 		return error.prefixWith(null, "type");
@@ -732,9 +735,6 @@ ValidatorContext.prototype.validateType = function validateType(data, schema) {
 		return null;
 	}
 	var dataType = typeof data;
-	if (dataType === "undefined") {
-		return null;
-	}
 	if (data === null) {
 		dataType = "null";
 	} else if (Array.isArray(data)) {