@qrvey/utils 1.10.0-timezone-2 → 1.10.1

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

@@ -14,21 +14,21 @@ const mdyDateToDate_1 = require("../adapters/mdyDateToDate");
  * @param time flag to convert the formatted date to miliseconds
  * @returns a Date object, milisecond time or the same value if date format does not match.
  */
-function getDateByDateFormat(date, format, time = false) {
+function getDateByDateFormat(date, format, settings) {
     switch (format) {
         case DATE_FORMAT_1.DATE_FORMAT.YEAR:
-            return (0, yearToDate_1.yearToDate)(date, time);
+            return (0, yearToDate_1.yearToDate)(date, settings);
         case DATE_FORMAT_1.DATE_FORMAT.MONTH:
-            return (0, monthYearToDate_1.monthYearToDate)(date, time);
+            return (0, monthYearToDate_1.monthYearToDate)(date, settings);
         case DATE_FORMAT_1.DATE_FORMAT.QUARTER:
-            return (0, quarterYearToDate_1.quarterYearToDate)(date, time);
+            return (0, quarterYearToDate_1.quarterYearToDate)(date, settings);
         case DATE_FORMAT_1.DATE_FORMAT.WEEK:
-            return (0, weekYearToDate_1.weekYearToDate)(date, time);
+            return (0, weekYearToDate_1.weekYearToDate)(date, settings);
         case DATE_FORMAT_1.DATE_FORMAT.DAY:
         case DATE_FORMAT_1.DATE_FORMAT.HOUR:
         case DATE_FORMAT_1.DATE_FORMAT.MINUTE:
         case DATE_FORMAT_1.DATE_FORMAT.SECOND:
-            return (0, mdyDateToDate_1.mdyDateToDate)(date, time);
+            return (0, mdyDateToDate_1.mdyDateToDate)(date, settings);
         default:
             return date;
     }

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

@@ -1,8 +1,8 @@
-import { IGetDateByTimezoneSettings } from "../interfaces/IGetDateByTimezoneSettings";
+import { IDTimezone } from "../interfaces/IDTimezone";
 /**
  * Gets a date value in the given timezone
  * @param {string} date the date
- * @param {IGetDateByTimezoneSettings} settings The settings of the getDateByTimezone function
+ * @param {IDTimezone} timezone the timezone object
  * @returns {string} A transformed value
  */
-export declare function getDateByTimezone(date: string, settings: IGetDateByTimezoneSettings): string;
+export declare function getDateByTimezone(date: string | number | Date, timezone: IDTimezone): string | number | Date;

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

@@ -2,38 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDateByTimezone = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
-const DATE_GROUPING_TIME_PROPERTY_1 = require("../constants/DATE_GROUPING_TIME_PROPERTY");
-const getDateByDateFormat_1 = require("./getDateByDateFormat");
+const DATE_FORMAT_1 = require("../constants/DATE_FORMAT");
 const getDateByTimezoneOffset_1 = require("./getDateByTimezoneOffset");
-const getDateFormatByProperty_1 = require("./getDateFormatByProperty");
-const getFormattedDateByFormat_1 = require("./getFormattedDateByFormat");
+const getTimezoneObject_1 = require("./getTimezoneObject");
+const isValidPotentialDate_1 = require("./isValidPotentialDate");
+const validateDate_1 = require("./validateDate");
 /**
  * Gets a date value in the given timezone
  * @param {string} date the date
- * @param {IGetDateByTimezoneSettings} settings The settings of the getDateByTimezone function
+ * @param {IDTimezone} timezone the timezone object
  * @returns {string} A transformed value
  */
-function getDateByTimezone(date, settings) {
-    const defaultSettings = getDefaultSettings(settings);
-    const isDateTime = [
-        DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.HOUR,
-        DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.MINUTE,
-        DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.SECOND,
-    ].includes(defaultSettings.property);
-    if (!(0, isEmpty_1.isEmpty)(defaultSettings.timezone.offset) && isDateTime) {
-        const dateFormat = (0, getDateFormatByProperty_1.getDateFormatByProperty)(defaultSettings.property);
-        const formattedDate = (0, getDateByDateFormat_1.getDateByDateFormat)(date, dateFormat);
-        const timezonedDate = (0, getDateByTimezoneOffset_1.getDateByTimezoneOffset)(formattedDate, defaultSettings.timezone.offset);
-        return (0, getFormattedDateByFormat_1.getFormattedDateByFormat)(timezonedDate, dateFormat);
-    }
-    return date;
+function getDateByTimezone(date, timezone) {
+    const defaultTimezone = (0, getTimezoneObject_1.getTimezoneObject)(timezone);
+    if ((0, isEmpty_1.isEmpty)(timezone === null || timezone === void 0 ? void 0 : timezone.offset) ||
+        !(0, isValidPotentialDate_1.isValidPotentialDate)(date) ||
+        (typeof date === "string" && !(0, validateDate_1.validateDate)(date, DATE_FORMAT_1.DATE_FORMAT.SECOND)))
+        return date;
+    return (0, getDateByTimezoneOffset_1.getDateByTimezoneOffset)(date, defaultTimezone.offset);
 }
 exports.getDateByTimezone = getDateByTimezone;
-function getDefaultSettings(settings) {
-    return {
-        property: settings.property,
-        timezone: (settings === null || settings === void 0 ? void 0 : settings.timezone) || {
-            offset: undefined,
-        },
-    };
-}

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

@@ -4,4 +4,4 @@
  * @param date String, object or millisencond number of the date
  * @returns updated Date object
  */
-export declare function getDateByTimezoneOffset(date: string | Date | number, offset?: number | string): Date;
+export declare function getDateByTimezoneOffset(date: string | Date | number, offset?: number | string): string | Date | number;

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

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDateByTimezoneOffset = void 0;
-const isEmpty_1 = require("../../general/mix/isEmpty");
+const dayjs_1 = __importDefault(require("dayjs"));
 const ISOToNumericOffset_1 = require("../adapters/ISOToNumericOffset");
 const DATE_FORMAT_1 = require("../constants/DATE_FORMAT");
 const isValidPotentialDate_1 = require("./isValidPotentialDate");
@@ -14,12 +17,17 @@ const validateDate_1 = require("./validateDate");
  */
 function getDateByTimezoneOffset(date, offset) {
     if (!(0, isValidPotentialDate_1.isValidPotentialDate)(date) ||
-        (typeof date === "string" && !(0, validateDate_1.validateDate)(date, DATE_FORMAT_1.DATE_FORMAT.DAY)))
+        (typeof date === "string" && !(0, validateDate_1.validateDate)(date, DATE_FORMAT_1.DATE_FORMAT.SECOND)))
         return date;
     const dt = new Date(date.valueOf());
-    const newOffset = (0, isEmpty_1.isEmpty)(offset) || offset === "browser"
-        ? dt.getTimezoneOffset()
-        : (0, ISOToNumericOffset_1.ISOToNumericOffset)(offset);
-    return new Date(+dt + newOffset * 1000 * 60);
+    const newOffset = (0, ISOToNumericOffset_1.ISOToNumericOffset)(offset);
+    const timezonedDate = new Date(+dt + newOffset * 1000 * 60);
+    if (typeof date === "string") {
+        return (0, dayjs_1.default)(timezonedDate).format(DATE_FORMAT_1.DATE_FORMAT.SECOND);
+    }
+    else if (typeof date === "number") {
+        return +timezonedDate;
+    }
+    return timezonedDate;
 }
 exports.getDateByTimezoneOffset = getDateByTimezoneOffset;

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

@@ -0,0 +1,7 @@
+import { IDateSettings } from "../interfaces/IDateSettings";
+/**
+ * Gets the default properties for Date Settings object
+ * @param settings the date settings
+ * @returns a new object with the date settings.
+ */
+export declare function getDefaultDateSettings(settings: IDateSettings): IDateSettings;

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultDateSettings = void 0;
+const getTimezoneObject_1 = require("./getTimezoneObject");
+/**
+ * Gets the default properties for Date Settings object
+ * @param settings the date settings
+ * @returns a new object with the date settings.
+ */
+function getDefaultDateSettings(settings) {
+    var _a;
+    return {
+        convertMiliseconds: (_a = settings === null || settings === void 0 ? void 0 : settings.convertMiliseconds) !== null && _a !== void 0 ? _a : false,
+        timezone: (0, getTimezoneObject_1.getTimezoneObject)(settings === null || settings === void 0 ? void 0 : settings.timezone),
+    };
+}
+exports.getDefaultDateSettings = getDefaultDateSettings;

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

@@ -1,4 +1,5 @@
 import { IDateFormat } from "../interfaces/IDateFormat";
+import { IDateSettings } from "../interfaces/IDateSettings";
 /**
  * A Date object, string or millisecond number are gotten in order to convert it in an formatted string date
  * - Some strings are valid
@@ -6,4 +7,4 @@ import { IDateFormat } from "../interfaces/IDateFormat";
  * @param format The date format
  * @returns a formmatted date or the same value if format does not match
  */
-export declare function getFormattedDateByFormat(date: string | Date | number, format: IDateFormat): string | Date | number;
+export declare function getFormattedDateByFormat(date: string | Date | number, format: IDateFormat, settings?: IDateSettings): string | Date | number;

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

@@ -14,22 +14,22 @@ const DATE_FORMAT_1 = require("../constants/DATE_FORMAT");
  * @param format The date format
  * @returns a formmatted date or the same value if format does not match
  */
-function getFormattedDateByFormat(date, format) {
+function getFormattedDateByFormat(date, format, settings) {
     switch (format) {
         case DATE_FORMAT_1.DATE_FORMAT.YEAR:
-            return (0, dateToYear_1.dateToYear)(date);
+            return (0, dateToYear_1.dateToYear)(date, settings);
         case DATE_FORMAT_1.DATE_FORMAT.MONTH:
-            return (0, dateToMonthYear_1.dateToMonthYear)(date);
+            return (0, dateToMonthYear_1.dateToMonthYear)(date, settings);
         case DATE_FORMAT_1.DATE_FORMAT.QUARTER:
-            return (0, dateToQuarterYear_1.dateToQuarterYear)(date);
+            return (0, dateToQuarterYear_1.dateToQuarterYear)(date, settings);
         case DATE_FORMAT_1.DATE_FORMAT.WEEK:
-            return (0, dateToWeekYear_1.dateToWeekYear)(date);
+            return (0, dateToWeekYear_1.dateToWeekYear)(date, settings);
         case DATE_FORMAT_1.DATE_FORMAT.DAY:
-            return (0, dateToMdyDate_1.dateToMdyDate)(date);
+            return (0, dateToMdyDate_1.dateToMdyDate)(date, settings);
         case DATE_FORMAT_1.DATE_FORMAT.HOUR:
         case DATE_FORMAT_1.DATE_FORMAT.MINUTE:
         case DATE_FORMAT_1.DATE_FORMAT.SECOND:
-            return (0, dateToMdyDate_1.dateToMdyDate)(date, true);
+            return (0, dateToMdyDate_1.dateToMdyDate)(date, Object.assign(Object.assign({}, settings), { convertMiliseconds: true }));
         default:
             return date;
     }

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

@@ -1,4 +1,11 @@
 import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IModel } from "../../qrvey/interfaces/IModel";
 import { IDTimezone } from "../interfaces/IDTimezone";
-export declare function getTimezoneObject(timezone: IDTimezone, model: IModel | IDataset): IDTimezone;
+/**
+ * Gets the timezone object by the given argument or the model object
+ * - In any case, the offset is prioritized to override other properties.
+ * @param {IDTimezone} timezone the timezone object
+ * @param {IModel | IDataset} model the info of the dataset (model)
+ * @returns a new timezone object
+ */
+export declare function getTimezoneObject(timezone: IDTimezone, model?: IModel | IDataset): IDTimezone;

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

@@ -2,23 +2,107 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTimezoneObject = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
+const isNaNV2_1 = require("../../general/mix/isNaNV2");
+const TIMEZONE_TYPE_1 = require("../constants/TIMEZONE_TYPE");
+const getTimezoneOffsetByType_1 = require("./getTimezoneOffsetByType");
+const getUTCFormatByOffset_1 = require("./getUTCFormatByOffset");
+const isValidISOOffset_1 = require("./isValidISOOffset");
+/**
+ * Gets the timezone object by the given argument or the model object
+ * - In any case, the offset is prioritized to override other properties.
+ * @param {IDTimezone} timezone the timezone object
+ * @param {IModel | IDataset} model the info of the dataset (model)
+ * @returns a new timezone object
+ */
 function getTimezoneObject(timezone, model) {
-    var _a;
-    let newTimezone = {
-        offset: "+00:00",
+    const offset = getOffset(timezone, model);
+    const type = getType(timezone, model, offset);
+    const resultingOffset = (0, getTimezoneOffsetByType_1.getTimezoneOffsetByType)({ offset, type });
+    const utc = getUTC({ offset: resultingOffset, type });
+    return {
+        offset: resultingOffset,
+        type,
+        utc,
     };
-    if ((0, isEmpty_1.isEmpty)(timezone)) {
-        if (!(0, isEmpty_1.isEmpty)(model)) {
-            newTimezone = {
-                offset: ((_a = model.timezone) === null || _a === void 0 ? void 0 : _a.offset) || newTimezone.offset,
-            };
-        }
+}
+exports.getTimezoneObject = getTimezoneObject;
+/**
+ * Gets the offset of the timezone by the given objects
+ * - Searchs the first argument
+ * - If the timezone is empty, in the model timezone is searched
+ * - If it does not exist in any, a default one is set.
+ * @param {IDTimezone} timezone The timezone object
+ * @param {IModel | IDataset} model The model info
+ * @returns {IDTimezoneOffset} the offset of the objects
+ */
+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 {
-        newTimezone = {
-            offset: (timezone === null || timezone === void 0 ? void 0 : timezone.offset) || newTimezone.offset,
-        };
+        offset = "+00:00";
     }
-    return newTimezone;
+    return offset;
+}
+/**
+ * Gets the type of the timezone
+ * - Searchs the first argument
+ * - If it does not exist, asking for the timezone offset in order to prioritized the offset above all.
+ * - If the timezone is empty, in the model timezone is searched.
+ * - If it does not exist in any, a default one is set.
+ * @param {IDTimezone} timezone The timezone object
+ * @param {IModel | IDataset} model The model info
+ * @param {IDTimezoneOffset} offset a default offset if the validation are not satisfied
+ * @returns {IDTimezoneType} the rigth type of the timezone
+ */
+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)(timezone === null || timezone === void 0 ? void 0 : timezone.offset)) {
+        type = getTypeByOffset(timezone === null || timezone === void 0 ? void 0 : 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.type)) {
+        type = model.timezone.type;
+    }
+    if ((0, isEmpty_1.isEmpty)(type)) {
+        type = getTypeByOffset(offset);
+    }
+    return type;
+}
+/**
+ * Gets the type by a offset
+ * - For a offset=0 the type is default
+ * - For a offset="browser" the type is browser
+ * - For a valid offset different to previous ones, the type is fixed;
+ * - Anything else, it is considered default.
+ * @param {IDTimezoneOffset} offset a given offset
+ * @returns {IDTimezoneType} the right timezone type for the offset
+ */
+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) || !(0, isNaNV2_1.isNaNV2)(offset)) {
+        return TIMEZONE_TYPE_1.TIMEZONE_TYPE.FIXED;
+    }
+    return TIMEZONE_TYPE_1.TIMEZONE_TYPE.DEFAULT;
+}
+/**
+ * Gets the UTC string by the timezone object
+ * @param {IDTimezone} timezone the timezone object
+ * @returns {string} the label of the UTC value
+ */
+function getUTC(timezone) {
+    return (0, getUTCFormatByOffset_1.getUTCFormatByOffset)(timezone);
 }
