From 24dbf18936944b61c9d3795c343e9996013aba5b Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Fri, 27 Aug 2021 19:05:16 +0300 Subject: [PATCH] LibJS: Implement Temporal.PlainDateTime.prototype.withPlainTime() --- .../LibJS/Runtime/CommonPropertyNames.h | 1 + .../Temporal/PlainDateTimePrototype.cpp | 25 +++++++++++++++++++ .../Runtime/Temporal/PlainDateTimePrototype.h | 1 + .../PlainDateTime.prototype.withPlainTime.js | 20 +++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDateTime/PlainDateTime.prototype.withPlainTime.js diff --git a/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h b/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h index c70477df7d..eae0dd3cb5 100644 --- a/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h +++ b/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h @@ -437,6 +437,7 @@ namespace JS { P(with) \ P(withCalendar) \ P(withPlainDate) \ + P(withPlainTime) \ P(writable) \ P(year) \ P(yearMonthFromFields) \ diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.cpp index a3a29d5929..9b081197e3 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.cpp @@ -51,6 +51,7 @@ void PlainDateTimePrototype::initialize(GlobalObject& global_object) define_native_accessor(vm.names.inLeapYear, in_leap_year_getter, {}, Attribute::Configurable); u8 attr = Attribute::Writable | Attribute::Configurable; + define_native_function(vm.names.withPlainTime, with_plain_time, 1, attr); define_native_function(vm.names.withPlainDate, with_plain_date, 1, attr); define_native_function(vm.names.withCalendar, with_calendar, 1, attr); define_native_function(vm.names.equals, equals, 1, attr); @@ -358,6 +359,30 @@ JS_DEFINE_NATIVE_FUNCTION(PlainDateTimePrototype::in_leap_year_getter) return calendar_in_leap_year(global_object, calendar, *date_time); } +// 5.3.23 Temporal.PlainDateTime.prototype.withPlainTime ( [ plainTimeLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.plaindatetime.prototype.withplaintime +JS_DEFINE_NATIVE_FUNCTION(PlainDateTimePrototype::with_plain_time) +{ + // 1. Let dateTime be the this value. + // 2. Perform ? RequireInternalSlot(dateTime, [[InitializedTemporalDateTime]]). + auto* date_time = typed_this(global_object); + if (vm.exception()) + return {}; + + // 3. If plainTimeLike is undefined, then + if (vm.argument(0).is_undefined()) { + // a. Return ? CreateTemporalDateTime(dateTime.[[ISOYear]], dateTime.[[ISOMonth]], dateTime.[[ISODay]], 0, 0, 0, 0, 0, 0, dateTime.[[Calendar]]). + return create_temporal_date_time(global_object, date_time->iso_year(), date_time->iso_month(), date_time->iso_day(), 0, 0, 0, 0, 0, 0, date_time->calendar()); + } + + // 4. Let plainTime be ? ToTemporalTime(plainTimeLike). + auto* plain_time = to_temporal_time(global_object, vm.argument(0)); + if (vm.exception()) + return {}; + + // 5. Return ? CreateTemporalDateTime(dateTime.[[ISOYear]], dateTime.[[ISOMonth]], dateTime.[[ISODay]], plainTime.[[ISOHour]], plainTime.[[ISOMinute]], plainTime.[[ISOSecond]], plainTime.[[ISOMillisecond]], plainTime.[[ISOMicrosecond]], plainTime.[[ISONanosecond]], dateTime.[[Calendar]]). + return create_temporal_date_time(global_object, date_time->iso_year(), date_time->iso_month(), date_time->iso_day(), plain_time->iso_hour(), plain_time->iso_minute(), plain_time->iso_second(), plain_time->iso_millisecond(), plain_time->iso_microsecond(), plain_time->iso_nanosecond(), date_time->calendar()); +} + // 5.3.24 Temporal.PlainDateTime.prototype.withPlainDate ( plainDateLike ), https://tc39.es/proposal-temporal/#sec-temporal.plaindatetime.prototype.withplaindate JS_DEFINE_NATIVE_FUNCTION(PlainDateTimePrototype::with_plain_date) { diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.h b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.h index 20f9b10192..f5ecbdb2db 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDateTimePrototype.h @@ -38,6 +38,7 @@ private: JS_DECLARE_NATIVE_FUNCTION(days_in_year_getter); JS_DECLARE_NATIVE_FUNCTION(months_in_year_getter); JS_DECLARE_NATIVE_FUNCTION(in_leap_year_getter); + JS_DECLARE_NATIVE_FUNCTION(with_plain_time); JS_DECLARE_NATIVE_FUNCTION(with_plain_date); JS_DECLARE_NATIVE_FUNCTION(with_calendar); JS_DECLARE_NATIVE_FUNCTION(equals); diff --git a/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDateTime/PlainDateTime.prototype.withPlainTime.js b/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDateTime/PlainDateTime.prototype.withPlainTime.js new file mode 100644 index 0000000000..6d5ba6376f --- /dev/null +++ b/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDateTime/PlainDateTime.prototype.withPlainTime.js @@ -0,0 +1,20 @@ +describe("correct behavior", () => { + test("length is 1", () => { + expect(Temporal.PlainDateTime.prototype.withPlainTime).toHaveLength(1); + }); + + test("basic functionality", () => { + const firstPlainDateTime = new Temporal.PlainDateTime(1, 2, 3, 4, 5, 6, 7, 8, 9); + const plainTime = new Temporal.PlainTime(10, 11, 12, 13, 14, 15); + const secondPlainDateTime = firstPlainDateTime.withPlainTime(plainTime); + expect(secondPlainDateTime.year).toBe(1); + expect(secondPlainDateTime.month).toBe(2); + expect(secondPlainDateTime.day).toBe(3); + expect(secondPlainDateTime.hour).toBe(10); + expect(secondPlainDateTime.minute).toBe(11); + expect(secondPlainDateTime.second).toBe(12); + expect(secondPlainDateTime.millisecond).toBe(13); + expect(secondPlainDateTime.microsecond).toBe(14); + expect(secondPlainDateTime.nanosecond).toBe(15); + }); +});