@qrvey/utils 1.10.0-2 → 1.10.0-3

package/dist/cjs/dates/adapters/numericOffsetToISO.d.ts

@@ -3,4 +3,4 @@
  * @param {number} offset the timezone offset
  * @returns {string} the offset in minutes
  */
-export declare function numericOffsetToISO(offset: number | string): string;
+export declare function numericOffsetToISO(offset: number | string, leadZeros?: boolean): string;

package/dist/cjs/dates/adapters/numericOffsetToISO.js

@@ -5,25 +5,30 @@ const isNaNV2_1 = require("../../general/mix/isNaNV2");
 const getSign_1 = require("../../general/numeric/getSign");
 const padLeadingZeros_1 = require("../../general/string/padLeadingZeros");
 const isValidISOOffset_1 = require("../helpers/isValidISOOffset");
+const ISOToNumericOffset_1 = require("./ISOToNumericOffset");
 /**
  * Gets the ISO offset From the numeric offset (minutes)
  * @param {number} offset the timezone offset
  * @returns {string} the offset in minutes
  */
-function numericOffsetToISO(offset) {
+function numericOffsetToISO(offset, leadZeros = true) {
+    const leadZeroNumber = leadZeros ? 2 : 0;
     let newOffset = offset;
-    if (typeof offset === "string" && offset === "browser")
+    if (typeof newOffset === "string" && newOffset === "browser")
         newOffset = -1 * new Date().getTimezoneOffset();
-    if (typeof newOffset === "string" && (0, isValidISOOffset_1.isValidISOOffset)(newOffset))
-        return String(newOffset);
+    if (typeof newOffset === "string" && (0, isValidISOOffset_1.isValidISOOffset)(newOffset)) {
+        if (leadZeros)
+            return String(newOffset);
+        newOffset = (0, ISOToNumericOffset_1.ISOToNumericOffset)(newOffset);
+    }
     if (typeof newOffset !== "number" && (0, isNaNV2_1.isNaNV2)(newOffset))
-        return "+00:00";
+        return leadZeros ? "+00:00" : "+0:0";
     if (typeof newOffset === "string" && !(0, isNaNV2_1.isNaNV2)(newOffset))
         newOffset = +newOffset;
     const sign = (0, getSign_1.getSign)(newOffset);
     newOffset = Math.abs(newOffset);
-    const hours = (0, padLeadingZeros_1.padLeadingZeros)(Math.floor(newOffset / 60), 2);
-    const minutes = (0, padLeadingZeros_1.padLeadingZeros)(newOffset % 60, 2);
+    const hours = (0, padLeadingZeros_1.padLeadingZeros)(Math.floor(newOffset / 60), leadZeroNumber);
+    const minutes = (0, padLeadingZeros_1.padLeadingZeros)(newOffset % 60, leadZeroNumber);
     return `${sign}${hours}:${minutes}`;
 }
 exports.numericOffsetToISO = numericOffsetToISO;

package/dist/cjs/dates/helpers/getTimezoneObject.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTimezoneObject = void 0;
+const isEmpty_1 = require("../../general/mix/isEmpty");
 const TIMEZONE_TYPE_1 = require("../constants/TIMEZONE_TYPE");
 const getTimezoneOffsetByType_1 = require("./getTimezoneOffsetByType");
+const isValidISOOffset_1 = require("./isValidISOOffset");
 /**
  * Gets the timezone object by the given argument or the model object
  * @param {IDTimezone} timezone the timezone object
@@ -10,12 +12,51 @@ const getTimezoneOffsetByType_1 = require("./getTimezoneOffsetByType");
  * @returns a new timezone object
  */
 function getTimezoneObject(timezone, model) {
-    var _a, _b;
-    const offset = (timezone === null || timezone === void 0 ? void 0 : timezone.offset) || ((_a = model === null || model === void 0 ? void 0 : model.timezone) === null || _a === void 0 ? void 0 : _a.offset) || "+00:00";
-    const type = (timezone === null || timezone === void 0 ? void 0 : timezone.type) || ((_b = model === null || model === void 0 ? void 0 : model.timezone) === null || _b === void 0 ? void 0 : _b.type) || TIMEZONE_TYPE_1.TIMEZONE_TYPE.DEFAULT;
+    const offset = getOffset(timezone, model);
+    const type = getType(timezone, model, offset);
     return {
         offset: (0, getTimezoneOffsetByType_1.getTimezoneOffsetByType)({ offset, type }),
         type,
     };
 }
 exports.getTimezoneObject = getTimezoneObject;
+function getOffset(timezone, model) {
+    var _a;
+    let offset;
+    if (!(0, isEmpty_1.isEmpty)(timezone === null || timezone === void 0 ? void 0 : timezone.offset)) {
+        offset = timezone.offset;
+    }
+    else if (!(0, isEmpty_1.isEmpty)((_a = model === null || model === void 0 ? void 0 : model.timezone) === null || _a === void 0 ? void 0 : _a.offset)) {
+        offset = model.timezone.offset;
+    }
+    else {
+        offset = "+00:00";
+    }
+    return offset;
+}
+function getType(timezone, model, offset) {
+    var _a;
+    let type;
+    if (!(0, isEmpty_1.isEmpty)(timezone === null || timezone === void 0 ? void 0 : timezone.type)) {
+        type = timezone.type;
+    }
+    else if (!(0, isEmpty_1.isEmpty)((_a = model === null || model === void 0 ? void 0 : model.timezone) === null || _a === void 0 ? void 0 : _a.type)) {
+        type = model.timezone.type;
+    }
+    if ((0, isEmpty_1.isEmpty)(type)) {
+        type = getTypeByOffset(offset);
+    }
+    return type;
+}
+function getTypeByOffset(offset) {
+    if (offset === "+00:00") {
+        return TIMEZONE_TYPE_1.TIMEZONE_TYPE.DEFAULT;
+    }
+    else if (offset === "browser") {
+        return TIMEZONE_TYPE_1.TIMEZONE_TYPE.BROWSER;
+    }
+    else if ((0, isValidISOOffset_1.isValidISOOffset)(offset)) {
+        return TIMEZONE_TYPE_1.TIMEZONE_TYPE.FIXED;
+    }
+    return TIMEZONE_TYPE_1.TIMEZONE_TYPE.DEFAULT;
+}

package/dist/cjs/dates/helpers/getUTCFormatByOffset.d.ts

@@ -0,0 +1,7 @@
+import { IDTimezone } from "../interfaces/IDTimezone";
+/**
+ * Gets the UTC format dependeing on the given offset
+ * @param {IDTimezone} timezone the timezone object
+ * @returns {string} an string with the UTC format
+ */
+export declare function getUTCFormatByOffset(timezone: IDTimezone): string;

package/dist/cjs/dates/helpers/getUTCFormatByOffset.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUTCFormatByOffset = void 0;
+const numericOffsetToISO_1 = require("../adapters/numericOffsetToISO");
+const getTimezoneObject_1 = require("./getTimezoneObject");
+/**
+ * Gets the UTC format dependeing on the given offset
+ * @param {IDTimezone} timezone the timezone object
+ * @returns {string} an string with the UTC format
+ */
+function getUTCFormatByOffset(timezone) {
+    const newTimezone = (0, getTimezoneObject_1.getTimezoneObject)(timezone, undefined);
+    let newOffset = (0, numericOffsetToISO_1.numericOffsetToISO)(newTimezone === null || newTimezone === void 0 ? void 0 : newTimezone.offset, false);
+    if (newOffset.search(":0") > -1) {
+        newOffset = newOffset.slice(0, newOffset.indexOf(":"));
+    }
+    return `UTC${newOffset}`;
+}
+exports.getUTCFormatByOffset = getUTCFormatByOffset;

package/dist/cjs/dates/helpers/index.d.ts

@@ -10,6 +10,7 @@ export * from "./getFormattedDateByFormat";
 export * from "./getSeparatorByDateFormat";
 export * from "./getTimezoneObject";
 export * from "./getTimezoneOffsetByType";
+export * from "./getUTCFormatByOffset";
 export * from "./getWeek";
 export * from "./isValidDateObject";
 export * from "./isValidPotentialDate";

package/dist/cjs/dates/helpers/index.js

@@ -26,6 +26,7 @@ __exportStar(require("./getFormattedDateByFormat"), exports);
 __exportStar(require("./getSeparatorByDateFormat"), exports);
 __exportStar(require("./getTimezoneObject"), exports);
 __exportStar(require("./getTimezoneOffsetByType"), exports);
+__exportStar(require("./getUTCFormatByOffset"), exports);
 __exportStar(require("./getWeek"), exports);
 __exportStar(require("./isValidDateObject"), exports);
 __exportStar(require("./isValidPotentialDate"), exports);

package/dist/cjs/filters/services/Filters.api.js

@@ -103,7 +103,7 @@ class FiltersApi {
             else {
                 api = this.chartPaginationApi;
             }
-            return api.getChartResult(this.config, FiltersApi.getFilter(config), FiltersApi.getLogic(config), FiltersApi.getChartRequest(config), resetApi);
+            return api.getChartResult(Object.assign(Object.assign({}, this.config), { timezone: config.widgetConfig.timezone }), FiltersApi.getFilter(config), FiltersApi.getLogic(config), FiltersApi.getChartRequest(config), resetApi);
         });
     }
     static getLogic(config) {

package/dist/cjs/format/localization.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatWithLocale = exports.chooseLang = exports.getLang = void 0;
+const dates_1 = require("../dates");
 const isEmpty_1 = require("../general/mix/isEmpty");
 const definition_1 = require("./definition");
 const durationFormatter_1 = require("./duration/durationFormatter");
@@ -29,11 +30,19 @@ const formatWithLocale = (value, outputFormat, config = {}) => {
     }
 };
 exports.formatWithLocale = formatWithLocale;
