From b42b7d5f16e755d6dbfec418494e2d870ae18c64 Mon Sep 17 00:00:00 2001
From: Linus Groh <mail@linusgroh.de>
Date: Fri, 19 Nov 2021 18:21:33 +0000
Subject: [PATCH] LibJS: Implement parsing of TemporalDateTimeString

---
 Userland/Libraries/LibJS/Runtime/ErrorTypes.h       |  1 +
 .../LibJS/Runtime/Temporal/AbstractOperations.cpp   | 13 +++++++++----
 .../Libraries/LibJS/Runtime/Temporal/ISO8601.cpp    | 13 +++++++++++--
 Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.h |  1 +
 .../ZonedDateTime.prototype.withPlainTime.js        |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/Userland/Libraries/LibJS/Runtime/ErrorTypes.h b/Userland/Libraries/LibJS/Runtime/ErrorTypes.h
index d919410e04..52e729d852 100644
--- a/Userland/Libraries/LibJS/Runtime/ErrorTypes.h
+++ b/Userland/Libraries/LibJS/Runtime/ErrorTypes.h
@@ -208,6 +208,7 @@
     M(TemporalInvalidCalendarFunctionResult, "Invalid calendar, {}() function returned {}")                                             \
     M(TemporalInvalidCalendarIdentifier, "Invalid calendar identifier '{}'")                                                            \
     M(TemporalInvalidDateString, "Invalid date string '{}'")                                                                            \
+    M(TemporalInvalidDateTimeString, "Invalid date time string '{}'")                                                                   \
     M(TemporalInvalidDuration, "Invalid duration")                                                                                      \
     M(TemporalInvalidDurationLikeObject, "Invalid duration-like object")                                                                \
     M(TemporalInvalidDurationPropertyValueNonIntegral, "Invalid value for duration property '{}': must be an integer, got {}")          \
diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp
index 02af6a4991..6b230cc4a3 100644
--- a/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp
+++ b/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp
@@ -1261,16 +1261,21 @@ ThrowCompletionOr<TemporalDate> parse_temporal_date_string(GlobalObject& global_
 }
 
 // 13.39 ParseTemporalDateTimeString ( isoString ), https://tc39.es/proposal-temporal/#sec-temporal-parsetemporaldatetimestring
-ThrowCompletionOr<ISODateTime> parse_temporal_date_time_string(GlobalObject& global_object, [[maybe_unused]] String const& iso_string)
+ThrowCompletionOr<ISODateTime> parse_temporal_date_time_string(GlobalObject& global_object, String const& iso_string)
 {
+    auto& vm = global_object.vm();
+
     // 1. Assert: Type(isoString) is String.
 
     // 2. If isoString does not satisfy the syntax of a TemporalDateTimeString (see 13.33), then
-    // a. Throw a RangeError exception.
-    // TODO
+    auto parse_result = parse_iso8601(Production::TemporalDateTimeString, iso_string);
+    if (!parse_result.has_value()) {
+        // a. Throw a RangeError exception.
+        return vm.throw_completion<RangeError>(global_object, ErrorType::TemporalInvalidDateTimeString, iso_string);
+    }
 
     // 3. Let result be ? ParseISODateTime(isoString).
-    auto result = TRY(parse_iso_date_time(global_object, {}));
+    auto result = TRY(parse_iso_date_time(global_object, *parse_result));
 
     // 4. Return result.
     return result;
diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.cpp
index 3162e9e232..f3b21b1942 100644
--- a/Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.cpp
+++ b/Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.cpp
@@ -467,10 +467,19 @@ bool ISO8601Parser::parse_temporal_date_string()
     return parse_calendar_date_time();
 }
 
+// https://tc39.es/proposal-temporal/#prod-TemporalDateTimeString
+bool ISO8601Parser::parse_temporal_date_time_string()
+{
+    // TemporalDateTimeString :
+    //     CalendarDateTime
+    return parse_calendar_date_time();
 }
 
-#define JS_ENUMERATE_ISO8601_PRODUCTION_PARSERS \
-    __JS_ENUMERATE(TemporalDateString, parse_temporal_date_string)
+}
+
+#define JS_ENUMERATE_ISO8601_PRODUCTION_PARSERS                    \
+    __JS_ENUMERATE(TemporalDateString, parse_temporal_date_string) \
+    __JS_ENUMERATE(TemporalDateTimeString, parse_temporal_date_time_string)
 
 Optional<ParseResult> parse_iso8601(Production production, StringView input)
 {
diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.h b/Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.h
index 3625d2421e..fde46751c5 100644
--- a/Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.h
+++ b/Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.h
@@ -77,6 +77,7 @@ public:
     [[nodiscard]] bool parse_date_time();
     [[nodiscard]] bool parse_calendar_date_time();
     [[nodiscard]] bool parse_temporal_date_string();
+    [[nodiscard]] bool parse_temporal_date_time_string();
 
 private:
     struct State {
diff --git a/Userland/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.withPlainTime.js b/Userland/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.withPlainTime.js
index f05634ba84..c2e0b65c91 100644
--- a/Userland/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.withPlainTime.js
+++ b/Userland/Libraries/LibJS/Tests/builtins/Temporal/ZonedDateTime/ZonedDateTime.prototype.withPlainTime.js
@@ -98,7 +98,7 @@ describe("correct behavior", () => {
         );
     });
 
-    // FIXME: Enable when time string parsing is implemented.
+    // FIXME: This currently yields an incorrect result (epochNanoseconds = 1635984000000000000)
     test.skip("from plain time string", () => {
         const plainDateTime = new Temporal.PlainDateTime(2021, 11, 4, 21, 16, 56, 100, 200, 300);
         const timeZone = new Temporal.TimeZone("UTC");