@qrvey/utils 1.16.1-8 → 1.17.0-0

package/dist/filters/adapters/adaptFilterValues.d.ts

@@ -1,9 +1,3 @@
 import { IFValue } from "../interfaces/IFValue";
 import { IFSFilter } from "../interfaces/common/IFSFilter";
-/**
- * [TODO: For 2022, eliminate this adapter]
- * Gets an adapted filter value array. Validates the enabled property and sets
- * @param filter The filter
- * @returns A new value array with the filled properties.
- */
 export declare function adaptFilterValues(filter: IFSFilter): IFValue[];

package/dist/filters/adapters/adaptFilterValues.js

@@ -1,13 +1,12 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { isRankingFilter } from "../helpers/common/isRankingFilter";
-/**
- * [TODO: For 2022, eliminate this adapter]
- * Gets an adapted filter value array. Validates the enabled property and sets
- * @param filter The filter
- * @returns A new value array with the filled properties.
- */
 export function adaptFilterValues(filter) {
-    const setValue = (value) => (Object.assign(Object.assign({}, value), { value: isEmpty(value.value) ? undefined : value.value, displayed: isEmpty(value.displayed) ? true : value.displayed, enabled: isEmpty(value.enabled) ? true : value.enabled }));
+    const setValue = (value) => ({
+        ...value,
+        value: isEmpty(value.value) ? undefined : value.value,
+        displayed: isEmpty(value.displayed) ? true : value.displayed,
+        enabled: isEmpty(value.enabled) ? true : value.enabled,
+    });
     if (isRankingFilter(filter)) {
         return (filter.values || []).map((rValues) => rValues.map(setValue));
     }

package/dist/filters/adapters/flatUIToFD.d.ts

@@ -1,10 +1,4 @@
 import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
 import { IFSection } from "../interfaces/IFSection";
 import { IFSData } from "../interfaces/common/IFSData";
-/**
- * Generates a filter data structure from the flatttened UI filters.
- * @param uFilters Array of flattened filters from UI
- * @param version Tag for the version of the filter data structure
- * @returns a Filter Data.
- */
 export declare function flatUIToFD(uFilters?: IFUFlattenedFilter[], section?: IFSection, enabled?: boolean, version?: string): IFSData;

package/dist/filters/adapters/flatUIToFD.js

@@ -4,12 +4,6 @@ import { adaptFilterValues } from "./adaptFilterValues";
 import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
 import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
 import { objectCopy } from "../../general/object/objectCopy";
-/**
- * Generates a filter data structure from the flatttened UI filters.
- * @param uFilters Array of flattened filters from UI
- * @param version Tag for the version of the filter data structure
- * @returns a Filter Data.
- */
 export function flatUIToFD(uFilters = [], section = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION) {
     return {
         enabled,
@@ -18,12 +12,6 @@ export function flatUIToFD(uFilters = [], section = FILTER_SECTION.ANYWHERE, ena
         scopes: buildScopes(uFilters),
     };
 }
-/**
- * Gets an array of scopes structure for the filter data. The scopes is organized by scope types and scope IDs
- * Also, adds and organizes filters by datasets
- * @param fbFilters Array of flat filters from UI
- * @returns an array of scopes structure.
- */
 function buildScopes(uFilters) {
     return uFilters.reduce((scopes, uFilter) => {
         const uiFilter = buildFilter(uFilter);
@@ -35,10 +23,13 @@ function buildScopes(uFilters) {
             ? scopes[scopeIndex].datasets.findIndex((dt) => dt.qrveyid === uFilter.extras.dataset.qrveyid)
             : -1;
         if (scopeIndex === -1) {
-            scopes.push(Object.assign(Object.assign({}, uiScope), { datasets: [Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] })] }));
+            scopes.push({
+                ...uiScope,
+                datasets: [{ ...uiDataset, filters: [uiFilter] }],
+            });
         }
         else if (datasetIndex === -1) {
-            scopes[scopeIndex].datasets.push(Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] }));
+            scopes[scopeIndex].datasets.push({ ...uiDataset, filters: [uiFilter] });
         }
         else {
             scopes[scopeIndex].datasets[datasetIndex].filters.push(uiFilter);
@@ -46,11 +37,6 @@ function buildScopes(uFilters) {
         return scopes;
     }, []);
 }
