@osimatic/helpers-js 1.5.26 → 1.5.27

package/location.js

@@ -329,7 +329,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 +365,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.27",
   "main": "main.js",
   "scripts": {
     "test": "jest",

package/tests/location.test.js

@@ -706,5 +706,35 @@ 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)', () => {
+			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 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'));
+		});
 	});
 });