Skip to content

fix(isISO8601): fix for dates with year inferior to 1000 #2519

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

fix(isISO8601): fix for dates with year inferior to 1000 #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94d069b
Add fix for isISO8601 for year < 1000 and add tests
skpanagiotis Jan 19, 2025
7ffcec2
Replace padStart implementation with slice to support node js 6
skpanagiotis Jan 19, 2025
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
24 changes: 15 additions & 9 deletions src/lib/isISO8601.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import assertString from './util/assertString';

/* eslint-disable max-len */
// from http://goo.gl/0ejHHW
const iso8601 = /^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-3])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$/;
const iso8601 =
/^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-3])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$/;
// same as above, except with a strict 'T' separator between date and time
const iso8601StrictSeparator = /^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-3])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T]((([01]\d|2[0-3])((:?)[0-5]\d)?|24:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$/;
const iso8601StrictSeparator =
/^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-3])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T]((([01]\d|2[0-3])((:?)[0-5]\d)?|24:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$/;
/* eslint-enable max-len */
const isValidDate = (str) => {
// str must have passed the ISO8601 check
Expand All @@ -16,7 +18,7 @@ const isValidDate = (str) => {
const oYear = Number(ordinalMatch[1]);
const oDay = Number(ordinalMatch[2]);
// if is leap year
if ((oYear % 4 === 0 && oYear % 100 !== 0) || oYear % 400 === 0) return oDay <= 366;
if ((oYear % 4 === 0 && oYear % 100 !== 0) || oYear % 400 === 0) { return oDay <= 366; }
return oDay <= 365;
}
const match = str.match(/(\d{4})-?(\d{0,2})-?(\d*)/).map(Number);
Expand All @@ -25,20 +27,24 @@ const isValidDate = (str) => {
const day = match[3];
const monthString = month ? `0${month}`.slice(-2) : month;
const dayString = day ? `0${day}`.slice(-2) : day;
const yearString = year < 1000 ? `0000${year}`.slice(-4) : year;
Copy link
Member

Choose a reason for hiding this comment

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

How would this work for years < 0?


// create a date object and compare
const d = new Date(`${year}-${monthString || '01'}-${dayString || '01'}`);
const d = new Date(`${yearString}-${monthString || '01'}-${dayString || '01'}`);
if (month && day) {
return d.getUTCFullYear() === year
&& (d.getUTCMonth() + 1) === month
&& d.getUTCDate() === day;
return (
d.getUTCFullYear() === year &&
d.getUTCMonth() + 1 === month &&
d.getUTCDate() === day
);
}
return true;
};

export default function isISO8601(str, options = {}) {
assertString(str);
const check = options.strictSeparator ? iso8601StrictSeparator.test(str) : iso8601.test(str);
const check = options.strictSeparator
? iso8601StrictSeparator.test(str)
: iso8601.test(str);
if (check && options.strict) return isValidDate(str);
return check;
}
19 changes: 19 additions & 0 deletions test/validators.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11924,6 +11924,9 @@ describe('Validators', () => {
'2009-10-10',
'2020-366',
'2000-366',
'0080-05-19',
'0008-W51-1',
'0009-05-19T14:39Z',
];

const invalidISO8601 = [
Expand Down Expand Up @@ -11953,6 +11956,9 @@ describe('Validators', () => {
'2010-13-1',
'nonsense2021-01-01T00:00:00Z',
'2021-01-01T00:00:00Znonsense',
'0010-02-18T16:23.33.600',
'0200-02-18T16,25:23:48,444',
'nonsense0021-01-01T00:00:00Z',
];

it('should validate ISO 8601 dates', () => {
Expand Down Expand Up @@ -11987,6 +11993,8 @@ describe('Validators', () => {
'2009-222',
'2020-366',
'2400-366',
'0050-02-15',
'0010-05-19T14:39Z',
],
invalid: [
'2010-02-30',
Expand Down Expand Up @@ -12038,6 +12046,10 @@ describe('Validators', () => {
'2009-10-10',
'2020-366',
'2000-366',
'0010-02-18T16:23.4',
'0010-02-18T16:23,25',
'0200-02-18T16:23.33+0600',
'0200-02-18T16.23334444',
],
invalid: [
'200905',
Expand Down Expand Up @@ -12072,6 +12084,9 @@ describe('Validators', () => {
'2009-05-19 14:39:22-06:00',
'2009-05-19 14:39:22+0600',
'2009-05-19 14:39:22-01',
'0009-05-19 14.5.44',
'0010-02-18T16:23.33.600',
'0010-02-18T16,25:23:48,444',
],
});
});
Expand All @@ -12088,6 +12103,8 @@ describe('Validators', () => {
'2009-222',
'2020-366',
'2400-366',
'0020-366',
'0400-366',
],
invalid: [
'2010-02-30',
Expand All @@ -12100,6 +12117,8 @@ describe('Validators', () => {
'2009-05-19 14:39:22-06:00',
'2009-05-19 14:39:22+0600',
'2009-05-19 14:39:22-01',
'0009-05-19 14:39:22+0600',
'0009-05-19 14:39:22-01',
],
});
});
Expand Down
Loading