@formatjs/intl-localematcher 0.5.1 → 0.5.3

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 FormatJS
+Copyright (c) 2023 FormatJS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/abstract/utils.js

@@ -12,8 +12,8 @@ function invariant(condition, message, Err) {
     }
 }
 exports.invariant = invariant;
-// This is effectively 2 languages in 2 different regions not even in the same cluster
-var DEFAULT_MATCHING_THRESHOLD = 840;
+// This is effectively 2 languages in 2 different regions in the same cluster
+var DEFAULT_MATCHING_THRESHOLD = 838;
 var PROCESSED_DATA;
 function processData() {
     var _a, _b;

package/lib/abstract/BestAvailableLocale.js

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

package/lib/abstract/BestFitMatcher.js

@@ -1,24 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BestFitMatcher = void 0;
-var utils_1 = require("./utils");
+import { UNICODE_EXTENSION_SEQUENCE_REGEX, findBestMatch } from './utils';
 /**
  * https://tc39.es/ecma402/#sec-bestfitmatcher
  * @param availableLocales
  * @param requestedLocales
  * @param getDefaultLocale
  */
-function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
+export function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
     var foundLocale;
     var extension;
     var noExtensionLocales = [];
     var noExtensionLocaleMap = requestedLocales.reduce(function (all, l) {
-        var noExtensionLocale = l.replace(utils_1.UNICODE_EXTENSION_SEQUENCE_REGEX, '');
+        var noExtensionLocale = l.replace(UNICODE_EXTENSION_SEQUENCE_REGEX, '');
         noExtensionLocales.push(noExtensionLocale);
         all[noExtensionLocale] = l;
         return all;
     }, {});
-    var result = (0, utils_1.findBestMatch)(noExtensionLocales, availableLocales);
+    var result = findBestMatch(noExtensionLocales, availableLocales);
     if (result.matchedSupportedLocale && result.matchedDesiredLocale) {
         foundLocale = result.matchedSupportedLocale;
         extension =
@@ -32,4 +29,3 @@ function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
         extension: extension,
     };
 }
-exports.BestFitMatcher = BestFitMatcher;

package/lib/abstract/CanonicalizeLocaleList.js

@@ -1,12 +1,8 @@
-"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) {
+export function CanonicalizeLocaleList(locales) {
     // TODO
     return Intl.getCanonicalLocales(locales);
 }
-exports.CanonicalizeLocaleList = CanonicalizeLocaleList;

package/lib/abstract/LookupMatcher.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LookupMatcher = void 0;
-var BestAvailableLocale_1 = require("./BestAvailableLocale");
-var utils_1 = require("./utils");
+import { BestAvailableLocale } from './BestAvailableLocale';
+import { UNICODE_EXTENSION_SEQUENCE_REGEX } from './utils';
 /**
  * https://tc39.es/ecma402/#sec-lookupmatcher
  * @param availableLocales
  * @param requestedLocales
  * @param getDefaultLocale
  */
