Merge branch 'master' into pr/avanelli/304

Author: icebob

.vscode/launch.json

@@ -8,7 +8,7 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Launch dev",
-			"program": "${workspaceRoot}\\examples\\async.js"
+			"program": "${workspaceRoot}\\examples\\issue-303.js"
 		},
 		{
 			"type": "node",

examples/issue-303.js

@@ -0,0 +1,20 @@
+const Validator = require("../index");
+
+const v = new Validator({
+	debug: true,
+	useNewCustomCheckerFunction: true,
+});
+
+const schema = {
+	dateString: [
+		{ type: "string", nullable: true },
+		{ type: "boolean", nullable: true }
+	]
+};
+
+check = v.compile(schema);
+
+console.log("Boolean:", check({ dateString: true })); // Valid
+console.log("Date:", check({ dateString: new Date().toISOString() })); // Valid
+console.log("Null:", check({ dateString: null })); // Fail
+

lib/validator.js

@@ -500,6 +500,13 @@ class Validator {
 				.every(rule => rule.schema.optional === true);
 			if (isOptional)
 				schema.optional = true;
+
+			// Check 'nullable' flag
+			const isNullable = schema.rules
+				.map(s => this.getRuleFromSchema(s))
+				.every(rule => rule.schema.nullable === true);
+			if (isNullable)
+				schema.nullable = true;
 		}
 
 		if (schema.$$type) {

package-lock.json

@@ -5,7 +5,7 @@ const v = new Validator();
 
 describe("Test rule: currency", () => {
 	it("should have decimal optional, and correctly placed if present", () => {
-		const check = v.compile({$$root: true, type: "currency", 'currencySymbol': '$', 'symbolOptional': true});
+		const check = v.compile({$$root: true, type: "currency", "currencySymbol": "$", "symbolOptional": true});
 		expect(check("$12.2")).toEqual(true);
 		expect(check("$12,222.2")).toEqual(true);
 		expect(check("$12,222")).toEqual(true);
@@ -14,7 +14,7 @@ describe("Test rule: currency", () => {
 	});
 
 	it("should check thousand separator placement is correct", () => {
-		const check = v.compile({$$root: true, type: "currency", 'currencySymbol': '$', 'symbolOptional': true});
+		const check = v.compile({$$root: true, type: "currency", "currencySymbol": "$", "symbolOptional": true});
 		expect(check("$12.2")).toEqual(true);
 		expect(check("$12,222.2")).toEqual(true);
 		expect(check("$122,222.2")).toEqual(true);
@@ -29,36 +29,36 @@ describe("Test rule: currency", () => {
 	});
 
 	it("should not allow any other currency symbol, other than supplied in schema", () => {
-		let check = v.compile({$$root: true, type: "currency", 'currencySymbol': '$', 'symbolOptional': false});
+		let check = v.compile({$$root: true, type: "currency", "currencySymbol": "$", "symbolOptional": false});
 		expect(check("$12.2")).toEqual(true);
 		expect(check("#12.2")).toEqual([{"actual": "#12.2", "field": undefined, "message": "The '' must be a valid currency format", "type": "currency"}]);
 	});
 
 	it("should keep currency symbol optional, if symbolOptional is true in schema", () => {
-		let check = v.compile({$$root: true, type: "currency", 'currencySymbol': '$', 'symbolOptional': true});
+		let check = v.compile({$$root: true, type: "currency", "currencySymbol": "$", "symbolOptional": true});
 		expect(check("$12.2")).toEqual(true);
 		expect(check("12.2")).toEqual(true);
 		expect(check("#12.2")).toEqual([{"actual": "#12.2", "field": undefined, "message": "The '' must be a valid currency format", "type": "currency"}]
 		);
 	});
 
 	it("should allow negative currencies", () => {
-		let check = v.compile({$$root: true, type: "currency", 'currencySymbol': '$', 'symbolOptional': true});
+		let check = v.compile({$$root: true, type: "currency", "currencySymbol": "$", "symbolOptional": true});
 		expect(check("-12.2")).toEqual(true);
 		expect(check("$-12.2")).toEqual(true);
 		expect(check("-$12.2")).toEqual(true);
 		expect(check("-$-12.2")).toEqual([{"actual": "-$-12.2", "field": undefined, "message": "The '' must be a valid currency format", "type": "currency"}]);
 	});
 
 	it("should work correctly with supplied thousand and decimal separator", () => {
-		let check = v.compile({$$root: true, type: "currency", 'currencySymbol': '$', 'symbolOptional': true, 'thousandSeparator':'.', 'decimalSeparator':','});
+		let check = v.compile({$$root: true, type: "currency", "currencySymbol": "$", "symbolOptional": true, "thousandSeparator":".", "decimalSeparator":","});
 		expect(check("$12,2")).toEqual(true);
 		expect(check("$12.222")).toEqual(true);
 		expect(check("$12.222,2")).toEqual(true);
 		expect(check("$12,222.2")).toEqual([{"actual": "$12,222.2", "field": undefined, "message": "The '' must be a valid currency format", "type": "currency"}]);
 	});
 	it("should work correctly with supplied regex pattern", () => {
-		let check = v.compile({$$root: true, type: "currency", 'customRegex': /123/g});
+		let check = v.compile({$$root: true, type: "currency", "customRegex": /123/g});
 		expect(check("123")).toEqual(true);
 		expect(check("134")).toEqual([{"actual": "134", "field": undefined, "message": "The '' must be a valid currency format", "type": "currency"}]);
 	});

test/rules/currency.spec.js

@@ -99,6 +99,21 @@ describe("Test rule: multi", () => {
 
 			expect(check({ address: "London", age: "22", name: "John", surname: "Doe" })).toEqual([{"type":"number","message":"The 'age' field must be a number.","field":"age","actual":"22"},{"type":"objectStrict","message":"The object '' contains forbidden keys: 'address'.","expected":"age, name, surname","actual":"address"}] );
 		});
+
+		it("issue #303 (nullable with shorthard format)", () => {
+			const v = new Validator();
+			const check = v.compile({
+				dateString: [
+					{ type: "string", nullable: true },
+					{ type: "boolean", nullable: true }
+				]
+			});
+
+			expect(check({ dateString: true })).toBe(true);
+			expect(check({ dateString: new Date().toISOString() })).toBe(true);
+			expect(check({ dateString: null })).toBe(true);
+			expect(check({})).toEqual([{"type":"required","message":"The 'dateString' field is required.","field":"dateString","actual":undefined}] );
+		});
 	});
 
 	describe("should work with custom validator", () => {

test/rules/multi.spec.js

@@ -36,7 +36,7 @@ describe("Test rule: number", () => {
 		expect(check(5)).toEqual(true);
 		expect(check(8)).toEqual(true);
 
-		expect(v.validate(-1, { $$root: true, type: "number", min: 0})).toEqual([{actual: -1, expected: 0, field: undefined, message: "The '' field must be greater than or equal to 0.", type: 'numberMin'}]);
+		expect(v.validate(-1, { $$root: true, type: "number", min: 0})).toEqual([{actual: -1, expected: 0, field: undefined, message: "The '' field must be greater than or equal to 0.", type: "numberMin"}]);
 	});
 
 	it("check max", () => {