Skip to content

fix(en): resolve "last/next weekday" to the adjacent working day #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Enesuygurs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(en): resolve "last/next weekday" to the adjacent working day #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/locales/en/parsers/ENWeekdayParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ export default class ENWeekdayParser extends AbstractParserWithWordBoundaryCheck
} else {
weekday = refWeekday - 1;
weekday = modifier == "last" ? weekday - 1 : weekday + 1;
weekday = (weekday % 5) + 1;
weekday = ((weekday + 5) % 5) + 1;
}
// The weekday above is already the adjacent working day. Use "this" to count forward to it,
// because "next" would skip to the following week (e.g. "next Tuesday" on Monday).
if (modifier == "next") {
modifier = "this";
}
} else {
return null;
Expand Down
22 changes: 22 additions & 0 deletions test/en/en_weekday.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,28 @@ test("Test - Casual 'weekday' mentioning", () => {
expect(result.start).toBeDate(new Date(2024, 10 - 1, 21, 12)); // Monday
});
}
{
const refDateOnMonday = new Date(2024, 10 - 1, 21, 12, 0);
testSingleCase(chrono.casual, "last weekday", refDateOnMonday, (result, text) => {
expect(result.text).toBe(text);
expect(result.start).toBeDate(new Date(2024, 10 - 1, 18, 12)); // Friday
});
testSingleCase(chrono.casual, "next weekday", refDateOnMonday, (result, text) => {
expect(result.text).toBe(text);
expect(result.start).toBeDate(new Date(2024, 10 - 1, 22, 12)); // Tuesday
});
}
{
const refDateOnWednesday = new Date(2024, 10 - 1, 23, 12, 0);
testSingleCase(chrono.casual, "last weekday", refDateOnWednesday, (result, text) => {
expect(result.text).toBe(text);
expect(result.start).toBeDate(new Date(2024, 10 - 1, 22, 12)); // Tuesday
});
testSingleCase(chrono.casual, "next weekday", refDateOnWednesday, (result, text) => {
expect(result.text).toBe(text);
expect(result.start).toBeDate(new Date(2024, 10 - 1, 24, 12)); // Thursday
});
}
{
const refDateOnSaturday = new Date(2024, 10 - 1, 19, 12, 0);
testSingleCase(chrono.casual, "last weekday", refDateOnSaturday, (result, text) => {
Expand Down