@qrvey/utils 1.1.8 → 1.2.1

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

@@ -1,4 +1,5 @@
-import { IFBLogic, IFSData } from "../interfaces";
+import { IFBLogic } from "../interfaces/backend/IFBLogic";
+import { IFSData } from "../interfaces/common/IFSData";
 /**
  * Generates a Filter Logic structure from Filter Data structure.
  * @param filterData The filter data object.

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

@@ -3,7 +3,7 @@
 // TO Logic structure = Cleaner logic structure
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FDToLogic = void 0;
-const general_1 = require("../../general");
+const isEmpty_1 = require("../../general/mix/isEmpty");
 const buildFilters_1 = require("../helpers/backend/buildFilters");
 /**
  * Generates a Filter Logic structure from Filter Data structure.
@@ -12,7 +12,7 @@ const buildFilters_1 = require("../helpers/backend/buildFilters");
  */
 function FDToLogic(filterData) {
     let logic = [];
-    if (general_1.isEmpty(filterData) || general_1.isEmpty(filterData.scopes))
+    if ((0, isEmpty_1.isEmpty)(filterData) || (0, isEmpty_1.isEmpty)(filterData.scopes))
         return logic;
     switch (filterData.version) {
         case '2.1': {
@@ -35,7 +35,7 @@ function getLogicBodyFromFD21(filterData) {
         let filters = [];
         if (scope.datasets.length > 0) {
             scope.datasets.forEach((dataset) => {
-                const expressions = buildFilters_1.buildFilters(dataset.filters, true);
+                const expressions = (0, buildFilters_1.buildFilters)(dataset.filters, true);
                 filters = filters.concat(expressions);
             });
         }

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

@@ -1,9 +1,10 @@
-import { IQrveyDataset } from "../../interfaces";
-import { IFSData, IFUData } from "../interfaces";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFSData } from "../interfaces/common/IFSData";
 /**
  * Generates a UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
  * @param datasetsInfo Collection of datasets information
  * @returns a UI Filters structure
  */
-export declare function FDToUI(filterData: IFSData, datasetsInfo?: IQrveyDataset[]): IFUData;
+export declare function FDToUI(filterData: IFSData, datasetsInfo?: IDataset[]): IFUData;

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

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FDToUI = void 0;
-const _1 = require(".");
-const general_1 = require("../../general");
-const constants_1 = require("../constants");
-const helpers_1 = require("../helpers");
+const adaptDateGroupingProperty_1 = require("./adaptDateGroupingProperty");
 const adaptFilterValues_1 = require("./adaptFilterValues");
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const cloneDeep_1 = require("../../general/object/cloneDeep");
+const FILTER_SECTION_1 = require("../constants/common/FILTER_SECTION");
+const FILTER_STRUCTURE_VERSION_1 = require("../constants/common/FILTER_STRUCTURE_VERSION");
+const get_1 = require("../../general/object/get");
+const getUIValues_1 = require("../helpers/ui/getUIValues");
 /**
  * Generates a UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
@@ -14,9 +17,9 @@ const adaptFilterValues_1 = require("./adaptFilterValues");
  */
 function FDToUI(filterData, datasetsInfo = []) {
     let ufData;
-    if (general_1.isEmpty(filterData) || general_1.isEmpty(filterData.scopes))
+    if ((0, isEmpty_1.isEmpty)(filterData) || (0, isEmpty_1.isEmpty)(filterData.scopes))
         return ufData;
-    filterData = general_1.cloneDeep(filterData);
+    filterData = (0, cloneDeep_1.cloneDeep)(filterData);
     switch (filterData.version) {
         case '2.1': {
             ufData = FD21ToUI(filterData.scopes, filterData.section, filterData.enabled, datasetsInfo, filterData.version);
@@ -34,7 +37,7 @@ exports.FDToUI = FDToUI;
  * @param datasetsInfo Collection of datasets information
  * @returns a UI filter Structure
  */
-function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, datasetsInfo = [], version = constants_1.FILTER_STRUCTURE_VERSION) {
+function FD21ToUI(scopes = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHERE, enabled = true, datasetsInfo = [], version = FILTER_STRUCTURE_VERSION_1.FILTER_STRUCTURE_VERSION) {
     if (scopes.length === 0)
         return;
     const ufData = {
@@ -45,23 +48,24 @@ function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = tr
     };
     ufData.scopes = scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(dataset => {
             const datasetInfo = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
-            return Object.assign(Object.assign({}, dataset), { label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.name, filters: dataset.filters.map(filter => {
+            return Object.assign(Object.assign({}, dataset), { label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label, filters: dataset.filters.map(filter => {
+                    var _a;
                     let columnInfo;
-                    if (!general_1.isEmpty(datasetInfo))
+                    if (!(0, isEmpty_1.isEmpty)(datasetInfo))
                         columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
-                    const property = _1.adaptDateGroupingProperty(filter.property);
+                    const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(filter.property);
                     return Object.assign(Object.assign({}, filter), { column: {
                             aggregate: filter.column.aggregate,
                             calculation: filter.column.calculation,
                             formulaType: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.formulaType,
                             id: filter.column.id,
-                            label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.text,
+                            label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
                             linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
-                            linkid: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linkid) || (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid),
-                            outputFormat: general_1._get(datasetInfo, 'outputFormat'),
+                            linkid: ((_a = columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.dataset) === null || _a === void 0 ? void 0 : _a.linkid) || (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid),
+                            outputFormat: (0, get_1._get)(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
-                        }, property, uiValues: helpers_1.getUIValues(filter), values: adaptFilterValues_1.adaptFilterValues(filter) });
+                        }, property, uiValues: (0, getUIValues_1.getUIValues)(filter), values: (0, adaptFilterValues_1.adaptFilterValues)(filter) });
                 }) });
         }) })));
     return ufData;

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

@@ -1,4 +1,5 @@
-import { IFSData, IFUData } from "../interfaces";
+import { IFSData } from "../interfaces/common/IFSData";
+import { IFUData } from "../interfaces/ui/IFUData";
 /**
  * Generates a Filter Data Structure structure from UI Filter Data structure.
  * @param filterData The UI filter data object.

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UIToFD = void 0;
-const general_1 = require("../../general");
+const cloneDeep_1 = require("../../general/object/cloneDeep");
+const isEmpty_1 = require("../../general/mix/isEmpty");
 /**
  * Generates a Filter Data Structure structure from UI Filter Data structure.
  * @param filterData The UI filter data object.
@@ -9,9 +10,9 @@ const general_1 = require("../../general");
  */
 function UIToFD(uFilterData) {
     let sData;
-    if (general_1.isEmpty(uFilterData) || general_1.isEmpty(uFilterData.scopes) || !Array.isArray(uFilterData.scopes))
+    if ((0, isEmpty_1.isEmpty)(uFilterData) || (0, isEmpty_1.isEmpty)(uFilterData.scopes) || !Array.isArray(uFilterData.scopes))
         return sData;
-    uFilterData = general_1.cloneDeep(uFilterData);
+    uFilterData = (0, cloneDeep_1.cloneDeep)(uFilterData);
     switch (uFilterData.version) {
         case '2.1': {
             sData = UI21ToFD(uFilterData, uFilterData.version);

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

@@ -1,9 +1,10 @@
-import { IQrveyDataset } from "../../interfaces/Qrvey.Interface";
-import { IFUData, IFUFlattenedFilter } from "../interfaces";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
+import { IFUData } from "../interfaces/ui/IFUData";
 /**
  * Generates a Flattened UI filter structure from UI Filter Data structure.
  * @param filterData The UI filter data object.
  * @param datasetsInfo Collection of datasets information. Optional for updating the datasets info
  * @returns a flattened UI filters array
  */
-export declare function UIToFlatUI(filterData: IFUData, datasetsInfo?: IQrveyDataset[]): IFUFlattenedFilter[];
+export declare function UIToFlatUI(filterData: IFUData, datasetsInfo?: IDataset[]): IFUFlattenedFilter[];

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UIToFlatUI = void 0;
-const _1 = require(".");
-const general_1 = require("../../general");
-const helpers_1 = require("../helpers");
+const adaptDateGroupingProperty_1 = require("./adaptDateGroupingProperty");
 const adaptFilterValues_1 = require("./adaptFilterValues");
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const cloneDeep_1 = require("../../general/object/cloneDeep");
+const getUIValues_1 = require("../helpers/ui/getUIValues");
 /**
  * Generates a Flattened UI filter structure from UI Filter Data structure.
  * @param filterData The UI filter data object.
@@ -13,9 +14,9 @@ const adaptFilterValues_1 = require("./adaptFilterValues");
  */
 function UIToFlatUI(filterData, datasetsInfo = []) {
     let uFilters = [];
-    if (general_1.isEmpty(filterData) || general_1.isEmpty(filterData.scopes) || filterData.scopes.length === 0)
+    if ((0, isEmpty_1.isEmpty)(filterData) || (0, isEmpty_1.isEmpty)(filterData.scopes) || filterData.scopes.length === 0)
         return uFilters;
-    filterData = general_1.cloneDeep(filterData);
+    filterData = (0, cloneDeep_1.cloneDeep)(filterData);
     switch (filterData.version) {
         case '2.1': {
             uFilters = UI21ToFlatUI(filterData.scopes, datasetsInfo);
@@ -41,10 +42,10 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                     dataset.filters.forEach(filter => {
                         const datasetInfo = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
                         let columnInfo;
-                        if (!general_1.isEmpty(datasetInfo))
+                        if (!(0, isEmpty_1.isEmpty)(datasetInfo))
                             columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
-                        const info = !general_1.isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
-                        const property = _1.adaptDateGroupingProperty(filter.property);
+                        const info = !(0, isEmpty_1.isEmpty)(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
+                        const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(filter.property);
                         const uFilter = {
                             collapsed: filter.collapsed,
                             column: {
@@ -53,7 +54,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                                 qrveyid: filter.column.qrveyid,
                                 aggregate: filter.column.aggregate,
                                 calculation: filter.column.calculation,
-                                label: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.text) || filter.column.label,
+                                label: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label) || filter.column.label,
                                 linkid: filter.column.linkid,
                                 linked: filter.column.linked,
                                 outputFormat: filter.column.outputFormat,
@@ -74,7 +75,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                                     collapsed: dataset.collapsed,
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
-                                    label: (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.name) || dataset.label,
+                                    label: dataset.label,
                                     linkid: dataset.linkid,
                                 } }),
                             filterid: filter.filterid,
@@ -82,9 +83,9 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                             nullValues: filter.nullValues,
                             operator: filter.operator,
                             property,
-                            uiValues: helpers_1.getUIValues(filter),
+                            uiValues: (0, getUIValues_1.getUIValues)(filter),
                             validator: filter.validator,
-                            values: adaptFilterValues_1.adaptFilterValues(filter),
+                            values: (0, adaptFilterValues_1.adaptFilterValues)(filter),
                         };
                         uFilters.push(uFilter);
                     });

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

@@ -1,2 +1,3 @@
-import { IFUData, OLD_IFilterData } from "../interfaces";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { OLD_IFilterData } from "../interfaces/OLD_IFilterData";
 export declare function UIToOldLogic(uFilterData: IFUData, flattedMethod?: boolean): OLD_IFilterData;

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

@@ -1,20 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UIToOldLogic = void 0;
-const _1 = require(".");
-const general_1 = require("../../general");
-const helpers_1 = require("../helpers");
+const adaptDateGroupingProperty_1 = require("./adaptDateGroupingProperty");
+const FILTER_OPERATOR_1 = require("../constants/common/FILTER_OPERATOR");
 const adaptFilterValues_1 = require("./adaptFilterValues");
 const flatUIToOldLogic_1 = require("./flatUIToOldLogic");
 const UIToFlatUI_1 = require("./UIToFlatUI");
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const cloneDeep_1 = require("../../general/object/cloneDeep");
+const getBackendGroupValue_1 = require("../helpers/backend/getBackendGroupValue");
+const getBackendProperty_1 = require("../helpers/backend/getBackendProperty");
+const getBackendValidator_1 = require("../helpers/backend/getBackendValidator");
+const getBackendValues_1 = require("../helpers/backend/getBackendValues");
+const getUIValues_1 = require("../helpers/ui/getUIValues");
 function UIToOldLogic(uFilterData, flattedMethod = true) {
     let oldFilterData;
-    if (general_1.isEmpty(uFilterData) || general_1.isEmpty(uFilterData.scopes))
+    if ((0, isEmpty_1.isEmpty)(uFilterData) || (0, isEmpty_1.isEmpty)(uFilterData.scopes))
         return oldFilterData;
-    uFilterData = general_1.cloneDeep(uFilterData);
+    uFilterData = (0, cloneDeep_1.cloneDeep)(uFilterData);
     switch (uFilterData.version) {
         case '2.1': {
-            oldFilterData = flattedMethod ? flatUIToOldLogic_1.flatUIToOldLogic(UIToFlatUI_1.UIToFlatUI(uFilterData), uFilterData.section) : UI21ToOldLogic(uFilterData);
+            oldFilterData = flattedMethod ? (0, flatUIToOldLogic_1.flatUIToOldLogic)((0, UIToFlatUI_1.UIToFlatUI)(uFilterData), uFilterData.section) : UI21ToOldLogic(uFilterData);
             break;
         }
     }
@@ -50,12 +56,12 @@ function buildFilters(datasetSection, scope) {
         const filter = {
             expressions: [{
                     expressions: buildExpressions(dataset.filters, scope, dataset),
-                    operator: "OR" /* OR */,
+                    operator: FILTER_OPERATOR_1.FILTER_OPERATOR.OR,
                     uiExtras: {
                         expressionid: '' // CANNOT ADD AT THIS SCOPE.
                     }
                 }],
-            operator: "AND" /* AND */
+            operator: FILTER_OPERATOR_1.FILTER_OPERATOR.AND
         };
         filters.push(filter);
         return filters;
@@ -66,14 +72,14 @@ function buildExpressions(filterSection, scope, dataset) {
         const expression = {
             enabled: filter.enabled,
             formulaType: filter.column.formulaType,
-            groupValue: helpers_1.getBackendGroupValue(filter),
+            groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(filter),
             linkid: filter.column.linkid,
-            property: helpers_1.getBackendProperty(filter),
+            property: (0, getBackendProperty_1.getBackendProperty)(filter),
             qrveyid: filter.column.qrveyid,
             questionType: filter.column.type,
             questionid: filter.column.id,
-            validationType: helpers_1.getBackendValidator(filter.validator),
-            value: helpers_1.getBackendValues(filter),
+            validationType: (0, getBackendValidator_1.getBackendValidator)(filter.validator),
+            value: (0, getBackendValues_1.getBackendValues)(filter),
             uiExtras: getFilterDetail(filter, scope, dataset),
         };
         expressions.push(expression);
@@ -81,44 +87,45 @@ function buildExpressions(filterSection, scope, dataset) {
     }, []);
 }
 const getFilterDetail = (filter, scope, dataset) => {
-    let aggregate, calculation, info;
-    if (filter.column.aggregate != null) {
-        aggregate = {
-            abbreviation: undefined,
-            id: undefined,
-            label: filter.column.aggregate,
-            text: undefined, // CANNOT ADD AT THIS SCOPE
-        };
-    }
-    if (filter.column.calculation != null) {
-        calculation = {
-            abbreviation: undefined,
-            id: undefined,
-            text: undefined,
-            type: undefined,
-            value: filter.column.calculation,
-        };
-    }
-    if (!general_1.isEmpty(filter.extras.info)) {
+    // let aggregate, calculation, info;
+    let info;
+    // if (filter.column.aggregate != null) {
+    //     aggregate = {
+    //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
+    //         id: undefined, // CANNOT ADD AT THIS SCOPE
+    //         label: filter.column.aggregate,
+    //         text: undefined, // CANNOT ADD AT THIS SCOPE
+    //     };
+    // }
+    // if (filter.column.calculation != null) {
+    //     calculation = {
+    //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
+    //         id: undefined, // CANNOT ADD AT THIS SCOPE
+    //         text: undefined,
+    //         type: undefined,
+    //         value: filter.column.calculation,
+    //     };
+    // }
+    if (!(0, isEmpty_1.isEmpty)(filter.extras.info)) {
         info = {
             icon: filter.extras.info.icon,
             label: filter.extras.info.label,
         };
     }
-    const property = _1.adaptDateGroupingProperty(filter.property);
+    const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(filter.property);
     return {
         collapsed: filter.collapsed,
         column: {
             dataset: {
-                name: dataset.label,
+                label: dataset.label,
                 qrveyid: dataset.qrveyid,
             },
             id: filter.column.id,
             qrveyid: filter.column.qrveyid,
-            text: filter.column.label,
+            label: filter.column.label,
             type: filter.column.type,
-            aggregate,
-            calculation,
+            aggregate: filter.column.aggregate,
+            calculation: filter.column.calculation,
             formulaType: filter.column.formulaType,
             linked: undefined,
             linkid: filter.column.linkid,
@@ -140,8 +147,8 @@ const getFilterDetail = (filter, scope, dataset) => {
         panelid: filter.extras.panelid,
         panelName: filter.extras.filterLabel,
         section: filter.extras.section,
-        uiValue: helpers_1.getUIValues(filter, true),
+        uiValue: (0, getUIValues_1.getUIValues)(filter, true),
         validator: filter.validator,
-        values: adaptFilterValues_1.adaptFilterValues(filter)
+        values: (0, adaptFilterValues_1.adaptFilterValues)(filter)
     };
 };

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

@@ -1,4 +1,4 @@
-import { IFProperty } from "..";
+import { IFProperty } from "../interfaces/IFProperty";
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.adaptDateGroupingProperty = void 0;
+const DATE_DISTINCT_PROPERTY_1 = require("../../dates/constants/DATE_DISTINCT_PROPERTY");
+const DATE_DISTINCT_TIME_PROPERTY_1 = require("../../dates/constants/DATE_DISTINCT_TIME_PROPERTY");
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties
@@ -8,12 +10,12 @@ exports.adaptDateGroupingProperty = void 0;
  * @returns
  */
 function adaptDateGroupingProperty(property) {
-    return property === 'p&quarter' ? "quarter_only" /* DATE_YEAR_QUARTER */ :
-        property === 'p&month' ? "month_only" /* DATE_YEAR_MONTH */ :
-            property === 'p&day' ? "day_only" /* DATE_MONTH_DAY */ :
-                property === 'p&hour' ? "hour_only" /* DATE_DAY_HOUR */ :
-                    property === 'p&minute' ? "minute_only" /* DATE_HOUR_MINUTE */ :
-                        property === 'p&second' ? "second_only" /* DATE_MINUTE_SECOND */ :
+    return property === 'p&quarter' ? DATE_DISTINCT_PROPERTY_1.DATE_DISTINCT_PROPERTY.YEAR_QUARTER :
+        property === 'p&month' ? DATE_DISTINCT_PROPERTY_1.DATE_DISTINCT_PROPERTY.YEAR_MONTH :
+            property === 'p&day' ? DATE_DISTINCT_PROPERTY_1.DATE_DISTINCT_PROPERTY.MONTH_DAY :
+                property === 'p&hour' ? DATE_DISTINCT_TIME_PROPERTY_1.DATE_DISTINCT_TIME_PROPERTY.DAY_HOUR :
+                    property === 'p&minute' ? DATE_DISTINCT_TIME_PROPERTY_1.DATE_DISTINCT_TIME_PROPERTY.HOUR_MINUTE :
+                        property === 'p&second' ? DATE_DISTINCT_TIME_PROPERTY_1.DATE_DISTINCT_TIME_PROPERTY.MINUTE_SECOND :
                             property;
 }
 exports.adaptDateGroupingProperty = adaptDateGroupingProperty;

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

@@ -1,5 +1,7 @@
-import { IQrveyDataset } from "../../interfaces";
-import { IFSData, IFUData, OLD_IFilterData } from "../interfaces";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFSData } from "../interfaces/common/IFSData";
+import { OLD_IFilterData } from "../interfaces/OLD_IFilterData";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
 /**
  * Checks and adapts the v2.0 Filter Data Structure to the v2.1
  * @param filterData The filter data structure. Accepts both v2.1 or v2.0
@@ -7,4 +9,4 @@ import { IFSData, IFUData, OLD_IFilterData } from "../interfaces";
  * @param datasetsInfo Collection of datasets information. If getUIFilterData is true, the datasetsInfo should be mandatory
  * @returns A new filter data structure v2.1
  */
-export declare function adaptFilterData(filterData: IFSData | IFUData | OLD_IFilterData, getUIFilterData?: boolean, datasetsInfo?: IQrveyDataset[]): IFSData | IFUData;
+export declare function adaptFilterData(filterData: IFSData | IFUData | OLD_IFilterData, getUIFilterData?: boolean, datasetsInfo?: IDataset[]): IFSData | IFUData;

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.adaptFilterData = void 0;
-const general_1 = require("../../general");
-const FDToUI_1 = require("./FDToUI");
-const logicToFD_1 = require("./logicToFD");
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const cloneDeep_1 = require("../../general/object/cloneDeep");
+const get_1 = require("../../general/object/get");
 const logicToUI_1 = require("./logicToUI");
+const FDToUI_1 = require("./FDToUI");
 const UIToFD_1 = require("./UIToFD");
+const logicToFD_1 = require("./logicToFD");
 /**
  * Checks and adapts the v2.0 Filter Data Structure to the v2.1
  * @param filterData The filter data structure. Accepts both v2.1 or v2.0
@@ -14,14 +16,14 @@ const UIToFD_1 = require("./UIToFD");
  * @returns A new filter data structure v2.1
  */
 function adaptFilterData(filterData, getUIFilterData = true, datasetsInfo = []) {
-    if (general_1.isEmpty(filterData))
+    if ((0, isEmpty_1.isEmpty)(filterData))
         return;
-    filterData = general_1.cloneDeep(filterData);
-    if (!general_1.isEmpty(general_1._get(filterData, 'logic'))) {
-        return getUIFilterData ? logicToUI_1.logicToUI(general_1._get(filterData, 'logic'), general_1._get(filterData, 'section'), general_1._get(filterData, 'enabled')) : logicToFD_1.logicToFD(general_1._get(filterData, 'logic'), general_1._get(filterData, 'section'), general_1._get(filterData, 'enabled'));
+    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'));
     }
-    if (!general_1.isEmpty(general_1._get(filterData, 'scopes'))) {
-        return getUIFilterData ? FDToUI_1.FDToUI(filterData, datasetsInfo) : UIToFD_1.UIToFD(filterData);
+    if (!(0, isEmpty_1.isEmpty)((0, get_1._get)(filterData, 'scopes'))) {
+        return getUIFilterData ? (0, FDToUI_1.FDToUI)(filterData, datasetsInfo) : (0, UIToFD_1.UIToFD)(filterData);
     }
 }
 exports.adaptFilterData = adaptFilterData;

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

@@ -1,4 +1,5 @@
-import { IFSFilter, IFValue } from "..";
+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

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.adaptFilterValues = void 0;
-const __1 = require("../..");
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const COLUMN_1 = require("../../columns/constants/COLUMN");
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Gets an adapted filter value array. Validates the enabled property and sets
@@ -9,8 +10,8 @@ const __1 = require("../..");
  * @returns A new value array with the filled properties.
  */
 function adaptFilterValues(filter) {
-    const setValue = value => (Object.assign(Object.assign({}, value), { enabled: __1.isEmpty(value.enabled) ? true : value.enabled }));
-    if (filter.column.type === __1.COLUMN.RANKING && __1.isEmpty(filter.column.aggregate)) {
+    const setValue = value => (Object.assign(Object.assign({}, value), { enabled: (0, isEmpty_1.isEmpty)(value.enabled) ? true : value.enabled }));
+    if (filter.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(filter.column.aggregate)) {
         return filter.values.map(rValues => rValues.map(setValue));
     }
     return filter.values.map(setValue);

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

@@ -1,4 +1,6 @@
-import { IFSData, IFSection, IFUFlattenedFilter } from "../interfaces";
+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

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

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flatUIToFD = void 0;
-const _1 = require(".");
-const general_1 = require("../../general");
-const constants_1 = require("../constants");
+const adaptDateGroupingProperty_1 = require("./adaptDateGroupingProperty");
+const isEmpty_1 = require("../../general/mix/isEmpty");
 const adaptFilterValues_1 = require("./adaptFilterValues");
+const FILTER_SECTION_1 = require("../constants/common/FILTER_SECTION");
+const FILTER_STRUCTURE_VERSION_1 = require("../constants/common/FILTER_STRUCTURE_VERSION");
 /**
  * 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.
  */
-function flatUIToFD(uFilters = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, version = constants_1.FILTER_STRUCTURE_VERSION) {
+function flatUIToFD(uFilters = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION_1.FILTER_STRUCTURE_VERSION) {
     return {
         enabled,
         section,
@@ -81,8 +82,8 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
-    const info = !general_1.isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
-    const property = _1.adaptDateGroupingProperty(uFilter.property);
+    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);
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -103,6 +104,6 @@ function buildFilter(uFilter) {
         operator: uFilter.operator,
         property,
         validator: uFilter.validator,
-        values: adaptFilterValues_1.adaptFilterValues(uFilter),
+        values: (0, adaptFilterValues_1.adaptFilterValues)(uFilter),
     };
 }

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

@@ -1,4 +1,5 @@
-import { IFBLogic, IFUFlattenedFilter } from "../interfaces";
+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

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

@@ -9,7 +9,7 @@ const FDToLogic_1 = require("./FDToLogic");
  * @returns The logic structure
  */
 function flatUIToLogic(uFilter) {
-    const uiFilters = flatUIToFD_1.flatUIToFD(uFilter);
-    return FDToLogic_1.FDToLogic(uiFilters);
+    const uiFilters = (0, flatUIToFD_1.flatUIToFD)(uFilter);
+    return (0, FDToLogic_1.FDToLogic)(uiFilters);
 }
 exports.flatUIToLogic = flatUIToLogic;

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

@@ -1,4 +1,8 @@
-import { IFSection, OLD_IFilterData, OLD_IFilterDetail, OLD_IFilterLogic, IFUFlattenedFilter } from "../interfaces";
+import { OLD_IFilterData } from "../interfaces/OLD_IFilterData";
+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