diff --git a/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp b/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp index 8f4709ffb3c..61afdedebc5 100644 --- a/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp +++ b/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp @@ -79,6 +79,7 @@ void ZonedDateTimePrototype::initialize(Realm& realm) define_native_function(realm, vm.names.toLocaleString, to_locale_string, 0, attr); define_native_function(realm, vm.names.toJSON, to_json, 0, attr); define_native_function(realm, vm.names.valueOf, value_of, 0, attr); + define_native_function(realm, vm.names.startOfDay, start_of_day, 0, attr); } // 6.3.3 get Temporal.ZonedDateTime.prototype.calendarId, https://tc39.es/proposal-temporal/#sec-get-temporal.zoneddatetime.prototype.calendarid @@ -808,4 +809,27 @@ JS_DEFINE_NATIVE_FUNCTION(ZonedDateTimePrototype::value_of) return vm.throw_completion(ErrorType::Convert, "Temporal.ZonedDateTime", "a primitive value"); } +// 6.3.45 Temporal.ZonedDateTime.prototype.startOfDay ( ), https://tc39.es/proposal-temporal/#sec-temporal.zoneddatetime.prototype.startofday +JS_DEFINE_NATIVE_FUNCTION(ZonedDateTimePrototype::start_of_day) +{ + // 1. Let zonedDateTime be the this value. + // 2. Perform ? RequireInternalSlot(zonedDateTime, [[InitializedTemporalZonedDateTime]]). + auto zoned_date_time = TRY(typed_this_object(vm)); + + // 3. Let timeZone be zonedDateTime.[[TimeZone]]. + auto const& time_zone = zoned_date_time->time_zone(); + + // 4. Let calendar be zonedDateTime.[[Calendar]]. + auto const& calendar = zoned_date_time->calendar(); + + // 5. Let isoDateTime be GetISODateTimeFor(timeZone, zonedDateTime.[[EpochNanoseconds]]). + auto iso_date_time = get_iso_date_time_for(time_zone, zoned_date_time->epoch_nanoseconds()->big_integer()); + + // 6. Let epochNanoseconds be ? GetStartOfDay(timeZone, isoDateTime.[[ISODate]]). + auto epoch_nanoseconds = TRY(get_start_of_day(vm, time_zone, iso_date_time.iso_date)); + + // 7. Return ! CreateTemporalZonedDateTime(epochNanoseconds, timeZone, calendar). + return MUST(create_temporal_zoned_date_time(vm, BigInt::create(vm, move(epoch_nanoseconds)), time_zone, calendar)); +} + } diff --git a/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.h b/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.h index 2dfe821e3f2..d52dfa195d0 100644 --- a/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.h +++ b/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.h @@ -65,6 +65,7 @@ private: JS_DECLARE_NATIVE_FUNCTION(to_locale_string); JS_DECLARE_NATIVE_FUNCTION(to_json); JS_DECLARE_NATIVE_FUNCTION(value_of); + JS_DECLARE_NATIVE_FUNCTION(start_of_day); }; } diff --git a/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.startOfDay.js b/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.startOfDay.js new file mode 100644 index 00000000000..8cd77b868d1 --- /dev/null +++ b/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.startOfDay.js @@ -0,0 +1,42 @@ +describe("correct behavior", () => { + test("length is 0", () => { + expect(Temporal.ZonedDateTime.prototype.startOfDay).toHaveLength(0); + }); + + test("basic functionality", () => { + const plainDateTime = new Temporal.PlainDateTime(2021, 11, 3, 20, 9, 45, 100, 200, 300); + const zonedDateTime = plainDateTime.toZonedDateTime("UTC"); + const startOfDayZonedDateTime = zonedDateTime.startOfDay(); + + expect(startOfDayZonedDateTime.epochNanoseconds).toBe(1635897600000000000n); + expect(startOfDayZonedDateTime.epochMilliseconds).toBe(1635897600000); + expect(startOfDayZonedDateTime.year).toBe(2021); + expect(startOfDayZonedDateTime.month).toBe(11); + expect(startOfDayZonedDateTime.monthCode).toBe("M11"); + expect(startOfDayZonedDateTime.day).toBe(3); + expect(startOfDayZonedDateTime.hour).toBe(0); + expect(startOfDayZonedDateTime.minute).toBe(0); + expect(startOfDayZonedDateTime.second).toBe(0); + expect(startOfDayZonedDateTime.millisecond).toBe(0); + expect(startOfDayZonedDateTime.microsecond).toBe(0); + expect(startOfDayZonedDateTime.nanosecond).toBe(0); + expect(startOfDayZonedDateTime.dayOfWeek).toBe(3); + expect(startOfDayZonedDateTime.dayOfYear).toBe(307); + expect(startOfDayZonedDateTime.weekOfYear).toBe(44); + expect(startOfDayZonedDateTime.hoursInDay).toBe(24); + expect(startOfDayZonedDateTime.daysInWeek).toBe(7); + expect(startOfDayZonedDateTime.daysInYear).toBe(365); + expect(startOfDayZonedDateTime.monthsInYear).toBe(12); + expect(startOfDayZonedDateTime.inLeapYear).toBeFalse(); + expect(startOfDayZonedDateTime.offset).toBe("+00:00"); + expect(startOfDayZonedDateTime.offsetNanoseconds).toBe(0); + }); +}); + +describe("errors", () => { + test("this value must be a Temporal.ZonedDateTime object", () => { + expect(() => { + Temporal.ZonedDateTime.prototype.startOfDay.call("foo"); + }).toThrowWithMessage(TypeError, "Not an object of type Temporal.ZonedDateTime"); + }); +}); diff --git a/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.withPlainTime.js b/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.withPlainTime.js index 129833a69af..2bb51ce542d 100644 --- a/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.withPlainTime.js +++ b/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.withPlainTime.js @@ -53,42 +53,41 @@ describe("correct behavior", () => { checkCommonExpectedResults(withPlainTimeZonedDateTime); }); - // FIXME: Enable this test when we have ZonedDateTime.prototype.startOfDay - // test("passing no parameters is the equivalent of using startOfDay", () => { - // const plainDateTime = new Temporal.PlainDateTime(2021, 11, 4, 21, 16, 56, 100, 200, 300); - // const zonedDateTime = plainDateTime.toZonedDateTime("UTC"); - // const startOfDayZonedDateTime = zonedDateTime.startOfDay(); - // const withPlainTimeZonedDateTime = zonedDateTime.withPlainTime(); + test("passing no parameters is the equivalent of using startOfDay", () => { + const plainDateTime = new Temporal.PlainDateTime(2021, 11, 4, 21, 16, 56, 100, 200, 300); + const zonedDateTime = plainDateTime.toZonedDateTime("UTC"); + const startOfDayZonedDateTime = zonedDateTime.startOfDay(); + const withPlainTimeZonedDateTime = zonedDateTime.withPlainTime(); - // expect(startOfDayZonedDateTime.epochNanoseconds).toBe( - // withPlainTimeZonedDateTime.epochNanoseconds - // ); - // expect(startOfDayZonedDateTime.epochMilliseconds).toBe( - // withPlainTimeZonedDateTime.epochMilliseconds - // ); - // expect(startOfDayZonedDateTime.year).toBe(withPlainTimeZonedDateTime.year); - // expect(startOfDayZonedDateTime.month).toBe(withPlainTimeZonedDateTime.month); - // expect(startOfDayZonedDateTime.monthCode).toBe(withPlainTimeZonedDateTime.monthCode); - // expect(startOfDayZonedDateTime.day).toBe(withPlainTimeZonedDateTime.day); - // expect(startOfDayZonedDateTime.hour).toBe(withPlainTimeZonedDateTime.hour); - // expect(startOfDayZonedDateTime.minute).toBe(withPlainTimeZonedDateTime.minute); - // expect(startOfDayZonedDateTime.second).toBe(withPlainTimeZonedDateTime.second); - // expect(startOfDayZonedDateTime.millisecond).toBe(withPlainTimeZonedDateTime.millisecond); - // expect(startOfDayZonedDateTime.microsecond).toBe(withPlainTimeZonedDateTime.microsecond); - // expect(startOfDayZonedDateTime.nanosecond).toBe(withPlainTimeZonedDateTime.nanosecond); - // expect(startOfDayZonedDateTime.dayOfWeek).toBe(withPlainTimeZonedDateTime.dayOfWeek); - // expect(startOfDayZonedDateTime.dayOfYear).toBe(withPlainTimeZonedDateTime.dayOfYear); - // expect(startOfDayZonedDateTime.weekOfYear).toBe(withPlainTimeZonedDateTime.weekOfYear); - // expect(startOfDayZonedDateTime.hoursInDay).toBe(withPlainTimeZonedDateTime.hoursInDay); - // expect(startOfDayZonedDateTime.daysInWeek).toBe(withPlainTimeZonedDateTime.daysInWeek); - // expect(startOfDayZonedDateTime.daysInYear).toBe(withPlainTimeZonedDateTime.daysInYear); - // expect(startOfDayZonedDateTime.monthsInYear).toBe(withPlainTimeZonedDateTime.monthsInYear); - // expect(startOfDayZonedDateTime.inLeapYear).toBe(withPlainTimeZonedDateTime.inLeapYear); - // expect(startOfDayZonedDateTime.offset).toBe(withPlainTimeZonedDateTime.offset); - // expect(startOfDayZonedDateTime.offsetNanoseconds).toBe( - // withPlainTimeZonedDateTime.offsetNanoseconds - // ); - // }); + expect(startOfDayZonedDateTime.epochNanoseconds).toBe( + withPlainTimeZonedDateTime.epochNanoseconds + ); + expect(startOfDayZonedDateTime.epochMilliseconds).toBe( + withPlainTimeZonedDateTime.epochMilliseconds + ); + expect(startOfDayZonedDateTime.year).toBe(withPlainTimeZonedDateTime.year); + expect(startOfDayZonedDateTime.month).toBe(withPlainTimeZonedDateTime.month); + expect(startOfDayZonedDateTime.monthCode).toBe(withPlainTimeZonedDateTime.monthCode); + expect(startOfDayZonedDateTime.day).toBe(withPlainTimeZonedDateTime.day); + expect(startOfDayZonedDateTime.hour).toBe(withPlainTimeZonedDateTime.hour); + expect(startOfDayZonedDateTime.minute).toBe(withPlainTimeZonedDateTime.minute); + expect(startOfDayZonedDateTime.second).toBe(withPlainTimeZonedDateTime.second); + expect(startOfDayZonedDateTime.millisecond).toBe(withPlainTimeZonedDateTime.millisecond); + expect(startOfDayZonedDateTime.microsecond).toBe(withPlainTimeZonedDateTime.microsecond); + expect(startOfDayZonedDateTime.nanosecond).toBe(withPlainTimeZonedDateTime.nanosecond); + expect(startOfDayZonedDateTime.dayOfWeek).toBe(withPlainTimeZonedDateTime.dayOfWeek); + expect(startOfDayZonedDateTime.dayOfYear).toBe(withPlainTimeZonedDateTime.dayOfYear); + expect(startOfDayZonedDateTime.weekOfYear).toBe(withPlainTimeZonedDateTime.weekOfYear); + expect(startOfDayZonedDateTime.hoursInDay).toBe(withPlainTimeZonedDateTime.hoursInDay); + expect(startOfDayZonedDateTime.daysInWeek).toBe(withPlainTimeZonedDateTime.daysInWeek); + expect(startOfDayZonedDateTime.daysInYear).toBe(withPlainTimeZonedDateTime.daysInYear); + expect(startOfDayZonedDateTime.monthsInYear).toBe(withPlainTimeZonedDateTime.monthsInYear); + expect(startOfDayZonedDateTime.inLeapYear).toBe(withPlainTimeZonedDateTime.inLeapYear); + expect(startOfDayZonedDateTime.offset).toBe(withPlainTimeZonedDateTime.offset); + expect(startOfDayZonedDateTime.offsetNanoseconds).toBe( + withPlainTimeZonedDateTime.offsetNanoseconds + ); + }); test("from plain time string", () => { const plainDateTime = new Temporal.PlainDateTime(2021, 11, 4, 21, 16, 56, 100, 200, 300);