+function getDateWithOffset(dateValue, offset) {
+    const targetTime = new Date(dateValue);
+    if (!(0, isEmpty_1.isEmpty)(offset))
+        targetTime.setUTCMinutes(targetTime.getUTCMinutes() +
+            targetTime.getTimezoneOffset() +
+            (0, dates_1.ISOToNumericOffset)(offset));
+    return targetTime;
+}
 const DATE_FORMAT_CACHE = [];
 function formatLocaleDate(value, outputFormat, config) {
     const { lang = definition_1.LANG_DEFAULT, options } = config;
     const dateValue = value === null || value === void 0 ? void 0 : value.replace(/Z$/i, "");
-    const dateParam = new Date(dateValue);
+    const dateParam = getDateWithOffset(dateValue, config === null || config === void 0 ? void 0 : config.offset);
     let langOpts = options;
     if (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) {
         if ((0, isDateTimeFormat_1.isDateTimeFormat)(outputFormat))

package/dist/cjs/globalization/labels/formula_builder/I18N_FORMULA_BUILDER.js

@@ -362,7 +362,7 @@ exports.I18N_FORMULA_BUILDER = {
     },
     function_date_add: {
         description: "Given a Date or a Column, add the specific value to the specific part.",
-        function_placeholder: "dateAdd(date, date_part, interval_value)",
+        function_placeholder: "dateAdd(date, 'date_part', interval_value)",
         param_date_name: "date",
         param_date_description: "This is the Date or Column to which you want to add.",
         param_part_name: "date_part",
@@ -372,7 +372,7 @@ exports.I18N_FORMULA_BUILDER = {
     },
     function_date_subtract: {
         description: "Given a Date or a Column, subtract the specific value to the specific part.",
-        function_placeholder: "dateSubtract(date, date_part, interval_value)",
+        function_placeholder: "dateSubtract(date, 'date_part', interval_value)",
         param_date_name: "date",
         param_date_description: "This is the Date or Column to which you want to subtract.",
         param_part_name: "date_part",
@@ -382,7 +382,7 @@ exports.I18N_FORMULA_BUILDER = {
     },
     function_date_diff: {
         description: "Calculates the difference between two dates based on the date part requested.",
-        function_placeholder: "dateDiff(date_value1, date_value2, date_part)",
+        function_placeholder: "dateDiff(date_value1, date_value2, 'date_part')",
         param_date_value_one_name: "date_value1",
         param_date_value_one_description: "The first date value.",
         param_date_value_two_name: "date_value2",

package/dist/cjs/interfaces/format/IFormatConfig.Interface.d.ts

@@ -1,6 +1,6 @@
 export interface IFormatConfig {
     lang?: string;
-    offset?: number;
+    offset?: number | string;
     options?: object;
     isMultiplied?: boolean;
 }

package/dist/dates/adapters/numericOffsetToISO.d.ts

@@ -3,4 +3,4 @@
  * @param {number} offset the timezone offset
  * @returns {string} the offset in minutes
  */
-export declare function numericOffsetToISO(offset: number | string): string;
+export declare function numericOffsetToISO(offset: number | string, leadZeros?: boolean): string;

package/dist/dates/adapters/numericOffsetToISO.js

@@ -2,24 +2,29 @@ import { isNaNV2 } from "../../general/mix/isNaNV2";
 import { getSign } from "../../general/numeric/getSign";
 import { padLeadingZeros } from "../../general/string/padLeadingZeros";
 import { isValidISOOffset } from "../helpers/isValidISOOffset";
+import { ISOToNumericOffset } from "./ISOToNumericOffset";
 /**
  * Gets the ISO offset From the numeric offset (minutes)
  * @param {number} offset the timezone offset
  * @returns {string} the offset in minutes
  */
-export function numericOffsetToISO(offset) {
+export function numericOffsetToISO(offset, leadZeros = true) {
+    const leadZeroNumber = leadZeros ? 2 : 0;
     let newOffset = offset;
-    if (typeof offset === "string" && offset === "browser")
+    if (typeof newOffset === "string" && newOffset === "browser")
         newOffset = -1 * new Date().getTimezoneOffset();
-    if (typeof newOffset === "string" && isValidISOOffset(newOffset))
-        return String(newOffset);
+    if (typeof newOffset === "string" && isValidISOOffset(newOffset)) {
+        if (leadZeros)
+            return String(newOffset);
+        newOffset = ISOToNumericOffset(newOffset);
+    }
     if (typeof newOffset !== "number" && isNaNV2(newOffset))
-        return "+00:00";
+        return leadZeros ? "+00:00" : "+0:0";
     if (typeof newOffset === "string" && !isNaNV2(newOffset))
         newOffset = +newOffset;
     const sign = getSign(newOffset);
     newOffset = Math.abs(newOffset);
-    const hours = padLeadingZeros(Math.floor(newOffset / 60), 2);
-    const minutes = padLeadingZeros(newOffset % 60, 2);
+    const hours = padLeadingZeros(Math.floor(newOffset / 60), leadZeroNumber);
+    const minutes = padLeadingZeros(newOffset % 60, leadZeroNumber);
     return `${sign}${hours}:${minutes}`;
 }

package/dist/dates/helpers/getTimezoneObject.js

@@ -1,5 +1,7 @@
+import { isEmpty } from "../../general/mix/isEmpty";
 import { TIMEZONE_TYPE } from "../constants/TIMEZONE_TYPE";
 import { getTimezoneOffsetByType } from "./getTimezoneOffsetByType";
+import { isValidISOOffset } from "./isValidISOOffset";
 /**
  * Gets the timezone object by the given argument or the model object
  * @param {IDTimezone} timezone the timezone object
@@ -7,11 +9,50 @@ import { getTimezoneOffsetByType } from "./getTimezoneOffsetByType";
  * @returns a new timezone object
  */
 export function getTimezoneObject(timezone, model) {
-    var _a, _b;
-    const offset = (timezone === null || timezone === void 0 ? void 0 : timezone.offset) || ((_a = model === null || model === void 0 ? void 0 : model.timezone) === null || _a === void 0 ? void 0 : _a.offset) || "+00:00";
-    const type = (timezone === null || timezone === void 0 ? void 0 : timezone.type) || ((_b = model === null || model === void 0 ? void 0 : model.timezone) === null || _b === void 0 ? void 0 : _b.type) || TIMEZONE_TYPE.DEFAULT;
+    const offset = getOffset(timezone, model);
+    const type = getType(timezone, model, offset);
     return {
         offset: getTimezoneOffsetByType({ offset, type }),
         type,
     };
 }
+function getOffset(timezone, model) {
+    var _a;
+    let offset;
+    if (!isEmpty(timezone === null || timezone === void 0 ? void 0 : timezone.offset)) {
+        offset = timezone.offset;
+    }
+    else if (!isEmpty((_a = model === null || model === void 0 ? void 0 : model.timezone) === null || _a === void 0 ? void 0 : _a.offset)) {
+        offset = model.timezone.offset;
+    }
+    else {
+        offset = "+00:00";
+    }
+    return offset;
+}
+function getType(timezone, model, offset) {
+    var _a;
+    let type;
+    if (!isEmpty(timezone === null || timezone === void 0 ? void 0 : timezone.type)) {
+        type = timezone.type;
+    }
+    else if (!isEmpty((_a = model === null || model === void 0 ? void 0 : model.timezone) === null || _a === void 0 ? void 0 : _a.type)) {
+        type = model.timezone.type;
+    }
+    if (isEmpty(type)) {
+        type = getTypeByOffset(offset);
+    }
+    return type;
+}
+function getTypeByOffset(offset) {
+    if (offset === "+00:00") {
+        return TIMEZONE_TYPE.DEFAULT;
+    }
+    else if (offset === "browser") {
+        return TIMEZONE_TYPE.BROWSER;
+    }
+    else if (isValidISOOffset(offset)) {
+        return TIMEZONE_TYPE.FIXED;
+    }
+    return TIMEZONE_TYPE.DEFAULT;
+}

package/dist/dates/helpers/getUTCFormatByOffset.d.ts

@@ -0,0 +1,7 @@
+import { IDTimezone } from "../interfaces/IDTimezone";
+/**
+ * Gets the UTC format dependeing on the given offset
+ * @param {IDTimezone} timezone the timezone object
+ * @returns {string} an string with the UTC format
+ */
+export declare function getUTCFormatByOffset(timezone: IDTimezone): string;

package/dist/dates/helpers/getUTCFormatByOffset.js

@@ -0,0 +1,15 @@
+import { numericOffsetToISO } from "../adapters/numericOffsetToISO";
+import { getTimezoneObject } from "./getTimezoneObject";
+/**
+ * Gets the UTC format dependeing on the given offset
+ * @param {IDTimezone} timezone the timezone object
+ * @returns {string} an string with the UTC format
+ */
+export function getUTCFormatByOffset(timezone) {
+    const newTimezone = getTimezoneObject(timezone, undefined);
+    let newOffset = numericOffsetToISO(newTimezone === null || newTimezone === void 0 ? void 0 : newTimezone.offset, false);
+    if (newOffset.search(":0") > -1) {
+        newOffset = newOffset.slice(0, newOffset.indexOf(":"));
+    }
+    return `UTC${newOffset}`;
+}

package/dist/dates/helpers/index.d.ts

@@ -10,6 +10,7 @@ export * from "./getFormattedDateByFormat";
 export * from "./getSeparatorByDateFormat";
 export * from "./getTimezoneObject";
 export * from "./getTimezoneOffsetByType";
+export * from "./getUTCFormatByOffset";
 export * from "./getWeek";
 export * from "./isValidDateObject";
 export * from "./isValidPotentialDate";

package/dist/dates/helpers/index.js

@@ -10,6 +10,7 @@ export * from "./getFormattedDateByFormat";
 export * from "./getSeparatorByDateFormat";
 export * from "./getTimezoneObject";
 export * from "./getTimezoneOffsetByType";
+export * from "./getUTCFormatByOffset";
 export * from "./getWeek";
 export * from "./isValidDateObject";
 export * from "./isValidPotentialDate";

package/dist/filters/services/Filters.api.js

@@ -97,7 +97,7 @@ export class FiltersApi {
             else {
                 api = this.chartPaginationApi;
             }
-            return api.getChartResult(this.config, FiltersApi.getFilter(config), FiltersApi.getLogic(config), FiltersApi.getChartRequest(config), resetApi);
+            return api.getChartResult(Object.assign(Object.assign({}, this.config), { timezone: config.widgetConfig.timezone }), FiltersApi.getFilter(config), FiltersApi.getLogic(config), FiltersApi.getChartRequest(config), resetApi);
         });
     }
     static getLogic(config) {

package/dist/format/localization.js

@@ -1,3 +1,4 @@
+import { ISOToNumericOffset } from "../dates";
 import { isEmpty } from "../general/mix/isEmpty";
 import { currencyISO, LANG_DEFAULT, CURRENCY_DEFAULT, DATETIME_OPTIONS, } from "./definition";
 import { DurationFormatter } from "./duration/durationFormatter";
@@ -23,11 +24,19 @@ export const formatWithLocale = (value, outputFormat, config = {}) => {
             return formatLocaleNumber(value, outputFormat, config);
     }
 };
+function getDateWithOffset(dateValue, offset) {
+    const targetTime = new Date(dateValue);
+    if (!isEmpty(offset))
+        targetTime.setUTCMinutes(targetTime.getUTCMinutes() +
+            targetTime.getTimezoneOffset() +
+            ISOToNumericOffset(offset));
+    return targetTime;
+}
 const DATE_FORMAT_CACHE = [];
 function formatLocaleDate(value, outputFormat, config) {
     const { lang = LANG_DEFAULT, options } = config;
     const dateValue = value === null || value === void 0 ? void 0 : value.replace(/Z$/i, "");
-    const dateParam = new Date(dateValue);
+    const dateParam = getDateWithOffset(dateValue, config === null || config === void 0 ? void 0 : config.offset);
     let langOpts = options;
     if (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) {
         if (isDateTimeFormat(outputFormat))

package/dist/globalization/labels/formula_builder/I18N_FORMULA_BUILDER.js

@@ -359,7 +359,7 @@ export const I18N_FORMULA_BUILDER = {
     },
     function_date_add: {
         description: "Given a Date or a Column, add the specific value to the specific part.",
-        function_placeholder: "dateAdd(date, date_part, interval_value)",
+        function_placeholder: "dateAdd(date, 'date_part', interval_value)",
         param_date_name: "date",
         param_date_description: "This is the Date or Column to which you want to add.",
         param_part_name: "date_part",
@@ -369,7 +369,7 @@ export const I18N_FORMULA_BUILDER = {
     },
     function_date_subtract: {
         description: "Given a Date or a Column, subtract the specific value to the specific part.",
-        function_placeholder: "dateSubtract(date, date_part, interval_value)",
+        function_placeholder: "dateSubtract(date, 'date_part', interval_value)",
         param_date_name: "date",
         param_date_description: "This is the Date or Column to which you want to subtract.",
         param_part_name: "date_part",
@@ -379,7 +379,7 @@ export const I18N_FORMULA_BUILDER = {
     },
     function_date_diff: {
         description: "Calculates the difference between two dates based on the date part requested.",
-        function_placeholder: "dateDiff(date_value1, date_value2, date_part)",
+        function_placeholder: "dateDiff(date_value1, date_value2, 'date_part')",
         param_date_value_one_name: "date_value1",
         param_date_value_one_description: "The first date value.",
         param_date_value_two_name: "date_value2",

package/dist/interfaces/format/IFormatConfig.Interface.d.ts

@@ -1,6 +1,6 @@
 export interface IFormatConfig {
     lang?: string;
-    offset?: number;
+    offset?: number | string;
     options?: object;
     isMultiplied?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.10.0-2",
+  "version": "1.10.0-3",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",