resolve-accept-language 1.1.12 → 1.1.15

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2021 Avansai
-
-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:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2021 Avansai
+
+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:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -19,11 +19,11 @@ npm install resolve-accept-language
 Code example:
 
 ```ts
-import resolveAcceptLanguage from 'resolve-accept-language';
+import resolveAcceptLanguage from 'resolve-accept-language'
 
 console.log(
   resolveAcceptLanguage('fr-CA;q=0.01,en-CA;q=0.1,en-US;q=0.001', ['en-US', 'fr-CA'], 'en-US')
-);
+)
 ```
 
 Output:
@@ -37,7 +37,7 @@ fr-CA
 You may want to control exactly the behavior depending on the type of match. For example, you could want to display a language picker on your home page if the match is not satisfactory. In those cases, you will need to use the `ResolveAcceptLanguage` class instead. It offers more visibility into the selection process while matching a locale:
 
 ```ts
-import { ResolveAcceptLanguage } from 'resolve-accept-language';
+import { ResolveAcceptLanguage } from 'resolve-accept-language'
 
 /**
  * If you are planning to have a "default locale", make sure to add it first in the provided locale list.
@@ -47,23 +47,23 @@ import { ResolveAcceptLanguage } from 'resolve-accept-language';
 const resolveAcceptLanguage = new ResolveAcceptLanguage('fr-CA;q=0.01,en-CA;q=0.1,en-US;q=0.001', [
   'en-US',
   'fr-CA',
-]);
+])
 
 if (resolveAcceptLanguage.hasMatch()) {
-  const locale = resolveAcceptLanguage.getBestMatch() as string;
-  console.log(`A locale was matched: ${locale}`);
+  const locale = resolveAcceptLanguage.getBestMatch() as string
+  console.log(`A locale was matched: ${locale}`)
 
   if (resolveAcceptLanguage.bestMatchIsLocaleBased()) {
-    console.log('The match is locale-based');
+    console.log('The match is locale-based')
   } else if (resolveAcceptLanguage.bestMatchIsLanguageBased()) {
-    console.log('The match is language-based');
+    console.log('The match is language-based')
   } else if (resolveAcceptLanguage.bestMatchIsRelatedLocaleBased()) {
-    console.log('The match is related-locale-based');
+    console.log('The match is related-locale-based')
   }
 }
 
 if (resolveAcceptLanguage.hasNoMatch()) {
-  console.log('No match found :(');
+  console.log('No match found :(')
 }
 ```
 

package/lib/locale-list.d.ts

