@qrvey/utils 1.4.0-4 → 1.4.0-5

package/dist/cjs/filters/services/UChartApi.d.ts

@@ -15,12 +15,26 @@ export default class UChartApi {
     getChartResult: (config: IFilterConfig, uFilter: IFUFlattenedFilter, filterLogic?: IFBLogic[], chartSettings?: IFUChartSettings, _resetApi?: boolean) => Promise<IFBData>;
     /**
      * Gets request body structure
-     * @param uFilter The filter Builder filter
-     * @param filterLogic Additional filter logic to apply in the preview
-     * @param chartSettings The settings of the chart. For Aggregate Columns.
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {IFBLogic[]} filterLogic Additional filter logic to apply in the preview
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
      * @returns the request body structure
      */
     private _getPreviewRequestBody;
+    /**
+     * Gets the filter object structure for the searching text
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @returns the filter object structure
+     */
+    private _getSearchLogic;
+    /**
+     * Gets the filters from the chart settings
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {OLD_IFilterData} searchLogic Additional filter object for the searching text
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
+     * @returns the filters from the chart settings
+     */
+    private _getFilterCharts;
     /**
      * Gets chart body structure
      * @param uFilter The filter Builder filter

package/dist/cjs/filters/services/UChartApi.js

@@ -42,34 +42,14 @@ class UChartApi {
         };
         /**
          * Gets request body structure
-         * @param uFilter The filter Builder filter
-         * @param filterLogic Additional filter logic to apply in the preview
-         * @param chartSettings The settings of the chart. For Aggregate Columns.
+         * @param {IFUFlattenedFilter} uFilter The filter object
+         * @param {IFBLogic[]} filterLogic Additional filter logic to apply in the preview
+         * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
          * @returns the request body structure
          */
         this._getPreviewRequestBody = (uFilter, filterLogic = [], chartSettings) => {
-            const { column, validator } = uFilter;
-            const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
-                ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
-            let searchLogic;
-            if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
-                searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
-                    Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(column, validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
-                ]);
-            }
-            let filterCharts = [];
-            if (haveAggFilters) {
-                filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
-                    if (uFilter.column.type === COLUMN_1.COLUMN.AGGREGATED_FORMULA)
-                        return chart;
-                    const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
-                        s.aggregate === uFilter.column.aggregate);
-                    const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
-                    const chartAggFilters = (0, getAggFiltersBySummaryIndex_1.getAggFiltersBySummaryIndex)(chart.aggFilters, summaryIndex);
-                    const searchAggFilters = (0, OLD_getAggFilters_1.getAggFilters)((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
-                    return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
-                }).filter((chart) => chart.summaries.length);
-            }
+            const searchLogic = this._getSearchLogic(uFilter);
+            const filterCharts = this._getFilterCharts(uFilter, searchLogic, chartSettings);
             const chartsBody = !filterCharts[0]
                 ? [this._getChartBody(uFilter)]
                 : [filterCharts[0]];
@@ -77,7 +57,11 @@ class UChartApi {
                 ...filterLogic,
                 ...(!filterCharts[0] ? (searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [] : []),
             ];
-            return { charts: chartsBody, logic: filters, qrveyid: column.qrveyid };
+            return {
+                charts: chartsBody,
+                logic: filters,
+                qrveyid: uFilter.column.qrveyid,
+            };
         };
         /**
          * Gets chart body structure
@@ -273,5 +257,44 @@ class UChartApi {
             return validation;
         };
     }
+    /**
+     * Gets the filter object structure for the searching text
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @returns the filter object structure
+     */
+    _getSearchLogic(uFilter) {
+        let searchLogic;
+        if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
+            searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
+                Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
+            ]);
+        }
+        return searchLogic;
+    }
+    /**
+     * Gets the filters from the chart settings
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {OLD_IFilterData} searchLogic Additional filter object for the searching text
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
+     * @returns the filters from the chart settings
+     */
+    _getFilterCharts(uFilter, searchLogic, chartSettings) {
+        let filterCharts = [];
+        const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
+            ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
+        if (haveAggFilters) {
+            filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
+                if (uFilter.column.type === COLUMN_1.COLUMN.AGGREGATED_FORMULA)
+                    return chart;
+                const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
+                    s.aggregate === uFilter.column.aggregate);
+                const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
+                const chartAggFilters = (0, getAggFiltersBySummaryIndex_1.getAggFiltersBySummaryIndex)(chart.aggFilters, summaryIndex);
+                const searchAggFilters = (0, OLD_getAggFilters_1.getAggFilters)((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
+                return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
+            }).filter((chart) => chart.summaries.length);
+        }
+        return filterCharts;
+    }
 }
 exports.default = UChartApi;

package/dist/cjs/filters/services/UChartPaginationApi.d.ts

