diff --git a/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.cpp b/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.cpp index 267a6b7e44..0b6eec3ba3 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.cpp @@ -4,9 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include -#include #include namespace JS::Intl { @@ -40,47 +37,4 @@ StringView PluralRules::type_string() const } } -// 16.1.1 InitializePluralRules ( pluralRules, locales, options ), https://tc39.es/ecma402/#sec-initializepluralrules -ThrowCompletionOr initialize_plural_rules(GlobalObject& global_object, PluralRules& plural_rules, Value locales_value, Value options_value) -{ - auto& vm = global_object.vm(); - - // 1. Let requestedLocales be ? CanonicalizeLocaleList(locales). - auto requested_locales = TRY(canonicalize_locale_list(global_object, locales_value)); - - // 2. Set options to ? CoerceOptionsToObject(options). - auto* options = TRY(coerce_options_to_object(global_object, options_value)); - - // 3. Let opt be a new Record. - LocaleOptions opt {}; - - // 4. Let matcher be ? GetOption(options, "localeMatcher", "string", « "lookup", "best fit" », "best fit"). - auto matcher = TRY(get_option(global_object, *options, vm.names.localeMatcher, Value::Type::String, AK::Array { "lookup"sv, "best fit"sv }, "best fit"sv)); - - // 5. Set opt.[[localeMatcher]] to matcher. - opt.locale_matcher = matcher; - - // 6. Let t be ? GetOption(options, "type", "string", « "cardinal", "ordinal" », "cardinal"). - auto type = TRY(get_option(global_object, *options, vm.names.type, Value::Type::String, AK::Array { "cardinal"sv, "ordinal"sv }, "cardinal"sv)); - - // 7. Set pluralRules.[[Type]] to t. - plural_rules.set_type(type.as_string().string()); - - // 8. Perform ? SetNumberFormatDigitOptions(pluralRules, options, +0𝔽, 3𝔽, "standard"). - TRY(set_number_format_digit_options(global_object, plural_rules, *options, 0, 3, NumberFormat::Notation::Standard)); - - // 9. Let localeData be %PluralRules%.[[LocaleData]]. - // 10. Let r be ResolveLocale(%PluralRules%.[[AvailableLocales]], requestedLocales, opt, %PluralRules%.[[RelevantExtensionKeys]], localeData). - auto result = resolve_locale(requested_locales, opt, {}); - - // 11. Set pluralRules.[[Locale]] to r.[[locale]]. - plural_rules.set_locale(move(result.locale)); - - // Non-standard, the data locale is used by our NumberFormat implementation. - plural_rules.set_data_locale(move(result.data_locale)); - - // 12. Return pluralRules. - return &plural_rules; -} - } diff --git a/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.h b/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.h index d51f16e3c0..b1e6c6a291 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/PluralRules.h @@ -8,7 +8,6 @@ #include #include -#include #include #include @@ -34,6 +33,4 @@ private: Type m_type { Type::Cardinal }; // [[Type]] }; -ThrowCompletionOr initialize_plural_rules(GlobalObject& global_object, PluralRules& plural_rules, Value locales_value, Value options_value); - } diff --git a/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesConstructor.cpp index cee18d31f6..06ebe0712d 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesConstructor.cpp @@ -4,16 +4,18 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include #include #include #include +#include #include #include namespace JS::Intl { -// 16.2 The Intl.PluralRules Constructor, https://tc39.es/ecma402/#sec-intl-pluralrules-constructor +// 16.1 The Intl.PluralRules Constructor, https://tc39.es/ecma402/#sec-intl-pluralrules-constructor PluralRulesConstructor::PluralRulesConstructor(GlobalObject& global_object) : NativeFunction(vm().names.PluralRules.as_string(), *global_object.function_prototype()) { @@ -25,7 +27,7 @@ void PluralRulesConstructor::initialize(GlobalObject& global_object) auto& vm = this->vm(); - // 16.3.1 Intl.PluralRules.prototype, https://tc39.es/ecma402/#sec-intl.pluralrules.prototype + // 16.2.1 Intl.PluralRules.prototype, https://tc39.es/ecma402/#sec-intl.pluralrules.prototype define_direct_property(vm.names.prototype, global_object.intl_plural_rules_prototype(), 0); define_direct_property(vm.names.length, Value(0), Attribute::Configurable); @@ -33,14 +35,14 @@ void PluralRulesConstructor::initialize(GlobalObject& global_object) define_native_function(vm.names.supportedLocalesOf, supported_locales_of, 1, attr); } -// 16.2.1 Intl.PluralRules ( [ locales [ , options ] ] ), https://tc39.es/ecma402/#sec-intl.pluralrules +// 16.1.1 Intl.PluralRules ( [ locales [ , options ] ] ), https://tc39.es/ecma402/#sec-intl.pluralrules ThrowCompletionOr PluralRulesConstructor::call() { // 1. If NewTarget is undefined, throw a TypeError exception. return vm().throw_completion(global_object(), ErrorType::ConstructorWithoutNew, "Intl.PluralRules"); } -// 16.2.1 Intl.PluralRules ( [ locales [ , options ] ] ), https://tc39.es/ecma402/#sec-intl.pluralrules +// 16.1.1 Intl.PluralRules ( [ locales [ , options ] ] ), https://tc39.es/ecma402/#sec-intl.pluralrules ThrowCompletionOr PluralRulesConstructor::construct(FunctionObject& new_target) { auto& vm = this->vm(); @@ -56,7 +58,7 @@ ThrowCompletionOr PluralRulesConstructor::construct(FunctionObject& new return TRY(initialize_plural_rules(global_object, *plural_rules, locales, options)); } -// 16.3.2 Intl.PluralRules.supportedLocalesOf ( locales [ , options ] ), https://tc39.es/ecma402/#sec-intl.pluralrules.supportedlocalesof +// 16.2.2 Intl.PluralRules.supportedLocalesOf ( locales [ , options ] ), https://tc39.es/ecma402/#sec-intl.pluralrules.supportedlocalesof JS_DEFINE_NATIVE_FUNCTION(PluralRulesConstructor::supported_locales_of) { auto locales = vm.argument(0); @@ -71,4 +73,47 @@ JS_DEFINE_NATIVE_FUNCTION(PluralRulesConstructor::supported_locales_of) return TRY(supported_locales(global_object, requested_locales, options)); } +// 16.1.2 InitializePluralRules ( pluralRules, locales, options ), https://tc39.es/ecma402/#sec-initializepluralrules +ThrowCompletionOr initialize_plural_rules(GlobalObject& global_object, PluralRules& plural_rules, Value locales_value, Value options_value) +{ + auto& vm = global_object.vm(); + + // 1. Let requestedLocales be ? CanonicalizeLocaleList(locales). + auto requested_locales = TRY(canonicalize_locale_list(global_object, locales_value)); + + // 2. Set options to ? CoerceOptionsToObject(options). + auto* options = TRY(coerce_options_to_object(global_object, options_value)); + + // 3. Let opt be a new Record. + LocaleOptions opt {}; + + // 4. Let matcher be ? GetOption(options, "localeMatcher", "string", « "lookup", "best fit" », "best fit"). + auto matcher = TRY(get_option(global_object, *options, vm.names.localeMatcher, Value::Type::String, AK::Array { "lookup"sv, "best fit"sv }, "best fit"sv)); + + // 5. Set opt.[[localeMatcher]] to matcher. + opt.locale_matcher = matcher; + + // 6. Let t be ? GetOption(options, "type", "string", « "cardinal", "ordinal" », "cardinal"). + auto type = TRY(get_option(global_object, *options, vm.names.type, Value::Type::String, AK::Array { "cardinal"sv, "ordinal"sv }, "cardinal"sv)); + + // 7. Set pluralRules.[[Type]] to t. + plural_rules.set_type(type.as_string().string()); + + // 8. Perform ? SetNumberFormatDigitOptions(pluralRules, options, +0𝔽, 3𝔽, "standard"). + TRY(set_number_format_digit_options(global_object, plural_rules, *options, 0, 3, NumberFormat::Notation::Standard)); + + // 9. Let localeData be %PluralRules%.[[LocaleData]]. + // 10. Let r be ResolveLocale(%PluralRules%.[[AvailableLocales]], requestedLocales, opt, %PluralRules%.[[RelevantExtensionKeys]], localeData). + auto result = resolve_locale(requested_locales, opt, {}); + + // 11. Set pluralRules.[[Locale]] to r.[[locale]]. + plural_rules.set_locale(move(result.locale)); + + // Non-standard, the data locale is used by our NumberFormat implementation. + plural_rules.set_data_locale(move(result.data_locale)); + + // 12. Return pluralRules. + return &plural_rules; +} + } diff --git a/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesConstructor.h b/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesConstructor.h index 0af2d98d1b..9884d70a83 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesConstructor.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesConstructor.h @@ -27,4 +27,6 @@ private: JS_DECLARE_NATIVE_FUNCTION(supported_locales_of); }; +ThrowCompletionOr initialize_plural_rules(GlobalObject& global_object, PluralRules& plural_rules, Value locales_value, Value options_value); + } diff --git a/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesPrototype.cpp b/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesPrototype.cpp index 83aa2fe315..3aef812e17 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/PluralRulesPrototype.cpp @@ -11,7 +11,7 @@ namespace JS::Intl { -// 16.4 Properties of the Intl.PluralRules Prototype Object, https://tc39.es/ecma402/#sec-properties-of-intl-pluralrules-prototype-object +// 16.3 Properties of the Intl.PluralRules Prototype Object, https://tc39.es/ecma402/#sec-properties-of-intl-pluralrules-prototype-object PluralRulesPrototype::PluralRulesPrototype(GlobalObject& global_object) : PrototypeObject(*global_object.object_prototype()) { @@ -23,14 +23,14 @@ void PluralRulesPrototype::initialize(GlobalObject& global_object) auto& vm = this->vm(); - // 16.4.2 Intl.PluralRules.prototype [ @@toStringTag ], https://tc39.es/ecma402/#sec-intl.pluralrules.prototype-tostringtag + // 16.3.2 Intl.PluralRules.prototype [ @@toStringTag ], https://tc39.es/ecma402/#sec-intl.pluralrules.prototype-tostringtag define_direct_property(*vm.well_known_symbol_to_string_tag(), js_string(vm, "Intl.PluralRules"sv), Attribute::Configurable); u8 attr = Attribute::Writable | Attribute::Configurable; define_native_function(vm.names.resolvedOptions, resolved_options, 0, attr); } -// 16.4.4 Intl.PluralRules.prototype.resolvedOptions ( ), https://tc39.es/ecma402/#sec-intl.pluralrules.prototype.resolvedoptions +// 16.3.4 Intl.PluralRules.prototype.resolvedOptions ( ), https://tc39.es/ecma402/#sec-intl.pluralrules.prototype.resolvedoptions JS_DEFINE_NATIVE_FUNCTION(PluralRulesPrototype::resolved_options) { // 1. Let pr be the this value. @@ -40,7 +40,7 @@ JS_DEFINE_NATIVE_FUNCTION(PluralRulesPrototype::resolved_options) // 3. Let options be ! OrdinaryObjectCreate(%Object.prototype%). auto* options = Object::create(global_object, global_object.object_prototype()); - // 4. For each row of Table 14, except the header row, in table order, do + // 4. For each row of Table 13, except the header row, in table order, do // a. Let p be the Property value of the current row. // b. Let v be the value of pr's internal slot whose name is the Internal Slot value of the current row. // c. If v is not undefined, then