-exports.getTimezoneObject = getTimezoneObject;

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

@@ -0,0 +1,13 @@
+import { IBTimezone } from "../interfaces/IBTimezone";
+import { IDTimezone } from "../interfaces/IDTimezone";
+import { IDTimezoneOffset } from "../interfaces/IDTimezoneOffset";
+/**
+ * Gets the timezone offset by the timezone type.
+ * For browser types, it is calculated by a Date instance
+ * Default types is UTC-0
+ * Undefined or Fixed types is gotten by the offset property
+ * @param {IDTimezoneType} type the timezone type
+ * @param {IDTimezone | IBTimezone} timezone the timezone object
+ * @returns {IDTimezoneOffset} the offset of the timezone
+ */
+export declare function getTimezoneOffsetByType(timezone: IDTimezone | IBTimezone): IDTimezoneOffset;

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

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTimezoneOffsetByType = void 0;
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const numericOffsetToISO_1 = require("../adapters/numericOffsetToISO");
+const TIMEZONE_TYPE_1 = require("../constants/TIMEZONE_TYPE");
+/**
+ * Gets the timezone offset by the timezone type.
+ * For browser types, it is calculated by a Date instance
+ * Default types is UTC-0
+ * Undefined or Fixed types is gotten by the offset property
+ * @param {IDTimezoneType} type the timezone type
+ * @param {IDTimezone | IBTimezone} timezone the timezone object
+ * @returns {IDTimezoneOffset} the offset of the timezone
+ */
+function getTimezoneOffsetByType(timezone) {
+    if ((0, isEmpty_1.isEmpty)(timezone))
+        return "+00:00";
+    if (timezone.type === TIMEZONE_TYPE_1.TIMEZONE_TYPE.BROWSER) {
+        return (0, numericOffsetToISO_1.numericOffsetToISO)("browser");
+    }
+    else if (timezone.type === TIMEZONE_TYPE_1.TIMEZONE_TYPE.DEFAULT) {
+        return "+00:00";
+    }
+    return timezone.offset || timezone.numericOffset || "+00:00";
+}
+exports.getTimezoneOffsetByType = getTimezoneOffsetByType;

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, minified?: boolean): 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 general_1 = require("../../general");
+const numericOffsetToISO_1 = require("../adapters/numericOffsetToISO");
+/**
+ * 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, minified = false) {
+    const newMinified = !(0, general_1.isEmpty)(minified) && typeof minified === "boolean" ? minified : false;
+    let newOffset = (0, numericOffsetToISO_1.numericOffsetToISO)(timezone === null || timezone === void 0 ? void 0 : timezone.offset, !newMinified);
+    if (newMinified && newOffset.search(":00") > -1) {
+        newOffset = newOffset.slice(0, newOffset.indexOf(":"));
+    }
+    return `UTC${newOffset}`;
+}
+exports.getUTCFormatByOffset = getUTCFormatByOffset;

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

@@ -1,15 +1,18 @@
 export * from "./areIncludedDateTokens";
 export * from "./getDateByDateFormat";
 export * from "./getDateByTimezone";
+export * from "./getDateByTimezoneOffset";
 export * from "./getDateFormatByProperty";
 export * from "./getDateFormatRegularExpressionInArray";
 export * from "./getDatePickerPickLevel";
 export * from "./getDateRange";
+export * from "./getDefaultDateSettings";
 export * from "./getFormattedDateByFormat";
 export * from "./getSeparatorByDateFormat";
 export * from "./getTimezoneObject";
+export * from "./getTimezoneOffsetByType";
+export * from "./getUTCFormatByOffset";
 export * from "./getWeek";
 export * from "./isValidDateObject";
 export * from "./isValidPotentialDate";
-export * from "./getDateByTimezoneOffset";
 export * from "./validateDate";

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

@@ -17,15 +17,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./areIncludedDateTokens"), exports);
 __exportStar(require("./getDateByDateFormat"), exports);
 __exportStar(require("./getDateByTimezone"), exports);
+__exportStar(require("./getDateByTimezoneOffset"), exports);
 __exportStar(require("./getDateFormatByProperty"), exports);
 __exportStar(require("./getDateFormatRegularExpressionInArray"), exports);
 __exportStar(require("./getDatePickerPickLevel"), exports);
 __exportStar(require("./getDateRange"), exports);
+__exportStar(require("./getDefaultDateSettings"), exports);
 __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);
-__exportStar(require("./getDateByTimezoneOffset"), exports);
 __exportStar(require("./validateDate"), exports);

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

@@ -1,5 +1,6 @@
 /**
  * Checks if the given date is allowed to continue the process for adapting dates
+ * - If the string is a token or a combination of tokens is not valid
  * @param {string | Date | number} date String, object or millisencond number of the date
  * @returns true: the date is valid.
  */

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

