@formatjs/intl-localematcher 0.2.20 → 0.2.24

package/abstract/BestFitMatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BestFitMatcher.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl-localematcher/abstract/BestFitMatcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAA;AAG3C;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC7B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,MAAM,GAC7B,mBAAmB,CAyDrB"}
+{"version":3,"file":"BestFitMatcher.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl-localematcher/abstract/BestFitMatcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAA;AAG3C;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC7B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,MAAM,GAC7B,mBAAmB,CAiErB"}

package/abstract/BestFitMatcher.js

@@ -10,17 +10,21 @@ var utils_1 = require("./utils");
  * @param getDefaultLocale
  */
 function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
-    var minimizedAvailableLocaleMap = Array.from(availableLocales).reduce(function (all, l) {
-        all[l] = l;
-        return all;
-    }, {});
+    var minimizedAvailableLocaleMap = {};
+    var availableLocaleMap = {};
+    var canonicalizedLocaleMap = {};
     var minimizedAvailableLocales = new Set();
     availableLocales.forEach(function (locale) {
         var minimizedLocale = new Intl.Locale(locale)
             .minimize()
             .toString();
+        var canonicalizedLocale = Intl.getCanonicalLocales(locale)[0] || locale;
         minimizedAvailableLocaleMap[minimizedLocale] = locale;
+        availableLocaleMap[locale] = locale;
+        canonicalizedLocaleMap[canonicalizedLocale] = locale;
         minimizedAvailableLocales.add(minimizedLocale);
+        minimizedAvailableLocales.add(locale);
+        minimizedAvailableLocales.add(canonicalizedLocale);
     });
     var foundLocale;
     for (var _i = 0, requestedLocales_1 = requestedLocales; _i < requestedLocales_1.length; _i++) {
@@ -46,11 +50,16 @@ function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
             break;
         }
         // Lookup algo on maximized locale
-        foundLocale = BestAvailableLocale_1.BestAvailableLocale(minimizedAvailableLocales, maximizedRequestedLocale);
+        foundLocale = (0, BestAvailableLocale_1.BestAvailableLocale)(minimizedAvailableLocales, maximizedRequestedLocale);
+    }
+    if (!foundLocale) {
+        return { locale: getDefaultLocale() };
     }
     return {
-        locale: (foundLocale && minimizedAvailableLocaleMap[foundLocale]) ||
-            getDefaultLocale(),
+        locale: availableLocaleMap[foundLocale] ||
+            canonicalizedLocaleMap[foundLocale] ||
+            minimizedAvailableLocaleMap[foundLocale] ||
+            foundLocale,
     };
 }
 exports.BestFitMatcher = BestFitMatcher;

package/abstract/CanonicalizeLocaleList.d.ts

@@ -0,0 +1,6 @@
+/**
+ * http://ecma-international.org/ecma-402/7.0/index.html#sec-canonicalizelocalelist
+ * @param locales
+ */
+export declare function CanonicalizeLocaleList(locales?: string | string[]): string[];
+//# sourceMappingURL=CanonicalizeLocaleList.d.ts.map

package/abstract/CanonicalizeLocaleList.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CanonicalizeLocaleList.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl-localematcher/abstract/CanonicalizeLocaleList.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAG5E"}

package/abstract/CanonicalizeLocaleList.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CanonicalizeLocaleList = void 0;
+/**
+ * http://ecma-international.org/ecma-402/7.0/index.html#sec-canonicalizelocalelist
+ * @param locales
+ */
+function CanonicalizeLocaleList(locales) {
+    // TODO
+    return Intl.getCanonicalLocales(locales);
+}
+exports.CanonicalizeLocaleList = CanonicalizeLocaleList;

package/abstract/LookupMatcher.js