@@ -1,13 +1,13 @@
 import Locale from './locale';
 export default class LocaleList {
-    /** A list of locale objects. */
-    readonly objects: Locale[];
-    /** A set of locale identifiers using the BCP 47 `language`-`country` case-normalized format. */
-    readonly locales: Set<string>;
-    /** A set of ISO 639-1 alpha-2 language codes. */
-    readonly languages: Set<string>;
     /** A set of ISO 3166-1 alpha-2 country codes. */
     readonly countries: Set<string>;
+    /** A set of ISO 639-1 alpha-2 language codes. */
+    readonly languages: Set<string>;
+    /** A set of locale identifiers using the BCP 47 `language`-`country` case-normalized format. */
+    readonly locales: Set<string>;
+    /** A list of locale objects. */
+    readonly objects: Locale[];
     /**
      * Create a list of locale identifiers.
      *

package/lib/locale-list.js

@@ -11,14 +11,14 @@ var LocaleList = /** @class */ (function () {
      */
     function LocaleList(locales) {
         var _this = this;
-        /** A list of locale objects. */
-        this.objects = [];
-        /** A set of locale identifiers using the BCP 47 `language`-`country` case-normalized format. */
-        this.locales = new Set();
-        /** A set of ISO 639-1 alpha-2 language codes. */
-        this.languages = new Set();
         /** A set of ISO 3166-1 alpha-2 country codes. */
         this.countries = new Set();
+        /** A set of ISO 639-1 alpha-2 language codes. */
+        this.languages = new Set();
+        /** A set of locale identifiers using the BCP 47 `language`-`country` case-normalized format. */
+        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)) {

package/lib/locale.d.ts

@@ -1,25 +1,19 @@
 /** Class to manage a locale identifier using the BCP 47 `language`-`country` format. */
 export default class Locale {
+    /** The ISO 3166-1 alpha-2 country code. */
+    readonly countryCode: string;
     /** The locale identifier using the BCP 47 `language`-`country` case-normalized format. */
     readonly identifier: string;
     /** The ISO 639-1 alpha-2 language code. */
     readonly languageCode: string;
-    /** The ISO 3166-1 alpha-2 country code. */
-    readonly countryCode: string;
     /**
-     * Is a given string a locale identifier following the BCP 47 `language`-`country` format.
+     * Create a new `Locale` object.
      *
-     * @param identifier - A potential locale identify to verify.
-     * @param caseNormalized - Should we verify if the identifier is using the case-normalized format?
-     */
-    static isLocale(identifier: string, caseNormalized?: boolean): boolean;
-    /**
-     * Is a given string an ISO 639-1 alpha-2 language code.
+     * @param identifier - A locale identifier using the BCP 47 `language`-`country` format (case insensitive).
      *
-     * @param languageCode - An ISO 639-1 alpha-2 language code.
-     * @param caseNormalized - Should we verify if the identifier is using the case-normalized format?
+     * @throws An error if the `identifier` format is invalid.
      */
-    static isLanguageCode(languageCode: string, caseNormalized?: boolean): boolean;
+    constructor(identifier: string);
     /**
      * Is a given string an ISO 3166-1 alpha-2 country code.
      *
@@ -28,11 +22,17 @@ export default class Locale {
      */
     static isCountryCode(countryCode: string, caseNormalized?: boolean): boolean;
     /**
-     * Create a new `Locale` object.
+     * Is a given string an ISO 639-1 alpha-2 language code.
      *
-     * @param identifier - A locale identifier using the BCP 47 `language`-`country` format (case insensitive).
+     * @param languageCode - An ISO 639-1 alpha-2 language code.
+     * @param caseNormalized - Should we verify if the identifier is using the case-normalized format?
+     */
+    static isLanguageCode(languageCode: string, caseNormalized?: boolean): boolean;
+    /**
+     * Is a given string a locale identifier following the BCP 47 `language`-`country` format.
      *
-     * @throws An error if the `identifier` format is invalid.
+     * @param identifier - A potential locale identify to verify.
+     * @param caseNormalized - Should we verify if the identifier is using the case-normalized format?
      */
-    constructor(identifier: string);
+    static isLocale(identifier: string, caseNormalized?: boolean): boolean;
 }

package/lib/locale.js

@@ -19,15 +19,15 @@ var Locale = /** @class */ (function () {
         this.identifier = "".concat(this.languageCode, "-").concat(this.countryCode);
     }
     /**
-     * Is a given string a locale identifier following the BCP 47 `language`-`country` format.
+     * Is a given string an ISO 3166-1 alpha-2 country code.
      *
-     * @param identifier - A potential locale identify to verify.
+     * @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.isLocale = function (identifier, caseNormalized) {
+    Locale.isCountryCode = function (countryCode, caseNormalized) {
         if (caseNormalized === void 0) { caseNormalized = true; }
-        var regExp = new RegExp(/^[a-z]{2}-[A-Z]{2}$/, caseNormalized ? undefined : 'i');
-        return regExp.test(identifier);
+        var 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.
@@ -41,15 +41,15 @@ var Locale = /** @class */ (function () {
         return regExp.test(languageCode);
     };
     /**
-     * Is a given string an ISO 3166-1 alpha-2 country code.
+     * Is a given string a locale identifier following the BCP 47 `language`-`country` format.
      *
-     * @param countryCode - An ISO 3166-1 alpha-2 country code.
+     * @param identifier - A potential locale identify to verify.
      * @param caseNormalized - Should we verify if the identifier is using the case-normalized format?
      */
-    Locale.isCountryCode = function (countryCode, caseNormalized) {
+    Locale.isLocale = function (identifier, caseNormalized) {
         if (caseNormalized === void 0) { caseNormalized = true; }
-        var regExp = new RegExp(/^[A-Z]{2}$/, caseNormalized ? undefined : 'i');
-        return regExp.test(countryCode);
+        var regExp = new RegExp(/^[a-z]{2}-[A-Z]{2}$/, caseNormalized ? undefined : 'i');
+        return regExp.test(identifier);
     };
     return Locale;
 }());

package/lib/lookup-list.d.ts

@@ -17,20 +17,25 @@ export default class LookupList {
      */
     constructor(acceptLanguageHeader: string, locales: string[]);
     /**
-     * Get a directive object from a directive string.
+     * Get the top (highest-ranked) locale by language.
      *
-     * @param directiveString - The string representing a directive, extracted from the HTTP header.
+     * @param languageCode - An ISO 639-1 alpha-2 language code.
      *
-     * @returns A `Directive` object or `undefined` if the string's format is invalid.
+     * @returns The top locale with the specified language.
      */
-    private getDirective;
+    getTopByLanguage(languageCode: string): string | undefined;
     /**
-     * Add a locale in the data object matching its quality.
+     * Get the top (highest-ranked) locale or language.
      *
-     * @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.
+     * @returns The top match, which can either be a locale or a language.
      */
-    private addLocale;
+    getTopLocaleOrLanguage(): string | undefined;
+    /**
+     * Get the top (highest-ranked) related locale.
+     *
+     * @returns The top related locale.
+     */
+    getTopRelatedLocale(): string | undefined;
     /**
      * Add a language in the data object matching its quality.
      *
@@ -38,6 +43,13 @@ export default class LookupList {
      * @param languageCode - An ISO 639-1 alpha-2 language code.
      */
     private addLanguage;
+    /**
+     * 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.
+     */
+    private addLocale;
     /**
      * Add a related locale's language in the data object matching its quality.
      *
@@ -46,31 +58,19 @@ export default class LookupList {
      */
     private addRelatedLocaleLanguage;
     /**
-     * Get the top (highest-ranked) entry from a dataset object entries.
-     *
-     * @param dataObjectEntries - The object entries of a dataset object.
+     * Get a directive object from a directive string.
      *
-     * @returns The top entry from a dataset object entries.
-     */
-    private getTop;
-    /**
-     * Get the top (highest-ranked) locale or language.
+     * @param directiveString - The string representing a directive, extracted from the HTTP header.
      *
-     * @returns The top match, which can either be a locale or a language.
+     * @returns A `Directive` object or `undefined` if the string's format is invalid.
      */
-    getTopLocaleOrLanguage(): string | undefined;
+    private getDirective;
     /**
-     * Get the top (highest-ranked) locale by language.
-     *
-     * @param languageCode - An ISO 639-1 alpha-2 language code.
+     * Get the top (highest-ranked) entry from a dataset object entries.
      *
-     * @returns The top locale with the specified language.
-     */
-    getTopByLanguage(languageCode: string): string | undefined;
-    /**
-     * Get the top (highest-ranked) related locale.
+     * @param dataObjectEntries - The object entries of a dataset object.
      *
-     * @returns The top related locale.
+     * @returns The top entry from a dataset object entries.
      */
-    getTopRelatedLocale(): string | undefined;
+    private getTop;
 }

package/lib/lookup-list.js

@@ -46,42 +46,40 @@ var LookupList = /** @class */ (function () {
         }
     }
     /**
-     * Get a directive object from a directive string.
+     * Get the top (highest-ranked) locale by language.
      *
-     * @param directiveString - The string representing a directive, extracted from the HTTP header.
+     * @param languageCode - An ISO 639-1 alpha-2 language code.
      *
-     * @returns A `Directive` object or `undefined` if the string's format is invalid.
+     * @returns The top locale with the specified language.
      */
-    LookupList.prototype.getDirective = function (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):
-         *
-         * - The wildcard character "*", as per RFC 2616 (section 14.4), should match any unmatched language tag.
-         * - 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.(\d*[1-9]\d*){1,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' : parseFloat(matchedQuality).toString(); // Remove trailing zeros.
-        var locale = countryCode ? "".concat(languageCode, "-").concat(countryCode) : undefined;
-        return { locale: locale, languageCode: languageCode, quality: quality };
+    LookupList.prototype.getTopByLanguage = function (languageCode) {
+        var _a;
+        return (_a = this.localeList.objects.find(function (locale) { return locale.languageCode === languageCode; })) === null || _a === void 0 ? void 0 : _a.identifier;
     };
     /**
-     * Add a locale in the data object matching its quality.
+     * Get the top (highest-ranked) locale or language.
      *
-     * @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.
+     * @returns The top match, which can either be a locale or a language.
      */
-    LookupList.prototype.addLocale = function (quality, identifier) {
-        if (!this.localesAndLanguagesByQuality[quality]) {
-            this.localesAndLanguagesByQuality[quality] = new Set();
+    LookupList.prototype.getTopLocaleOrLanguage = function () {
+        var localesAndLanguagesByQuality = Object.entries(this.localesAndLanguagesByQuality);
+        if (localesAndLanguagesByQuality.length === 0) {
+            return undefined;
         }
-        this.localesAndLanguagesByQuality[quality].add(identifier);
+        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);
+        if (relatedLocaleLanguagesByQuality.length === 0) {
+            return undefined;
+        }
+        var topRelatedLocaleLanguage = this.getTop(relatedLocaleLanguagesByQuality);
+        return this.getTopByLanguage(topRelatedLocaleLanguage);
     };
     /**
      * Add a language in the data object matching its quality.
@@ -95,6 +93,18 @@ var LookupList = /** @class */ (function () {
         }
         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) {
+        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.
      *
@@ -108,50 +118,40 @@ var LookupList = /** @class */ (function () {
         this.relatedLocaleLanguagesByQuality[quality].add(languageCode);
     };
     /**
-     * Get the top (highest-ranked) entry from a dataset object entries.
-     *
-     * @param dataObjectEntries - The object entries of a dataset object.
+     * Get a directive object from a directive string.
      *
-     * @returns The top entry from a dataset object entries.
-     */
-    LookupList.prototype.getTop = function (dataObjectEntries) {
-        return dataObjectEntries.sort().reverse()[0][1].values().next().value;
-    };
-    /**
-     * Get the top (highest-ranked) locale or language.
+     * @param directiveString - The string representing a directive, extracted from the HTTP header.
      *
-     * @returns The top match, which can either be a locale or a language.
+     * @returns A `Directive` object or `undefined` if the string's format is invalid.
      */
-    LookupList.prototype.getTopLocaleOrLanguage = function () {
-        var localesAndLanguagesByQuality = Object.entries(this.localesAndLanguagesByQuality);
-        if (!localesAndLanguagesByQuality.length) {
-            return undefined;
-        }
-        return this.getTop(localesAndLanguagesByQuality);
+    LookupList.prototype.getDirective = function (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):
+         *
+         * - The wildcard character "*", as per RFC 2616 (section 14.4), should match any unmatched language tag.
+         * - 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.(\d*[1-9]\d*){1,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 };
     };
     /**
-     * Get the top (highest-ranked) locale by language.
-     *
-     * @param languageCode - An ISO 639-1 alpha-2 language code.
+     * Get the top (highest-ranked) entry from a dataset object entries.
      *
-     * @returns The top locale with the specified language.
-     */
-    LookupList.prototype.getTopByLanguage = function (languageCode) {
-        var _a;
-        return (_a = this.localeList.objects.find(function (locale) { return locale.languageCode === languageCode; })) === null || _a === void 0 ? void 0 : _a.identifier;
-    };
-    /**
-     * Get the top (highest-ranked) related locale.
+     * @param dataObjectEntries - The object entries of a dataset object.
      *
-     * @returns The top related locale.
+     * @returns The top entry from a dataset object entries.
      */
-    LookupList.prototype.getTopRelatedLocale = function () {
-        var relatedLocaleLanguagesByQuality = Object.entries(this.relatedLocaleLanguagesByQuality);
-        if (!relatedLocaleLanguagesByQuality.length) {
-            return undefined;
-        }
-        var topRelatedLocaleLanguage = this.getTop(relatedLocaleLanguagesByQuality);
-        return this.getTopByLanguage(topRelatedLocaleLanguage);
+    LookupList.prototype.getTop = function (dataObjectEntries) {
+        return dataObjectEntries.sort().reverse()[0][1].values().next().value;
     };
     return LookupList;
 }());

package/lib/resolve-accept-language.d.ts

@@ -1,9 +1,9 @@
 /** Resolve the preferred locale from an HTTP `Accept-Language` header. */
 export declare class ResolveAcceptLanguage {
-    /** The locale-based match, if applicable. */
-    private localeBasedMatch;
     /** The language-based match, if applicable. */
     private languageBasedMatch;
+    /** The locale-based match, if applicable. */
+    private localeBasedMatch;
     /** The related-locale-based match, if applicable. */
     private relatedLocaleBasedMatch;
     /**
@@ -17,29 +17,17 @@ export declare class ResolveAcceptLanguage {
      */
     constructor(acceptLanguageHeader: string, locales: string[]);
     /**
-     * Was a match found when resolving the preferred locale?
-     *
-     * @returns True when a match is found, otherwise false.
-     */
-    hasMatch(): boolean;
-    /**
-     * Did the resolution of the preferred locale find no match?
+     * Is the best match language-based?
      *
-     * @returns True when there is no match, otherwise false.
+     * @returns True if the best match language-based, otherwise false.
      */
-    hasNoMatch(): boolean;
+    bestMatchIsLanguageBased(): boolean;
     /**
      * Is the best match locale-based?
      *
      * @returns True if the best match locale-based, otherwise false.
      */
     bestMatchIsLocaleBased(): boolean;
-    /**
-     * Is the best match language-based?
-     *
-     * @returns True if the best match language-based, otherwise false.
-     */
-    bestMatchIsLanguageBased(): boolean;
     /**
      * Is the best match related-locale-based?
      *
@@ -52,6 +40,18 @@ export declare class ResolveAcceptLanguage {
      * @returns The locale which was the best match.
      */
     getBestMatch(): string | undefined;
+    /**
+     * Was a match found when resolving the preferred locale?
+     *
+     * @returns True when a match is found, otherwise false.
+     */
+    hasMatch(): boolean;
+    /**
+     * Did the resolution of the preferred locale find no match?
+     *
+     * @returns True when there is no match, otherwise false.
+     */
+    hasNoMatch(): boolean;
 }
 /**
  * Resolve the preferred locale from an HTTP `Accept-Language` header.

package/lib/resolve-accept-language.js

@@ -39,25 +39,12 @@ var ResolveAcceptLanguage = /** @class */ (function () {
         }
     }
     /**
-     * Was a match found when resolving the preferred locale?
-     *
-     * @returns True when a match is found, otherwise false.
-     */
-    ResolveAcceptLanguage.prototype.hasMatch = function () {
-        if (this.localeBasedMatch !== undefined ||
-            this.languageBasedMatch !== undefined ||
-            this.relatedLocaleBasedMatch !== undefined) {
-            return true;
-        }
-        return false;
-    };
-    /**
-     * Did the resolution of the preferred locale find no match?
+     * Is the best match language-based?
      *
-     * @returns True when there is no match, otherwise false.
+     * @returns True if the best match language-based, otherwise false.
      */
-    ResolveAcceptLanguage.prototype.hasNoMatch = function () {
-        return !this.hasMatch();
+    ResolveAcceptLanguage.prototype.bestMatchIsLanguageBased = function () {
+        return this.languageBasedMatch !== undefined;
     };
     /**
      * Is the best match locale-based?
@@ -67,14 +54,6 @@ var ResolveAcceptLanguage = /** @class */ (function () {
     ResolveAcceptLanguage.prototype.bestMatchIsLocaleBased = function () {
         return this.localeBasedMatch !== undefined;
     };
-    /**
-     * Is the best match language-based?
-     *
-     * @returns True if the best match language-based, otherwise false.
-     */
-    ResolveAcceptLanguage.prototype.bestMatchIsLanguageBased = function () {
-        return this.languageBasedMatch !== undefined;
-    };
     /**
      * Is the best match related-locale-based?
      *
@@ -89,16 +68,24 @@ var ResolveAcceptLanguage = /** @class */ (function () {
      * @returns The locale which was the best match.
      */
     ResolveAcceptLanguage.prototype.getBestMatch = function () {
-        if (this.localeBasedMatch !== undefined) {
-            return this.localeBasedMatch;
-        }
-        else if (this.languageBasedMatch !== undefined) {
-            return this.languageBasedMatch;
-        }
-        else if (this.relatedLocaleBasedMatch !== undefined) {
-            return this.relatedLocaleBasedMatch;
-        }
-        return undefined;
+        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 () {
+        return this.getBestMatch() !== undefined ? true : false;
+    };
+    /**
+     * Did the resolution of the preferred locale find no match?
+     *
+     * @returns True when there is no match, otherwise false.
+     */
+    ResolveAcceptLanguage.prototype.hasNoMatch = function () {
+        return !this.hasMatch();
     };
     return ResolveAcceptLanguage;
 }());

package/package.json

@@ -1,54 +1,62 @@
-{
-  "name": "resolve-accept-language",
-  "version": "1.1.12",
-  "description": "Resolve the preferred locale based on the value of an `Accept-Language` HTTP header.",
-  "author": "Avansai (https://avansai.com)",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Avansai/resolve-accept-language.git"
-  },
-  "main": "lib/resolve-accept-language.js",
-  "types": "lib/resolve-accept-language.d.ts",
-  "scripts": {
-    "build": "rm -Rf ./lib && tsc && npm run lint && npm test",
-    "test": "jest --coverage",
-    "lint": "eslint . --fix",
-    "prettier-check": "prettier --check .",
-    "prettier-fix": "prettier --write .",
-    "release": "dotenv -- release-it --only-version"
-  },
-  "license": "MIT",
-  "files": [
-    "lib"
-  ],
-  "keywords": [
-    "accept-language",
-    "RFC 4647",
-    "locale",
-    "language tags",
-    "RFC 4646",
-    "BCP 47",
-    "RFC 2616",
-    "resolve",
-    "detect",
-    "intl",
-    "i18n",
-    "internationalization"
-  ],
-  "devDependencies": {
-    "@release-it/conventional-changelog": "^5.0.0",
-    "@types/jest": "^28.1.6",
-    "@typescript-eslint/eslint-plugin": "^5.30.7",
-    "@typescript-eslint/parser": "^5.30.7",
-    "dotenv-cli": "^6.0.0",
-    "eslint": "^8.20.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-jest": "^26.6.0",
-    "jest": "^28.1.3",
-    "prettier": "2.7.1",
-    "release-it": "^15.1.3",
-    "ts-jest": "^28.0.7",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.7.4"
-  }
-}
+{
+  "name": "resolve-accept-language",
+  "version": "1.1.15",
+  "description": "Resolve the preferred locale based on the value of an `Accept-Language` HTTP header.",
+  "author": "Avansai (https://avansai.com)",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Avansai/resolve-accept-language.git"
+  },
+  "main": "lib/resolve-accept-language.js",
+  "types": "lib/resolve-accept-language.d.ts",
+  "scripts": {
+    "build": "npm run prettier && npm run lint-fix && rm -Rf ./lib && tsc && npm test",
+    "lint-fix": "eslint --ext .js --ext .jsx --ext .ts --ext .tsx --fix .",
+    "lint-check": "eslint --ext .js --ext .jsx --ext .ts --ext .tsx .",
+    "lint-print-config": "eslint --print-config ./eslintrc.yaml",
+    "prettier": "prettier --write .",
+    "test": "jest --coverage",
+    "release": "dotenv -- release-it --only-version"
+  },
+  "license": "MIT",
+  "files": [
+    "lib"
+  ],
+  "keywords": [
+    "accept-language",
+    "RFC 4647",
+    "locale",
+    "language tags",
+    "RFC 4646",
+    "BCP 47",
+    "RFC 2616",
+    "resolve",
+    "detect",
+    "intl",
+    "i18n",
+    "internationalization"
+  ],
+  "devDependencies": {
+    "@release-it/conventional-changelog": "^5.0.0",
+    "@types/jest": "^28.1.6",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "@typescript-eslint/parser": "^5.33.0",
+    "dotenv-cli": "^6.0.0",
+    "eslint": "^8.21.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-import-resolver-node": "^0.3.6",
+    "eslint-import-resolver-typescript": "^3.4.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^26.8.2",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-unicorn": "^43.0.2",
+    "jest": "^28.1.3",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^3.0.3",
+    "prettier-plugin-sh": "^0.12.8",
+    "release-it": "^15.3.0",
+    "ts-jest": "^28.0.7",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.7.4"
+  }
+}