@qrvey/utils 1.4.0-2 → 1.4.0-5

package/dist/cjs/qrvey/helpers/getExpressionAnswers.js

@@ -12,17 +12,21 @@ const isEmpty_1 = require("../../general/mix/isEmpty");
 function getExpressionAnswers(column, property) {
     if ((0, isEmpty_1.isEmpty)(column))
         return [];
-    if (column.expressionCategory) {
-        return (COMPLEX_COLUMN_PROPERTY_1.COMPLEX_COLUMN_PROPERTY.EXPRESSION_NEGATIVE === property
-            ? column.expressionNegative
-            : COMPLEX_COLUMN_PROPERTY_1.COMPLEX_COLUMN_PROPERTY.EXPRESSION_POSITIVE === property
-                ? column.expressionPositive
-                : []).map((word) => ({ answer: word.text }));
+    const categoryExpressions = column.expressionCategory
+        ? getCategoryAnswers(column, property)
+        : column.expressionWords;
+    return (categoryExpressions || []).map((word) => ({
+        answer: word.text,
+    }));
+}
+exports.getExpressionAnswers = getExpressionAnswers;
+function getCategoryAnswers(column, property) {
+    let categoryExpressions;
+    if (COMPLEX_COLUMN_PROPERTY_1.COMPLEX_COLUMN_PROPERTY.EXPRESSION_NEGATIVE === property) {
+        categoryExpressions = column.expressionNegative;
     }
-    else {
-        return (column.expressionWords || []).map((word) => ({
-            answer: word.text,
-        }));
+    else if (COMPLEX_COLUMN_PROPERTY_1.COMPLEX_COLUMN_PROPERTY.EXPRESSION_POSITIVE === property) {
+        categoryExpressions = column.expressionPositive;
     }
+    return categoryExpressions;
 }
-exports.getExpressionAnswers = getExpressionAnswers;

package/dist/cjs/qrvey/helpers/getImageAnswers.js

@@ -9,7 +9,7 @@ exports.getImageAnswers = void 0;
 function getImageAnswers(column) {
     const answers = (column === null || column === void 0 ? void 0 : column.answers) || [];
     return answers.map((answer) => ({
-        answer: answer.answer || "",
+        answer: answer.answer,
         answerid: answer.answerid,
         answerUrl: answer.imageUrl,
     }));

package/dist/cjs/tokens/isTokenLabel.js

@@ -10,7 +10,6 @@ const isEmpty_1 = require("../general/mix/isEmpty");
 function isTokenLabel(label = "") {
     if ((0, isEmpty_1.isEmpty)(label) || typeof label !== "string")
         return false;
-    const regex = new RegExp("^({{)([^{/\\s/}]+)(}})$", "g");
-    return regex.test(label);
+    return /^\{\{([^{\s}]+)\}\}$/g.test(label);
 }
 exports.isTokenLabel = isTokenLabel;

package/dist/column_format/helpers/defineTableChartFormat.js

@@ -10,19 +10,17 @@ import { columnTypeByChart } from "./columnTypeByChart";
  * @param {IColumnFormatSettings} settings - IColumnFormatSettings
  */
 export const defineTableChartFormat = (column, settings) => {
-    const { aggregate, type, defaultFormat, outputFormat, selectedFormat, dateGroup, } = column;
+    const { aggregate, defaultFormat, outputFormat, selectedFormat, dateGroup } = column;
     const { tableType, shelfType } = settings;
     //Defaults
     const defaultText = "Default";
     const defaultNumeric = { type: "NUMERIC", format: "Numeric" };
-    const defaultAbb = { type: "NUMERIC", format: "Abbreviated" };
     const isGroupedTable = tableType === TABLE_TYPE.GROUPED;
     const columnType = columnTypeByChart(column, shelfType, CHART_GROUPS.TABLES, isGroupedTable);
     const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT.some((gp) => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
     const hasDefaultFormat = isEmpty(selectedFormat) ||
         (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText ||
         (selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText;
-    const isUsedAsNumericColumn = type !== columnType;
     switch (columnType) {
         case COLUMN.YES_NO:
         case COLUMN.PHONE:
@@ -40,8 +38,8 @@ export const defineTableChartFormat = (column, settings) => {
                 return STRING_FORMAT.NONE;
             }
             else if (hasDefaultFormat) {
-                const columnDefaultFormat = defaultFormat || outputFormat;
-                return Object.assign(Object.assign({}, defaultFormat), { format: defaultText, originalFormat: Object.assign({}, columnDefaultFormat) });
+                const columnDefaultFormat = defaultFormat || outputFormat || { type: 'DATE', format: 'MM/DD/YYYY' };
+                return Object.assign(Object.assign({}, defaultFormat), { format: defaultText, originalFormat: Object.assign({}, columnDefaultFormat), type: "DATE" });
             }
             else {
                 return selectedFormat;
@@ -50,21 +48,13 @@ export const defineTableChartFormat = (column, settings) => {
         case COLUMN.NUMERIC:
         case COLUMN.RATING:
         case COLUMN.SLIDEBAR: {
-            if (isUsedAsNumericColumn) {
-                if ((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.COUNT && hasDefaultFormat)
+            if (hasDefaultFormat) {
+                if ((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.COUNT ||
+                    (aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE.DISTINCTCOUNT)
                     return defaultNumeric;
-                else if (hasDefaultFormat)
-                    return defaultAbb;
-                else
-                    return selectedFormat || outputFormat;
-            }
-            else {
-                if (hasDefaultFormat) {
-                    return Object.assign({}, column.outputFormat);
-                }
-                else
-                    return selectedFormat;
+                return defaultFormat || defaultNumeric;
             }
+            return selectedFormat;
         }
     }
 };

package/dist/columns/helpers/getDatasetColumn.js

@@ -3,9 +3,7 @@ export function getDatasetColumn(column, dataset) {
     if (isEmpty(column) || isEmpty(dataset))
         return;
     const columns = getDatasetColumns(dataset);
-    if (isEmpty(column))
-        return;
-    return columns.find((c) => c.id === column.id);
+    return columns.find((c) => c.id === column.id && c.qrveyid === column.qrveyid);
 }
 function getDatasetColumns(dataset) {
     return (dataset === null || dataset === void 0 ? void 0 : dataset.options) || [];

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

@@ -2,6 +2,6 @@
  * Transforms String Date from a [mm/dd/yyyy] format to Date object.
  * @param monthYearDate String of [mm/dd/yyyy] date
  * @param time Flag to parse the object date to milliseconds.
- * @returns The date object or the date in 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 mdyDateToDate(date: string, time?: boolean): string | Date | number;

package/dist/dates/adapters/mdyDateToDate.js

@@ -6,12 +6,19 @@ import { validateDate } from "../helpers/validateDate";
  * Transforms String Date from a [mm/dd/yyyy] format to Date object.
  * @param monthYearDate String of [mm/dd/yyyy] date
  * @param time Flag to parse the object date to milliseconds.
- * @returns The date object or the date in 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 mdyDateToDate(date, time = false) {
-    if (isEmpty(date) || isTokenLabel(date))
+    if (isEmpty(date) ||
+        isTokenLabel(date) ||
+        typeof date !== "string" ||
+        !validatingDate(date))
         return date;
-    if (validateDate(date, DATE_FORMAT.DAY)) {
-        return time ? +new Date(date) : new Date(date);
-    }
+    return time ? +new Date(date) : new Date(date);
+}
+function validatingDate(date) {
+    return (validateDate(date, DATE_FORMAT.DAY) ||
+        validateDate(date, DATE_FORMAT.HOUR) ||
+        validateDate(date, DATE_FORMAT.MINUTE) ||
+        validateDate(date, DATE_FORMAT.SECOND));
 }

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

@@ -2,6 +2,6 @@
  * Transforms String Date from a [Month Year] format to Date object.
  * @param monthYearDate String of [Month Year] date
  * @param time Flag to parse the object date to milliseconds.
- * @returns The date object or the date in 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 monthYearToDate(monthYearDate: string, time?: boolean): string | Date | number;

package/dist/dates/adapters/monthYearToDate.js

@@ -7,14 +7,15 @@ import { validateDate } from "../helpers/validateDate";
  * Transforms String Date from a [Month Year] format to Date object.
  * @param monthYearDate String of [Month Year] date
  * @param time Flag to parse the object date to milliseconds.
- * @returns The date object or the date in 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 monthYearToDate(monthYearDate, time = false) {
-    if (isEmpty(monthYearDate) || isTokenLabel(monthYearDate))
+    if (isEmpty(monthYearDate) ||
+        isTokenLabel(monthYearDate) ||
+        typeof monthYearDate !== "string" ||
+        !validateDate(monthYearDate, DATE_FORMAT.MONTH))
         return monthYearDate;
-    if (validateDate(monthYearDate, DATE_FORMAT.MONTH)) {
-        const [month, year] = monthYearDate.split(" ");
-        const start = new Date(+year, DATE_YEAR_MONTHS.indexOf(month), 1);
-        return time ? +start : start;
-    }
+    const [month, year] = monthYearDate.split(" ");
+    const start = new Date(+year, DATE_YEAR_MONTHS.indexOf(month), 1);
+    return time ? +start : start;
 }

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

@@ -2,6 +2,6 @@
  * Transforms String Date from a [Quarter Year] format to Date object.
  * @param quarterYearDate String of [Quarter Year] date
  * @param time Flag to parse the object date to milliseconds.
- * @returns The date object or the date in 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 quarterYearToDate(quarterYearDate: string, time?: boolean): string | Date | number;

package/dist/dates/adapters/quarterYearToDate.js

@@ -7,14 +7,15 @@ import { validateDate } from "../helpers/validateDate";
  * Transforms String Date from a [Quarter Year] format to Date object.
  * @param quarterYearDate String of [Quarter Year] date
  * @param time Flag to parse the object date to milliseconds.
- * @returns The date object or the date in 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 quarterYearToDate(quarterYearDate, time = false) {
-    if (isEmpty(quarterYearDate) || isTokenLabel(quarterYearDate))
+    if (isEmpty(quarterYearDate) ||
+        isTokenLabel(quarterYearDate) ||
+        typeof quarterYearDate !== "string" ||
+        !validateDate(quarterYearDate, DATE_FORMAT.QUARTER))
         return quarterYearDate;
-    if (validateDate(quarterYearDate, DATE_FORMAT.QUARTER)) {
-        const [quarter, year] = quarterYearDate.split(" ");
-        const start = new Date(+year, DATE_YEAR_QUARTERS_RANGE[quarter].initial, 1);
-        return time ? +start : start;
-    }
+    const [quarter, year] = quarterYearDate.split(" ");
+    const start = new Date(+year, DATE_YEAR_QUARTERS_RANGE[quarter].initial, 1);
+    return time ? +start : start;
 }

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

@@ -2,6 +2,6 @@
  * Transforms String Date from a [Week Year] format to Date object.
  * @param date String of [Week Year] date
  * @param time Flag to parse the object date to milliseconds.
- * @returns The date object or the date in 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 weekYearToDate(weekYear: string, time?: boolean): string | Date | number;

package/dist/dates/adapters/weekYearToDate.js

@@ -7,26 +7,27 @@ import { validateDate } from "../helpers/validateDate";
  * Transforms String Date from a [Week Year] format to Date object.
  * @param date String of [Week Year] date
  * @param time Flag to parse the object date to milliseconds.
- * @returns The date object or the date in 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) {
-    if (isEmpty(weekYear) || isTokenLabel(weekYear))
+    if (isEmpty(weekYear) ||
+        isTokenLabel(weekYear) ||
+        typeof weekYear !== "string" ||
+        !validateDate(weekYear, DATE_FORMAT.WEEK))
         return weekYear;
-    if (validateDate(weekYear, DATE_FORMAT.WEEK)) {
-        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 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;
-    }
+    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 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;
 }

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

@@ -2,6 +2,6 @@
  * 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
+ * @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;

package/dist/dates/adapters/yearToDate.js

@@ -6,13 +6,14 @@ import { validateDate } from "../helpers/validateDate";
  * 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
+ * @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) {
-    if (isEmpty(yearDate) || isTokenLabel(yearDate))
+    if (isEmpty(yearDate) ||
+        isTokenLabel(yearDate) ||
+        typeof yearDate !== "string" ||
+        !validateDate(yearDate, DATE_FORMAT.YEAR))
         return yearDate;
-    if (validateDate(yearDate, DATE_FORMAT.YEAR)) {
-        const start = new Date(+yearDate, 0, 1);
-        return time ? +start : start;
-    }
+    const start = new Date(+yearDate, 0, 1);
+    return time ? +start : start;
 }

package/dist/dates/constants/DATE_FORMAT_BY_PROPERTY.d.ts

@@ -0,0 +1,16 @@
+export declare const DATE_FORMAT_BY_PROPERTY: {
+    year: string;
+    month: string;
+    quarter: string;
+    week: string;
+    day: string;
+    hour: string;
+    minute: string;
+    second: string;
+    day_only: string;
+    month_only: string;
+    quarter_only: string;
+    hour_only: string;
+    minute_only: string;
+    second_only: string;
+};

package/dist/dates/constants/DATE_FORMAT_BY_PROPERTY.js

@@ -0,0 +1,18 @@
+import { COLUMN_PROPERTY } from "../../columns/constants/COLUMN_PROPERTY";
+import { DATE_FORMAT } from "./DATE_FORMAT";
+export const DATE_FORMAT_BY_PROPERTY = {
+    [COLUMN_PROPERTY.YEAR]: DATE_FORMAT.YEAR,
+    [COLUMN_PROPERTY.MONTH]: DATE_FORMAT.MONTH,
+    [COLUMN_PROPERTY.QUARTER]: DATE_FORMAT.QUARTER,
+    [COLUMN_PROPERTY.WEEK]: DATE_FORMAT.WEEK,
+    [COLUMN_PROPERTY.DAY]: DATE_FORMAT.DAY,
+    [COLUMN_PROPERTY.HOUR]: DATE_FORMAT.HOUR,
+    [COLUMN_PROPERTY.MINUTE]: DATE_FORMAT.MINUTE,
+    [COLUMN_PROPERTY.SECOND]: DATE_FORMAT.SECOND,
+    [COLUMN_PROPERTY.MONTH_DAY]: DATE_FORMAT.MONTH_DAY,
+    [COLUMN_PROPERTY.YEAR_MONTH]: DATE_FORMAT.YEAR_MONTH,
+    [COLUMN_PROPERTY.YEAR_QUARTER]: DATE_FORMAT.YEAR_QUARTER,
+    [COLUMN_PROPERTY.DAY_HOUR]: DATE_FORMAT.DAY_HOUR,
+    [COLUMN_PROPERTY.HOUR_MINUTE]: DATE_FORMAT.HOUR_MINUTE,
+    [COLUMN_PROPERTY.MINUTE_SECOND]: DATE_FORMAT.MINUTE_SECOND,
+};

package/dist/dates/helpers/getDateFormatByProperty.js

@@ -1,38 +1,9 @@
-import { COLUMN_PROPERTY } from "../../columns/constants/COLUMN_PROPERTY";
-import { DATE_FORMAT } from "../constants/DATE_FORMAT";
+import { DATE_FORMAT_BY_PROPERTY } from "../constants/DATE_FORMAT_BY_PROPERTY";
 /**
  * Gets the date format by the given property
  * @param property The Column Property
  * @returns The date format
  */
 export function getDateFormatByProperty(property) {
-    return property === COLUMN_PROPERTY.YEAR
-        ? DATE_FORMAT.YEAR
-        : property === COLUMN_PROPERTY.MONTH
-            ? DATE_FORMAT.MONTH
-            : property === COLUMN_PROPERTY.QUARTER
-                ? DATE_FORMAT.QUARTER
-                : property === COLUMN_PROPERTY.WEEK
-                    ? DATE_FORMAT.WEEK
-                    : property === COLUMN_PROPERTY.DAY
-                        ? DATE_FORMAT.DAY
-                        : property === COLUMN_PROPERTY.HOUR
-                            ? DATE_FORMAT.HOUR
-                            : property === COLUMN_PROPERTY.MINUTE
-                                ? DATE_FORMAT.MINUTE
-                                : property === COLUMN_PROPERTY.SECOND
-                                    ? DATE_FORMAT.SECOND
-                                    : property === COLUMN_PROPERTY.MONTH_DAY
-                                        ? DATE_FORMAT.MONTH_DAY
-                                        : property === COLUMN_PROPERTY.YEAR_MONTH
-                                            ? DATE_FORMAT.YEAR_MONTH
-                                            : property === COLUMN_PROPERTY.YEAR_QUARTER
-                                                ? DATE_FORMAT.YEAR_QUARTER
-                                                : property === COLUMN_PROPERTY.DAY_HOUR
-                                                    ? DATE_FORMAT.DAY_HOUR
-                                                    : property === COLUMN_PROPERTY.HOUR_MINUTE
-                                                        ? DATE_FORMAT.HOUR_MINUTE
-                                                        : property === COLUMN_PROPERTY.MINUTE_SECOND
-                                                            ? DATE_FORMAT.MINUTE_SECOND
-                                                            : undefined;
+    return DATE_FORMAT_BY_PROPERTY[property];
 }

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

@@ -1,6 +1,7 @@
 import { IDateFormat } from "../interfaces/IDateFormat";
 /**
- * Gets an array of regular expressions by the given date format
+ * Gets an array of regular expressions by the given date format.
+ * Day date format is the default
  * @param dateFormat the date format
  * @returns an array of regular expressions
  */

package/dist/dates/helpers/getDateFormatRegularExpressionInArray.js

@@ -1,7 +1,8 @@
 import { DATE_FORMAT } from "../constants/DATE_FORMAT";
 import { DATE_REGULAR_EXPRESSION } from "../constants/DATE_REGULAR_EXPRESSION";
 /**
- * Gets an array of regular expressions by the given date format
+ * Gets an array of regular expressions by the given date format.
+ * Day date format is the default
  * @param dateFormat the date format
  * @returns an array of regular expressions
  */
@@ -18,12 +19,6 @@ export function getDateFormatRegularExpressionInArray(dateFormat = DATE_FORMAT.D
             ];
         case DATE_FORMAT.WEEK:
             return [DATE_REGULAR_EXPRESSION.YEAR_WEEK, DATE_REGULAR_EXPRESSION.YEAR];
-        case DATE_FORMAT.DAY:
-            return [
-                DATE_REGULAR_EXPRESSION.YEAR_MONTH_NUMBER,
-                DATE_REGULAR_EXPRESSION.MONTH_DAY,
-                DATE_REGULAR_EXPRESSION.YEAR,
-            ];
         case DATE_FORMAT.DAY_TIME:
             return [DATE_REGULAR_EXPRESSION.DAY_TIME];
         case DATE_FORMAT.HOUR:

package/dist/dates/helpers/getDatePickerPickLevel.js

@@ -5,5 +5,11 @@ import { DATE_FORMAT } from "../constants/DATE_FORMAT";
  * @returns {number} A number of the pick level setting
  */
 export function getDatePickerPickLevel(format) {
-    return format === DATE_FORMAT.YEAR ? 2 : format === DATE_FORMAT.MONTH ? 1 : 0;
+    if (format === DATE_FORMAT.YEAR) {
+        return 2;
+    }
+    else if (format === DATE_FORMAT.MONTH) {
+        return 1;
+    }
+    return 0;
 }

package/dist/dates/helpers/getSeparatorByDateFormat.js

@@ -5,22 +5,5 @@ import { DATE_FORMAT } from "../constants/DATE_FORMAT";
  * @returns a separator string
  */
 export function getSeparatorByDateFormat(format = DATE_FORMAT.DAY) {
-    return format === DATE_FORMAT.YEAR ||
-        format === DATE_FORMAT.DAY_TIME ||
-        format === DATE_FORMAT.MONTH_DAY ||
-        format === DATE_FORMAT.YEAR_MONTH ||
-        format === DATE_FORMAT.YEAR_QUARTER ||
-        format === DATE_FORMAT.YEAR_WEEK ||
-        format === DATE_FORMAT.DAY_HOUR ||
-        format === DATE_FORMAT.HOUR_MINUTE ||
-        format === DATE_FORMAT.MINUTE_SECOND
-        ? " "
-        : format === DATE_FORMAT.MONTH ||
-            format === DATE_FORMAT.QUARTER ||
-            format === DATE_FORMAT.WEEK ||
-            format === DATE_FORMAT.HOUR ||
-            format === DATE_FORMAT.MINUTE ||
-            format === DATE_FORMAT.SECOND
-            ? " "
-            : "/";
+    return format === DATE_FORMAT.DAY ? "/" : " ";
 }

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

@@ -7,4 +7,3 @@ export * from "./getSeparatorByDateFormat";
 export * from "./includeDateTokens";
 export * from "./getWeek";
 export * from "./validateDate";
-export * from "./validateDateByDateFormat";

package/dist/dates/helpers/index.js

@@ -7,4 +7,3 @@ export * from "./getSeparatorByDateFormat";
 export * from "./includeDateTokens";
 export * from "./getWeek";
 export * from "./validateDate";
-export * from "./validateDateByDateFormat";

package/dist/dates/helpers/validateDate.js

@@ -1,7 +1,8 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { isTokenLabel } from "../../tokens/isTokenLabel";
 import { DATE_FORMAT } from "../constants/DATE_FORMAT";
-import { validateDateByDateFormat } from "./validateDateByDateFormat";
+import { getDateFormatRegularExpressionInArray } from "./getDateFormatRegularExpressionInArray";
+import { getSeparatorByDateFormat } from "./getSeparatorByDateFormat";
 /**
  * Validate a string date depending on giving format
  * - If the string is a token label, the function lets it pass.
@@ -12,9 +13,19 @@ import { validateDateByDateFormat } from "./validateDateByDateFormat";
  * @returns True if it is valid or not. Undefined if date is undefined
  */
 export function validateDate(date, format = DATE_FORMAT.DAY) {
-    if (isEmpty(date))
+    if (isEmpty(date) || typeof date !== "string")
         return false;
     if (isTokenLabel(date))
         return true;
-    return validateDateByDateFormat(date, format);
+    const resultValidation = [];
+    const separator = getSeparatorByDateFormat(format);
+    const separatedDate = separator === "" ? [date] : date.split(separator);
+    const regularExpression = getDateFormatRegularExpressionInArray(format);
+    if (regularExpression.length !== separatedDate.length)
+        return false;
+    for (let i = 0; i < separatedDate.length; i++) {
+        resultValidation.push(isTokenLabel(separatedDate[i]) ||
+            new RegExp(regularExpression[i], "g").test(separatedDate[i]));
+    }
+    return resultValidation.every((validValue) => validValue);
 }

package/dist/dates/range/getDateRange.js

@@ -36,7 +36,6 @@ import { isValidDateObject } from "../helpers/isValidDateObject";
  * }
  */
 export function getDateRange(value, dateGroupLabel = "DAY", withTime = true) {
-    const range = {};
     const upperCaseDateGroup = dateGroupLabel.toUpperCase();
     const [timeFrom, timeTo] = withTime
         ? getStringTimeRange(value, upperCaseDateGroup)
@@ -47,60 +46,51 @@ export function getDateRange(value, dateGroupLabel = "DAY", withTime = true) {
             const yearRange = !isToken
                 ? getYearRange(value)
                 : { from: `01/01/${value}`, to: `12/31/${value}` };
-            range.from = `${yearRange.from}${timeFrom}`;
-            range.to = `${yearRange.to}${timeTo}`;
-            break;
+            return getRange(`${yearRange.from}${timeFrom}`, `${yearRange.to}${timeTo}`);
         }
         case "QUARTER": {
             const quarterRange = !isToken
                 ? getQuarterRange(value)
                 : { from: value, to: value };
-            range.from = `${quarterRange.from}${timeFrom}`;
-            range.to = `${quarterRange.to}${timeTo}`;
-            break;
+            return getRange(`${quarterRange.from}${timeFrom}`, `${quarterRange.to}${timeTo}`);
         }
         case "MONTH": {
-            const monthRange = monthInclideTokens(value)
+            const monthRange = monthIncludeTokens(value)
                 ? getMonthRangeWithToken(value)
                 : getMonthRange(value);
-            range.from = `${monthRange.from}${timeFrom}`;
-            range.to = `${monthRange.to}${timeTo}`;
-            break;
+            return getRange(`${monthRange.from}${timeFrom}`, `${monthRange.to}${timeTo}`);
         }
         case "WEEK": {
             const weekRange = !isToken
                 ? getWeekRange(value)
                 : { from: value, to: value };
-            range.from = `${weekRange.from}${timeFrom}`;
-            range.to = `${weekRange.to}${timeTo}`;
-            break;
+            return getRange(`${weekRange.from}${timeFrom}`, `${weekRange.to}${timeTo}`);
         }
         case "HOUR": {
             const hourRange = !isToken
                 ? getHourRange(value)
                 : { from: value, to: value };
-            range.from = hourRange.from;
-            range.to = hourRange.to;
-            break;
+            return getRange(hourRange.from, hourRange.to);
         }
         case "MINUTE": {
             const minuteRange = !isToken
                 ? getMinuteRange(value)
                 : { from: value, to: value };
-            range.from = minuteRange.from;
-            range.to = minuteRange.to;
-            break;
+            return getRange(minuteRange.from, minuteRange.to);
         }
         default: {
             const dayFrom = new Date(value);
             const dayTo = new Date(value);
             const includTokens = includeTokens(value, "/");
-            range.from = `${!includTokens ? getStringDate(dayFrom) : value}${timeFrom}`;
-            range.to = `${!includTokens ? getStringDate(dayTo) : value}${timeTo}`;
-            break;
+            return getRange(`${!includTokens ? getStringDate(dayFrom) : value}${timeFrom}`, `${!includTokens ? getStringDate(dayTo) : value}${timeTo}`);
         }
     }
-    return range;
+}
+function getRange(from, to) {
+    return {
+        from,
+        to,
+    };
 }
 function getStringTimeRange(value, dateGroupLabel) {
     const addLeadingZero = (unit) => `${unit < 10 ? "0" : ""}${unit}`;
@@ -236,7 +226,7 @@ function getMonthRangeWithToken(value) {
         to: `${monthToReturn}/{{LAST_DAY_MONTH}}/${year}`,
     };
 }
-function monthInclideTokens(value) {
+function monthIncludeTokens(value) {
     const [month, year] = value.split(" ");
     return isTokenLabel(month) || isTokenLabel(year);
 }