@formatjs/intl-displaynames 7.0.5 → 7.0.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formatjs/intl-displaynames",
   "description": "Polyfill for: https://tc39.es/proposal-intl-displaynames",
-  "version": "7.0.5",
+  "version": "7.0.6",
   "license": "MIT",
   "author": "Linjie Ding <pyrocat101@users.noreply.github.com>",
   "type": "module",
@@ -15,12 +15,12 @@
   },
   "dependencies": {
     "tslib": "^2.8.0",
-    "@formatjs/intl-localematcher": "0.7.2",
-    "@formatjs/ecma402-abstract": "3.0.4"
+    "@formatjs/ecma402-abstract": "3.0.5",
+    "@formatjs/intl-localematcher": "0.7.3"
   },
   "devDependencies": {
     "@formatjs/intl-getcanonicallocales": "3.0.4",
-    "@formatjs/intl-locale": "5.0.5"
+    "@formatjs/intl-locale": "5.0.6"
   },
   "bugs": "https://github.com/formatjs/formatjs/issues",
   "homepage": "https://github.com/formatjs/formatjs",

package/polyfill.iife.js

@@ -6771,7 +6771,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 = {
@@ -6813,7 +6813,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;
     }
@@ -6822,17 +6841,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;
         }
       });
     });
@@ -6913,10 +6999,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("-");