Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/validator.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,9 @@ class Validator {
res.source = res.source.replace(/%%INDEX%%/g, rule.index);
const fn = new Function("value", "field", "parent", "errors", "context", res.source);
context.fn[rule.index] = fn;
sourceCode.push(this.makeCustomValidator({vName: resVar, path: customPath, schema: rule.schema, context, messages: rule.messages, ruleIndex: rule.index}));
sourceCode.push(this.wrapRequiredCheckSourceCode(rule, innerSrc.replace(/%%INDEX%%/g, rule.index), resVar));
sourceCode.push(this.makeCustomValidator({vName: resVar, path: customPath, schema: rule.schema, context, messages: rule.messages, ruleIndex: rule.index}));

} else {
sourceCode.push(this.wrapRequiredCheckSourceCode(rule));
}
Expand Down
8 changes: 4 additions & 4 deletions test/rules/multi.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const Validator = require("../../lib/validator");
const v = new Validator({
useNewCustomCheckerFunction: true
useNewCustomCheckerFunction: true,
});

describe("Test rule: multi", () => {
Expand All @@ -28,7 +28,7 @@ describe("Test rule: multi", () => {
expect(fn).toBeCalledWith("s", [], schema.rules[0], "$$root", null, expect.any(Object));
});

it("should value equals to other field", () => {
// TODO: move from validator.spec.js
});
// it("should value equals to other field", () => {
// // TODO: move from validator.spec.js
// });
});
21 changes: 20 additions & 1 deletion test/validator.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ describe("Test custom validation v1", () => {
});
});

describe("Test custom validation v2", () => {
describe("Test custom validation", () => {
const v = new Validator({
useNewCustomCheckerFunction: true,
messages: {
Expand Down Expand Up @@ -468,6 +468,25 @@ describe("Test custom validation v2", () => {
expect(check({num: 18})[0].type).toEqual("numberMax");
expect(check({num: 13})[0].type).toEqual("evenNumber");
});

it("should call checker function after build-in rule", () => {
// depended to number rule
const checkerFn = jest.fn((v) => v);

const schema = {
a: {
type: "number",
convert: true,
custom: checkerFn
}
};
const check = v.compile(schema);
const o = { a: "123" };

expect(check(o)).toBe(true);
expect(checkerFn).toBeCalledTimes(1);
expect(checkerFn.mock.calls[0][0]).toBe(123);
});
});

describe("Test default settings", () => {
Expand Down