diff options
author | Timothy Flynn <trflynn89@pm.me> | 2021-09-06 08:53:28 -0400 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2021-09-06 23:49:56 +0100 |
commit | eacc8bef47eeffe56f293486e2912992ee3fbd7c (patch) | |
tree | 20c6a8f8385e40f72a2cdeb5c5730c5ad542ffa8 /Userland | |
parent | 1a7443bec7250cdd6c609decafed8101011600c4 (diff) | |
download | serenity-eacc8bef47eeffe56f293486e2912992ee3fbd7c.zip |
LibJS: Implement the Intl.ListFormat constructor
Diffstat (limited to 'Userland')
-rw-r--r-- | Userland/Libraries/LibJS/Runtime/Intl/ListFormatConstructor.cpp | 53 | ||||
-rw-r--r-- | Userland/Libraries/LibJS/Tests/builtins/Intl/ListFormat/ListFormat.js | 48 |
2 files changed, 101 insertions, 0 deletions
diff --git a/Userland/Libraries/LibJS/Runtime/Intl/ListFormatConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/ListFormatConstructor.cpp index bca493f359..dbbd0d2f64 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/ListFormatConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/ListFormatConstructor.cpp @@ -6,8 +6,10 @@ #include <LibJS/Runtime/AbstractOperations.h> #include <LibJS/Runtime/GlobalObject.h> +#include <LibJS/Runtime/Intl/AbstractOperations.h> #include <LibJS/Runtime/Intl/ListFormat.h> #include <LibJS/Runtime/Intl/ListFormatConstructor.h> +#include <LibJS/Runtime/Temporal/AbstractOperations.h> namespace JS::Intl { @@ -42,11 +44,62 @@ Value ListFormatConstructor::construct(FunctionObject& new_target) auto& vm = this->vm(); auto& global_object = this->global_object(); + auto locales = vm.argument(0); + auto options = vm.argument(1); + // 2. Let listFormat be ? OrdinaryCreateFromConstructor(NewTarget, "%ListFormat.prototype%", « [[InitializedListFormat]], [[Locale]], [[Type]], [[Style]], [[Templates]] »). auto* list_format = ordinary_create_from_constructor<ListFormat>(global_object, new_target, &GlobalObject::intl_list_format_prototype); if (vm.exception()) return {}; + // 3. Let requestedLocales be ? CanonicalizeLocaleList(locales). + auto requested_locales = canonicalize_locale_list(global_object, locales); + if (vm.exception()) + return {}; + + // 4. Set options to ? GetOptionsObject(options). + options = Temporal::get_options_object(global_object, options); + if (vm.exception()) + return {}; + + // 5. Let opt be a new Record. + LocaleOptions opt {}; + + // 6. Let matcher be ? GetOption(options, "localeMatcher", "string", « "lookup", "best fit" », "best fit"). + auto matcher = get_option(global_object, options, vm.names.localeMatcher, Value::Type::String, { "lookup"sv, "best fit"sv }, "best fit"sv); + if (vm.exception()) + return {}; + + // 7. Set opt.[[localeMatcher]] to matcher. + opt.locale_matcher = matcher; + + // 8. Let localeData be %ListFormat%.[[LocaleData]]. + + // 9. Let r be ResolveLocale(%ListFormat%.[[AvailableLocales]], requestedLocales, opt, %ListFormat%.[[RelevantExtensionKeys]], localeData). + auto result = resolve_locale(requested_locales, opt, {}); + + // 10. Set listFormat.[[Locale]] to r.[[locale]]. + list_format->set_locale(move(result.locale)); + + // 11. Let type be ? GetOption(options, "type", "string", « "conjunction", "disjunction", "unit" », "conjunction"). + auto type = get_option(global_object, options, vm.names.type, Value::Type::String, { "conjunction"sv, "disjunction"sv, "unit"sv }, "conjunction"sv); + if (vm.exception()) + return {}; + + // 12. Set listFormat.[[Type]] to type. + list_format->set_type(type.as_string().string()); + + // 13. Let style be ? GetOption(options, "style", "string", « "long", "short", "narrow" », "long"). + auto style = get_option(global_object, options, vm.names.style, Value::Type::String, { "long"sv, "short"sv, "narrow"sv }, "long"sv); + if (vm.exception()) + return {}; + + // 14. Set listFormat.[[Style]] to style. + list_format->set_style(style.as_string().string()); + + // Note: The remaining steps are skipped in favor of deferring to LibUnicode. + + // 19. Return listFormat. return list_format; } diff --git a/Userland/Libraries/LibJS/Tests/builtins/Intl/ListFormat/ListFormat.js b/Userland/Libraries/LibJS/Tests/builtins/Intl/ListFormat/ListFormat.js index 9f0ac10931..970185daf5 100644 --- a/Userland/Libraries/LibJS/Tests/builtins/Intl/ListFormat/ListFormat.js +++ b/Userland/Libraries/LibJS/Tests/builtins/Intl/ListFormat/ListFormat.js @@ -4,10 +4,58 @@ describe("errors", () => { Intl.ListFormat(); }).toThrowWithMessage(TypeError, "Intl.ListFormat constructor must be called with 'new'"); }); + + test("options is an invalid type", () => { + expect(() => { + new Intl.ListFormat("en", true); + }).toThrowWithMessage(TypeError, "Options is not an object"); + }); + + test("type option is invalid ", () => { + expect(() => { + new Intl.ListFormat("en", { type: "hello!" }); + }).toThrowWithMessage(RangeError, "hello! is not a valid value for option type"); + }); + + test("style option is invalid ", () => { + expect(() => { + new Intl.ListFormat("en", { style: "hello!" }); + }).toThrowWithMessage(RangeError, "hello! is not a valid value for option style"); + }); + + test("matcher option is invalid ", () => { + expect(() => { + new Intl.ListFormat("en", { localeMatcher: "hello!" }); + }).toThrowWithMessage(RangeError, "hello! is not a valid value for option localeMatcher"); + }); }); describe("normal behavior", () => { test("length is 0", () => { expect(Intl.ListFormat).toHaveLength(0); }); + + test("all valid types", () => { + ["conjunction", "disjunction", "unit"].forEach(type => { + expect(() => { + new Intl.ListFormat("en", { type: type }); + }).not.toThrow(); + }); + }); + + test("all valid styles", () => { + ["long", "short", "narrow"].forEach(style => { + expect(() => { + new Intl.ListFormat("en", { style: style }); + }).not.toThrow(); + }); + }); + + test("all valid matchers", () => { + ["lookup", "best fit"].forEach(matcher => { + expect(() => { + new Intl.ListFormat("en", { localeMatcher: matcher }); + }).not.toThrow(); + }); + }); }); |