@osimatic/helpers-js 1.5.29 → 1.5.31

package/location.js

@@ -1,6 +1,7 @@
 
 const Address = require('ilib/lib/Address');
 const AddressFmt = require('ilib/lib/AddressFmt');
+const { HTTPClient } = require('./http_client');
 const { toEl } = require('./util');
 const isoCountries = require('i18n-iso-countries');
 isoCountries.registerLocale(require('i18n-iso-countries/langs/en.json'));
@@ -11,16 +12,19 @@ class Country {
 	}
 
 	static getFlagPath(countryCode) {
-		return (typeof Country.flagsPath != 'undefined' ? Country.flagsPath : '/')+countryCode.toLowerCase()+'.png';
+		return typeof Country.flagsPath !== 'undefined' ? Country.flagsPath + countryCode.toLowerCase() + '.png' : null;
 	}
-	static getFlagImg(countryCode) {
-		return '<span><img src="'+Country.getFlagPath(countryCode)+'" alt="" title="'+Country.getCountryName(countryCode)+'" class="flag" /></span>'
+	static getFlagImg(countryCode, locale='fr-FR') {
+		if (typeof Country.flagsPath !== 'undefined') {
+			return '<span><img src="'+Country.getFlagPath(countryCode)+'" alt="" title="'+Country.getCountryName(countryCode, locale)+'" class="flag" /></span>';
+		}
+		return '<span class="fi fi-' + countryCode.toLowerCase() + '"></span>';
 	}
 	static getFlagEmoji(countryCode) {
 		return [...countryCode.toUpperCase()].map(c => String.fromCodePoint(0x1F1E6 - 65 + c.charCodeAt(0))).join('');
 	}
 
-	static fillSelect(select, defaultValue=null, showFlags=false, countriesList=null, addNoneValue=false, noneLabel='- Aucun -', locale='fr-FR') {
+	static fillSelect(select, defaultValue=null, showFlags=false, locale='fr-FR', countriesList=null, addNoneValue=false, noneLabel='- Aucun -') {
 		select = toEl(select);
 		if (!select) {
 			return;
@@ -33,14 +37,13 @@ class Country {
 			const entries = countriesList != null
 				? countriesList.map(code => [code, allCountries[code] || code])
 				: Object.entries(allCountries);
-			entries.forEach(([countryCode, countryName]) => {
+				entries.forEach(([countryCode, countryName]) => {
 				let attrs = '';
 				if (showFlags) {
-					if (typeof Country.flagsPath !== 'undefined') {
+					/*if (typeof Country.flagsPath !== 'undefined') {
 						attrs = ' data-thumbnail="' + Country.getFlagPath(countryCode) + '"';
-					} else {
-						attrs = ' data-content="<span class=&quot;fi fi-' + countryCode.toLowerCase() + '&quot;></span> ' + countryName + '"';
-					}
+					} else {*/
+					attrs = ' data-content="<span class=&quot;fi fi-' + countryCode.toLowerCase() + '&quot;></span> ' + countryName + '"';
 				}
 				select.insertAdjacentHTML('beforeend', '<option value="' + countryCode + '"' + attrs + '>' + countryName + '</option>');
 			});
@@ -50,24 +53,28 @@ class Country {
 		}
 	}
 
-	static fillSelectWithFlags(select, defaultValue=null, countriesList=null, addNoneValue=false, noneLabel='- Aucun -', locale='fr-FR') {
-		return Country.fillSelect(select, defaultValue, true, countriesList, addNoneValue, noneLabel, locale);
+	static fillSelectWithFlags(select, defaultValue=null, locale='fr-FR', countriesList=null, addNoneValue=false, noneLabel='- Aucun -') {
+		return Country.fillSelect(select, defaultValue, true, locale, countriesList, addNoneValue, noneLabel);
 	}
 
 	static getCountryName(countryCode, locale='fr-FR') {
-		const name = isoCountries.getName(countryCode, locale);
+		const baseLang = Locale.getBaseLang(locale);
+		Country.getCountries(locale); // ensure locale is registered
+		const name = isoCountries.getName(countryCode, baseLang);
 		return name || countryCode;
 	}
 	static getCountries(locale = 'en') {
-		const names = isoCountries.getNames(locale);
+		const baseLang = Locale.getBaseLang(locale);
+		let names = isoCountries.getNames(baseLang);
 		if (!names || Object.keys(names).length === 0) {
 			try {
-				isoCountries.registerLocale(require('i18n-iso-countries/langs/' + locale + '.json'));
+				isoCountries.registerLocale(require('i18n-iso-countries/langs/' + baseLang + '.json'));
+				names = isoCountries.getNames(baseLang);
 			} catch (e) {
 				// locale not available
 			}
 		}
-		return isoCountries.getNames(locale);
+		return names || {};
 	}
 
 	static getContinents() {
@@ -529,4 +536,35 @@ class GeographicCoordinates {
 
 }
 
-module.exports = { Country, PostalAddress, GeographicCoordinates, Polygon };
+class Locale {
+	static getBaseLang(locale) {
+		return Locale.normalize(locale).split('-')[0];
+	}
+
+	static getRegion(locale) {
+		const parts = Locale.normalize(locale).split('-');
+		return parts.length > 1 ? parts[1] : null;
+	}
+
+	static normalize(locale) {
+		// Accept both 'fr_FR' and 'fr-fr', output 'fr-FR'
+		const parts = locale.replace('_', '-').split('-');
+		const lang = parts[0].toLowerCase();
+		const region = parts[1] ? parts[1].toUpperCase() : null;
+		return region ? lang + '-' + region : lang;
+	}
+
+	static isValid(locale) {
+		return /^[a-zA-Z]{2,3}(-[a-zA-Z]{2,3})?$/.test(locale);
+	}
+
+	static toPOSIX(locale) {
+		return Locale.normalize(locale).replace('-', '_');
+	}
+
+	static update(locale) {
+		HTTPClient.setHeader('Accept-Language', Locale.normalize(locale));
+	}
+}
+
+module.exports = { Country, Locale, PostalAddress, GeographicCoordinates, Polygon };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.5.29",
+  "version": "1.5.31",
   "main": "main.js",
   "scripts": {
     "test": "jest",

package/tests/location.test.js

@@ -1,4 +1,4 @@
-const { Country, PostalAddress, GeographicCoordinates, Polygon } = require('../location');
+const { Country, Locale, PostalAddress, GeographicCoordinates, Polygon } = require('../location');
 
 describe('Country', () => {
 	describe('getCountries', () => {
@@ -19,12 +19,23 @@ describe('Country', () => {
 	});
 
 	describe('getCountryName', () => {
-		test('should return country name for valid code', () => {
+		test('should return country name for valid code (default fr-FR locale)', () => {
 			expect(Country.getCountryName('FR')).toBe('France');
-			expect(Country.getCountryName('US')).toBe('United States of America');
+			expect(Country.getCountryName('US')).toBe("États-Unis d'Amérique");
 			expect(Country.getCountryName('CA')).toBe('Canada');
 		});
 
+		test('should return country name in specified locale', () => {
+			expect(Country.getCountryName('US', 'en')).toBe('United States of America');
+			expect(Country.getCountryName('DE', 'de')).toBeTruthy();
+		});
+
+		test('should handle full locale with region (fr-FR, en-US)', () => {
+			expect(Country.getCountryName('FR', 'fr-FR')).toBe('France');
+			expect(Country.getCountryName('US', 'fr-FR')).toBe("États-Unis d'Amérique");
+			expect(Country.getCountryName('US', 'en-US')).toBe('United States of America');
+		});
+
 		test('should return the code itself if country not found', () => {
 			expect(Country.getCountryName('XX')).toBe('XX');
 			expect(Country.getCountryName('ZZZ')).toBe('ZZZ');
@@ -42,50 +53,35 @@ describe('Country', () => {
 	});
 
 	describe('getFlagPath', () => {
-		test('should return correct flag path', () => {
-			const path = Country.getFlagPath('FR');
-			expect(path).toContain('fr.png');
-		});
-
-		test('should lowercase the country code', () => {
-			const path = Country.getFlagPath('US');
-			expect(path).toContain('us.png');
+		test('should return null when no flagsPath set', () => {
+			Country.flagsPath = undefined;
+			expect(Country.getFlagPath('FR')).toBeNull();
 		});
 
-		test('should use custom flags path when set', () => {
+		test('should return image path when flagsPath set', () => {
 			Country.setFlagsPath('/custom/flags/');
-			const path = Country.getFlagPath('FR');
-			expect(path).toBe('/custom/flags/fr.png');
-
-			// Reset for other tests
+			expect(Country.getFlagPath('FR')).toBe('/custom/flags/fr.png');
+			expect(Country.getFlagPath('US')).toBe('/custom/flags/us.png');
 			Country.flagsPath = undefined;
 		});
+	});
 
-		test('should use default path when not set', () => {
+	describe('getFlagImg', () => {
+		test('should return flag-icons span when no flagsPath set', () => {
 			Country.flagsPath = undefined;
-			const path = Country.getFlagPath('DE');
-			expect(path).toBe('/de.png');
+			const html = Country.getFlagImg('FR');
+			expect(html).toContain('<span');
+			expect(html).toContain('fi fi-fr');
 		});
-	});
 
-	describe('getFlagImg', () => {
-		test('should return HTML img tag', () => {
+		test('should return img tag when flagsPath set', () => {
+			Country.setFlagsPath('/flags/');
 			const html = Country.getFlagImg('FR');
 			expect(html).toContain('<img');
-			expect(html).toContain('src=');
 			expect(html).toContain('fr.png');
 			expect(html).toContain('class="flag"');
-		});
-
-		test('should include country name in title', () => {
-			const html = Country.getFlagImg('US');
-			expect(html).toContain('title="United States of America"');
-		});
-
-		test('should wrap img in span', () => {
-			const html = Country.getFlagImg('GB');
-			expect(html).toMatch(/^<span>/);
-			expect(html).toMatch(/<\/span>$/);
+			expect(html).toContain("title=\"France\"");
+			Country.flagsPath = undefined;
 		});
 	});
 
@@ -129,6 +125,74 @@ describe('Country', () => {
 	});
 });
 
+describe('Locale', () => {
+	describe('normalize', () => {
+		test('should canonicalize to lang-REGION format', () => {
+			expect(Locale.normalize('fr-FR')).toBe('fr-FR');
+			expect(Locale.normalize('fr-fr')).toBe('fr-FR');
+			expect(Locale.normalize('FR-fr')).toBe('fr-FR');
+			expect(Locale.normalize('fr_FR')).toBe('fr-FR');
+		});
+
+		test('should handle lang-only locales', () => {
+			expect(Locale.normalize('fr')).toBe('fr');
+			expect(Locale.normalize('EN')).toBe('en');
+		});
+	});
+
+	describe('getBaseLang', () => {
+		test('should extract base language', () => {
+			expect(Locale.getBaseLang('fr-FR')).toBe('fr');
+			expect(Locale.getBaseLang('en-US')).toBe('en');
+			expect(Locale.getBaseLang('fr_FR')).toBe('fr');
+		});
+
+		test('should return lang as-is when no region', () => {
+			expect(Locale.getBaseLang('fr')).toBe('fr');
+		});
+	});
+
+	describe('getRegion', () => {
+		test('should extract region code', () => {
+			expect(Locale.getRegion('fr-FR')).toBe('FR');
+			expect(Locale.getRegion('en-US')).toBe('US');
+			expect(Locale.getRegion('fr_FR')).toBe('FR');
+		});
+
+		test('should return null when no region', () => {
+			expect(Locale.getRegion('fr')).toBeNull();
+		});
+	});
+
+	describe('isValid', () => {
+		test('should accept valid locales', () => {
+			expect(Locale.isValid('fr')).toBe(true);
+			expect(Locale.isValid('fr-FR')).toBe(true);
+			expect(Locale.isValid('en-US')).toBe(true);
+			expect(Locale.isValid('zh-CN')).toBe(true);
+		});
+
+		test('should reject invalid locales', () => {
+			expect(Locale.isValid('foobar')).toBe(false);
+			expect(Locale.isValid('fr_FR')).toBe(false);
+			expect(Locale.isValid('')).toBe(false);
+			expect(Locale.isValid('1234')).toBe(false);
+		});
+	});
+
+	describe('toPOSIX', () => {
+		test('should convert to POSIX format', () => {
+			expect(Locale.toPOSIX('fr-FR')).toBe('fr_FR');
+			expect(Locale.toPOSIX('en-US')).toBe('en_US');
+			expect(Locale.toPOSIX('fr_FR')).toBe('fr_FR');
+		});
+
+		test('should handle lang-only locales', () => {
+			expect(Locale.toPOSIX('fr')).toBe('fr');
+		});
+	});
+});
+
 describe('GeographicCoordinates', () => {
 	describe('check', () => {
 		test('should validate correct coordinates', () => {