@formatjs/intl-numberformat 9.0.5 → 9.0.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formatjs/intl-numberformat",
   "description": "Ponyfill for ES2020 Intl.NumberFormat",
-  "version": "9.0.5",
+  "version": "9.0.7",
   "license": "MIT",
   "type": "module",
   "types": "index.d.ts",
@@ -15,13 +15,13 @@
   "dependencies": {
     "decimal.js": "^10.4.3",
     "tslib": "^2.8.0",
-    "@formatjs/ecma402-abstract": "3.0.3",
-    "@formatjs/intl-localematcher": "0.7.2"
+    "@formatjs/intl-localematcher": "0.7.3",
+    "@formatjs/ecma402-abstract": "3.0.5"
   },
   "devDependencies": {
-    "@formatjs/intl-pluralrules": "6.0.4",
-    "@formatjs/intl-getcanonicallocales": "3.0.3",
-    "@formatjs/intl-locale": "5.0.4"
+    "@formatjs/intl-getcanonicallocales": "3.0.4",
+    "@formatjs/intl-locale": "5.0.6",
+    "@formatjs/intl-pluralrules": "6.0.6"
   },
   "bugs": "https://github.com/formatjs/formatjs/issues",
   "contributors": [

package/polyfill.iife.js

@@ -2899,6 +2899,11 @@
     return result;
   }
 