@@ -2,17 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidPotentialDate = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
-const isTokenLabel_1 = require("../../tokens/isTokenLabel");
+const DATE_FORMATS_1 = require("../constants/DATE_FORMATS");
+const areIncludedDateTokens_1 = require("./areIncludedDateTokens");
 /**
  * Checks if the given date is allowed to continue the process for adapting dates
+ * - If the string is a token or a combination of tokens is not valid
  * @param {string | Date | number} date String, object or millisencond number of the date
  * @returns true: the date is valid.
  */
 function isValidPotentialDate(date) {
     return (!(0, isEmpty_1.isEmpty)(date) &&
-        !(0, isTokenLabel_1.isTokenLabel)(date) &&
-        ((date instanceof Date && !isNaN(date)) ||
-            typeof date === "string" ||
-            typeof date === "number"));
+        !includingDateTokens(date) &&
+        (isDateInstance(date) || isStringDate(date) || typeof date === "number"));
 }
 exports.isValidPotentialDate = isValidPotentialDate;
+function includingDateTokens(date) {
+    return DATE_FORMATS_1.DATE_FORMATS.some((dateFormat) => (0, areIncludedDateTokens_1.areIncludedDateTokens)(date, dateFormat));
+}
+function isDateInstance(date) {
+    return date instanceof Date && !isNaN(date);
+}
+function isStringDate(date) {
+    return (typeof date === "string" && new Date(date).toString() !== "Invalid Date");
+}

