Skip to content
Open
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: 5 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,14 @@ class Schema {
let value = source[z];
arr.forEach(r => {
let rule: InternalRuleItem = r;
let inferredType: RuleType;
if (typeof rule.transform === 'function') {
if (source === source_) {
source = { ...source };
}
value = source[z] = rule.transform(value);
if (value !== undefined && value !== null) {
rule.type = rule.type || ((Array.isArray(value) ? 'array' : typeof value) as RuleType);
inferredType = (Array.isArray(value) ? 'array' : typeof value) as RuleType;
}
}
if (typeof rule === 'function') {
Expand All @@ -155,6 +156,9 @@ class Schema {
};
} else {
rule = { ...rule };
if (inferredType) {
rule.type = rule.type || inferredType;
}
}

// Fill validator. Skip if nothing need to validate
Expand Down
8 changes: 8 additions & 0 deletions tests/number.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,14 @@ describe('number', () => {
done();
});
});
it('reinfers transformed type across validations', async () => {
const schema = new Schema({
v: { required: true, transform: value => value },
});

await expect(schema.validate({ v: 1 })).resolves.toEqual({ v: 1 });
await expect(schema.validate({ v: 'value' })).resolves.toEqual({ v: 'value' });
});
it('transform array', done => {
const value = { v: [0, 1] };
new Schema({
Expand Down
Loading