summaryrefslogtreecommitdiff
path: root/Userland
diff options
context:
space:
mode:
authorLinus Groh <mail@linusgroh.de>2021-11-02 17:47:23 +0100
committerLinus Groh <mail@linusgroh.de>2021-11-02 18:40:37 +0100
commite27bb940383ae912bd72d66a5a08344409ee6dac (patch)
tree5f6dc09c261027f8348e21c4c66fa4e896b9c41b /Userland
parentfc411695c76554cf1907121a851441a574498c49 (diff)
downloadserenity-e27bb940383ae912bd72d66a5a08344409ee6dac.zip
LibJS: Implement Temporal.PlainDate.prototype.toZonedDateTime()
Diffstat (limited to 'Userland')
-rw-r--r--Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h1
-rw-r--r--Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp68
-rw-r--r--Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h1
-rw-r--r--Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.toZonedDateTime.js86
4 files changed, 156 insertions, 0 deletions
diff --git a/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h b/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h
index 50e60386ac..93bd2d757a 100644
--- a/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h
+++ b/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h
@@ -342,6 +342,7 @@ namespace JS {
P(plainDateISO) \
P(plainDateTime) \
P(plainDateTimeISO) \
+ P(plainTime) \
P(plainTimeISO) \
P(pop) \
P(pow) \
diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp
index 62d6c88a1e..854f599c21 100644
--- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp
+++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.cpp
@@ -9,12 +9,15 @@
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Temporal/AbstractOperations.h>
#include <LibJS/Runtime/Temporal/Calendar.h>
+#include <LibJS/Runtime/Temporal/Instant.h>
#include <LibJS/Runtime/Temporal/PlainDate.h>
#include <LibJS/Runtime/Temporal/PlainDatePrototype.h>
#include <LibJS/Runtime/Temporal/PlainDateTime.h>
#include <LibJS/Runtime/Temporal/PlainMonthDay.h>
#include <LibJS/Runtime/Temporal/PlainTime.h>
#include <LibJS/Runtime/Temporal/PlainYearMonth.h>
+#include <LibJS/Runtime/Temporal/TimeZone.h>
+#include <LibJS/Runtime/Temporal/ZonedDateTime.h>
namespace JS::Temporal {
@@ -58,6 +61,7 @@ void PlainDatePrototype::initialize(GlobalObject& global_object)
define_native_function(vm.names.withCalendar, with_calendar, 1, attr);
define_native_function(vm.names.equals, equals, 1, attr);
define_native_function(vm.names.toPlainDateTime, to_plain_date_time, 0, attr);
+ define_native_function(vm.names.toZonedDateTime, to_zoned_date_time, 1, attr);
define_native_function(vm.names.toString, to_string, 0, attr);
define_native_function(vm.names.toLocaleString, to_locale_string, 0, attr);
define_native_function(vm.names.toJSON, to_json, 0, attr);
@@ -431,6 +435,70 @@ JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::to_plain_date_time)
return TRY(create_temporal_date_time(global_object, temporal_date->iso_year(), temporal_date->iso_month(), temporal_date->iso_day(), temporal_time->iso_hour(), temporal_time->iso_minute(), temporal_time->iso_second(), temporal_time->iso_millisecond(), temporal_time->iso_microsecond(), temporal_time->iso_nanosecond(), temporal_date->calendar()));
}
+// 3.3.27 Temporal.PlainDate.prototype.toZonedDateTime ( item ), https://tc39.es/proposal-temporal/#sec-temporal.plaindatetime.prototype.tozoneddatetime
+JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::to_zoned_date_time)
+{
+ auto item = vm.argument(0);
+
+ // 1. Let temporalDate be the this value.
+ // 2. Perform ? RequireInternalSlot(temporalDate, [[InitializedTemporalDate]]).
+ auto* temporal_date = TRY(typed_this_object(global_object));
+
+ auto temporal_time_value = js_undefined();
+ Object* time_zone;
+
+ // 3. If Type(item) is Object, then
+ if (item.is_object()) {
+ // a. Let timeZoneLike be ? Get(item, "timeZone").
+ auto time_zone_like = TRY(item.as_object().get(vm.names.timeZone));
+
+ // b. If timeZoneLike is undefined, then
+ if (time_zone_like.is_undefined()) {
+ // i. Let timeZone be ? ToTemporalTimeZone(item).
+ time_zone = TRY(to_temporal_time_zone(global_object, item));
+
+ // ii. Let temporalTime be undefined.
+ }
+ // c. Else,
+ else {
+ // i. Let timeZone be ? ToTemporalTimeZone(timeZoneLike).
+ time_zone = TRY(to_temporal_time_zone(global_object, time_zone_like));
+
+ // ii. Let temporalTime be ? Get(item, "plainTime").
+ temporal_time_value = TRY(item.as_object().get(vm.names.plainTime));
+ }
+ }
+ // 4. Else,
+ else {
+ // a. Let timeZone be ? ToTemporalTimeZone(item).
+ time_zone = TRY(to_temporal_time_zone(global_object, item));
+
+ // b. Let temporalTime be undefined.
+ }
+
+ PlainDateTime* temporal_date_time;
+
+ // 5. If temporalTime is undefined, then
+ if (temporal_time_value.is_undefined()) {
+ // a. Let temporalDateTime be ? CreateTemporalDateTime(temporalDate.[[ISOYear]], temporalDate.[[ISOMonth]], temporalDate.[[ISODay]], 0, 0, 0, 0, 0, 0, temporalDate.[[Calendar]]).
+ temporal_date_time = TRY(create_temporal_date_time(global_object, temporal_date->iso_year(), temporal_date->iso_month(), temporal_date->iso_day(), 0, 0, 0, 0, 0, 0, temporal_date->calendar()));
+ }
+ // 6. Else,
+ else {
+ // a. Set temporalTime to ? ToTemporalTime(temporalTime).
+ auto* temporal_time = TRY(to_temporal_time(global_object, temporal_time_value));
+
+ // b. Let temporalDateTime be ? CreateTemporalDateTime(temporalDate.[[ISOYear]], temporalDate.[[ISOMonth]], temporalDate.[[ISODay]], temporalTime.[[ISOHour]], temporalTime.[[ISOMinute]], temporalTime.[[ISOSecond]], temporalTime.[[ISOMillisecond]], temporalTime.[[ISOMicrosecond]], temporalTime.[[ISONanosecond]], temporalDate.[[Calendar]]).
+ temporal_date_time = TRY(create_temporal_date_time(global_object, temporal_date->iso_year(), temporal_date->iso_month(), temporal_date->iso_day(), temporal_time->iso_hour(), temporal_time->iso_minute(), temporal_time->iso_second(), temporal_time->iso_millisecond(), temporal_time->iso_microsecond(), temporal_time->iso_nanosecond(), temporal_time->calendar()));
+ }
+
+ // 7. Let instant be ? BuiltinTimeZoneGetInstantFor(timeZone, temporalDateTime, "compatible").
+ auto* instant = TRY(builtin_time_zone_get_instant_for(global_object, time_zone, *temporal_date_time, "compatible"sv));
+
+ // 8. Return ! CreateTemporalZonedDateTime(instant.[[Nanoseconds]], timeZone, temporalDate.[[Calendar]]).
+ return MUST(create_temporal_zoned_date_time(global_object, instant->nanoseconds(), *time_zone, temporal_date->calendar()));
+}
+
// 3.3.28 Temporal.PlainDate.prototype.toString ( [ options ] ), https://tc39.es/proposal-temporal/#sec-temporal.plaindate.prototype.tostring
JS_DEFINE_NATIVE_FUNCTION(PlainDatePrototype::to_string)
{
diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h
index 4f73104599..8d7c6e4fc8 100644
--- a/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h
+++ b/Userland/Libraries/LibJS/Runtime/Temporal/PlainDatePrototype.h
@@ -43,6 +43,7 @@ private:
JS_DECLARE_NATIVE_FUNCTION(with_calendar);
JS_DECLARE_NATIVE_FUNCTION(equals);
JS_DECLARE_NATIVE_FUNCTION(to_plain_date_time);
+ JS_DECLARE_NATIVE_FUNCTION(to_zoned_date_time);
JS_DECLARE_NATIVE_FUNCTION(to_string);
JS_DECLARE_NATIVE_FUNCTION(to_locale_string);
JS_DECLARE_NATIVE_FUNCTION(to_json);
diff --git a/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.toZonedDateTime.js b/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.toZonedDateTime.js
new file mode 100644
index 0000000000..f6c57d8908
--- /dev/null
+++ b/Userland/Libraries/LibJS/Tests/builtins/Temporal/PlainDate/PlainDate.prototype.toZonedDateTime.js
@@ -0,0 +1,86 @@
+describe("correct behavior", () => {
+ test("length is 1", () => {
+ expect(Temporal.PlainDate.prototype.toZonedDateTime).toHaveLength(1);
+ });
+
+ test("basic functionality - time zone", () => {
+ // 3.b. in the spec
+ const plainDate = new Temporal.PlainDate(2021, 7, 6);
+ const timeZone = new Temporal.TimeZone("UTC");
+ const zonedDateTime = plainDate.toZonedDateTime(timeZone);
+ expect(zonedDateTime.year).toBe(2021);
+ expect(zonedDateTime.month).toBe(7);
+ expect(zonedDateTime.day).toBe(6);
+ expect(zonedDateTime.hour).toBe(0);
+ expect(zonedDateTime.minute).toBe(0);
+ expect(zonedDateTime.second).toBe(0);
+ expect(zonedDateTime.millisecond).toBe(0);
+ expect(zonedDateTime.microsecond).toBe(0);
+ expect(zonedDateTime.nanosecond).toBe(0);
+ expect(zonedDateTime.calendar).toBe(plainDate.calendar);
+ expect(zonedDateTime.timeZone).toBe(timeZone);
+ });
+
+ test("basic functionality - time zone like object", () => {
+ // 3.c. in the spec
+ const plainDate = new Temporal.PlainDate(2021, 7, 6);
+ const timeZone = new Temporal.TimeZone("UTC");
+ const zonedDateTime = plainDate.toZonedDateTime({ timeZone });
+ expect(zonedDateTime.year).toBe(2021);
+ expect(zonedDateTime.month).toBe(7);
+ expect(zonedDateTime.day).toBe(6);
+ expect(zonedDateTime.hour).toBe(0);
+ expect(zonedDateTime.minute).toBe(0);
+ expect(zonedDateTime.second).toBe(0);
+ expect(zonedDateTime.millisecond).toBe(0);
+ expect(zonedDateTime.microsecond).toBe(0);
+ expect(zonedDateTime.nanosecond).toBe(0);
+ expect(zonedDateTime.calendar).toBe(plainDate.calendar);
+ expect(zonedDateTime.timeZone).toBe(timeZone);
+ });
+
+ test("basic functionality - time zone like object and plain time", () => {
+ // 3.c. in the spec
+ const plainDate = new Temporal.PlainDate(2021, 7, 6);
+ const plainTime = new Temporal.PlainTime(18, 14, 47, 123, 456, 789);
+ const timeZone = new Temporal.TimeZone("UTC");
+ const zonedDateTime = plainDate.toZonedDateTime({ timeZone, plainTime });
+ expect(zonedDateTime.year).toBe(2021);
+ expect(zonedDateTime.month).toBe(7);
+ expect(zonedDateTime.day).toBe(6);
+ expect(zonedDateTime.hour).toBe(18);
+ expect(zonedDateTime.minute).toBe(14);
+ expect(zonedDateTime.second).toBe(47);
+ expect(zonedDateTime.millisecond).toBe(123);
+ expect(zonedDateTime.microsecond).toBe(456);
+ expect(zonedDateTime.nanosecond).toBe(789);
+ expect(zonedDateTime.calendar).toBe(plainDate.calendar);
+ expect(zonedDateTime.timeZone).toBe(timeZone);
+ });
+
+ // TODO: Enable when parse_temporal_time_zone_string() is fully implemented
+ test.skip("basic functionality - time zone identifier", () => {
+ // 4. in the spec
+ const plainDate = new Temporal.PlainDate(2021, 7, 6);
+ const zonedDateTime = plainDate.toZonedDateTime("UTC");
+ expect(zonedDateTime.year).toBe(2021);
+ expect(zonedDateTime.month).toBe(7);
+ expect(zonedDateTime.day).toBe(6);
+ expect(zonedDateTime.hour).toBe(0);
+ expect(zonedDateTime.minute).toBe(0);
+ expect(zonedDateTime.second).toBe(0);
+ expect(zonedDateTime.millisecond).toBe(0);
+ expect(zonedDateTime.microsecond).toBe(0);
+ expect(zonedDateTime.nanosecond).toBe(0);
+ expect(zonedDateTime.calendar).toBe(plainDate.calendar);
+ expect(zonedDateTime.timeZone.id).toBe("UTC");
+ });
+});
+
+describe("errors", () => {
+ test("this value must be a Temporal.PlainDate object", () => {
+ expect(() => {
+ Temporal.PlainDate.prototype.toZonedDateTime.call("foo");
+ }).toThrowWithMessage(TypeError, "Not an object of type Temporal.PlainDate");
+ });
+});