From 4e79ce4e7a16f4faa4275186845a82c4dbc6ae89 Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Sun, 16 Oct 2022 11:33:42 +0300 Subject: [PATCH] LibJS: Add optional dateAdd parameter to MoveRelativeDate This is a normative change in the Temporal spec. See: https://github.com/tc39/proposal-temporal/commit/891060f --- .../LibJS/Runtime/Temporal/Duration.cpp | 28 +++++++++++-------- .../LibJS/Runtime/Temporal/Duration.h | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Duration.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/Duration.cpp index 7d83c551e5..6f5fe7be57 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Duration.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Duration.cpp @@ -1084,16 +1084,20 @@ ThrowCompletionOr add_duration(VM& vm, double years1, double mon return difference_zoned_date_time(vm, relative_to.nanoseconds(), *end_ns, time_zone, calendar, largest_unit, *Object::create(realm, nullptr)); } -// 7.5.23 MoveRelativeDate ( calendar, relativeTo, duration ), https://tc39.es/proposal-temporal/#sec-temporal-moverelativedate -ThrowCompletionOr move_relative_date(VM& vm, Object& calendar, PlainDate& relative_to, Duration& duration) +// 7.5.23 MoveRelativeDate ( calendar, relativeTo, duration [ , dateAdd ] ), https://tc39.es/proposal-temporal/#sec-temporal-moverelativedate +ThrowCompletionOr move_relative_date(VM& vm, Object& calendar, PlainDate& relative_to, Duration& duration, FunctionObject* date_add) { - // 1. Let newDate be ? CalendarDateAdd(calendar, relativeTo, duration, options). - auto* new_date = TRY(calendar_date_add(vm, calendar, &relative_to, duration)); + // 1. If dateAdd is not present, set dateAdd to ? GetMethod(calendar, "dateAdd"). + if (!date_add) + date_add = TRY(Value(&calendar).get_method(vm, vm.names.dateAdd)); - // 2. Let days be DaysUntil(relativeTo, newDate). + // 2. Let newDate be ? CalendarDateAdd(calendar, relativeTo, duration, undefined, dateAdd) + auto* new_date = TRY(calendar_date_add(vm, calendar, &relative_to, duration, nullptr, date_add)); + + // 3. Let days be DaysUntil(relativeTo, newDate). auto days = days_until(relative_to, *new_date); - // 3. Return the Record { [[RelativeTo]]: newDate, [[Days]]: days }. + // 4. Return the Record { [[RelativeTo]]: newDate, [[Days]]: days }. return MoveRelativeDateResult { .relative_to = make_handle(new_date), .days = days }; } @@ -1266,8 +1270,8 @@ ThrowCompletionOr round_duration(VM& vm, double years, double m // v. Let oneYear be ! CreateTemporalDuration(sign, 0, 0, 0, 0, 0, 0, 0, 0, 0). auto* one_year = MUST(create_temporal_duration(vm, sign, 0, 0, 0, 0, 0, 0, 0, 0, 0)); - // w. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneYear). - auto move_result = TRY(move_relative_date(vm, *calendar, *relative_to, *one_year)); + // w. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneYear, dateAdd). + auto move_result = TRY(move_relative_date(vm, *calendar, *relative_to, *one_year, date_add)); // x. Let oneYearDays be moveResult.[[Days]]. auto one_year_days = move_result.days; @@ -1320,8 +1324,8 @@ ThrowCompletionOr round_duration(VM& vm, double years, double m // j. Let oneMonth be ! CreateTemporalDuration(0, sign, 0, 0, 0, 0, 0, 0, 0, 0). auto* one_month = MUST(create_temporal_duration(vm, 0, sign, 0, 0, 0, 0, 0, 0, 0, 0)); - // k. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneMonth). - auto move_result = TRY(move_relative_date(vm, *calendar, *relative_to, *one_month)); + // k. Let moveResult be ? MoveRelativeDate(calendar, relativeTo, oneMonth, dateAdd). + auto move_result = TRY(move_relative_date(vm, *calendar, *relative_to, *one_month, date_add)); // l. Set relativeTo to moveResult.[[RelativeTo]]. relative_to = move_result.relative_to.cell(); @@ -1337,8 +1341,8 @@ ThrowCompletionOr round_duration(VM& vm, double years, double m // ii. Set days to days - oneMonthDays. days -= one_month_days; - // iii. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneMonth). - move_result = TRY(move_relative_date(vm, *calendar, *relative_to, *one_month)); + // iii. Set moveResult to ? MoveRelativeDate(calendar, relativeTo, oneMonth, dateAdd). + move_result = TRY(move_relative_date(vm, *calendar, *relative_to, *one_month, date_add)); // iv. Set relativeTo to moveResult.[[RelativeTo]]. relative_to = move_result.relative_to.cell(); diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Duration.h b/Userland/Libraries/LibJS/Runtime/Temporal/Duration.h index da1edda786..3da7b90de8 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Duration.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Duration.h @@ -153,7 +153,7 @@ ThrowCompletionOr balance_duration(VM&, double days, double ThrowCompletionOr unbalance_duration_relative(VM&, double years, double months, double weeks, double days, String const& largest_unit, Value relative_to); ThrowCompletionOr balance_duration_relative(VM&, double years, double months, double weeks, double days, String const& largest_unit, Value relative_to); ThrowCompletionOr add_duration(VM&, double years1, double months1, double weeks1, double days1, double hours1, double minutes1, double seconds1, double milliseconds1, double microseconds1, double nanoseconds1, double years2, double months2, double weeks2, double days2, double hours2, double minutes2, double seconds2, double milliseconds2, double microseconds2, double nanoseconds2, Value relative_to_value); -ThrowCompletionOr move_relative_date(VM&, Object& calendar, PlainDate& relative_to, Duration& duration); +ThrowCompletionOr move_relative_date(VM&, Object& calendar, PlainDate& relative_to, Duration& duration, FunctionObject* date_add = nullptr); ThrowCompletionOr move_relative_zoned_date_time(VM&, ZonedDateTime&, double years, double months, double weeks, double days); ThrowCompletionOr round_duration(VM&, double years, double months, double weeks, double days, double hours, double minutes, double seconds, double milliseconds, double microseconds, double nanoseconds, u32 increment, StringView unit, StringView rounding_mode, Object* relative_to_object = nullptr); ThrowCompletionOr adjust_rounded_duration_days(VM&, double years, double months, double weeks, double days, double hours, double minutes, double seconds, double milliseconds, double microseconds, double nanoseconds, u32 increment, StringView unit, StringView rounding_mode, Object* relative_to_object);