Przeglądaj źródła

LibJS: Implement Temporal.PlainDate.prototype.day

Idan Horowitz 4 lat temu
rodzic
commit
59dc0e8421

+ 21 - 0
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);
     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<RangeError>(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
 // 12.1.21 ToTemporalCalendar ( temporalCalendarLike ), https://tc39.es/proposal-temporal/#sec-temporal-totemporalcalendar
 Object* to_temporal_calendar(GlobalObject& global_object, Value temporal_calendar_like)
 Object* to_temporal_calendar(GlobalObject& global_object, Value temporal_calendar_like)
 {
 {

+ 1 - 0
Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h

@@ -37,6 +37,7 @@ Vector<String> calendar_fields(GlobalObject&, Object& calendar, Vector<StringVie
 double calendar_year(GlobalObject&, Object& calendar, Object& date_like);
 double calendar_year(GlobalObject&, Object& calendar, Object& date_like);
 double calendar_month(GlobalObject&, Object& calendar, Object& date_like);
 double calendar_month(GlobalObject&, Object& calendar, Object& date_like);
 String calendar_month_code(GlobalObject&, Object& calendar, Object& date_like);
 String calendar_month_code(GlobalObject&, Object& calendar, Object& date_like);
+double calendar_day(GlobalObject&, Object& calendar, Object& date_like);
 Object* to_temporal_calendar(GlobalObject&, Value);
 Object* to_temporal_calendar(GlobalObject&, Value);
 Object* to_temporal_calendar_with_iso_default(GlobalObject&, Value);
 Object* to_temporal_calendar_with_iso_default(GlobalObject&, Value);
 Object* get_temporal_calendar_with_iso_default(GlobalObject&, Object&);
 Object* get_temporal_calendar_with_iso_default(GlobalObject&, Object&);

+ 17 - 0
Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp

@@ -30,6 +30,7 @@ void PlainDatePrototype::initialize(GlobalObject& global_object)
     define_native_accessor(vm.names.year, year_getter, {}, Attribute::Configurable);
     define_native_accessor(vm.names.year, year_getter, {}, Attribute::Configurable);
     define_native_accessor(vm.names.month, month_getter, {}, Attribute::Configurable);
     define_native_accessor(vm.names.month, month_getter, {}, Attribute::Configurable);
     define_native_accessor(vm.names.monthCode, month_code_getter, {}, Attribute::Configurable);
     define_native_accessor(vm.names.monthCode, month_code_getter, {}, Attribute::Configurable);
+    define_native_accessor(vm.names.day, day_getter, {}, Attribute::Configurable);
 
 
     u8 attr = Attribute::Writable | Attribute::Configurable;
     u8 attr = Attribute::Writable | Attribute::Configurable;
     define_native_function(vm.names.withCalendar, with_calendar, 1, attr);
     define_native_function(vm.names.withCalendar, with_calendar, 1, attr);
@@ -111,6 +112,22 @@ JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::month_code_getter)
     return js_string(vm, calendar_month_code(global_object, calendar, *temporal_date));
     return js_string(vm, calendar_month_code(global_object, calendar, *temporal_date));
 }
 }
 
 
+// 3.3.7 get Temporal.PlainDate.prototype.day, https://tc39.es/proposal-temporal/#sec-get-temporal.plaindate.prototype.day
+JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::day_getter)
+{
+    // 1. Let temporalDate be the this value.
+    // 2. Perform ? RequireInternalSlot(temporalDate, [[InitializedTemporalDate]]).
+    auto* temporal_date = typed_this(global_object);
+    if (vm.exception())
+        return {};
+
+    // 3. Let calendar be temporalDate.[[Calendar]].
+    auto& calendar = temporal_date->calendar();
+
+    // 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
 // 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)
 JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::with_calendar)
 {
 {

+ 1 - 0
Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h

@@ -23,6 +23,7 @@ private:
     JS_DECLARE_NATIVE_FUNCTION(year_getter);
     JS_DECLARE_NATIVE_FUNCTION(year_getter);
     JS_DECLARE_NATIVE_FUNCTION(month_getter);
     JS_DECLARE_NATIVE_FUNCTION(month_getter);
     JS_DECLARE_NATIVE_FUNCTION(month_code_getter);
     JS_DECLARE_NATIVE_FUNCTION(month_code_getter);
+    JS_DECLARE_NATIVE_FUNCTION(day_getter);
 
 
     JS_DECLARE_NATIVE_FUNCTION(with_calendar);
     JS_DECLARE_NATIVE_FUNCTION(with_calendar);
     JS_DECLARE_NATIVE_FUNCTION(equals);
     JS_DECLARE_NATIVE_FUNCTION(equals);

+ 14 - 0
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");
+    });
+});