@qrvey/utils 1.5.0-9 → 1.5.0

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.5.0-9*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *$npm_config_np_new_version*
 
 > Helper, Utils for all Qrvey Projects
 

package/dist/charts/adapters/endpointData.js

@@ -11,11 +11,13 @@ function makeBodyRequest(body, filters = []) {
     if (category && category.bucketId)
         category.id = category.bucketId;
     const distribution = _get(body, "layerList[0].distribution");
-    const categoryId = category
-        ? category.id
-        : distribution
-            ? distribution.id
-            : null;
+    let categoryId = null;
+    if (category) {
+        categoryId = category.id;
+    }
+    else if (distribution) {
+        categoryId = distribution.id;
+    }
     const dataType = _get(body, "layerList[0].category.type");
     const maxDataPoints = _get(body, "globalSettings.maxNumDataPoints", 50);
     const sorting = _get(body, "globalSettings.sortX", {});
@@ -37,13 +39,13 @@ function makeBodyRequest(body, filters = []) {
             if (index > 0 && !_get(layer, "combopt.label"))
                 return charts;
             let chart;
-            if (index > 0 && layer.combopt.label == "MULTI") {
+            if (index > 0 && layer.combopt.label === "MULTI") {
                 chart = { type: "MULTI_SERIE" };
             }
             else if (index > 0 &&
                 ["TREND", "REFERENCE"].includes(layer.combopt.label)) {
                 chart =
-                    layer.combopt.label == "TREND"
+                    layer.combopt.label === "TREND"
                         ? getTrendBody(layer)
                         : getRefenceBody(layer);
                 if (typeof chart.value == "object" && !chart.value.qrveyid)
@@ -74,9 +76,9 @@ function makeBodyRequest(body, filters = []) {
                         }
                         delete chart.aggregate;
                     }
-                    if ((layer.type == "WORD_CLOUD" ||
-                        (layer.type == "GEO_CHART" &&
-                            _get(layer, "mapType.label") == "DOT")) &&
+                    if ((layer.type === "WORD_CLOUD" ||
+                        (layer.type === "GEO_CHART" &&
+                            _get(layer, "mapType.label") === "DOT")) &&
                         !chart.value) {
                         chart.label = label;
                         if (label.type !== "BUCKET") {
@@ -168,7 +170,7 @@ function makeBodyRequestU(body, filters, newModel = false) {
             pSummaries = [];
         }
         // TODO: Mejorar estructura  para que la propiedad venga directamente del chart builder
-        if (body.type == "HEATMAP_CHART" &&
+        if (body.type === "HEATMAP_CHART" &&
             pSummaries &&
             pSummaries[0].calculations) {
             const direction = _get(body.globalSettings, "calculation_direction", "Across") === "Down"
@@ -473,25 +475,25 @@ export function configMetricData(metricObj //
 export function configChartData(chartData, model, setup) {
     var _a, _b;
     const ctx = configSetup(setup);
-    chartData = updateDimensionsByChart(chartData, model);
-    if (!chartData.defaultFilters)
-        chartData.defaultFilters = {};
-    if (!isEmpty(chartData.defaultFilters) &&
-        isEmpty(_get(chartData.defaultFilters, "data.version"))) {
-        chartData.defaultFilters = {
-            data: adaptFilterData(chartData.defaultFilters),
+    const _chartData = updateDimensionsByChart(chartData, model);
+    if (!_chartData.defaultFilters)
+        _chartData.defaultFilters = {};
+    if (!isEmpty(_chartData.defaultFilters) &&
+        isEmpty(_get(_chartData.defaultFilters, "data.version"))) {
+        _chartData.defaultFilters = {
+            data: adaptFilterData(_chartData.defaultFilters),
         };
     }
-    const logic = FDToLogic(Object.assign({}, excludeFiltersByAggregateColumn(chartData.defaultFilters.data)));
+    const logic = FDToLogic(Object.assign({}, excludeFiltersByAggregateColumn(_chartData.defaultFilters.data)));
     const chart = {
-        data: chartData,
-        type: chartData.layerList[0].type,
+        data: _chartData,
+        type: _chartData.layerList[0].type,
     };
-    if (isNotValid(_get(chartData, "layerList[0]")))
+    if (isNotValid(_get(_chartData, "layerList[0]")))
         return;
     let drillData = {};
     const customData = {};
-    const drilldowns = ctx.config.drilldowns[getDrilldownId(ctx, chartData)] || [];
+    const drilldowns = ctx.config.drilldowns[getDrilldownId(ctx, _chartData)] || [];
     if (drilldowns.length > 0)
         drillData = Object.assign({}, drilldowns[drilldowns.length - 1]);
     if (drillData.chart)
@@ -499,8 +501,8 @@ export function configChartData(chartData, model, setup) {
     if (((_a = drillData.filters) === null || _a === void 0 ? void 0 : _a.length) > 0)
         customData.filters = [...drillData.filters];
     const validEndPoint = validChartTypeWithEndPoint(chart.type);
-    const bodyRequest = customData.chart || chartData;
-    const filterRequest = (_b = UIToOldLogic(chartData.defaultFilters.data)) === null || _b === void 0 ? void 0 : _b.logic;
+    const bodyRequest = customData.chart || _chartData;
+    const filterRequest = (_b = UIToOldLogic(_chartData.defaultFilters.data)) === null || _b === void 0 ? void 0 : _b.logic;
     const charts = validEndPoint
         ? makeBodyRequestU(bodyRequest, filterRequest, true)
         : makeBodyRequest(bodyRequest, filterRequest);

package/dist/charts/adapters/endpointDataGet.js

@@ -28,14 +28,15 @@ export function getPivotBody(layer, body) {
             value && value.calculation
                 ? { sortBy: "CATEGORY", sortDirection: "ASC" }
                 : pSortOption;
-        const maxDataPoints = pivot.type !== "DATE"
-            ? _get(layer, "multiserie.maxDataPoints")
+        let maxDataPoints = 50;
+        if (pivot.type !== "DATE") {
+            maxDataPoints = _get(layer, "multiserie.maxDataPoints")
                 ? _get(layer, "multiserie.maxNumDataPoints", 50)
-                : undefined
-            : 50;
+                : undefined;
+        }
         obj = {
             linkid: pivot.linkid,
-            maxDataPoints: maxDataPoints,
+            maxDataPoints,
             property: pivot.property,
             qrveyid: pivot.qrveyid || body.qrveyid,
             questionid: pivot.id || pivot.bucketId,
@@ -50,7 +51,7 @@ export function getValidSortingType(body) {
     const sorting = _get(body, "globalSettings.sortX", {});
     const type = _get(body, "layerList[0].type");
     const notAllowValue = type === "HEATMAP_CHART" && _get(body, "layerList[0].pivot");
-    return !sorting.type || sorting.type == "Label" || notAllowValue
+    return !sorting.type || sorting.type === "Label" || notAllowValue
         ? "Label"
         : "Value";
 }
@@ -63,11 +64,9 @@ export function getCategoryBody(layer, body) {
     const categoryId = category ? category.id : null;
     const sorting = _get(body, "globalSettings.sortX", {});
     const pSortOption = {
-        sortBy: ((_a = sorting === null || sorting === void 0 ? void 0 : sorting.column) === null || _a === void 0 ? void 0 : _a.isHidden)
+        sortBy: ((_a = sorting === null || sorting === void 0 ? void 0 : sorting.column) === null || _a === void 0 ? void 0 : _a.isHidden) || getValidSortingType(body) !== "Label"
             ? "VALUE"
-            : getValidSortingType(body) === "Label"
-                ? "CATEGORY"
-                : "VALUE",
+            : "CATEGORY",
         sortDirection: (sorting.order || "ASC").toUpperCase(),
         order: getSortOrder(sorting, category, body),
     };
@@ -151,15 +150,16 @@ export function getAggFiltersResults(logics = [], summaries = []) {
     }
     function getExpressionsInLogic(logicsData = []) {
         return logicsData.reduce((expressions, logic) => {
+            let _expressions = expressions;
             logic.filters.forEach((filter) => {
-                expressions = expressions.concat(filter.expressions[0].expressions);
+                _expressions = _expressions.concat(filter.expressions[0].expressions);
             });
-            return expressions;
+            return _expressions;
         }, []);
     }
     function getAggregateFilters(logicsData = []) {
-        logicsData = cloneDeep(logicsData);
-        const aggregateLogics = logicsData.reduce((newLogics, logic) => {
+        const _logicsData = cloneDeep(logicsData);
+        return _logicsData.reduce((newLogics, logic) => {
             if (!logic)
                 return newLogics;
             // if ([FILTER_SCOPE.DEFAULT, FILTER_SCOPE.CHART].includes(logic.scope)) {
@@ -178,7 +178,6 @@ export function getAggFiltersResults(logics = [], summaries = []) {
             //}
             return newLogics;
         }, []);
-        return aggregateLogics;
     }
     const aggregateFilters = getAggregateFilters(logics);
     const aggFilters = aggregateFilters
@@ -275,7 +274,7 @@ export function getRefenceBodyU(layer, body) {
 export function getLayerBody(layer, dateGroup, qrveyid) {
     let obj;
     try {
-        if (_get(layer, "mapType.label") == "DOT")
+        if (_get(layer, "mapType.label") === "DOT")
             obj = {};
         // eslint-disable-next-line no-extra-boolean-cast
         else if (!!~["BOXWHISKER_CHART", "WORD_CLOUD"].indexOf(layer.type)) {

package/dist/cjs/charts/adapters/endpointData.js

@@ -14,11 +14,13 @@ function makeBodyRequest(body, filters = []) {
     if (category && category.bucketId)
         category.id = category.bucketId;
     const distribution = (0, general_1._get)(body, "layerList[0].distribution");
-    const categoryId = category
-        ? category.id
-        : distribution
-            ? distribution.id
-            : null;
+    let categoryId = null;
+    if (category) {
+        categoryId = category.id;
+    }
+    else if (distribution) {
+        categoryId = distribution.id;
+    }
     const dataType = (0, general_1._get)(body, "layerList[0].category.type");
     const maxDataPoints = (0, general_1._get)(body, "globalSettings.maxNumDataPoints", 50);
     const sorting = (0, general_1._get)(body, "globalSettings.sortX", {});
@@ -40,13 +42,13 @@ function makeBodyRequest(body, filters = []) {
             if (index > 0 && !(0, general_1._get)(layer, "combopt.label"))
                 return charts;
             let chart;
-            if (index > 0 && layer.combopt.label == "MULTI") {
+            if (index > 0 && layer.combopt.label === "MULTI") {
                 chart = { type: "MULTI_SERIE" };
             }
             else if (index > 0 &&
                 ["TREND", "REFERENCE"].includes(layer.combopt.label)) {
                 chart =
-                    layer.combopt.label == "TREND"
+                    layer.combopt.label === "TREND"
                         ? (0, endpointDataGet_1.getTrendBody)(layer)
                         : (0, endpointDataGet_1.getRefenceBody)(layer);
                 if (typeof chart.value == "object" && !chart.value.qrveyid)
@@ -77,9 +79,9 @@ function makeBodyRequest(body, filters = []) {
                         }
                         delete chart.aggregate;
                     }
-                    if ((layer.type == "WORD_CLOUD" ||
-                        (layer.type == "GEO_CHART" &&
-                            (0, general_1._get)(layer, "mapType.label") == "DOT")) &&
+                    if ((layer.type === "WORD_CLOUD" ||
+                        (layer.type === "GEO_CHART" &&
+                            (0, general_1._get)(layer, "mapType.label") === "DOT")) &&
                         !chart.value) {
                         chart.label = label;
                         if (label.type !== "BUCKET") {
@@ -171,7 +173,7 @@ function makeBodyRequestU(body, filters, newModel = false) {
             pSummaries = [];
         }
         // TODO: Mejorar estructura  para que la propiedad venga directamente del chart builder
-        if (body.type == "HEATMAP_CHART" &&
+        if (body.type === "HEATMAP_CHART" &&
             pSummaries &&
             pSummaries[0].calculations) {
             const direction = (0, general_1._get)(body.globalSettings, "calculation_direction", "Across") === "Down"
@@ -478,25 +480,25 @@ exports.configMetricData = configMetricData;
 function configChartData(chartData, model, setup) {
     var _a, _b;
     const ctx = configSetup(setup);
-    chartData = updateDimensionsByChart(chartData, model);
-    if (!chartData.defaultFilters)
-        chartData.defaultFilters = {};
-    if (!(0, general_1.isEmpty)(chartData.defaultFilters) &&
-        (0, general_1.isEmpty)((0, general_1._get)(chartData.defaultFilters, "data.version"))) {
-        chartData.defaultFilters = {
-            data: (0, filters_1.adaptFilterData)(chartData.defaultFilters),
+    const _chartData = updateDimensionsByChart(chartData, model);
+    if (!_chartData.defaultFilters)
+        _chartData.defaultFilters = {};
+    if (!(0, general_1.isEmpty)(_chartData.defaultFilters) &&
+        (0, general_1.isEmpty)((0, general_1._get)(_chartData.defaultFilters, "data.version"))) {
+        _chartData.defaultFilters = {
+            data: (0, filters_1.adaptFilterData)(_chartData.defaultFilters),
         };
     }
-    const logic = (0, filters_1.FDToLogic)(Object.assign({}, (0, filters_1.excludeFiltersByAggregateColumn)(chartData.defaultFilters.data)));
+    const logic = (0, filters_1.FDToLogic)(Object.assign({}, (0, filters_1.excludeFiltersByAggregateColumn)(_chartData.defaultFilters.data)));
     const chart = {
-        data: chartData,
-        type: chartData.layerList[0].type,
+        data: _chartData,
+        type: _chartData.layerList[0].type,
     };
-    if ((0, endpointDataValidators_1.isNotValid)((0, general_1._get)(chartData, "layerList[0]")))
+    if ((0, endpointDataValidators_1.isNotValid)((0, general_1._get)(_chartData, "layerList[0]")))
         return;
     let drillData = {};
     const customData = {};
-    const drilldowns = ctx.config.drilldowns[(0, endpointDataGet_1.getDrilldownId)(ctx, chartData)] || [];
+    const drilldowns = ctx.config.drilldowns[(0, endpointDataGet_1.getDrilldownId)(ctx, _chartData)] || [];
     if (drilldowns.length > 0)
         drillData = Object.assign({}, drilldowns[drilldowns.length - 1]);
     if (drillData.chart)
@@ -504,8 +506,8 @@ function configChartData(chartData, model, setup) {
     if (((_a = drillData.filters) === null || _a === void 0 ? void 0 : _a.length) > 0)
         customData.filters = [...drillData.filters];
     const validEndPoint = (0, endpointDataValidators_1.validChartTypeWithEndPoint)(chart.type);
-    const bodyRequest = customData.chart || chartData;
-    const filterRequest = (_b = (0, filters_1.UIToOldLogic)(chartData.defaultFilters.data)) === null || _b === void 0 ? void 0 : _b.logic;
+    const bodyRequest = customData.chart || _chartData;
+    const filterRequest = (_b = (0, filters_1.UIToOldLogic)(_chartData.defaultFilters.data)) === null || _b === void 0 ? void 0 : _b.logic;
     const charts = validEndPoint
         ? makeBodyRequestU(bodyRequest, filterRequest, true)
         : makeBodyRequest(bodyRequest, filterRequest);

package/dist/cjs/charts/adapters/endpointDataGet.js

@@ -32,14 +32,15 @@ function getPivotBody(layer, body) {
             value && value.calculation
                 ? { sortBy: "CATEGORY", sortDirection: "ASC" }
                 : pSortOption;
-        const maxDataPoints = pivot.type !== "DATE"
-            ? (0, general_1._get)(layer, "multiserie.maxDataPoints")
+        let maxDataPoints = 50;
+        if (pivot.type !== "DATE") {
+            maxDataPoints = (0, general_1._get)(layer, "multiserie.maxDataPoints")
                 ? (0, general_1._get)(layer, "multiserie.maxNumDataPoints", 50)
-                : undefined
-            : 50;
+                : undefined;
+        }
         obj = {
             linkid: pivot.linkid,
-            maxDataPoints: maxDataPoints,
+            maxDataPoints,
             property: pivot.property,
             qrveyid: pivot.qrveyid || body.qrveyid,
             questionid: pivot.id || pivot.bucketId,
@@ -55,7 +56,7 @@ function getValidSortingType(body) {
     const sorting = (0, general_1._get)(body, "globalSettings.sortX", {});
     const type = (0, general_1._get)(body, "layerList[0].type");
     const notAllowValue = type === "HEATMAP_CHART" && (0, general_1._get)(body, "layerList[0].pivot");
-    return !sorting.type || sorting.type == "Label" || notAllowValue
+    return !sorting.type || sorting.type === "Label" || notAllowValue
         ? "Label"
         : "Value";
 }
@@ -69,11 +70,9 @@ function getCategoryBody(layer, body) {
     const categoryId = category ? category.id : null;
     const sorting = (0, general_1._get)(body, "globalSettings.sortX", {});
     const pSortOption = {
-        sortBy: ((_a = sorting === null || sorting === void 0 ? void 0 : sorting.column) === null || _a === void 0 ? void 0 : _a.isHidden)
+        sortBy: ((_a = sorting === null || sorting === void 0 ? void 0 : sorting.column) === null || _a === void 0 ? void 0 : _a.isHidden) || getValidSortingType(body) !== "Label"
             ? "VALUE"
-            : getValidSortingType(body) === "Label"
-                ? "CATEGORY"
-                : "VALUE",
+            : "CATEGORY",
         sortDirection: (sorting.order || "ASC").toUpperCase(),
         order: getSortOrder(sorting, category, body),
     };
@@ -160,15 +159,16 @@ function getAggFiltersResults(logics = [], summaries = []) {
     }
     function getExpressionsInLogic(logicsData = []) {
         return logicsData.reduce((expressions, logic) => {
+            let _expressions = expressions;
             logic.filters.forEach((filter) => {
-                expressions = expressions.concat(filter.expressions[0].expressions);
+                _expressions = _expressions.concat(filter.expressions[0].expressions);
             });
-            return expressions;
+            return _expressions;
         }, []);
     }
     function getAggregateFilters(logicsData = []) {
-        logicsData = (0, general_1.cloneDeep)(logicsData);
-        const aggregateLogics = logicsData.reduce((newLogics, logic) => {
+        const _logicsData = (0, general_1.cloneDeep)(logicsData);
+        return _logicsData.reduce((newLogics, logic) => {
             if (!logic)
                 return newLogics;
             // if ([FILTER_SCOPE.DEFAULT, FILTER_SCOPE.CHART].includes(logic.scope)) {
@@ -187,7 +187,6 @@ function getAggFiltersResults(logics = [], summaries = []) {
             //}
             return newLogics;
         }, []);
-        return aggregateLogics;
     }
     const aggregateFilters = getAggregateFilters(logics);
     const aggFilters = aggregateFilters
@@ -288,7 +287,7 @@ exports.getRefenceBodyU = getRefenceBodyU;
 function getLayerBody(layer, dateGroup, qrveyid) {
     let obj;
     try {
-        if ((0, general_1._get)(layer, "mapType.label") == "DOT")
+        if ((0, general_1._get)(layer, "mapType.label") === "DOT")
             obj = {};
         // eslint-disable-next-line no-extra-boolean-cast
         else if (!!~["BOXWHISKER_CHART", "WORD_CLOUD"].indexOf(layer.type)) {

package/dist/cjs/column_format/helpers/columnTypeByChart.js

@@ -26,8 +26,7 @@ const columnTypeByChart = (column, shelfType, chartGroup, isGroupedTable) => {
         (chartGroup === CHART_GROUP_1.CHART_GROUPS.TABLES &&
             isGroupedTable === true &&
             shelfType === SHELF_TYPE_1.SHELF_TYPE.COLUMNS) ||
-        (chartGroup === CHART_GROUP_1.CHART_GROUPS.XY &&
-            (shelfType === SHELF_TYPE_1.SHELF_TYPE.VALUE || shelfType === SHELF_TYPE_1.SHELF_TYPE.SERIES));
+        (chartGroup === CHART_GROUP_1.CHART_GROUPS.XY && shelfType === SHELF_TYPE_1.SHELF_TYPE.VALUE);
     return isNumericalColumn === true ? __1.NUMERICAL_COLUMN.NUMERIC : currentType;
 };
 exports.columnTypeByChart = columnTypeByChart;

package/dist/cjs/column_format/helpers/defineTableChartFormat.js

@@ -19,7 +19,7 @@ const DATEGROUP_UNSUPPORT_FORMAT_1 = require("../constants/DATEGROUP_UNSUPPORT_F
 const defineTableChartFormat = (column, settings) => {
     const { aggregate, defaultFormat, outputFormat, selectedFormat, calculation, dateGroup, } = column;
     const { tableType, shelfType } = settings;
-    //Defaults
+    // Defaults
     const defaultText = "Default";
     const defaultNumeric = { type: "NUMERIC", format: "Decimal" /* LOCALE_FORMATS.DECIMAL */ };
     const defaultPercentage = {
@@ -49,13 +49,13 @@ const defineTableChartFormat = (column, settings) => {
             if (noFormatSupported) {
                 return STRING_FORMAT_1.STRING_FORMAT.NONE;
             }
-            if (selectedFormat)
-                return selectedFormat;
             if (hasDefaultFormat) {
                 const columnDefaultFormat = defaultFormat ||
                     outputFormat || { type: "DATE", format: "MM/DD/YYYY" };
                 return Object.assign(Object.assign({}, defaultFormat), { format: defaultText, originalFormat: Object.assign({}, columnDefaultFormat), type: "DATE" });
             }
+            if (selectedFormat)
+                return selectedFormat;
             return;
         }
         case COLUMN_1.COLUMN.NUMERIC:

package/dist/cjs/column_format/helpers/defineXYChartFormat.js

@@ -57,9 +57,7 @@ const defineXYChartFormat = (column, settings) => {
             else if (hasDefaultFormat) {
                 return Object.assign(Object.assign({}, columnDefaultFormat), { format: defaultText, originalFormat: Object.assign({}, outputFormat) });
             }
-            else {
-                return selectedFormat;
-            }
+            return selectedFormat;
         }
         case COLUMN_1.COLUMN.NUMERIC:
         case COLUMN_1.COLUMN.RATING:
@@ -75,23 +73,18 @@ const defineXYChartFormat = (column, settings) => {
                     (columnCurrentFormat === null || columnCurrentFormat === void 0 ? void 0 : columnCurrentFormat.type) !== COLUMN_1.COLUMN.NUMERIC) ||
                     withoutFormat)
                     return defaultAbb;
-                else
-                    return columnCurrentFormat;
+                return columnCurrentFormat;
             }
-            else {
-                if (withoutFormat === true) {
-                    return columnDefaultFormat;
-                }
-                else if (hasDefaultFormat) {
-                    if (!definition_1.STANDARD_NUMERIC_FORMATS.includes(outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format)) {
-                        return Object.assign(Object.assign({}, outputFormat), { template: outputFormat.format, format: "Duration" });
-                    }
-                    else
-                        return Object.assign({}, outputFormat);
+            if (withoutFormat === true) {
+                return columnDefaultFormat;
+            }
+            else if (hasDefaultFormat) {
+                if (!definition_1.STANDARD_NUMERIC_FORMATS.includes(outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format)) {
+                    return Object.assign(Object.assign({}, outputFormat), { template: outputFormat.format, format: "Duration" });
                 }
-                else
-                    return selectedFormat;
+                return Object.assign({}, outputFormat);
             }
+            return selectedFormat;
         }
     }
 };

package/dist/cjs/columns/constants/COLUMN.js

@@ -33,7 +33,7 @@ var COLUMN;
     COLUMN["NUMERICP"] = "NUMERIC-P";
     COLUMN["NUMERICG"] = "NUMERIC-G";
     COLUMN["RATING"] = "RATING";
-    //...COMPLEX_COLUMN,
+    // ...COMPLEX_COLUMN,
     COLUMN["TEXTFIELD"] = "TEXTFIELD";
     COLUMN["LONGTEXT"] = "LONGTEXT";
     COLUMN["IMAGEUPLOAD"] = "IMAGEUPLOAD";

package/dist/cjs/columns/constants/COLUMN_PROPERTY.js

@@ -13,7 +13,7 @@ var COLUMN_PROPERTY;
     COLUMN_PROPERTY["MONTH"] = "month";
     COLUMN_PROPERTY["WEEK"] = "week";
     COLUMN_PROPERTY["DAY"] = "day";
-    //...DATE_GROUPING_TIME_PROPERTY,
+    // ...DATE_GROUPING_TIME_PROPERTY,
     COLUMN_PROPERTY["HOUR"] = "hour";
     COLUMN_PROPERTY["MINUTE"] = "minute";
     COLUMN_PROPERTY["SECOND"] = "second";
@@ -22,7 +22,7 @@ var COLUMN_PROPERTY;
     COLUMN_PROPERTY["YEAR_MONTH"] = "month_only";
     // YEAR_DAY = 'p-y-day',
     COLUMN_PROPERTY["MONTH_DAY"] = "day_only";
-    //WEEK_DAY = 'p-w-day'
+    // WEEK_DAY = 'p-w-day'
     // ...DATE_DISTINCT_TIME_PROPERTY,
     COLUMN_PROPERTY["DAY_HOUR"] = "hour_only";
     COLUMN_PROPERTY["HOUR_MINUTE"] = "minute_only";

package/dist/cjs/columns/helpers/getDatasetColumn.d.ts

@@ -1,3 +1,11 @@
 import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IColumn } from "../interfaces/IColumn";
-export declare function getDatasetColumn(column: Partial<IColumn>, dataset: IDataset): IColumn;
+/**
+ * Gets the column from the dataset object
+ * Recieves a partial column object and returns a full column object from the Dataset
+ * @param {IColumn} column a partial column info
+ * @param {IDataset} dataset the dataset info to look for the column
+ * @param {boolean} getIndex flag to get the index of the column array or the complete column info
+ * @returns the dataset column index or the dataset column object
+ */
+export declare function getDatasetColumn(column: Partial<IColumn>, dataset: IDataset, getIndex?: boolean): IColumn | number;

package/dist/cjs/columns/helpers/getDatasetColumn.js

@@ -1,14 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatasetColumn = void 0;
+const general_1 = require("../../general");
 const isEmpty_1 = require("../../general/mix/isEmpty");
-function getDatasetColumn(column, dataset) {
-    if ((0, isEmpty_1.isEmpty)(column) || (0, isEmpty_1.isEmpty)(dataset))
-        return;
+/**
+ * Gets the column from the dataset object
+ * Recieves a partial column object and returns a full column object from the Dataset
+ * @param {IColumn} column a partial column info
+ * @param {IDataset} dataset the dataset info to look for the column
+ * @param {boolean} getIndex flag to get the index of the column array or the complete column info
+ * @returns the dataset column index or the dataset column object
+ */
+function getDatasetColumn(column, dataset, getIndex = false) {
+    if (!isValidArguments(column, dataset))
+        return getIndex ? -1 : undefined;
     const columns = getDatasetColumns(dataset);
-    return columns.find((c) => c.id === column.id && c.qrveyid === column.qrveyid);
+    const validation = (c) => c.id === column.id && c.qrveyid === column.qrveyid;
+    return getIndex ? columns.findIndex(validation) : columns.find(validation);
 }
 exports.getDatasetColumn = getDatasetColumn;
+/**
+ * Validates the arguments
+ * @param {IColumn} column a partial column info
+ * @param {IDataset} dataset the dataset info
+ * @returns true: the arguments are valid.
+ */
+function isValidArguments(column, dataset) {
+    return (!(0, isEmpty_1.isEmpty)(column) &&
+        (0, general_1.isObject)(column) &&
+        !(0, isEmpty_1.isEmpty)(dataset) &&
+        (0, general_1.isObject)(dataset));
+}
+/**
+ * Gets the column array
+ * @param {IDataset} dataset the dataset info
+ * @returns the column array
+ */
 function getDatasetColumns(dataset) {
     return (dataset === null || dataset === void 0 ? void 0 : dataset.options) || [];
 }

package/dist/cjs/columns/helpers/getDatasetColumnByDatasets.d.ts

@@ -1,10 +1,11 @@
 import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IColumn } from "../interfaces/IColumn";
 /**
- * Gets a column from a dataset.
- * Recieves a partial column object and received a full column object from the Dataset
- * @param column a partial column object
- * @param datasets the datasets to look for the colun
+ * Gets a column from a datasets collection.
+ * Recieves a partial column object and returns a full column object from the Dataset
+ * @param {IColumn} column a partial column object
+ * @param {IDataset} datasets the datasets collection to look for the column
+ * @param {boolean} getIndex flag to get the index of the column array or the complete column info
  * @returns the Column object
  */
-export declare function getDatasetColumnByDatasets(column: Partial<IColumn>, datasets: IDataset[]): IColumn;
+export declare function getDatasetColumnByDatasets(column: Partial<IColumn>, datasets: IDataset[], getIndex?: boolean): IColumn | number;

package/dist/cjs/columns/helpers/getDatasetColumnByDatasets.js

@@ -2,18 +2,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatasetColumnByDatasets = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
+const isObject_1 = require("../../general/object/isObject");
 const getDatasetColumn_1 = require("./getDatasetColumn");
 /**
- * Gets a column from a dataset.
- * Recieves a partial column object and received a full column object from the Dataset
- * @param column a partial column object
- * @param datasets the datasets to look for the colun
+ * Gets a column from a datasets collection.
+ * Recieves a partial column object and returns a full column object from the Dataset
+ * @param {IColumn} column a partial column object
+ * @param {IDataset} datasets the datasets collection to look for the column
+ * @param {boolean} getIndex flag to get the index of the column array or the complete column info
  * @returns the Column object
  */
-function getDatasetColumnByDatasets(column, datasets) {
-    if ((0, isEmpty_1.isEmpty)(column) || (0, isEmpty_1.isEmpty)(datasets))
-        return;
+function getDatasetColumnByDatasets(column, datasets, getIndex = false) {
+    if (!isValidArguments(column, datasets))
+        return getIndex ? -1 : undefined;
     const dataset = datasets.find((_dataset) => _dataset.qrveyid === column.qrveyid);
-    return (0, getDatasetColumn_1.getDatasetColumn)(column, dataset);
+    return (0, getDatasetColumn_1.getDatasetColumn)(column, dataset, getIndex);
 }
 exports.getDatasetColumnByDatasets = getDatasetColumnByDatasets;
+/**
+ * Validates the arguments
+ * @param {IColumn} column a partial column info
+ * @param {IDataset} dataset the datasets collection
+ * @returns true: the arguments are valid.
+ */
+function isValidArguments(column, datasets) {
+    return (!(0, isEmpty_1.isEmpty)(column) &&
+        (0, isObject_1.isObject)(column) &&
+        !(0, isEmpty_1.isEmpty)(datasets) &&
+        Array.isArray(datasets));
+}

package/dist/cjs/columns/helpers/getModelColumn.d.ts

@@ -1,9 +1,9 @@
 import { IModel } from "../../qrvey/interfaces/IModel";
 import { IColumn } from "../interfaces/IColumn";
 /**
- * Get a model question by column id.
- * @param column The column with info
- * @param model The model object
- * @returns the model question
+ * Get a model column by a partial column info.
+ * @param {IColumn} column The partial column info
+ * @param {IModel} model The model object
+ * @returns the model column
  */
 export declare function getModelColumn(column: Partial<IColumn>, model: IModel): IColumn;