@trenskow/language 1.4.46 → 1.4.48

package/index.js

@@ -66,14 +66,45 @@ const expand = (identifier) => {
 
 };
 
-const collapse = (identifier) => {
+const collapse = (identifier, available) => {
+
+	let useLanguages = languages;
+
+	if (typeof available !== 'undefined') {
+
+		if (!Array.isArray(available) || !available.length) throw new Error('Available languages must be a non-empty array of language identifiers.');
+		if (available.some((item) => typeof item !== 'string')) throw new Error('Available languages must be a non-empty array of language identifiers.');
+
+		available = available.map((identifier) => expand(identifier));
+
+		useLanguages = {};
+
+		available.forEach((identifier) => {
+			const { languageIdentifier, scriptIdentifier, countryIdentifier } = entities(identifier);
+			if (!useLanguages[languageIdentifier]) {
+				useLanguages[languageIdentifier] = {
+					primaryScripts: languages[languageIdentifier].primaryScripts,
+					scripts: {}
+				};
+			}
+			if (!useLanguages[languageIdentifier].scripts[scriptIdentifier]) {
+				useLanguages[languageIdentifier].scripts[scriptIdentifier] = {
+					countries: []
+				};
+			}
+			if (!useLanguages[languageIdentifier].scripts[scriptIdentifier].countries.includes(countryIdentifier)) {
+				useLanguages[languageIdentifier].scripts[scriptIdentifier].countries.push(countryIdentifier);
+			}
+		});
+
+	}
 
 	const { languageIdentifier, scriptIdentifier, countryIdentifier } = entities(expand(identifier));
 
 	let parts = [languageIdentifier];
 
-	if (languages[languageIdentifier].primaryScripts.length > 1) parts.push(scriptIdentifier);
-	if (languages[languageIdentifier].scripts[scriptIdentifier].countries.length > 1) parts.push(countryIdentifier);
+	if (useLanguages[languageIdentifier].primaryScripts.length > 1) parts.push(scriptIdentifier);
+	if (useLanguages[languageIdentifier].scripts[scriptIdentifier].countries.length > 1) parts.push(countryIdentifier);
 
 	return parts.join('-');
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@trenskow/language",
-	"version": "1.4.46",
+	"version": "1.4.48",
 	"description": "A small library for getting a full language identifier (RFC 5646).",
 	"main": "index.js",
 	"type": "module",
@@ -21,11 +21,11 @@
 		"@eslint/eslintrc": "^3.3.3",
 		"@eslint/js": "^9.13.0",
 		"chai": "^6.2.1",
-		"eslint": "^9.39.1",
+		"eslint": "^9.39.2",
 		"globals": "^16.5.0",
 		"mocha": "^11.7.5"
 	},
 	"dependencies": {
-		"@trenskow/localization-data": "^1.4.34"
+		"@trenskow/localization-data": "^1.4.35"
 	}
 }

package/test/index.js

@@ -14,6 +14,9 @@ describe('language', () => {
 	it ('should come back with `da` (from `da-DK`).', () => {
 		expect(language.collapse('da-DK')).to.equal('da');
 	});
+	it ('should come back with `en` when collapsing from a list of available languages.', () => {
+		expect(language.collapse('en-US', ['en-Latn-US', 'da'])).to.equal('en');
+	});
 	it ('should throw an error if country is missing (`fr`).', () => {
 		expect(() => { language.expand('fr'); }).to.throw('Country is ambiguous for identifier \'fr\'.');
 	});