@qrvey/utils 1.16.1-9 → 1.17.0-1

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

@@ -1,63 +1,50 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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("./areFiltersEquals"), exports);
-__exportStar(require("./excludeFiltersByAggregateColumn"), exports);
-__exportStar(require("./excludeFiltersByParams"), exports);
-__exportStar(require("./excludeFiltersByScopes"), exports);
-__exportStar(require("./getDefaultValidatorByColumn"), exports);
-__exportStar(require("./getDateProperties"), exports);
-__exportStar(require("./getFilterColumnLabel"), exports);
-__exportStar(require("./getFilterid"), exports);
-__exportStar(require("./getFilterLabel"), exports);
-__exportStar(require("./getFiltersByAggregateColumn"), exports);
-__exportStar(require("./getFiltersByDatasetsColumns"), exports);
-__exportStar(require("./getFiltersByParams"), exports);
-__exportStar(require("./getFiltersByScopes"), exports);
-__exportStar(require("./getFiltersByScopesIds"), exports);
-__exportStar(require("./getFiltersByTimezone"), exports);
-__exportStar(require("./getFiltersByVisibility"), exports);
-__exportStar(require("./getMergeFiltersSettings"), exports);
-__exportStar(require("./getParamsToGetFilterSettings"), exports);
-__exportStar(require("./getPropertiesByColumn"), exports);
-__exportStar(require("./getTimeProperties"), exports);
-__exportStar(require("./getValidatorsByColumn"), exports);
-__exportStar(require("./getValuesFromModel"), exports);
-__exportStar(require("./getValuesFromDataset"), exports);
-__exportStar(require("./getVerboseFilterDatasets"), exports);
-__exportStar(require("./getVerboseFilterFilters"), exports);
-__exportStar(require("./getVerboseFilters"), exports);
-__exportStar(require("./getVerboseFilterScopes"), exports);
-__exportStar(require("./getVerboseFilterValues"), exports);
-__exportStar(require("./haveFiltersByDataset"), exports);
-__exportStar(require("./isBetweenValidator"), exports);
-__exportStar(require("./isColumnForEqualLayout"), exports);
-__exportStar(require("./isColumnForNumericLayout"), exports);
-__exportStar(require("./isColumnForNullLayout"), exports);
-__exportStar(require("./isColumnForTextLayout"), exports);
-__exportStar(require("./isDateDistinctProperty"), exports);
-__exportStar(require("./isInValidator"), exports);
-__exportStar(require("./isNullValidator"), exports);
-__exportStar(require("./isValidatorMatchedToWindow"), exports);
-__exportStar(require("./isRangeValidator"), exports);
-__exportStar(require("./isRankingFilter"), exports);
-__exportStar(require("./isRegularValidator"), exports);
-__exportStar(require("./mergeFilters"), exports);
-__exportStar(require("./mergeValues"), exports);
-__exportStar(require("./resolveDatasetConditions"), exports);
-__exportStar(require("./resolveFilterConditions"), exports);
-__exportStar(require("./resolveScopeConditions"), exports);
-__exportStar(require("./excludeFiltersByDatasetsColumns"), exports);
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./areFiltersEquals"), exports);
+tslib_1.__exportStar(require("./excludeFiltersByAggregateColumn"), exports);
+tslib_1.__exportStar(require("./excludeFiltersByParams"), exports);
+tslib_1.__exportStar(require("./excludeFiltersByScopes"), exports);
+tslib_1.__exportStar(require("./getDefaultValidatorByColumn"), exports);
+tslib_1.__exportStar(require("./getDateProperties"), exports);
+tslib_1.__exportStar(require("./getFilterColumnLabel"), exports);
+tslib_1.__exportStar(require("./getFilterid"), exports);
+tslib_1.__exportStar(require("./getFilterLabel"), exports);
+tslib_1.__exportStar(require("./getFiltersByAggregateColumn"), exports);
+tslib_1.__exportStar(require("./getFiltersByDatasetsColumns"), exports);
+tslib_1.__exportStar(require("./getFiltersByParams"), exports);
+tslib_1.__exportStar(require("./getFiltersByScopes"), exports);
+tslib_1.__exportStar(require("./getFiltersByScopesIds"), exports);
+tslib_1.__exportStar(require("./getFiltersByTimezone"), exports);
+tslib_1.__exportStar(require("./getFiltersByVisibility"), exports);
+tslib_1.__exportStar(require("./getMergeFiltersSettings"), exports);
+tslib_1.__exportStar(require("./getParamsToGetFilterSettings"), exports);
+tslib_1.__exportStar(require("./getPropertiesByColumn"), exports);
+tslib_1.__exportStar(require("./getTimeProperties"), exports);
+tslib_1.__exportStar(require("./getValidatorsByColumn"), exports);
+tslib_1.__exportStar(require("./getValuesFromModel"), exports);
+tslib_1.__exportStar(require("./getValuesFromDataset"), exports);
+tslib_1.__exportStar(require("./getVerboseFilterDatasets"), exports);
+tslib_1.__exportStar(require("./getVerboseFilterFilters"), exports);
+tslib_1.__exportStar(require("./getVerboseFilters"), exports);
+tslib_1.__exportStar(require("./getVerboseFilterScopes"), exports);
+tslib_1.__exportStar(require("./getVerboseFilterValues"), exports);
+tslib_1.__exportStar(require("./haveFiltersByDataset"), exports);
+tslib_1.__exportStar(require("./isBetweenValidator"), exports);
+tslib_1.__exportStar(require("./isColumnForEqualLayout"), exports);
+tslib_1.__exportStar(require("./isColumnForNumericLayout"), exports);
+tslib_1.__exportStar(require("./isColumnForNullLayout"), exports);
+tslib_1.__exportStar(require("./isColumnForTextLayout"), exports);
+tslib_1.__exportStar(require("./isDateDistinctProperty"), exports);
+tslib_1.__exportStar(require("./isInValidator"), exports);
+tslib_1.__exportStar(require("./isNullValidator"), exports);
+tslib_1.__exportStar(require("./isValidatorMatchedToWindow"), exports);
+tslib_1.__exportStar(require("./isRangeValidator"), exports);
+tslib_1.__exportStar(require("./isRankingFilter"), exports);
+tslib_1.__exportStar(require("./isRegularValidator"), exports);
+tslib_1.__exportStar(require("./mergeFilters"), exports);
+tslib_1.__exportStar(require("./mergeValues"), exports);
+tslib_1.__exportStar(require("./resolveDatasetConditions"), exports);
+tslib_1.__exportStar(require("./resolveFilterConditions"), exports);
+tslib_1.__exportStar(require("./resolveScopeConditions"), exports);
+tslib_1.__exportStar(require("./excludeFiltersByDatasetsColumns"), exports);

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

