beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibJS: Accept and ignore calendar annotation in Instant strings

Browse source 
This is a normative change in the Temporal spec.

See: https://github.com/tc39/proposal-temporal/commit/3cd9669
This commit is contained in:
Luke Wilde 2022-08-25 22:11:10 +01:00 committed by Linus Groh
parent 54bb6bf2c0
commit 9643a5c63f
Notes: sideshowbarker 2024-07-17 07:44:50 +09:00 
Author: https://github.com/Lubrsi
Commit: https://github.com/SerenityOS/serenity/commit/9643a5c63f
Pull-request: https://github.com/SerenityOS/serenity/pull/15026
Reviewed-by: https://github.com/linusg ✅
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.cpp
View file

@ -1592,13 +1592,14 @@ bool ISO8601Parser::parse_duration()
bool ISO8601Parser::parse_temporal_instant_string()
{
// TemporalInstantString :
// Date TimeSpecSeparator[opt] TimeZoneOffsetRequired
// Date TimeSpecSeparator[opt] TimeZoneOffsetRequired Calendar[opt]
StateTransaction transaction { *this };
if (!parse_date())
return false;
(void)parse_time_spec_separator();
if (!parse_time_zone_offset_required())
return false;
(void)parse_calendar();
transaction.commit();
return true;
}

25
Userland/Libraries/LibJS/Tests/builtins/Temporal/Instant/Instant.from.js
View file

@ -23,6 +23,22 @@ describe("correct behavior", () => {
Temporal.Instant.from("1975-02-02T14:25:36.123456789Z[Custom/TimeZone]")
.epochNanoseconds
).toBe(160583136123456789n);
// Accepts but ignores the calendar.
let result = null;
expect(() => {
result = Temporal.Instant.from("1970-01-01T00:00Z[u-ca=UTC]");
}).not.toThrow();
expect(result).toBeInstanceOf(Temporal.Instant);
expect(result.epochNanoseconds).toBe(0n);
// Does not validate calendar name, it only checks that the calendar name matches the grammar.
result = null;
expect(() => {
result = Temporal.Instant.from("1970-01-01T00:00Z[u-ca=aAaAaAaA-bBbBbBb]");
}).not.toThrow();
expect(result).toBeInstanceOf(Temporal.Instant);
expect(result.epochNanoseconds).toBe(0n);
});
});
@ -48,4 +64,13 @@ describe("errors", () => {
"Invalid epoch nanoseconds value, must be in range -86400 * 10^17 to 86400 * 10^17"
);
});
test("calendar annotation must match calendar grammar even though it's ignored", () => {
expect(() => {
Temporal.Instant.from("1970-01-01T00:00Z[u-ca=SerenityOS]");
}).toThrowWithMessage(
RangeError,
"Invalid instant string '1970-01-01T00:00Z[u-ca=SerenityOS]'"
);
});
});