@osimatic/helpers-js 1.4.23 → 1.4.25

package/.claude/settings.local.json

@@ -0,0 +1,13 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm test)",
+      "Bash(npm test:*)",
+      "Bash(npm run test:coverage:*)",
+      "Bash(npm login)",
+      "Bash(npm publish:*)",
+      "Bash(npm logout:*)",
+      "Bash(node -e:*)",
+    ]
+  }
+}

package/CHANGELOG

@@ -79,4 +79,5 @@ PostalAddress.setAutocomplete(input, onChange(formatted_address)) -> PostalAddre
 
 1.4.0
 new OpenStreetMap(id) -> new OpenStreetMap(element)
-OpenStreetMap.centerOnFrance -> OpenStreetMap.centerMapOnCountry('FR')
+OpenStreetMap.centerOnFrance -> OpenStreetMap.centerMapOnCountry('FR')
+const flagsPath = 'xxx'; -> Country.setFlagsPath('xxx');

package/array.js

@@ -31,7 +31,7 @@ Array.prototype.unique = function() {
 };
 
 Array.prototype.removeEmptyValues = function() {
-	return this.filter(val => val != '');
+	return this.filter(val => val !== '');
 };
 
 Array.prototype.hasOwnIndex = function(prop) {
@@ -64,7 +64,7 @@ Array.generate = ({from = 0, to, step = 1, length = Math.ceil((to - from) / step
 
 Array.getValuesByKeyInArrayOfArrays = function(array, key) {
 	let listeValues = [];
-	for (let i in array) {
+	for (let i = 0; i < array.length; i++) {
 		let subArray = array[i];
 		if (typeof(subArray[key]) != 'undefined') {
 			listeValues.push(subArray[key]);

package/bank.js

@@ -1,14 +1,14 @@
 class IBAN {
 	static format(iban) {
-		return iban.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim();
+		return iban.toUpperCase().replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim();
 	}
 }
 
 class BankCard {
-	static formatCardNumber(cardNumber) {
+	static formatCardNumber(cardNumber, hiddenChar='*') {
 		if (cardNumber.length === 16) {
 			cardNumber = cardNumber.substring(0, 4)+'-'+cardNumber.substring(4, 8)+'-'+cardNumber.substring(8, 12)+'-'+cardNumber.substring(12, 16);
-			cardNumber = cardNumber.replace(/(\*)/gi, 'X');
+			cardNumber = cardNumber.replace(/[*X]/gi, hiddenChar);
 		}
 		return cardNumber;
 	}

package/chartjs.js

@@ -298,7 +298,7 @@ class Chartjs {
 	}
 
 	static getAutoGranularity(data) {
-		const dates = Object.keys(data);
+		const dates = Object.keys(data).sort();
 		const days = (new Date(dates[dates.length - 1]) - new Date(dates[0])) / (1000 * 60 * 60 * 24);
 		if (days > 90) return 'month';
 		if (days > 30) return 'week';

package/contact_details.js

@@ -4,10 +4,10 @@ class PersonName {
 	static format(firstName, lastName) {
 		let str = '';
 		if (firstName != null && firstName !== '') {
-			str += ' '+firstName;
+			str += ' '+firstName.trim();
 		}
 		if (lastName != null && lastName !== '') {
-			str += ' '+lastName;
+			str += ' '+lastName.trim();
 		}
 		return str.trim();
 	}

package/date_time.js

@@ -206,9 +206,7 @@ class DateTime {
 	}
 
 	static getLastDayOfYear(date) {
-		date.setUTCDate(31);
-		date.setUTCMonth(11);
-		return new Date(date);
+		return new Date(Date.UTC(date.getUTCFullYear(), 11, 31));
 	}
 
 	static getFirstDayOfWeekAndYear(year, week) {
@@ -308,7 +306,7 @@ class DatePeriod {
 		return partOfDay === DatePeriod.PART_OF_DAY_MORNING || partOfDay === DatePeriod.PART_OF_DAY_AFTERNOON;
 	}
 
-	static getNbDayBetweenTwo(jsDate1, jsDate2, asPeriod=false, timeZone="Europe/Paris") {
+	static getNbDayBetweenTwo(jsDate1, jsDate2, considerTime=false, timeZone="Europe/Paris", returnDecimal=false) {
 		//jsDate1.set
 		if (jsDate1 == null || jsDate2 == null) {
 			return 0;
@@ -317,7 +315,7 @@ class DatePeriod {
 		let timestamp1 = jsDate1.getTime() / 1000;
 		let timestamp2 = jsDate2.getTime() / 1000;
 
-		if (!asPeriod) {
+		if (!considerTime) {
 			let jsMidnightDate1 = new Date(jsDate1.toLocaleDateString('en-US', {timeZone: timeZone})+' 00:00:00');
 			let jsMidnightDate2 = new Date(jsDate2.toLocaleDateString('en-US', {timeZone: timeZone})+' 00:00:00');
 			timestamp1 = jsMidnightDate1.getTime() / 1000;
@@ -327,7 +325,9 @@ class DatePeriod {
 			//jsDate1.setUTCHours(0, 0, 0);
 			//jsDate2.setUTCHours(0, 0, 0);
 		}
-		return parseInt(Math.round((timestamp2-timestamp1)/86400));
+
+		const daysDiff = (timestamp2-timestamp1)/86400;
+		return returnDecimal ? daysDiff : parseInt(Math.round(daysDiff));
 	}
 
 	static getPeriodLabels(data, period, locale = 'fr-FR', timeZone = 'Europe/Paris') {
@@ -392,23 +392,32 @@ class TimestampUnix {
 	}
 
 	static getYear(timestamp, timeZone="Europe/Paris") {
-		return this.parse(timestamp).toLocaleDateString('fr-FR', {year: 'numeric', timeZone: timeZone});
+		//const sqlDate = this.getSqlDate(timestamp, timeZone);
+		//return parseInt(sqlDate.substring(0, 4));
+		return parseInt(this.parse(timestamp).toLocaleDateString('fr-FR', {year: 'numeric', timeZone: timeZone}));
 	}
 	static getMonth(timestamp, timeZone="Europe/Paris") {
-		return this.parse(timestamp).toLocaleDateString('fr-FR', {month: 'numeric', timeZone: timeZone});
+		//const sqlDate = this.getSqlDate(timestamp, timeZone);
+		//return parseInt(sqlDate.substring(5, 7));
+		return parseInt(this.parse(timestamp).toLocaleDateString('fr-FR', {month: 'numeric', timeZone: timeZone}));
 	}
 	static getDayOfMonth(timestamp, timeZone="Europe/Paris") {
-		return this.parse(timestamp).toLocaleDateString('fr-FR', {day: 'numeric', timeZone: timeZone});
+		//const sqlDate = this.getSqlDate(timestamp, timeZone);
+		//return parseInt(sqlDate.substring(8, 10));
+		return parseInt(this.parse(timestamp).toLocaleDateString('fr-FR', {day: 'numeric', timeZone: timeZone}));
 	}
 
 	static getHour(timestamp, timeZone="Europe/Paris") {
-		return this.parse(timestamp).toLocaleTimeString('en-GB', {hour: 'numeric', timeZone: timeZone});
+		const sqlTime = this.getSqlTime(timestamp, timeZone);
+		return parseInt(sqlTime.substring(0, 2));
 	}
 	static getMinute(timestamp, timeZone="Europe/Paris") {
-		return this.parse(timestamp).toLocaleTimeString('en-GB', {minute: 'numeric', timeZone: timeZone});
+		const sqlTime = this.getSqlTime(timestamp, timeZone);
+		return parseInt(sqlTime.substring(3, 5));
 	}
 	static getSecond(timestamp, timeZone="Europe/Paris") {
-		return this.parse(timestamp).toLocaleTimeString('en-GB', {second: 'numeric', timeZone: timeZone});
+		const sqlTime = this.getSqlTime(timestamp, timeZone);
+		return parseInt(sqlTime.substring(6, 8));
 	}
 
 	static getSqlDateTime(timestamp, timeZone="Europe/Paris") {
@@ -556,18 +565,18 @@ class SqlDateTime {
 		return DateTime.getSqlDateTime(new Date());
 	}
 
-	static getSqlDate(sqlDateTime) {
+	static getSqlDate(sqlDateTime, timeZone="UTC") {
 		if (sqlDateTime == null) {
 			return null;
 		}
-		return DateTime.getSqlDate(this.parse(sqlDateTime));
+		return DateTime.getSqlDate(this.parse(sqlDateTime), timeZone);
 	}
 
-	static getSqlTime(sqlDateTime) {
+	static getSqlTime(sqlDateTime, timeZone="UTC") {
 		if (sqlDateTime == null) {
 			return null;
 		}
-		return DateTime.getSqlTime(this.parse(sqlDateTime));
+		return DateTime.getSqlTime(this.parse(sqlDateTime), timeZone);
 	}
 
 	static parse(sqlDateTime) {

package/draw.js

@@ -1,6 +1,7 @@
 class HexColor {
 	static check(hexColor) {
-		return hexColor.match(/^[0-9a-fA-F]{6}$/).length;
+		const match = hexColor.match(/^[0-9a-fA-F]{6}$/);
+		return match ? match.length > 0 : false;
 	}
 
 	static convertToRgb(hexColor) {
@@ -9,7 +10,7 @@ class HexColor {
 		}
 
 		if (hexColor.length === 3) {
-			hexColor = hexColor+hexColor;
+			hexColor = hexColor[0]+hexColor[0]+hexColor[1]+hexColor[1]+hexColor[2]+hexColor[2];
 		}
 
 		if (!HexColor.check(hexColor)) {

package/duration.js

@@ -72,30 +72,24 @@ class Duration {
 		if (withMinutes) {
 			let nbMinutes = this.getNbMinutesRemainingOfDurationInSeconds(durationInSeconds);
 			strMinute += ' ';
-			//strMinute += sprintf('%02d', nbMinutes);
-			strMinute += nbMinutes.toString().padStart(2, '0');
-			if (withMinuteLabel) {
-				if (fullLabel) {
-					strMinute += ' minute'+(nbMinutes>1?'s':'');
-				}
-				else {
-					strMinute += 'min';
-				}
+			if (fullLabel) {
+				strMinute += nbMinutes.toString()+(withMinuteLabel ? ' minute'+(nbMinutes>1?'s':'') : '');
+			}
+			else {
+				strMinute += nbMinutes.toString().padStart(2, '0')+(withMinuteLabel ? 'min' : '');
 			}
 		}
-		
+
 		// Secondes
 		let strSeconde = '';
 		if (withSeconds) {
 			let nbSecondes = this.getNbSecondsRemainingOfDurationInSeconds(durationInSeconds);
 			strSeconde += ' ';
-			//strSeconde += sprintf('%02d', nbSecondes);
-			strSeconde += nbSecondes.toString().padStart(2, '0');
 			if (fullLabel) {
-				strSeconde += ' seconde'+(nbSecondes>1?'s':'');
+				strSeconde += nbSecondes.toString()+' seconde'+(nbSecondes>1?'s':'');
 			}
 			else {
-				strSeconde += 's';
+				strSeconde += nbSecondes.toString().padStart(2, '0')+'s';
 			}
 		}
 		
@@ -191,7 +185,10 @@ class Duration {
 	}
 
 	static getNbMinutesOfHundredthOfAnHour(durationAsHundredthOfAnHour) {
-		return Math.floor(Math.getDecimals(Number.roundDecimal(durationAsHundredthOfAnHour, 2)) / 100 * 60);
+		// Extraire la partie décimale et convertir en minutes
+		// Ex: 1.5h -> 0.5 * 60 = 30 minutes
+		const decimalPart = durationAsHundredthOfAnHour - Math.floor(durationAsHundredthOfAnHour);
+		return Math.floor(decimalPart * 60);
 	}
 
 

package/event_bus.js

@@ -30,9 +30,9 @@ class EventBus {
 
         if (!!handlers === false) {
             return;
-        } 
+        }
 
-		handlers.splice(handlers.indexOf(handler));
+		handlers.splice(handlers.indexOf(handler), 1);
     }
 }
 

package/file.js

@@ -52,7 +52,7 @@ class File {
 			fileSizeInBytes = fileSizeInBytes / 1024;
 			i++;
 		}
-		while (fileSizeInBytes > 1024);
+		while (fileSizeInBytes >= 1024);
 		//var size = Math.max(fileSizeInBytes, 0.1).toFixed(fractionDigits);
 		let size = Math.max(fileSizeInBytes, 0.1);
 		return (new Intl.NumberFormat(locale, {

package/form_helper.js

@@ -294,7 +294,7 @@ class FormHelper {
 			if (typeof errors[property] == 'function') {
 				continue;
 			}
-			if (typeof errors[property]['error_description'] !== 'undefined') {
+			if (errors[property] != null && typeof errors[property]['error_description'] !== 'undefined') {
 				errorLabels.push(errors[property]['error_description']);
 				continue;
 			}

package/http_client.js

@@ -1,3 +1,5 @@
+const { JwtSession } = require('./jwt');
+const { UrlAndQueryString } = require('./network');
 
 class HTTPClient {
 	static setAuthorizationToken(authorizationToken) {

package/jwt.js

@@ -2,9 +2,15 @@ class JwtToken {
 	static parseJwt (token) {
 		let base64Url = token.split('.')[1];
 		let base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
-		let jsonPayload = decodeURIComponent(atob(base64).split('').map(function(c) {
-			return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-		}).join(''));
+		let jsonPayload;
+		try {
+			jsonPayload = decodeURIComponent(atob(base64).split('').map(function(c) {
+				return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+			}).join(''));
+		} catch (e) {
+			// Fallback for characters that can't be decoded
+			jsonPayload = atob(base64);
+		}
 
 		return JSON.parse(jsonPayload);
 	}
@@ -75,7 +81,9 @@ class JwtSession {
 	static login(data, redirectUrl, onComplete) {
 		console.log('JwtSession.login()');
 		JwtSession.setToken(data['access_token'] || data['token']);
-		JwtSession.setRefreshToken(data['refresh_token']);
+		if (data['refresh_token'] != null) {
+			JwtSession.setRefreshToken(data['refresh_token']);
+		}
 
 		JwtSession.removeItemInStorage('real_users');
 
@@ -191,7 +199,9 @@ class JwtSession {
 
 		// on enregistre la session de l'utilisateur simulé
 		JwtSession.setToken(loginData['access_token'] || loginData['token']);
-		JwtSession.setRefreshToken(loginData['refresh_token']);
+		if (loginData['refresh_token'] != null) {
+			JwtSession.setRefreshToken(loginData['refresh_token']);
+		}
 
 		if (typeof onComplete == 'function') {
 			onComplete();
@@ -216,7 +226,9 @@ class JwtSession {
 		JwtSession.setItemInStorage('real_users', JSON.stringify(realUsers));
 
 		JwtSession.setToken(loginData['access_token'] || loginData['token']);
-		JwtSession.setRefreshToken(loginData['refresh_token']);
+		if (loginData['refresh_token'] != null) {
+			JwtSession.setRefreshToken(loginData['refresh_token']);
+		}
 
 		if (typeof onComplete == 'function') {
 			onComplete();

package/location.js

@@ -1,7 +1,11 @@
 
 class Country {
+	static setFlagsPath(flagsPath) {
+		Country.flagsPath = flagsPath;
+	}
+
 	static getFlagPath(countryCode) {
-		return flagsPath+countryCode.toLowerCase()+'.png';
+		return (typeof Country.flagsPath != 'undefined' ? Country.flagsPath : '/')+countryCode.toLowerCase()+'.png';
 	}
 	static getFlagImg(countryCode) {
 		return '<span><img src="'+Country.getFlagPath(countryCode)+'" alt="" title="'+Country.getCountryName(countryCode)+'" class="flag" /></span>'
@@ -613,7 +617,7 @@ class GeographicCoordinates {
 			return null;
 		}
 
-		return asString ? str.join(',') : [lat, long];
+		return asString ? lat+','+long : [lat, long];
 	}
 
 	static toFixed(latOrLong, fractionDigit=6) {

package/media.js

@@ -137,7 +137,7 @@ class VideoMedia {
 //Source : https://www.npmjs.com/package/mic-check
 class UserMedia {
 	static hasGetUserMedia() {
-		return !!(navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia);
+		return !!(typeof navigator !== 'undefined' && (navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia));
 	}
 
 	/** SystemPermissionDenied => (macOS) browser does not have permission to access cam/mic */

package/number.js

@@ -78,11 +78,10 @@ Number.padLeft2 = Number.padLeft2 || function(n) {
 	return n > 9 ? "" + n : "0" + n;
 }
 
-Number.prototype.roundDecimal = Number.prototype.roundDecimal || function(precision) {
+Number.prototype.roundDecimal = Number.prototype.roundDecimal || function(precision=2) {
 	return Number.roundDecimal(this, precision);
 }
-Number.roundDecimal = Number.roundDecimal || function(number, precision) {
-	precision = precision || 2;
+Number.roundDecimal = Number.roundDecimal || function(number, precision=2) {
 	let tmp = Math.pow(10, precision);
 	return Math.round(number*tmp) / tmp;
 }

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.4.23",
+  "version": "1.4.25",
   "main": "main.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "test:verbose": "jest --verbose"
   },
   "keywords": [],
   "author": "",
@@ -11,5 +14,28 @@
   "description": "",
   "dependencies": {
     "ilib": "^14.16.0"
+  },
+  "devDependencies": {
+    "jest": "^30.2.0",
+    "whatwg-fetch": "^3.6.20"
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "testMatch": [
+      "**/tests/**/*.test.js"
+    ],
+    "collectCoverageFrom": [
+      "*.js",
+      "!main.js",
+      "!index.js",
+      "!node_modules/**",
+      "!tests/**"
+    ],
+    "coverageDirectory": "coverage",
+    "coverageReporters": [
+      "text",
+      "lcov",
+      "html"
+    ]
   }
 }

package/social_network.js

@@ -1,3 +1,5 @@
+require('./string');
+
 class SocialNetwork {
 
 	// ---------- Facebook ----------
@@ -40,6 +42,9 @@ class SocialNetwork {
 		/*
 		<a target="_blank" title="Twitter" href="https://twitter.com/share?url=<?php the_permalink(); ?>&text=<?php the_title(); ?>&via=korben" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=400,width=700');return false;"><img src="http://korben.info/wp-content/themes/korben2013/hab/twitter_icon.png" alt="Twitter" /></a>
 		*/
+		if (typeof text === 'string' && typeof text.escapeHtml === 'function') {
+			text = text.escapeHtml();
+		}
 		return ''
 			+'<a href="https://twitter.com/share" class="twitter-share-button" data-url="'+url+'" data-text="'+text+'" data-lang="'+lang+'" data-hashtags="'+hashtags+'">Tweeter</a>'
 			+'<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>'

package/string.js

@@ -31,7 +31,7 @@ String.prototype.reverseString = String.prototype.reverseString || function() {
 
 String.prototype.truncateOnWord = String.prototype.truncateOnWord || function(limit, fromLeft) {
 	if (fromLeft) {
-		return this.reverseString(this.truncateOnWord(this.reverseString(), limit));
+		return this.reverseString().truncateOnWord(limit, false).reverseString();
 	}
 	let TRIM_CHARS = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u2028\u2029\u3000\uFEFF';
 	let words = this.split(RegExp('(?=['+TRIM_CHARS+'])'));
@@ -62,15 +62,24 @@ String.prototype.truncateString = String.prototype.truncateString || function(le
 	switch(from) {
 		case 'left':
 			str2 = split ? this.truncateOnWord(length, true) : this.slice(this.length - length);
+			if (split) {
+				str2 = str2.trimStart();
+				return ellipsis + ' ' + str2;
+			}
 			return ellipsis + str2;
 		case 'middle':
 			len1 = Math.ceil(length / 2);
 			len2 = Math.floor(length / 2);
 			str1 = split ? this.truncateOnWord(len1) : this.slice(0, len1);
 			str2 = split ? this.truncateOnWord(len2, true) : this.slice(this.length - len2);
-			return str1 + ellipsis + str2;
+			// Enlever les espaces de fin de str1 et de début de str2 pour éviter les doubles espaces
+			return str1.trimEnd() + ' ' + ellipsis + ' ' + str2.trimStart();
 		default:
 			str1 = split ? this.truncateOnWord(length) : this.slice(0, length);
+			if (split) {
+				str1 = str1.trimEnd();
+				return str1 + ' ' + ellipsis;
+			}
 			return str1 + ellipsis;
 	}
 };