Browse Source

LibJS: Implement Intl.NumberFormat.prototype.resolvedOptions

Timothy Flynn 3 years ago
parent
commit
9b5696fee7

+ 72 - 0
Userland/Libraries/LibJS/Runtime/Intl/NumberFormatPrototype.cpp

@@ -4,11 +4,29 @@
  * SPDX-License-Identifier: BSD-2-Clause
  * SPDX-License-Identifier: BSD-2-Clause
  */
  */
 
 
+#include <AK/TypeCasts.h>
 #include <LibJS/Runtime/GlobalObject.h>
 #include <LibJS/Runtime/GlobalObject.h>
+#include <LibJS/Runtime/Intl/NumberFormat.h>
 #include <LibJS/Runtime/Intl/NumberFormatPrototype.h>
 #include <LibJS/Runtime/Intl/NumberFormatPrototype.h>
 
 
 namespace JS::Intl {
 namespace JS::Intl {
 
 
+static NumberFormat* typed_this(GlobalObject& global_object)
+{
+    auto& vm = global_object.vm();
+
+    auto* this_object = vm.this_value(global_object).to_object(global_object);
+    if (!this_object)
+        return nullptr;
+
+    if (!is<NumberFormat>(this_object)) {
+        vm.throw_exception<TypeError>(global_object, ErrorType::NotA, "Intl.NumberFormat");
+        return nullptr;
+    }
+
+    return static_cast<NumberFormat*>(this_object);
+}
+
 // 15.4 Properties of the Intl.NumberFormat Prototype Object, https://tc39.es/ecma402/#sec-properties-of-intl-numberformat-prototype-object
 // 15.4 Properties of the Intl.NumberFormat Prototype Object, https://tc39.es/ecma402/#sec-properties-of-intl-numberformat-prototype-object
 NumberFormatPrototype::NumberFormatPrototype(GlobalObject& global_object)
 NumberFormatPrototype::NumberFormatPrototype(GlobalObject& global_object)
     : Object(*global_object.object_prototype())
     : Object(*global_object.object_prototype())
@@ -23,6 +41,60 @@ void NumberFormatPrototype::initialize(GlobalObject& global_object)
 
 
     // 15.4.2 Intl.NumberFormat.prototype [ @@toStringTag ], https://tc39.es/ecma402/#sec-intl.numberformat.prototype-@@tostringtag
     // 15.4.2 Intl.NumberFormat.prototype [ @@toStringTag ], https://tc39.es/ecma402/#sec-intl.numberformat.prototype-@@tostringtag
     define_direct_property(*vm.well_known_symbol_to_string_tag(), js_string(vm, "Intl.NumberFormat"), Attribute::Configurable);
     define_direct_property(*vm.well_known_symbol_to_string_tag(), js_string(vm, "Intl.NumberFormat"), Attribute::Configurable);
+
+    u8 attr = Attribute::Writable | Attribute::Configurable;
+    define_native_function(vm.names.resolvedOptions, resolved_options, 0, attr);
+}
+
+// 15.4.5 Intl.NumberFormat.prototype.resolvedOptions ( ), https://tc39.es/ecma402/#sec-intl.numberformat.prototype.resolvedoptions
+JS_DEFINE_NATIVE_FUNCTION(NumberFormatPrototype::resolved_options)
+{
+    // 1. Let nf be the this value.
+    // 2. If the implementation supports the normative optional constructor mode of 4.3 Note 1, then
+    //     a. Set nf to ? UnwrapNumberFormat(nf).
+    // 3. Perform ? RequireInternalSlot(nf, [[InitializedNumberFormat]]).
+    auto* number_format = typed_this(global_object);
+    if (vm.exception())
+        return {};
+
+    // 4. Let options be ! OrdinaryObjectCreate(%Object.prototype%).
+    auto* options = Object::create(global_object, global_object.object_prototype());
+
+    // 5. For each row of Table 11, 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 nf's internal slot whose name is the Internal Slot value of the current row.
+    //     c. If v is not undefined, then
+    //         i. Perform ! CreateDataPropertyOrThrow(options, p, v).
+    options->create_data_property_or_throw(vm.names.locale, js_string(vm, number_format->locale()));
+    options->create_data_property_or_throw(vm.names.numberingSystem, js_string(vm, number_format->numbering_system()));
+    options->create_data_property_or_throw(vm.names.style, js_string(vm, number_format->style_string()));
+    if (number_format->has_currency())
+        options->create_data_property_or_throw(vm.names.currency, js_string(vm, number_format->currency()));
+    if (number_format->has_currency_display())
+        options->create_data_property_or_throw(vm.names.currencyDisplay, js_string(vm, number_format->currency_display_string()));
+    if (number_format->has_currency_sign())
+        options->create_data_property_or_throw(vm.names.currencySign, js_string(vm, number_format->currency_sign_string()));
+    if (number_format->has_unit())
+        options->create_data_property_or_throw(vm.names.unit, js_string(vm, number_format->unit()));
+    if (number_format->has_unit_display())
+        options->create_data_property_or_throw(vm.names.unitDisplay, js_string(vm, number_format->unit_display_string()));
+    options->create_data_property_or_throw(vm.names.minimumIntegerDigits, Value(number_format->min_integer_digits()));
+    if (number_format->has_min_fraction_digits())
+        options->create_data_property_or_throw(vm.names.minimumFractionDigits, Value(number_format->min_fraction_digits()));
+    if (number_format->has_max_fraction_digits())
+        options->create_data_property_or_throw(vm.names.maximumFractionDigits, Value(number_format->max_fraction_digits()));
+    if (number_format->has_min_significant_digits())
+        options->create_data_property_or_throw(vm.names.minimumSignificantDigits, Value(number_format->min_significant_digits()));
+    if (number_format->has_max_significant_digits())
+        options->create_data_property_or_throw(vm.names.maximumSignificantDigits, Value(number_format->max_significant_digits()));
+    options->create_data_property_or_throw(vm.names.useGrouping, Value(number_format->use_grouping()));
+    options->create_data_property_or_throw(vm.names.notation, js_string(vm, number_format->notation_string()));
+    if (number_format->has_compact_display())
+        options->create_data_property_or_throw(vm.names.compactDisplay, js_string(vm, number_format->compact_display_string()));
+    options->create_data_property_or_throw(vm.names.signDisplay, js_string(vm, number_format->sign_display_string()));
+
+    // 5. Return options.
+    return options;
 }
 }
 
 
 }
 }

