@osimatic/helpers-js 1.1.3 → 1.1.5

package/date_time.js

@@ -1,59 +1,67 @@
 
 class DateTimeFormatter {
 	static getDateDigitalFormatter(locale, timeZone) {
-		if (this.dateDigitalFormatter == null) {
-			this.dateDigitalFormatter = new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'numeric', day: 'numeric', timeZone: timeZone }); 
+		this.dateDigitalFormatter = this.dateDigitalFormatter || {};
+		if (typeof this.dateDigitalFormatter[timeZone+locale] == 'undefined') {
+			this.dateDigitalFormatter[timeZone+locale] = new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'numeric', day: 'numeric', timeZone: timeZone });
 		}
 
-		return this.dateDigitalFormatter;
+		return this.dateDigitalFormatter[timeZone+locale];
 	}
 
 	static getDateTextFormatter(locale, timeZone) {
-		if (this.dateTextFormatter == null) {
-			this.dateTextFormatter = new Intl.DateTimeFormat(locale, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', timeZone: timeZone });
+		this.dateTextFormatter = this.dateTextFormatter || {};
+		if (typeof this.dateTextFormatter[timeZone+locale] == 'undefined') {
+			this.dateTextFormatter[timeZone+locale] = new Intl.DateTimeFormat(locale, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', timeZone: timeZone });
 		}
 
-		return this.dateTextFormatter;
+		return this.dateTextFormatter[timeZone+locale];
 	}
 
 	static getDateTimeFormatter(locale, timeZone) {
-		if (this.dateTimeFormatter == null) {
-			this.dateTimeFormatter = new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', timeZone: timeZone });
+		this.dateTimeFormatter = this.dateTimeFormatter || {};
+		if (typeof this.dateTimeFormatter[timeZone+locale] == 'undefined') {
+			this.dateTimeFormatter[timeZone+locale] = new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', timeZone: timeZone });
 		}
 
-		return this.dateTimeFormatter;
+		return this.dateTimeFormatter[timeZone+locale];
 	}
 
 	static getDateSqlFormatter(timeZone) {
-		if (this.dateSqlFormatter == null) {
-			this.dateSqlFormatter = new Intl.DateTimeFormat('fr-CA', { year: 'numeric', month: '2-digit', day: '2-digit', timeZone: timeZone });
+		this.dateSqlFormatter = this.dateSqlFormatter || {};
+		if (typeof this.dateSqlFormatter[timeZone] == 'undefined') {
+			this.dateSqlFormatter[timeZone] = new Intl.DateTimeFormat('fr-CA', { year: 'numeric', month: '2-digit', day: '2-digit', timeZone: timeZone });
 		}
 
-		return this.dateSqlFormatter;
+		return this.dateSqlFormatter[timeZone];
 	}
 
 	static getTimeSqlFormatter(timeZone) {
-		if (this.timeSqlFormatter == null) {
-			this.timeSqlFormatter = new Intl.DateTimeFormat('en-GB', { hour: 'numeric', minute: 'numeric', second: 'numeric', hour12: false, timeZone: timeZone }); //hour12: false = 24h format
+		this.timeSqlFormatter = this.timeSqlFormatter || {};
+		if (typeof this.timeSqlFormatter[timeZone] == 'undefined') {
+			console.log('init getTimeSqlFormatter avec timezone', timeZone);
+			this.timeSqlFormatter[timeZone] = new Intl.DateTimeFormat('en-GB', { hour: 'numeric', minute: 'numeric', second: 'numeric', hour12: false, timeZone: timeZone }); //hour12: false = 24h format
 		}
 
-		return this.timeSqlFormatter;
+		return this.timeSqlFormatter[timeZone];
 	}
 
 	static getTimeFormatter(locale, timeZone) {
-		if (this.timeFormatter == null) {
-			this.timeFormatter = new Intl.DateTimeFormat(locale, { hour: 'numeric', minute: 'numeric', timeZone: timeZone });
+		this.timeFormatter = this.timeFormatter || {};
+		if (typeof this.timeFormatter[timeZone+locale] == 'undefined') {
+			this.timeFormatter[timeZone+locale] = new Intl.DateTimeFormat(locale, { hour: 'numeric', minute: 'numeric', timeZone: timeZone });
 		}
 
-		return this.timeFormatter;
+		return this.timeFormatter[timeZone+locale];
 	}
 
 	static getTimeDigitalFormatter(locale, timeZone) {
-		if (this.timeDigitalFormatter == null) {
-			this.timeDigitalFormatter = new Intl.DateTimeFormat(locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', timeZone: timeZone });
+		this.timeDigitalFormatter = this.timeDigitalFormatter || {};
+		if (typeof this.timeDigitalFormatter[timeZone+locale] == 'undefined') {
+			this.timeDigitalFormatter[timeZone+locale] = new Intl.DateTimeFormat(locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', timeZone: timeZone });
 		}
 
-		return this.timeDigitalFormatter;
+		return this.timeDigitalFormatter[timeZone+locale];
 	}
 } 
 

package/http_client.js

@@ -184,8 +184,9 @@ class HTTPClient {
 		let body = null;
 		method = method.toUpperCase();
 
+		let headers = HTTPClient.getHeaders();
 		if ('PATCH' === method) {
-			HTTPClient.setHeader('Content-Type', 'application/x-www-form-urlencoded');
+			headers.append('Content-Type', 'application/x-www-form-urlencoded');
 			body = new URLSearchParams(HTTPClient.formatFormData(data)).toString();
 		}
 		else if ('POST' === method) {
@@ -197,7 +198,7 @@ class HTTPClient {
 		}
 
 		const requestOptions = {
-			headers: HTTPClient.getHeaders(),
+			headers: headers,
 			mode: 'cors',
 			cache: 'no-cache',
 			method,
@@ -223,27 +224,27 @@ class HTTPClient {
 			}
 
 			if (response.ok) {
-				if (typeof successCallback != 'undefined' && successCallback != null) {
+				if (typeof successCallback == 'function') {
 					successCallback(jsonData, response);
 				}
 				return;
 			}
 
-			if (response.status === 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
+			if (response.status === 400 && typeof formErrorCallback == 'function') {
 				formErrorCallback(jsonData, response);
 				return;
 			}
 		}
 		catch (e) {
 			console.error(e);
-			if (typeof errorCallback != 'undefined' && errorCallback != null) {
+			if (typeof errorCallback == 'function') {
 				errorCallback(response);
 			}
 			return;
 		}
 
 		HTTPClient.logRequestFailure(response, jsonData);
-		if (typeof errorCallback != 'undefined' && errorCallback != null) {
+		if (typeof errorCallback == 'function') {
 			errorCallback(response, jsonData);
 		}
 	}
@@ -264,8 +265,9 @@ class HTTPClient {
 		let body = null;
 		method = method.toUpperCase();
 
+		let headers = HTTPClient.getHeaders();
 		if ('PATCH' === method) {
-			HTTPClient.setHeader('Content-Type', 'application/x-www-form-urlencoded');
+			headers.append('Content-Type', 'application/x-www-form-urlencoded');
 			body = new URLSearchParams(HTTPClient.formatFormData(data)).toString();
 		}
 		else if ('POST' === method) {
@@ -278,7 +280,7 @@ class HTTPClient {
 
 		const requestOptions = {
 			method: method,
-			headers: HTTPClient.getHeaders(),
+			headers: headers,
 			body: body,
 			mode: 'cors',
 			cache: 'no-cache'
@@ -298,24 +300,24 @@ class HTTPClient {
 
 			if (response.ok) {
 				const blobData = await response.blob();
-				if (typeof successCallback != 'undefined' && successCallback != null) {
+				if (typeof successCallback == 'function') {
 					successCallback(blobData, response);
 				}
 			}
 			else {
 				HTTPClient.logRequestFailure(response, null);
-				if (typeof errorCallback != 'undefined' && errorCallback != null) {
+				if (typeof errorCallback == 'function') {
 					errorCallback(response);
 				}
 			}
 		}
 		catch (e) {
 			console.error(e);
-			if (typeof errorCallback != 'undefined' && errorCallback != null) {
+			if (typeof errorCallback == 'function') {
 				errorCallback(response);
 			}
 		}
-		if (typeof completeCallback != 'undefined' && completeCallback != null) {
+		if (typeof completeCallback == 'function') {
 			completeCallback(response);
 		}
 	}
@@ -366,7 +368,7 @@ class HTTPClient {
 			},
 			() => {
 				JwtSession.expireSession(HTTPClient.onInvalidRefreshTokenRedirectUrl, HTTPClient.onInvalidRefreshTokenCallback);
-				if (typeof errorCallback != 'undefined' && errorCallback != null) {
+				if (typeof errorCallback == 'function') {
 					errorCallback();
 				}
 			}
@@ -394,7 +396,7 @@ class HTTPClient {
 		xhr.onreadystatechange = function () {
 			if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
 				let data;
-				if (formatRetour == 'xml') {
+				if (formatRetour === 'xml') {
 					data = xhr.responseXML;
 				}
 				else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"