|
|
@@ -4,6 +4,7 @@
|
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
|
*/
|
|
|
|
|
|
+#include <AK/Enumerate.h>
|
|
|
#include <AK/StringBuilder.h>
|
|
|
#include <LibJS/Runtime/AbstractOperations.h>
|
|
|
#include <LibJS/Runtime/Array.h>
|
|
|
@@ -23,223 +24,75 @@ RelativeTimeFormat::RelativeTimeFormat(Object& prototype)
|
|
|
{
|
|
|
}
|
|
|
|
|
|
-void RelativeTimeFormat::visit_edges(Cell::Visitor& visitor)
|
|
|
-{
|
|
|
- Base::visit_edges(visitor);
|
|
|
- if (m_number_format)
|
|
|
- visitor.visit(m_number_format);
|
|
|
- if (m_plural_rules)
|
|
|
- visitor.visit(m_plural_rules);
|
|
|
-}
|
|
|
-
|
|
|
-void RelativeTimeFormat::set_numeric(StringView numeric)
|
|
|
-{
|
|
|
- if (numeric == "always"sv) {
|
|
|
- m_numeric = Numeric::Always;
|
|
|
- } else if (numeric == "auto"sv) {
|
|
|
- m_numeric = Numeric::Auto;
|
|
|
- } else {
|
|
|
- VERIFY_NOT_REACHED();
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-StringView RelativeTimeFormat::numeric_string() const
|
|
|
-{
|
|
|
- switch (m_numeric) {
|
|
|
- case Numeric::Always:
|
|
|
- return "always"sv;
|
|
|
- case Numeric::Auto:
|
|
|
- return "auto"sv;
|
|
|
- default:
|
|
|
- VERIFY_NOT_REACHED();
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
// 17.5.1 SingularRelativeTimeUnit ( unit ), https://tc39.es/ecma402/#sec-singularrelativetimeunit
|
|
|
ThrowCompletionOr<::Locale::TimeUnit> singular_relative_time_unit(VM& vm, StringView unit)
|
|
|
{
|
|
|
- // 1. Assert: Type(unit) is String.
|
|
|
-
|
|
|
- // 2. If unit is "seconds", return "second".
|
|
|
+ // 1. If unit is "seconds", return "second".
|
|
|
if (unit == "seconds"sv)
|
|
|
return ::Locale::TimeUnit::Second;
|
|
|
- // 3. If unit is "minutes", return "minute".
|
|
|
+ // 2. If unit is "minutes", return "minute".
|
|
|
if (unit == "minutes"sv)
|
|
|
return ::Locale::TimeUnit::Minute;
|
|
|
- // 4. If unit is "hours", return "hour".
|
|
|
+ // 3. If unit is "hours", return "hour".
|
|
|
if (unit == "hours"sv)
|
|
|
return ::Locale::TimeUnit::Hour;
|
|
|
- // 5. If unit is "days", return "day".
|
|
|
+ // 4. If unit is "days", return "day".
|
|
|
if (unit == "days"sv)
|
|
|
return ::Locale::TimeUnit::Day;
|
|
|
- // 6. If unit is "weeks", return "week".
|
|
|
+ // 5. If unit is "weeks", return "week".
|
|
|
if (unit == "weeks"sv)
|
|
|
return ::Locale::TimeUnit::Week;
|
|
|
- // 7. If unit is "months", return "month".
|
|
|
+ // 6. If unit is "months", return "month".
|
|
|
if (unit == "months"sv)
|
|
|
return ::Locale::TimeUnit::Month;
|
|
|
- // 8. If unit is "quarters", return "quarter".
|
|
|
+ // 7. If unit is "quarters", return "quarter".
|
|
|
if (unit == "quarters"sv)
|
|
|
return ::Locale::TimeUnit::Quarter;
|
|
|
- // 9. If unit is "years", return "year".
|
|
|
+ // 8. If unit is "years", return "year".
|
|
|
if (unit == "years"sv)
|
|
|
return ::Locale::TimeUnit::Year;
|
|
|
|
|
|
- // 10. If unit is not one of "second", "minute", "hour", "day", "week", "month", "quarter", or "year", throw a RangeError exception.
|
|
|
- // 11. Return unit.
|
|
|
+ // 9. If unit is not one of "second", "minute", "hour", "day", "week", "month", "quarter", or "year", throw a RangeError exception.
|
|
|
+ // 10. Return unit.
|
|
|
if (auto time_unit = ::Locale::time_unit_from_string(unit); time_unit.has_value())
|
|
|
return *time_unit;
|
|
|
return vm.throw_completion<RangeError>(ErrorType::IntlInvalidUnit, unit);
|
|
|
}
|
|
|
|
|
|
// 17.5.2 PartitionRelativeTimePattern ( relativeTimeFormat, value, unit ), https://tc39.es/ecma402/#sec-PartitionRelativeTimePattern
|
|
|
-ThrowCompletionOr<Vector<PatternPartitionWithUnit>> partition_relative_time_pattern(VM& vm, RelativeTimeFormat& relative_time_format, double value, StringView unit)
|
|
|
+ThrowCompletionOr<Vector<::Locale::RelativeTimeFormat::Partition>> partition_relative_time_pattern(VM& vm, RelativeTimeFormat& relative_time_format, double value, StringView unit)
|
|
|
{
|
|
|
- // 1. Assert: relativeTimeFormat has an [[InitializedRelativeTimeFormat]] internal slot.
|
|
|
- // 2. Assert: Type(value) is Number.
|
|
|
- // 3. Assert: Type(unit) is String.
|
|
|
-
|
|
|
- // 4. If value is NaN, +∞𝔽, or -∞𝔽, throw a RangeError exception.
|
|
|
+ // 1. If value is NaN, +∞𝔽, or -∞𝔽, throw a RangeError exception.
|
|
|
if (!Value(value).is_finite_number())
|
|
|
return vm.throw_completion<RangeError>(ErrorType::NumberIsNaNOrInfinity);
|
|
|
|
|
|
- // 5. Let unit be ? SingularRelativeTimeUnit(unit).
|
|
|
+ // 2. Let unit be ? SingularRelativeTimeUnit(unit).
|
|
|
auto time_unit = TRY(singular_relative_time_unit(vm, unit));
|
|
|
|
|
|
- // 6. Let localeData be %RelativeTimeFormat%.[[LocaleData]].
|
|
|
- // 7. Let dataLocale be relativeTimeFormat.[[DataLocale]].
|
|
|
- auto const& data_locale = relative_time_format.data_locale();
|
|
|
-
|
|
|
- // 8. Let fields be localeData.[[<dataLocale>]].
|
|
|
-
|
|
|
- // 9. Let style be relativeTimeFormat.[[Style]].
|
|
|
- auto style = relative_time_format.style();
|
|
|
-
|
|
|
- // NOTE: The next steps form a "key" based on combining various formatting options into a string,
|
|
|
- // then filtering the large set of locale data down to the pattern we are looking for. Instead,
|
|
|
- // LibUnicode expects the individual options as enumeration values, and returns the couple of
|
|
|
- // patterns that match those options.
|
|
|
- auto find_patterns_for_tense_or_number = [&](StringView tense_or_number) {
|
|
|
- // 10. If style is equal to "short", then
|
|
|
- // a. Let entry be the string-concatenation of unit and "-short".
|
|
|
- // 11. Else if style is equal to "narrow", then
|
|
|
- // a. Let entry be the string-concatenation of unit and "-narrow".
|
|
|
- // 12. Else,
|
|
|
- // a. Let entry be unit.
|
|
|
- auto patterns = ::Locale::get_relative_time_format_patterns(data_locale, time_unit, tense_or_number, style);
|
|
|
-
|
|
|
- // 13. If fields doesn't have a field [[<entry>]], then
|
|
|
- if (patterns.is_empty()) {
|
|
|
- // a. Let entry be unit.
|
|
|
- // NOTE: In the CLDR, the lack of "short" or "narrow" in the key implies "long".
|
|
|
- patterns = ::Locale::get_relative_time_format_patterns(data_locale, time_unit, tense_or_number, ::Locale::Style::Long);
|
|
|
- }
|
|
|
-
|
|
|
- // 14. Let patterns be fields.[[<entry>]].
|
|
|
- return patterns;
|
|
|
- };
|
|
|
-
|
|
|
- // 15. Let numeric be relativeTimeFormat.[[Numeric]].
|
|
|
- // 16. If numeric is equal to "auto", then
|
|
|
- if (relative_time_format.numeric() == RelativeTimeFormat::Numeric::Auto) {
|
|
|
- // a. Let valueString be ToString(value).
|
|
|
- auto value_string = MUST(Value(value).to_string(vm));
|
|
|
-
|
|
|
- // b. If patterns has a field [[<valueString>]], then
|
|
|
- if (auto patterns = find_patterns_for_tense_or_number(value_string); !patterns.is_empty()) {
|
|
|
- VERIFY(patterns.size() == 1);
|
|
|
-
|
|
|
- // i. Let result be patterns.[[<valueString>]].
|
|
|
- auto result = MUST(String::from_utf8(patterns[0].pattern));
|
|
|
-
|
|
|
- // ii. Return a List containing the Record { [[Type]]: "literal", [[Value]]: result }.
|
|
|
- return Vector<PatternPartitionWithUnit> { { "literal"sv, move(result) } };
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- // 17. If value is -0𝔽 or if value is less than 0, then
|
|
|
- StringView tense;
|
|
|
- if (Value(value).is_negative_zero() || (value < 0)) {
|
|
|
- // a. Let tl be "past".
|
|
|
- tense = "past"sv;
|
|
|
-
|
|
|
- // FIXME: The spec does not say to do this, but nothing makes sense after this with a negative value.
|
|
|
- value = fabs(value);
|
|
|
- }
|
|
|
- // 18. Else,
|
|
|
- else {
|
|
|
- // a. Let tl be "future".
|
|
|
- tense = "future"sv;
|
|
|
- }
|
|
|
-
|
|
|
- // 19. Let po be patterns.[[<tl>]].
|
|
|
- auto patterns = find_patterns_for_tense_or_number(tense);
|
|
|
-
|
|
|
- // 20. Let fv be ! PartitionNumberPattern(relativeTimeFormat.[[NumberFormat]], value).
|
|
|
- auto value_partitions = partition_number_pattern(relative_time_format.number_format(), Value(value));
|
|
|
-
|
|
|
- // 21. Let pr be ! ResolvePlural(relativeTimeFormat.[[PluralRules]], value).[[PluralCategory]].
|
|
|
- auto plurality = resolve_plural(relative_time_format.plural_rules(), Value(value));
|
|
|
-
|
|
|
- // 22. Let pattern be po.[[<pr>]].
|
|
|
- auto pattern = patterns.find_if([&](auto& p) { return p.plurality == plurality.plural_category; });
|
|
|
- if (pattern == patterns.end())
|
|
|
- return Vector<PatternPartitionWithUnit> {};
|
|
|
-
|
|
|
- // 23. Return ! MakePartsList(pattern, unit, fv).
|
|
|
- return make_parts_list(pattern->pattern, ::Locale::time_unit_to_string(time_unit), move(value_partitions));
|
|
|
-}
|
|
|
-
|
|
|
-// 17.5.3 MakePartsList ( pattern, unit, parts ), https://tc39.es/ecma402/#sec-makepartslist
|
|
|
-Vector<PatternPartitionWithUnit> make_parts_list(StringView pattern, StringView unit, Vector<::Locale::NumberFormat::Partition> parts)
|
|
|
-{
|
|
|
- // 1. Let patternParts be PartitionPattern(pattern).
|
|
|
- auto pattern_parts = partition_pattern(pattern);
|
|
|
-
|
|
|
- // 2. Let result be a new empty List.
|
|
|
- Vector<PatternPartitionWithUnit> result;
|
|
|
-
|
|
|
- // 3. For each Record { [[Type]], [[Value]] } patternPart in patternParts, do
|
|
|
- for (auto& pattern_part : pattern_parts) {
|
|
|
- // a. If patternPart.[[Type]] is "literal", then
|
|
|
- if (pattern_part.type == "literal"sv) {
|
|
|
- // i. Append Record { [[Type]]: "literal", [[Value]]: patternPart.[[Value]], [[Unit]]: empty } to result.
|
|
|
- result.empend("literal"sv, move(pattern_part.value));
|
|
|
- }
|
|
|
- // b. Else,
|
|
|
- else {
|
|
|
- // i. Assert: patternPart.[[Type]] is "0".
|
|
|
- VERIFY(pattern_part.type == "0"sv);
|
|
|
-
|
|
|
- // ii. For each Record { [[Type]], [[Value]] } part in parts, do
|
|
|
- for (auto& part : parts) {
|
|
|
- // 1. Append Record { [[Type]]: part.[[Type]], [[Value]]: part.[[Value]], [[Unit]]: unit } to result.
|
|
|
- result.empend(part.type, move(part.value), unit);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- // 4. Return result.
|
|
|
- return result;
|
|
|
+ return relative_time_format.formatter().format_to_parts(value, time_unit, relative_time_format.numeric());
|
|
|
}
|
|
|
|
|
|
// 17.5.4 FormatRelativeTime ( relativeTimeFormat, value, unit ), https://tc39.es/ecma402/#sec-FormatRelativeTime
|
|
|
ThrowCompletionOr<String> format_relative_time(VM& vm, RelativeTimeFormat& relative_time_format, double value, StringView unit)
|
|
|
{
|
|
|
// 1. Let parts be ? PartitionRelativeTimePattern(relativeTimeFormat, value, unit).
|
|
|
- auto parts = TRY(partition_relative_time_pattern(vm, relative_time_format, value, unit));
|
|
|
+ auto time_unit = TRY([&]() -> ThrowCompletionOr<::Locale::TimeUnit> {
|
|
|
+ // NOTE: We short-circuit PartitionRelativeTimePattern as we do not need individual partitions. But we must still
|
|
|
+ // perform the NaN/Infinity sanity checks and unit parsing from its first steps.
|
|
|
|
|
|
- // 2. Let result be an empty String.
|
|
|
- StringBuilder result;
|
|
|
+ // 1. If value is NaN, +∞𝔽, or -∞𝔽, throw a RangeError exception.
|
|
|
+ if (!Value(value).is_finite_number())
|
|
|
+ return vm.throw_completion<RangeError>(ErrorType::NumberIsNaNOrInfinity);
|
|
|
|
|
|
- // 3. For each Record { [[Type]], [[Value]], [[Unit]] } part in parts, do
|
|
|
- for (auto& part : parts) {
|
|
|
- // a. Set result to the string-concatenation of result and part.[[Value]].
|
|
|
- result.append(part.value);
|
|
|
- }
|
|
|
+ // 2. Let unit be ? SingularRelativeTimeUnit(unit).
|
|
|
+ return TRY(singular_relative_time_unit(vm, unit));
|
|
|
+ }());
|
|
|
|
|
|
+ // 2. Let result be an empty String.
|
|
|
+ // 3. For each Record { [[Type]], [[Value]], [[Unit]] } part in parts, do
|
|
|
+ // a. Set result to the string-concatenation of result and part.[[Value]].
|
|
|
// 4. Return result.
|
|
|
- return MUST(result.to_string());
|
|
|
+ return relative_time_format.formatter().format(value, time_unit, relative_time_format.numeric());
|
|
|
}
|
|
|
|
|
|
// 17.5.5 FormatRelativeTimeToParts ( relativeTimeFormat, value, unit ), https://tc39.es/ecma402/#sec-FormatRelativeTimeToParts
|
|
|
@@ -254,10 +107,8 @@ ThrowCompletionOr<NonnullGCPtr<Array>> format_relative_time_to_parts(VM& vm, Rel
|
|
|
auto result = MUST(Array::create(realm, 0));
|
|
|
|
|
|
// 3. Let n be 0.
|
|
|
- size_t n = 0;
|
|
|
-
|
|
|
// 4. For each Record { [[Type]], [[Value]], [[Unit]] } part in parts, do
|
|
|
- for (auto& part : parts) {
|
|
|
+ for (auto [n, part] : enumerate(parts)) {
|
|
|
// a. Let O be OrdinaryObjectCreate(%Object.prototype%).
|
|
|
auto object = Object::create(realm, realm.intrinsics().object_prototype());
|
|
|
|
|
|
@@ -277,7 +128,6 @@ ThrowCompletionOr<NonnullGCPtr<Array>> format_relative_time_to_parts(VM& vm, Rel
|
|
|
MUST(result->create_data_property_or_throw(n, object));
|
|
|
|
|
|
// f. Increment n by 1.
|
|
|
- ++n;
|
|
|
}
|
|
|
|
|
|
// 5. Return result.
|
Timothy Flynn