@@ -14,7 +14,7 @@ function LookupMatcher(availableLocales, requestedLocales, getDefaultLocale) {
     for (var _i = 0, requestedLocales_1 = requestedLocales; _i < requestedLocales_1.length; _i++) {
         var locale = requestedLocales_1[_i];
         var noExtensionLocale = locale.replace(utils_1.UNICODE_EXTENSION_SEQUENCE_REGEX, '');
-        var availableLocale = BestAvailableLocale_1.BestAvailableLocale(availableLocales, noExtensionLocale);
+        var availableLocale = (0, BestAvailableLocale_1.BestAvailableLocale)(availableLocales, noExtensionLocale);
         if (availableLocale) {
             result.locale = availableLocale;
             if (locale !== noExtensionLocale) {

package/abstract/LookupSupportedLocales.js

@@ -13,7 +13,7 @@ function LookupSupportedLocales(availableLocales, requestedLocales) {
     for (var _i = 0, requestedLocales_1 = requestedLocales; _i < requestedLocales_1.length; _i++) {
         var locale = requestedLocales_1[_i];
         var noExtensionLocale = locale.replace(utils_1.UNICODE_EXTENSION_SEQUENCE_REGEX, '');
-        var availableLocale = BestAvailableLocale_1.BestAvailableLocale(availableLocales, noExtensionLocale);
+        var availableLocale = (0, BestAvailableLocale_1.BestAvailableLocale)(availableLocales, noExtensionLocale);
         if (availableLocale) {
             subset.push(availableLocale);
         }

package/abstract/ResolveLocale.js

@@ -12,42 +12,42 @@ function ResolveLocale(availableLocales, requestedLocales, options, relevantExte
     var matcher = options.localeMatcher;
     var r;
     if (matcher === 'lookup') {
-        r = LookupMatcher_1.LookupMatcher(availableLocales, requestedLocales, getDefaultLocale);
+        r = (0, LookupMatcher_1.LookupMatcher)(availableLocales, requestedLocales, getDefaultLocale);
     }
     else {
-        r = BestFitMatcher_1.BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale);
+        r = (0, BestFitMatcher_1.BestFitMatcher)(availableLocales, requestedLocales, getDefaultLocale);
     }
     var foundLocale = r.locale;
     var result = { locale: '', dataLocale: foundLocale };
     var supportedExtension = '-u';
     for (var _i = 0, relevantExtensionKeys_1 = relevantExtensionKeys; _i < relevantExtensionKeys_1.length; _i++) {
         var key = relevantExtensionKeys_1[_i];
-        utils_1.invariant(foundLocale in localeData, "Missing locale data for " + foundLocale);
+        (0, utils_1.invariant)(foundLocale in localeData, "Missing locale data for ".concat(foundLocale));
         var foundLocaleData = localeData[foundLocale];
-        utils_1.invariant(typeof foundLocaleData === 'object' && foundLocaleData !== null, "locale data " + key + " must be an object");
+        (0, utils_1.invariant)(typeof foundLocaleData === 'object' && foundLocaleData !== null, "locale data ".concat(key, " must be an object"));
         var keyLocaleData = foundLocaleData[key];
-        utils_1.invariant(Array.isArray(keyLocaleData), "keyLocaleData for " + key + " must be an array");
+        (0, utils_1.invariant)(Array.isArray(keyLocaleData), "keyLocaleData for ".concat(key, " must be an array"));
         var value = keyLocaleData[0];
-        utils_1.invariant(typeof value === 'string' || value === null, "value must be string or null but got " + typeof value + " in key " + key);
+        (0, utils_1.invariant)(typeof value === 'string' || value === null, "value must be string or null but got ".concat(typeof value, " in key ").concat(key));
         var supportedExtensionAddition = '';
         if (r.extension) {
-            var requestedValue = UnicodeExtensionValue_1.UnicodeExtensionValue(r.extension, key);
+            var requestedValue = (0, UnicodeExtensionValue_1.UnicodeExtensionValue)(r.extension, key);
             if (requestedValue !== undefined) {
                 if (requestedValue !== '') {
                     if (~keyLocaleData.indexOf(requestedValue)) {
                         value = requestedValue;
-                        supportedExtensionAddition = "-" + key + "-" + value;
+                        supportedExtensionAddition = "-".concat(key, "-").concat(value);
                     }
                 }
                 else if (~requestedValue.indexOf('true')) {
                     value = 'true';
-                    supportedExtensionAddition = "-" + key;
+                    supportedExtensionAddition = "-".concat(key);
                 }
             }
         }
         if (key in options) {
             var optionsValue = options[key];
-            utils_1.invariant(typeof optionsValue === 'string' ||
+            (0, utils_1.invariant)(typeof optionsValue === 'string' ||
                 typeof optionsValue === 'undefined' ||
                 optionsValue === null, 'optionsValue must be String, Undefined or Null');
             if (~keyLocaleData.indexOf(optionsValue)) {

package/abstract/UnicodeExtensionValue.js

@@ -8,9 +8,9 @@ var utils_1 = require("./utils");
  * @param key
  */
 function UnicodeExtensionValue(extension, key) {
-    utils_1.invariant(key.length === 2, 'key must have 2 elements');
+    (0, utils_1.invariant)(key.length === 2, 'key must have 2 elements');
     var size = extension.length;
-    var searchValue = "-" + key + "-";
+    var searchValue = "-".concat(key, "-");
     var pos = extension.indexOf(searchValue);
     if (pos !== -1) {
         var start = pos + 4;
@@ -40,7 +40,7 @@ function UnicodeExtensionValue(extension, key) {
         }
         return extension.slice(start, end);
     }
-    searchValue = "-" + key;
+    searchValue = "-".concat(key);
     pos = extension.indexOf(searchValue);
     if (pos !== -1 && pos + 3 === size) {
         return '';

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/intl-localematcher/index.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,IAAI;IACnB,SAAS,EAAE,QAAQ,GAAG,UAAU,CAAA;CACjC;AAED,wBAAgB,KAAK,CACnB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR;AAED,OAAO,EAAC,sBAAsB,EAAC,MAAM,mCAAmC,CAAA;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/intl-localematcher/index.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,IAAI;IACnB,SAAS,EAAE,QAAQ,GAAG,UAAU,CAAA;CACjC;AAED,wBAAgB,KAAK,CACnB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR;AAED,OAAO,EAAC,sBAAsB,EAAC,MAAM,mCAAmC,CAAA;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAA"}

package/index.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolveLocale = exports.LookupSupportedLocales = exports.match = void 0;
+var CanonicalizeLocaleList_1 = require("./abstract/CanonicalizeLocaleList");
 var ResolveLocale_1 = require("./abstract/ResolveLocale");
 function match(requestedLocales, availableLocales, defaultLocale, opts) {
     var locales = availableLocales.reduce(function (all, l) {
         all.add(l);
         return all;
     }, new Set());
-    return 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; }).locale;
 }

package/lib/abstract/BestFitMatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BestFitMatcher.d.ts","sourceRoot":"","sources":["../../../../../../../packages/intl-localematcher/abstract/BestFitMatcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAA;AAG3C;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC7B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,MAAM,GAC7B,mBAAmB,CAyDrB"}
+{"version":3,"file":"BestFitMatcher.d.ts","sourceRoot":"","sources":["../../../../../../../packages/intl-localematcher/abstract/BestFitMatcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAA;AAG3C;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC7B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,MAAM,GAC7B,mBAAmB,CAiErB"}

package/lib/abstract/BestFitMatcher.js

@@ -7,17 +7,21 @@ import { UNICODE_EXTENSION_SEQUENCE_REGEX } from './utils';
  * @param getDefaultLocale
  */
 export function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
-    var minimizedAvailableLocaleMap = Array.from(availableLocales).reduce(function (all, l) {
-        all[l] = l;
-        return all;
-    }, {});
+    var minimizedAvailableLocaleMap = {};
+    var availableLocaleMap = {};
+    var canonicalizedLocaleMap = {};
     var minimizedAvailableLocales = new Set();
     availableLocales.forEach(function (locale) {
         var minimizedLocale = new Intl.Locale(locale)
             .minimize()
             .toString();
+        var canonicalizedLocale = Intl.getCanonicalLocales(locale)[0] || locale;
         minimizedAvailableLocaleMap[minimizedLocale] = locale;
+        availableLocaleMap[locale] = locale;
+        canonicalizedLocaleMap[canonicalizedLocale] = locale;
         minimizedAvailableLocales.add(minimizedLocale);
+        minimizedAvailableLocales.add(locale);
+        minimizedAvailableLocales.add(canonicalizedLocale);
     });
     var foundLocale;
     for (var _i = 0, requestedLocales_1 = requestedLocales; _i < requestedLocales_1.length; _i++) {
@@ -45,8 +49,13 @@ export function BestFitMatcher(availableLocales, requestedLocales, getDefaultLoc
         // Lookup algo on maximized locale
         foundLocale = BestAvailableLocale(minimizedAvailableLocales, maximizedRequestedLocale);
     }
+    if (!foundLocale) {
+        return { locale: getDefaultLocale() };
+    }
     return {
-        locale: (foundLocale && minimizedAvailableLocaleMap[foundLocale]) ||
-            getDefaultLocale(),
+        locale: availableLocaleMap[foundLocale] ||
+            canonicalizedLocaleMap[foundLocale] ||
+            minimizedAvailableLocaleMap[foundLocale] ||
+            foundLocale,
     };
 }

package/lib/abstract/CanonicalizeLocaleList.d.ts

@@ -0,0 +1,6 @@
+/**
+ * http://ecma-international.org/ecma-402/7.0/index.html#sec-canonicalizelocalelist
+ * @param locales
+ */
+export declare function CanonicalizeLocaleList(locales?: string | string[]): string[];
+//# sourceMappingURL=CanonicalizeLocaleList.d.ts.map

package/lib/abstract/CanonicalizeLocaleList.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CanonicalizeLocaleList.d.ts","sourceRoot":"","sources":["../../../../../../../packages/intl-localematcher/abstract/CanonicalizeLocaleList.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAG5E"}

package/lib/abstract/CanonicalizeLocaleList.js

@@ -0,0 +1,8 @@
+/**
+ * http://ecma-international.org/ecma-402/7.0/index.html#sec-canonicalizelocalelist
+ * @param locales
+ */
+export function CanonicalizeLocaleList(locales) {
+    // TODO
+    return Intl.getCanonicalLocales(locales);
+}

package/lib/abstract/ResolveLocale.js

@@ -19,13 +19,13 @@ export function ResolveLocale(availableLocales, requestedLocales, options, relev
     var supportedExtension = '-u';
     for (var _i = 0, relevantExtensionKeys_1 = relevantExtensionKeys; _i < relevantExtensionKeys_1.length; _i++) {
         var key = relevantExtensionKeys_1[_i];
-        invariant(foundLocale in localeData, "Missing locale data for " + foundLocale);
+        invariant(foundLocale in localeData, "Missing locale data for ".concat(foundLocale));
         var foundLocaleData = localeData[foundLocale];
-        invariant(typeof foundLocaleData === 'object' && foundLocaleData !== null, "locale data " + key + " must be an object");
+        invariant(typeof foundLocaleData === 'object' && foundLocaleData !== null, "locale data ".concat(key, " must be an object"));
         var keyLocaleData = foundLocaleData[key];
-        invariant(Array.isArray(keyLocaleData), "keyLocaleData for " + key + " must be an array");
+        invariant(Array.isArray(keyLocaleData), "keyLocaleData for ".concat(key, " must be an array"));
         var value = keyLocaleData[0];
-        invariant(typeof value === 'string' || value === null, "value must be string or null but got " + typeof value + " in key " + key);
+        invariant(typeof value === 'string' || value === null, "value must be string or null but got ".concat(typeof value, " in key ").concat(key));
         var supportedExtensionAddition = '';
         if (r.extension) {
             var requestedValue = UnicodeExtensionValue(r.extension, key);
@@ -33,12 +33,12 @@ export function ResolveLocale(availableLocales, requestedLocales, options, relev
                 if (requestedValue !== '') {
                     if (~keyLocaleData.indexOf(requestedValue)) {
                         value = requestedValue;
-                        supportedExtensionAddition = "-" + key + "-" + value;
+                        supportedExtensionAddition = "-".concat(key, "-").concat(value);
                     }
                 }
                 else if (~requestedValue.indexOf('true')) {
                     value = 'true';
-                    supportedExtensionAddition = "-" + key;
+                    supportedExtensionAddition = "-".concat(key);
                 }
             }
         }

package/lib/abstract/UnicodeExtensionValue.js

@@ -7,7 +7,7 @@ import { invariant } from './utils';
 export function UnicodeExtensionValue(extension, key) {
     invariant(key.length === 2, 'key must have 2 elements');
     var size = extension.length;
-    var searchValue = "-" + key + "-";
+    var searchValue = "-".concat(key, "-");
     var pos = extension.indexOf(searchValue);
     if (pos !== -1) {
         var start = pos + 4;
@@ -37,7 +37,7 @@ export function UnicodeExtensionValue(extension, key) {
         }
         return extension.slice(start, end);
     }
-    searchValue = "-" + key;
+    searchValue = "-".concat(key);
     pos = extension.indexOf(searchValue);
     if (pos !== -1 && pos + 3 === size) {
         return '';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl-localematcher/index.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,IAAI;IACnB,SAAS,EAAE,QAAQ,GAAG,UAAU,CAAA;CACjC;AAED,wBAAgB,KAAK,CACnB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR;AAED,OAAO,EAAC,sBAAsB,EAAC,MAAM,mCAAmC,CAAA;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl-localematcher/index.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,IAAI;IACnB,SAAS,EAAE,QAAQ,GAAG,UAAU,CAAA;CACjC;AAED,wBAAgB,KAAK,CACnB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR;AAED,OAAO,EAAC,sBAAsB,EAAC,MAAM,mCAAmC,CAAA;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAA"}

package/lib/index.js

@@ -1,10 +1,11 @@
+import { CanonicalizeLocaleList } from './abstract/CanonicalizeLocaleList';
 import { ResolveLocale } from './abstract/ResolveLocale';
 export function match(requestedLocales, availableLocales, defaultLocale, opts) {
     var locales = availableLocales.reduce(function (all, l) {
         all.add(l);
         return all;
     }, new Set());
-    return ResolveLocale(locales, requestedLocales, {
+    return ResolveLocale(locales, CanonicalizeLocaleList(requestedLocales), {
         localeMatcher: (opts === null || opts === void 0 ? void 0 : opts.algorithm) || 'best fit',
     }, [], {}, function () { return defaultLocale; }).locale;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-localematcher",
-  "version": "0.2.20",
+  "version": "0.2.24",
   "description": "Intl.LocaleMatcher ponyfill",
   "keywords": [
     "intl",