fux optional multi rule

Author: icebob

CHANGELOG.md

@@ -1,3 +1,10 @@
+--------------------------------------------------
+<a name="1.0.0-beta3"></a>
+# 1.0.0-beta3 (2019-11-17)
+
+## Changes
+- fix optional multi rule.
+
 --------------------------------------------------
 <a name="1.0.0-beta2"></a>
 # 1.0.0-beta2 (2019-11-15)

lib/validator.js

@@ -272,6 +272,13 @@ class Validator {
 				type: "multi",
 				rules: schema
 			};
+
+			// Check 'optional' flag
+			const isOptional = schema.rules
+				.map(s => this.getRuleFromSchema(s))
+				.every(rule => rule.schema.optional == true);
+			if (isOptional)
+				schema.optional = true;
 		}
 
 		const ruleFunction = this.rules[schema.type];

test/integration.spec.js

@@ -340,6 +340,26 @@ describe("Test multiple rules", () => {
 		expect(res).toBe(true);
 	});
 
+	it("should work with optional (legacy)", () => {
+
+		let schemaOptional = {
+			a: [
+				{ type: "number", optional: true },
+				{ type: "string", optional: true },
+			]
+		};
+
+		let checkOptional = v.compile(schemaOptional);
+
+		expect(checkOptional({})).toBe(true);
+		expect(checkOptional({ a: 5 })).toBe(true);
+		expect(checkOptional({ a: "five" })).toBe(true);
+		expect(checkOptional({ a: false })).toEqual([
+			{ type: "number", field: "a", actual: false, message: "The 'a' field must be a number." },
+			{ type: "string", field: "a", actual: false, message: "The 'a' field must be a string." },
+		]);
+	});
+
 });
 
 describe("Test multiple rules with objects", () => {