package/dist/cjs/dates/interfaces/IBTimezone.d.ts

@@ -0,0 +1,7 @@
+import { IBTimezoneType } from "./IBTimezoneType";
+export interface IBTimezone {
+    numericOffset: number;
+    offset: string;
+    timezoneid?: string;
+    type: IBTimezoneType;
+}

package/dist/cjs/dates/interfaces/IBTimezoneType.d.ts

@@ -0,0 +1,2 @@
+import { TIMEZONE_TYPE } from "../constants/TIMEZONE_TYPE";
+export type IBTimezoneType = TIMEZONE_TYPE;

package/dist/cjs/dates/interfaces/IDFDateToHmsSettings.d.ts

@@ -1,4 +1,5 @@
-export interface IDFDateToHmsSettings {
+import { IDateSettings } from "./IDateSettings";
+export interface IDFDateToHmsSettings extends IDateSettings {
     omitHour?: boolean;
     omitMinute?: boolean;
     omitSecond?: boolean;

package/dist/cjs/dates/interfaces/IDTimezone.d.ts

@@ -1,4 +1,7 @@
 import { IDTimezoneOffset } from "./IDTimezoneOffset";
+import { IDTimezoneType } from "./IDTimezoneType";
 export interface IDTimezone {
     offset: IDTimezoneOffset;
+    type?: IDTimezoneType;
+    utc?: string;
 }

package/dist/cjs/dates/interfaces/IDTimezoneType.d.ts

@@ -0,0 +1,2 @@
+import { IBTimezoneType } from "./IBTimezoneType";
+export type IDTimezoneType = IBTimezoneType;

package/dist/cjs/dates/interfaces/IDTimezoneType.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/dates/interfaces/IDateSettings.d.ts

@@ -0,0 +1,5 @@
+import { IDTimezone } from "./IDTimezone";
+export interface IDateSettings {
+    timezone?: IDTimezone;
+    convertMiliseconds?: boolean;
+}

package/dist/cjs/dates/interfaces/IDateSettings.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,6 +1,9 @@
+export * from "./IBTimezone";
+export * from "./IBTimezoneType";
 export * from "./IDateFormat";
 export * from "./IDateGroupingProperty";
+export * from "./IDateSettings";
 export * from "./IDFDateToHmsSettings";
 export * from "./IDTimezone";
 export * from "./IDTimezoneOffset";
-export * from "./IGetDateByTimezoneSettings";
+export * from "./IDTimezoneType";

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

@@ -14,9 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./IBTimezone"), exports);
+__exportStar(require("./IBTimezoneType"), exports);
 __exportStar(require("./IDateFormat"), exports);
 __exportStar(require("./IDateGroupingProperty"), exports);
+__exportStar(require("./IDateSettings"), exports);
 __exportStar(require("./IDFDateToHmsSettings"), exports);
 __exportStar(require("./IDTimezone"), exports);
 __exportStar(require("./IDTimezoneOffset"), exports);
-__exportStar(require("./IGetDateByTimezoneSettings"), exports);
+__exportStar(require("./IDTimezoneType"), exports);

package/dist/cjs/filters/helpers/backend/buildExpression.js

@@ -16,6 +16,7 @@ function buildExpression(filter) {
     const expression = {
         groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(filter),
         questionid: filter.column.id,
+        questionType: filter.column.type,
         property: (0, getBackendProperty_1.getBackendProperty)(filter),
         validationType: (0, getBackendValidator_1.getBackendValidator)(filter),
         value: (0, getBackendValues_1.getBackendValues)(filter),

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/format.js

@@ -7,9 +7,14 @@ exports.defineFormat = exports.validateColumnType = exports.parseFormulaType = e
 const d3_format_1 = require("d3-format");
 const dayjs_1 = __importDefault(require("dayjs"));
 const definition_1 = require("./definition");
+//* *dayjs plugins */
 const isoWeek_1 = __importDefault(require("dayjs/plugin/isoWeek"));
 const advancedFormat_1 = __importDefault(require("dayjs/plugin/advancedFormat"));
 const utc_1 = __importDefault(require("dayjs/plugin/utc"));
+const weekYear_1 = __importDefault(require("dayjs/plugin/weekYear"));
+const weekOfYear_1 = __importDefault(require("dayjs/plugin/weekOfYear"));
+const updateLocale_1 = __importDefault(require("dayjs/plugin/updateLocale"));
+//* * end dayjs plugin imports */
 const isEmpty_1 = require("../general/mix/isEmpty");
 const get_1 = require("../general/object/get");
 const COLUMN_1 = require("../columns/constants/COLUMN");
@@ -18,9 +23,15 @@ const localization_1 = require("./localization");
 const isObject_1 = require("../general/object/isObject");
 const DURATION_PARTS_LIST_1 = require("../column_format/constants/DURATION_PARTS_LIST");
 const cloneDeep_1 = require("../general/object/cloneDeep");
+dayjs_1.default.extend(updateLocale_1.default);
+dayjs_1.default.updateLocale("en", {
+    yearStart: 4,
+});
 dayjs_1.default.extend(isoWeek_1.default); // Add support for iso week format https://github.com/iamkun/dayjs/issues/1328
 dayjs_1.default.extend(advancedFormat_1.default); // Add support to advanced formats https://day.js.org/docs/en/plugin/advanced-format
 dayjs_1.default.extend(utc_1.default);
+dayjs_1.default.extend(weekYear_1.default);
+dayjs_1.default.extend(weekOfYear_1.default);
 /**
  * Apply to the given date format to a date value
  * @param bytes type number