@formatjs/intl-numberformat 8.1.2 → 8.2.0

package/lib/src/core.js

@@ -85,6 +85,15 @@ defineProperty(NumberFormat.prototype, 'resolvedOptions', {
                 ro[key] = value;
             }
         }
+        if (internalSlots.roundingType === 'morePrecision') {
+            ro.roundingPriority = 'morePrecision';
+        }
+        else if (internalSlots.roundingType === 'lessPrecision') {
+            ro.roundingPriority = 'lessPrecision';
+        }
+        else {
+            ro.roundingPriority = 'auto';
+        }
         return ro;
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-numberformat",
-  "version": "8.1.2",
+  "version": "8.2.0",
   "description": "Ponyfill for ES2020 Intl.NumberFormat",
   "keywords": [
     "polyfill",
@@ -22,14 +22,14 @@
     "url": "git+https://github.com/formatjs/formatjs.git"
   },
   "dependencies": {
-    "@formatjs/ecma402-abstract": "1.11.10",
-    "@formatjs/intl-localematcher": "0.2.30",
+    "@formatjs/ecma402-abstract": "1.13.0",
+    "@formatjs/intl-localematcher": "0.2.31",
     "tslib": "2.4.0"
   },
   "devDependencies": {
     "@formatjs/intl-getcanonicallocales": "2.0.4",
-    "@formatjs/intl-locale": "3.0.5",
-    "@formatjs/intl-pluralrules": "5.1.2"
+    "@formatjs/intl-locale": "3.0.7",
+    "@formatjs/intl-pluralrules": "5.1.4"
   },
   "bugs": {
     "url": "https://github.com/formatjs/formatjs/issues"

package/polyfill.iife.js

@@ -128,6 +128,29 @@
     return fallback;
   }
 
+  // ../../../../../../../../execroot/formatjs/bazel-out/darwin-fastbuild/bin/node_modules/.aspect_rules_js/@formatjs+ecma402-abstract@0.0.0/node_modules/@formatjs/ecma402-abstract/lib/GetStringOrBooleanOption.js
+  function GetStringOrBooleanOption(opts, prop, values, trueValue, falsyValue, fallback) {
+    var value = opts[prop];
+    if (value === void 0) {
+      return fallback;
+    }
+    if (value === true) {
+      return trueValue;
+    }
+    var valueBoolean = Boolean(value);
+    if (valueBoolean === false) {
+      return falsyValue;
+    }
+    value = ToString(value);
+    if (value === "true" || value === "false") {
+      return fallback;
+    }
+    if ((values || []).indexOf(value) === -1) {
+      throw new RangeError("Invalid value ".concat(value));
+    }
+    return value;
+  }
+
   // ../../../../../../../../execroot/formatjs/bazel-out/darwin-fastbuild/bin/node_modules/.aspect_rules_js/@formatjs+ecma402-abstract@0.0.0/node_modules/@formatjs/ecma402-abstract/lib/IsSanctionedSimpleUnitIdentifier.js
   var SANCTIONED_UNITS = [
     "angle-degree",
@@ -552,7 +575,7 @@
             notation,
             exponent,
             numberingSystem,
-            !compactNumberPattern && options.useGrouping,
+            !compactNumberPattern && Boolean(options.useGrouping),
             decimalNumberPattern
           ));
           break;
