resolve-accept-language 1.1.44 → 1.1.45-0

package/lib/locale-list.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var locale_1 = require("./locale");
-var LocaleList = /** @class */ (function () {
+const locale_1 = __importDefault(require("./locale"));
+class LocaleList {
     /**
      * Create a list of locale identifiers.
      *
@@ -9,8 +12,7 @@ var LocaleList = /** @class */ (function () {
      *
      * @throws Will throw an error if one of the locale's format is invalid.
      */
-    function LocaleList(locales) {
-        var _this = this;
+    constructor(locales) {
         /** A set of ISO 3166-1 alpha-2 country codes. */
         this.countries = new Set();
         /** A set of ISO 639-1 alpha-2 language codes. */
@@ -19,16 +21,15 @@ var LocaleList = /** @class */ (function () {
         this.locales = new Set();
         /** A list of locale objects. */
         this.objects = [];
-        locales.forEach(function (locale) {
-            var localeObject = new locale_1.default(locale);
-            if (!_this.locales.has(localeObject.identifier)) {
-                _this.objects.push(localeObject);
-                _this.locales.add(localeObject.identifier);
-                _this.languages.add(localeObject.languageCode);
-                _this.countries.add(localeObject.countryCode);
+        locales.forEach((locale) => {
+            const localeObject = new locale_1.default(locale);
+            if (!this.locales.has(localeObject.identifier)) {
+                this.objects.push(localeObject);
+                this.locales.add(localeObject.identifier);
+                this.languages.add(localeObject.languageCode);
+                this.countries.add(localeObject.countryCode);
             }
         });
     }
-    return LocaleList;
-}());
+}
 exports.default = LocaleList;

package/lib/locale.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /** Class to manage a locale identifier using the BCP 47 `language`-`country` format. */
-var Locale = /** @class */ (function () {
+class Locale {
     /**
      * Create a new `Locale` object.
      *
@@ -9,14 +9,14 @@ var Locale = /** @class */ (function () {
      *
      * @throws An error if the `identifier` format is invalid.
      */
-    function Locale(identifier) {
+    constructor(identifier) {
         if (!Locale.isLocale(identifier, false)) {
-            throw new Error("invalid locale identifier '".concat(identifier, "'"));
+            throw new Error(`invalid locale identifier '${identifier}'`);
         }
-        var _a = identifier.split('-'), languageCode = _a[0], countryCode = _a[1];
+        const [languageCode, countryCode] = identifier.split('-');
         this.languageCode = languageCode.toLowerCase();
         this.countryCode = countryCode.toUpperCase();
-        this.identifier = "".concat(this.languageCode, "-").concat(this.countryCode);
+        this.identifier = `${this.languageCode}-${this.countryCode}`;
     }
     /**
      * Is a given string an ISO 3166-1 alpha-2 country code.
@@ -24,33 +24,29 @@ var Locale = /** @class */ (function () {
      * @param countryCode - An ISO 3166-1 alpha-2 country code.
      * @param caseNormalized - Should we verify if the identifier is using the case-normalized format?
      */
-    Locale.isCountryCode = function (countryCode, caseNormalized) {
-        if (caseNormalized === void 0) { caseNormalized = true; }
-        var regExp = new RegExp(/^[A-Z]{2}$/, caseNormalized ? undefined : 'i');
+    static isCountryCode(countryCode, caseNormalized = true) {
+        const regExp = new RegExp(/^[A-Z]{2}$/, caseNormalized ? undefined : 'i');
         return regExp.test(countryCode);
-    };
+    }
     /**
      * Is a given string an ISO 639-1 alpha-2 language code.
      *
      * @param languageCode - An ISO 639-1 alpha-2 language code.
      * @param caseNormalized - Should we verify if the identifier is using the case-normalized format?
      */
-    Locale.isLanguageCode = function (languageCode, caseNormalized) {
-        if (caseNormalized === void 0) { caseNormalized = true; }
-        var regExp = new RegExp(/^[a-z]{2}$/, caseNormalized ? undefined : 'i');
+    static isLanguageCode(languageCode, caseNormalized = true) {
+        const regExp = new RegExp(/^[a-z]{2}$/, caseNormalized ? undefined : 'i');
         return regExp.test(languageCode);
-    };
+    }
     /**
      * Is a given string a locale identifier following the BCP 47 `language`-`country` format.
      *
      * @param identifier - A potential locale identify to verify.
      * @param caseNormalized - Should we verify if the identifier is using the case-normalized format?
      */
-    Locale.isLocale = function (identifier, caseNormalized) {
-        if (caseNormalized === void 0) { caseNormalized = true; }
-        var regExp = new RegExp(/^[a-z]{2}-[A-Z]{2}$/, caseNormalized ? undefined : 'i');
+    static isLocale(identifier, caseNormalized = true) {
+        const regExp = new RegExp(/^[a-z]{2}-[A-Z]{2}$/, caseNormalized ? undefined : 'i');
         return regExp.test(identifier);
-    };
-    return Locale;
-}());
+    }
+}
 exports.default = Locale;

package/lib/lookup-list.js

@@ -1,8 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var locale_list_1 = require("./locale-list");
+const locale_list_1 = __importDefault(require("./locale-list"));
 /** Lookup list used to match the preferred locale based on the value of an `Accept-Language` HTTP header. */
-var LookupList = /** @class */ (function () {
+class LookupList {
     /**
      * Create a new `LookupList` object.
      *
@@ -10,7 +13,7 @@ var LookupList = /** @class */ (function () {
      * @param locales - An array of locale identifiers. The order will be used for matching where the first identifier will be more
      * likely to be matched than the last identifier.
      */
-    function LookupList(acceptLanguageHeader, locales) {
+    constructor(acceptLanguageHeader, locales) {
         /**
          * Data object where the properties are quality (in string format) and their values a set containing locale
          * identifiers using the `language`-`country` format and ISO 639-1 alpha-2 language code.
@@ -22,16 +25,15 @@ var LookupList = /** @class */ (function () {
          */
         this.relatedLocaleLanguagesByQuality = {};
         this.localeList = new locale_list_1.default(locales);
-        var directiveStrings = acceptLanguageHeader
+        const directiveStrings = acceptLanguageHeader
             .split(',')
-            .map(function (directiveString) { return directiveString.trim(); });
-        for (var _i = 0, directiveStrings_1 = directiveStrings; _i < directiveStrings_1.length; _i++) {
-            var directiveString = directiveStrings_1[_i];
-            var directive = this.getDirective(directiveString);
+            .map((directiveString) => directiveString.trim());
+        for (const directiveString of directiveStrings) {
+            const directive = this.getDirective(directiveString);
             if (directive === undefined) {
                 continue; // No match for this directive.
             }
-            var locale = directive.locale, languageCode = directive.languageCode, quality = directive.quality;
+            const { locale, languageCode, quality } = directive;
             // If the language is not supported, skip to the next match.
             if (!this.localeList.languages.has(languageCode)) {
                 continue;
@@ -57,71 +59,71 @@ var LookupList = /** @class */ (function () {
      *
      * @returns The top locale with the specified language.
      */
-    LookupList.prototype.getTopByLanguage = function (languageCode) {
+    getTopByLanguage(languageCode) {
         var _a;
-        return (_a = this.localeList.objects.find(function (locale) { return locale.languageCode === languageCode; })) === null || _a === void 0 ? void 0 : _a.identifier;
-    };
+        return (_a = this.localeList.objects.find((locale) => locale.languageCode === languageCode)) === null || _a === void 0 ? void 0 : _a.identifier;
+    }
     /**
      * Get the top (highest-ranked) locale or language.
      *
      * @returns The top match, which can either be a locale or a language.
      */
-    LookupList.prototype.getTopLocaleOrLanguage = function () {
-        var localesAndLanguagesByQuality = Object.entries(this.localesAndLanguagesByQuality);
+    getTopLocaleOrLanguage() {
+        const localesAndLanguagesByQuality = Object.entries(this.localesAndLanguagesByQuality);
         if (localesAndLanguagesByQuality.length === 0) {
             return undefined;
         }
         return this.getTop(localesAndLanguagesByQuality);
-    };
+    }
     /**
      * Get the top (highest-ranked) related locale.
      *
      * @returns The top related locale.
      */
-    LookupList.prototype.getTopRelatedLocale = function () {
-        var relatedLocaleLanguagesByQuality = Object.entries(this.relatedLocaleLanguagesByQuality);
+    getTopRelatedLocale() {
+        const relatedLocaleLanguagesByQuality = Object.entries(this.relatedLocaleLanguagesByQuality);
         if (relatedLocaleLanguagesByQuality.length === 0) {
             return undefined;
         }
-        var topRelatedLocaleLanguage = this.getTop(relatedLocaleLanguagesByQuality);
+        const topRelatedLocaleLanguage = this.getTop(relatedLocaleLanguagesByQuality);
         return this.getTopByLanguage(topRelatedLocaleLanguage);
-    };
+    }
     /**
      * Add a language in the data object matching its quality.
      *
      * @param quality - The HTTP header's quality factor associated with a language.
      * @param languageCode - An ISO 639-1 alpha-2 language code.
      */
-    LookupList.prototype.addLanguage = function (quality, languageCode) {
+    addLanguage(quality, languageCode) {
         if (!this.localesAndLanguagesByQuality[quality]) {
             this.localesAndLanguagesByQuality[quality] = new Set();
         }
         this.localesAndLanguagesByQuality[quality].add(languageCode);
-    };
+    }
     /**
      * Add a locale in the data object matching its quality.
      *
      * @param quality - The HTTP header's quality factor associated with a locale.
      * @param identifier - A locale identifier using the BCP 47 `language`-`country` case-normalized format.
      */
-    LookupList.prototype.addLocale = function (quality, identifier) {
+    addLocale(quality, identifier) {
         if (!this.localesAndLanguagesByQuality[quality]) {
             this.localesAndLanguagesByQuality[quality] = new Set();
         }
         this.localesAndLanguagesByQuality[quality].add(identifier);
-    };
+    }
     /**
      * Add a related locale's language in the data object matching its quality.
      *
      * @param quality - The HTTP header's quality factor associated with a related locale's language.
      * @param languageCode - An ISO 639-1 alpha-2 language code.
      */
-    LookupList.prototype.addRelatedLocaleLanguage = function (quality, languageCode) {
+    addRelatedLocaleLanguage(quality, languageCode) {
         if (!this.relatedLocaleLanguagesByQuality[quality]) {
             this.relatedLocaleLanguagesByQuality[quality] = new Set();
         }
         this.relatedLocaleLanguagesByQuality[quality].add(languageCode);
-    };
+    }
     /**
      * Get a directive object from a directive string.
      *
@@ -129,7 +131,7 @@ var LookupList = /** @class */ (function () {
      *
      * @returns A `Directive` object or `undefined` if the string's format is invalid.
      */
-    LookupList.prototype.getDirective = function (directiveString) {
+    getDirective(directiveString) {
         /**
          * The regular expression is excluding certain directives due to the inability to configure those options in modern
          * browsers today (also those options seem unpractical):
@@ -138,17 +140,17 @@ var LookupList = /** @class */ (function () {
          * - Language tags that starts with a wildcard (e.g. "*-CA") should match the first supported locale of a country.
          * - A quality value equivalent to "0", as per RFC 2616 (section 3.9), should be considered as "not acceptable".
          */
-        var directiveMatch = directiveString.match(/^((?<matchedLanguageCode>([a-z]{2}))(-(?<matchedCountryCode>[a-z]{2}))?)(;q=(?<matchedQuality>(1(\.0{0,3})?)|(0(\.\d{0,3})?)))?$/i);
+        const directiveMatch = directiveString.match(/^((?<matchedLanguageCode>([a-z]{2}))(-(?<matchedCountryCode>[a-z]{2}))?)(;q=(?<matchedQuality>(1(\.0{0,3})?)|(0(\.\d{0,3})?)))?$/i);
         if (!(directiveMatch === null || directiveMatch === void 0 ? void 0 : directiveMatch.groups)) {
             return undefined; // No regular expression match.
         }
-        var _a = directiveMatch.groups, matchedLanguageCode = _a.matchedLanguageCode, matchedCountryCode = _a.matchedCountryCode, matchedQuality = _a.matchedQuality;
-        var languageCode = matchedLanguageCode.toLowerCase();
-        var countryCode = matchedCountryCode ? matchedCountryCode.toUpperCase() : undefined;
-        var quality = matchedQuality === undefined ? '1' : Number.parseFloat(matchedQuality).toString(); // Remove trailing zeros.
-        var locale = countryCode ? "".concat(languageCode, "-").concat(countryCode) : undefined;
-        return { languageCode: languageCode, locale: locale, quality: quality };
-    };
+        const { matchedLanguageCode, matchedCountryCode, matchedQuality } = directiveMatch.groups;
+        const languageCode = matchedLanguageCode.toLowerCase();
+        const countryCode = matchedCountryCode ? matchedCountryCode.toUpperCase() : undefined;
+        const quality = matchedQuality === undefined ? '1' : Number.parseFloat(matchedQuality).toString(); // Remove trailing zeros.
+        const locale = countryCode ? `${languageCode}-${countryCode}` : undefined;
+        return { languageCode, locale, quality };
+    }
     /**
      * Get the top (highest-ranked) entry from a dataset object entries.
      *
@@ -156,9 +158,8 @@ var LookupList = /** @class */ (function () {
      *
      * @returns The top entry from a dataset object entries.
      */
-    LookupList.prototype.getTop = function (dataObjectEntries) {
+    getTop(dataObjectEntries) {
         return dataObjectEntries.sort().reverse()[0][1].values().next().value;
-    };
-    return LookupList;
-}());
+    }
+}
 exports.default = LookupList;

package/lib/resolve-accept-language.js

@@ -1,19 +1,13 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolveAcceptLanguage = void 0;
-var locale_1 = require("./locale");
-var lookup_list_1 = require("./lookup-list");
+const locale_1 = __importDefault(require("./locale"));
+const lookup_list_1 = __importDefault(require("./lookup-list"));
 /** Resolve the preferred locale from an HTTP `Accept-Language` header. */
-var ResolveAcceptLanguage = /** @class */ (function () {
+class ResolveAcceptLanguage {
     /**
      * Create a new `ResolveAcceptLanguage` object.
      *
@@ -23,9 +17,9 @@ var ResolveAcceptLanguage = /** @class */ (function () {
      * @param locales - An array of locale identifiers. The order will be used for matching where the first identifier will be more
      * likely to be matched than the last identifier.
      */
-    function ResolveAcceptLanguage(acceptLanguageHeader, locales) {
-        var lookupList = new lookup_list_1.default(acceptLanguageHeader, locales);
-        var topLocaleOrLanguage = lookupList.getTopLocaleOrLanguage();
+    constructor(acceptLanguageHeader, locales) {
+        const lookupList = new lookup_list_1.default(acceptLanguageHeader, locales);
+        const topLocaleOrLanguage = lookupList.getTopLocaleOrLanguage();
         if (topLocaleOrLanguage === undefined) {
             this.relatedLocaleBasedMatch = lookupList.getTopRelatedLocale();
         }
@@ -43,52 +37,51 @@ var ResolveAcceptLanguage = /** @class */ (function () {
      *
      * @returns True if the best match language-based, otherwise false.
      */
-    ResolveAcceptLanguage.prototype.bestMatchIsLanguageBased = function () {
+    bestMatchIsLanguageBased() {
         return this.languageBasedMatch !== undefined;
-    };
+    }
     /**
      * Is the best match locale-based?
      *
      * @returns True if the best match locale-based, otherwise false.
      */
-    ResolveAcceptLanguage.prototype.bestMatchIsLocaleBased = function () {
+    bestMatchIsLocaleBased() {
         return this.localeBasedMatch !== undefined;
-    };
+    }
     /**
      * Is the best match related-locale-based?
      *
      * @returns True if the best match related-locale-based, otherwise false.
      */
-    ResolveAcceptLanguage.prototype.bestMatchIsRelatedLocaleBased = function () {
+    bestMatchIsRelatedLocaleBased() {
         return this.relatedLocaleBasedMatch !== undefined;
-    };
+    }
     /**
      * Get the locale which was the best match.
      *
      * @returns The locale which was the best match.
      */
-    ResolveAcceptLanguage.prototype.getBestMatch = function () {
+    getBestMatch() {
         var _a, _b;
         return (_b = (_a = this.localeBasedMatch) !== null && _a !== void 0 ? _a : this.languageBasedMatch) !== null && _b !== void 0 ? _b : this.relatedLocaleBasedMatch;
-    };
+    }
     /**
      * Was a match found when resolving the preferred locale?
      *
      * @returns True when a match is found, otherwise false.
      */
-    ResolveAcceptLanguage.prototype.hasMatch = function () {
+    hasMatch() {
         return this.getBestMatch() === undefined ? false : true;
-    };
+    }
     /**
      * Did the resolution of the preferred locale find no match?
      *
      * @returns True when there is no match, otherwise false.
      */
-    ResolveAcceptLanguage.prototype.hasNoMatch = function () {
+    hasNoMatch() {
         return !this.hasMatch();
-    };
-    return ResolveAcceptLanguage;
-}());
+    }
+}
 exports.ResolveAcceptLanguage = ResolveAcceptLanguage;
 /**
  * Resolve the preferred locale from an HTTP `Accept-Language` header.
@@ -110,24 +103,24 @@ exports.ResolveAcceptLanguage = ResolveAcceptLanguage;
  *   'en-US'
  * )
  */
-var resolveAcceptLanguage = function (acceptLanguageHeader, locales, defaultLocale) {
-    var localesIncludeDefault = false;
-    locales.forEach(function (locale) {
+const resolveAcceptLanguage = (acceptLanguageHeader, locales, defaultLocale) => {
+    let localesIncludeDefault = false;
+    locales.forEach((locale) => {
         if (!locale_1.default.isLocale(locale, false)) {
-            throw new Error("invalid locale identifier '".concat(locale, "'"));
+            throw new Error(`invalid locale identifier '${locale}'`);
         }
         if (locale.toLowerCase() === defaultLocale.toLocaleLowerCase()) {
             localesIncludeDefault = true;
         }
     });
     if (!locale_1.default.isLocale(defaultLocale, false)) {
-        throw new Error("invalid default locale identifier '".concat(defaultLocale, "'"));
+        throw new Error(`invalid default locale identifier '${defaultLocale}'`);
     }
     if (!localesIncludeDefault) {
         throw new Error('the default locale must be included in the locales');
     }
-    var rankedLocales = __spreadArray([defaultLocale], locales.filter(function (locale) { return locale !== defaultLocale; }), true);
-    var resolveAcceptLanguage = new ResolveAcceptLanguage(acceptLanguageHeader, rankedLocales);
+    const rankedLocales = [defaultLocale, ...locales.filter((locale) => locale !== defaultLocale)];
+    const resolveAcceptLanguage = new ResolveAcceptLanguage(acceptLanguageHeader, rankedLocales);
     if (resolveAcceptLanguage.hasMatch()) {
         return resolveAcceptLanguage.getBestMatch();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolve-accept-language",
-  "version": "1.1.44",
+  "version": "1.1.45-0",
   "description": "Resolve the preferred locale based on the value of an `Accept-Language` HTTP header.",
   "keywords": [
     "accept-language",
@@ -22,6 +22,7 @@
   },
   "license": "MIT",
   "author": "Avansai (https://avansai.com)",
+  "type": "module",
   "main": "lib/resolve-accept-language.js",
   "types": "lib/resolve-accept-language.d.ts",
   "files": [
@@ -32,6 +33,7 @@
     "lint-check": "eslint --ext .js --ext .jsx --ext .ts --ext .tsx --ext .json .",
     "lint-fix": "eslint --ext .js --ext .jsx --ext .ts --ext .tsx --ext .json --fix .",
     "lint-print-config": "eslint --print-config ./eslintrc.yaml",
+    "pre-release": "dotenv -- release-it --only-version --preRelease",
     "prettier": "prettier --write .",
     "release": "dotenv -- release-it --only-version",
     "test": "jest --coverage"
@@ -42,7 +44,7 @@
     "@typescript-eslint/eslint-plugin": "^5.53.0",
     "@typescript-eslint/parser": "^5.53.0",
     "dotenv-cli": "^7.0.0",
-    "eslint": "^8.34.0",
+    "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-import-resolver-node": "^0.3.7",
     "eslint-import-resolver-typescript": "^3.5.3",