Merge pull request #203 from erfanium/fix

(Bugfix) multiple custom validator bug #202

Author: icebob

lib/validator.js

@@ -419,11 +419,12 @@ class Validator {
 				`;
 			}
 
+			const result = "res_" + ruleVName;
 			return `
 				const ${ruleVName} = context.customs[${ruleIndex}];
-				const res = ${ruleVName}.schema.${fnName}.call(this, ${vName}, ${ruleVName}.schema, "${path}", parent, context);
-				if (Array.isArray(res)) {
-					res.forEach(err => errors.push(Object.assign({ message: ${ruleVName}.messages[err.type], field }, err)));
+				const ${result} = ${ruleVName}.schema.${fnName}.call(this, ${vName}, ${ruleVName}.schema, "${path}", parent, context);
+				if (Array.isArray(${result})) {
+					${result}.forEach(err => errors.push(Object.assign({ message: ${ruleVName}.messages[err.type], field }, err)));
 				}
 		`;
 		}

test/validator.spec.js

@@ -444,13 +444,9 @@ describe("Test custom validation v1", () => {
 		}
 	});
 
-	let check;
-	const fn = jest.fn();
-
-
 	it("should compile without error", () => {
-
-		check = v.compile({
+		const fn = jest.fn();
+		const check = v.compile({
 			num: {
 				type: "number",
 				min: 10,
@@ -467,6 +463,20 @@ describe("Test custom validation v1", () => {
 	});
 
 	it("should work correctly with custom validator", () => {
+		const fn = jest.fn();
+		const check = v.compile({
+			num: {
+				type: "number",
+				min: 10,
+				max: 15,
+				integer: true,
+				custom(value){
+					fn(value);
+					if (value % 2 !== 0) return [{ type: "evenNumber", actual: value }];
+				}
+			}
+		});
+
 		const res = check({num: 12});
 		expect(res).toBe(true);
 		expect(fn).toBeCalledWith(12);
@@ -475,6 +485,31 @@ describe("Test custom validation v1", () => {
 		expect(check({num: 18})[0].type).toEqual("numberMax");
 		expect(check({num: 13})[0].type).toEqual("evenNumber");
 	});
+
+	it("should work with multiple custom validators", () => {
+		const fn = jest.fn();
+
+		const check = v.compile({
+			a: {
+				type: "number",
+				custom(value){
+					fn(value);
+					if (value % 2 !== 0) return [{ type: "evenNumber", actual: value }];
+				}
+			}, 
+			b: {
+				type: "number",
+				custom(value){
+					fn(value);
+					if (value % 2 !== 0) return [{ type: "evenNumber", actual: value }];
+				}
+			}
+		});
+
+		const res = check({a: 12, b:10});
+		expect(res).toBe(true);
+		expect(fn).toBeCalledTimes(2);
+	});
 });
 
 describe("Test custom validation", () => {