@formatjs/intl-localematcher 0.2.23 → 0.2.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +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,CA2DrB"}
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,CAiErB"}
@@ -11,6 +11,8 @@ var utils_1 = require("./utils");
11
11
  */
12
12
  function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
13
13
  var minimizedAvailableLocaleMap = {};
14
+ var availableLocaleMap = {};
15
+ var canonicalizedLocaleMap = {};
14
16
  var minimizedAvailableLocales = new Set();
15
17
  availableLocales.forEach(function (locale) {
16
18
  var minimizedLocale = new Intl.Locale(locale)
@@ -18,8 +20,8 @@ function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
18
20
  .toString();
19
21
  var canonicalizedLocale = Intl.getCanonicalLocales(locale)[0] || locale;
20
22
  minimizedAvailableLocaleMap[minimizedLocale] = locale;
21
- minimizedAvailableLocaleMap[locale] = locale;
22
- minimizedAvailableLocaleMap[canonicalizedLocale] = locale;
23
+ availableLocaleMap[locale] = locale;
24
+ canonicalizedLocaleMap[canonicalizedLocale] = locale;
23
25
  minimizedAvailableLocales.add(minimizedLocale);
24
26
  minimizedAvailableLocales.add(locale);
25
27
  minimizedAvailableLocales.add(canonicalizedLocale);
@@ -54,7 +56,10 @@ function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
54
56
  return { locale: getDefaultLocale() };
55
57
  }
56
58
  return {
57
- locale: minimizedAvailableLocaleMap[foundLocale] || foundLocale,
59
+ locale: availableLocaleMap[foundLocale] ||
60
+ canonicalizedLocaleMap[foundLocale] ||
61
+ minimizedAvailableLocaleMap[foundLocale] ||
62
+ foundLocale,
58
63
  };
59
64
  }
60
65
  exports.BestFitMatcher = BestFitMatcher;
@@ -1 +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,CA2DrB"}
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,CAiErB"}
@@ -8,6 +8,8 @@ import { UNICODE_EXTENSION_SEQUENCE_REGEX } from './utils';
8
8
  */
9
9
  export function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
10
10
  var minimizedAvailableLocaleMap = {};
11
+ var availableLocaleMap = {};
12
+ var canonicalizedLocaleMap = {};
11
13
  var minimizedAvailableLocales = new Set();
12
14
  availableLocales.forEach(function (locale) {
13
15
  var minimizedLocale = new Intl.Locale(locale)
@@ -15,8 +17,8 @@ export function BestFitMatcher(availableLocales, requestedLocales, getDefaultLoc
15
17
  .toString();
16
18
  var canonicalizedLocale = Intl.getCanonicalLocales(locale)[0] || locale;
17
19
  minimizedAvailableLocaleMap[minimizedLocale] = locale;
18
- minimizedAvailableLocaleMap[locale] = locale;
19
- minimizedAvailableLocaleMap[canonicalizedLocale] = locale;
20
+ availableLocaleMap[locale] = locale;
21
+ canonicalizedLocaleMap[canonicalizedLocale] = locale;
20
22
  minimizedAvailableLocales.add(minimizedLocale);
21
23
  minimizedAvailableLocales.add(locale);
22
24
  minimizedAvailableLocales.add(canonicalizedLocale);
@@ -51,6 +53,9 @@ export function BestFitMatcher(availableLocales, requestedLocales, getDefaultLoc
51
53
  return { locale: getDefaultLocale() };
52
54
  }
53
55
  return {
54
- locale: minimizedAvailableLocaleMap[foundLocale] || foundLocale,
56
+ locale: availableLocaleMap[foundLocale] ||
57
+ canonicalizedLocaleMap[foundLocale] ||
58
+ minimizedAvailableLocaleMap[foundLocale] ||
59
+ foundLocale,
55
60
  };
56
61
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@formatjs/intl-localematcher",
3
- "version": "0.2.23",
3
+ "version": "0.2.24",
4
4
  "description": "Intl.LocaleMatcher ponyfill",
5
5
  "keywords": [
6
6
  "intl",