-function LookupMatcher(availableLocales, requestedLocales, getDefaultLocale) {
+export function LookupMatcher(availableLocales, requestedLocales, getDefaultLocale) {
     var result = { locale: '' };
     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 = (0, BestAvailableLocale_1.BestAvailableLocale)(availableLocales, noExtensionLocale);
+        var noExtensionLocale = locale.replace(UNICODE_EXTENSION_SEQUENCE_REGEX, '');
+        var availableLocale = BestAvailableLocale(availableLocales, noExtensionLocale);
         if (availableLocale) {
             result.locale = availableLocale;
             if (locale !== noExtensionLocale) {
@@ -26,4 +23,3 @@ function LookupMatcher(availableLocales, requestedLocales, getDefaultLocale) {
     result.locale = getDefaultLocale();
     return result;
 }
-exports.LookupMatcher = LookupMatcher;

package/lib/abstract/LookupSupportedLocales.js

@@ -1,23 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LookupSupportedLocales = void 0;
-var BestAvailableLocale_1 = require("./BestAvailableLocale");
-var utils_1 = require("./utils");
+import { BestAvailableLocale } from './BestAvailableLocale';
+import { UNICODE_EXTENSION_SEQUENCE_REGEX } from './utils';
 /**
  * https://tc39.es/ecma402/#sec-lookupsupportedlocales
  * @param availableLocales
  * @param requestedLocales
  */
-function LookupSupportedLocales(availableLocales, requestedLocales) {
+export function LookupSupportedLocales(availableLocales, requestedLocales) {
     var subset = [];
     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 = (0, BestAvailableLocale_1.BestAvailableLocale)(availableLocales, noExtensionLocale);
+        var noExtensionLocale = locale.replace(UNICODE_EXTENSION_SEQUENCE_REGEX, '');
+        var availableLocale = BestAvailableLocale(availableLocales, noExtensionLocale);
         if (availableLocale) {
             subset.push(availableLocale);
         }
     }
     return subset;
 }
-exports.LookupSupportedLocales = LookupSupportedLocales;

package/lib/abstract/ResolveLocale.js

@@ -1,37 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResolveLocale = void 0;
-var BestFitMatcher_1 = require("./BestFitMatcher");
-var LookupMatcher_1 = require("./LookupMatcher");
-var UnicodeExtensionValue_1 = require("./UnicodeExtensionValue");
-var utils_1 = require("./utils");
+import { BestFitMatcher } from './BestFitMatcher';
+import { LookupMatcher } from './LookupMatcher';
+import { UnicodeExtensionValue } from './UnicodeExtensionValue';
+import { invariant } from './utils';
 /**
  * https://tc39.es/ecma402/#sec-resolvelocale
  */
-function ResolveLocale(availableLocales, requestedLocales, options, relevantExtensionKeys, localeData, getDefaultLocale) {
+export function ResolveLocale(availableLocales, requestedLocales, options, relevantExtensionKeys, localeData, getDefaultLocale) {
     var matcher = options.localeMatcher;
     var r;
     if (matcher === 'lookup') {
-        r = (0, LookupMatcher_1.LookupMatcher)(Array.from(availableLocales), requestedLocales, getDefaultLocale);
+        r = LookupMatcher(Array.from(availableLocales), requestedLocales, getDefaultLocale);
     }
     else {
-        r = (0, BestFitMatcher_1.BestFitMatcher)(Array.from(availableLocales), requestedLocales, getDefaultLocale);
+        r = BestFitMatcher(Array.from(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];
-        (0, utils_1.invariant)(foundLocale in localeData, "Missing locale data for ".concat(foundLocale));
+        invariant(foundLocale in localeData, "Missing locale data for ".concat(foundLocale));
         var foundLocaleData = localeData[foundLocale];
-        (0, utils_1.invariant)(typeof foundLocaleData === 'object' && foundLocaleData !== null, "locale data ".concat(key, " must be an object"));
+        invariant(typeof foundLocaleData === 'object' && foundLocaleData !== null, "locale data ".concat(key, " must be an object"));
         var keyLocaleData = foundLocaleData[key];
-        (0, utils_1.invariant)(Array.isArray(keyLocaleData), "keyLocaleData for ".concat(key, " must be an array"));
+        invariant(Array.isArray(keyLocaleData), "keyLocaleData for ".concat(key, " must be an array"));
         var value = keyLocaleData[0];
-        (0, utils_1.invariant)(typeof value === 'string' || value === null, "value must be string or null but got ".concat(typeof value, " in key ").concat(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 = (0, UnicodeExtensionValue_1.UnicodeExtensionValue)(r.extension, key);
+            var requestedValue = UnicodeExtensionValue(r.extension, key);
             if (requestedValue !== undefined) {
                 if (requestedValue !== '') {
                     if (~keyLocaleData.indexOf(requestedValue)) {
@@ -47,7 +44,7 @@ function ResolveLocale(availableLocales, requestedLocales, options, relevantExte
         }
         if (key in options) {
             var optionsValue = options[key];
-            (0, utils_1.invariant)(typeof optionsValue === 'string' ||
+            invariant(typeof optionsValue === 'string' ||
                 typeof optionsValue === 'undefined' ||
                 optionsValue === null, 'optionsValue must be String, Undefined or Null');
             if (~keyLocaleData.indexOf(optionsValue)) {
@@ -75,4 +72,3 @@ function ResolveLocale(availableLocales, requestedLocales, options, relevantExte
     result.locale = foundLocale;
     return result;
 }
-exports.ResolveLocale = ResolveLocale;

package/lib/abstract/UnicodeExtensionValue.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnicodeExtensionValue = void 0;
-var utils_1 = require("./utils");
+import { invariant } from './utils';
 /**
  * https://tc39.es/ecma402/#sec-unicodeextensionvalue
  * @param extension
  * @param key
  */
-function UnicodeExtensionValue(extension, key) {
-    (0, utils_1.invariant)(key.length === 2, 'key must have 2 elements');
+export function UnicodeExtensionValue(extension, key) {
+    invariant(key.length === 2, 'key must have 2 elements');
     var size = extension.length;
     var searchValue = "-".concat(key, "-");
     var pos = extension.indexOf(searchValue);
@@ -47,4 +44,3 @@ function UnicodeExtensionValue(extension, key) {
     }
     return undefined;
 }
-exports.UnicodeExtensionValue = UnicodeExtensionValue;

package/lib/abstract/languageMatching.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.data = void 0;
-exports.data = {
+export var data = {
     supplemental: {
         languageMatching: {
             'written-new': [

package/lib/abstract/regions.generated.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.regions = void 0;
 // This file is generated from regions-gen.ts
-exports.regions = {
+export var regions = {
     "001": [
         "001",
         "001-status-grouping",

package/lib/abstract/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/abstract/utils.js

@@ -1,26 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findBestMatch = exports.findMatchingDistance = exports.invariant = exports.UNICODE_EXTENSION_SEQUENCE_REGEX = void 0;
-var tslib_1 = require("tslib");
-var languageMatching_1 = require("./languageMatching");
-var regions_generated_1 = require("./regions.generated");
-exports.UNICODE_EXTENSION_SEQUENCE_REGEX = /-u(?:-[0-9a-z]{2,8})+/gi;
-function invariant(condition, message, Err) {
+import { __spreadArray } from "tslib";
+import { data as jsonData } from './languageMatching';
+import { regions } from './regions.generated';
+export var UNICODE_EXTENSION_SEQUENCE_REGEX = /-u(?:-[0-9a-z]{2,8})+/gi;
+export function invariant(condition, message, Err) {
     if (Err === void 0) { Err = Error; }
     if (!condition) {
         throw new Err(message);
     }
 }
-exports.invariant = invariant;
-// This is effectively 2 languages in 2 different regions not even in the same cluster
-var DEFAULT_MATCHING_THRESHOLD = 840;
+// This is effectively 2 languages in 2 different regions in the same cluster
+var DEFAULT_MATCHING_THRESHOLD = 838;
 var PROCESSED_DATA;
 function processData() {
     var _a, _b;
     if (!PROCESSED_DATA) {
-        var paradigmLocales = (_b = (_a = languageMatching_1.data.supplemental.languageMatching['written-new'][0]) === null || _a === void 0 ? void 0 : _a.paradigmLocales) === null || _b === void 0 ? void 0 : _b._locales.split(' ');
-        var matchVariables = languageMatching_1.data.supplemental.languageMatching['written-new'].slice(1, 5);
-        var data = languageMatching_1.data.supplemental.languageMatching['written-new'].slice(5);
+        var paradigmLocales = (_b = (_a = jsonData.supplemental.languageMatching['written-new'][0]) === null || _a === void 0 ? void 0 : _a.paradigmLocales) === null || _b === void 0 ? void 0 : _b._locales.split(' ');
+        var matchVariables = jsonData.supplemental.languageMatching['written-new'].slice(1, 5);
+        var data = jsonData.supplemental.languageMatching['written-new'].slice(5);
         var matches = data.map(function (d) {
             var key = Object.keys(d)[0];
             var value = d[key];
@@ -39,7 +35,7 @@ function processData() {
                 all[key.slice(1)] = value._value.split('+');
                 return all;
             }, {}),
-            paradigmLocales: tslib_1.__spreadArray(tslib_1.__spreadArray([], paradigmLocales, true), paradigmLocales.map(function (l) {
+            paradigmLocales: __spreadArray(__spreadArray([], paradigmLocales, true), paradigmLocales.map(function (l) {
                 return new Intl.Locale(l.replace(/_/g, '-')).maximize().toString();
             }), true),
         };
@@ -55,8 +51,8 @@ function isMatched(locale, languageMatchInfoLocale, matchVariables) {
             ? matchVariables[region.slice(1)]
             : matchVariables[region.slice(2)];
         var expandedMatchedRegions = matchRegions
-            .map(function (r) { return regions_generated_1.regions[r] || [r]; })
-            .reduce(function (all, list) { return tslib_1.__spreadArray(tslib_1.__spreadArray([], all, true), list, true); }, []);
+            .map(function (r) { return regions[r] || [r]; })
+            .reduce(function (all, list) { return __spreadArray(__spreadArray([], all, true), list, true); }, []);
         matches && (matches = !(expandedMatchedRegions.indexOf(locale.region || '') > 1 !=
             shouldInclude));
     }
@@ -95,7 +91,7 @@ function findMatchingDistanceForLSR(desired, supported, data) {
     }
     throw new Error('No matching distance found');
 }
-function findMatchingDistance(desired, supported) {
+export function findMatchingDistance(desired, supported) {
     var desiredLocale = new Intl.Locale(desired).maximize();
     var supportedLocale = new Intl.Locale(supported).maximize();
     var desiredLSR = {
@@ -137,8 +133,7 @@ function findMatchingDistance(desired, supported) {
     }
     return matchingDistance;
 }
-exports.findMatchingDistance = findMatchingDistance;
-function findBestMatch(requestedLocales, supportedLocales, threshold) {
+export function findBestMatch(requestedLocales, supportedLocales, threshold) {
     if (threshold === void 0) { threshold = DEFAULT_MATCHING_THRESHOLD; }
     var lowestDistance = Infinity;
     var result = {
@@ -167,4 +162,3 @@ function findBestMatch(requestedLocales, supportedLocales, threshold) {
     }
     return result;
 }
-exports.findBestMatch = findBestMatch;

package/lib/index.js

@@ -1,15 +1,9 @@
-"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) {
-    return (0, ResolveLocale_1.ResolveLocale)(availableLocales, (0, CanonicalizeLocaleList_1.CanonicalizeLocaleList)(requestedLocales), {
+import { CanonicalizeLocaleList } from './abstract/CanonicalizeLocaleList';
+import { ResolveLocale } from './abstract/ResolveLocale';
+export function match(requestedLocales, availableLocales, defaultLocale, opts) {
+    return ResolveLocale(availableLocales, CanonicalizeLocaleList(requestedLocales), {
         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");
-Object.defineProperty(exports, "ResolveLocale", { enumerable: true, get: function () { return ResolveLocale_2.ResolveLocale; } });
+export { LookupSupportedLocales } from './abstract/LookupSupportedLocales';
+export { ResolveLocale } from './abstract/ResolveLocale';

package/package.json

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