Skip to content

Alternatives respect subsequent "when"s if first has only "otherwise"#1161

Merged
Marsup merged 2 commits intohapijs:masterfrom
WesTyler:otherwise_bug
May 13, 2017
Merged

Alternatives respect subsequent "when"s if first has only "otherwise"#1161
Marsup merged 2 commits intohapijs:masterfrom
WesTyler:otherwise_bug

Conversation

@WesTyler
Copy link
Contributor

@WesTyler WesTyler commented Apr 14, 2017 •
edited
Loading

Addresses #1151 .

When a .when() has only an otherwise, subsequent when()s should now be checked until either a then is found or the last condition is reached.

Previous Buggy Behavior

const schema = Joi.object({
    a: Joi.number(),
    b: Joi.number(),
    c: Joi.number()
        .when('a', { is: 1, otherwise: Joi.number().min(1) })
        .when('b', { is: 1, then: Joi.number().min(1) })
});

schema.validate({
    a: 1,
    b: 1,
    c: 0
}); // { error: null, value: { a: 1, b: 1, c: 0 } }

New behavior

const schema = Joi.object({
    a: Joi.number(),
    b: Joi.number(),
    c: Joi.number()
        .when('a', { is: 1, otherwise: Joi.number().min(1) })
        .when('b', { is: 1, then: Joi.number().min(1) })
});

schema.validate({
    a: 1,
    b: 1,
    c: 0
}); // child "c" fails because ["c" must be larger than or equal to 1]

Marsup
Marsup requested changes May 1, 2017
View reviewed changes
lib/alternatives.js Outdated
return baseType._validate(value, state, options);
}
}
else if (item.then === undefined && i < (il - 1)) {
Copy link
Collaborator

@Marsup Marsup May 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs a more important change. baseType should probably only ever be used as last resort, so removing it from the failed branch seem to make sense. I haven't tested it but my guts tell me we can simplify this code by only dealing with baseType once.

Copy link
Contributor Author

@WesTyler WesTyler May 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll see what I can do 👍

@Marsup Marsup added the bug Bug or defect label May 1, 2017
@WesTyler
Copy link
Contributor Author

WesTyler commented May 5, 2017

@Marsup I cleaned up the logic around baseType. Is that what you had in mind?

@Marsup Marsup merged commit cd01c65 into hapijs:master May 13, 2017
Marsup added a commit that referenced this pull request May 13, 2017
@Marsup
Cleanup for #1161
d8af6ab
@Marsup
Copy link
Collaborator

Marsup commented May 13, 2017

Thanks !

@Marsup Marsup added this to the 10.4.2 milestone May 13, 2017
@lock
Copy link

lock bot commented Jan 9, 2020

This thread has been automatically locked due to inactivity. Please open a new issue for related bugs or questions following the new issue template instructions.

@lock lock bot locked as resolved and limited conversation to collaborators Jan 9, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@Marsup Marsup Marsup approved these changes

Assignees

No one assigned

Labels

bug Bug or defect

Projects

None yet

Milestone

10.4.2

Development

Successfully merging this pull request may close these issues.

2 participants

@WesTyler @Marsup