Skip to content

Commit

Permalink
LibJS: Implement Intl.ListFormat.supportedLocalesOf
Browse files Browse the repository at this point in the history
  • Loading branch information
trflynn89 authored and linusg committed Sep 6, 2021
1 parent eacc8be commit 3b41074
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 0 deletions.
22 changes: 22 additions & 0 deletions Userland/Libraries/LibJS/Runtime/Intl/ListFormatConstructor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

#include <LibJS/Runtime/AbstractOperations.h>
#include <LibJS/Runtime/Array.h>
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Intl/AbstractOperations.h>
#include <LibJS/Runtime/Intl/ListFormat.h>
Expand All @@ -27,6 +28,10 @@ void ListFormatConstructor::initialize(GlobalObject& global_object)

// 13.3.1 Intl.ListFormat.prototype, https://tc39.es/ecma402/#sec-Intl.ListFormat.prototype
define_direct_property(vm.names.prototype, global_object.intl_list_format_prototype(), 0);

u8 attr = Attribute::Writable | Attribute::Configurable;
define_native_function(vm.names.supportedLocalesOf, supported_locales_of, 1, attr);

define_direct_property(vm.names.length, Value(0), Attribute::Configurable);
}

Expand Down Expand Up @@ -103,4 +108,21 @@ Value ListFormatConstructor::construct(FunctionObject& new_target)
return list_format;
}

// 13.3.2 Intl.ListFormat.supportedLocalesOf ( locales [ , options ] ), https://tc39.es/ecma402/#sec-Intl.ListFormat.supportedLocalesOf
JS_DEFINE_NATIVE_FUNCTION(ListFormatConstructor::supported_locales_of)
{
auto locales = vm.argument(0);
auto options = vm.argument(1);

// 1. Let availableLocales be %DisplayNames%.[[AvailableLocales]].

// 2. Let requestedLocales be ? CanonicalizeLocaleList(locales).
auto requested_locales = canonicalize_locale_list(global_object, locales);
if (vm.exception())
return {};

// 3. Return ? SupportedLocales(availableLocales, requestedLocales, options).
return supported_locales(global_object, requested_locales, options);
}

}
2 changes: 2 additions & 0 deletions Userland/Libraries/LibJS/Runtime/Intl/ListFormatConstructor.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class ListFormatConstructor final : public NativeFunction {

private:
virtual bool has_constructor() const override { return true; }

JS_DECLARE_NATIVE_FUNCTION(supported_locales_of);
};

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
describe("correct behavior", () => {
test("length is 1", () => {
expect(Intl.ListFormat.supportedLocalesOf).toHaveLength(1);
});

test("basic functionality", () => {
// prettier-ignore
const values = [
[[], []],
[undefined, []],
["en", ["en"]],
[new Intl.Locale("en"), ["en"]],
[["en"], ["en"]],
[["en", "en-gb", "en-us"], ["en", "en-GB", "en-US"]],
[["en", "de", "fr"], ["en", "de", "fr"]],
[["en-foobar"], ["en-foobar"]],
[["en-foobar-u-abc"], ["en-foobar-u-abc"]],
[["aa", "zz"], []],
[["en", "aa", "zz"], ["en"]],
];
for (const [input, expected] of values) {
expect(Intl.ListFormat.supportedLocalesOf(input)).toEqual(expected);
// "best fit" (implementation defined) just uses the same implementation as "lookup" at the moment
expect(
Intl.ListFormat.supportedLocalesOf(input, { localeMatcher: "best fit" })
).toEqual(Intl.ListFormat.supportedLocalesOf(input, { localeMatcher: "lookup" }));
}
});
});

describe("errors", () => {
test("invalid value for localeMatcher option", () => {
expect(() => {
Intl.ListFormat.supportedLocalesOf([], { localeMatcher: "foo" });
}).toThrowWithMessage(RangeError, "foo is not a valid value for option localeMatcher");
});

test("invalid language tag", () => {
expect(() => {
Intl.ListFormat.supportedLocalesOf(["aaaaaaaaa"]);
}).toThrowWithMessage(RangeError, "aaaaaaaaa is not a structurally valid language tag");
});
});

0 comments on commit 3b41074

Please sign in to comment.