Skip to content

Fix nth weekday matches on day 31 #70

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
bensynapse wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix nth weekday matches on day 31 #70

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: 1 addition & 6 deletions packages/matcher/src/matcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,13 +338,8 @@ function getLastWeekDay(time: DateTime) {
*/
function getDaysOfType(time: DateTime, day: number) {
const days: number[] = [];
for (let i = 1; i < 31; i++) {
for (let i = 1; i <= time.daysInMonth; i++) {
const newTime = time.set({day: i});
if (newTime.month != time.month) {
// means it split over to next month
break;
}

if (getWeekDay(newTime) === day) {
days.push(newTime.day);
}
Expand Down
41 changes: 41 additions & 0 deletions packages/matcher/test/unit/matcher.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,47 @@ describe('getFutureMatches', () => {
});
});

describe('nth weekday on day 31', () => {
const cases = [
['sun', '2020-05-31', '2020-06-01'],
['mon', '2020-08-31', '2020-09-01'],
['tue', '2020-03-31', '2020-04-01'],
['wed', '2021-03-31', '2021-04-01'],
['thu', '2020-12-31', '2021-01-01'],
['fri', '2020-07-31', '2020-08-01'],
['sat', '2020-10-31', '2020-11-01'],
];

it.each(cases)('matches the fifth %s on %s', (weekday, date) => {
expect(subject.isTimeMatches(`0 0 ? * ${weekday}#5`, `${date}T00:00:00Z`)).toBe(true);
expect(subject.isTimeMatches(`0 0 ? * ${weekday}#4`, `${date}T00:00:00Z`)).toBe(false);
});

it.each(cases)('returns the fifth %s on %s', (weekday, date, endDate) => {
expectFutureMatches(`0 0 ? * ${weekday}#5`, [`${date}T00:00:00Z`], {
startAt: `${date}T00:00:00Z`,
endAt: `${endDate}T00:00:00Z`,
});
});

it('returns all fifth Fridays within the year', () => {
expectFutureMatches(
'0 0 ? * fri#5',
['2020-01-31T00:00:00Z', '2020-05-29T00:00:00Z', '2020-07-31T00:00:00Z', '2020-10-30T00:00:00Z'],
{endAt: '2021-01-01T00:00:00Z'}
);
});

it('skips a month without a fifth Friday', () => {
expect(
subject.getFutureMatches('0 0 ? * fri#5', {
startAt: '2021-02-01T00:00:00Z',
endAt: '2021-03-01T00:00:00Z',
})
).toEqual([]);
});
});

describe('getFutureMatches with timezones', () => {
it('1 am every day in pacific', () => {
expectFutureMatches('0 1 * *', ['2020-01-01T09:00:00Z', '2020-01-02T09:00:00Z'], {timezone: 'America/Los_Angeles'});
Expand Down