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

Jump to bottom

Editorial: Use early errors and parameterization to simplify ISO 8601 grammar #2766

Merged
merged 7 commits into from
Jun 13, 2024
Merged

Editorial: Use early errors and parameterization to simplify ISO 8601 grammar #2766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e9a7f7
Editorial: Introduce SDOs and early errors to reject bad ISO 8601 dates
ptomato Jan 19, 2024
c30c407
Editorial: Use early errors to simplify time-only grammar
ptomato Jan 19, 2024
354a172
Editorial: Use TimeSeparator[Extended] consistently in the grammar
ptomato Jan 20, 2024
2d5f0df
Editorial: Introduce DateSeparator[Extended]
ptomato Jan 20, 2024
e9ef361
Editorial: Use grammar parameterization to express whether 'Z' is all…
ptomato Jan 20, 2024
d358e03
Editorial: Replace AnnotatedDateTimeTimeRequired production with para…
ptomato Jan 24, 2024
c507068
Editorial: Parameterize UTCOffset grammar
ptomato Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
115 changes: 63 additions & 52 deletions polyfill/test/validStrings.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class Literal {
return this.str;
}
}
const empty = new Literal('');

class Optional {
constructor(productionLike) {
Expand Down Expand Up @@ -189,6 +190,8 @@ function seq(...productions) {

// characters
const temporalSign = character('+-−');
const dateSeparator = (extended) => (extended ? character('-') : empty);
const timeSeparator = (extended) => (extended ? character(':') : empty);
const hour = zeroPaddedInclusive(0, 23, 2);
const minuteSecond = zeroPaddedInclusive(0, 59, 2);
const temporalDecimalSeparator = character('.,');
Expand Down Expand Up @@ -242,22 +245,28 @@ const timeFraction = withCode(temporalDecimalFraction, (data, result) => {
data.microsecond = +fraction.slice(3, 6);
data.nanosecond = +fraction.slice(6, 9);
});

function saveOffset(data, result) {
data.offset = ES.ParseDateTimeUTCOffset(result);
}
const utcOffsetSubMinutePrecision = withCode(
seq(
temporalSign,
hour,
const utcOffset = (subMinutePrecision) =>
seq(temporalSign, hour, [
choice(
[minuteSecond, [minuteSecond, [temporalDecimalFraction]]],
seq(':', minuteSecond, [':', minuteSecond, [temporalDecimalFraction]])
seq(
timeSeparator(true),
minuteSecond,
subMinutePrecision ? [timeSeparator(true), minuteSecond, [temporalDecimalFraction]] : empty
),
seq(
timeSeparator(false),
minuteSecond,
subMinutePrecision ? [timeSeparator(false), minuteSecond, [temporalDecimalFraction]] : empty
)
)
),
saveOffset
);
const dateTimeUTCOffset = choice(utcDesignator, utcOffsetSubMinutePrecision);
const timeZoneUTCOffsetName = seq(temporalSign, hour, choice([minuteSecond], seq(':', minuteSecond)));
]);
const dateTimeUTCOffset = (z) =>
z ? choice(utcDesignator, withCode(utcOffset(true), saveOffset)) : withCode(utcOffset(true), saveOffset);
const timeZoneUTCOffsetName = utcOffset(false);
const timeZoneIANAName = choice(...timezoneNames);
const timeZoneIdentifier = withCode(
choice(timeZoneUTCOffsetName, timeZoneIANAName),
Expand All @@ -281,42 +290,48 @@ const annotations = withSyntaxConstraints(oneOrMore(choice(calendarAnnotation, a
throw new SyntaxError('more than one calendar annotation and at least one critical');
}
});
const timeSpec = seq(
timeHour,
choice([':', timeMinute, [':', timeSecond, [timeFraction]]], seq(timeMinute, [timeSecond, [timeFraction]]))
);
const timeSpecWithOptionalOffsetNotAmbiguous = withSyntaxConstraints(seq(timeSpec, [dateTimeUTCOffset]), (result) => {
if (/^(?:(?!02-?30)(?:0[1-9]|1[012])-?(?:0[1-9]|[12][0-9]|30)|(?:0[13578]|10|12)-?31)$/.test(result)) {
throw new SyntaxError('valid PlainMonthDay');
}
if (/^(?![−-]000000)(?:[0-9]{4}|[+−-][0-9]{6})-?(?:0[1-9]|1[012])$/.test(result)) {
throw new SyntaxError('valid PlainYearMonth');
}
});
const timeSpec = (extended) =>
seq(timeHour, [timeSeparator(extended), timeMinute, [timeSeparator(extended), timeSecond, [timeFraction]]]);
const time = choice(timeSpec(true), timeSpec(false));

function validateDayOfMonth(result, { year, month, day }) {
if (day > ES.ISODaysInMonth(year, month)) throw SyntaxError('retry if bad day of month');
}
const dateSpecMonthDay = withSyntaxConstraints(seq(['--'], dateMonth, ['-'], dateDay), validateDayOfMonth);
const dateSpecYearMonth = seq(dateYear, ['-'], dateMonth);
const date = withSyntaxConstraints(
choice(seq(dateYear, '-', dateMonth, '-', dateDay), seq(dateYear, dateMonth, dateDay)),
const dateSpecMonthDay = withSyntaxConstraints(
seq(['--'], dateMonth, choice(dateSeparator(true), dateSeparator(false)), dateDay),
validateDayOfMonth
);
const dateTime = seq(date, [dateTimeSeparator, timeSpec, [dateTimeUTCOffset]]);
const dateSpecYearMonth = seq(dateYear, choice(dateSeparator(true), dateSeparator(false)), dateMonth);
const dateSpec = (extended) =>
withSyntaxConstraints(
seq(dateYear, dateSeparator(extended), dateMonth, dateSeparator(extended), dateDay),
validateDayOfMonth
);
const date = choice(dateSpec(true), dateSpec(false));
const dateTime = (z, timeRequired) =>
seq(
date,
timeRequired
? seq(dateTimeSeparator, time, [dateTimeUTCOffset(z)])
: [dateTimeSeparator, time, [dateTimeUTCOffset(z)]]
);
const annotatedTime = choice(
seq(timeDesignator, timeSpec, [dateTimeUTCOffset], [timeZoneAnnotation], [annotations]),
seq(timeSpecWithOptionalOffsetNotAmbiguous, [timeZoneAnnotation], [annotations])
);
const annotatedDateTime = seq(dateTime, [timeZoneAnnotation], [annotations]);
const annotatedDateTimeTimeRequired = seq(
date,
dateTimeSeparator,
timeSpec,
[dateTimeUTCOffset],
[timeZoneAnnotation],
[annotations]
seq(timeDesignator, time, [dateTimeUTCOffset(false)], [timeZoneAnnotation], [annotations]),
seq(
withSyntaxConstraints(seq(time, [dateTimeUTCOffset(false)]), (result) => {
if (/^(?:(?!02-?30)(?:0[1-9]|1[012])-?(?:0[1-9]|[12][0-9]|30)|(?:0[13578]|10|12)-?31)$/.test(result)) {
throw new SyntaxError('valid PlainMonthDay');
}
if (/^(?![−-]000000)(?:[0-9]{4}|[+−-][0-9]{6})-?(?:0[1-9]|1[012])$/.test(result)) {
throw new SyntaxError('valid PlainYearMonth');
}
}),
[timeZoneAnnotation],
[annotations]
)
);
const annotatedDateTime = (zoned, timeRequired) =>
seq(dateTime(zoned, timeRequired), zoned ? timeZoneAnnotation : [timeZoneAnnotation], [annotations]);
const annotatedYearMonth = withSyntaxConstraints(
seq(dateSpecYearMonth, [timeZoneAnnotation], [annotations]),
(result, data) => {
Expand Down Expand Up @@ -427,19 +442,19 @@ const duration = withSyntaxConstraints(
}
);

const instant = seq(date, dateTimeSeparator, timeSpec, dateTimeUTCOffset, [timeZoneAnnotation], [annotations]);
const zonedDateTime = seq(dateTime, timeZoneAnnotation, [annotations]);
const instant = seq(date, dateTimeSeparator, time, dateTimeUTCOffset(true), [timeZoneAnnotation], [annotations]);
const zonedDateTime = annotatedDateTime(true, false);

// goal elements
const goals = {
Instant: instant,
Date: annotatedDateTime,
DateTime: annotatedDateTime,
Date: annotatedDateTime(false, false),
DateTime: annotatedDateTime(false, false),
Duration: duration,
MonthDay: choice(annotatedMonthDay, annotatedDateTime),
Time: choice(annotatedTime, annotatedDateTimeTimeRequired),
MonthDay: choice(annotatedMonthDay, annotatedDateTime(false, false)),
Time: choice(annotatedTime, annotatedDateTime(false, true)),
TimeZone: choice(timeZoneIdentifier, zonedDateTime, instant),
YearMonth: choice(annotatedYearMonth, annotatedDateTime),
YearMonth: choice(annotatedYearMonth, annotatedDateTime(false, false)),
ZonedDateTime: zonedDateTime
};

Expand Down Expand Up @@ -467,16 +482,12 @@ const comparisonItems = {
YearMonth: ['year', 'month', 'calendar'],
ZonedDateTime: [...dateItems, ...timeItems, 'offset', 'z', 'tzAnnotation', 'calendar']
};
const plainModes = ['Date', 'DateTime', 'MonthDay', 'Time', 'YearMonth'];

function fuzzMode(mode) {
console.log('// starting to fuzz ' + mode);
for (let count = 0; count < 1000; count++) {
let generatedData, fuzzed;
do {
generatedData = {};
fuzzed = goals[mode].generate(generatedData);
} while (plainModes.includes(mode) && /[0-9][zZ]/.test(fuzzed));
const generatedData = {};
const fuzzed = goals[mode].generate(generatedData);
try {
const parsingMethod = ES[`ParseTemporal${mode}StringRaw`] ?? ES[`ParseTemporal${mode}String`];
const parsed = parsingMethod(fuzzed);
Expand Down