@@ -23,12 +23,26 @@ export default class UChartPaginationApi {
     getChartResult: (config: IFilterConfig, uFilter: IFUFlattenedFilter, filterLogic?: IFBLogic[], chartSettings?: IFUChartSettings, resetApi?: boolean) => Promise<IFBData>;
     /**
      * Gets request body structure
-     * @param uFilter The filter Builder filter
-     * @param filterLogic Additional filter logic to apply in the preview
-     * @param chartSettings The settings of the chart. For Aggregate Columns.
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {IFBLogic[]} filterLogic Additional filter logic to apply in the preview
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
      * @returns the request body structure
      */
     private _getPreviewRequestBody;
+    /**
+     * Gets the filter object structure for the searching text
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @returns the filter object structure
+     */
+    private _getSearchLogic;
+    /**
+     * Gets the filters from the chart settings
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {OLD_IFilterData} searchLogic Additional filter object for the searching text
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
+     * @returns the filters from the chart settings
+     */
+    private _getFilterCharts;
     /**
      * Gets dimension body structure
      * @param uFilter The filter Builder filter

package/dist/cjs/filters/services/UChartPaginationApi.js

@@ -52,39 +52,21 @@ class UChartPaginationApi {
         };
         /**
          * Gets request body structure
-         * @param uFilter The filter Builder filter
-         * @param filterLogic Additional filter logic to apply in the preview
-         * @param chartSettings The settings of the chart. For Aggregate Columns.
+         * @param {IFUFlattenedFilter} uFilter The filter object
+         * @param {IFBLogic[]} filterLogic Additional filter logic to apply in the preview
+         * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
          * @returns the request body structure
          */
         this._getPreviewRequestBody = (uFilter, filterLogic = [], chartSettings, afterKey) => {
-            const { column, validator } = uFilter;
-            const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
-                ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
-            let searchLogic;
-            if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
-                searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
-                    Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(column, validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
-                ]);
-            }
-            let filterCharts = [];
-            if (haveAggFilters) {
-                filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
-                    const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
-                        s.aggregate === uFilter.column.aggregate);
-                    const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
-                    const chartAggFilters = (0, getAggFiltersBySummaryIndex_1.getAggFiltersBySummaryIndex)(chart.aggFilters, summaryIndex);
-                    const searchAggFilters = (0, OLD_getAggFilters_1.getAggFilters)((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
-                    return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
-                }).filter((chart) => chart.summaries.length);
-            }
+            const searchLogic = this._getSearchLogic(uFilter);
+            const filterCharts = this._getFilterCharts(uFilter, searchLogic, chartSettings);
             const dimensions = !filterCharts[0]
                 ? this._getDimensionsBody(uFilter)
                 : this._getDimensionsBodyAdapter(filterCharts[0].dimensions);
             const summaries = !filterCharts[0]
                 ? this._getSummariesBody(uFilter)
                 : filterCharts[0].summaries;
-            const maxDataPoints = this._getMaxDataPoints(column, chartSettings);
+            const maxDataPoints = this._getMaxDataPoints(uFilter.column, chartSettings);
             const filters = [
                 ...filterLogic,
                 ...(!filterCharts[0] ? (searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [] : []),
@@ -315,5 +297,44 @@ class UChartPaginationApi {
             return (0, isEmpty_1.isEmpty)(result);
         };
     }
+    /**
+     * Gets the filter object structure for the searching text
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @returns the filter object structure
+     */
+    _getSearchLogic(uFilter) {
+        let searchLogic;
+        if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
+            searchLogic = (0, flatUIToOldLogic_1.flatUIToOldLogic)([
+                Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
+            ]);
+        }
+        return searchLogic;
+    }
+    /**
+     * Gets the filters from the chart settings
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {OLD_IFilterData} searchLogic Additional filter object for the searching text
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
+     * @returns the filters from the chart settings
+     */
+    _getFilterCharts(uFilter, searchLogic, chartSettings) {
+        let filterCharts = [];
+        const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
+            ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
+        if (haveAggFilters) {
+            filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
+                if (uFilter.column.type === COLUMN_1.COLUMN.AGGREGATED_FORMULA)
+                    return chart;
+                const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
+                    s.aggregate === uFilter.column.aggregate);
+                const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
+                const chartAggFilters = (0, getAggFiltersBySummaryIndex_1.getAggFiltersBySummaryIndex)(chart.aggFilters, summaryIndex);
+                const searchAggFilters = (0, OLD_getAggFilters_1.getAggFilters)((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
+                return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
+            }).filter((chart) => chart.summaries.length);
+        }
+        return filterCharts;
+    }
 }
 exports.default = UChartPaginationApi;

package/dist/cjs/general/mix/isNaNV2.d.ts

@@ -1,8 +1,15 @@
 /**
  * Validates if the recieved number is NaN type.
- * This function recieves any variable but will return false.
- * Validates if variable is null, undefined, or an empty string, also, the function uses isNaN native function.
+ *
+ * Conditions:
+ * - This function recieves any variable but will return true if it is different to number.
+ * - Empty variables as undefined, null, empty string will return true.
+ *
+ * Special case for isNaN
+ * - The isNaN('') is considered as false statement. The empty string is converted to 0 which is not NaN.
+ * - Boolean variables is considered as false statement.
+ *
  * @param variable the variable to validate
- * @return True if variable is a NaN or false otherwise
+ * @return True: variable is a NaN; False: The variable is a number
  */
 export declare function isNaNV2(variable: any): boolean;

