Merge pull request #290 from 0x0a0d/multi_rule_with_custom_checker

fix(multi): item rule has custom checker will throw error if validate…

Author: icebob

lib/rules/multi.js

@@ -9,6 +9,7 @@ module.exports = function({ schema, messages }, path, context) {
 		var hasValid = false;
 		var newVal = value;
 		var checkErrors = [];
+		var errorsSize = errors.length;
 	`);
 
 	for (let i = 0; i < schema.rules.length; i++) {
@@ -20,11 +21,11 @@ module.exports = function({ schema, messages }, path, context) {
 		const rule = this.getRuleFromSchema(schema.rules[i]);
 		src.push(this.compileRule(rule, context, path, `var tmpVal = ${context.async ? "await " : ""}context.fn[%%INDEX%%](value, field, parent, _errors, context);`, "tmpVal"));
 		src.push(`
-				if (_errors.length == 0) {
+				if (errors.length == errorsSize && _errors.length == 0) {
 					hasValid = true;
 					newVal = tmpVal;
 				} else {
-					Array.prototype.push.apply(checkErrors, _errors);
+					Array.prototype.push.apply(checkErrors, [].concat(_errors, errors.splice(errorsSize)));
 				}
 			}
 		`);

test/rules/multi.spec.js

@@ -88,4 +88,74 @@ describe("Test rule: multi", () => {
 			expect(check({d: 4})).toEqual([{"actual": undefined, "field": "a", "message": "The 'a' field is required.", "type": "required"}, {"actual": undefined, "field": "b", "message": "The 'b' field is required.", "type": "required"}, {"actual": undefined, "field": "c", "message": "The 'c' field is required.", "type": "required"}]);
 		});
 	});
+
+	describe("should work with custom validator", () => {
+		const checkerFn = jest.fn(() => {});
+
+		const v = new Validator({
+			useNewCustomCheckerFunction: true,
+			aliases: {
+				strOK: {
+					type: "string",
+					custom: (value, errors) => {
+						checkerFn();
+						if (value !== "OK") {
+							errors.push({type: "strOK"});
+							return;
+						}
+						return value;
+					}
+				},
+				num99: {
+					type: "number",
+					custom: (value, errors) => {
+						checkerFn();
+						if (value !== 99) {
+							errors.push({type: "num99"});
+							return;
+						}
+						return value;
+					}
+				}
+			}
+		});
+
+		const schema = {
+			a: {
+				type: "multi",
+				rules: ["strOK", "num99"]
+			}
+		};
+		const check = v.compile(schema);
+
+		it("test strOK", () => {
+			{
+				const o = { a: "OK" };
+				expect(check(o)).toBe(true);
+				expect(o).toStrictEqual({ a: "OK" });
+				expect(checkerFn).toBeCalledTimes(1);
+			}
+			{
+				const o = { a: "not-OK" };
+				expect(check(o)).toStrictEqual([{"field": "a", "message": undefined, "type": "strOK"}, {"actual": "not-OK", "field": "a", "message": "The 'a' field must be a number.", "type": "number"}, {"field": "a", "message": undefined, "type": "num99"}]);
+				expect(o).toStrictEqual({ a: "not-OK" });
+				expect(checkerFn).toBeCalledTimes(3);
+			}
+		});
+
+		it("test num99", () => {
+			{
+				const o = { a: 99 };
+				expect(check(o)).toBe(true);
+				expect(o).toStrictEqual({ a: 99 });
+				expect(checkerFn).toBeCalledTimes(5);
+			}
+			{
+				const o = { a: 1199 };
+				expect(check(o)).toStrictEqual([{"actual": 1199, "field": "a", "message": "The 'a' field must be a string.", "type": "string"}, {"field": "a", "message": undefined, "type": "strOK"}, {"field": "a", "message": undefined, "type": "num99"}]);
+				expect(o).toStrictEqual({ a: 1199 });
+				expect(checkerFn).toBeCalledTimes(7);
+			}
+		});
+	});
 });