Skipped format validation for allowed null values.

component.json

@@ -16,6 +16,7 @@
   "scripts": [
     "tv4.js",
     "lang/de.js",
+    "lang/es.js",
     "lang/fr.js",
     "lang/nb.js",
     "lang/pl-PL.js",

source/basic.js

@@ -3,6 +3,18 @@ ValidatorContext.prototype.validateBasic = function validateBasic(data, schema,
 	if (error = this.validateType(data, schema, dataPointerPath)) {
 		return error.prefixWith(null, "type");
 	}
+
+	var dataType = typeof data;
+	if (data === null) {
+		dataType = "null";
+	} else if (Array.isArray(data)) {
+		dataType = "array";
+	}
+
+	if (dataType === "null" || dataType === "undefined") {
+		return null;
+	}
+
 	if (error = this.validateEnum(data, schema, dataPointerPath)) {
 		return error.prefixWith(null, "type");
 	}

source/object.js

@@ -35,7 +35,7 @@ ValidatorContext.prototype.validateObjectRequiredProperties = function validateO
 	if (schema.required !== undefined) {
 		for (var i = 0; i < schema.required.length; i++) {
 			var key = schema.required[i];
-			if (data[key] === undefined) {
+			if (data[key] === undefined || data[key] === null) {
 				var error = this.createError(ErrorCodes.OBJECT_REQUIRED, {key: key}, '', '/required/' + i, null, data, schema);
 				if (this.handleError(error)) {
 					return error;

source/validate.js

@@ -316,6 +316,15 @@ ValidatorContext.prototype.validateAll = function (data, schema, dataPathParts,
 	return this.handleError(error);
 };
 ValidatorContext.prototype.validateFormat = function (data, schema) {
+	var allowedTypes = schema.type;
+	if (!Array.isArray(allowedTypes)) {
+		allowedTypes = [allowedTypes];
+	}
+
+	if (data === null && allowedTypes.indexOf('null') !== -1) {
+		return null;
+	}
+
 	if (typeof schema.format !== 'string' || !this.formatValidators[schema.format]) {
 		return null;
 	}

test/tests/11 - format/01 - register validator.js

@@ -58,4 +58,43 @@ describe("Registering custom validator", function () {
 		assert.isFalse(result2.valid);
 		assert.includes(result2.error.message, 'break 2');
 	});
+
+	it("Custom validator should be skipped for null values", function () {
+		tv4.addFormat('null-format', function (data) {
+			if (data !== "test") {
+				return "string does not match";
+			}
+		});
+
+		var schema = {type: ["string", "null"], format: 'null-format'};
+		var data1 = "test";
+		var data2 = null;
+
+		assert.isTrue(tv4.validate(data1, schema));
+		assert.isTrue(tv4.validate(data2, schema));
+	});
+
+	it("Validator should be skipped for null (undefined) enum values", function () {
+		var schema = {
+			"type": "object",
+			"properties": {
+				"a": {
+					type: "string"
+				},
+				"b": {
+					"type": ["string", "null"],
+					"enum": ['one', 'two', 'three']
+				}
+			}
+		};
+		var data1 = {a: "something", b: "test"};
+		var data2 = {a: "something", b: "one"};
+		var data3 = {a: "something", b: null};
+		var data4 = {a: "something"};
+
+		assert.isFalse(tv4.validate(data1, schema));
+		assert.isTrue(tv4.validate(data2, schema));
+		assert.isTrue(tv4.validate(data3, schema));
+		assert.isTrue(tv4.validate(data4, schema));
+	});
 });

test/tests/Misc/enum null failure.js

@@ -6,16 +6,21 @@ describe("Enum object/null failure", function () {
 			"type": "object",
 			"required": ["value"],
 			"properties": {
+				"key": {
+					"type": "string"
+				},
 				"value": {
 					"enum": [6, "foo", [], true, {"foo": 12}]
 				}
 			}
 		};
 
-		var data = {value: null}; // Somehow this is only a problem when a *property* is null, not the root
-
+		var data = {key: "test", value: null}; // Somehow this is only a problem when a *property* is null, not the root
 		var result = tv4.validateMultiple(data, schema);
-
+		assert.isFalse(result.valid, 'validateMultiple() should return invalid');
+
+		data = {key: "test"}; // Undefined required property.
+		result = tv4.validateMultiple(data, schema);
 		assert.isFalse(result.valid, 'validateMultiple() should return invalid');
 	});
 });