+ 3 - 0
Userland/Libraries/LibJS/Runtime/Intl/NumberFormatPrototype.h

@@ -17,6 +17,9 @@ public:
     explicit NumberFormatPrototype(GlobalObject&);
     explicit NumberFormatPrototype(GlobalObject&);
     virtual void initialize(GlobalObject&) override;
     virtual void initialize(GlobalObject&) override;
     virtual ~NumberFormatPrototype() override = default;
     virtual ~NumberFormatPrototype() override = default;
+
+private:
+    JS_DECLARE_NATIVE_FUNCTION(resolved_options);
 };
 };
 
 
 }
 }

+ 294 - 0
Userland/Libraries/LibJS/Tests/builtins/Intl/NumberFormat/NumberFormat.prototype.resolvedOptions.js

@@ -0,0 +1,294 @@
+describe("correct behavior", () => {
+    test("length is 0", () => {
+        expect(Intl.NumberFormat.prototype.resolvedOptions).toHaveLength(0);
+    });
+
+    test("locale only contains relevant extension keys", () => {
+        const en1 = Intl.NumberFormat("en-u-ca-islamicc");
+        expect(en1.resolvedOptions().locale).toBe("en");
+
+        const en2 = Intl.NumberFormat("en-u-nu-latn");
+        expect(en2.resolvedOptions().locale).toBe("en-u-nu-latn");
+
+        const en3 = Intl.NumberFormat("en-u-ca-islamicc-nu-latn");
+        expect(en3.resolvedOptions().locale).toBe("en-u-nu-latn");
+    });
+
+    test("numberingSystem may be set by option", () => {
+        const en = Intl.NumberFormat("en", { numberingSystem: "latn" });
+        expect(en.resolvedOptions().numberingSystem).toBe("latn");
+
+        const el = Intl.NumberFormat("el", { numberingSystem: "latn" });
+        expect(el.resolvedOptions().numberingSystem).toBe("latn");
+    });
+
+    test("numberingSystem may be set by locale extension", () => {
+        const en = Intl.NumberFormat("en-u-nu-latn");
+        expect(en.resolvedOptions().numberingSystem).toBe("latn");
+
+        const el = Intl.NumberFormat("el-u-nu-latn");
+        expect(el.resolvedOptions().numberingSystem).toBe("latn");
+    });
+
+    test("numberingSystem option overrides locale extension", () => {
+        const el = Intl.NumberFormat("el-u-nu-latn", { numberingSystem: "grek" });
+        expect(el.resolvedOptions().numberingSystem).toBe("grek");
+    });
+
+    test("numberingSystem option limited to known 'nu' values", () => {
+        ["latn", "arab"].forEach(numberingSystem => {
+            const en = Intl.NumberFormat("en", { numberingSystem: numberingSystem });
+            expect(en.resolvedOptions().numberingSystem).toBe("latn");
+        });
+
+        ["latn", "arab"].forEach(numberingSystem => {
+            const en = Intl.NumberFormat(`en-u-nu-${numberingSystem}`);
+            expect(en.resolvedOptions().numberingSystem).toBe("latn");
+        });
+
+        ["latn", "grek"].forEach(numberingSystem => {
+            const el = Intl.NumberFormat("el", { numberingSystem: numberingSystem });
+            expect(el.resolvedOptions().numberingSystem).toBe(numberingSystem);
+        });
+
+        ["latn", "grek"].forEach(numberingSystem => {
+            const el = Intl.NumberFormat(`el-u-nu-${numberingSystem}`);
+            expect(el.resolvedOptions().numberingSystem).toBe(numberingSystem);
+        });
+    });
+
+    test("style", () => {
+        const en1 = new Intl.NumberFormat("en");
+        expect(en1.resolvedOptions().style).toBe("decimal");
+
+        ["decimal", "percent", "currency", "unit"].forEach(style => {
+            const en2 = new Intl.NumberFormat("en", {
+                style: style,
+                currency: "USD",
+                unit: "degree",
+            });
+            expect(en2.resolvedOptions().style).toBe(style);
+        });
+    });
+
+    test("style option of currency sets min/max fraction digits to currency's minor unit", () => {
+        const en1 = new Intl.NumberFormat("en", { style: "currency", currency: "USD" });
+        expect(en1.resolvedOptions().style).toBe("currency");
+        expect(en1.resolvedOptions().minimumFractionDigits).toBe(2);
+        expect(en1.resolvedOptions().maximumFractionDigits).toBe(2);
+
+        const en2 = new Intl.NumberFormat("en", { style: "currency", currency: "JOD" });
+        expect(en2.resolvedOptions().style).toBe("currency");
+        expect(en2.resolvedOptions().minimumFractionDigits).toBe(3);
+        expect(en2.resolvedOptions().maximumFractionDigits).toBe(3);
+    });
+
+    test("unknown currency codes and currency codes without minor units default to min/max fraction digits of 2", () => {
+        const en1 = new Intl.NumberFormat("en", { style: "currency", currency: "XXX" });
+        expect(en1.resolvedOptions().style).toBe("currency");
+        expect(en1.resolvedOptions().minimumFractionDigits).toBe(2);
+        expect(en1.resolvedOptions().maximumFractionDigits).toBe(2);
+
+        const en2 = new Intl.NumberFormat("en", { style: "currency", currency: "XAG" });
+        expect(en2.resolvedOptions().style).toBe("currency");
+        expect(en2.resolvedOptions().minimumFractionDigits).toBe(2);
+        expect(en2.resolvedOptions().maximumFractionDigits).toBe(2);
+    });
+
+    test("other style options default to min fraction digits of 0 and max fraction digits of 0 or 3", () => {
+        const en1 = new Intl.NumberFormat("en", { style: "decimal" });
+        expect(en1.resolvedOptions().style).toBe("decimal");
+        expect(en1.resolvedOptions().minimumFractionDigits).toBe(0);
+        expect(en1.resolvedOptions().maximumFractionDigits).toBe(3);
+
+        const en2 = new Intl.NumberFormat("en", { style: "unit", unit: "degree" });
+        expect(en2.resolvedOptions().style).toBe("unit");
+        expect(en2.resolvedOptions().minimumFractionDigits).toBe(0);
+        expect(en2.resolvedOptions().maximumFractionDigits).toBe(3);
+
+        const en3 = new Intl.NumberFormat("en", { style: "percent" });
+        expect(en3.resolvedOptions().style).toBe("percent");
+        expect(en3.resolvedOptions().minimumFractionDigits).toBe(0);
+        expect(en3.resolvedOptions().maximumFractionDigits).toBe(0);
+    });
+
+    test("min integer digits", () => {
+        const en1 = new Intl.NumberFormat("en");
+        expect(en1.resolvedOptions().minimumIntegerDigits).toBe(1);
+
+        const en2 = new Intl.NumberFormat("en", { minimumIntegerDigits: 5 });
+        expect(en2.resolvedOptions().minimumIntegerDigits).toBe(5);
+    });
+
+    test("min/max fraction digits", () => {
+        const en1 = new Intl.NumberFormat("en", { minimumFractionDigits: 5 });
+        expect(en1.resolvedOptions().minimumFractionDigits).toBe(5);
+        expect(en1.resolvedOptions().maximumFractionDigits).toBe(5);
+        expect(en1.resolvedOptions().minimumSignificantDigits).toBeUndefined();
+        expect(en1.resolvedOptions().maximumSignificantDigits).toBeUndefined();
+
+        const en2 = new Intl.NumberFormat("en", { maximumFractionDigits: 5 });
+        expect(en2.resolvedOptions().minimumFractionDigits).toBe(0);
+        expect(en2.resolvedOptions().maximumFractionDigits).toBe(5);
+        expect(en2.resolvedOptions().minimumSignificantDigits).toBeUndefined();
+        expect(en2.resolvedOptions().maximumSignificantDigits).toBeUndefined();
+
+        const en3 = new Intl.NumberFormat("en", {
+            minimumFractionDigits: 5,
+            maximumFractionDigits: 10,
+        });
+        expect(en3.resolvedOptions().minimumFractionDigits).toBe(5);
+        expect(en3.resolvedOptions().maximumFractionDigits).toBe(10);
+        expect(en3.resolvedOptions().minimumSignificantDigits).toBeUndefined();
+        expect(en3.resolvedOptions().maximumSignificantDigits).toBeUndefined();
+    });
+
+    test("min/max significant digits", () => {
+        const en1 = new Intl.NumberFormat("en", { minimumSignificantDigits: 5 });
+        expect(en1.resolvedOptions().minimumFractionDigits).toBeUndefined();
+        expect(en1.resolvedOptions().maximumFractionDigits).toBeUndefined();
+        expect(en1.resolvedOptions().minimumSignificantDigits).toBe(5);
+        expect(en1.resolvedOptions().maximumSignificantDigits).toBe(21);
+
+        const en2 = new Intl.NumberFormat("en", { maximumSignificantDigits: 5 });
+        expect(en2.resolvedOptions().minimumFractionDigits).toBeUndefined();
+        expect(en2.resolvedOptions().maximumFractionDigits).toBeUndefined();
+        expect(en2.resolvedOptions().minimumSignificantDigits).toBe(1);
+        expect(en2.resolvedOptions().maximumSignificantDigits).toBe(5);
+
+        const en3 = new Intl.NumberFormat("en", {
+            minimumSignificantDigits: 5,
+            maximumSignificantDigits: 10,
+        });
+        expect(en3.resolvedOptions().minimumFractionDigits).toBeUndefined();
+        expect(en3.resolvedOptions().maximumFractionDigits).toBeUndefined();
+        expect(en3.resolvedOptions().minimumSignificantDigits).toBe(5);
+        expect(en3.resolvedOptions().maximumSignificantDigits).toBe(10);
+    });
+
+    test("notation", () => {
+        const en1 = new Intl.NumberFormat("en");
+        expect(en1.resolvedOptions().notation).toBe("standard");
+
+        ["standard", "scientific", "engineering", "compact"].forEach(notation => {
+            const en2 = new Intl.NumberFormat("en", { notation: notation });
+            expect(en2.resolvedOptions().notation).toBe(notation);
+        });
+    });
+
+    test("compact notation causes all min/max digits to be undefined by default", () => {
+        const en = new Intl.NumberFormat("en", { notation: "compact" });
+        expect(en.resolvedOptions().minimumFractionDigits).toBeUndefined();
+        expect(en.resolvedOptions().maximumFractionDigits).toBeUndefined();
+        expect(en.resolvedOptions().minimumSignificantDigits).toBeUndefined();
+        expect(en.resolvedOptions().maximumSignificantDigits).toBeUndefined();
+    });
+
+    test("currency display and sign only defined when style is currency", () => {
+        ["decimal", "percent", "unit"].forEach(style => {
+            const en1 = new Intl.NumberFormat("en", { style: style, unit: "degree" });
+            expect(en1.resolvedOptions().currencyDisplay).toBeUndefined();
+            expect(en1.resolvedOptions().currencySign).toBeUndefined();
+
+            const en2 = new Intl.NumberFormat("en", {
+                style: style,
+                unit: "degree",
+                currencyDisplay: "symbol",
+                currencySign: "standard",
+            });
+            expect(en2.resolvedOptions().style).toBe(style);
+            expect(en2.resolvedOptions().currencyDisplay).toBeUndefined();
+            expect(en2.resolvedOptions().currencySign).toBeUndefined();
+        });
+
+        const en3 = new Intl.NumberFormat("en", { style: "currency", currency: "USD" });
+        expect(en3.resolvedOptions().currencyDisplay).toBe("symbol");
+        expect(en3.resolvedOptions().currencySign).toBe("standard");
+
+        ["code", "symbol", "narrowSymbol", "name"].forEach(currencyDisplay => {
+            ["standard", "accounting"].forEach(currencySign => {
+                const en4 = new Intl.NumberFormat("en", {
+                    style: "currency",
+                    currency: "USD",
+                    currencyDisplay: currencyDisplay,
+                    currencySign: currencySign,
+                });
+                expect(en4.resolvedOptions().style).toBe("currency");
+                expect(en4.resolvedOptions().currencyDisplay).toBe(currencyDisplay);
+                expect(en4.resolvedOptions().currencySign).toBe(currencySign);
+            });
+        });
+    });
+
+    test("unit display only defined when style is unit", () => {
+        ["decimal", "percent", "currency"].forEach(style => {
+            const en1 = new Intl.NumberFormat("en", { style: style, currency: "USD" });
+            expect(en1.resolvedOptions().unitDisplay).toBeUndefined();
+
+            const en2 = new Intl.NumberFormat("en", {
+                style: style,
+                currency: "USD",
+                unitDisplay: "short",
+            });
+            expect(en2.resolvedOptions().style).toBe(style);
+            expect(en2.resolvedOptions().unitDisplay).toBeUndefined();
+        });
+
+        const en3 = new Intl.NumberFormat("en", { style: "unit", unit: "degree" });
+        expect(en3.resolvedOptions().unitDisplay).toBe("short");
+
+        ["short", "narrow", "long"].forEach(unitDisplay => {
+            const en4 = new Intl.NumberFormat("en", {
+                style: "unit",
+                unit: "degree",
+                unitDisplay: unitDisplay,
+            });
+            expect(en4.resolvedOptions().style).toBe("unit");
+            expect(en4.resolvedOptions().unitDisplay).toBe(unitDisplay);
+        });
+    });
+
+    test("compact display only defined when notation is compact", () => {
+        ["standard", "scientific", "engineering"].forEach(notation => {
+            const en1 = new Intl.NumberFormat("en", { notation: notation });
+            expect(en1.resolvedOptions().compactDisplay).toBeUndefined();
+
+            const en2 = new Intl.NumberFormat("en", {
+                notation: notation,
+                compactDisplay: "short",
+            });
+            expect(en2.resolvedOptions().notation).toBe(notation);
+            expect(en2.resolvedOptions().compactDisplay).toBeUndefined();
+        });
+
+        const en3 = new Intl.NumberFormat("en", { notation: "compact" });
+        expect(en3.resolvedOptions().compactDisplay).toBe("short");
+
+        ["short", "long"].forEach(compactDisplay => {
+            const en4 = new Intl.NumberFormat("en", {
+                notation: "compact",
+                compactDisplay: compactDisplay,
+            });
+            expect(en4.resolvedOptions().notation).toBe("compact");
+            expect(en4.resolvedOptions().compactDisplay).toBe(compactDisplay);
+        });
+    });
+
+    test("use grouping", () => {
+        const en1 = new Intl.NumberFormat("en");
+        expect(en1.resolvedOptions().useGrouping).toBeTrue();
+
+        const en2 = new Intl.NumberFormat("en", { useGrouping: false });
+        expect(en2.resolvedOptions().useGrouping).toBeFalse();
+    });
+
+    test("sign display", () => {
+        const en1 = new Intl.NumberFormat("en");
+        expect(en1.resolvedOptions().signDisplay).toBe("auto");
+
+        ["auto", "never", "always", "exceptZero"].forEach(signDisplay => {
+            const en2 = new Intl.NumberFormat("en", { signDisplay: signDisplay });
+            expect(en2.resolvedOptions().signDisplay).toBe(signDisplay);
+        });
+    });
+});