Skip to content
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

feat: reject non-calendar ISO strings #3061

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

feat: reject non-calendar ISO strings #3061

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
12 changes: 12 additions & 0 deletions lib/types/string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,18 @@ internals.isoDate = function (value) {
return null;
}

const day = Number(value.split('T')[0].replace(/^-?/, '').split('-')[2]);

if (/T24:00$/.test(value)) {
const nextDate = new Date(value.replace(/T24:00/, '')).setDate(day + 1);
if (date.getTime() !== nextDate) {
return null;
}
}
else if (day !== date.getDate()) {
return null;
}

return date.toISOString();
};

Expand Down
20 changes: 19 additions & 1 deletion test/types/string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5399,7 +5399,7 @@ describe('string', () => {
});
});

describe('isoData()', () => {
describe('isoDate()', () => {

it('validates isoDate', () => {

Expand Down Expand Up @@ -5574,6 +5574,24 @@ describe('string', () => {
path: [],
type: 'string.isoDate',
context: { value: '2013-1841', label: 'value' }
}],
['2013-04-31', false, {
message: '"value" must be in iso format',
path: [],
type: 'string.isoDate',
context: { value: '2013-04-31', label: 'value' }
}],
['2013-04-31T24:00', false, {
message: '"value" must be in iso format',
path: [],
type: 'string.isoDate',
context: { value: '2013-04-31T24:00', label: 'value' }
}],
['2025-02-29T12:21', false, {
message: '"value" must be in iso format',
path: [],
type: 'string.isoDate',
context: { value: '2025-02-29T12:21', label: 'value' }
}]
]);
});
Expand Down