mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-05-15 15:42:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibJS: Integrate Temporal.Duration into Intl.DurationFormat

Browse source 
This is a normative change in the Temporal proposal. See:
2d97205
This commit is contained in:
Timothy Flynn 2025-02-28 13:36:22 -05:00 • committed by Andreas Kling
parent f16fe66def
commit 8f51d1dd04
Notes: github-actions[bot] 2025-03-01 13:50:25 +00:00
6 changed files with 56 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

124
Libraries/LibJS/Runtime/Intl/DurationFormat.cpp
View file

@ -17,7 +17,6 @@
#include <LibJS/Runtime/Intl/PluralRules.h> #include <LibJS/Runtime/Intl/PluralRules.h>
#include <LibJS/Runtime/Intl/PluralRulesConstructor.h> #include <LibJS/Runtime/Intl/PluralRulesConstructor.h>
#include <LibJS/Runtime/Intl/RelativeTimeFormat.h> #include <LibJS/Runtime/Intl/RelativeTimeFormat.h>
#include <LibJS/Runtime/Temporal/Duration.h>
#include <LibJS/Runtime/ValueInlines.h> #include <LibJS/Runtime/ValueInlines.h>
namespace JS::Intl { namespace JS::Intl {
@ -186,108 +185,6 @@ static GC::Ref<ListFormat> construct_list_format(VM& vm, DurationFormat const& d
return static_cast<ListFormat&>(*list_format); return static_cast<ListFormat&>(*list_format);
} }
// 13.1.3 ToDurationRecord ( input ), https://tc39.es/ecma402/#sec-todurationrecord
ThrowCompletionOr<DurationRecord> to_duration_record(VM& vm, Value input)
{
// 1. If input is not an Object, then
if (!input.is_object()) {
// a. If input is a String, throw a RangeError exception.
if (input.is_string())
return vm.throw_completion<RangeError>(ErrorType::NotAnObject, input);
// b. Throw a TypeError exception.
return vm.throw_completion<TypeError>(ErrorType::NotAnObject, input);
}
auto& input_object = input.as_object();
// 2. Let result be a new Duration Record with each field set to 0.
DurationRecord result {};
bool any_defined = false;
auto set_duration_record_value = [&](auto const& name, auto& value_slot) -> ThrowCompletionOr<void> {
auto value = TRY(input_object.get(name));
if (!value.is_undefined()) {
value_slot = TRY(to_integer_if_integral(vm, value, ErrorType::TemporalInvalidDurationPropertyValueNonIntegral, name, value));
any_defined = true;
}
return {};
};
// 3. Let days be ? Get(input, "days").
// 4. If days is not undefined, set result.[[Days]] to ? ToIntegerIfIntegral(days).
TRY(set_duration_record_value(vm.names.days, result.days));
// 5. Let hours be ? Get(input, "hours").
// 6. If hours is not undefined, set result.[[Hours]] to ? ToIntegerIfIntegral(hours).
TRY(set_duration_record_value(vm.names.hours, result.hours));
// 7. Let microseconds be ? Get(input, "microseconds").
// 8. If microseconds is not undefined, set result.[[Microseconds]] to ? ToIntegerIfIntegral(microseconds).
TRY(set_duration_record_value(vm.names.microseconds, result.microseconds));
// 9. Let milliseconds be ? Get(input, "milliseconds").
// 10. If milliseconds is not undefined, set result.[[Milliseconds]] to ? ToIntegerIfIntegral(milliseconds).
TRY(set_duration_record_value(vm.names.milliseconds, result.milliseconds));
// 11. Let minutes be ? Get(input, "minutes").
// 12. If minutes is not undefined, set result.[[Minutes]] to ? ToIntegerIfIntegral(minutes).
TRY(set_duration_record_value(vm.names.minutes, result.minutes));
// 13. Let months be ? Get(input, "months").
// 14. If months is not undefined, set result.[[Months]] to ? ToIntegerIfIntegral(months).
TRY(set_duration_record_value(vm.names.months, result.months));
// 15. Let nanoseconds be ? Get(input, "nanoseconds").
// 16. If nanoseconds is not undefined, set result.[[Nanoseconds]] to ? ToIntegerIfIntegral(nanoseconds).
TRY(set_duration_record_value(vm.names.nanoseconds, result.nanoseconds));
// 17. Let seconds be ? Get(input, "seconds").
// 18. If seconds is not undefined, set result.[[Seconds]] to ? ToIntegerIfIntegral(seconds).
TRY(set_duration_record_value(vm.names.seconds, result.seconds));
// 19. Let weeks be ? Get(input, "weeks").
// 20. If weeks is not undefined, set result.[[Weeks]] to ? ToIntegerIfIntegral(weeks).
TRY(set_duration_record_value(vm.names.weeks, result.weeks));
// 21. Let years be ? Get(input, "years").
// 22. If years is not undefined, set result.[[Years]] to ? ToIntegerIfIntegral(years).
TRY(set_duration_record_value(vm.names.years, result.years));
// 23. If years, months, weeks, days, hours, minutes, seconds, milliseconds, microseconds, and nanoseconds are all undefined, throw a TypeError exception.
if (!any_defined)
return vm.throw_completion<TypeError>(ErrorType::TemporalInvalidDurationLikeObject);
// 24. If IsValidDuration( result.[[Years]], result.[[Months]], result.[[Weeks]], result.[[Days]], result.[[Hours]], result.[[Minutes]], result.[[Seconds]], result.[[Milliseconds]], result.[[Microseconds]], result.[[Nanoseconds]]) is false, then
if (!Temporal::is_valid_duration(result.years, result.months, result.weeks, result.days, result.hours, result.minutes, result.seconds, result.milliseconds, result.microseconds, result.nanoseconds)) {
// a. Throw a RangeError exception.
return vm.throw_completion<RangeError>(ErrorType::TemporalInvalidDurationLikeObject);
}
// 25. Return result.
return result;
}
// 13.1.4 DurationSign ( duration ), https://tc39.es/ecma402/#sec-durationsign
i8 duration_sign(DurationRecord const& duration)
{
// 1. For each value v of « duration.[[Years]], duration.[[Months]], duration.[[Weeks]], duration.[[Days]], duration.[[Hours]], duration.[[Minutes]], duration.[[Seconds]], duration.[[Milliseconds]], duration.[[Microseconds]], duration.[[Nanoseconds]] », do
for (auto value : { duration.years, duration.months, duration.weeks, duration.days, duration.hours, duration.minutes, duration.seconds, duration.milliseconds, duration.microseconds, duration.nanoseconds }) {
// a. If v < 0, return -1.
if (value < 0)
return -1;
// b. If v > 0, return 1.
if (value > 0)
return 1;
}
// 2. Return 0.
return 0;
}
// 13.1.6 GetDurationUnitOptions ( unit, options, baseStyle, stylesList, digitalBase, prevStyle, twoDigitHours ), https://tc39.es/ecma402/#sec-getdurationunitoptions // 13.1.6 GetDurationUnitOptions ( unit, options, baseStyle, stylesList, digitalBase, prevStyle, twoDigitHours ), https://tc39.es/ecma402/#sec-getdurationunitoptions
ThrowCompletionOr<DurationUnitOptions> get_duration_unit_options(VM& vm, DurationFormat::Unit unit, Object const& options, DurationFormat::Style base_style, ReadonlySpan<StringView> styles_list, DurationFormat::ValueStyle digital_base, Optional<DurationFormat::ValueStyle> previous_style, bool two_digit_hours) ThrowCompletionOr<DurationUnitOptions> get_duration_unit_options(VM& vm, DurationFormat::Unit unit, Object const& options, DurationFormat::Style base_style, ReadonlySpan<StringView> styles_list, DurationFormat::ValueStyle digital_base, Optional<DurationFormat::ValueStyle> previous_style, bool two_digit_hours)
{ {
@ -399,7 +296,8 @@ ThrowCompletionOr<DurationUnitOptions> get_duration_unit_options(VM& vm, Duratio
} }
// 13.1.7 ComputeFractionalDigits ( durationFormat, duration ), https://tc39.es/ecma402/#sec-computefractionaldigits // 13.1.7 ComputeFractionalDigits ( durationFormat, duration ), https://tc39.es/ecma402/#sec-computefractionaldigits
Crypto::BigFraction compute_fractional_digits(DurationFormat const& duration_format, DurationRecord const& duration) // 15.9.6 ComputeFractionalDigits ( durationFormat, duration ), https://tc39.es/proposal-temporal/#sec-computefractionaldigits
Crypto::BigFraction compute_fractional_digits(DurationFormat const& duration_format, Temporal::Duration const& duration)
{ {
// 1. Let result be 0. // 1. Let result be 0.
Crypto::BigFraction result; Crypto::BigFraction result;
@ -420,7 +318,7 @@ Crypto::BigFraction compute_fractional_digits(DurationFormat const& duration_for
// ii. Let value be the value of duration's field whose name is the Value Field value of the current row. // ii. Let value be the value of duration's field whose name is the Value Field value of the current row.
// iii. Set value to value / 10**exponent. // iii. Set value to value / 10**exponent.
Crypto::BigFraction value { Crypto::BigFraction value {
Crypto::SignedBigInteger { duration.*duration_instances_component.value_slot }, Crypto::SignedBigInteger { (duration.*duration_instances_component.value_slot)() },
Crypto::UnsignedBigInteger { pow(10, exponent) } Crypto::UnsignedBigInteger { pow(10, exponent) }
}; };
@ -674,7 +572,8 @@ Vector<DurationFormatPart> format_numeric_seconds(VM& vm, DurationFormat const&
} }
// 13.1.12 FormatNumericUnits ( durationFormat, duration, firstNumericUnit, signDisplayed ), https://tc39.es/ecma402/#sec-formatnumericunits // 13.1.12 FormatNumericUnits ( durationFormat, duration, firstNumericUnit, signDisplayed ), https://tc39.es/ecma402/#sec-formatnumericunits
Vector<DurationFormatPart> format_numeric_units(VM& vm, DurationFormat const& duration_format, DurationRecord const& duration, DurationFormat::Unit first_numeric_unit, bool sign_displayed) // 15.9.7 FormatNumericUnits ( durationFormat, duration, firstNumericUnit, signDisplayed ), https://tc39.es/proposal-temporal/#sec-formatnumericunits
Vector<DurationFormatPart> format_numeric_units(VM& vm, DurationFormat const& duration_format, Temporal::Duration const& duration, DurationFormat::Unit first_numeric_unit, bool sign_displayed)
{ {
// 1. Assert: firstNumericUnit is "hours", "minutes", or "seconds". // 1. Assert: firstNumericUnit is "hours", "minutes", or "seconds".
VERIFY(first_is_one_of(first_numeric_unit, DurationFormat::Unit::Hours, DurationFormat::Unit::Minutes, DurationFormat::Unit::Seconds)); VERIFY(first_is_one_of(first_numeric_unit, DurationFormat::Unit::Hours, DurationFormat::Unit::Minutes, DurationFormat::Unit::Seconds));
@ -683,22 +582,22 @@ Vector<DurationFormatPart> format_numeric_units(VM& vm, DurationFormat const& du
Vector<DurationFormatPart> numeric_parts_list; Vector<DurationFormatPart> numeric_parts_list;
// 3. Let hoursValue be duration.[[Hours]]. // 3. Let hoursValue be duration.[[Hours]].
auto hours_value = duration.hours; auto hours_value = duration.hours();
// 4. Let hoursDisplay be durationFormat.[[HoursDisplay]]. // 4. Let hoursDisplay be durationFormat.[[HoursDisplay]].
auto hours_display = duration_format.hours_display(); auto hours_display = duration_format.hours_display();
// 5. Let minutesValue be duration.[[Minutes]]. // 5. Let minutesValue be duration.[[Minutes]].
auto minutes_value = duration.minutes; auto minutes_value = duration.minutes();
// 6. Let minutesDisplay be durationFormat.[[MinutesDisplay]]. // 6. Let minutesDisplay be durationFormat.[[MinutesDisplay]].
auto minutes_display = duration_format.minutes_display(); auto minutes_display = duration_format.minutes_display();
// 7. Let secondsValue be duration.[[Seconds]]. // 7. Let secondsValue be duration.[[Seconds]].
Crypto::BigFraction seconds_value { duration.seconds }; Crypto::BigFraction seconds_value { duration.seconds() };
// 8. If duration.[[Milliseconds]] is not 0 or duration.[[Microseconds]] is not 0 or duration.[[Nanoseconds]] is not 0, then // 8. If duration.[[Milliseconds]] is not 0 or duration.[[Microseconds]] is not 0 or duration.[[Nanoseconds]] is not 0, then
if (duration.milliseconds != 0 || duration.microseconds != 0 || duration.nanoseconds != 0) { if (duration.milliseconds() != 0 || duration.microseconds() != 0 || duration.nanoseconds() != 0) {
// a. Set secondsValue to secondsValue + ComputeFractionalDigits(durationFormat, duration). // a. Set secondsValue to secondsValue + ComputeFractionalDigits(durationFormat, duration).
seconds_value = seconds_value + compute_fractional_digits(duration_format, duration); seconds_value = seconds_value + compute_fractional_digits(duration_format, duration);
} }
@ -892,7 +791,8 @@ Vector<DurationFormatPart> list_format_parts(VM& vm, DurationFormat const& durat
} }
// 13.1.14 PartitionDurationFormatPattern ( durationFormat, duration ), https://tc39.es/ecma402/#sec-partitiondurationformatpattern // 13.1.14 PartitionDurationFormatPattern ( durationFormat, duration ), https://tc39.es/ecma402/#sec-partitiondurationformatpattern
Vector<DurationFormatPart> partition_duration_format_pattern(VM& vm, DurationFormat const& duration_format, DurationRecord const& duration) // 15.9.8 PartitionDurationFormatPattern ( durationFormat, duration ), https://tc39.es/proposal-temporal/#sec-formatnumericunits
Vector<DurationFormatPart> partition_duration_format_pattern(VM& vm, DurationFormat const& duration_format, Temporal::Duration const& duration)
{ {
auto& realm = *vm.current_realm(); auto& realm = *vm.current_realm();
@ -910,7 +810,7 @@ Vector<DurationFormatPart> partition_duration_format_pattern(VM& vm, DurationFor
auto const& duration_instances_component = duration_instances_components[i]; auto const& duration_instances_component = duration_instances_components[i];
// a. Let value be the value of duration's field whose name is the Value Field value of the current row. // a. Let value be the value of duration's field whose name is the Value Field value of the current row.
Crypto::BigFraction value { duration.*duration_instances_component.value_slot }; Crypto::BigFraction value { (duration.*duration_instances_component.value_slot)() };
// b. Let style be the value of durationFormat's internal slot whose name is the Style Slot value of the current row. // b. Let style be the value of durationFormat's internal slot whose name is the Style Slot value of the current row.
auto style = (duration_format.*duration_instances_component.get_style_slot)(); auto style = (duration_format.*duration_instances_component.get_style_slot)();

45
Libraries/LibJS/Runtime/Intl/DurationFormat.h
View file

@ -12,6 +12,7 @@
#include <LibCrypto/BigFraction/BigFraction.h> #include <LibCrypto/BigFraction/BigFraction.h>
#include <LibJS/Runtime/Intl/AbstractOperations.h> #include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Object.h> #include <LibJS/Runtime/Object.h>
#include <LibJS/Runtime/Temporal/Duration.h>
#include <LibUnicode/Locale.h> #include <LibUnicode/Locale.h>
namespace JS::Intl { namespace JS::Intl {
@ -206,22 +207,8 @@ private:
Optional<u8> m_fractional_digits; // [[FractionalDigits]] Optional<u8> m_fractional_digits; // [[FractionalDigits]]
}; };
// 13.1.1 Duration Records, https://tc39.es/ecma402/#sec-duration-records
struct DurationRecord {
double years { 0 };
double months { 0 };
double weeks { 0 };
double days { 0 };
double hours { 0 };
double minutes { 0 };
double seconds { 0 };
double milliseconds { 0 };
double microseconds { 0 };
double nanoseconds { 0 };
};
struct DurationInstanceComponent { struct DurationInstanceComponent {
double DurationRecord::* value_slot; double (Temporal::Duration::*value_slot)() const;
DurationFormat::ValueStyle (DurationFormat::*get_style_slot)() const; DurationFormat::ValueStyle (DurationFormat::*get_style_slot)() const;
void (DurationFormat::*set_style_slot)(DurationFormat::ValueStyle); void (DurationFormat::*set_style_slot)(DurationFormat::ValueStyle);
DurationFormat::Display (DurationFormat::*get_display_slot)() const; DurationFormat::Display (DurationFormat::*get_display_slot)() const;
@ -238,16 +225,16 @@ static constexpr auto time_values = AK::Array { "long"sv, "short"sv, "narrow"sv,
static constexpr auto sub_second_values = AK::Array { "long"sv, "short"sv, "narrow"sv, "numeric"sv }; static constexpr auto sub_second_values = AK::Array { "long"sv, "short"sv, "narrow"sv, "numeric"sv };
static constexpr auto duration_instances_components = to_array<DurationInstanceComponent>({ static constexpr auto duration_instances_components = to_array<DurationInstanceComponent>({
{ &DurationRecord::years, &DurationFormat::years_style, &DurationFormat::set_years_style, &DurationFormat::years_display, &DurationFormat::set_years_display, DurationFormat::Unit::Years, date_values, DurationFormat::ValueStyle::Short }, { &Temporal::Duration::years, &DurationFormat::years_style, &DurationFormat::set_years_style, &DurationFormat::years_display, &DurationFormat::set_years_display, DurationFormat::Unit::Years, date_values, DurationFormat::ValueStyle::Short },
{ &DurationRecord::months, &DurationFormat::months_style, &DurationFormat::set_months_style, &DurationFormat::months_display, &DurationFormat::set_months_display, DurationFormat::Unit::Months, date_values, DurationFormat::ValueStyle::Short }, { &Temporal::Duration::months, &DurationFormat::months_style, &DurationFormat::set_months_style, &DurationFormat::months_display, &DurationFormat::set_months_display, DurationFormat::Unit::Months, date_values, DurationFormat::ValueStyle::Short },
{ &DurationRecord::weeks, &DurationFormat::weeks_style, &DurationFormat::set_weeks_style, &DurationFormat::weeks_display, &DurationFormat::set_weeks_display, DurationFormat::Unit::Weeks, date_values, DurationFormat::ValueStyle::Short }, { &Temporal::Duration::weeks, &DurationFormat::weeks_style, &DurationFormat::set_weeks_style, &DurationFormat::weeks_display, &DurationFormat::set_weeks_display, DurationFormat::Unit::Weeks, date_values, DurationFormat::ValueStyle::Short },
{ &DurationRecord::days, &DurationFormat::days_style, &DurationFormat::set_days_style, &DurationFormat::days_display, &DurationFormat::set_days_display, DurationFormat::Unit::Days, date_values, DurationFormat::ValueStyle::Short }, { &Temporal::Duration::days, &DurationFormat::days_style, &DurationFormat::set_days_style, &DurationFormat::days_display, &DurationFormat::set_days_display, DurationFormat::Unit::Days, date_values, DurationFormat::ValueStyle::Short },
{ &DurationRecord::hours, &DurationFormat::hours_style, &DurationFormat::set_hours_style, &DurationFormat::hours_display, &DurationFormat::set_hours_display, DurationFormat::Unit::Hours, time_values, DurationFormat::ValueStyle::Numeric }, { &Temporal::Duration::hours, &DurationFormat::hours_style, &DurationFormat::set_hours_style, &DurationFormat::hours_display, &DurationFormat::set_hours_display, DurationFormat::Unit::Hours, time_values, DurationFormat::ValueStyle::Numeric },
{ &DurationRecord::minutes, &DurationFormat::minutes_style, &DurationFormat::set_minutes_style, &DurationFormat::minutes_display, &DurationFormat::set_minutes_display, DurationFormat::Unit::Minutes, time_values, DurationFormat::ValueStyle::Numeric }, { &Temporal::Duration::minutes, &DurationFormat::minutes_style, &DurationFormat::set_minutes_style, &DurationFormat::minutes_display, &DurationFormat::set_minutes_display, DurationFormat::Unit::Minutes, time_values, DurationFormat::ValueStyle::Numeric },
{ &DurationRecord::seconds, &DurationFormat::seconds_style, &DurationFormat::set_seconds_style, &DurationFormat::seconds_display, &DurationFormat::set_seconds_display, DurationFormat::Unit::Seconds, time_values, DurationFormat::ValueStyle::Numeric }, { &Temporal::Duration::seconds, &DurationFormat::seconds_style, &DurationFormat::set_seconds_style, &DurationFormat::seconds_display, &DurationFormat::set_seconds_display, DurationFormat::Unit::Seconds, time_values, DurationFormat::ValueStyle::Numeric },
{ &DurationRecord::milliseconds, &DurationFormat::milliseconds_style, &DurationFormat::set_milliseconds_style, &DurationFormat::milliseconds_display, &DurationFormat::set_milliseconds_display, DurationFormat::Unit::Milliseconds, sub_second_values, DurationFormat::ValueStyle::Numeric }, { &Temporal::Duration::milliseconds, &DurationFormat::milliseconds_style, &DurationFormat::set_milliseconds_style, &DurationFormat::milliseconds_display, &DurationFormat::set_milliseconds_display, DurationFormat::Unit::Milliseconds, sub_second_values, DurationFormat::ValueStyle::Numeric },
{ &DurationRecord::microseconds, &DurationFormat::microseconds_style, &DurationFormat::set_microseconds_style, &DurationFormat::microseconds_display, &DurationFormat::set_microseconds_display, DurationFormat::Unit::Microseconds, sub_second_values, DurationFormat::ValueStyle::Numeric }, { &Temporal::Duration::microseconds, &DurationFormat::microseconds_style, &DurationFormat::set_microseconds_style, &DurationFormat::microseconds_display, &DurationFormat::set_microseconds_display, DurationFormat::Unit::Microseconds, sub_second_values, DurationFormat::ValueStyle::Numeric },
{ &DurationRecord::nanoseconds, &DurationFormat::nanoseconds_style, &DurationFormat::set_nanoseconds_style, &DurationFormat::nanoseconds_display, &DurationFormat::set_nanoseconds_display, DurationFormat::Unit::Nanoseconds, sub_second_values, DurationFormat::ValueStyle::Numeric }, { &Temporal::Duration::nanoseconds, &DurationFormat::nanoseconds_style, &DurationFormat::set_nanoseconds_style, &DurationFormat::nanoseconds_display, &DurationFormat::set_nanoseconds_display, DurationFormat::Unit::Nanoseconds, sub_second_values, DurationFormat::ValueStyle::Numeric },
}); });
struct DurationUnitOptions { struct DurationUnitOptions {
@ -261,16 +248,14 @@ struct DurationFormatPart {
StringView unit; StringView unit;
}; };
ThrowCompletionOr<DurationRecord> to_duration_record(VM&, Value input);
i8 duration_sign(DurationRecord const&);
ThrowCompletionOr<DurationUnitOptions> get_duration_unit_options(VM&, DurationFormat::Unit unit, Object const& options, DurationFormat::Style base_style, ReadonlySpan<StringView> styles_list, DurationFormat::ValueStyle digital_base, Optional<DurationFormat::ValueStyle> previous_style, bool two_digit_hours); ThrowCompletionOr<DurationUnitOptions> get_duration_unit_options(VM&, DurationFormat::Unit unit, Object const& options, DurationFormat::Style base_style, ReadonlySpan<StringView> styles_list, DurationFormat::ValueStyle digital_base, Optional<DurationFormat::ValueStyle> previous_style, bool two_digit_hours);
Crypto::BigFraction compute_fractional_digits(DurationFormat const&, DurationRecord const&); Crypto::BigFraction compute_fractional_digits(DurationFormat const&, Temporal::Duration const&);
bool next_unit_fractional(DurationFormat const&, DurationFormat::Unit unit); bool next_unit_fractional(DurationFormat const&, DurationFormat::Unit unit);
Vector<DurationFormatPart> format_numeric_hours(VM&, DurationFormat const&, MathematicalValue const& hours_value, bool sign_displayed); Vector<DurationFormatPart> format_numeric_hours(VM&, DurationFormat const&, MathematicalValue const& hours_value, bool sign_displayed);
Vector<DurationFormatPart> format_numeric_minutes(VM&, DurationFormat const&, MathematicalValue const& minutes_value, bool hours_displayed, bool sign_displayed); Vector<DurationFormatPart> format_numeric_minutes(VM&, DurationFormat const&, MathematicalValue const& minutes_value, bool hours_displayed, bool sign_displayed);
Vector<DurationFormatPart> format_numeric_seconds(VM&, DurationFormat const&, MathematicalValue const& seconds_value, bool minutes_displayed, bool sign_displayed); Vector<DurationFormatPart> format_numeric_seconds(VM&, DurationFormat const&, MathematicalValue const& seconds_value, bool minutes_displayed, bool sign_displayed);
Vector<DurationFormatPart> format_numeric_units(VM&, DurationFormat const&, DurationRecord const&, DurationFormat::Unit first_numeric_unit, bool sign_displayed); Vector<DurationFormatPart> format_numeric_units(VM&, DurationFormat const&, Temporal::Duration const&, DurationFormat::Unit first_numeric_unit, bool sign_displayed);
Vector<DurationFormatPart> list_format_parts(VM&, DurationFormat const&, Vector<Vector<DurationFormatPart>>& partitioned_parts_list); Vector<DurationFormatPart> list_format_parts(VM&, DurationFormat const&, Vector<Vector<DurationFormatPart>>& partitioned_parts_list);
Vector<DurationFormatPart> partition_duration_format_pattern(VM&, DurationFormat const&, DurationRecord const&); Vector<DurationFormatPart> partition_duration_format_pattern(VM&, DurationFormat const&, Temporal::Duration const&);
} }

19
Libraries/LibJS/Runtime/Intl/DurationFormatPrototype.cpp
View file

@ -10,6 +10,7 @@
#include <LibJS/Runtime/Array.h> #include <LibJS/Runtime/Array.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Intl/DurationFormatPrototype.h> #include <LibJS/Runtime/Intl/DurationFormatPrototype.h>
#include <LibJS/Runtime/Temporal/Duration.h>
namespace JS::Intl { namespace JS::Intl {
@ -37,17 +38,18 @@ void DurationFormatPrototype::initialize(Realm& realm)
} }
// 13.4.3 Intl.DurationFormat.prototype.format ( duration ), https://tc39.es/ecma402/#sec-Intl.DurationFormat.prototype.format // 13.4.3 Intl.DurationFormat.prototype.format ( duration ), https://tc39.es/ecma402/#sec-Intl.DurationFormat.prototype.format
// 15.10.1 Intl.DurationFormat.prototype.format ( durationLike ), https://tc39.es/proposal-temporal/#sec-Intl.DurationFormat.prototype.format
JS_DEFINE_NATIVE_FUNCTION(DurationFormatPrototype::format) JS_DEFINE_NATIVE_FUNCTION(DurationFormatPrototype::format)
{ {
// 1. Let df be this value. // 1. Let df be this value.
// 2. Perform ? RequireInternalSlot(df, [[InitializedDurationFormat]]). // 2. Perform ? RequireInternalSlot(df, [[InitializedDurationFormat]]).
auto duration_format = TRY(typed_this_object(vm)); auto duration_format = TRY(typed_this_object(vm));
// 3. Let record be ? ToDurationRecord(duration). // 3. Let duration be ? ToTemporalDuration(durationLike).
auto record = TRY(to_duration_record(vm, vm.argument(0))); auto duration = TRY(Temporal::to_temporal_duration(vm, vm.argument(0)));
// 4. Let parts be PartitionDurationFormatPattern(df, record). // 4. Let parts be PartitionDurationFormatPattern(df, duration).
auto parts = partition_duration_format_pattern(vm, duration_format, record); auto parts = partition_duration_format_pattern(vm, duration_format, duration);
// 5. Let result be a new empty String. // 5. Let result be a new empty String.
StringBuilder result; StringBuilder result;
@ -63,6 +65,7 @@ JS_DEFINE_NATIVE_FUNCTION(DurationFormatPrototype::format)
} }
// 13.4.4 Intl.DurationFormat.prototype.formatToParts ( duration ), https://tc39.es/ecma402/#sec-Intl.DurationFormat.prototype.formatToParts // 13.4.4 Intl.DurationFormat.prototype.formatToParts ( duration ), https://tc39.es/ecma402/#sec-Intl.DurationFormat.prototype.formatToParts
// 15.10.2 Intl.DurationFormat.prototype.formatToParts ( durationLike ), https://tc39.es/proposal-temporal/#sec-Intl.DurationFormat.prototype.formatToParts
JS_DEFINE_NATIVE_FUNCTION(DurationFormatPrototype::format_to_parts) JS_DEFINE_NATIVE_FUNCTION(DurationFormatPrototype::format_to_parts)
{ {
auto& realm = *vm.current_realm(); auto& realm = *vm.current_realm();
@ -71,11 +74,11 @@ JS_DEFINE_NATIVE_FUNCTION(DurationFormatPrototype::format_to_parts)
// 2. Perform ? RequireInternalSlot(df, [[InitializedDurationFormat]]). // 2. Perform ? RequireInternalSlot(df, [[InitializedDurationFormat]]).
auto duration_format = TRY(typed_this_object(vm)); auto duration_format = TRY(typed_this_object(vm));
// 3. Let record be ? ToDurationRecord(duration). // 3. Let duration be ? ToTemporalDuration(durationLike).
auto record = TRY(to_duration_record(vm, vm.argument(0))); auto duration = TRY(Temporal::to_temporal_duration(vm, vm.argument(0)));
// 4. Let parts be PartitionDurationFormatPattern(df, record). // 4. Let parts be PartitionDurationFormatPattern(df, duration).
auto parts = partition_duration_format_pattern(vm, duration_format, record); auto parts = partition_duration_format_pattern(vm, duration_format, duration);
// 5. Let result be ! ArrayCreate(0). // 5. Let result be ! ArrayCreate(0).
auto result = MUST(Array::create(realm, 0)); auto result = MUST(Array::create(realm, 0));

2
Libraries/LibJS/Runtime/Temporal/Duration.cpp
View file

@ -414,7 +414,7 @@ ThrowCompletionOr<GC::Ref<Duration>> to_temporal_duration(VM& vm, Value item)
return TRY(create_temporal_duration(vm, *result.years, *result.months, *result.weeks, *result.days, *result.hours, *result.minutes, *result.seconds, *result.milliseconds, *result.microseconds, *result.nanoseconds)); return TRY(create_temporal_duration(vm, *result.years, *result.months, *result.weeks, *result.days, *result.hours, *result.minutes, *result.seconds, *result.milliseconds, *result.microseconds, *result.nanoseconds));
} }
// 7.5.13 DurationSign ( duration ), https://tc39.es/proposal-temporal/#sec-temporal-durationsign // 7.5.13 DurationSign ( duration ), https://tc39.es/proposal-temporal/#sec-durationsign
i8 duration_sign(Duration const& duration) i8 duration_sign(Duration const& duration)
{ {
// 1. For each value v of « duration.[[Years]], duration.[[Months]], duration.[[Weeks]], duration.[[Days]], duration.[[Hours]], duration.[[Minutes]], duration.[[Seconds]], duration.[[Milliseconds]], duration.[[Microseconds]], duration.[[Nanoseconds]] », do // 1. For each value v of « duration.[[Years]], duration.[[Months]], duration.[[Weeks]], duration.[[Days]], duration.[[Hours]], duration.[[Minutes]], duration.[[Seconds]], duration.[[Milliseconds]], duration.[[Microseconds]], duration.[[Nanoseconds]] », do

17
Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.format.js
View file

@ -163,29 +163,36 @@ describe("correct behavior", () => {
}; };
expect(en.format(duration)).toBe("0:00:9007200.256743991"); expect(en.format(duration)).toBe("0:00:9007200.256743991");
}); });
test("format Temporal Duration objects", () => {
const duration = Temporal.Duration.from("P1Y2M3W4DT5H6M7S");
const en = new Intl.DurationFormat("en", { style: "digital" });
expect(en.format(duration)).toBe("1 yr, 2 mths, 3 wks, 4 days, 5:06:07");
});
}); });
describe("errors", () => { describe("errors", () => {
test("non-object duration records", () => { test("non-object duration records", () => {
expect(() => { expect(() => {
new Intl.DurationFormat().format("hello"); new Intl.DurationFormat().format("hello");
}).toThrowWithMessage(RangeError, "is not an object"); }).toThrowWithMessage(RangeError, "Invalid duration string 'hello");
[-100, Infinity, NaN, 152n, Symbol("foo"), true, null, undefined].forEach(value => { [-100, Infinity, NaN, 152n, Symbol("foo"), true, null, undefined].forEach(value => {
expect(() => { expect(() => {
new Intl.DurationFormat().format(value); new Intl.DurationFormat().format(value);
}).toThrowWithMessage(TypeError, "is not an object"); }).toThrowWithMessage(TypeError, "is not a string");
}); });
}); });
test("empty duration record", () => { test("empty duration record", () => {
expect(() => { expect(() => {
new Intl.DurationFormat().format({}); new Intl.DurationFormat().format({});
}).toThrowWithMessage(TypeError, "Invalid duration-like object"); }).toThrowWithMessage(TypeError, "Invalid duration");
expect(() => { expect(() => {
new Intl.DurationFormat().format({ foo: 123 }); new Intl.DurationFormat().format({ foo: 123 });
}).toThrowWithMessage(TypeError, "Invalid duration-like object"); }).toThrowWithMessage(TypeError, "Invalid duration");
}); });
test("non-integral duration fields", () => { test("non-integral duration fields", () => {
@ -220,6 +227,6 @@ describe("errors", () => {
test("inconsistent field signs", () => { test("inconsistent field signs", () => {
expect(() => { expect(() => {
new Intl.DurationFormat().format({ years: 1, months: -1 }); new Intl.DurationFormat().format({ years: 1, months: -1 });
}).toThrowWithMessage(RangeError, "Invalid duration-like object"); }).toThrowWithMessage(RangeError, "Invalid duration");
}); });
}); });

10
Libraries/LibJS/Tests/builtins/Intl/DurationFormat/DurationFormat.prototype.formatToParts.js
View file

@ -477,23 +477,23 @@ describe("errors", () => {
test("non-object duration records", () => { test("non-object duration records", () => {
expect(() => { expect(() => {
new Intl.DurationFormat().formatToParts("hello"); new Intl.DurationFormat().formatToParts("hello");
}).toThrowWithMessage(RangeError, "is not an object"); }).toThrowWithMessage(RangeError, "Invalid duration string 'hello");
[-100, Infinity, NaN, 152n, Symbol("foo"), true, null, undefined].forEach(value => { [-100, Infinity, NaN, 152n, Symbol("foo"), true, null, undefined].forEach(value => {
expect(() => { expect(() => {
new Intl.DurationFormat().formatToParts(value); new Intl.DurationFormat().formatToParts(value);
}).toThrowWithMessage(TypeError, "is not an object"); }).toThrowWithMessage(TypeError, "is not a string");
}); });
}); });
test("empty duration record", () => { test("empty duration record", () => {
expect(() => { expect(() => {
new Intl.DurationFormat().formatToParts({}); new Intl.DurationFormat().formatToParts({});
}).toThrowWithMessage(TypeError, "Invalid duration-like object"); }).toThrowWithMessage(TypeError, "Invalid duration");
expect(() => { expect(() => {
new Intl.DurationFormat().formatToParts({ foo: 123 }); new Intl.DurationFormat().formatToParts({ foo: 123 });
}).toThrowWithMessage(TypeError, "Invalid duration-like object"); }).toThrowWithMessage(TypeError, "Invalid duration");
}); });
test("non-integral duration fields", () => { test("non-integral duration fields", () => {
@ -528,6 +528,6 @@ describe("errors", () => {
test("inconsistent field signs", () => { test("inconsistent field signs", () => {
expect(() => { expect(() => {
new Intl.DurationFormat().formatToParts({ years: 1, months: -1 }); new Intl.DurationFormat().formatToParts({ years: 1, months: -1 });
}).toThrowWithMessage(RangeError, "Invalid duration-like object"); }).toThrowWithMessage(RangeError, "Invalid duration");
}); });
}); });