@@ -1,16 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBetweenValidator = void 0;
+exports.isBetweenValidator = isBetweenValidator;
 const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
-/**
- * Validates if the given validator is a Between type
- * @param validator The 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);
 }
-exports.isBetweenValidator = isBetweenValidator;

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

@@ -1,13 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isColumnForEqualLayout = void 0;
+exports.isColumnForEqualLayout = isColumnForEqualLayout;
 const COLUMNS_FOR_EQUALS_LAYOUT_1 = require("../../constants/builder/COLUMNS_FOR_EQUALS_LAYOUT");
-/**
- * Validates if the given column is compatible with the Equal Layout.
- * @param column The Qrvey column
- * @returns true if the conditions fulfill; otherwise, false
- */
 function isColumnForEqualLayout(column) {
     return COLUMNS_FOR_EQUALS_LAYOUT_1.COLUMNS_FOR_EQUALS_LAYOUT.includes(column.type);
 }
-exports.isColumnForEqualLayout = isColumnForEqualLayout;

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

@@ -1,15 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isColumnForEqualNullLayout = void 0;
+exports.isColumnForEqualNullLayout = isColumnForEqualNullLayout;
 const COLUMN_1 = require("../../../columns/constants/COLUMN");
 const COLUMN_PROPERTY_1 = require("../../../columns/constants/COLUMN_PROPERTY");
 const COLUMNS_FOR_EQUALS_NULL_LAYOUT_1 = require("../../constants/builder/COLUMNS_FOR_EQUALS_NULL_LAYOUT");
