@osimatic/helpers-js 1.5.26 → 1.5.28

package/location.js

@@ -2,6 +2,8 @@
 const Address = require('ilib/lib/Address');
 const AddressFmt = require('ilib/lib/AddressFmt');
 const { toEl } = require('./util');
+const isoCountries = require('i18n-iso-countries');
+isoCountries.registerLocale(require('i18n-iso-countries/langs/en.json'));
 
 class Country {
 	static setFlagsPath(flagsPath) {
@@ -14,8 +16,11 @@ class Country {
 	static getFlagImg(countryCode) {
 		return '<span><img src="'+Country.getFlagPath(countryCode)+'" alt="" title="'+Country.getCountryName(countryCode)+'" class="flag" /></span>'
 	}
+	static getFlagEmoji(countryCode) {
+		return [...countryCode.toUpperCase()].map(c => String.fromCodePoint(0x1F1E6 - 65 + c.charCodeAt(0))).join('');
+	}
 
-	static fillCountrySelect(select, defaultValue=null, countriesList=null, addNoneValue=false, noneLabel='- Aucun -') {
+	static fillCountrySelect(select, defaultValue=null, countriesList=null, addNoneValue=false, noneLabel='- Aucun -', showFlags=false) {
 		select = toEl(select);
 		if (!select) {
 			return;
@@ -24,265 +29,21 @@ class Country {
 			if (addNoneValue) {
 				select.insertAdjacentHTML('beforeend', '<option value="">'+noneLabel+'</option>');
 			}
-			Object.entries(null != countriesList ? countriesList : Country.getCountries()).forEach(([countryCode, countryName]) => select.insertAdjacentHTML('beforeend', '<option value="' + countryCode + '">' + countryName + '</option>'));
+			Object.entries(null != countriesList ? countriesList : Country.getCountries()).forEach(([countryCode, countryName]) => {
+				const flag = showFlags ? Country.getFlagEmoji(countryCode) + ' ' : '';
+				select.insertAdjacentHTML('beforeend', '<option value="' + countryCode + '">' + flag + countryName + '</option>');
+			});
 		}
 		if (null != defaultValue) {
 			select.value = defaultValue;
 		}
 	}
-	static getCountryName(countryCode) {
-		if (Country.getCountries().hasOwnProperty(countryCode)) {
-			return Country.getCountries()[countryCode];
-		}
-		return countryCode;
+	static getCountryName(countryCode, locale = 'en') {
+		const name = isoCountries.getName(countryCode, locale);
+		return name || countryCode;
 	}
-	static getCountries() {
-		return {
-			AF:'Afghanistan',
-			AX:'Åland Islands',
-			AL:'Albania',
-			DZ:'Algeria',
-			AS:'American Samoa',
-			AD:'Andorra',
-			AO:'Angola',
-			AI:'Anguilla',
-			AQ:'Antarctica',
-			AG:'Antigua and Barbuda',
-			AR:'Argentina',
-			AM:'Armenia',
-			AW:'Aruba',
-			AU:'Australia',
-			AT:'Austria',
-			AZ:'Azerbaijan',
-			BS:'Bahamas',
-			BH:'Bahrain',
-			BD:'Bangladesh',
-			BB:'Barbados',
-			BY:'Belarus',
-			BE:'Belgium',
-			BZ:'Belize',
-			BJ:'Benin',
-			BM:'Bermuda',
-			BT:'Bhutan',
-			BO:'Bolivia',
-			BA:'Bosnia and Herzegovina',
-			BW:'Botswana',
-			BV:'Bouvet Island',
-			BR:'Brazil',
-			IO:'British Indian Ocean Territory',
-			BN:'Brunei Darussalam',
-			BG:'Bulgaria',
-			BF:'Burkina Faso',
-			BI:'Burundi',
-			KH:'Cambodia',
-			CM:'Cameroon',
-			CA:'Canada',
-			CV:'Cape Verde',
-			KY:'Cayman Islands',
-			CF:'Central African Republic',
-			TD:'Chad',
-			CL:'Chile',
-			CN:'China',
-			CX:'Christmas Island',
-			CC:'Cocos (Keeling) Islands',
-			CO:'Colombia',
-			KM:'Comoros',
-			CG:'Congo',
-			CD:'Congo, The Democratic Republic of The',
-			CK:'Cook Islands',
-			CR:'Costa Rica',
-			CI:'Cote d’Ivoire',
-			HR:'Croatia',
-			CU:'Cuba',
-			CY:'Cyprus',
-			CZ:'Czechia',
-			DK:'Denmark',
-			DJ:'Djibouti',
-			DM:'Dominica',
-			DO:'Dominican Republic',
-			EC:'Ecuador',
-			EG:'Egypt',
-			SV:'El Salvador',
-			GQ:'Equatorial Guinea',
-			ER:'Eritrea',
-			EE:'Estonia',
-			ET:'Ethiopia',
-			FK:'Falkland Islands (Malvinas)',
-			FO:'Faroe Islands',
-			FJ:'Fiji',
-			FI:'Finland',
-			FR:'France',
-			GF:'French Guiana',
-			PF:'French Polynesia',
-			TF:'French Southern Territories',
-			GA:'Gabon',
-			GM:'Gambia',
-			GE:'Georgia',
-			DE:'Germany',
-			GH:'Ghana',
-			GI:'Gibraltar',
-			GR:'Greece',
-			GL:'Greenland',
-			GD:'Grenada',
-			GP:'Guadeloupe',
-			GU:'Guam',
-			GT:'Guatemala',
-			GG:'Guernsey',
-			GN:'Guinea',
-			GW:'Guinea-bissau',
-			GY:'Guyana',
-			HT:'Haiti',
-			HM:'Heard Island and Mcdonald Islands',
-			VA:'Holy See (Vatican City State)',
-			HN:'Honduras',
-			HK:'Hong Kong',
-			HU:'Hungary',
-			IS:'Iceland',
-			IN:'India',
-			ID:'Indonesia',
-			IR:'Iran, Islamic Republic of',
-			IQ:'Iraq',
-			IE:'Ireland',
-			IM:'Isle of Man',
-			IL:'Israel',
-			IT:'Italy',
-			JM:'Jamaica',
-			JP:'Japan',
-			JE:'Jersey',
-			JO:'Jordan',
-			KZ:'Kazakhstan',
-			KE:'Kenya',
-			KI:'Kiribati',
-			KP:'Korea, Democratic People’s Republic of',
-			KR:'Korea, Republic of',
-			KW:'Kuwait',
-			KG:'Kyrgyzstan',
-			LA:'Lao People’s Democratic Republic',
-			LV:'Latvia',
-			LB:'Lebanon',
-			LS:'Lesotho',
-			LR:'Liberia',
-			LY:'Libyan Arab Jamahiriya',
-			LI:'Liechtenstein',
-			LT:'Lithuania',
-			LU:'Luxembourg',
-			MO:'Macao',
-			MK:'Macedonia, The Former Yugoslav Republic of',
-			MG:'Madagascar',
-			MW:'Malawi',
-			MY:'Malaysia',
-			MV:'Maldives',
-			ML:'Mali',
-			MT:'Malta',
-			MH:'Marshall Islands',
-			MQ:'Martinique',
-			MR:'Mauritania',
-			MU:'Mauritius',
-			YT:'Mayotte',
-			MX:'Mexico',
-			FM:'Micronesia, Federated States of',
-			MD:'Moldova, Republic of',
-			MC:'Monaco',
-			MN:'Mongolia',
-			ME:'Montenegro',
-			MS:'Montserrat',
-			MA:'Morocco',
-			MZ:'Mozambique',
-			MM:'Myanmar',
-			NA:'Namibia',
-			NR:'Nauru',
-			NP:'Nepal',
-			NL:'Netherlands',
-			AN:'Netherlands Antilles',
-			NC:'New Caledonia',
-			NZ:'New Zealand',
-			NI:'Nicaragua',
-			NE:'Niger',
-			NG:'Nigeria',
-			NU:'Niue',
-			NF:'Norfolk Island',
-			MP:'Northern Mariana Islands',
-			NO:'Norway',
-			OM:'Oman',
-			PK:'Pakistan',
-			PW:'Palau',
-			PS:'Palestinian Territory, Occupied',
-			PA:'Panama',
-			PG:'Papua New Guinea',
-			PY:'Paraguay',
-			PE:'Peru',
-			PH:'Philippines',
-			PN:'Pitcairn',
-			PL:'Poland',
-			PT:'Portugal',
-			PR:'Puerto Rico',
-			QA:'Qatar',
-			RE:'Reunion',
-			RO:'Romania',
-			RU:'Russian Federation',
-			RW:'Rwanda',
-			SH:'Saint Helena',
-			KN:'Saint Kitts and Nevis',
-			LC:'Saint Lucia',
-			PM:'Saint Pierre and Miquelon',
-			VC:'Saint Vincent and The Grenadines',
-			WS:'Samoa',
-			SM:'San Marino',
-			ST:'Sao Tome and Principe',
-			SA:'Saudi Arabia',
-			SN:'Senegal',
-			RS:'Serbia',
-			SC:'Seychelles',
-			SL:'Sierra Leone',
-			SG:'Singapore',
-			SK:'Slovakia',
-			SI:'Slovenia',
-			SB:'Solomon Islands',
-			SO:'Somalia',
-			ZA:'South Africa',
-			GS:'South Georgia and The South Sandwich Islands',
-			ES:'Spain',
-			LK:'Sri Lanka',
-			SD:'Sudan',
-			SR:'Suriname',
-			SJ:'Svalbard and Jan Mayen',
-			SZ:'Swaziland',
-			SE:'Sweden',
-			CH:'Switzerland',
-			SY:'Syrian Arab Republic',
-			TW:'Taiwan, Province of China',
-			TJ:'Tajikistan',
-			TZ:'Tanzania, United Republic of',
-			TH:'Thailand',
-			TL:'Timor-leste',
-			TG:'Togo',
-			TK:'Tokelau',
-			TO:'Tonga',
-			TT:'Trinidad and Tobago',
-			TN:'Tunisia',
-			TR:'Turkey',
-			TM:'Turkmenistan',
-			TC:'Turks and Caicos Islands',
-			TV:'Tuvalu',
-			UG:'Uganda',
-			UA:'Ukraine',
-			AE:'United Arab Emirates',
-			GB:'United Kingdom',
-			US:'United States',
-			UM:'United States Minor Outlying Islands',
-			UY:'Uruguay',
-			UZ:'Uzbekistan',
-			VU:'Vanuatu',
-			VE:'Venezuela',
-			VN:'Viet Nam',
-			VG:'Virgin Islands, British',
-			VI:'Virgin Islands, U.S.',
-			WF:'Wallis and Futuna',
-			EH:'Western Sahara',
-			YE:'Yemen',
-			ZM:'Zambia',
-			ZW:'Zimbabwe',
-		};
+	static getCountries(locale = 'en') {
+		return isoCountries.getNames(locale);
 	}
 
 	static getContinents() {
@@ -329,7 +90,7 @@ class PostalAddress {
 		return autocomplete;
 	}
 
-	static format(addressData, separator='<br/>') {
+	static format(addressData, separator='<br/>', locale=null) {
 		function empty(value) {
 			return typeof value == 'undefined' || value == null || value === '';
 		}
@@ -365,7 +126,8 @@ class PostalAddress {
 			addressDataForPluging['locality'] = addressData['stateDistrict'];
 		}
 
-		let af = new AddressFmt();
+		const afLocale = locale || (addressDataForPluging['countryCode'] ? `und-${addressDataForPluging['countryCode']}` : null);
+		let af = new AddressFmt(afLocale ? {locale: afLocale} : {});
 		let formattedAddress = af.format(new Address(addressDataForPluging));
 		return formattedAddress.replace(/\n+/g, separator);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.5.26",
+  "version": "1.5.28",
   "main": "main.js",
   "scripts": {
     "test": "jest",
@@ -14,6 +14,7 @@
   "description": "",
   "dependencies": {
     "deepmerge": "^4.3.1",
+    "i18n-iso-countries": "^7.14.0",
     "ilib": "^14.21",
     "libphonenumber-js": "^1.12.39",
     "ua-parser-js": "^2.0.9"

package/tests/location.test.js

@@ -13,7 +13,7 @@ describe('Country', () => {
 		test('should have correct country names', () => {
 			const countries = Country.getCountries();
 			expect(countries.FR).toBe('France');
-			expect(countries.US).toBe('United States');
+			expect(countries.US).toBe('United States of America');
 			expect(countries.GB).toBe('United Kingdom');
 		});
 	});
@@ -21,7 +21,7 @@ describe('Country', () => {
 	describe('getCountryName', () => {
 		test('should return country name for valid code', () => {
 			expect(Country.getCountryName('FR')).toBe('France');
-			expect(Country.getCountryName('US')).toBe('United States');
+			expect(Country.getCountryName('US')).toBe('United States of America');
 			expect(Country.getCountryName('CA')).toBe('Canada');
 		});
 
@@ -79,7 +79,7 @@ describe('Country', () => {
 
 		test('should include country name in title', () => {
 			const html = Country.getFlagImg('US');
-			expect(html).toContain('title="United States"');
+			expect(html).toContain('title="United States of America"');
 		});
 
 		test('should wrap img in span', () => {
@@ -96,6 +96,27 @@ describe('Country', () => {
 			expect(list).toEqual(countries);
 		});
 	});
+
+	describe('getFlagEmoji', () => {
+		test('should return emoji flag for country code', () => {
+			expect(Country.getFlagEmoji('FR')).toBe('🇫🇷');
+			expect(Country.getFlagEmoji('US')).toBe('🇺🇸');
+			expect(Country.getFlagEmoji('GB')).toBe('🇬🇧');
+		});
+		test('should handle lowercase country codes', () => {
+			expect(Country.getFlagEmoji('fr')).toBe('🇫🇷');
+		});
+	});
+
+	describe('getCountries with locale', () => {
+		test('should support locale parameter', () => {
+			const isoCountries = require('i18n-iso-countries');
+			isoCountries.registerLocale(require('i18n-iso-countries/langs/fr.json'));
+			const countriesFr = Country.getCountries('fr');
+			expect(countriesFr.FR).toBe('France');
+			expect(typeof countriesFr.US).toBe('string');
+		});
+	});
 });
 
 describe('GeographicCoordinates', () => {
@@ -706,5 +727,45 @@ describe('PostalAddress', () => {
 			expect(result).toContain('Mountain View');
 			expect(result).toContain('94043');
 		});
+
+		test('should place postalCode before locality for FR (countryCode)', () => {
+			const result = PostalAddress.format({
+				streetAddress: '10 Rue de la Paix',
+				postalCode: '75001',
+				locality: 'Paris',
+				countryCode: 'FR',
+			}, '\n');
+			expect(result.indexOf('75001')).toBeLessThan(result.indexOf('Paris'));
+		});
+
+		test('should place postalCode before locality for FR (locale parameter, no countryCode)', () => {
+			const result = PostalAddress.format({
+				streetAddress: '10 Rue de la Paix',
+				postalCode: '75001',
+				locality: 'Paris',
+			}, '\n', 'fr-FR');
+			expect(result.indexOf('75001')).toBeLessThan(result.indexOf('Paris'));
+		});
+
+		test('should place postalCode before locality for FR (locale parameter and countryCode)', () => {
+			const result = PostalAddress.format({
+				streetAddress: '10 Rue de la Paix',
+				postalCode: '75001',
+				locality: 'Paris',
+				countryCode: 'FR',
+			}, '\n', 'fr-FR');
+			expect(result.indexOf('75001')).toBeLessThan(result.indexOf('Paris'));
+		});
+
+		test('should place postalCode after locality for US', () => {
+			const result = PostalAddress.format({
+				streetAddress: '1600 Amphitheatre Pkwy',
+				postalCode: '94043',
+				locality: 'Mountain View',
+				state: 'CA',
+				countryCode: 'US',
+			}, '\n');
+			expect(result.indexOf('94043')).toBeGreaterThan(result.indexOf('Mountain View'));
+		});
 	});
 });