summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIdan Horowitz <idan.horowitz@gmail.com>2021-07-23 16:39:58 +0300
committerLinus Groh <mail@linusgroh.de>2021-07-23 22:00:23 +0100
commit8434ca6c4b67845840192cfd2faa9c7b23b13b15 (patch)
treef934a1a126fc8c20cee685b43b71c105beac57a6
parent3895a8354d18e1f0b72d9a3fe53b7b71917e4f6c (diff)
downloadserenity-8434ca6c4b67845840192cfd2faa9c7b23b13b15.zip
LibJS: Implement Temporal.PlainDate.prototype.year
-rw-r--r--Userland/Libraries/LibJS/Runtime/ErrorTypes.h1
-rw-r--r--Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp21
-rw-r--r--Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h1
-rw-r--r--Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp17
-rw-r--r--Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h1
-rw-r--r--Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.year.js14
6 files changed, 55 insertions, 0 deletions
diff --git a/Userland/Libraries/LibJS/Runtime/ErrorTypes.h b/Userland/Libraries/LibJS/Runtime/ErrorTypes.h
index cc296cefe6..18052606d8 100644
--- a/Userland/Libraries/LibJS/Runtime/ErrorTypes.h
+++ b/Userland/Libraries/LibJS/Runtime/ErrorTypes.h
@@ -166,6 +166,7 @@
M(StringNonGlobalRegExp, "RegExp argument is non-global") \
M(StringRawCannotConvert, "Cannot convert property 'raw' to object from {}") \
M(StringRepeatCountMustBe, "repeat count must be a {} number") \
+ M(TemporalInvalidCalendarFunctionResult, "Invalid calendar, {}() function returned undefined") \
M(TemporalInvalidCalendarIdentifier, "Invalid calendar identifier '{}'") \
M(TemporalInvalidDuration, "Invalid duration") \
M(TemporalInvalidDurationLikeObject, "Invalid duration-like object") \
diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp
index d034f18472..3451c6eb38 100644
--- a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp
+++ b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp
@@ -119,6 +119,27 @@ Vector<String> calendar_fields(GlobalObject& global_object, Object& calendar, Ve
return result;
}
+// 12.1.9 CalendarYear ( calendar, dateLike ), https://tc39.es/proposal-temporal/#sec-temporal-calendaryear
+double calendar_year(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, "year", ยซ dateLike ยป).
+ auto result = calendar.invoke(vm.names.year, &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.year.as_string());
+ return {};
+ }
+
+ // 4. Return ? ToIntegerOrInfinity(result).
+ return result.to_integer_or_infinity(global_object);
+}
+
// 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 e4768be983..979cb1ef48 100644
--- a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h
+++ b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h
@@ -34,6 +34,7 @@ bool is_builtin_calendar(String const& identifier);
Calendar* get_builtin_calendar(GlobalObject&, String const& identifier);
Calendar* get_iso8601_calendar(GlobalObject&);
Vector<String> calendar_fields(GlobalObject&, Object& calendar, Vector<StringView> const& field_names);
+double calendar_year(GlobalObject&, Object& calendar, Object& date_like);
Object* to_temporal_calendar(GlobalObject&, Value);
Object* to_temporal_calendar_with_iso_default(GlobalObject&, Value);
Object* get_temporal_calendar_with_iso_default(GlobalObject&, Object&);
diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp
index d02492eefe..5129dccdd2 100644
--- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp
+++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp
@@ -27,6 +27,7 @@ void PlainDatePrototype::initialize(GlobalObject& global_object)
define_direct_property(*vm.well_known_symbol_to_string_tag(), js_string(vm.heap(), "Temporal.PlainDate"), Attribute::Configurable);
define_native_accessor(vm.names.calendar, calendar_getter, {}, Attribute::Configurable);
+ define_native_accessor(vm.names.year, year_getter, {}, Attribute::Configurable);
u8 attr = Attribute::Writable | Attribute::Configurable;
define_native_function(vm.names.withCalendar, with_calendar, 1, attr);
@@ -60,6 +61,22 @@ JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::calendar_getter)
return Value(&temporal_date->calendar());
}
+// 3.3.4 get Temporal.PlainDate.prototype.year, https://tc39.es/proposal-temporal/#sec-get-temporal.plaindate.prototype.year
+JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::year_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 ? CalendarYear(calendar, temporalDate).
+ return Value(calendar_year(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 a94d9ec9d6..d055e367f9 100644
--- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h
+++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h
@@ -20,6 +20,7 @@ public:
private:
JS_DECLARE_NATIVE_FUNCTION(calendar_getter);
+ JS_DECLARE_NATIVE_FUNCTION(year_getter);
JS_DECLARE_NATIVE_FUNCTION(with_calendar);
JS_DECLARE_NATIVE_FUNCTION(equals);
diff --git a/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.year.js b/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.year.js
new file mode 100644
index 0000000000..4536ab9950
--- /dev/null
+++ b/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.year.js
@@ -0,0 +1,14 @@
+describe("correct behavior", () => {
+ test("basic functionality", () => {
+ const date = new Temporal.PlainDate(2021, 7, 23);
+ expect(date.year).toBe(2021);
+ });
+});
+
+test("errors", () => {
+ test("this value must be a Temporal.PlainDate object", () => {
+ expect(() => {
+ Reflect.get(Temporal.PlainDate.prototype, "year", "foo");
+ }).toThrowWithMessage(TypeError, "Not a Temporal.PlainDate");
+ });
+});