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
6 changes: 6 additions & 0 deletions src/factories/records.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ describe("validateWith", () => {

expect(validator).toValidate({ a: 1 });
expect(validator).toInvalidateWith(null, "Not a record: null");

expect(validator).toInvalidateWith({}, "Missing required fields: a");
expect(validator).toInvalidateWith({a: undefined}, "Missing required fields: a");

expect(validator).toInvalidateWith({ a: "1" }, { a: 'Not a number: "1"' });
expect(validator).toInvalidateWith(
{ a: 1, b: 2 },
Expand All @@ -36,7 +39,10 @@ describe("validateWithAtLeast", () => {

expect(validator).toValidate({ a: 1 });
expect(validator).toInvalidateWith(null, "Not a record: null");

expect(validator).toInvalidateWith({}, "Missing required fields: a");
expect(validator).toInvalidateWith({a: undefined}, "Missing required fields: a");

expect(validator).toInvalidateWith({ a: "1" }, { a: 'Not a number: "1"' });
expect(validator).toValidate({ a: 1, b: 2 });
});
Expand Down
20 changes: 18 additions & 2 deletions src/factories/records.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,16 @@ export const validateWith =
return record as Validated<T>;
}

const optional = Object.entries(validators).reduce<string[]>(
(acc, [field, validator]) =>
guard(validator as Validator<unknown>, undefined)
? acc.concat(field)
: acc,
[],
);

const missing = Object.keys(validators).filter(
(i) => !(i in record.parsed || validators[i as keyof T](undefined).valid),
(i) => record.parsed[i] === undefined && !optional.includes(i),
);

if (missing.length > 0) {
Expand Down Expand Up @@ -83,8 +91,16 @@ export const validateWithAtLeast =
return record as Validated<T>;
}

const optional = Object.entries(validators).reduce<string[]>(
(acc, [field, validator]) =>
guard(validator as Validator<unknown>, undefined)
? acc.concat(field)
: acc,
[],
);

const missing = Object.keys(validators).filter(
(i) => !(i in record.parsed || validators[i as keyof T](undefined).valid),
(i) => record.parsed[i] === undefined && !optional.includes(i),
);

if (missing.length > 0) {
Expand Down
Loading
Loading