Browse Source

LibJS: Implement Temporal.Now.plainDateTimeISO()

Linus Groh 4 years ago
parent
commit
af3a26f4cc

+ 1 - 0
Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h

@@ -285,6 +285,7 @@ namespace JS {
     P(plainDate)                             \
     P(plainDate)                             \
     P(plainDateISO)                          \
     P(plainDateISO)                          \
     P(plainDateTime)                         \
     P(plainDateTime)                         \
+    P(plainDateTimeISO)                      \
     P(pop)                                   \
     P(pop)                                   \
     P(pow)                                   \
     P(pow)                                   \
     P(preventExtensions)                     \
     P(preventExtensions)                     \

+ 15 - 0
Userland/Libraries/LibJS/Runtime/Temporal/Now.cpp

@@ -35,6 +35,7 @@ void Now::initialize(GlobalObject& global_object)
     define_native_function(vm.names.timeZone, time_zone, 0, attr);
     define_native_function(vm.names.timeZone, time_zone, 0, attr);
     define_native_function(vm.names.instant, instant, 0, attr);
     define_native_function(vm.names.instant, instant, 0, attr);
     define_native_function(vm.names.plainDateTime, plain_date_time, 1, attr);
     define_native_function(vm.names.plainDateTime, plain_date_time, 1, attr);
+    define_native_function(vm.names.plainDateTimeISO, plain_date_time_iso, 0, attr);
     define_native_function(vm.names.plainDate, plain_date, 1, attr);
     define_native_function(vm.names.plainDate, plain_date, 1, attr);
     define_native_function(vm.names.plainDateISO, plain_date_iso, 0, attr);
     define_native_function(vm.names.plainDateISO, plain_date_iso, 0, attr);
 }
 }
@@ -63,6 +64,20 @@ JS_DEFINE_NATIVE_FUNCTION(Now::plain_date_time)
     return system_date_time(global_object, temporal_time_zone_like, calendar);
     return system_date_time(global_object, temporal_time_zone_like, calendar);
 }
 }
 
 
+// 2.1.4 Temporal.Now.plainDateTimeISO ( [ temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.plaindatetimeiso
+JS_DEFINE_NATIVE_FUNCTION(Now::plain_date_time_iso)
+{
+    auto temporal_time_zone_like = vm.argument(0);
+
+    // 1, Let calendar be ? GetISO8601Calendar().
+    auto* calendar = get_iso8601_calendar(global_object);
+    if (vm.exception())
+        return {};
+
+    // 2. Return ? SystemDateTime(temporalTimeZoneLike, calendar).
+    return system_date_time(global_object, temporal_time_zone_like, calendar);
+}
+
 // 2.1.7 Temporal.Now.plainDate ( calendar [ , temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.plaindate
 // 2.1.7 Temporal.Now.plainDate ( calendar [ , temporalTimeZoneLike ] ), https://tc39.es/proposal-temporal/#sec-temporal.now.plaindate
 JS_DEFINE_NATIVE_FUNCTION(Now::plain_date)
 JS_DEFINE_NATIVE_FUNCTION(Now::plain_date)
 {
 {

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

@@ -22,6 +22,7 @@ private:
     JS_DECLARE_NATIVE_FUNCTION(time_zone);
     JS_DECLARE_NATIVE_FUNCTION(time_zone);
     JS_DECLARE_NATIVE_FUNCTION(instant);
     JS_DECLARE_NATIVE_FUNCTION(instant);
     JS_DECLARE_NATIVE_FUNCTION(plain_date_time);
     JS_DECLARE_NATIVE_FUNCTION(plain_date_time);
+    JS_DECLARE_NATIVE_FUNCTION(plain_date_time_iso);
     JS_DECLARE_NATIVE_FUNCTION(plain_date);
     JS_DECLARE_NATIVE_FUNCTION(plain_date);
     JS_DECLARE_NATIVE_FUNCTION(plain_date_iso);
     JS_DECLARE_NATIVE_FUNCTION(plain_date_iso);
 };
 };

+ 31 - 0
Userland/Libraries/LibJS/Tests/builtins/Temporal/Now/Now.plainDateTimeISO.js

@@ -0,0 +1,31 @@
+describe("correct behavior", () => {
+    test("length is 0", () => {
+        expect(Temporal.Now.plainDateTimeISO).toHaveLength(0);
+    });
+
+    test("basic functionality", () => {
+        const plainDateTime = Temporal.Now.plainDateTimeISO();
+        expect(plainDateTime).toBeInstanceOf(Temporal.PlainDateTime);
+        expect(plainDateTime.calendar.id).toBe("iso8601");
+    });
+
+    test("custom time zone", () => {
+        const timeZone = {
+            getOffsetNanosecondsFor() {
+                return 86400000000000;
+            },
+        };
+        const plainDateTime = Temporal.Now.plainDateTimeISO();
+        const plainDateTimeWithOffset = Temporal.Now.plainDateTimeISO(timeZone);
+        // Yes, this will fail if a day, month, or year change happens between the above two lines :^)
+        // FIXME: enable these once the getters are implemented
+        // expect(plainDateTimeWithOffset.year).toBe(plainDateTime.year);
+        // expect(plainDateTimeWithOffset.month).toBe(plainDateTime.month);
+        // expect(plainDateTimeWithOffset.day).toBe(plainDateTime.day + 1);
+        // expect(plainDateTimeWithOffset.hour).not.toBe(plainDateTime.hour);
+        // expect(plainDateTimeWithOffset.minute).not.toBe(plainDateTime.minute);
+        // expect(plainDateTimeWithOffset.second).not.toBe(plainDateTime.second);
+        // expect(plainDateTimeWithOffset.millisecond).not.toBe(plainDateTime.millisecond);
+        // microsecond, and nanosecond not checked here as they could easily be the same for both
+    });
+});