+  // node_modules/.aspect_rules_js/@formatjs+ecma402-abstract@0.0.0/node_modules/@formatjs/ecma402-abstract/NumberFormat/decimal-cache.js
+  var getPowerOf10 = memoize(function(exponent) {
+    return Decimal.pow(10, exponent);
+  });
+
   // node_modules/.aspect_rules_js/@formatjs+ecma402-abstract@0.0.0/node_modules/@formatjs/ecma402-abstract/NumberFormat/ComputeExponentForMagnitude.js
   Decimal.set({
     toExpPos: 100
@@ -2927,7 +2932,7 @@
         if (!thresholdMap) {
           return 0;
         }
-        var num = Decimal.pow(10, magnitude).toString();
+        var num = getPowerOf10(magnitude).toString();
         var thresholds = Object.keys(thresholdMap);
         if (num < thresholds[0]) {
           return 0;
@@ -2984,10 +2989,10 @@
     toExpPos: 100
   });
   function ToRawFixedFn(n, f) {
-    return n.times(Decimal.pow(10, -f));
+    return n.times(getPowerOf10(-f));
   }
   function findN1R1(x, f, roundingIncrement) {
-    var nx = x.times(Decimal.pow(10, f)).floor();
+    var nx = x.times(getPowerOf10(f)).floor();
     var n1 = nx.div(roundingIncrement).floor().times(roundingIncrement);
     var r1 = ToRawFixedFn(n1, f);
     return {
@@ -2996,7 +3001,7 @@
     };
   }
   function findN2R2(x, f, roundingIncrement) {
-    var nx = x.times(Decimal.pow(10, f)).ceil();
+    var nx = x.times(getPowerOf10(f)).ceil();
     var n2 = nx.div(roundingIncrement).ceil().times(roundingIncrement);
     var r2 = ToRawFixedFn(n2, f);
     return {
@@ -3056,14 +3061,34 @@
 
   // node_modules/.aspect_rules_js/@formatjs+ecma402-abstract@0.0.0/node_modules/@formatjs/ecma402-abstract/NumberFormat/ToRawPrecision.js
   function findN1E1R1(x, p) {
-    var maxN1 = Decimal.pow(10, p);
-    var minN1 = Decimal.pow(10, p - 1);
+    var maxN1 = getPowerOf10(p);
+    var minN1 = getPowerOf10(p - 1);
+    var log10x = x.log(10);
+    var e1 = log10x.floor();
+    var divisor = getPowerOf10(e1.minus(p).plus(1));
+    var n1 = x.div(divisor).floor();
+    var r1 = n1.times(divisor);
+    if (n1.greaterThanOrEqualTo(maxN1)) {
+      e1 = e1.plus(1);
+      var newDivisor = getPowerOf10(e1.minus(p).plus(1));
+      n1 = x.div(newDivisor).floor();
+      r1 = n1.times(newDivisor);
+    } else if (n1.lessThan(minN1)) {
+      e1 = e1.minus(1);
+      var newDivisor = getPowerOf10(e1.minus(p).plus(1));
+      n1 = x.div(newDivisor).floor();
+      r1 = n1.times(newDivisor);
+    }
+    if (r1.lessThanOrEqualTo(x) && n1.lessThan(maxN1) && n1.greaterThanOrEqualTo(minN1)) {
+      return { n1, e1, r1 };
+    }
     var maxE1 = x.div(minN1).log(10).plus(p).minus(1).ceil();
     var currentE1 = maxE1;
     while (true) {
-      var currentN1 = x.div(Decimal.pow(10, currentE1.minus(p).plus(1))).floor();
+      var currentDivisor = getPowerOf10(currentE1.minus(p).plus(1));
+      var currentN1 = x.div(currentDivisor).floor();
       if (currentN1.lessThan(maxN1) && currentN1.greaterThanOrEqualTo(minN1)) {
-        var currentR1 = currentN1.times(Decimal.pow(10, currentE1.minus(p).plus(1)));
+        var currentR1 = currentN1.times(currentDivisor);
         if (currentR1.lessThanOrEqualTo(x)) {
           return {
             n1: currentN1,
@@ -3076,14 +3101,34 @@
     }
   }
   function findN2E2R2(x, p) {
-    var maxN2 = Decimal.pow(10, p);
-    var minN2 = Decimal.pow(10, p - 1);
+    var maxN2 = getPowerOf10(p);
+    var minN2 = getPowerOf10(p - 1);
+    var log10x = x.log(10);
+    var e2 = log10x.floor();
+    var divisor = getPowerOf10(e2.minus(p).plus(1));
+    var n2 = x.div(divisor).ceil();
+    var r2 = n2.times(divisor);
+    if (n2.greaterThanOrEqualTo(maxN2)) {
+      e2 = e2.plus(1);
+      var newDivisor = getPowerOf10(e2.minus(p).plus(1));
+      n2 = x.div(newDivisor).ceil();
+      r2 = n2.times(newDivisor);
+    } else if (n2.lessThan(minN2)) {
+      e2 = e2.minus(1);
+      var newDivisor = getPowerOf10(e2.minus(p).plus(1));
+      n2 = x.div(newDivisor).ceil();
+      r2 = n2.times(newDivisor);
+    }
+    if (r2.greaterThanOrEqualTo(x) && n2.lessThan(maxN2) && n2.greaterThanOrEqualTo(minN2)) {
+      return { n2, e2, r2 };
+    }
     var minE2 = x.div(maxN2).log(10).plus(p).minus(1).floor();
     var currentE2 = minE2;
     while (true) {
-      var currentN2 = x.div(Decimal.pow(10, currentE2.minus(p).plus(1))).ceil();
+      var currentDivisor = getPowerOf10(currentE2.minus(p).plus(1));
+      var currentN2 = x.div(currentDivisor).ceil();
       if (currentN2.lessThan(maxN2) && currentN2.greaterThanOrEqualTo(minN2)) {
-        var currentR2 = currentN2.times(Decimal.pow(10, currentE2.minus(p).plus(1)));
+        var currentR2 = currentN2.times(currentDivisor);
         if (currentR2.greaterThanOrEqualTo(x)) {
           return {
             n2: currentN2,
@@ -3229,14 +3274,28 @@
     if (x.isNegative()) {
       x = x.negated();
     }
-    var magnitude = x.log(10).floor();
+    var xNum = x.toNumber();
+    var magnitude;
+    if (Number.isFinite(xNum) && Number.isSafeInteger(xNum) && xNum > 0 && xNum <= 999999) {
+      var magNum = Math.floor(Math.log10(xNum));
+      magnitude = new Decimal(magNum);
+    } else {
+      magnitude = x.log(10).floor();
+    }
     var exponent = ComputeExponentForMagnitude(internalSlots, magnitude);
-    x = x.times(Decimal.pow(10, -exponent));
+    x = x.times(getPowerOf10(-exponent));
     var formatNumberResult = FormatNumericToString(internalSlots, x);
     if (formatNumberResult.roundedNumber.isZero()) {
       return [exponent, magnitude.toNumber()];
     }
-    var newMagnitude = formatNumberResult.roundedNumber.log(10).floor();
+    var roundedNum = formatNumberResult.roundedNumber.toNumber();
+    var newMagnitude;
+    if (Number.isFinite(roundedNum) && Number.isSafeInteger(roundedNum) && roundedNum > 0 && roundedNum <= 999999) {
+      var newMagNum = Math.floor(Math.log10(roundedNum));
+      newMagnitude = new Decimal(newMagNum);
+    } else {
+      newMagnitude = formatNumberResult.roundedNumber.log(10).floor();
+    }
     if (newMagnitude.eq(magnitude.minus(exponent))) {
       return [exponent, magnitude.toNumber()];
     }
@@ -4155,7 +4214,7 @@
           var unitName = void 0;
           var currencyNameData = data2.currencies[options.currency];
           if (currencyNameData) {
-            unitName = selectPlural(pl, numberResult.roundedNumber.times(Decimal.pow(10, exponent)).toNumber(), currencyNameData.displayName);
+            unitName = selectPlural(pl, numberResult.roundedNumber.times(getPowerOf10(exponent)).toNumber(), currencyNameData.displayName);
           } else {
             unitName = options.currency;
           }
@@ -4187,11 +4246,11 @@
         var unitData = data2.units.simple[unit];
         var unitPattern = void 0;
         if (unitData) {
-          unitPattern = selectPlural(pl, numberResult.roundedNumber.times(Decimal.pow(10, exponent)).toNumber(), data2.units.simple[unit][unitDisplay]);
+          unitPattern = selectPlural(pl, numberResult.roundedNumber.times(getPowerOf10(exponent)).toNumber(), data2.units.simple[unit][unitDisplay]);
         } else {
           var _c = unit.split("-per-"), numeratorUnit = _c[0], denominatorUnit = _c[1];
           unitData = data2.units.simple[numeratorUnit];
-          var numeratorUnitPattern = selectPlural(pl, numberResult.roundedNumber.times(Decimal.pow(10, exponent)).toNumber(), data2.units.simple[numeratorUnit][unitDisplay]);
+          var numeratorUnitPattern = selectPlural(pl, numberResult.roundedNumber.times(getPowerOf10(exponent)).toNumber(), data2.units.simple[numeratorUnit][unitDisplay]);
           var perUnitPattern = data2.units.simple[denominatorUnit].perUnit[unitDisplay];
           if (perUnitPattern) {
             unitPattern = perUnitPattern.replace("{0}", numeratorUnitPattern);
@@ -4382,7 +4441,7 @@
         ;
         _a = ComputeExponent(internalSlots, x), exponent = _a[0], // IMPL: We need to record the magnitude of the number
         magnitude = _a[1];
-        x = x.times(Decimal.pow(10, -exponent));
+        x = x.times(getPowerOf10(-exponent));
       }
       var formatNumberResult = FormatNumericToString(internalSlots, x);
       n = formatNumberResult.formattedString;
@@ -8557,7 +8616,7 @@
     }
     throw new Error("No matching distance found");
   }
-  function findMatchingDistance(desired, supported) {
+  function findMatchingDistanceImpl(desired, supported) {
     var desiredLocale = new Intl.Locale(desired).maximize();
     var supportedLocale = new Intl.Locale(supported).maximize();
     var desiredLSR = {
@@ -8599,7 +8658,26 @@
     }
     return matchingDistance;
   }
+  var findMatchingDistance = memoize(findMatchingDistanceImpl, {
+    serializer: function(args) {
+      return "".concat(args[0], "|").concat(args[1]);
+    }
+  });
+  function getFallbackCandidates(locale) {
+    var candidates = [];
+    var current = locale;
+    while (current) {
+      candidates.push(current);
+      var lastDash = current.lastIndexOf("-");
+      if (lastDash === -1)
+        break;
+      current = current.substring(0, lastDash);
+    }
+    return candidates;
+  }
+  var canonicalizedSupportedCache = /* @__PURE__ */ new WeakMap();
   function findBestMatch(requestedLocales, supportedLocales2, threshold) {
+    var _a;
     if (threshold === void 0) {
       threshold = DEFAULT_MATCHING_THRESHOLD;
     }
@@ -8608,17 +8686,84 @@
       matchedDesiredLocale: "",
       distances: {}
     };
-    requestedLocales.forEach(function(desired, i) {
-      if (!result.distances[desired]) {
-        result.distances[desired] = {};
-      }
-      supportedLocales2.forEach(function(supported) {
-        var distance = findMatchingDistance(desired, supported) + 0 + i * 40;
-        result.distances[desired][supported] = distance;
+    var canonicalizedSupportedLocales = canonicalizedSupportedCache.get(supportedLocales2);
+    if (!canonicalizedSupportedLocales) {
+      canonicalizedSupportedLocales = supportedLocales2.map(function(locale) {
+        try {
+          var canonical = Intl.getCanonicalLocales([locale]);
+          return canonical[0] || locale;
+        } catch (_a2) {
+          return locale;
+        }
+      });
+      canonicalizedSupportedCache.set(supportedLocales2, canonicalizedSupportedLocales);
+    }
+    var supportedSet = new Set(canonicalizedSupportedLocales);
+    for (var i = 0; i < requestedLocales.length; i++) {
+      var desired = requestedLocales[i];
+      if (supportedSet.has(desired)) {
+        var distance = 0 + i * 40;
+        result.distances[desired] = (_a = {}, _a[desired] = distance, _a);
         if (distance < lowestDistance) {
           lowestDistance = distance;
           result.matchedDesiredLocale = desired;
-          result.matchedSupportedLocale = supported;
+          result.matchedSupportedLocale = desired;
+        }
+        if (i === 0) {
+          return result;
+        }
+      }
+    }
+    for (var i = 0; i < requestedLocales.length; i++) {
+      var desired = requestedLocales[i];
+      try {
+        var maximized = new Intl.Locale(desired).maximize().toString();
+        if (maximized !== desired) {
+          var maximizedCandidates = getFallbackCandidates(maximized);
+          for (var j = 0; j < maximizedCandidates.length; j++) {
+            var candidate = maximizedCandidates[j];
+            if (candidate === desired)
+              continue;
+            if (supportedSet.has(candidate)) {
+              var distance = void 0;
+              try {
+                var candidateMaximized = new Intl.Locale(candidate).maximize().toString();
+                distance = candidateMaximized === maximized ? 0 + i * 40 : j * 10 + i * 40;
+              } catch (_b) {
+                distance = j * 10 + i * 40;
+              }
+              if (!result.distances[desired]) {
+                result.distances[desired] = {};
+              }
+              result.distances[desired][candidate] = distance;
+              if (distance < lowestDistance) {
+                lowestDistance = distance;
+                result.matchedDesiredLocale = desired;
+                result.matchedSupportedLocale = candidate;
+              }
+              break;
+            }
+          }
+        }
+      } catch (_c) {
+      }
+    }
+    if (result.matchedSupportedLocale && lowestDistance === 0) {
+      return result;
+    }
+    requestedLocales.forEach(function(desired2, i2) {
+      if (!result.distances[desired2]) {
+        result.distances[desired2] = {};
+      }
+      canonicalizedSupportedLocales.forEach(function(canonicalLocale, supportedIndex) {
+        var originalSupported = supportedLocales2[supportedIndex];
+        var distance2 = findMatchingDistance(desired2, canonicalLocale);
+        var finalDistance = distance2 + 0 + i2 * 40;
+        result.distances[desired2][originalSupported] = finalDistance;
+        if (finalDistance < lowestDistance) {
+          lowestDistance = finalDistance;
+          result.matchedDesiredLocale = desired2;
+          result.matchedSupportedLocale = originalSupported;
         }
       });
     });
@@ -8699,10 +8844,16 @@
   }
 
   // node_modules/.aspect_rules_js/@formatjs+intl-localematcher@0.0.0/node_modules/@formatjs/intl-localematcher/abstract/BestAvailableLocale.js
+  var availableLocalesSetCache = /* @__PURE__ */ new WeakMap();
   function BestAvailableLocale(availableLocales, locale) {
+    var availableSet = availableLocalesSetCache.get(availableLocales);
+    if (!availableSet) {
+      availableSet = new Set(availableLocales);
+      availableLocalesSetCache.set(availableLocales, availableSet);
+    }
     var candidate = locale;
     while (true) {
-      if (availableLocales.indexOf(candidate) > -1) {
+      if (availableSet.has(candidate)) {
         return candidate;
       }
       var pos = candidate.lastIndexOf("-");