@qrvey/utils 1.5.0-0 → 1.5.0-11

package/dist/cjs/dates/relative/constants/RELATIVE_UNIT_INFO_LIST.js

@@ -6,9 +6,9 @@ const RELATIVE_UNIT_INFO_1 = require("./RELATIVE_UNIT_INFO");
  * @description Key/array of compound relative cursor info
  */
 exports.RELATIVE_UNIT_INFO_LIST = [
-    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO["YEAR"],
-    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO["QUARTER"],
-    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO["MONTH"],
-    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO["WEEK"],
-    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO["DAY"],
+    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO.YEAR,
+    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO.QUARTER,
+    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO.MONTH,
+    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO.WEEK,
+    RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO.DAY,
 ];

package/dist/cjs/filters/adapters/FDToFlatUI.js

@@ -18,9 +18,9 @@ function FDToFlatUI(filterData, datasetsInfo = []) {
         (0, isEmpty_1.isEmpty)(filterData.scopes) ||
         filterData.scopes.length === 0)
         return uFilters;
-    filterData = (0, cloneDeep_1.cloneDeep)(filterData);
-    if (filterData.version === "2.1") {
-        uFilters = FD21ToFlatUI(filterData.scopes, datasetsInfo);
+    const _filterData = (0, cloneDeep_1.cloneDeep)(filterData);
+    if (_filterData.version === "2.1") {
+        uFilters = FD21ToFlatUI(_filterData.scopes, datasetsInfo);
     }
     return uFilters;
 }
@@ -85,7 +85,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,
                             operator: filter.operator,
-                            property: property,
+                            property,
                             selectAll: filter.selectAll,
                             validator: filter.validator,
                             values: (0, adaptFilterValues_1.adaptFilterValues)(filter),

package/dist/cjs/filters/adapters/FDToUI.js

