@qrvey/utils 1.3.2 → 1.4.0-1

package/dist/cjs/filters/helpers/common/getFilterid.js

@@ -18,26 +18,25 @@ exports.getFilterid = void 0;
  * @returns a text to identify the filter
  */
 function getFilterid(filter, index) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     const filterid = [];
     if (filter.extras.scopeid != null)
         filterid.push(filter.extras.scopeid);
-    if (((_a = filter.column) === null || _a === void 0 ? void 0 : _a.qrveyid) != null)
-        filterid.push((_b = filter.column) === null || _b === void 0 ? void 0 : _b.qrveyid);
+    if (filter.column?.qrveyid != null)
+        filterid.push(filter.column?.qrveyid);
     if (filter.extras.panelid != null)
         filterid.push(filter.extras.panelid);
-    if (((_c = filter.column) === null || _c === void 0 ? void 0 : _c.id) != null)
-        filterid.push((_d = filter.column) === null || _d === void 0 ? void 0 : _d.id);
+    if (filter.column?.id != null)
+        filterid.push(filter.column?.id);
     if (filter.validator != null)
         filterid.push(filter.validator);
     if (filter.property != null)
         filterid.push(filter.property);
-    if (((_e = filter.column) === null || _e === void 0 ? void 0 : _e.aggregate) != null)
-        filterid.push((_f = filter.column) === null || _f === void 0 ? void 0 : _f.aggregate);
-    if (((_g = filter.column) === null || _g === void 0 ? void 0 : _g.calculation) != null)
-        filterid.push((_h = filter.column) === null || _h === void 0 ? void 0 : _h.calculation);
+    if (filter.column?.aggregate != null)
+        filterid.push(filter.column?.aggregate);
+    if (filter.column?.calculation != null)
+        filterid.push(filter.column?.calculation);
     if (index != null)
         filterid.push(index.toString());
-    return filterid.length > 0 ? filterid.join('|') : '';
+    return filterid.length > 0 ? filterid.join("|") : "";
 }
 exports.getFilterid = getFilterid;

package/dist/cjs/filters/helpers/common/getFiltersByAggregateColumn.js

@@ -16,11 +16,11 @@ function getFiltersByAggregateColumn(filterData) {
         if ((0, isEmpty_1.isEmpty)(scope))
             return scopes;
         scope.datasets.forEach((dataset, index) => {
-            scope.datasets[index].filters = dataset.filters.filter(filter => filter.column.aggregate != null);
+            scope.datasets[index].filters = dataset.filters.filter((filter) => filter.column.aggregate != null);
             if (dataset.filters.length === 0)
                 scope.datasets[index] = undefined;
         });
-        scope.datasets = scope.datasets.filter(dataset => dataset);
+        scope.datasets = scope.datasets.filter((dataset) => dataset);
         if (scope.datasets.length > 0)
             scopes.push(scope);
         return scopes;

package/dist/cjs/filters/helpers/common/getFiltersByDatasetsColumns.js

@@ -14,17 +14,33 @@ function getFiltersByDatasetsColumns(data, datasets = []) {
         return;
     if ((0, isEmpty_1.isEmpty)(datasets))
         return data;
-    const newData = Object.assign(Object.assign({}, data), { scopes: data.scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(filterDataset => {
-                const dataset = datasets.find(_data => _data.qrveyid === filterDataset.qrveyid);
+    const newData = {
+        ...data,
+        scopes: data.scopes
+            .map((scope) => ({
+            ...scope,
+            datasets: scope.datasets
+                .map((filterDataset) => {
+                const dataset = datasets.find((_data) => _data.qrveyid === filterDataset.qrveyid);
                 if (!(0, isEmpty_1.isEmpty)(dataset)) {
-                    return Object.assign(Object.assign({}, filterDataset), { filters: filterDataset.filters.map(filter => {
-                            const column = (dataset.options || []).find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid);
+                    return {
+                        ...filterDataset,
+                        filters: filterDataset.filters
+                            .map((filter) => {
+                            const column = (dataset.options || []).find((cInfo) => cInfo.id === filter.column.id &&
+                                cInfo.qrveyid === filter.column.qrveyid);
                             if (!(0, isEmpty_1.isEmpty)(column)) {
-                                return Object.assign({}, filter);
+                                return { ...filter };
                             }
-                        }).filter(Boolean) });
+                        })
+                            .filter(Boolean),
+                    };
                 }
-            }).filter(dataset => !(0, isEmpty_1.isEmpty)(dataset) && dataset.filters.length > 0) }))).filter(scope => !(0, isEmpty_1.isEmpty)(scope) && scope.datasets.length > 0) });
+            })
+                .filter((dataset) => !(0, isEmpty_1.isEmpty)(dataset) && dataset.filters.length > 0),
+        }))
+            .filter((scope) => !(0, isEmpty_1.isEmpty)(scope) && scope.datasets.length > 0),
+    };
     if (!(0, isEmpty_1.isEmpty)(newData) && newData.scopes.length > 0) {
         return newData;
     }

