@formatjs/intl-listformat 6.5.0 → 6.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-listformat",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "description": "Formats JS list in a i18n-safe way",
   "keywords": [
     "intl",
@@ -19,8 +19,8 @@
     "url": "git@github.com:formatjs/formatjs.git"
   },
   "dependencies": {
-    "@formatjs/ecma402-abstract": "1.11.1",
-    "@formatjs/intl-localematcher": "0.2.22",
+    "@formatjs/ecma402-abstract": "1.11.2",
+    "@formatjs/intl-localematcher": "0.2.23",
     "tslib": "^2.1.0"
   },
   "main": "index.js",

package/polyfill.iife.js

@@ -30,6 +30,19 @@
     }, enumerable: true } : { value: module, enumerable: true })), module);
   };
 
+  // bazel-out/darwin-fastbuild/bin/packages/intl-localematcher/abstract/CanonicalizeLocaleList.js
+  var require_CanonicalizeLocaleList = __commonJS({
+    "bazel-out/darwin-fastbuild/bin/packages/intl-localematcher/abstract/CanonicalizeLocaleList.js": function(exports) {
+      "use strict";
+      Object.defineProperty(exports, "__esModule", { value: true });
+      exports.CanonicalizeLocaleList = void 0;
+      function CanonicalizeLocaleList2(locales) {
+        return Intl.getCanonicalLocales(locales);
+      }
+      exports.CanonicalizeLocaleList = CanonicalizeLocaleList2;
+    }
+  });
+
   // bazel-out/darwin-fastbuild/bin/packages/intl-localematcher/abstract/utils.js
   var require_utils = __commonJS({
     "bazel-out/darwin-fastbuild/bin/packages/intl-localematcher/abstract/utils.js": function(exports) {
@@ -114,14 +127,16 @@
       var utils_1 = require_utils();
       function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
         var minimizedAvailableLocaleMap = {};
-        availableLocales.forEach(function(l2) {
-          return minimizedAvailableLocaleMap[l2] = l2;
-        });
         var minimizedAvailableLocales = /* @__PURE__ */ new Set();
         availableLocales.forEach(function(locale2) {
           var minimizedLocale = new Intl.Locale(locale2).minimize().toString();
+          var canonicalizedLocale = Intl.getCanonicalLocales(locale2)[0] || locale2;
           minimizedAvailableLocaleMap[minimizedLocale] = locale2;
+          minimizedAvailableLocaleMap[locale2] = locale2;
+          minimizedAvailableLocaleMap[canonicalizedLocale] = locale2;
           minimizedAvailableLocales.add(minimizedLocale);
+          minimizedAvailableLocales.add(locale2);
+          minimizedAvailableLocales.add(canonicalizedLocale);
         });
         var foundLocale;
         for (var _i = 0, requestedLocales_1 = requestedLocales; _i < requestedLocales_1.length; _i++) {
@@ -147,8 +162,11 @@
           }
           foundLocale = (0, BestAvailableLocale_1.BestAvailableLocale)(minimizedAvailableLocales, maximizedRequestedLocale);
         }
+        if (!foundLocale) {
+          return { locale: getDefaultLocale() };
+        }
         return {
-          locale: foundLocale && minimizedAvailableLocaleMap[foundLocale] || getDefaultLocale()
+          locale: minimizedAvailableLocaleMap[foundLocale] || foundLocale
         };
       }
       exports.BestFitMatcher = BestFitMatcher;
@@ -309,13 +327,14 @@
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.ResolveLocale = exports.LookupSupportedLocales = exports.match = void 0;
+      var CanonicalizeLocaleList_1 = require_CanonicalizeLocaleList();
       var ResolveLocale_1 = require_ResolveLocale();
       function match2(requestedLocales, availableLocales, defaultLocale, opts) {
         var locales = availableLocales.reduce(function(all, l) {
           all.add(l);
           return all;
         }, /* @__PURE__ */ new Set());
-        return (0, ResolveLocale_1.ResolveLocale)(locales, requestedLocales, {
+        return (0, ResolveLocale_1.ResolveLocale)(locales, (0, CanonicalizeLocaleList_1.CanonicalizeLocaleList)(requestedLocales), {
           localeMatcher: (opts === null || opts === void 0 ? void 0 : opts.algorithm) || "best fit"
         }, [], {}, function() {
           return defaultLocale;
@@ -400,7 +419,7 @@
   // bazel-out/darwin-fastbuild/bin/packages/ecma402-abstract/lib/GetOptionsObject.js
   function GetOptionsObject(options) {
     if (typeof options === "undefined") {
-      return Object.create(null);
+      return /* @__PURE__ */ Object.create(null);
     }
     if (typeof options === "object") {
       return options;
@@ -411,7 +430,7 @@
   // bazel-out/darwin-fastbuild/bin/packages/ecma402-abstract/lib/utils.js
   function setInternalSlot(map, pl, field, value) {
     if (!map.get(pl)) {
-      map.set(pl, Object.create(null));
+      map.set(pl, /* @__PURE__ */ Object.create(null));
     }
     var slots = map.get(pl);
     slots[field] = value;
@@ -431,7 +450,7 @@
     return fields.reduce(function(all, f) {
       all[f] = slots[f];
       return all;
-    }, Object.create(null));
+    }, /* @__PURE__ */ Object.create(null));
   }
   function isLiteralPart(patternPart) {
     return patternPart.type === "literal";
@@ -575,7 +594,7 @@
       }
       setInternalSlot(ListFormat2.__INTERNAL_SLOT_MAP__, this, "initializedListFormat", true);
       var requestedLocales = CanonicalizeLocaleList(locales);
-      var opt = Object.create(null);
+      var opt = /* @__PURE__ */ Object.create(null);
       var opts = GetOptionsObject(options);
       var matcher = GetOption(opts, "localeMatcher", "string", ["best fit", "lookup"], "best fit");
       opt.localeMatcher = matcher;