@formatjs/intl-localematcher 0.5.3 → 0.5.5

package/abstract/BestAvailableLocale.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BestAvailableLocale = void 0;
+exports.BestAvailableLocale = BestAvailableLocale;
 /**
  * https://tc39.es/ecma402/#sec-bestavailablelocale
  * @param availableLocales
@@ -22,4 +22,3 @@ function BestAvailableLocale(availableLocales, locale) {
         candidate = candidate.slice(0, pos);
     }
 }
-exports.BestAvailableLocale = BestAvailableLocale;

package/abstract/BestFitMatcher.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BestFitMatcher = void 0;
+exports.BestFitMatcher = BestFitMatcher;
 var utils_1 = require("./utils");
 /**
  * https://tc39.es/ecma402/#sec-bestfitmatcher
@@ -32,4 +32,3 @@ function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
         extension: extension,
     };
 }
-exports.BestFitMatcher = BestFitMatcher;

package/abstract/CanonicalizeLocaleList.js

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

package/abstract/LookupMatcher.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LookupMatcher = void 0;
+exports.LookupMatcher = LookupMatcher;
 var BestAvailableLocale_1 = require("./BestAvailableLocale");
 var utils_1 = require("./utils");
 /**
@@ -26,4 +26,3 @@ function LookupMatcher(availableLocales, requestedLocales, getDefaultLocale) {
     result.locale = getDefaultLocale();
     return result;
 }
-exports.LookupMatcher = LookupMatcher;

package/abstract/LookupSupportedLocales.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LookupSupportedLocales = void 0;
+exports.LookupSupportedLocales = LookupSupportedLocales;
 var BestAvailableLocale_1 = require("./BestAvailableLocale");
 var utils_1 = require("./utils");
 /**
@@ -20,4 +20,3 @@ function LookupSupportedLocales(availableLocales, requestedLocales) {
     }
     return subset;
 }
-exports.LookupSupportedLocales = LookupSupportedLocales;

package/abstract/ResolveLocale.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResolveLocale = void 0;
+exports.ResolveLocale = ResolveLocale;
 var BestFitMatcher_1 = require("./BestFitMatcher");
 var LookupMatcher_1 = require("./LookupMatcher");
 var UnicodeExtensionValue_1 = require("./UnicodeExtensionValue");
@@ -75,4 +75,3 @@ function ResolveLocale(availableLocales, requestedLocales, options, relevantExte
     result.locale = foundLocale;
     return result;
 }
-exports.ResolveLocale = ResolveLocale;

package/abstract/UnicodeExtensionValue.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnicodeExtensionValue = void 0;
+exports.UnicodeExtensionValue = UnicodeExtensionValue;
 var utils_1 = require("./utils");
 /**
  * https://tc39.es/ecma402/#sec-unicodeextensionvalue
@@ -47,4 +47,3 @@ function UnicodeExtensionValue(extension, key) {
     }
     return undefined;
 }
-exports.UnicodeExtensionValue = UnicodeExtensionValue;

package/abstract/utils.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findBestMatch = exports.findMatchingDistance = exports.invariant = exports.UNICODE_EXTENSION_SEQUENCE_REGEX = void 0;
+exports.UNICODE_EXTENSION_SEQUENCE_REGEX = void 0;
+exports.invariant = invariant;
+exports.findMatchingDistance = findMatchingDistance;
+exports.findBestMatch = findBestMatch;
 var tslib_1 = require("tslib");
 var languageMatching_1 = require("./languageMatching");
 var regions_generated_1 = require("./regions.generated");
@@ -11,7 +14,6 @@ function invariant(condition, message, Err) {
         throw new Err(message);
     }
 }
-exports.invariant = invariant;
 // This is effectively 2 languages in 2 different regions in the same cluster
 var DEFAULT_MATCHING_THRESHOLD = 838;
 var PROCESSED_DATA;
@@ -137,7 +139,6 @@ function findMatchingDistance(desired, supported) {
     }
     return matchingDistance;
 }
-exports.findMatchingDistance = findMatchingDistance;
 function findBestMatch(requestedLocales, supportedLocales, threshold) {
     if (threshold === void 0) { threshold = DEFAULT_MATCHING_THRESHOLD; }
     var lowestDistance = Infinity;
@@ -149,10 +150,11 @@ function findBestMatch(requestedLocales, supportedLocales, threshold) {
         if (!result.distances[desired]) {
             result.distances[desired] = {};
         }
-        supportedLocales.forEach(function (supported, j) {
+        supportedLocales.forEach(function (supported) {
             // Add some weight to the distance based on the order of the supported locales
-            // Add penalty for the order of the requested locales
-            var distance = findMatchingDistance(desired, supported) + j + i * 40;
+            // Add penalty for the order of the requested locales, which currently is 0 since ECMA-402
+            // doesn't really have room for weighted locales like `en; q=0.1`
+            var distance = findMatchingDistance(desired, supported) + 0 + i * 40;
             result.distances[desired][supported] = distance;
             if (distance < lowestDistance) {
                 lowestDistance = distance;
@@ -167,4 +169,3 @@ function findBestMatch(requestedLocales, supportedLocales, threshold) {
     }
     return result;
 }
-exports.findBestMatch = findBestMatch;

package/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResolveLocale = exports.LookupSupportedLocales = exports.match = void 0;
+exports.ResolveLocale = exports.LookupSupportedLocales = void 0;
+exports.match = match;
 var CanonicalizeLocaleList_1 = require("./abstract/CanonicalizeLocaleList");
 var ResolveLocale_1 = require("./abstract/ResolveLocale");
 function match(requestedLocales, availableLocales, defaultLocale, opts) {
@@ -8,7 +9,6 @@ function match(requestedLocales, availableLocales, defaultLocale, opts) {
         localeMatcher: (opts === null || opts === void 0 ? void 0 : opts.algorithm) || 'best fit',
     }, [], {}, function () { return defaultLocale; }).locale;
 }
-exports.match = match;
 var LookupSupportedLocales_1 = require("./abstract/LookupSupportedLocales");
 Object.defineProperty(exports, "LookupSupportedLocales", { enumerable: true, get: function () { return LookupSupportedLocales_1.LookupSupportedLocales; } });
 var ResolveLocale_2 = require("./abstract/ResolveLocale");

package/lib/abstract/utils.js

@@ -144,10 +144,11 @@ export function findBestMatch(requestedLocales, supportedLocales, threshold) {
         if (!result.distances[desired]) {
             result.distances[desired] = {};
         }
-        supportedLocales.forEach(function (supported, j) {
+        supportedLocales.forEach(function (supported) {
             // Add some weight to the distance based on the order of the supported locales
-            // Add penalty for the order of the requested locales
-            var distance = findMatchingDistance(desired, supported) + j + i * 40;
+            // Add penalty for the order of the requested locales, which currently is 0 since ECMA-402
+            // doesn't really have room for weighted locales like `en; q=0.1`
+            var distance = findMatchingDistance(desired, supported) + 0 + i * 40;
             result.distances[desired][supported] = distance;
             if (distance < lowestDistance) {
                 lowestDistance = distance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-localematcher",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Intl.LocaleMatcher ponyfill",
   "keywords": [
     "intl",
@@ -25,6 +25,6 @@
     "url": "https://github.com/formatjs/formatjs/issues"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.7.0"
   }
 }