package/dist/cjs/filters/helpers/common/getFiltersByParams.js

@@ -30,32 +30,61 @@ function getFiltersByParams(filterData, params, settings) {
         return filterData;
     filterData = (0, cloneDeep_1.cloneDeep)(filterData);
     settings = (0, getParamsToGetFilterSettings_1.getParamsToGetFilterSettings)(settings);
-    filterData.scopes = filterData.scopes.map((scope) => {
+    filterData.scopes = filterData.scopes
+        .map((scope) => {
         if ((0, resolveScopeConditions_1.resolveScopeConditions)(scope, params, settings.letPassUndefinedProperties.scope, settings.letPassUndefinedParams.scope)) {
-            return Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map((dataset) => {
+            return {
+                ...scope,
+                datasets: scope.datasets
+                    .map((dataset) => {
                     if ((0, resolveDatasetConditions_1.resolveDatasetConditions)(dataset, params, settings.letPassUndefinedProperties.dataset, settings.letPassUndefinedParams.dataset)) {
-                        return Object.assign(Object.assign({}, dataset), { filters: dataset.filters.map((filter) => {
+                        return {
+                            ...dataset,
+                            filters: dataset.filters
+                                .map((filter) => {
                                 if ((0, resolveFilterConditions_1.resolveFilterConditions)(filter, params, settings.letPassUndefinedProperties.filter, settings.letPassUndefinedParams.filter)) {
-                                    return Object.assign(Object.assign({}, filter), { values: (filter.values || []).map((value) => {
+                                    return {
+                                        ...filter,
+                                        values: (filter.values || [])
+                                            .map((value) => {
                                             if (Array.isArray(value) && value.length > 0) {
                                                 const rankingValues = value;
-                                                return rankingValues.map(rValue => {
-                                                    if (!(0, hasProperty_1._hasProperty)(params, 'enableds') || !(0, hasProperty_1._hasProperty)(params.enableds, 'values') || params.enableds.values === rValue.enabled)
+                                                return rankingValues
+                                                    .map((rValue) => {
+                                                    if (!(0, hasProperty_1._hasProperty)(params, "enableds") ||
+                                                        !(0, hasProperty_1._hasProperty)(params.enableds, "values") ||
+                                                        params.enableds.values === rValue.enabled)
                                                         return rValue;
-                                                }).filter(Boolean);
+                                                })
+                                                    .filter(Boolean);
                                             }
                                             else {
                                                 value = value;
-                                                if (!(0, hasProperty_1._hasProperty)(params, 'enableds') || !(0, hasProperty_1._hasProperty)(params.enableds, 'values') || params.enableds.values === value.enabled)
+                                                if (!(0, hasProperty_1._hasProperty)(params, "enableds") ||
+                                                    !(0, hasProperty_1._hasProperty)(params.enableds, "values") ||
+                                                    params.enableds.values === value.enabled)
                                                     return value;
                                             }
-                                        }).filter(Boolean) });
+                                        })
+                                            .filter(Boolean),
+                                    };
                                 }
-                            }).filter(filter => { var _a; return !(0, isEmpty_1.isEmpty)(filter) && (!settings.filterEmptyArrays.filter || filter.selectAll || ((_a = filter.values) === null || _a === void 0 ? void 0 : _a.length) > 0); }) });
+                            })
+                                .filter((filter) => !(0, isEmpty_1.isEmpty)(filter) &&
+                                (!settings.filterEmptyArrays.filter ||
+                                    filter.selectAll ||
+                                    filter.values?.length > 0)),
+                        };
                     }
-                }).filter(dataset => !(0, isEmpty_1.isEmpty)(dataset) && (!settings.filterEmptyArrays.dataset || dataset.filters.length > 0)) });
+                })
+                    .filter((dataset) => !(0, isEmpty_1.isEmpty)(dataset) &&
+                    (!settings.filterEmptyArrays.dataset ||
+                        dataset.filters.length > 0)),
+            };
         }
-    }).filter(scope => !(0, isEmpty_1.isEmpty)(scope) && (!settings.filterEmptyArrays.scope || scope.datasets.length > 0));
+    })
+        .filter((scope) => !(0, isEmpty_1.isEmpty)(scope) &&
+        (!settings.filterEmptyArrays.scope || scope.datasets.length > 0));
     return filterData.scopes.length > 0 ? filterData : undefined;
 }
 exports.getFiltersByParams = getFiltersByParams;

