From 59dc0e8421c320b496c84bdcb918ec06c80e4246 Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Fri, 23 Jul 2021 17:08:07 +0300 Subject: [PATCH] LibJS: Implement Temporal.PlainDate.prototype.day --- .../LibJS/Runtime/Temporal/Calendar.cpp | 21 +++++++++++++++++++ .../LibJS/Runtime/Temporal/Calendar.h | 1 + .../Runtime/Temporal/PlainDatePrototype.cpp | 17 +++++++++++++++ .../Runtime/Temporal/PlainDatePrototype.h | 1 + .../PlainDate/PlainDate.prototype.day.js | 14 +++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.day.js diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp index 6e64673d0c..e7b2e07dd3 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp @@ -182,6 +182,27 @@ String calendar_month_code(GlobalObject& global_object, Object& calendar, Object return result.to_string(global_object); } +// 12.1.12 CalendarDay ( calendar, dateLike ), https://tc39.es/proposal-temporal/#sec-temporal-calendarday +double calendar_day(GlobalObject& global_object, Object& calendar, Object& date_like) +{ + auto& vm = global_object.vm(); + // 1. Assert: Type(calendar) is Object. + + // 2. Let result be ? Invoke(calendar, "day", « dateLike »). + auto result = calendar.invoke(vm.names.day, &date_like); + if (vm.exception()) + return {}; + + // 3. If result is undefined, throw a RangeError exception. + if (result.is_undefined()) { + vm.throw_exception(global_object, ErrorType::TemporalInvalidCalendarFunctionResult, vm.names.day.as_string()); + return {}; + } + + // 4. Return ? ToPositiveIntegerOrInfinity(result). + return to_positive_integer_or_infinity(global_object, result); +} + // 12.1.21 ToTemporalCalendar ( temporalCalendarLike ), https://tc39.es/proposal-temporal/#sec-temporal-totemporalcalendar Object* to_temporal_calendar(GlobalObject& global_object, Value temporal_calendar_like) { diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h index 95f0cd37cf..a822542c27 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h @@ -37,6 +37,7 @@ Vector calendar_fields(GlobalObject&, Object& calendar, Vectorcalendar(); + + // 4. Return ? CalendarDay(calendar, temporalDate). + return Value(calendar_day(global_object, calendar, *temporal_date)); +} + // 3.3.22 Temporal.PlainDate.prototype.withCalendar ( calendar ), https://tc39.es/proposal-temporal/#sec-temporal.plaindate.prototype.withcalendar JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::with_calendar) { diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h index 0288e2033c..26e9e83e41 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h @@ -23,6 +23,7 @@ private: JS_DECLARE_NATIVE_FUNCTION(year_getter); JS_DECLARE_NATIVE_FUNCTION(month_getter); JS_DECLARE_NATIVE_FUNCTION(month_code_getter); + JS_DECLARE_NATIVE_FUNCTION(day_getter); JS_DECLARE_NATIVE_FUNCTION(with_calendar); JS_DECLARE_NATIVE_FUNCTION(equals); diff --git a/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.day.js b/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.day.js new file mode 100644 index 0000000000..3f71be275f --- /dev/null +++ b/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.day.js @@ -0,0 +1,14 @@ +describe("correct behavior", () => { + test("basic functionality", () => { + const date = new Temporal.PlainDate(2021, 7, 23); + expect(date.day).toBe(23); + }); +}); + +test("errors", () => { + test("this value must be a Temporal.PlainDate object", () => { + expect(() => { + Reflect.get(Temporal.PlainDate.prototype, "day", "foo"); + }).toThrowWithMessage(TypeError, "Not a Temporal.PlainDate"); + }); +});