-/**
- * Gets an scope structure for the filter data
- * @param uFilter UI structure filter
- * @returns an scope structure
- */
 function buildScope(uFilter) {
     return {
         collapsed: uFilter.extras.scopeInfo.collapsed,
@@ -61,11 +47,6 @@ function buildScope(uFilter) {
         scope: uFilter.extras.scope,
     };
 }
-/**
- * Gets an dataset structure for the filter data
- * @param uFilter a UI structure filter
- * @returns an dataset structure
- */
 function buildDataset(uFilter) {
     return {
         qrveyid: uFilter.extras.dataset.qrveyid,
@@ -75,13 +56,7 @@ function buildDataset(uFilter) {
         filters: undefined,
     };
 }
-/**
- * Gets an filter structure for the filter data
- * @param uFilter a UI structure filter
- * @returns an filter structure
- */
 function buildFilter(uFilter) {
-    var _a, _b, _c;
     const _uFilter = objectCopy(uFilter);
     const info = !isEmpty(_uFilter.extras.info)
         ? { icon: _uFilter.extras.info.icon, label: _uFilter.extras.info.label }
@@ -100,13 +75,21 @@ function buildFilter(uFilter) {
             type: _uFilter.column.type,
         },
         dateSection: _uFilter.dateSection,
-        deletable: (_a = _uFilter.deletable) !== null && _a !== void 0 ? _a : true,
+        deletable: _uFilter.deletable ?? true,
         displayed: _uFilter.displayed,
-        editable: (_b = _uFilter.editable) !== null && _b !== void 0 ? _b : true,
-        enableable: (_c = _uFilter.enableable) !== null && _c !== void 0 ? _c : true,
+        editable: _uFilter.editable ?? true,
+        enableable: _uFilter.enableable ?? true,
         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 }),
+        extras: {
+            ..._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,

package/dist/filters/adapters/flatUIToLogic.d.ts

@@ -1,8 +1,3 @@
 import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
 import { IFBLogic } from "../interfaces/backend/IFBLogic";
-/**
- * Generates a Logic structure from flattened UI filters
- * @param uFilter Array of flat filters from UI
- * @returns The logic structure
- */
 export declare function flatUIToLogic(uFilter: IFUFlattenedFilter[]): IFBLogic[];

package/dist/filters/adapters/flatUIToLogic.js

@@ -1,10 +1,5 @@
 import { flatUIToFD } from "./flatUIToFD";
 import { FDToLogic } from "./FDToLogic";
-/**
- * Generates a Logic structure from flattened UI filters
- * @param uFilter Array of flat filters from UI
- * @returns The logic structure
- */
 export function flatUIToLogic(uFilter) {
     const uiFilters = flatUIToFD(uFilter);
     return FDToLogic(uiFilters);

package/dist/filters/adapters/flatUIToOldLogic.d.ts

@@ -3,11 +3,6 @@ import { IFSection } from "../interfaces/IFSection";
 import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
 import { OLD_IFilterDetail } from "../interfaces/OLD_IFilterDetail";
 import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
-/**
- * Generates a Logic structure from flattened UI filters
- * @param uFilters Array of flat filters from UI
- * @returns The logic structure
- */
 export declare function flatUIToOldLogic(uFilters: IFUFlattenedFilter[], section?: IFSection): OLD_IFilterData;
 export declare function getLogicBody(uFilters: OLD_IFilterDetail[]): OLD_IFilterLogic[];
 export declare function getExpressionId(props: OLD_IFilterDetail): string;

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -15,11 +15,6 @@ import { flattenDeep } from "../../general/array/flattenDeep";
 import { getBackendGroupValue } from "../helpers/backend/getBackendGroupValue";
 import { getBackendProperty } from "../helpers/backend/getBackendProperty";
 import { isRankingFilter } from "../helpers/common/isRankingFilter";
-/**
- * Generates a Logic structure from flattened UI filters
- * @param uFilters Array of flat filters from UI
- * @returns The logic structure
- */
 export function flatUIToOldLogic(uFilters, section = FILTER_SECTION.ANYWHERE) {
     let oldFilterData;
     if (isEmpty(uFilters))
@@ -69,7 +64,7 @@ const flatUIToOldFilterDetail = (uFilters = []) => uFilters.map((filter) => ({
     uiValue: getUIValues(filter, { addEnableds: true }),
     validator: filter.validator,
     values: filter.values,
-    _newFilters: Object.assign({}, filter),
+    _newFilters: { ...filter },
 }));
 export function getLogicBody(uFilters) {
     return uFilters.reduce((scopes, props) => {
@@ -117,7 +112,7 @@ function getExpressions(props) {
         expressions.push(getRegularExpression(props));
     }
     if (props.nullValues) {
-        expressions.push(getNullValueExpression(Object.assign({}, props)));
+        expressions.push(getNullValueExpression({ ...props }));
     }
     return expressions;
 }
@@ -127,12 +122,21 @@ export function getExpressionId(props) {
 function getRankingExpressions(props) {
     const values = props.values || [];
     return values.map((_value, index) => {
-        const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: getBackendValidator(props) });
-        return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValuess(props, index) }) });
+        const expression = {
+            ...getRegularExpression({
+                ...props,
+                values: [props.values[index]],
+            }),
+            validationType: getBackendValidator(props),
+        };
+        return {
+            ...expression,
+            value: getValues(props, index),
+            uiExtras: { ...expression.uiExtras, uiValue: getUIValuess(props, index) },
+        };
     });
 }
 function getRegularExpression(props) {
-    var _a;
     const uiValue = getUIValuess(props);
     const expression = {
         groupValue: getBackendGroupValue(props),
@@ -143,10 +147,13 @@ function getRegularExpression(props) {
         formulaType: props.column.formulaType,
         validationType: getBackendValidator(props),
         value: getValues(props),
-        uiExtras: Object.assign(Object.assign({}, props), { uiValue }),
+        uiExtras: {
+            ...props,
+            uiValue,
+        },
     };
     expression.enabled =
-        props.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? props.enabled : false;
+        props.selectAll || expression.value?.length > 0 ? props.enabled : false;
     return expression;
 }
 function getNullValueExpression(props) {
@@ -216,41 +223,63 @@ function getValues(props, rankingGroupIndex) {
     }
 }
 function getUIValuess(props, rankingGroupIndex) {
-    var _a, _b;
     const values = props.values || [];
     switch (props.validator) {
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map((value) => (Object.assign(Object.assign({}, value), { value: value.min, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
+            return values.map((value) => ({
+                ...value,
+                value: value.min,
+                displayed: value.displayed != null ? value.displayed : true,
+                enabled: value.enabled != null ? value.enabled : true,
+            }));
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return values.map((value) => (Object.assign(Object.assign({}, value), { value: value.max, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
+            return values.map((value) => ({
+                ...value,
+                value: value.max,
+                displayed: value.displayed != null ? value.displayed : true,
+                enabled: value.enabled != null ? value.enabled : true,
+            }));
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map((value) => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, displayed: value.displayed != null ? value.displayed : true, enabled: value.enabled != null ? value.enabled : true })));
+            return values.map((value) => ({
+                ...value,
+                value: `${value.min} - ${value.max}`,
+                displayed: value.displayed != null ? value.displayed : true,
+                enabled: value.enabled != null ? value.enabled : true,
+            }));
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
             return [
                 {
                     value: FILTER_VALIDATOR_INFO[props.validator].label,
-                    enabled: (_b = (_a = values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled,
+                    enabled: values[0]?.enabled ?? props.enabled,
                 },
             ];
         case FILTER_VALIDATOR.IN:
-            return values.map((value) => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1
+            return values.map((value) => ({
+                ...value,
+                value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1
                     ? value.number
                     : ""} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS
                     ? `from ${value.anchor || "current date"}`
-                    : ""}`, displayed: value.displayed != null ? value.displayed : true, enabled: props.enabled })));
+                    : ""}`,
+                displayed: value.displayed != null ? value.displayed : true,
+                enabled: props.enabled,
+            }));
         default:
             if (isRankingFilter(props)) {
                 return getRankingUIValues(values, rankingGroupIndex);
             }
-            return values.map((val) => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
+            return values.map((val) => ({
+                ...val,
+                enabled: val.enabled != null ? val.enabled : true,
+            }));
     }
 }
 function getValueUiUnitRelativeDate(relative) {

package/dist/filters/adapters/flatUIToUI.d.ts

@@ -1,10 +1,4 @@
 import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
 import { IFSection } from "../interfaces/IFSection";
 import { IFUData } from "../interfaces/ui/IFUData";
-/**
- * Generates a UI filter data structure from the flatttened UI filters.
- * @param uFilters Array of flattened filters from UI
- * @param version Tag for the version of the filter data structure
- * @returns a UI Filter Data.
- */
 export declare function flatUIToUI(uFilters?: IFUFlattenedFilter[], section?: IFSection, enabled?: boolean, version?: string): IFUData;

package/dist/filters/adapters/flatUIToUI.js

@@ -5,12 +5,6 @@ import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_V
 import { getLastIndexFromArray } from "../../general/array/getLastIndexFromArray";
 import { isEmpty } from "../../general/mix/isEmpty";
 import { objectCopy } from "../../general/object/objectCopy";
-/**
- * Generates a UI filter data structure from the flatttened UI filters.
- * @param uFilters Array of flattened filters from UI
- * @param version Tag for the version of the filter data structure
- * @returns a UI Filter Data.
- */
 export function flatUIToUI(uFilters = [], section = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION) {
     return {
         enabled,
@@ -19,12 +13,6 @@ export function flatUIToUI(uFilters = [], section = FILTER_SECTION.ANYWHERE, ena
         scopes: buildScopes(uFilters),
     };
 }
-/**
- * Gets an array of scopes structure for the UI filter data. The scopes is organized by scope types and scope IDs
- * Also, adds and organizes filters by datasets
- * @param fbFilters Array of flat filters from UI
- * @returns an array of scopes structure.
- */
 function buildScopes(uFilters) {
     return uFilters.reduce((scopes, uFilter) => {
         const uiFilter = buildFilter(uFilter);
@@ -40,10 +28,13 @@ function buildScopes(uFilters) {
                 uf.column.qrveyid === uFilter.column.qrveyid)
             : -1;
         if (scopeIndex === -1) {
-            scopes.push(Object.assign(Object.assign({}, uiScope), { datasets: [Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] })] }));
+            scopes.push({
+                ...uiScope,
+                datasets: [{ ...uiDataset, filters: [uiFilter] }],
+            });
         }
         else if (datasetIndex === -1) {
-            scopes[scopeIndex].datasets.push(Object.assign(Object.assign({}, uiDataset), { filters: [uiFilter] }));
+            scopes[scopeIndex].datasets.push({ ...uiDataset, filters: [uiFilter] });
         }
         else if (lastUiFilterIndex === -1) {
             scopes[scopeIndex].datasets[datasetIndex].filters.push(uiFilter);
@@ -54,11 +45,6 @@ function buildScopes(uFilters) {
         return scopes;
     }, []);
 }
-/**
- * Gets an scope structure for the UI filter data
- * @param uFilter UI structure filter
- * @returns an scope structure
- */
 function buildScope(uFilter) {
     return {
         collapsed: uFilter.extras.scopeInfo.collapsed,
@@ -70,11 +56,6 @@ function buildScope(uFilter) {
         scopeid: uFilter.extras.scopeid,
     };
 }
-/**
- * Gets an dataset structure for the UI filter data
- * @param uFilter a UI structure filter
- * @returns an dataset structure
- */
 function buildDataset(uFilter) {
     return {
         qrveyid: uFilter.extras.dataset.qrveyid,
@@ -85,13 +66,7 @@ function buildDataset(uFilter) {
         label: uFilter.extras.dataset.label,
     };
 }
-/**
- * Gets an filter structure for the UI filter data
- * @param uFilter a UI structure filter
- * @returns an filter structure
- */
 function buildFilter(uFilter) {
-    var _a, _b, _c;
     const _uFilter = objectCopy(uFilter);
     const info = !isEmpty(_uFilter.extras.info)
         ? { icon: _uFilter.extras.info.icon, label: _uFilter.extras.info.label }
@@ -115,13 +90,21 @@ function buildFilter(uFilter) {
             type: _uFilter.column.type,
         },
         dateSection: _uFilter.dateSection,
-        deletable: (_a = _uFilter.deletable) !== null && _a !== void 0 ? _a : true,
+        deletable: _uFilter.deletable ?? true,
         displayed: _uFilter.displayed,
-        editable: (_b = _uFilter.editable) !== null && _b !== void 0 ? _b : true,
-        enableable: (_c = _uFilter.enableable) !== null && _c !== void 0 ? _c : true,
+        editable: _uFilter.editable ?? true,
+        enableable: _uFilter.enableable ?? true,
         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 }),
+        extras: {
+            ..._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,

package/dist/filters/adapters/logicToFD.d.ts

@@ -1,10 +1,4 @@
 import { IFSection } from "../interfaces/IFSection";
 import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
 import { IFSData } from "../interfaces/common/IFSData";
-/**
- * Generates a filter data structure from the old logic structure (v2.0).
- * @param filterData The old filter data structure with logic (v2.0)
- * @param version Tag for the version of the filter data structure
- * @returns a Filter Data.
- */
 export declare function logicToFD(logics?: OLD_IFilterLogic[], section?: IFSection, enabled?: boolean, version?: string): IFSData;

package/dist/filters/adapters/logicToFD.js

@@ -1,16 +1,8 @@
-// FROM Logic structure = Old logic structure (v2.0)
-// TO Logic structure = Cleaner logic structure
 import { isEmpty } from "../../general/mix/isEmpty";
 import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
 import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
 import { flatUIToFD } from "./flatUIToFD";
 import { logicToFlatUI } from "./logicToFlatUI";
-/**
- * Generates a filter data structure from the old logic structure (v2.0).
- * @param filterData The old filter data structure with logic (v2.0)
- * @param version Tag for the version of the filter data structure
- * @returns a Filter Data.
- */
 export function logicToFD(logics = [], section = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION) {
     if (isEmpty(logics) || !Array.isArray(logics))
         return;

package/dist/filters/adapters/logicToFlatUI.d.ts

@@ -1,8 +1,3 @@
 import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
 import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
-/**
- * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
- * @param logics The old logic structure (v2.0)
- * @returns The Flattened UI Filters array
- */
 export declare function logicToFlatUI(logics?: OLD_IFilterLogic[]): IFUFlattenedFilter[];

package/dist/filters/adapters/logicToFlatUI.js

@@ -1,5 +1,3 @@
-// FROM Logic structure = Old logic structure (v2.0)
-// TO Logic structure = Cleaner logic structure
 import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
 import { COLUMN } from "../../columns/constants/COLUMN";
 import { isEmpty } from "../../general/mix/isEmpty";
@@ -11,11 +9,6 @@ import { _get } from "../../general/object/get";
 import { isNullValidator } from "../helpers/common/isNullValidator";
 import { FILTER_VALIDATOR_INFO } from "../constants/common/FILTER_VALIDATOR_INFO";
 import { isRankingFilter } from "../helpers/common/isRankingFilter";
-/**
- * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
- * @param logics The old logic structure (v2.0)
- * @returns The Flattened UI Filters array
- */
 export function logicToFlatUI(logics = []) {
     if (isEmpty(logics))
         return [];
@@ -48,7 +41,6 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
         uFilters.push(uFilter);
     }
     if (isRankingFilter(uiExtras)) {
-        // Restore uiExtras.values array into single IFilterDetail object values array
         if (index > -1)
             uFilters[index].values.push(uiExtras.values[0]);
         const refinedRankingValues = refineRankingValues((index > -1
@@ -61,7 +53,6 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
     }
 }
 function getFilterByExpression(expression, scopeItem) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
     const uiExtras = expression.uiExtras;
     const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL
         ? _get(scopeItem, "uiExtras.scopeid")
@@ -73,40 +64,49 @@ function getFilterByExpression(expression, scopeItem) {
     return {
         collapsed: uiExtras.collapsed,
         column: {
-            id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
-            formulaType: (_b = uiExtras.column) === null || _b === void 0 ? void 0 : _b.formulaType,
-            qrveyid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.qrveyid,
-            aggregate: ((_e = (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.aggregate) === null || _e === void 0 ? void 0 : _e.label) ||
-                ((_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate),
-            calculation: ((_h = (_g = uiExtras.column) === null || _g === void 0 ? void 0 : _g.calculation) === null || _h === void 0 ? void 0 : _h.value) ||
-                ((_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation),
+            id: uiExtras.column?.id,
+            formulaType: uiExtras.column?.formulaType,
+            qrveyid: uiExtras.column?.qrveyid,
+            aggregate: uiExtras.column?.aggregate?.label ||
+                uiExtras.column?.aggregate,
+            calculation: uiExtras.column?.calculation?.value ||
+                uiExtras.column?.calculation,
             label: _get(uiExtras.column, "text") || _get(uiExtras.column, "label"),
             property: uiExtras.column.property,
             sorting: uiExtras.column.sorting,
-            outputFormat: (_k = uiExtras.column) === null || _k === void 0 ? void 0 : _k.outputFormat,
-            type: (_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.type,
+            outputFormat: uiExtras.column?.outputFormat,
+            type: uiExtras.column?.type,
         },
         dateSection: uiExtras.dateSection,
-        deletable: (_o = (_m = uiExtras._newFilters) === null || _m === void 0 ? void 0 : _m.deletable) !== null && _o !== void 0 ? _o : true,
-        displayed: (_q = (_p = uiExtras._newFilters) === null || _p === void 0 ? void 0 : _p.displayed) !== null && _q !== void 0 ? _q : true,
-        editable: (_s = (_r = uiExtras._newFilters) === null || _r === void 0 ? void 0 : _r.editable) !== null && _s !== void 0 ? _s : true,
-        enableable: (_u = (_t = uiExtras._newFilters) === null || _t === void 0 ? void 0 : _t.enableable) !== null && _u !== void 0 ? _u : true,
+        deletable: uiExtras._newFilters?.deletable ?? true,
+        displayed: uiExtras._newFilters?.displayed ?? true,
+        editable: uiExtras._newFilters?.editable ?? true,
+        enableable: uiExtras._newFilters?.enableable ?? true,
         enabled: uiExtras.enabled,
-        extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
-            scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
-                collapsed: (_v = scopeItem.uiExtras) === null || _v === void 0 ? void 0 : _v.collapsed,
+        extras: {
+            ...uiExtras.extras,
+            panelid: uiExtras.panelid,
+            filterLabel: uiExtras.panelName,
+            info,
+            scopeid,
+            scope: scopeItem.scope,
+            section: uiExtras.section,
+            scopeInfo: {
+                collapsed: scopeItem.uiExtras?.collapsed,
                 enabled: scopeItem.enabled,
                 displayed: true,
                 scope: scopeItem.scope,
                 scopeid,
-            }, dataset: {
+            },
+            dataset: {
                 collapsed: false,
                 enabled: true,
                 displayed: true,
-                qrveyid: (_w = uiExtras.column) === null || _w === void 0 ? void 0 : _w.qrveyid,
+                qrveyid: uiExtras.column?.qrveyid,
                 label: _get(uiExtras.column, "dataset.name") ||
                     _get(uiExtras.column, "label"),
-            } }),
+            },
+        },
         filterid: undefined,
         lookupDisplayIndex: uiExtras.lookupDisplayIndex,
         nullValues: uiExtras.nullValues,
@@ -134,13 +134,6 @@ function getValues(uiExtras) {
     }
     return [];
 }
-/**
- * Get the filter or the index of the given array, validating an old filter structure.
- * @param filters The array of UI filters
- * @param filter The old logic structure filter
- * @param getIndex Determines if the index or returns the UI filter object
- * @returns the index or the UI filter object
- */
 function getFilter(filters, filter, getIndex = false) {
     const validator = (f) => f.validator === filter.validator &&
         f.column.id === filter.column.id &&
@@ -153,17 +146,15 @@ function getFilter(filters, filter, getIndex = false) {
         f.extras.panelid === filter.panelid;
     return getIndex ? filters.findIndex(validator) : filters.find(validator);
 }
-/**
- * Refines the values of the Ranking column type.
- * @param values the Array of Ranking values
- * @param uiValues Object with additional info about the values of the filter.
- * @returns the array of Ranking values
- */
 function refineRankingValues(values = [], uiValues = []) {
     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 });
+            return {
+                ...value,
+                displayed: rValue && rValue.displayed != null ? rValue.displayed : true,
+                enabled: rValue && rValue.enabled != null ? rValue.enabled : true,
+            };
         }),
     ]);
 }

package/dist/filters/adapters/logicToUI.d.ts

@@ -1,10 +1,4 @@
 import { IFUData } from "../interfaces/ui/IFUData";
 import { IFSection } from "../interfaces/IFSection";
 import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
-/**
- * Generates a UI filter structure from the old logic structure (v2.0).
- * @param uFilters Array of filters from old logic structure
- * @param datasetsInfo Collection of datasets information
- * @returns a UI Filter Data.
- */
 export declare function logicToUI(logics?: OLD_IFilterLogic[], section?: IFSection, enabled?: boolean, version?: string): IFUData;

package/dist/filters/adapters/logicToUI.js

@@ -2,12 +2,6 @@ import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_V
 import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
 import { flatUIToUI } from "./flatUIToUI";
 import { logicToFlatUI } from "./logicToFlatUI";
-/**
- * Generates a UI filter structure from the old logic structure (v2.0).
- * @param uFilters Array of filters from old logic structure
- * @param datasetsInfo Collection of datasets information
- * @returns a UI Filter Data.
- */
 export function logicToUI(logics = [], section = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION) {
     const flatUiFilters = logicToFlatUI(logics);
     return flatUIToUI(flatUiFilters, section, enabled, version);

package/dist/filters/adapters/modelAnswerToFilterValue.d.ts

@@ -1,8 +1,3 @@
 import { IModelAnswer } from "../../qrvey/interfaces/IModelAnswer";
 import { IFSValue } from "../interfaces/common/IFSValue";
-/**
- * Adapter for model answer to convert to recognizable values for Filter Builder
- * @param answers Array of the qrvey model answers
- * @returns Array of values
- */
 export declare function modelAnswerToFilterValue(answers?: IModelAnswer[]): IFSValue[];