package/dist/cjs/filters/helpers/common/getFiltersByScopes.js

@@ -13,7 +13,7 @@ function getFiltersByScopes(filterData, scopes) {
     if ((0, isEmpty_1.isEmpty)(filterData) || (0, isEmpty_1.isEmpty)(filterData.scopes))
         return;
     filterData = (0, cloneDeep_1.cloneDeep)(filterData);
-    filterData.scopes = filterData.scopes.filter(scope => scopes.includes(scope.scope));
+    filterData.scopes = filterData.scopes.filter((scope) => scopes.includes(scope.scope));
     return filterData.scopes.length > 0 ? filterData : undefined;
 }
 exports.getFiltersByScopes = getFiltersByScopes;

package/dist/cjs/filters/helpers/common/getFiltersByScopesIds.js

@@ -15,7 +15,7 @@ function getFiltersByScopesIds(filterData, scopes = []) {
         return;
     filterData = (0, cloneDeep_1.cloneDeep)(filterData);
     filterData.scopes = scopes.reduce((newScopes, scope) => {
-        const filteredScopes = filterData.scopes.filter(fScope => scope.label === fScope.scope &&
+        const filteredScopes = filterData.scopes.filter((fScope) => scope.label === fScope.scope &&
             (scope.id === fScope.scopeid ||
                 (fScope.scope === FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL && fScope.scopeid == null)) &&
             fScope.datasets.length > 0);

package/dist/cjs/filters/helpers/common/getMergeFiltersSettings.js

@@ -7,11 +7,10 @@ exports.getMergeFiltersSettings = void 0;
  * @returns a new MergeFilters settings object.
  */
 function getMergeFiltersSettings(settings) {
-    var _a, _b, _c;
     return {
-        overwriteFilterProps: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteFilterProps) !== null && _a !== void 0 ? _a : true,
-        overwriteValues: (_b = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _b !== void 0 ? _b : false,
-        setGroupedColumnOperator: (_c = settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator) !== null && _c !== void 0 ? _c : true
+        overwriteFilterProps: settings?.overwriteFilterProps ?? true,
+        overwriteValues: settings?.overwriteValues ?? false,
+        setGroupedColumnOperator: settings?.setGroupedColumnOperator ?? true,
     };
 }
 exports.getMergeFiltersSettings = getMergeFiltersSettings;

package/dist/cjs/filters/helpers/common/getMergeValuesSettings.js

@@ -7,9 +7,8 @@ exports.getMergeValuesSettings = void 0;
  * @returns a new MergeFilters settings object.
  */
 function getMergeValuesSettings(settings) {
-    var _a;
     return {
-        overwriteValues: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _a !== void 0 ? _a : false,
+        overwriteValues: settings?.overwriteValues ?? false,
     };
 }
 exports.getMergeValuesSettings = getMergeValuesSettings;

package/dist/cjs/filters/helpers/common/getParamsToGetFilterSettings.js

@@ -7,23 +7,22 @@ exports.getParamsToGetFilterSettings = void 0;
  * @returns a new ParamsToGetFilter settings object.
  */
 function getParamsToGetFilterSettings(settings) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     return {
         letPassUndefinedParams: {
-            dataset: (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedParams) === null || _a === void 0 ? void 0 : _a.dataset) !== null && _b !== void 0 ? _b : true,
-            filter: (_d = (_c = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedParams) === null || _c === void 0 ? void 0 : _c.filter) !== null && _d !== void 0 ? _d : true,
-            scope: (_f = (_e = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedParams) === null || _e === void 0 ? void 0 : _e.scope) !== null && _f !== void 0 ? _f : true,
+            dataset: settings?.letPassUndefinedParams?.dataset ?? true,
+            filter: settings?.letPassUndefinedParams?.filter ?? true,
+            scope: settings?.letPassUndefinedParams?.scope ?? true,
         },
         letPassUndefinedProperties: {
-            dataset: (_h = (_g = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _g === void 0 ? void 0 : _g.dataset) !== null && _h !== void 0 ? _h : false,
-            filter: (_k = (_j = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _j === void 0 ? void 0 : _j.filter) !== null && _k !== void 0 ? _k : false,
-            scope: (_m = (_l = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _l === void 0 ? void 0 : _l.scope) !== null && _m !== void 0 ? _m : false,
+            dataset: settings?.letPassUndefinedProperties?.dataset ?? false,
+            filter: settings?.letPassUndefinedProperties?.filter ?? false,
+            scope: settings?.letPassUndefinedProperties?.scope ?? false,
         },
         filterEmptyArrays: {
-            dataset: (_p = (_o = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) === null || _o === void 0 ? void 0 : _o.dataset) !== null && _p !== void 0 ? _p : true,
-            filter: (_r = (_q = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) === null || _q === void 0 ? void 0 : _q.filter) !== null && _r !== void 0 ? _r : true,
-            scope: (_t = (_s = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) === null || _s === void 0 ? void 0 : _s.scope) !== null && _t !== void 0 ? _t : true,
-        }
+            dataset: settings?.filterEmptyArrays?.dataset ?? true,
+            filter: settings?.filterEmptyArrays?.filter ?? true,
+            scope: settings?.filterEmptyArrays?.scope ?? true,
+        },
     };
 }
 exports.getParamsToGetFilterSettings = getParamsToGetFilterSettings;

package/dist/cjs/filters/helpers/common/getValuesFromDataset.js

@@ -9,11 +9,16 @@ const modelAnswerToFilterValue_1 = require("../../adapters/modelAnswerToFilterVa
  * @returns The values.
  */
 function getValuesFromDataset(props) {
-    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({ column: props.column, dataset: props.dataset, property: props.property, lookupDisplay: props.lookupDisplay });
+    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({
+        column: props.column,
+        dataset: props.dataset,
+        property: props.property,
+        lookupDisplay: props.lookupDisplay,
+    });
     const data = (0, modelAnswerToFilterValue_1.modelAnswerToFilterValue)(answers);
     const values = { data, total: data.length };
     if (props.value) {
-        values.data = values.data.filter(v => v.value.toLowerCase().includes(props.value.toLowerCase()));
+        values.data = values.data.filter((v) => v.value.toLowerCase().includes(props.value.toLowerCase()));
     }
     return values;
 }

package/dist/cjs/filters/helpers/common/getValuesFromModel.js

@@ -9,11 +9,16 @@ const modelAnswerToFilterValue_1 = require("../../adapters/modelAnswerToFilterVa
  * @returns The values.
  */
 function getValuesFromModel(props) {
-    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({ column: props.column, model: props.model, property: props.property, lookupDisplay: props.lookupDisplay });
+    const answers = (0, getDataAnswersByColumn_1.getDataAnswersByColumn)({
+        column: props.column,
+        model: props.model,
+        property: props.property,
+        lookupDisplay: props.lookupDisplay,
+    });
     const data = (0, modelAnswerToFilterValue_1.modelAnswerToFilterValue)(answers);
     const values = { data, total: data.length };
     if (props.value) {
-        values.data = values.data.filter(v => v.value.toLowerCase().includes(props.value.toLowerCase()));
+        values.data = values.data.filter((v) => v.value.toLowerCase().includes(props.value.toLowerCase()));
     }
     return values;
 }

package/dist/cjs/filters/helpers/common/haveFiltersByDataset.js

@@ -11,6 +11,7 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
 function haveFiltersByDataset(filterData, qrveyid) {
     if ((0, isEmpty_1.isEmpty)(filterData) || (0, isEmpty_1.isEmpty)(filterData.scopes))
         return false;
-    return filterData.scopes.some(scope => scope.datasets.length > 0 && scope.datasets.some(dataset => dataset.qrveyid === qrveyid));
+    return filterData.scopes.some((scope) => scope.datasets.length > 0 &&
+        scope.datasets.some((dataset) => dataset.qrveyid === qrveyid));
 }
 exports.haveFiltersByDataset = haveFiltersByDataset;

package/dist/cjs/filters/helpers/common/index.d.ts

@@ -1,29 +1,29 @@
-export * from './areFiltersEquals';
-export * from './excludeFiltersByAggregateColumn';
-export * from './excludeFiltersByParams';
-export * from './excludeFiltersByScopes';
-export * from './getFilterColumnLabel';
-export * from './getFilterid';
-export * from './getFilterLabel';
-export * from './getFiltersByAggregateColumn';
-export * from './getFiltersByDatasetsColumns';
-export * from './getFiltersByParams';
-export * from './getFiltersByScopes';
-export * from './getFiltersByScopesIds';
-export * from './getFiltersByVisibility';
-export * from './getMergeFiltersSettings';
-export * from './getParamsToGetFilterSettings';
-export * from './getValuesFromModel';
-export * from './getValuesFromDataset';
-export * from './haveFiltersByDataset';
-export * from './isBetweenValidator';
-export * from './isDateDistinctProperty';
-export * from './isInValidator';
-export * from './isNullValidator';
-export * from './isRangeValidator';
-export * from './isRegularValidator';
-export * from './mergeFilters';
-export * from './mergeValues';
-export * from './resolveDatasetConditions';
-export * from './resolveFilterConditions';
-export * from './resolveScopeConditions';
+export * from "./areFiltersEquals";
+export * from "./excludeFiltersByAggregateColumn";
+export * from "./excludeFiltersByParams";
+export * from "./excludeFiltersByScopes";
+export * from "./getFilterColumnLabel";
+export * from "./getFilterid";
+export * from "./getFilterLabel";
+export * from "./getFiltersByAggregateColumn";
+export * from "./getFiltersByDatasetsColumns";
+export * from "./getFiltersByParams";
+export * from "./getFiltersByScopes";
+export * from "./getFiltersByScopesIds";
+export * from "./getFiltersByVisibility";
+export * from "./getMergeFiltersSettings";
+export * from "./getParamsToGetFilterSettings";
+export * from "./getValuesFromModel";
+export * from "./getValuesFromDataset";
+export * from "./haveFiltersByDataset";
+export * from "./isBetweenValidator";
+export * from "./isDateDistinctProperty";
+export * from "./isInValidator";
+export * from "./isNullValidator";
+export * from "./isRangeValidator";
+export * from "./isRegularValidator";
+export * from "./mergeFilters";
+export * from "./mergeValues";
+export * from "./resolveDatasetConditions";
+export * from "./resolveFilterConditions";
+export * from "./resolveScopeConditions";

package/dist/cjs/filters/helpers/common/index.js

@@ -43,4 +43,3 @@ __exportStar(require("./mergeValues"), exports);
 __exportStar(require("./resolveDatasetConditions"), exports);
 __exportStar(require("./resolveFilterConditions"), exports);
 __exportStar(require("./resolveScopeConditions"), exports);
-// export * from './validateFilterTextByColumn';

package/dist/cjs/filters/helpers/common/isBetweenValidator.js

@@ -8,6 +8,9 @@ const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
  * @returns true: it is a between validator; false: it is not a between validator
  */
 function isBetweenValidator(validator) {
-    return [FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE, FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE].includes(validator);
+    return [
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE,
+    ].includes(validator);
 }
 exports.isBetweenValidator = isBetweenValidator;

package/dist/cjs/filters/helpers/common/isDateDistinctProperty.js

@@ -12,6 +12,11 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
  * @returns True if the given property is included from distinct group dates type
  */
 function isDateDistinctProperty(column, property) {
-    return (0, isDateColumn_1.isDateColumn)(column) && (0, isEmpty_1.isEmpty)(column.aggregate) && [...DATE_DISTINCT_PROPERTIES_1.DATE_DISTINCT_PROPERTIES, ...DATE_DISTINCT_TIME_PROPERTIES_1.DATE_DISTINCT_TIME_PROPERTIES].includes(property);
+    return ((0, isDateColumn_1.isDateColumn)(column) &&
+        (0, isEmpty_1.isEmpty)(column.aggregate) &&
+        [
+            ...DATE_DISTINCT_PROPERTIES_1.DATE_DISTINCT_PROPERTIES,
+            ...DATE_DISTINCT_TIME_PROPERTIES_1.DATE_DISTINCT_TIME_PROPERTIES,
+        ].includes(property));
 }
 exports.isDateDistinctProperty = isDateDistinctProperty;

package/dist/cjs/filters/helpers/common/isRangeValidator.js

@@ -9,11 +9,16 @@ const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
  */
 function isRangeValidator(validator) {
     return [
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN, FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN, FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER, FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE, FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE, FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN_EQUAL,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.LESS_THAN_EQUAL,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.AFTER_ON,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BEFORE_ON,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_EXCLUSIVE,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE,
     ].includes(validator);
 }
 exports.isRangeValidator = isRangeValidator;

package/dist/cjs/filters/helpers/common/isRegularValidator.js

@@ -9,10 +9,14 @@ const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
  */
 function isRegularValidator(validator) {
     return [
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.CONTAINS, FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_CONTAIN,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.ENDS_WITH, FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_END_WITH,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.EQUALS, FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_EQUAL,
-        FILTER_VALIDATOR_1.FILTER_VALIDATOR.STARTS_WITH, FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.CONTAINS,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_CONTAIN,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.ENDS_WITH,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_END_WITH,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.EQUALS,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_EQUAL,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.STARTS_WITH,
+        FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH,
     ].includes(validator);
 }
 exports.isRegularValidator = isRegularValidator;

package/dist/cjs/filters/helpers/common/mergeFilters.js

@@ -32,7 +32,7 @@ function mergeFilters(filterData1, filterData2, settings) {
         enabled: filterData1.enabled,
         scopes: mergeScopes(filterData1.scopes, filterData2.scopes, settings),
         section: filterData1.section,
-        version: filterData1.version
+        version: filterData1.version,
     };
 }
 exports.mergeFilters = mergeFilters;
@@ -45,9 +45,15 @@ exports.mergeFilters = mergeFilters;
  */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     let newScopes = scopes1.reduce((scopes, scope1) => {
-        const scope2Index = scopes2.findIndex(scope2 => (0, resolveScopeConditions_1.resolveScopeConditions)(scope2, { scope: scope1.scope, scopeid: scope1.scopeid }));
+        const scope2Index = scopes2.findIndex((scope2) => (0, resolveScopeConditions_1.resolveScopeConditions)(scope2, {
+            scope: scope1.scope,
+            scopeid: scope1.scopeid,
+        }));
         if (scope2Index > -1) {
-            scope1 = Object.assign(Object.assign({}, scopes2[scope2Index]), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
+            scope1 = {
+                ...scopes2[scope2Index],
+                datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings),
+            };
             scopes2.splice(scope2Index, 1);
         }
         scopes.push(scope1);
@@ -66,9 +72,15 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
  */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
-        const dataset2Index = datasets2.findIndex(dataset2 => (0, resolveDatasetConditions_1.resolveDatasetConditions)(dataset2, { qrveyid: dataset1.qrveyid, linkid: dataset1.linkid }));
+        const dataset2Index = datasets2.findIndex((dataset2) => (0, resolveDatasetConditions_1.resolveDatasetConditions)(dataset2, {
+            qrveyid: dataset1.qrveyid,
+            linkid: dataset1.linkid,
+        }));
         if (dataset2Index > -1) {
-            dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
+            dataset1 = {
+                ...datasets2[dataset2Index],
+                filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings),
+            };
             datasets2.splice(dataset2Index, 1);
         }
         datasets.push(dataset1);
@@ -87,14 +99,28 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
  */
 function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
-        const filter2Index = filters2.findIndex(filter2 => (0, resolveFilterConditions_1.resolveFilterConditions)(filter2, { column: filter1.column, dateSection: filter1.dateSection, panelid: filter1.extras.panelid, property: filter1.property, validator: filter1.validator }));
+        const filter2Index = filters2.findIndex((filter2) => (0, resolveFilterConditions_1.resolveFilterConditions)(filter2, {
+            column: filter1.column,
+            dateSection: filter1.dateSection,
+            panelid: filter1.extras.panelid,
+            property: filter1.property,
+            validator: filter1.validator,
+        }));
         if (filter2Index > -1) {
-            filter1 = Object.assign(Object.assign({}, filter1), { values: (0, mergeValues_1.mergeValues)(filter1, filters2[filter2Index], settings) });
+            filter1 = {
+                ...filter1,
+                values: (0, mergeValues_1.mergeValues)(filter1, filters2[filter2Index], settings),
+            };
             filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
             filters2.splice(filter2Index, 1);
         }
         else {
-            filter1 = Object.assign(Object.assign({}, filter1), { operator: settings.setGroupedColumnOperator ? FILTER_GROUPED_COLUMN_OPERATOR_1.FILTER_GROUPED_COLUMN_OPERATOR : filter1.operator });
+            filter1 = {
+                ...filter1,
+                operator: settings.setGroupedColumnOperator
+                    ? FILTER_GROUPED_COLUMN_OPERATOR_1.FILTER_GROUPED_COLUMN_OPERATOR
+                    : filter1.operator,
+            };
         }
         filter1.filterid = (0, getFilterid_1.getFilterid)(filter1);
         filters.push(filter1);
@@ -112,9 +138,20 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
  * @returns a new filter structure with overwritted props
  */
 function mergeFilterProps(filter1, filter2, settings) {
-    var _a, _b, _c;
     if (settings.overwriteFilterProps) {
-        filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, operator: filter2.operator || filter1.operator, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
+        filter1 = {
+            ...filter1,
+            collapsed: filter2.collapsed ?? filter1.collapsed,
+            displayed: filter2.displayed ?? filter1.displayed,
+            dateSection: filter2.dateSection,
+            extras: filter2.extras,
+            enabled: filter2.enabled ?? filter1.enabled,
+            operator: filter2.operator || filter1.operator,
+            filterid: filter2.filterid,
+            lookupDisplayIndex: filter2.lookupDisplayIndex,
+            nullValues: filter2.nullValues,
+            selectAll: filter2.selectAll,
+        };
     }
     return filter1;
 }

package/dist/cjs/filters/helpers/common/mergeValues.js

@@ -28,8 +28,12 @@ function mergeValues(filter1, filter2, settings) {
     else {
         if ((0, isInValidator_1.isInValidator)(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
-                var _a, _b;
-                const value1Index = filter1Values.findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
+                const value1Index = filter1Values.findIndex((value1) => value2.anchor === value1.anchor &&
+                    value2.cursor === value1.cursor &&
+                    value2.includeCurrent === value1.includeCurrent &&
+                    value2.isCalendarDate === value1.isCalendarDate &&
+                    value2.number === value1.number &&
+                    value2.unit === value1.unit);
                 if (value1Index === -1) {
                     values.push(value2);
                 }
@@ -37,8 +41,8 @@ function mergeValues(filter1, filter2, settings) {
                     values[value1Index] = {
                         anchor: value2.anchor,
                         cursor: value2.cursor,
-                        displayed: (_a = value2.displayed) !== null && _a !== void 0 ? _a : values[value1Index].displayed,
-                        enabled: (_b = value2.enabled) !== null && _b !== void 0 ? _b : values[value1Index].enabled,
+                        displayed: value2.displayed ?? values[value1Index].displayed,
+                        enabled: value2.enabled ?? values[value1Index].enabled,
                         includeCurrent: value2.includeCurrent,
                         isCalendarDate: value2.isCalendarDate,
                         number: value2.number,
@@ -50,15 +54,14 @@ function mergeValues(filter1, filter2, settings) {
         }
         else if ((0, isRangeValidator_1.isRangeValidator)(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
-                var _a, _b;
-                const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                const value1Index = filter1Values.findIndex((value1) => value2.max === value1.max && value2.min === value1.min);
                 if (value1Index === -1) {
                     values.push(value2);
                 }
                 else {
                     values[value1Index] = {
-                        displayed: (_a = value2.displayed) !== null && _a !== void 0 ? _a : values[value1Index].displayed,
-                        enabled: (_b = value2.enabled) !== null && _b !== void 0 ? _b : values[value1Index].enabled,
+                        displayed: value2.displayed ?? values[value1Index].displayed,
+                        enabled: value2.enabled ?? values[value1Index].enabled,
                         max: value2.max,
                         min: value2.min,
                     };
@@ -66,17 +69,18 @@ function mergeValues(filter1, filter2, settings) {
                 return values;
             }, filter1Values);
         }
-        else if ((0, isRegularValidator_1.isRegularValidator)(filter1.validator) || (0, isNullValidator_1.isNullValidator)(filter1.validator)) {
+        else if ((0, isRegularValidator_1.isRegularValidator)(filter1.validator) ||
+            (0, isNullValidator_1.isNullValidator)(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
-                var _a, _b;
-                const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                const value1Index = filter1Values.findIndex((value1) => value2.imageUrl === value1.imageUrl &&
+                    value2.value === value1.value);
                 if (value1Index === -1) {
                     values.push(value2);
                 }
                 else {
                     values[value1Index] = {
-                        displayed: (_a = value2.displayed) !== null && _a !== void 0 ? _a : values[value1Index].displayed,
-                        enabled: (_b = value2.enabled) !== null && _b !== void 0 ? _b : values[value1Index].enabled,
+                        displayed: value2.displayed ?? values[value1Index].displayed,
+                        enabled: value2.enabled ?? values[value1Index].enabled,
                         imageUrl: value2.imageUrl,
                         value: value2.value,
                         valueid: value2.valueid,