@formatjs/intl-displaynames 6.6.2 → 6.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-displaynames",
-  "version": "6.6.2",
+  "version": "6.6.3",
   "description": "Polyfill for: https://tc39.es/proposal-intl-displaynames",
   "keywords": [
     "i18n",
@@ -22,12 +22,12 @@
   },
   "dependencies": {
     "tslib": "^2.4.0",
-    "@formatjs/ecma402-abstract": "1.17.3",
-    "@formatjs/intl-localematcher": "0.5.0"
+    "@formatjs/ecma402-abstract": "1.17.4",
+    "@formatjs/intl-localematcher": "0.5.1"
   },
   "devDependencies": {
-    "@formatjs/intl-getcanonicallocales": "2.3.0",
-    "@formatjs/intl-locale": "3.4.1"
+    "@formatjs/intl-locale": "3.4.2",
+    "@formatjs/intl-getcanonicallocales": "2.3.0"
   },
   "bugs": {
     "url": "https://github.com/formatjs/formatjs/issues"

package/polyfill.iife.js

@@ -6919,23 +6919,34 @@
         return matchingDistance;
       }
       exports.findMatchingDistance = findMatchingDistance;
-      function findBestMatch(desired, supportedLocales, threshold) {
+      function findBestMatch(requestedLocales, supportedLocales, threshold) {
         if (threshold === void 0) {
           threshold = DEFAULT_MATCHING_THRESHOLD;
         }
-        var bestMatch = void 0;
         var lowestDistance = Infinity;
-        supportedLocales.forEach(function(supported, i) {
-          var distance = findMatchingDistance(desired, supported) + i;
-          if (distance < lowestDistance) {
-            lowestDistance = distance;
-            bestMatch = supported;
+        var result = {
+          matchedDesiredLocale: "",
+          distances: {}
+        };
+        requestedLocales.forEach(function(desired, i) {
+          if (!result.distances[desired]) {
+            result.distances[desired] = {};
           }
+          supportedLocales.forEach(function(supported, j) {
+            var distance = findMatchingDistance(desired, supported) + j + i * 40;
+            result.distances[desired][supported] = distance;
+            if (distance < lowestDistance) {
+              lowestDistance = distance;
+              result.matchedDesiredLocale = desired;
+              result.matchedSupportedLocale = supported;
+            }
+          });
         });
         if (lowestDistance >= threshold) {
-          return;
+          result.matchedDesiredLocale = void 0;
+          result.matchedSupportedLocale = void 0;
         }
-        return bestMatch;
+        return result;
       }
       exports.findBestMatch = findBestMatch;
     }
@@ -6951,15 +6962,17 @@
       function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
         var foundLocale;
         var extension;
-        for (var _i = 0, requestedLocales_1 = requestedLocales; _i < requestedLocales_1.length; _i++) {
-          var l = requestedLocales_1[_i];
-          var matchedLocale = (0, utils_1.findBestMatch)(l.replace(utils_1.UNICODE_EXTENSION_SEQUENCE_REGEX, ""), availableLocales);
-          if (matchedLocale) {
-            foundLocale = matchedLocale;
-            var noExtensionLocale = l.replace(utils_1.UNICODE_EXTENSION_SEQUENCE_REGEX, "");
-            extension = l.slice(noExtensionLocale.length, l.length) || void 0;
-            break;
-          }
+        var noExtensionLocales = [];
+        var noExtensionLocaleMap = requestedLocales.reduce(function(all, l) {
+          var noExtensionLocale = l.replace(utils_1.UNICODE_EXTENSION_SEQUENCE_REGEX, "");
+          noExtensionLocales.push(noExtensionLocale);
+          all[noExtensionLocale] = l;
+          return all;
+        }, {});
+        var result = (0, utils_1.findBestMatch)(noExtensionLocales, availableLocales);
+        if (result.matchedSupportedLocale && result.matchedDesiredLocale) {
+          foundLocale = result.matchedSupportedLocale;
+          extension = noExtensionLocaleMap[result.matchedDesiredLocale].slice(result.matchedDesiredLocale.length) || void 0;
         }
         if (!foundLocale) {
           return { locale: getDefaultLocale() };