package/dist/cjs/general/mix/isNaNV2.js

@@ -4,12 +4,19 @@ exports.isNaNV2 = void 0;
 const _1 = require(".");
 /**
  * Validates if the recieved number is NaN type.
- * This function recieves any variable but will return false.
- * Validates if variable is null, undefined, or an empty string, also, the function uses isNaN native function.
+ *
+ * Conditions:
+ * - This function recieves any variable but will return true if it is different to number.
+ * - Empty variables as undefined, null, empty string will return true.
+ *
+ * Special case for isNaN
+ * - The isNaN('') is considered as false statement. The empty string is converted to 0 which is not NaN.
+ * - Boolean variables is considered as false statement.
+ *
  * @param variable the variable to validate
- * @return True if variable is a NaN or false otherwise
+ * @return True: variable is a NaN; False: The variable is a number
  */
 function isNaNV2(variable) {
-    return (0, _1.isEmpty)(variable) || isNaN(variable);
+    return (0, _1.isEmpty)(variable) || typeof variable == "boolean" || isNaN(variable);
 }
 exports.isNaNV2 = isNaNV2;

package/dist/cjs/general/string/parseUrl.js

@@ -11,9 +11,9 @@ const parseUrl = (url, transformer) => {
     if (!match)
         return url;
     return match.reduce((newUrl, curr) => {
-        const key = curr.substr(2);
+        const key = curr.substring(2);
         const value = typeof transformer === "function" ? transformer(key) : transformer[key];
-        return newUrl.replace(curr.substr(1), value);
+        return newUrl.replace(curr.substring(1), value);
     }, url);
 };
 exports.parseUrl = parseUrl;

package/dist/cjs/globalization/helpers/getI18nCalendar.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getI18nCalendar = void 0;
+const isEmpty_1 = require("../../general/mix/isEmpty");
 const i18nextBuilder_1 = require("../service/i18nextBuilder");
 function getI18nCalendar(locale) {
-    const localeOverride = locale instanceof i18nextBuilder_1.I18nService
-        ? locale
-        : typeof locale === "function"
-            ? { translate: locale }
-            : undefined;
-    if (!localeOverride)
-        return undefined;
+    let localeOverride;
+    if (locale instanceof i18nextBuilder_1.I18nService) {
+        localeOverride = locale;
+    }
+    else if (typeof locale === "function") {
+        localeOverride = { translate: locale };
+    }
+    if ((0, isEmpty_1.isEmpty)(localeOverride))
+        return;
     return {
         clear: localeOverride.translate("common.calendar.clear"),
         days: [

package/dist/cjs/globalization/service/i18nextBuilder.js

@@ -17,9 +17,7 @@ const i18next_1 = __importDefault(require("i18next"));
 const mergeDeep_1 = require("../../general/object/mergeDeep");
 class I18nServiceBuilder {
     static buildI18n(i18nDefault, i18nResource) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this._initI18n(i18nDefault, i18nResource);
-        });
+        return this._initI18n(i18nDefault, i18nResource);
     }
     static _initI18n(i18nDefault, i18nResource) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/cjs/globalization/service/initI18n.js

@@ -1,19 +1,8 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initI18n = void 0;
 const i18nextBuilder_1 = require("../service/i18nextBuilder");
 function initI18n(i18nConfig = {}, i18nDefault = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield i18nextBuilder_1.I18nServiceBuilder.buildI18n(i18nDefault, i18nConfig);
-    });
+    return i18nextBuilder_1.I18nServiceBuilder.buildI18n(i18nDefault, i18nConfig);
 }
 exports.initI18n = initI18n;

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

@@ -50,9 +50,10 @@ function getDataAnswersByColumn(settings) {
 }
 exports.getDataAnswersByColumn = getDataAnswersByColumn;
 function getColumnFromData(settings) {
-    return !(0, isEmpty_1.isEmpty)(settings.dataset)
-        ? (0, getDatasetColumn_1.getDatasetColumn)(settings.column, settings.dataset)
-        : !(0, isEmpty_1.isEmpty)(settings.model)
-            ? (0, getModelColumn_1.getModelColumn)(settings.column, settings.model)
-            : undefined;
+    if (!(0, isEmpty_1.isEmpty)(settings.dataset)) {
+        return (0, getDatasetColumn_1.getDatasetColumn)(settings.column, settings.dataset);
+    }
+    else if (!(0, isEmpty_1.isEmpty)(settings.model)) {
+        return (0, getModelColumn_1.getModelColumn)(settings.column, settings.model);
+    }
 }

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/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

@@ -38,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;
@@ -52,7 +52,7 @@ export const defineTableChartFormat = (column, settings) => {
                 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;
-                return defaultFormat;
+                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;