@formatjs/intl-localematcher 0.4.2 → 0.5.0

package/abstract/BestAvailableLocale.d.ts

@@ -3,4 +3,4 @@
  * @param availableLocales
  * @param locale
  */
-export declare function BestAvailableLocale(availableLocales: Set<String>, locale: string): string | undefined;
+export declare function BestAvailableLocale(availableLocales: readonly string[], locale: string): string | undefined;

package/abstract/BestAvailableLocale.js

@@ -9,7 +9,7 @@ exports.BestAvailableLocale = void 0;
 function BestAvailableLocale(availableLocales, locale) {
     var candidate = locale;
     while (true) {
-        if (availableLocales.has(candidate)) {
+        if (availableLocales.indexOf(candidate) > -1) {
             return candidate;
         }
         var pos = candidate.lastIndexOf('-');

package/abstract/BestFitMatcher.d.ts

@@ -5,4 +5,4 @@ import { LookupMatcherResult } from './types';
  * @param requestedLocales
  * @param getDefaultLocale
  */
-export declare function BestFitMatcher(availableLocales: Set<string>, requestedLocales: string[], getDefaultLocale: () => string): LookupMatcherResult;
+export declare function BestFitMatcher(availableLocales: readonly string[], requestedLocales: readonly string[], getDefaultLocale: () => string): LookupMatcherResult;

package/abstract/BestFitMatcher.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BestFitMatcher = void 0;
-var BestAvailableLocale_1 = require("./BestAvailableLocale");
 var utils_1 = require("./utils");
 /**
  * https://tc39.es/ecma402/#sec-bestfitmatcher
@@ -10,60 +9,23 @@ var utils_1 = require("./utils");
  * @param getDefaultLocale
  */
 function BestFitMatcher(availableLocales, requestedLocales, getDefaultLocale) {
-    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;
     var extension;
     for (var _i = 0, requestedLocales_1 = requestedLocales; _i < requestedLocales_1.length; _i++) {
         var l = requestedLocales_1[_i];
-        if (foundLocale) {
+        var matchedLocale = (0, utils_1.findBestMatch)(l.replace(utils_1.UNICODE_EXTENSION_SEQUENCE_REGEX, ''), availableLocales);
+        if (matchedLocale) {
+            foundLocale = matchedLocale;
+            var noExtensionLocale = l.replace(utils_1.UNICODE_EXTENSION_SEQUENCE_REGEX, '');
+            extension = l.slice(noExtensionLocale.length, l.length) || undefined;
             break;
         }
-        var noExtensionLocale = l.replace(utils_1.UNICODE_EXTENSION_SEQUENCE_REGEX, '');
-        if (l !== noExtensionLocale) {
-            extension = l.slice(noExtensionLocale.length, l.length);
-        }
-        if (availableLocales.has(noExtensionLocale)) {
-            foundLocale = noExtensionLocale;
-            break;
-        }
-        if (minimizedAvailableLocales.has(noExtensionLocale)) {
-            foundLocale = noExtensionLocale;
-            break;
-        }
-        var locale = new Intl.Locale(noExtensionLocale);
-        var maximizedRequestedLocale = locale.maximize().toString();
-        var minimizedRequestedLocale = locale.minimize().toString();
-        // Check minimized locale
-        if (minimizedAvailableLocales.has(minimizedRequestedLocale)) {
-            foundLocale = minimizedRequestedLocale;
-            break;
-        }
-        // Lookup algo on maximized locale
-        foundLocale = (0, BestAvailableLocale_1.BestAvailableLocale)(minimizedAvailableLocales, maximizedRequestedLocale);
     }
     if (!foundLocale) {
         return { locale: getDefaultLocale() };
     }
     return {
-        locale: availableLocaleMap[foundLocale] ||
-            canonicalizedLocaleMap[foundLocale] ||
-            minimizedAvailableLocaleMap[foundLocale] ||
-            foundLocale,
+        locale: foundLocale,
         extension: extension,
     };
 }

package/abstract/LookupMatcher.d.ts

@@ -5,4 +5,4 @@ import { LookupMatcherResult } from './types';
  * @param requestedLocales
  * @param getDefaultLocale
  */
-export declare function LookupMatcher(availableLocales: Set<string>, requestedLocales: string[], getDefaultLocale: () => string): LookupMatcherResult;
+export declare function LookupMatcher(availableLocales: readonly string[], requestedLocales: readonly string[], getDefaultLocale: () => string): LookupMatcherResult;

package/abstract/LookupMatcher.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LookupMatcher = void 0;
-var utils_1 = require("./utils");
 var BestAvailableLocale_1 = require("./BestAvailableLocale");
+var utils_1 = require("./utils");
 /**
  * https://tc39.es/ecma402/#sec-lookupmatcher
  * @param availableLocales

package/abstract/LookupSupportedLocales.d.ts

@@ -3,4 +3,4 @@
  * @param availableLocales
  * @param requestedLocales
  */
-export declare function LookupSupportedLocales(availableLocales: Set<string>, requestedLocales: string[]): string[];
+export declare function LookupSupportedLocales(availableLocales: string[], requestedLocales: string[]): string[];

package/abstract/LookupSupportedLocales.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LookupSupportedLocales = void 0;
-var utils_1 = require("./utils");
 var BestAvailableLocale_1 = require("./BestAvailableLocale");
+var utils_1 = require("./utils");
 /**
  * https://tc39.es/ecma402/#sec-lookupsupportedlocales
  * @param availableLocales

package/abstract/ResolveLocale.d.ts

@@ -8,7 +8,7 @@ export interface ResolveLocaleResult {
  */
 export declare function ResolveLocale<K extends string, D extends {
     [k in K]: any;
-}>(availableLocales: Set<string>, requestedLocales: string[], options: {
+}>(availableLocales: Set<string> | readonly string[], requestedLocales: readonly string[], options: {
     localeMatcher: string;
     [k: string]: string;
 }, relevantExtensionKeys: K[], localeData: Record<string, D | undefined>, getDefaultLocale: () => string): ResolveLocaleResult;

package/abstract/ResolveLocale.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolveLocale = void 0;
-var LookupMatcher_1 = require("./LookupMatcher");
 var BestFitMatcher_1 = require("./BestFitMatcher");
-var utils_1 = require("./utils");
+var LookupMatcher_1 = require("./LookupMatcher");
 var UnicodeExtensionValue_1 = require("./UnicodeExtensionValue");
+var utils_1 = require("./utils");
 /**
  * https://tc39.es/ecma402/#sec-resolvelocale
  */
@@ -12,10 +12,10 @@ function ResolveLocale(availableLocales, requestedLocales, options, relevantExte
     var matcher = options.localeMatcher;
     var r;
     if (matcher === 'lookup') {
-        r = (0, LookupMatcher_1.LookupMatcher)(availableLocales, requestedLocales, getDefaultLocale);
+        r = (0, LookupMatcher_1.LookupMatcher)(Array.from(availableLocales), requestedLocales, getDefaultLocale);
     }
     else {
-        r = (0, BestFitMatcher_1.BestFitMatcher)(availableLocales, requestedLocales, getDefaultLocale);
+        r = (0, BestFitMatcher_1.BestFitMatcher)(Array.from(availableLocales), requestedLocales, getDefaultLocale);
     }
     var foundLocale = r.locale;
     var result = { locale: '', dataLocale: foundLocale };