@qrvey/utils 1.10.0-7 → 1.10.0-9

package/dist/dates/adapters/weekYearToDate.js

@@ -1,6 +1,8 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { isTokenLabel } from "../../tokens/isTokenLabel";
 import { DATE_FORMAT } from "../constants/DATE_FORMAT";
+import { getDateByTimezone } from "../helpers/getDateByTimezone";
+import { getDefaultDateSettings } from "../helpers/getDefaultDateSettings";
 import { getWeek } from "../helpers/getWeek";
 import { validateDate } from "../helpers/validateDate";
 /**
@@ -9,20 +11,22 @@ import { validateDate } from "../helpers/validateDate";
  * @param time Flag to parse the object date to milliseconds.
  * @returns The date object or the date in milliseconds. If the argument is an unexpected date, the function will return the same value.
  */
-export function weekYearToDate(weekYear, time = false) {
+export function weekYearToDate(weekYear, settings) {
     if (isEmpty(weekYear) ||
         isTokenLabel(weekYear) ||
         typeof weekYear !== "string" ||
         !validateDate(weekYear, DATE_FORMAT.WEEK))
         return weekYear;
+    const defaultSettings = getDefaultDateSettings(settings);
     const [week, year] = weekYear.split(" ");
     const weekNumber = Number(week.substring(1));
     const dateObj = new Date(+year, 1, 1);
-    const numOfdaysPastSinceLastSunday = dateObj.getDay();
-    dateObj.setDate(dateObj.getDate() - numOfdaysPastSinceLastSunday);
+    const numOfdaysPastSinceLastSunday = dateObj.getUTCDay();
+    dateObj.setDate(dateObj.getUTCDate() - numOfdaysPastSinceLastSunday);
     const weekNoToday = getWeek(dateObj).week;
     const weeksInTheFuture = weekNumber - weekNoToday;
-    dateObj.setDate(dateObj.getDate() + 7 * weeksInTheFuture);
-    const date = new Date(`${dateObj.getMonth() + 1}/${dateObj.getDate()}/${dateObj.getFullYear()}`);
-    return time ? +date : date;
+    dateObj.setDate(dateObj.getUTCDate() + 7 * weeksInTheFuture);
+    const date = new Date(`${dateObj.getUTCMonth() + 1}/${dateObj.getUTCDate()}/${dateObj.getUTCFullYear()}`);
+    const timezonedDate = getDateByTimezone(date, defaultSettings.timezone);
+    return (defaultSettings === null || defaultSettings === void 0 ? void 0 : defaultSettings.convertMiliseconds) ? +timezonedDate : timezonedDate;
 }

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

@@ -1,7 +1,8 @@
+import { IDateSettings } from "../interfaces/IDateSettings";
 /**
  * Transforms String Date from a [Year] format to Date object.
  * @param yearDate String of [Year] date
  * @param time Flag to parse the object date to milliseconds.
  * @returns The date object or the date in milliseconds. If the argument is an unexpected date, the function will return the same value.
  */
-export declare function yearToDate(yearDate: string, time?: boolean): string | Date | number;
+export declare function yearToDate(yearDate: string, settings?: IDateSettings): string | Date | number;

package/dist/dates/adapters/yearToDate.js

@@ -1,6 +1,8 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { isTokenLabel } from "../../tokens/isTokenLabel";
 import { DATE_FORMAT } from "../constants/DATE_FORMAT";
+import { getDateByTimezone } from "../helpers/getDateByTimezone";
+import { getDefaultDateSettings } from "../helpers/getDefaultDateSettings";
 import { validateDate } from "../helpers/validateDate";
 /**
  * Transforms String Date from a [Year] format to Date object.
@@ -8,12 +10,14 @@ import { validateDate } from "../helpers/validateDate";
  * @param time Flag to parse the object date to milliseconds.
  * @returns The date object or the date in milliseconds. If the argument is an unexpected date, the function will return the same value.
  */
-export function yearToDate(yearDate, time = false) {
+export function yearToDate(yearDate, settings) {
     if (isEmpty(yearDate) ||
         isTokenLabel(yearDate) ||
         typeof yearDate !== "string" ||
         !validateDate(yearDate, DATE_FORMAT.YEAR))
         return yearDate;
+    const defaultSettings = getDefaultDateSettings(settings);
     const start = new Date(+yearDate, 0, 1);
-    return time ? +start : start;
+    const timezonedDate = getDateByTimezone(start, defaultSettings.timezone);
+    return (defaultSettings === null || defaultSettings === void 0 ? void 0 : defaultSettings.convertMiliseconds) ? +timezonedDate : timezonedDate;
 }

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

@@ -1,4 +1,5 @@
 import { IDateFormat } from "../interfaces/IDateFormat";
+import { IDateSettings } from "../interfaces/IDateSettings";
 /**
  * Gets a Date Object instance by a Date format
  * @param date String with a formatted date
@@ -6,4 +7,4 @@ import { IDateFormat } from "../interfaces/IDateFormat";
  * @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.
  */
-export declare function getDateByDateFormat(date: string, format: IDateFormat, time?: boolean): string | Date | number;
+export declare function getDateByDateFormat(date: string, format: IDateFormat, settings?: IDateSettings): string | Date | number;

package/dist/dates/helpers/getDateByDateFormat.js

@@ -11,21 +11,21 @@ import { mdyDateToDate } from "../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.
  */
-export function getDateByDateFormat(date, format, time = false) {
+export function getDateByDateFormat(date, format, settings) {
     switch (format) {
         case DATE_FORMAT.YEAR:
-            return yearToDate(date, time);
+            return yearToDate(date, settings);
         case DATE_FORMAT.MONTH:
-            return monthYearToDate(date, time);
+            return monthYearToDate(date, settings);
         case DATE_FORMAT.QUARTER:
-            return quarterYearToDate(date, time);
+            return quarterYearToDate(date, settings);
         case DATE_FORMAT.WEEK:
-            return weekYearToDate(date, time);
+            return weekYearToDate(date, settings);
         case DATE_FORMAT.DAY:
         case DATE_FORMAT.HOUR:
         case DATE_FORMAT.MINUTE:
         case DATE_FORMAT.SECOND:
-            return mdyDateToDate(date, time);
+            return mdyDateToDate(date, settings);
         default:
             return date;
     }

package/dist/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/dates/helpers/getDateByTimezone.js

@@ -1,37 +1,20 @@
 import { isEmpty } from "../../general/mix/isEmpty";
-import { DATE_GROUPING_TIME_PROPERTY } from "../constants/DATE_GROUPING_TIME_PROPERTY";
-import { TIMEZONE_TYPE } from "../constants/TIMEZONE_TYPE";
-import { getDateByDateFormat } from "./getDateByDateFormat";
+import { DATE_FORMAT } from "../constants/DATE_FORMAT";
 import { getDateByTimezoneOffset } from "./getDateByTimezoneOffset";
-import { getDateFormatByProperty } from "./getDateFormatByProperty";
-import { getFormattedDateByFormat } from "./getFormattedDateByFormat";
+import { getTimezoneObject } from "./getTimezoneObject";
+import { isValidPotentialDate } from "./isValidPotentialDate";
+import { validateDate } from "./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
  */
-export function getDateByTimezone(date, settings) {
-    const defaultSettings = getDefaultSettings(settings);
-    const isDateTime = [
-        DATE_GROUPING_TIME_PROPERTY.HOUR,
-        DATE_GROUPING_TIME_PROPERTY.MINUTE,
-        DATE_GROUPING_TIME_PROPERTY.SECOND,
-    ].includes(defaultSettings.property);
-    if (!isEmpty(defaultSettings.timezone.offset) && isDateTime) {
-        const dateFormat = getDateFormatByProperty(defaultSettings.property);
-        const formattedDate = getDateByDateFormat(date, dateFormat);
-        const timezonedDate = getDateByTimezoneOffset(formattedDate, defaultSettings.timezone.offset);
-        return getFormattedDateByFormat(timezonedDate, dateFormat);
-    }
-    return date;
-}
-function getDefaultSettings(settings) {
-    return {
-        property: settings.property,
-        timezone: (settings === null || settings === void 0 ? void 0 : settings.timezone) || {
-            offset: undefined,
-            type: TIMEZONE_TYPE.DEFAULT,
-        },
-    };
+export function getDateByTimezone(date, timezone) {
+    const defaultTimezone = getTimezoneObject(timezone);
+    if (isEmpty(timezone === null || timezone === void 0 ? void 0 : timezone.offset) ||
+        !isValidPotentialDate(date) ||
+        (typeof date === "string" && !validateDate(date, DATE_FORMAT.SECOND)))
+        return date;
+    return getDateByTimezoneOffset(date, defaultTimezone.offset);
 }

package/dist/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/dates/helpers/getDateByTimezoneOffset.js

@@ -1,3 +1,4 @@
+import dayjs from "dayjs";
 import { ISOToNumericOffset } from "../adapters/ISOToNumericOffset";
 import { DATE_FORMAT } from "../constants/DATE_FORMAT";
 import { isValidPotentialDate } from "./isValidPotentialDate";
@@ -10,9 +11,16 @@ import { validateDate } from "./validateDate";
  */
 export function getDateByTimezoneOffset(date, offset) {
     if (!isValidPotentialDate(date) ||
-        (typeof date === "string" && !validateDate(date, DATE_FORMAT.DAY)))
+        (typeof date === "string" && !validateDate(date, DATE_FORMAT.SECOND)))
         return date;
     const dt = new Date(date.valueOf());
     const newOffset = ISOToNumericOffset(offset);
-    return new Date(+dt + newOffset * 1000 * 60);
+    const timezonedDate = new Date(+dt + newOffset * 1000 * 60);
+    if (typeof date === "string") {
+        return dayjs(timezonedDate).format(DATE_FORMAT.SECOND);
+    }
+    else if (typeof date === "number") {
+        return +timezonedDate;
+    }
+    return timezonedDate;
 }

package/dist/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/dates/helpers/getDefaultDateSettings.js

@@ -0,0 +1,13 @@
+import { getTimezoneObject } from "./getTimezoneObject";
+/**
+ * Gets the default properties for Date Settings object
+ * @param settings the date settings
+ * @returns a new object with the date settings.
+ */
+export function getDefaultDateSettings(settings) {
+    var _a;
+    return {
+        convertMiliseconds: (_a = settings === null || settings === void 0 ? void 0 : settings.convertMiliseconds) !== null && _a !== void 0 ? _a : false,
+        timezone: getTimezoneObject(settings === null || settings === void 0 ? void 0 : settings.timezone),
+    };
+}

package/dist/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/dates/helpers/getFormattedDateByFormat.js

@@ -11,22 +11,22 @@ import { DATE_FORMAT } from "../constants/DATE_FORMAT";
  * @param format The date format
  * @returns a formmatted date or the same value if format does not match
  */
-export function getFormattedDateByFormat(date, format) {
+export function getFormattedDateByFormat(date, format, settings) {
     switch (format) {
         case DATE_FORMAT.YEAR:
-            return dateToYear(date);
+            return dateToYear(date, settings);
         case DATE_FORMAT.MONTH:
-            return dateToMonthYear(date);
+            return dateToMonthYear(date, settings);
         case DATE_FORMAT.QUARTER:
-            return dateToQuarterYear(date);
+            return dateToQuarterYear(date, settings);
         case DATE_FORMAT.WEEK:
-            return dateToWeekYear(date);
+            return dateToWeekYear(date, settings);
         case DATE_FORMAT.DAY:
-            return dateToMdyDate(date);
+            return dateToMdyDate(date, settings);
         case DATE_FORMAT.HOUR:
         case DATE_FORMAT.MINUTE:
         case DATE_FORMAT.SECOND:
-            return dateToMdyDate(date, true);
+            return dateToMdyDate(date, Object.assign(Object.assign({}, settings), { convertMiliseconds: true }));
         default:
             return date;
     }

package/dist/dates/helpers/getWeek.js

@@ -9,16 +9,16 @@ export function getWeek(date) {
     if (!isValidDateObject(date))
         return;
     const target = new Date(date.valueOf());
-    const dayNr = (date.getDay() + 6) % 7;
-    target.setDate(target.getDate() - dayNr + 3);
+    const dayNr = (date.getUTCDay() + 6) % 7;
+    target.setDate(target.getUTCDate() - dayNr + 3);
     const firstThursday = target.valueOf();
     target.setMonth(0, 1);
-    if (target.getDay() !== 4) {
-        target.setMonth(0, 1 + ((4 - target.getDay() + 7) % 7));
+    if (target.getUTCDay() !== 4) {
+        target.setMonth(0, 1 + ((4 - target.getUTCDay() + 7) % 7));
     }
     return {
         week: 1 + Math.ceil((firstThursday - +target) / 604800000),
-        month: date.getMonth() + 1,
-        year: target.getFullYear(),
+        month: date.getUTCMonth() + 1,
+        year: target.getUTCFullYear(),
     };
 }

package/dist/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/dates/interfaces/IDateSettings.d.ts

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

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

@@ -2,8 +2,8 @@ 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 "./IDTimezoneType";
-export * from "./IGetDateByTimezoneSettings";

package/dist/dates/interfaces/index.js

@@ -2,8 +2,8 @@ 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 "./IDTimezoneType";
-export * from "./IGetDateByTimezoneSettings";

package/dist/format/format.js

@@ -1,9 +1,13 @@
 import { format as d3Format } from "d3-format";
 import dayjs from "dayjs";
 import { DATEGROUP_FORMATTING_UNSUPPORT, appliesFormatting, hasfileSizeProperty, isTextColumn, DEFAULT_DATE, } from "./definition";
+//* *dayjs plugins */
 import isoWeek from "dayjs/plugin/isoWeek";
 import advancedFormat from "dayjs/plugin/advancedFormat";
 import utc from "dayjs/plugin/utc";
+import weekYear from "dayjs/plugin/weekYear";
+import weekOfYear from "dayjs/plugin/weekOfYear";
+//* * end dayjs plugin imports */
 import { isEmpty } from "../general/mix/isEmpty";
 import { _get } from "../general/object/get";
 import { COLUMN } from "../columns/constants/COLUMN";
@@ -15,6 +19,8 @@ import { cloneDeep } from "../general/object/cloneDeep";
 dayjs.extend(isoWeek); // Add support for iso week format https://github.com/iamkun/dayjs/issues/1328
 dayjs.extend(advancedFormat); // Add support to advanced formats https://day.js.org/docs/en/plugin/advanced-format
 dayjs.extend(utc);
+dayjs.extend(weekYear);
+dayjs.extend(weekOfYear);
 /**
  * Apply to the given date format to a date value
  * @param bytes type number

package/dist/general/object/applyTimezoneDeep.js

@@ -1,5 +1,4 @@
 import { DATE_FORMAT } from "../../dates/constants/DATE_FORMAT";
-import { DATE_GROUPING_TIME_PROPERTY } from "../../dates/constants/DATE_GROUPING_TIME_PROPERTY";
 import { getDateByTimezone } from "../../dates/helpers/getDateByTimezone";
 import { validateDate } from "../../dates/helpers/validateDate";
 import { isEmpty } from "../mix/isEmpty";
@@ -27,10 +26,7 @@ export function applyTimezoneDeep(obj, timezone) {
             }
             else if (obj[i] instanceof Date ||
                 validateDate(obj[i], DATE_FORMAT.HOUR)) {
-                result[i] = getDateByTimezone(obj[i], {
-                    property: DATE_GROUPING_TIME_PROPERTY.HOUR,
-                    timezone,
-                });
+                result[i] = getDateByTimezone(obj[i], timezone);
             }
             else {
                 result[i] = obj[i];

package/dist/qrvey/helpers/transformValue.js

@@ -20,10 +20,7 @@ export function transformValue(value, settings) {
     const defaultSettings = getDefaultSettings(settings);
     let timezonedValue = value;
     if (!defaultSettings.noTimezone) {
-        timezonedValue = getDateByTimezone(value, {
-            property: defaultSettings.property,
-            timezone: defaultSettings.timezone,
-        });
+        timezonedValue = getDateByTimezone(value, defaultSettings.timezone);
     }
     let valueWithI18n = timezonedValue;
     if (!defaultSettings.noTranslate) {

package/package.json

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

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

@@ -1,6 +0,0 @@
-import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
-import { IDTimezone } from "./IDTimezone";
-export interface IGetDateByTimezoneSettings {
-    property: IColumnPropertyType;
-    timezone: IDTimezone;
-}

package/dist/dates/interfaces/IGetDateByTimezoneSettings.d.ts

@@ -1,6 +0,0 @@
-import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
-import { IDTimezone } from "./IDTimezone";
-export interface IGetDateByTimezoneSettings {
-    property: IColumnPropertyType;
-    timezone: IDTimezone;
-}