-/**
- * Validates if the given column is compatible with the Equal or Null Layout.
- * @param column The Qrvey column
- * @param property The filter property
- * @returns true if the conditions fulfill; otherwise, false
- */
 function isColumnForEqualNullLayout(column, property) {
     return (COLUMNS_FOR_EQUALS_NULL_LAYOUT_1.COLUMNS_FOR_EQUALS_NULL_LAYOUT.includes(column.type) ||
         (COLUMN_1.COLUMN.FILEUPLOAD === column.type &&
@@ -17,4 +11,3 @@ function isColumnForEqualNullLayout(column, property) {
         (COLUMN_1.COLUMN.IMAGEUPLOAD === column.type &&
             COLUMN_PROPERTY_1.COLUMN_PROPERTY.FILEUPLOAD_FILETYPE === property));
 }
-exports.isColumnForEqualNullLayout = isColumnForEqualNullLayout;

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

@@ -1,13 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isColumnForNullLayout = void 0;
+exports.isColumnForNullLayout = isColumnForNullLayout;
 const COLUMNS_FOR_NULL_LAYOUT_1 = require("../../constants/builder/COLUMNS_FOR_NULL_LAYOUT");
-/**
- * Validates if the given column is compatible with the Null Layout.
- * @param column The Qrvey column
- * @returns true if the conditions fulfill; otherwise, false
- */
 function isColumnForNullLayout(column) {
     return COLUMNS_FOR_NULL_LAYOUT_1.COLUMNS_FOR_NULL_LAYOUT.includes(column.type);
 }
-exports.isColumnForNullLayout = isColumnForNullLayout;

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

@@ -1,16 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isColumnForNumericLayout = void 0;
+exports.isColumnForNumericLayout = isColumnForNumericLayout;
 const COLUMN_1 = require("../../../columns/constants/COLUMN");
 const COLUMN_PROPERTY_1 = require("../../../columns/constants/COLUMN_PROPERTY");
 const isNumericalColumn_1 = require("../../../columns/helpers/isNumericalColumn");
 const isEmpty_1 = require("../../../general/mix/isEmpty");
-/**
- * Validates if the given column is compatible with Numeric Layout.
- * @param column The Qrvey column
- * @param property The filter property
- * @returns true if the conditions fulfill; otherwise, false
- */
 function isColumnForNumericLayout(column, property) {
     return ((0, isNumericalColumn_1.isNumericalColumn)(column) ||
         !(0, isEmpty_1.isEmpty)(column.aggregate) ||
@@ -19,4 +13,3 @@ function isColumnForNumericLayout(column, property) {
         (COLUMN_1.COLUMN.IMAGEUPLOAD === column.type &&
             COLUMN_PROPERTY_1.COLUMN_PROPERTY.FILEUPLOAD_FILESIZE === property));
 }
-exports.isColumnForNumericLayout = isColumnForNumericLayout;

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

@@ -1,20 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isColumnForTextLayout = void 0;
+exports.isColumnForTextLayout = isColumnForTextLayout;
 const COLUMN_1 = require("../../../columns/constants/COLUMN");
 const COLUMN_PROPERTY_1 = require("../../../columns/constants/COLUMN_PROPERTY");
 const definition_1 = require("../../../format/definition");
 const COLUMNS_FOR_TEXT_LAYOUT_1 = require("../../constants/builder/COLUMNS_FOR_TEXT_LAYOUT");
-/**
- * Validates if the given column is compatible with the Text Layout.
- * @param column The Qrvey column
- * @param property The filter property
- * @returns true if the conditions fulfill; otherwise, false
- */
 function isColumnForTextLayout(column, property) {
     return ((0, definition_1.isTextColumn)(column) ||
         COLUMNS_FOR_TEXT_LAYOUT_1.COLUMNS_FOR_TEXT_LAYOUT.includes(column.type) ||
         (COLUMN_1.COLUMN.IMAGEUPLOAD === column.type &&
             COLUMN_PROPERTY_1.COLUMN_PROPERTY.IMAGEUPLOAD_IMAGEWORDS === property));
 }
-exports.isColumnForTextLayout = isColumnForTextLayout;

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

@@ -1,16 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDateDistinctProperty = void 0;
+exports.isDateDistinctProperty = isDateDistinctProperty;
 const isDateColumn_1 = require("../../../columns/helpers/isDateColumn");
 const DATE_DISTINCT_PROPERTIES_1 = require("../../../dates/constants/DATE_DISTINCT_PROPERTIES");
 const DATE_DISTINCT_TIME_PROPERTIES_1 = require("../../../dates/constants/DATE_DISTINCT_TIME_PROPERTIES");
 const isEmpty_1 = require("../../../general/mix/isEmpty");
-/**
- * Determines if the filter column and property is a distinct group dates type
- * @param column The filter column
- * @param property The filter property
- * @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) &&
@@ -19,4 +13,3 @@ function isDateDistinctProperty(column, property) {
             ...DATE_DISTINCT_TIME_PROPERTIES_1.DATE_DISTINCT_TIME_PROPERTIES,
         ].includes(property));
 }
-exports.isDateDistinctProperty = isDateDistinctProperty;

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

@@ -1,13 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isInValidator = void 0;
+exports.isInValidator = isInValidator;
 const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
-/**
- * Validates if the given validator is a In type
- * @param validator The validator
- * @returns true: it is a In validator; false: it is not a In validator
- */
 function isInValidator(validator) {
     return validator === FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN;
 }
-exports.isInValidator = isInValidator;

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

@@ -1,13 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNullValidator = void 0;
+exports.isNullValidator = isNullValidator;
 const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
-/**
- * Checks if the given validator is a Null type.
- * @param validator The Filter Validator
- * @returns True: It is a Null Validator; False: It is not a Null Validator.
- */
 function isNullValidator(validator) {
     return [FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL, FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL].includes(validator);
 }
-exports.isNullValidator = isNullValidator;

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

@@ -1,12 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRangeValidator = void 0;
+exports.isRangeValidator = isRangeValidator;
 const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
-/**
- * Validates if the given validator is a Range type. Range type means the value has min and max values to filter
- * @param validator The filter validator
- * @returns true: it is a range validator
- */
 function isRangeValidator(validator) {
     return [
         FILTER_VALIDATOR_1.FILTER_VALIDATOR.GREATER_THAN,
@@ -21,4 +16,3 @@ function isRangeValidator(validator) {
         FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE,
     ].includes(validator);
 }
-exports.isRangeValidator = isRangeValidator;

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

@@ -1,19 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRankingFilter = void 0;
+exports.isRankingFilter = isRankingFilter;
 const COLUMN_1 = require("../../../columns/constants/COLUMN");
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
-/**
- * Validates if the given filter is considering a ranking filter type.
- * - Filters with Null and Is Not Null for ranking column are not considering as Ranking Filters.
- * @param filter The filter object
- * @returns a true if the filter is a ranking filter.
- */
 function isRankingFilter(filter) {
     return (filter.column.type === COLUMN_1.COLUMN.RANKING &&
         (0, isEmpty_1.isEmpty)(filter.column.aggregate) &&
         filter.validator !== FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL &&
         filter.validator !== FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL);
 }
-exports.isRankingFilter = isRankingFilter;

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

@@ -1,12 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRegularValidator = void 0;
+exports.isRegularValidator = isRegularValidator;
 const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
-/**
- * Validates if the given validator is a regular type. Regular type means the filter object has a value as string to filter
- * @param validator The filter validator
- * @returns true: it is a range validator
- */
 function isRegularValidator(validator) {
     return [
         FILTER_VALIDATOR_1.FILTER_VALIDATOR.CONTAINS,
@@ -19,4 +14,3 @@ function isRegularValidator(validator) {
         FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH,
     ].includes(validator);
 }
-exports.isRegularValidator = isRegularValidator;

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

@@ -1,13 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidatorMatchedToWindow = void 0;
+exports.isValidatorMatchedToWindow = isValidatorMatchedToWindow;
 const FILTER_VALIDATORS_FOR_WINDOW_1 = require("../../constants/builder/FILTER_VALIDATORS_FOR_WINDOW");
-/**
- * Validates if the given validator is compatible with Value Window layout.
- * @param validator the filter validator
- * @returns true if the conditions fulfill; otherwise, false
- */
 function isValidatorMatchedToWindow(validator) {
     return FILTER_VALIDATORS_FOR_WINDOW_1.FILTER_VALIDATORS_FOR_WINDOW.includes(validator);
 }
-exports.isValidatorMatchedToWindow = isValidatorMatchedToWindow;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeFilters = void 0;
+exports.mergeFilters = mergeFilters;
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const mergeDeep_1 = require("../../../general/object/mergeDeep");
 const objectCopy_1 = require("../../../general/object/objectCopy");
@@ -10,18 +10,7 @@ const mergeValues_1 = require("./mergeValues");
 const resolveDatasetConditions_1 = require("./resolveDatasetConditions");
 const resolveFilterConditions_1 = require("./resolveFilterConditions");
 const resolveScopeConditions_1 = require("./resolveScopeConditions");
-/**
- * Merges the second filter data into the first one; the first Filter Data passed in the argument has the priority.
- * Conditions:
- * - If the info in the second filter data does not exist in the first one, the info will be added
- * - If the info in the second filter data exists in the first one, the info will be merged
- * @param {IFUData} filterData1 The target filter data
- * @param {IFUData} filterData2 the filter data to be merged
- * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
- * @returns {IFUData} a new filter data structure
- */
 function mergeFilters(filterData1, filterData2, settings) {
-    var _a;
     if ((0, isEmpty_1.isEmpty)(filterData1) || (0, isEmpty_1.isEmpty)(filterData1.scopes)) {
         if ((0, isEmpty_1.isEmpty)(filterData2) || (0, isEmpty_1.isEmpty)(filterData2.scopes))
             return;
@@ -35,24 +24,17 @@ function mergeFilters(filterData1, filterData2, settings) {
     const scopes = mergeScopes(newFilterData1.scopes, newFilterData2.scopes, defaultSettings);
     if (defaultSettings.mergeFilterDataProps) {
         return {
-            enabled: (_a = newFilterData2.enabled) !== null && _a !== void 0 ? _a : newFilterData1.enabled,
+            enabled: newFilterData2.enabled ?? newFilterData1.enabled,
             section: newFilterData2.section || newFilterData1.section,
             scopes,
             version: newFilterData2.version || newFilterData1.version,
         };
     }
-    return Object.assign(Object.assign({}, newFilterData1), { scopes });
+    return {
+        ...newFilterData1,
+        scopes,
+    };
 }
-exports.mergeFilters = mergeFilters;
-/**
- * Gets a new scope array structure by merging both scope structures
- * - If the info in the second scope does not exist in the first one, the scope will be added
- * - If the info in the second scope exists in the first one, the scope will be merged
- * @param {IFUScope[]} scopes1 the target scope structure
- * @param {IFUScope[]} scopes2 the scope to be merged
- * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
- * @returns {IFUScope[]} a new scope array structure
- */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     let newScopes = scopes1.reduce((scopes, scope1) => {
         const scope2Index = scopes2.findIndex((scope2) => (0, resolveScopeConditions_1.resolveScopeConditions)(scope2, {
@@ -61,7 +43,10 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
         }));
         let _scope1 = scope1;
         if (scope2Index > -1) {
-            _scope1 = Object.assign(Object.assign({}, mergeScopeProps(scope1, scopes2[scope2Index], settings)), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
+            _scope1 = {
+                ...mergeScopeProps(scope1, scopes2[scope2Index], settings),
+                datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings),
+            };
             scopes2.splice(scope2Index, 1);
         }
         scopes.push(_scope1);
@@ -71,15 +56,6 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
         newScopes = newScopes.concat(scopes2);
     return newScopes;
 }
-/**
- * Gets a new dataset structure array by merging both dataset structures
- * - If the info in the second dataset does not exist in the first one, the dataset will be added
- * - If the info in the second dataset exists in the first one, the dataset will be merged
- * @param {IFUDataset[]} datasets1 the target dataset structure
- * @param {IFUDataset[]} datasets2 the dataset to be merged
- * @param {IFFiltersMergeFilters} settings configuration of the mergeFilter
- * @returns {IFUDataset[]} a new dataset structure array
- */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
         const dataset2Index = datasets2.findIndex((dataset2) => (0, resolveDatasetConditions_1.resolveDatasetConditions)(dataset2, {
@@ -87,7 +63,10 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
         }));
         let _dataset1 = dataset1;
         if (dataset2Index > -1) {
-            _dataset1 = Object.assign(Object.assign({}, mergeDatasetProps(dataset1, datasets2[dataset2Index], settings)), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
+            _dataset1 = {
+                ...mergeDatasetProps(dataset1, datasets2[dataset2Index], settings),
+                filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings),
+            };
             datasets2.splice(dataset2Index, 1);
         }
         datasets.push(_dataset1);
@@ -97,13 +76,6 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
         newDatasets = newDatasets.concat(datasets2);
     return newDatasets;
 }
-/**
- * Gets a new filter structure array by merging two filter structures
- * @param {IFUFilter[]} filters1 the target filter structure
- * @param {IFUFilter[]} filters2 the filter to be merged
- * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
- * @returns {IFUFilter[]} a new filter structure array
- */
 function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
         const filter2Index = filters2.findIndex((filter2) => (0, resolveFilterConditions_1.resolveFilterConditions)(filter2, {
@@ -115,7 +87,11 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
         }));
         let _filter1 = filter1;
         if (filter2Index > -1) {
-            _filter1 = Object.assign(Object.assign(Object.assign({}, _filter1), mergeFilterProps(_filter1, filters2[filter2Index], settings)), { values: (0, mergeValues_1.mergeValues)(_filter1, filters2[filter2Index], settings) });
+            _filter1 = {
+                ..._filter1,
+                ...mergeFilterProps(_filter1, filters2[filter2Index], settings),
+                values: (0, mergeValues_1.mergeValues)(_filter1, filters2[filter2Index], settings),
+            };
             filters2.splice(filter2Index, 1);
         }
         else if (!(0, isEmpty_1.isEmpty)(settings.setGroupedColumnOperator)) {
@@ -129,48 +105,53 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
         newFilters = newFilters.concat(filters2);
     return newFilters;
 }
-/**
- * Gets a new scope structure for the configured settings
- * @param {IFUScope} scope1 the target scope structure
- * @param {IFUScope} scope2 the scope to be used to merge the values
- * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
- * @returns {IFUScope} a new filter structure with overwritted props
- */
 function mergeScopeProps(scope1, scope2, settings) {
-    var _a, _b, _c;
     let _scope1 = scope1;
     if (settings.mergeScopeProps) {
-        _scope1 = Object.assign(Object.assign({}, scope1), { collapsed: (_a = scope2.collapsed) !== null && _a !== void 0 ? _a : scope1.collapsed, displayed: (_b = scope2.displayed) !== null && _b !== void 0 ? _b : scope1.displayed, enabled: (_c = scope2.enabled) !== null && _c !== void 0 ? _c : scope1.enabled, label: scope2.label || scope1.label, scope: scope2.scope || scope1.scope, scopeid: scope2.scopeid || scope1.scopeid });
+        _scope1 = {
+            ...scope1,
+            collapsed: scope2.collapsed ?? scope1.collapsed,
+            displayed: scope2.displayed ?? scope1.displayed,
+            enabled: scope2.enabled ?? scope1.enabled,
+            label: scope2.label || scope1.label,
+            scope: scope2.scope || scope1.scope,
+            scopeid: scope2.scopeid || scope1.scopeid,
+        };
     }
     return _scope1;
 }
-/**
- * Gets a new dataset structure for the configured settings
- * @param {IFUDataset} dataset1 the target dataset structure
- * @param {IFUDataset} dataset2 the dataset to be used to merge the values
- * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
- * @returns {IFUDataset} a new filter structure with overwritted props
- */
 function mergeDatasetProps(dataset1, dataset2, settings) {
-    var _a, _b, _c;
     let _dataset1 = dataset1;
     if (settings.mergeDatasetProps) {
-        _dataset1 = Object.assign(Object.assign({}, dataset1), { collapsed: (_a = dataset2.collapsed) !== null && _a !== void 0 ? _a : dataset1.collapsed, displayed: (_b = dataset2.displayed) !== null && _b !== void 0 ? _b : dataset1.displayed, enabled: (_c = dataset2.enabled) !== null && _c !== void 0 ? _c : dataset1.enabled, label: dataset2.label || dataset1.label, qrveyid: dataset2.qrveyid || dataset1.qrveyid });
+        _dataset1 = {
+            ...dataset1,
+            collapsed: dataset2.collapsed ?? dataset1.collapsed,
+            displayed: dataset2.displayed ?? dataset1.displayed,
+            enabled: dataset2.enabled ?? dataset1.enabled,
+            label: dataset2.label || dataset1.label,
+            qrveyid: dataset2.qrveyid || dataset1.qrveyid,
+        };
     }
     return _dataset1;
 }
-/**
- * Gets a new filter structure for the configured settings
- * @param {IFUFilter} filter1 the target filter structure
- * @param {IFUFilter} filter2 the filter to be used to merge the values
- * @param {IFFiltersMergeFilters} settings configuration of the mergeFilters
- * @returns a new filter structure with overwritted props
- */
 function mergeFilterProps(filter1, filter2, settings) {
-    var _a, _b, _c;
     let _filter1 = filter1;
     if (settings.mergeFilterProps) {
-        _filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, column: (0, mergeDeep_1.mergeDeep)(filter2.column, filter1.column), 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, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, property: filter2.property || filter1.property, operator: filter2.operator || filter1.operator, selectAll: filter2.selectAll, validator: filter2.validator || filter1.validator });
+        _filter1 = {
+            ...filter1,
+            collapsed: filter2.collapsed ?? filter1.collapsed,
+            column: (0, mergeDeep_1.mergeDeep)(filter2.column, filter1.column),
+            displayed: filter2.displayed ?? filter1.displayed,
+            dateSection: filter2.dateSection,
+            extras: filter2.extras,
+            enabled: filter2.enabled ?? filter1.enabled,
+            lookupDisplayIndex: filter2.lookupDisplayIndex,
+            nullValues: filter2.nullValues,
+            property: filter2.property || filter1.property,
+            operator: filter2.operator || filter1.operator,
+            selectAll: filter2.selectAll,
+            validator: filter2.validator || filter1.validator,
+        };
     }
     return _filter1;
 }