@@ -788,17 +811,22 @@
     var n;
     if (isNaN(x)) {
       n = symbols.nan;
-    } else if (!isFinite(x)) {
+    } else if (x == Number.POSITIVE_INFINITY || x == Number.NEGATIVE_INFINITY) {
       n = symbols.infinity;
     } else {
-      if (internalSlots.style === "percent") {
-        x *= 100;
+      if (!SameValue(x, -0)) {
+        if (!isFinite(x)) {
+          throw new Error("Input must be a mathematical value");
+        }
+        if (internalSlots.style == "percent") {
+          x *= 100;
+        }
+        ;
+        _b = ComputeExponent(numberFormat, x, {
+          getInternalSlots: getInternalSlots2
+        }), exponent = _b[0], magnitude = _b[1];
+        x = exponent < 0 ? x * Math.pow(10, -exponent) : x / Math.pow(10, exponent);
       }
-      ;
-      _b = ComputeExponent(numberFormat, x, {
-        getInternalSlots: getInternalSlots2
-      }), exponent = _b[0], magnitude = _b[1];
-      x = exponent < 0 ? x * Math.pow(10, -exponent) : x / Math.pow(10, exponent);
       var formatNumberResult = FormatNumericToString(internalSlots, x);
       n = formatNumberResult.formattedString;
       x = formatNumberResult.roundedNumber;
@@ -1125,29 +1153,81 @@
     var mnsd = opts.minimumSignificantDigits;
     var mxsd = opts.maximumSignificantDigits;
     internalSlots.minimumIntegerDigits = mnid;
-    if (mnsd !== void 0 || mxsd !== void 0) {
-      internalSlots.roundingType = "significantDigits";
-      mnsd = DefaultNumberOption(mnsd, 1, 21, 1);
-      mxsd = DefaultNumberOption(mxsd, mnsd, 21, 21);
-      internalSlots.minimumSignificantDigits = mnsd;
-      internalSlots.maximumSignificantDigits = mxsd;
-    } else if (mnfd !== void 0 || mxfd !== void 0) {
-      internalSlots.roundingType = "fractionDigits";
-      mnfd = DefaultNumberOption(mnfd, 0, 20, mnfdDefault);
-      var mxfdActualDefault = Math.max(mnfd, mxfdDefault);
-      mxfd = DefaultNumberOption(mxfd, mnfd, 20, mxfdActualDefault);
-      internalSlots.minimumFractionDigits = mnfd;
-      internalSlots.maximumFractionDigits = mxfd;
-    } else if (notation === "compact") {
-      internalSlots.roundingType = "compactRounding";
+    var roundingPriority = GetOption(opts, "roundingPriority", "string", ["auto", "morePrecision", "lessPrecision"], "auto");
+    var hasSd = mnsd !== void 0 || mxsd !== void 0;
+    var hasFd = mnfd !== void 0 || mxfd !== void 0;
+    var needSd = true;
+    var needFd = true;
+    if (roundingPriority === "auto") {
+      needSd = hasSd;
+      if (hasSd || !hasFd && notation === "compact") {
+        needFd = false;
+      }
+    }
+    if (needSd) {
+      if (hasSd) {
+        mnsd = DefaultNumberOption(mnsd, 1, 21, 1);
+        mxsd = DefaultNumberOption(mxsd, mnsd, 21, 21);
+        internalSlots.minimumSignificantDigits = mnsd;
+        internalSlots.maximumSignificantDigits = mxsd;
+      } else {
+        internalSlots.minimumSignificantDigits = 1;
+        internalSlots.maximumSignificantDigits = 21;
+      }
+    }
+    if (needFd) {
+      if (hasFd) {
+        mnfd = DefaultNumberOption(mnfd, 0, 20, void 0);
+        mxfd = DefaultNumberOption(mxfd, 0, 20, void 0);
+        if (mnfd === void 0) {
+          mnfd = Math.min(mnfdDefault, mxfd);
+        } else if (mxfd === void 0) {
+          mxfd = Math.max(mxfdDefault, mnfd);
+        } else if (mnfd > mxfd) {
+          throw new RangeError("Invalid range, ".concat(mnfd, " > ").concat(mxfd));
+        }
+        internalSlots.minimumFractionDigits = mnfd;
+        internalSlots.maximumFractionDigits = mxfd;
+      } else {
+        internalSlots.minimumFractionDigits = mnfdDefault;
+        internalSlots.maximumFractionDigits = mxfdDefault;
+      }
+    }
+    if (needSd || needFd) {
+      if (roundingPriority === "morePrecision") {
+        internalSlots.roundingType = "morePrecision";
+      } else if (roundingPriority === "lessPrecision") {
+        internalSlots.roundingType = "lessPrecision";
+      } else if (hasSd) {
+        internalSlots.roundingType = "significantDigits";
+      } else {
+        internalSlots.roundingType = "fractionDigits";
+      }
     } else {
-      internalSlots.roundingType = "fractionDigits";
-      internalSlots.minimumFractionDigits = mnfdDefault;
-      internalSlots.maximumFractionDigits = mxfdDefault;
+      internalSlots.roundingType = "morePrecision";
+      internalSlots.minimumFractionDigits = 0;
+      internalSlots.maximumFractionDigits = 0;
+      internalSlots.minimumSignificantDigits = 1;
+      internalSlots.maximumSignificantDigits = 2;
     }
   }
 
   // ../../../../../../../../execroot/formatjs/bazel-out/darwin-fastbuild/bin/node_modules/.aspect_rules_js/@formatjs+ecma402-abstract@0.0.0/node_modules/@formatjs/ecma402-abstract/lib/NumberFormat/InitializeNumberFormat.js
+  var VALID_ROUND_INCREMENT_VALUES = [
+    1,
+    2,
+    5,
+    10,
+    20,
+    25,
+    50,
+    100,
+    200,
+    250,
+    500,
+    1e3,
+    2e3
+  ];
   function InitializeNumberFormat(nf, locales, opts, _a) {
     var getInternalSlots2 = _a.getInternalSlots, localeData = _a.localeData, availableLocales = _a.availableLocales, numberingSystemNames2 = _a.numberingSystemNames, getDefaultLocale = _a.getDefaultLocale, currencyDigitsData2 = _a.currencyDigitsData;
     var requestedLocales = CanonicalizeLocaleList(locales);
@@ -1191,14 +1271,38 @@
     var notation = GetOption(options, "notation", "string", ["standard", "scientific", "engineering", "compact"], "standard");
     internalSlots.notation = notation;
     SetNumberFormatDigitOptions(internalSlots, options, mnfdDefault, mxfdDefault, notation);
+    var roundingIncrement = GetNumberOption(options, "roundingIncrement", 1, 5e3, 1);
+    if (VALID_ROUND_INCREMENT_VALUES.indexOf(roundingIncrement) === -1) {
+      throw new RangeError("Invalid rounding increment value: ".concat(roundingIncrement, ".\nValid values are ").concat(VALID_ROUND_INCREMENT_VALUES, "."));
+    }
+    if (roundingIncrement !== 1 && internalSlots.roundingType !== "fractionDigits") {
+      throw new TypeError("For roundingIncrement > 1 only fractionDigits is a valid roundingType");
+    }
+    if (roundingIncrement !== 1 && internalSlots.maximumFractionDigits !== internalSlots.minimumFractionDigits) {
+      throw new RangeError("With roundingIncrement > 1, maximumFractionDigits and minimumFractionDigits must be equal.");
+    }
+    internalSlots.roundingIncrement = roundingIncrement;
+    var trailingZeroDisplay = GetOption(options, "trailingZeroDisplay", "string", ["auto", "stripIfInteger"], "auto");
+    internalSlots.trailingZeroDisplay = trailingZeroDisplay;
     var compactDisplay = GetOption(options, "compactDisplay", "string", ["short", "long"], "short");
+    var defaultUseGrouping = "auto";
     if (notation === "compact") {
       internalSlots.compactDisplay = compactDisplay;
-    }
-    var useGrouping = GetOption(options, "useGrouping", "boolean", void 0, true);
-    internalSlots.useGrouping = useGrouping;
-    var signDisplay = GetOption(options, "signDisplay", "string", ["auto", "never", "always", "exceptZero"], "auto");
-    internalSlots.signDisplay = signDisplay;
+      defaultUseGrouping = "min2";
+    }
+    internalSlots.useGrouping = GetStringOrBooleanOption(options, "useGrouping", ["min2", "auto", "always"], "always", false, defaultUseGrouping);
+    internalSlots.signDisplay = GetOption(options, "signDisplay", "string", ["auto", "never", "always", "exceptZero", "negative"], "auto");
+    internalSlots.roundingMode = GetOption(options, "roundingMode", "string", [
+      "ceil",
+      "floor",
+      "expand",
+      "trunc",
+      "halfCeil",
+      "halfFloor",
+      "halfExpand",
+      "halfTrunc",
+      "halfEven"
+    ], "halfExpand");
     return nf;
   }
 
@@ -1348,6 +1452,13 @@
           ro[key] = value;
         }
       }
+      if (internalSlots.roundingType === "morePrecision") {
+        ro.roundingPriority = "morePrecision";
+      } else if (internalSlots.roundingType === "lessPrecision") {
+        ro.roundingPriority = "lessPrecision";
+      } else {
+        ro.roundingPriority = "auto";
+      }
       return ro;
     }
   });

package/src/core.js

@@ -89,6 +89,15 @@ catch (e) {
                 ro[key] = value;
             }
         }
+        if (internalSlots.roundingType === 'morePrecision') {
+            ro.roundingPriority = 'morePrecision';
+        }
+        else if (internalSlots.roundingType === 'lessPrecision') {
+            ro.roundingPriority = 'lessPrecision';
+        }
+        else {
+            ro.roundingPriority = 'auto';
+        }
         return ro;
     },
 });