@@ -17,9 +17,9 @@ function FDToUI(filterData, datasetsInfo = []) {
     let ufData;
     if ((0, isEmpty_1.isEmpty)(filterData) || (0, isEmpty_1.isEmpty)(filterData.scopes))
         return ufData;
-    filterData = (0, cloneDeep_1.cloneDeep)(filterData);
-    if (filterData.version === "2.1") {
-        ufData = FD21ToUI(filterData.scopes, filterData.section, filterData.enabled, datasetsInfo, filterData.version);
+    const _filterData = (0, cloneDeep_1.cloneDeep)(filterData);
+    if (_filterData.version === "2.1") {
+        ufData = FD21ToUI(_filterData.scopes, _filterData.section, _filterData.enabled, datasetsInfo, _filterData.version);
     }
     return ufData;
 }

package/dist/cjs/filters/adapters/UIToFD.js

@@ -14,9 +14,9 @@ function UIToFD(uFilterData) {
         (0, isEmpty_1.isEmpty)(uFilterData.scopes) ||
         !Array.isArray(uFilterData.scopes))
         return sData;
-    uFilterData = (0, cloneDeep_1.cloneDeep)(uFilterData);
-    if (uFilterData.version === "2.1") {
-        sData = UI21ToFD(uFilterData, uFilterData.version);
+    const _uFilterData = (0, cloneDeep_1.cloneDeep)(uFilterData);
+    if (_uFilterData.version === "2.1") {
+        sData = UI21ToFD(_uFilterData, _uFilterData.version);
     }
     return sData;
 }

package/dist/cjs/filters/adapters/UIToFlatUI.js

@@ -17,9 +17,9 @@ function UIToFlatUI(filterData, datasetsInfo = []) {
         (0, isEmpty_1.isEmpty)(filterData.scopes) ||
         filterData.scopes.length === 0)
         return uFilters;
-    filterData = (0, cloneDeep_1.cloneDeep)(filterData);
-    if (filterData.version === "2.1") {
-        uFilters = UI21ToFlatUI(filterData.scopes, datasetsInfo);
+    const _filterData = (0, cloneDeep_1.cloneDeep)(filterData);
+    if (_filterData.version === "2.1") {
+        uFilters = UI21ToFlatUI(_filterData.scopes, datasetsInfo);
     }
     return uFilters;
 }

package/dist/cjs/filters/adapters/UIToOldLogic.js

@@ -17,11 +17,11 @@ function UIToOldLogic(uFilterData, flattedMethod = true) {
     let oldFilterData;
     if ((0, isEmpty_1.isEmpty)(uFilterData) || (0, isEmpty_1.isEmpty)(uFilterData.scopes))
         return oldFilterData;
-    uFilterData = (0, cloneDeep_1.cloneDeep)(uFilterData);
-    if (uFilterData.version === "2.1") {
+    const _uFilterData = (0, cloneDeep_1.cloneDeep)(uFilterData);
+    if (_uFilterData.version === "2.1") {
         oldFilterData = flattedMethod
-            ? (0, flatUIToOldLogic_1.flatUIToOldLogic)((0, UIToFlatUI_1.UIToFlatUI)(uFilterData), uFilterData.section)
-            : UI21ToOldLogic(uFilterData);
+            ? (0, flatUIToOldLogic_1.flatUIToOldLogic)((0, UIToFlatUI_1.UIToFlatUI)(_uFilterData), _uFilterData.section)
+            : UI21ToOldLogic(_uFilterData);
     }
     return oldFilterData;
 }
@@ -43,7 +43,7 @@ function buildLogics(scopeSection, section) {
             uiExtras: {
                 scopeid: scope.scopeid,
                 collapsed: scope.collapsed,
-                section: section,
+                section,
             },
         };
         logics.push(logic);
@@ -83,7 +83,7 @@ function buildExpressions(filterSection, scope, dataset) {
             value: (0, getBackendValues_1.getBackendValues)(filter),
             uiExtras: getFilterDetail(filter, scope, dataset),
         };
-        expression["enabled"] =
+        expression.enabled =
             filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0
                 ? filter.enabled
                 : false;

package/dist/cjs/filters/adapters/adaptFilterData.js

@@ -18,16 +18,16 @@ const logicToFD_1 = require("./logicToFD");
 function adaptFilterData(filterData, getUIFilterData = true, datasetsInfo = []) {
     if ((0, isEmpty_1.isEmpty)(filterData))
         return;
-    filterData = (0, cloneDeep_1.cloneDeep)(filterData);
-    if (!(0, isEmpty_1.isEmpty)((0, get_1._get)(filterData, "logic"))) {
+    const _filterData = (0, cloneDeep_1.cloneDeep)(filterData);
+    if (!(0, isEmpty_1.isEmpty)((0, get_1._get)(_filterData, "logic"))) {
         return getUIFilterData
-            ? (0, logicToUI_1.logicToUI)((0, get_1._get)(filterData, "logic"), (0, get_1._get)(filterData, "section"), (0, get_1._get)(filterData, "enabled"))
-            : (0, logicToFD_1.logicToFD)((0, get_1._get)(filterData, "logic"), (0, get_1._get)(filterData, "section"), (0, get_1._get)(filterData, "enabled"));
+            ? (0, logicToUI_1.logicToUI)((0, get_1._get)(_filterData, "logic"), (0, get_1._get)(_filterData, "section"), (0, get_1._get)(_filterData, "enabled"))
+            : (0, logicToFD_1.logicToFD)((0, get_1._get)(_filterData, "logic"), (0, get_1._get)(_filterData, "section"), (0, get_1._get)(_filterData, "enabled"));
     }
-    if (!(0, isEmpty_1.isEmpty)((0, get_1._get)(filterData, "scopes"))) {
+    if (!(0, isEmpty_1.isEmpty)((0, get_1._get)(_filterData, "scopes"))) {
         return getUIFilterData
-            ? (0, FDToUI_1.FDToUI)(filterData, datasetsInfo)
-            : (0, UIToFD_1.UIToFD)(filterData);
+            ? (0, FDToUI_1.FDToUI)(_filterData, datasetsInfo)
+            : (0, UIToFD_1.UIToFD)(_filterData);
     }
 }
 exports.adaptFilterData = adaptFilterData;

package/dist/cjs/filters/adapters/flatUIToFD.js

@@ -85,34 +85,34 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
-    uFilter = (0, cloneDeep_1.cloneDeep)(uFilter);
-    const info = !(0, isEmpty_1.isEmpty)(uFilter.extras.info)
-        ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label }
+    const _uFilter = (0, cloneDeep_1.cloneDeep)(uFilter);
+    const info = !(0, isEmpty_1.isEmpty)(_uFilter.extras.info)
+        ? { icon: _uFilter.extras.info.icon, label: _uFilter.extras.info.label }
         : undefined;
-    const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(uFilter.property);
-    delete uFilter.extras.scopeInfo;
-    delete uFilter.extras.dataset;
+    const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(_uFilter.property);
+    delete _uFilter.extras.scopeInfo;
+    delete _uFilter.extras.dataset;
     return {
-        collapsed: uFilter.collapsed,
+        collapsed: _uFilter.collapsed,
         column: {
-            id: uFilter.column.id,
-            formulaType: uFilter.column.formulaType,
-            qrveyid: uFilter.column.qrveyid,
-            aggregate: uFilter.column.aggregate,
-            calculation: uFilter.column.calculation,
-            type: uFilter.column.type,
+            id: _uFilter.column.id,
+            formulaType: _uFilter.column.formulaType,
+            qrveyid: _uFilter.column.qrveyid,
+            aggregate: _uFilter.column.aggregate,
+            calculation: _uFilter.column.calculation,
+            type: _uFilter.column.type,
         },
-        dateSection: uFilter.dateSection,
-        displayed: uFilter.displayed,
-        filterid: uFilter.filterid,
-        enabled: uFilter.enabled,
-        extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
-        lookupDisplayIndex: uFilter.lookupDisplayIndex,
-        nullValues: uFilter.nullValues,
-        operator: uFilter.operator,
+        dateSection: _uFilter.dateSection,
+        displayed: _uFilter.displayed,
+        filterid: _uFilter.filterid,
+        enabled: _uFilter.enabled,
+        extras: Object.assign(Object.assign({}, _uFilter.extras), { panelid: _uFilter.extras.panelid, filterLabel: _uFilter.extras.filterLabel, info, scope: _uFilter.extras.scope, scopeid: _uFilter.extras.scopeid, section: _uFilter.extras.section }),
+        lookupDisplayIndex: _uFilter.lookupDisplayIndex,
+        nullValues: _uFilter.nullValues,
+        operator: _uFilter.operator,
         property,
-        selectAll: uFilter.selectAll,
-        validator: uFilter.validator,
-        values: (0, adaptFilterValues_1.adaptFilterValues)(uFilter),
+        selectAll: _uFilter.selectAll,
+        validator: _uFilter.validator,
+        values: (0, adaptFilterValues_1.adaptFilterValues)(_uFilter),
     };
 }

package/dist/cjs/filters/adapters/flatUIToOldLogic.js

@@ -26,8 +26,8 @@ function flatUIToOldLogic(uFilters, section = FILTER_SECTION_1.FILTER_SECTION.AN
     let oldFilterData;
     if ((0, isEmpty_1.isEmpty)(uFilters))
         return oldFilterData;
-    uFilters = (0, cloneDeep_1.cloneDeep)(uFilters);
-    const filterDetails = flatUIToOldFilterDetail(uFilters);
+    const uFilterss = (0, cloneDeep_1.cloneDeep)(uFilters);
+    const filterDetails = flatUIToOldFilterDetail(uFilterss);
     return {
         collapsed: false,
         enabled: true,
@@ -36,49 +36,44 @@ function flatUIToOldLogic(uFilters, section = FILTER_SECTION_1.FILTER_SECTION.AN
     };
 }
 exports.flatUIToOldLogic = flatUIToOldLogic;
-const flatUIToOldFilterDetail = (uFilters = []) => {
-    return uFilters.map((filter) => {
-        return {
-            collapsed: filter.collapsed,
-            column: {
-                dataset: {
-                    name: filter.extras.dataset.label,
-                    qrveyid: filter.extras.dataset.qrveyid,
-                },
-                id: filter.column.id,
-                qrveyid: filter.column.qrveyid,
-                text: filter.column.label,
-                type: filter.column.type,
-                aggregate: filter.column.aggregate,
-                calculation: filter.column.calculation,
-                formulaType: filter.column.formulaType,
-                linked: undefined,
-                outputFormat: filter.column.outputFormat,
-                property: filter.column.property,
-                sorting: filter.column.sorting,
-            },
-            dateSection: filter.dateSection,
-            enabled: filter.enabled,
-            extras: filter.extras,
-            lookupDisplayIndex: filter.lookupDisplayIndex,
-            info: filter.extras.info,
-            nullValues: filter.nullValues,
-            operator: filter.operator,
-            property: filter.property,
-            scope: filter.extras.scope,
-            scopeid: filter.extras.scopeid,
-            scopeEnabled: filter.extras.scopeInfo.enabled,
-            panelid: filter.extras.panelid,
-            panelName: filter.extras.filterLabel,
-            section: filter.extras.section,
-            selectAll: filter.selectAll,
-            uiValue: (0, getUIValues_1.getUIValues)(filter, { addEnableds: true }),
-            validator: filter.validator,
-            values: filter.values,
-            _newFilters: Object.assign({}, filter),
-        };
-    });
-};
+const flatUIToOldFilterDetail = (uFilters = []) => uFilters.map((filter) => ({
+    collapsed: filter.collapsed,
+    column: {
+        dataset: {
+            name: filter.extras.dataset.label,
+            qrveyid: filter.extras.dataset.qrveyid,
+        },
+        id: filter.column.id,
+        qrveyid: filter.column.qrveyid,
+        text: filter.column.label,
+        type: filter.column.type,
+        aggregate: filter.column.aggregate,
+        calculation: filter.column.calculation,
+        formulaType: filter.column.formulaType,
+        outputFormat: filter.column.outputFormat,
+        property: filter.column.property,
+        sorting: filter.column.sorting,
+    },
+    dateSection: filter.dateSection,
+    enabled: filter.enabled,
+    extras: filter.extras,
+    lookupDisplayIndex: filter.lookupDisplayIndex,
+    info: filter.extras.info,
+    nullValues: filter.nullValues,
+    operator: filter.operator,
+    property: filter.property,
+    scope: filter.extras.scope,
+    scopeid: filter.extras.scopeid,
+    scopeEnabled: filter.extras.scopeInfo.enabled,
+    panelid: filter.extras.panelid,
+    panelName: filter.extras.filterLabel,
+    section: filter.extras.section,
+    selectAll: filter.selectAll,
+    uiValue: (0, getUIValues_1.getUIValues)(filter, { addEnableds: true }),
+    validator: filter.validator,
+    values: filter.values,
+    _newFilters: Object.assign({}, filter),
+}));
 function getLogicBody(uFilters) {
     return uFilters.reduce((scopes, props) => {
         const scopeIndex = scopes.findIndex((sc) => sc.scope === props.scope && sc.uiExtras.scopeid === props.scopeid);
@@ -155,7 +150,7 @@ function getRegularExpression(props) {
         value: getValues(props),
         uiExtras: Object.assign(Object.assign({}, props), { uiValue }),
     };
-    expression["enabled"] =
+    expression.enabled =
         props.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? props.enabled : false;
     return expression;
 }
@@ -302,9 +297,7 @@ function getResultValues(values, props) {
             if (props.column.type === COLUMN_1.COLUMN.IMAGE) {
                 return value.valueid || value.imageUrl || value.value;
             }
-            else {
-                return value.value;
-            }
+            return value.value;
         }
     })
         .filter(Boolean);

package/dist/cjs/filters/adapters/flatUIToUI.js

@@ -95,39 +95,39 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
-    uFilter = (0, cloneDeep_1.cloneDeep)(uFilter);
-    const info = !(0, isEmpty_1.isEmpty)(uFilter.extras.info)
-        ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label }
+    const _uFilter = (0, cloneDeep_1.cloneDeep)(uFilter);
+    const info = !(0, isEmpty_1.isEmpty)(_uFilter.extras.info)
+        ? { icon: _uFilter.extras.info.icon, label: _uFilter.extras.info.label }
         : undefined;
-    const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(uFilter.property);
-    delete uFilter.extras.scopeInfo;
-    delete uFilter.extras.dataset;
+    const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(_uFilter.property);
+    delete _uFilter.extras.scopeInfo;
+    delete _uFilter.extras.dataset;
     return {
-        collapsed: uFilter.collapsed,
+        collapsed: _uFilter.collapsed,
         column: {
-            aggregate: uFilter.column.aggregate,
-            calculation: uFilter.column.calculation,
-            formulaType: uFilter.column.formulaType,
-            id: uFilter.column.id,
-            label: uFilter.column.label,
-            outputFormat: uFilter.column.outputFormat,
-            property: uFilter.column.property,
-            qrveyid: uFilter.column.qrveyid,
-            sorting: uFilter.column.sorting,
-            uniqueid: uFilter.column.uniqueid,
-            type: uFilter.column.type,
+            aggregate: _uFilter.column.aggregate,
+            calculation: _uFilter.column.calculation,
+            formulaType: _uFilter.column.formulaType,
+            id: _uFilter.column.id,
+            label: _uFilter.column.label,
+            outputFormat: _uFilter.column.outputFormat,
+            property: _uFilter.column.property,
+            qrveyid: _uFilter.column.qrveyid,
+            sorting: _uFilter.column.sorting,
+            uniqueid: _uFilter.column.uniqueid,
+            type: _uFilter.column.type,
         },
-        dateSection: uFilter.dateSection,
-        displayed: uFilter.displayed,
-        filterid: uFilter.filterid,
-        enabled: uFilter.enabled,
-        extras: Object.assign(Object.assign({}, uFilter.extras), { panelid: uFilter.extras.panelid, filterLabel: uFilter.extras.filterLabel, info, scope: uFilter.extras.scope, scopeid: uFilter.extras.scopeid, section: uFilter.extras.section }),
-        lookupDisplayIndex: uFilter.lookupDisplayIndex,
-        nullValues: uFilter.nullValues,
-        operator: uFilter.operator,
+        dateSection: _uFilter.dateSection,
+        displayed: _uFilter.displayed,
+        filterid: _uFilter.filterid,
+        enabled: _uFilter.enabled,
+        extras: Object.assign(Object.assign({}, _uFilter.extras), { panelid: _uFilter.extras.panelid, filterLabel: _uFilter.extras.filterLabel, info, scope: _uFilter.extras.scope, scopeid: _uFilter.extras.scopeid, section: _uFilter.extras.section }),
+        lookupDisplayIndex: _uFilter.lookupDisplayIndex,
+        nullValues: _uFilter.nullValues,
+        operator: _uFilter.operator,
         property,
-        selectAll: uFilter.selectAll,
-        validator: uFilter.validator,
-        values: (0, adaptFilterValues_1.adaptFilterValues)(uFilter),
+        selectAll: _uFilter.selectAll,
+        validator: _uFilter.validator,
+        values: (0, adaptFilterValues_1.adaptFilterValues)(_uFilter),
     };
 }

package/dist/cjs/filters/adapters/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./transformFilters";
 export * from "./modelAnswerToFilterValue";
 export * from "./adaptDateGroupingProperty";
 export * from "./adaptFilterData";

package/dist/cjs/filters/adapters/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./transformFilters"), exports);
 __exportStar(require("./modelAnswerToFilterValue"), exports);
 __exportStar(require("./adaptDateGroupingProperty"), exports);
 __exportStar(require("./adaptFilterData"), exports);

package/dist/cjs/filters/adapters/logicToFlatUI.js

@@ -161,12 +161,10 @@ function getFilter(filters, filter, getIndex = false) {
  * @returns the array of Ranking values
  */
 function refineRankingValues(values = [], uiValues = []) {
-    return values.map((valueGroup) => {
-        return [
-            ...valueGroup.map((value) => {
-                const rValue = uiValues.find((uiV) => uiV.valueid === value.value.valueid);
-                return Object.assign(Object.assign({}, value), { displayed: rValue && rValue.displayed != null ? rValue.displayed : true, enabled: rValue && rValue.enabled != null ? rValue.enabled : true });
-            }),
-        ];
-    });
+    return values.map((valueGroup) => [
+        ...valueGroup.map((value) => {
+            const rValue = uiValues.find((uiV) => uiV.valueid === value.value.valueid);
+            return Object.assign(Object.assign({}, value), { displayed: rValue && rValue.displayed != null ? rValue.displayed : true, enabled: rValue && rValue.enabled != null ? rValue.enabled : true });
+        }),
+    ]);
 }

package/dist/cjs/filters/helpers/OLD_getAggFilters.js

@@ -50,8 +50,8 @@ exports.getAggFilters = getAggFilters;
  * @returns the aggregate filters in the IFilterFilters way or as logic structure.
  */
 function getAggregateFilters(logics = []) {
-    logics = (0, cloneDeep_1.cloneDeep)(logics);
-    return logics.reduce((newLogics, logic) => {
+    const _logics = (0, cloneDeep_1.cloneDeep)(logics);
+    return _logics.reduce((newLogics, logic) => {
         if (!logic)
             return newLogics;
         logic.filters.forEach((filter, index) => {
@@ -82,9 +82,10 @@ function concatAggFilters(aggFilters, operator = FILTER_OPERATOR_1.FILTER_OPERAT
 }
 function getExpressionsInLogic(logics = []) {
     return logics.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;
     }, []);
 }

package/dist/cjs/filters/helpers/backend/buildExpression.js

@@ -21,7 +21,7 @@ function buildExpression(filter) {
         validationType: (0, getBackendValidator_1.getBackendValidator)(filter),
         value: (0, getBackendValues_1.getBackendValues)(filter),
     };
-    expression["enabled"] =
+    expression.enabled =
         filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? filter.enabled : false;
     return expression;
 }

package/dist/cjs/filters/helpers/backend/buildFilters.js

@@ -20,16 +20,12 @@ function buildFilters(filters, groupColumns = false) {
             const groupedExpression = {
                 operator: FILTER_OPERATOR_1.FILTER_OPERATOR.AND,
                 expressions: andOperators
-                    .map((group2) => {
-                    return getColumnExpressions(group2, getFilter);
-                })
+                    .map((group2) => getColumnExpressions(group2, getFilter))
                     .filter(Boolean),
             };
             return groupedExpression;
         }
-        else {
-            return getColumnExpressions(group, getFilter);
-        }
+        return getColumnExpressions(group, getFilter);
     })
         .filter(Boolean);
     if (orOperators.length > 1) {
@@ -40,14 +36,10 @@ function buildFilters(filters, groupColumns = false) {
             },
         ];
     }
-    else {
-        if ((0, hasProperty_1._hasProperty)(expressions[0], "expressions")) {
-            return expressions;
-        }
-        else {
-            return [{ operator: FILTER_OPERATOR_1.FILTER_OPERATOR.AND, expressions }];
-        }
+    if ((0, hasProperty_1._hasProperty)(expressions[0], "expressions")) {
+        return expressions;
     }
+    return [{ operator: FILTER_OPERATOR_1.FILTER_OPERATOR.AND, expressions }];
 }
 exports.buildFilters = buildFilters;
 function getColumnExpressions(group, getFilter) {
@@ -60,9 +52,7 @@ function getColumnExpressions(group, getFilter) {
                 .filter(Boolean),
         };
     }
-    else {
-        return getFilter(group);
-    }
+    return getFilter(group);
 }
 function logicToNumeric(operator, priority = false) {
     if (operator === FILTER_OPERATOR_1.FILTER_OPERATOR.AND) {

package/dist/cjs/filters/helpers/backend/getBackendValidator.js

@@ -46,7 +46,7 @@ function getBackendValidator(filter) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL:
             return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.IS_NOT_NULL;
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
-            //[TODO: FILTERS - Validate with backend if this will always be the validator type]
+            // [TODO: FILTERS - Validate with backend if this will always be the validator type]
             return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.RELATIVE;
         default:
             return FILTER_BACKEND_VALIDATOR_1.FILTER_BACKEND_VALIDATOR.EQUALS;

package/dist/cjs/filters/helpers/backend/getBackendValues.js

@@ -106,9 +106,7 @@ function getResultValues(values, filter) {
             if (filter.column.type === COLUMN_1.COLUMN.IMAGE) {
                 return value.valueid || value.imageUrl || value.value;
             }
-            else {
-                return value.value;
-            }
+            return value.value;
         }
     })
         .filter(Boolean);

package/dist/cjs/filters/helpers/backend/getLogicByDatasets.js

@@ -16,10 +16,10 @@ function getLogicByDatasets(logic, datasets = [], settings) {
         return;
     if ((0, isEmpty_1.isEmpty)(datasets))
         return logic;
-    settings = getGetLogicByDatasetsSettings(settings);
+    const defaultSettings = getGetLogicByDatasetsSettings(settings);
     return logic.map((_l) => (Object.assign(Object.assign({}, _l), { filters: (0, general_1.filterNestedTree)(_l.filters, "expressions", (expression) => {
             const dataset = datasets.find((_data) => _data === expression.qrveyid);
-            return ((settings.letPassUndefinedProperties.qrveyid &&
+            return ((defaultSettings.letPassUndefinedProperties.qrveyid &&
                 !(0, general_1._hasProperty)(expression, "qrveyid")) ||
                 !(0, isEmpty_1.isEmpty)(dataset));
         }) })));

package/dist/cjs/filters/helpers/backend/getLogicByDatasetsColumns.js

@@ -17,8 +17,8 @@ function getLogicByDatasetsColumns(logic, datasets = [], settings) {
         return;
     if ((0, isEmpty_1.isEmpty)(datasets))
         return logic;
-    settings = getGetLogicByDatasetsSettings(settings);
-    return logic.map((_l) => (Object.assign(Object.assign({}, _l), { filters: (0, filterNestedTree_1.filterNestedTree)(_l.filters, "expressions", filterCallback(settings, datasets)) })));
+    const defaultSettings = getGetLogicByDatasetsSettings(settings);
+    return logic.map((_l) => (Object.assign(Object.assign({}, _l), { filters: (0, filterNestedTree_1.filterNestedTree)(_l.filters, "expressions", filterCallback(defaultSettings, datasets)) })));
 }
 exports.getLogicByDatasetsColumns = getLogicByDatasetsColumns;
 /**

package/dist/cjs/filters/helpers/backend/getLogicByScopes.js

@@ -10,9 +10,9 @@ const FILTER_SCOPE_1 = require("../../constants/common/FILTER_SCOPE");
  * @returns a new Logic array
  */
 function getLogicByScopes(logics = [], scopes = []) {
-    logics = (0, cloneDeep_1.cloneDeep)(logics);
+    const _logics = (0, cloneDeep_1.cloneDeep)(logics);
     return scopes.reduce((newScopes, scope) => {
-        const filteredScopes = logics.filter((logic) => scope.label === logic.scope &&
+        const filteredScopes = _logics.filter((logic) => scope.label === logic.scope &&
             (scope.id === logic.scopeid ||
                 (logic.scope === FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL && logic.scopeid == null)) &&
             logic.filters.length > 0);

package/dist/cjs/filters/helpers/backend/getLogicByScopesHierarchy.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLogicByScopesHierarchy = void 0;
-const cloneDeep_1 = require("../../../general/object/cloneDeep");
 const FILTER_SCOPE_1 = require("../../constants/common/FILTER_SCOPE");
 const getScopesByHierarchy_1 = require("../getScopesByHierarchy");
 const getLogicByScopes_1 = require("./getLogicByScopes");
@@ -13,7 +12,6 @@ const getLogicByScopes_1 = require("./getLogicByScopes");
  * @returns a new array of Logic
  */
 function getLogicByScopesHierarchy(logics = [], scopes = [], currentScope = FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL) {
-    logics = (0, cloneDeep_1.cloneDeep)(logics);
     return (0, getLogicByScopes_1.getLogicByScopes)(logics, (0, getScopesByHierarchy_1.getScopesByHierarchy)(scopes, currentScope));
 }
 exports.getLogicByScopesHierarchy = getLogicByScopesHierarchy;

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

@@ -11,8 +11,8 @@ const cloneDeep_1 = require("../../../general/object/cloneDeep");
 function excludeFiltersByAggregateColumn(filterData) {
     if ((0, isEmpty_1.isEmpty)(filterData) || (0, isEmpty_1.isEmpty)(filterData.scopes))
         return;
-    filterData = (0, cloneDeep_1.cloneDeep)(filterData);
-    filterData.scopes = filterData.scopes.reduce((scopes, scope) => {
+    const _filterData = (0, cloneDeep_1.cloneDeep)(filterData);
+    _filterData.scopes = _filterData.scopes.reduce((scopes, scope) => {
         if ((0, isEmpty_1.isEmpty)(scope))
             return scopes;
         scope.datasets.forEach((dataset, index) => {
@@ -25,6 +25,6 @@ function excludeFiltersByAggregateColumn(filterData) {
             scopes.push(scope);
         return scopes;
     }, []);
-    return filterData.scopes.length > 0 ? filterData : undefined;
+    return _filterData.scopes.length > 0 ? _filterData : undefined;
 }
 exports.excludeFiltersByAggregateColumn = excludeFiltersByAggregateColumn;