Support for 'notation' option in Intl.PluralRules.

Author: iamstolis

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/intl/InitializePluralRulesNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -58,6 +58,7 @@
 public abstract class InitializePluralRulesNode extends JavaScriptBaseNode {
 
     private static final List<String> TYPE_OPTION_VALUES = List.of(IntlUtil.CARDINAL, IntlUtil.ORDINAL);
+    private static final List<String> NOTATION_OPTION_VALUES = List.of(IntlUtil.STANDARD, IntlUtil.SCIENTIFIC, IntlUtil.ENGINEERING, IntlUtil.COMPACT);
 
     private final JSContext context;
 
@@ -69,6 +70,7 @@ public abstract class InitializePluralRulesNode extends JavaScriptBaseNode {
     @Child SetNumberFormatDigitOptionsNode setNumberFormatDigitOptions;
 
     @Child GetStringOptionNode getTypeOption;
+    @Child GetStringOptionNode getNotationOption;
     private final BranchProfile errorBranch = BranchProfile.create();
 
     protected InitializePluralRulesNode(JSContext context) {
@@ -77,6 +79,7 @@ protected InitializePluralRulesNode(JSContext context) {
         this.coerceOptionsToObjectNode = CoerceOptionsToObjectNodeGen.create(context);
         this.getLocaleMatcherOption = GetStringOptionNode.create(context, IntlUtil.KEY_LOCALE_MATCHER, GetStringOptionNode.LOCALE_MATCHER_OPTION_VALUES, IntlUtil.BEST_FIT);
         this.getTypeOption = GetStringOptionNode.create(context, IntlUtil.KEY_TYPE, TYPE_OPTION_VALUES, IntlUtil.CARDINAL);
+        this.getNotationOption = GetStringOptionNode.create(context, IntlUtil.KEY_NOTATION, NOTATION_OPTION_VALUES, IntlUtil.STANDARD);
         this.setNumberFormatDigitOptions = SetNumberFormatDigitOptionsNode.create(context);
     }
 
@@ -98,9 +101,11 @@ public JSPluralRulesObject initializePluralRules(JSPluralRulesObject pluralRules
 
             getLocaleMatcherOption.executeValue(options);
             String optType = getTypeOption.executeValue(options);
-
             state.setType(optType);
 
+            String notation = getNotationOption.executeValue(options);
+            state.setNotation(notation);
+
             state.resolveLocaleAndNumberingSystem(context, locales, null);
             setNumberFormatDigitOptions.execute(state, options, 0, 3, false);
 

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/intl/JSNumberFormat.java

@@ -199,7 +199,7 @@ private static JSNumberFormatObject create(JSObjectFactory factory, JSRealm real
         return factory.trackAllocation(newObj);
     }
 
-    private static Notation notationToICUNotation(String notation, String compactDisplay) {
+    static Notation notationToICUNotation(String notation, String compactDisplay) {
         Notation icuNotation;
         switch (notation) {
             case IntlUtil.STANDARD:

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/intl/JSPluralRules.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -49,6 +49,7 @@
 import org.graalvm.shadowed.com.ibm.icu.number.LocalizedNumberFormatter;
 import org.graalvm.shadowed.com.ibm.icu.number.LocalizedNumberRangeFormatter;
 import org.graalvm.shadowed.com.ibm.icu.number.NumberRangeFormatter;
+import org.graalvm.shadowed.com.ibm.icu.number.UnlocalizedNumberFormatter;
 import org.graalvm.shadowed.com.ibm.icu.text.PluralRules;
 import org.graalvm.shadowed.com.ibm.icu.text.PluralRules.PluralType;
 
@@ -150,13 +151,15 @@ public static class InternalState extends JSNumberFormat.BasicInternalState {
         private LocalizedNumberRangeFormatter numberRangeFormatter;
 
         private String type;
+        private String notation;
         private PluralRules pluralRules;
         private final List<TruffleString> pluralCategories = new LinkedList<>();
 
         @Override
         void fillResolvedOptions(JSContext context, JSRealm realm, JSDynamicObject result) {
             JSObjectUtil.putDataProperty(result, IntlUtil.KEY_LOCALE, Strings.fromJavaString(getLocale()), JSAttributes.getDefault());
             JSObjectUtil.putDataProperty(result, IntlUtil.KEY_TYPE, Strings.fromJavaString(type), JSAttributes.getDefault());
+            JSObjectUtil.putDataProperty(result, IntlUtil.KEY_NOTATION, Strings.fromJavaString(notation), JSAttributes.getDefault());
             super.fillBasicResolvedOptions(result);
             JSObjectUtil.putDataProperty(result, IntlUtil.KEY_PLURAL_CATEGORIES, JSRuntime.createArrayFromList(realm.getContext(), realm, pluralCategories), JSAttributes.getDefault());
             super.fillRoundingResolvedOptions(result);
@@ -177,8 +180,10 @@ public void initializePluralRules() {
         @TruffleBoundary
         public void initializeNumberFormatter() {
             super.initializeNumberFormatter();
-            numberFormatter = getUnlocalizedFormatter().locale(getJavaLocale());
-            numberRangeFormatter = NumberRangeFormatter.withLocale(getJavaLocale()).numberFormatterBoth(getUnlocalizedFormatter());
+            UnlocalizedNumberFormatter formatter = getUnlocalizedFormatter();
+            formatter = formatter.notation(JSNumberFormat.notationToICUNotation(notation, IntlUtil.LONG));
+            numberFormatter = formatter.locale(getJavaLocale());
+            numberRangeFormatter = NumberRangeFormatter.withLocale(getJavaLocale()).numberFormatterBoth(formatter);
         }
 
         public PluralRules getPluralRules() {
@@ -196,6 +201,10 @@ public LocalizedNumberRangeFormatter getNumberRangeFormatter() {
         public void setType(String type) {
             this.type = type;
         }
+
+        public void setNotation(String notation) {
+            this.notation = notation;
+        }
     }
 
     @TruffleBoundary