@osimatic/helpers-js 1.4.29 → 1.5.1

package/README

@@ -1 +1,2 @@
-npm install @osimatic/helpers-js
+npm install @osimatic/helpers-js
+browserify index.js -o index.bundle.js

package/bank.js

@@ -1,3 +1,5 @@
+const { SqlDateTime } = require('./date_time');
+
 class IBAN {
 	static format(iban) {
 		return iban.toUpperCase().replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim();

package/contact_details.js

@@ -1,4 +1,8 @@
 
+const libphonenumber = require('libphonenumber-js/max');
+const intlTelInput = require('intl-tel-input');
+const { Country } = require('./location');
+
 class PersonName {
 
 	static format(firstName, lastName) {
@@ -48,8 +52,6 @@ class Email {
 }
 
 class TelephoneNumber {
-	//this class works with libphonenumber-max.min.js
-
 	static setLocalCountryCode(countryCode) {
 		TelephoneNumber.localCountryCode = countryCode;
 	}
@@ -172,7 +174,7 @@ class TelephoneNumber {
 		TelephoneNumber.localCountryCode = typeof TelephoneNumber.localCountryCode != 'undefined' ? TelephoneNumber.localCountryCode : null;
 		TelephoneNumber.intlTelInputUtilsPath = typeof TelephoneNumber.intlTelInputUtilsPath != 'undefined' ? TelephoneNumber.intlTelInputUtilsPath : null;
 
-		return window.intlTelInput(input[0], {
+		return intlTelInput(input[0], {
 			initialCountry: null != TelephoneNumber.localCountryCode ? TelephoneNumber.localCountryCode.toLowerCase() : null, // depuis version 19.x, le code pays doit être en minuscule
 			placeholderNumberType: placeholderNumberType || 'FIXED_LINE_OR_MOBILE',
 			utilsScript: TelephoneNumber.intlTelInputUtilsPath
@@ -180,11 +182,11 @@ class TelephoneNumber {
 	}
 
 	static getIntlTelInputInstance(input) {
-		return window.intlTelInput.getInstance(input[0]);
+		return intlTelInput.getInstance(input[0]);
 	}
 
 	static getEnteredNumberInInternationalFormat(intlTelInput) {
-		return intlTelInput.getNumber(window.intlTelInput.utils.numberFormat.E164);
+		return intlTelInput.getNumber(intlTelInput.utils.numberFormat.E164);
 	}
 
 	static formatNumberFromIntlTelInput(intlTelInput) {

package/date_time.js

@@ -1,4 +1,6 @@
 
+require('./string');
+
 class DateTimeFormatter {
 	static getDateDigitalFormatter(locale, timeZone) {
 		this.dateDigitalFormatter = this.dateDigitalFormatter || {};

package/open_street_map.js

@@ -1,3 +1,5 @@
+const L = require('leaflet');
+
 /**
  * https://leafletjs.com/
  * https://switch2osm.org/the-basics/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.4.29",
+  "version": "1.5.1",
   "main": "main.js",
   "scripts": {
     "test": "jest",
@@ -13,7 +13,13 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "ilib": "^14.21"
+    "ilib": "^14.21",
+    "libphonenumber-js": "^1.12.39",
+    "ua-parser-js": "^2.0.9"
+  },
+  "peerDependencies": {
+    "intl-tel-input": ">=19.0",
+    "leaflet": ">=1.9"
   },
   "devDependencies": {
     "jest": "^30.2.0",

package/tests/bank.test.js

@@ -108,50 +108,26 @@ describe('BankCard', () => {
 	});
 
 	describe('formatExpirationDate', () => {
-		// Mock SqlDateTime since it's imported from another module
-		beforeAll(() => {
-			global.SqlDateTime = {
-				getMonthName: jest.fn((date, locale) => {
-					// Mock implementation
-					const d = new Date(date);
-					const month = d.toLocaleString(locale, { month: 'long' });
-					return month.charAt(0).toUpperCase() + month.slice(1);
-				}),
-				getYear: jest.fn((date) => {
-					const d = new Date(date);
-					return d.getFullYear();
-				})
-			};
-		});
-
-		afterAll(() => {
-			delete global.SqlDateTime;
-		});
-
 		test('should format expiration date in French', () => {
-			const date = '2025-12-31';
-			const result = BankCard.formatExpirationDate(date, 'fr-FR');
+			const result = BankCard.formatExpirationDate('2025-12-31', 'fr-FR');
 			expect(result).toContain('2025');
-			expect(SqlDateTime.getMonthName).toHaveBeenCalledWith(date, 'fr-FR');
-			expect(SqlDateTime.getYear).toHaveBeenCalledWith(date);
+			expect(result).toContain('décembre');
 		});
 
 		test('should use default locale fr-FR', () => {
-			const date = '2025-06-15';
-			BankCard.formatExpirationDate(date);
-			expect(SqlDateTime.getMonthName).toHaveBeenCalledWith(date, 'fr-FR');
+			const result = BankCard.formatExpirationDate('2025-06-15');
+			expect(result).toContain('2025');
+			expect(result).toContain('juin');
 		});
 
 		test('should format expiration date in English', () => {
-			const date = '2025-03-20';
-			const result = BankCard.formatExpirationDate(date, 'en-US');
+			const result = BankCard.formatExpirationDate('2025-03-20', 'en-US');
 			expect(result).toContain('2025');
-			expect(SqlDateTime.getMonthName).toHaveBeenCalledWith(date, 'en-US');
+			expect(result).toContain('March');
 		});
 
 		test('should handle different date formats', () => {
-			const date = '2026-01-01';
-			const result = BankCard.formatExpirationDate(date);
+			const result = BankCard.formatExpirationDate('2026-01-01');
 			expect(result).toContain('2026');
 		});
 	});

package/tests/contact_details.test.js

@@ -171,51 +171,6 @@ describe('Email', () => {
 });
 
 describe('TelephoneNumber', () => {
-	// Mock libphonenumber
-	beforeAll(() => {
-		global.libphonenumber = {
-			parsePhoneNumber: jest.fn((phoneNumber, countryCode) => {
-				// Simple mock implementation
-				if (phoneNumber === '+33612345678') {
-					return {
-						country: 'FR',
-						formatNational: () => '06 12 34 56 78',
-						formatInternational: () => '+33 6 12 34 56 78',
-						isValid: () => true,
-						getType: () => 'MOBILE'
-					};
-				}
-				if (phoneNumber === '+14155552671') {
-					return {
-						country: 'US',
-						formatNational: () => '(415) 555-2671',
-						formatInternational: () => '+1 415-555-2671',
-						isValid: () => true,
-						getType: () => 'FIXED_LINE_OR_MOBILE'
-					};
-				}
-				if (phoneNumber === 'invalid') {
-					throw new Error('Invalid phone number');
-				}
-				return null;
-			})
-		};
-
-		global.Country = {
-			getCountryName: jest.fn((code) => {
-				const countries = { FR: 'France', US: 'United States' };
-				return countries[code] || code;
-			}),
-			getFlagImg: jest.fn((code) => {
-				return `<img src="/flags/${code.toLowerCase()}.png" />`;
-			})
-		};
-	});
-
-	afterAll(() => {
-		delete global.libphonenumber;
-		delete global.Country;
-	});
 
 	describe('setLocalCountryCode', () => {
 		test('should set local country code', () => {
@@ -360,22 +315,21 @@ describe('TelephoneNumber', () => {
 		test('should return country name for phone number', () => {
 			const result = TelephoneNumber.getCountryName('+33612345678', 'FR');
 			expect(result).toBe('France');
-			expect(Country.getCountryName).toHaveBeenCalledWith('FR');
 		});
 	});
 
 	describe('getFlagImg', () => {
 		test('should return flag image for phone number', () => {
 			const result = TelephoneNumber.getFlagImg('+33612345678', 'FR');
-			expect(result).toContain('<img src="/flags/fr.png"');
-			expect(Country.getFlagImg).toHaveBeenCalledWith('FR');
+			expect(result).toContain('fr.png');
+			expect(result).toContain('<img');
 		});
 	});
 
 	describe('formatNationalWithFlagImg', () => {
 		test('should format phone number with flag image', () => {
 			const result = TelephoneNumber.formatNationalWithFlagImg('+33612345678', 'FR');
-			expect(result).toContain('<img src="/flags/fr.png"');
+			expect(result).toContain('fr.png');
 			expect(result).toContain('06 12 34 56 78');
 		});
 	});
@@ -383,7 +337,7 @@ describe('TelephoneNumber', () => {
 	describe('formatNationalWithFlagImgAndTelLink', () => {
 		test('should format phone number with flag and tel link', () => {
 			const result = TelephoneNumber.formatNationalWithFlagImgAndTelLink('+33612345678', 'FR');
-			expect(result).toContain('<img src="/flags/fr.png"');
+			expect(result).toContain('fr.png');
 			expect(result).toContain('<a href="tel:+33612345678">');
 			expect(result).toContain('06 12 34 56 78');
 		});

package/tests/date_time/DatePeriod.test.js

@@ -81,13 +81,6 @@ describe('DatePeriod', () => {
 	});
 
 	describe('getPeriodLabels', () => {
-		beforeAll(() => {
-			// Mock capitalize sur String
-			String.prototype.capitalize = function() {
-				return this.charAt(0).toUpperCase() + this.slice(1);
-			};
-		});
-
 		test('should return empty array for empty data', () => {
 			expect(DatePeriod.getPeriodLabels([], 'day')).toEqual([]);
 			expect(DatePeriod.getPeriodLabels(null, 'day')).toEqual([]);

package/tests/visitor.test.js

@@ -244,114 +244,31 @@ describe('UserAgent', () => {
 	});
 
 	describe('getData', () => {
-		test('should return null when UAParser is undefined', () => {
-			expect(UserAgent.getData('some user agent')).toBeNull();
-		});
-
-		test('should parse user agent when UAParser is defined', () => {
-			global.UAParser = jest.fn(() => ({
-				os: { name: 'Windows', version: '10' },
-				browser: { name: 'Chrome', major: '91' },
-				device: { type: 'desktop', vendor: 'Dell', model: 'Inspiron' }
-			}));
-
-			const result = UserAgent.getData('Mozilla/5.0...');
-
-			expect(result).toEqual({
-				os: 'Windows 10',
-				browser: 'Chrome 91',
-				device: 'desktop Dell Inspiron'
-			});
-
-			delete global.UAParser;
+		test('should parse Windows Chrome user agent', () => {
+			const ua = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36';
+			const result = UserAgent.getData(ua);
+			expect(result.os).toBe('Windows 10');
+			expect(result.browser).toBe('Chrome 91');
+			expect(result.device).toBeNull();
 		});
 
 		test('should handle os without version', () => {
-			global.UAParser = jest.fn(() => ({
-				os: { name: 'Linux' },
-				browser: { name: 'Firefox', major: '89' },
-				device: {}
-			}));
-
-			const result = UserAgent.getData('Mozilla/5.0...');
-
+			const ua = 'Mozilla/5.0 (X11; Linux x86_64; rv:89.0) Gecko/20100101 Firefox/89.0';
+			const result = UserAgent.getData(ua);
 			expect(result.os).toBe('Linux');
-
-			delete global.UAParser;
-		});
-
-		test('should handle browser with version instead of major', () => {
-			global.UAParser = jest.fn(() => ({
-				os: { name: 'Windows', version: '10' },
-				browser: { name: 'Safari', version: '14.1.2' },
-				device: {}
-			}));
-
-			const result = UserAgent.getData('Mozilla/5.0...');
-
-			expect(result.browser).toBe('Safari 14.1.2');
-
-			delete global.UAParser;
-		});
-
-		test('should handle device with only type', () => {
-			global.UAParser = jest.fn(() => ({
-				os: { name: 'iOS', version: '14' },
-				browser: { name: 'Safari', major: '14' },
-				device: { type: 'mobile' }
-			}));
-
-			const result = UserAgent.getData('Mozilla/5.0...');
-
-			expect(result.device).toBe('mobile');
-
-			delete global.UAParser;
 		});
 
-		test('should return null for empty os', () => {
-			global.UAParser = jest.fn(() => ({
-				os: { name: '' },
-				browser: { name: 'Chrome', major: '91' },
-				device: {}
-			}));
-
-			const result = UserAgent.getData('Mozilla/5.0...');
-
-			expect(result.os).toBeNull();
-
-			delete global.UAParser;
+		test('should handle mobile device', () => {
+			const ua = 'Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0 Mobile/15E148 Safari/604.1';
+			const result = UserAgent.getData(ua);
+			expect(result.device).toContain('mobile');
+			expect(result.device).toContain('Apple');
+			expect(result.device).toContain('iPhone');
 		});
 
-		test('should return null for empty browser', () => {
-			global.UAParser = jest.fn(() => ({
-				os: { name: 'Windows', version: '10' },
-				browser: { name: '' },
-				device: {}
-			}));
-
-			const result = UserAgent.getData('Mozilla/5.0...');
-
-			expect(result.browser).toBeNull();
-
-			delete global.UAParser;
-		});
-
-		test('should return null when all undefined', () => {
-			global.UAParser = jest.fn(() => ({
-				os: {},
-				browser: {},
-				device: {}
-			}));
-
-			const result = UserAgent.getData('Mozilla/5.0...');
-
-			expect(result).toEqual({
-				os: null,
-				browser: null,
-				device: null
-			});
-
-			delete global.UAParser;
+		test('should return all null for empty user agent', () => {
+			const result = UserAgent.getData('');
+			expect(result).toEqual({ os: null, browser: null, device: null });
 		});
 	});
 

package/visitor.js

@@ -1,3 +1,5 @@
+const { UAParser } = require('ua-parser-js');
+
 class Browser {
 	static isOpera() {
 		return (!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
@@ -36,10 +38,6 @@ class UserAgent {
 	}
 
 	static getData(userAgent) {
-		if (typeof UAParser == 'undefined') {
-			return null;
-		}
-
 		const parsedData = UAParser(userAgent);
 
 		let os = null;