fix #27

Author: icebob

lib/validator.js

@@ -184,55 +184,61 @@ Validator.prototype._checkWrapper = function(rules, isMultipleRules) {
 			}
 
 			// Check required fields
-			if ((value === undefined || value === null) && check.type !== "forbidden") {
-				if (schema.optional !== true && !Array.isArray(schema)) {
+			if ((value === undefined || value === null)) {
+				if (check.type === "forbidden")
+					continue;
+
+				if (schema.optional === true)
+					continue;
+
+				if (!Array.isArray(schema)) {
 					self.handleResult(errors, stack, self.makeError("required"));
-				} else
 					continue;
+				}
 
-			} else {
-				// Call the checker function
-				if (check.iterate) {
-					let errorInCurrentArray = false;
-					const l = value.length;
-					for (let i = 0; i < l; i++) {
-						let _stack = stack + "[" + i + "]";
-						let res = check.fn.call(self, value[i], schema, _stack, obj);
-						if (res !== true) {
-							errorInCurrentArray = true;
-							self.handleResult(errors, _stack, res);
-						}
+			} // else {
+			// Call the checker function
+			if (check.iterate) {
+				let errorInCurrentArray = false;
+				const l = value.length;
+				for (let i = 0; i < l; i++) {
+					let _stack = stack + "[" + i + "]";
+					let res = check.fn.call(self, value[i], schema, _stack, obj);
+					if (res !== true) {
+						errorInCurrentArray = true;
+						self.handleResult(errors, _stack, res);
 					}
-					/**
+				}
+				/**
 					 * If this is second part of a multiRule array check and the array
 					 * is valid, then the rule is valid.
 					 */
-					if (!errorInCurrentArray && isMultipleRules && check.secondPart) {
-						return true;
-					}
-				} else {
-					let res = check.fn.call(self, value, schema, stack, obj);
+				if (!errorInCurrentArray && isMultipleRules && check.secondPart) {
+					return true;
+				}
+			} else {
+				let res = check.fn.call(self, value, schema, stack, obj);
 
-					if (isMultipleRules) {
-						if (res === true) {
-							/**
+				if (isMultipleRules) {
+					if (res === true) {
+						/**
 							 * Object and array checks are divided into two internal checks. In case of a multiRule
 							 * we have to make sure to check both parts. Thus we we continue to also do the second
 							 * check if their is one.
 							 */
-							const nextRule = rules[i + 1];
-							if (nextRule && nextRule.secondPart){
-								continue;
-							}
-							// Jump out after first success and clear previous errors
-							return true;
+						const nextRule = rules[i + 1];
+						if (nextRule && nextRule.secondPart){
+							continue;
 						}
+						// Jump out after first success and clear previous errors
+						return true;
 					}
-
-					if (res !== true)
-						self.handleResult(errors, stack, res);
 				}
+
+				if (res !== true)
+					self.handleResult(errors, stack, res);
 			}
+			//}
 		}
 
 		return errors.length === 0 ? true : errors;

test/validator.spec.js

@@ -586,15 +586,6 @@ describe("Test multiple rules", () => {
 
 	let check = v.compile(schema);
 
-	let schemaOptional = {
-		a: [
-			{ type: "number", optional: true },
-			{ type: "string", optional: true },
-		]
-	};
-
-	let checkOptional = v.compile(schema);
-
 	it("should give true if value is string", () => {
 		let obj = { value: "John" };
 
@@ -640,11 +631,21 @@ describe("Test multiple rules", () => {
 	});
 
 	it("should work with optional", () => {
+
+		let schemaOptional = {
+			a: [
+				{ type: "number", optional: true },
+				{ type: "string", optional: true },
+			]
+		};
+
+		let checkOptional = v.compile(schemaOptional);
+
+
 		let obj = {};
 		let res = checkOptional(obj);
 
 		expect(res).toBe(true);
-
 	});
 
 });
@@ -880,13 +881,14 @@ describe("Test multiple rules with mixed types", () => {
 	});
 
 	it("should give error if 'undefined'", () => {
+		debugger; // eslint-disable-line
 		const res = check({ value: undefined });
 
 		expect(res).toBeInstanceOf(Array);
 		expect(res.length).toBe(2);
-		expect(res[0].type).toBe("string");
+		expect(res[0].type).toBe("required");
 		expect(res[0].field).toBe("value");		
-		expect(res[1].type).toBe("boolean");
+		expect(res[1].type).toBe("required");
 		expect(res[1].field).toBe("value");		
 	});