@qrvey/utils 1.1.8 → 1.2.1

package/dist/dates/relative/helpers/formatStatement.js

@@ -0,0 +1,21 @@
+import { RELATIVE_CURSOR } from "../constants/RELATIVE_CURSOR";
+import { _get } from "../../../general/object/get";
+import { mapValues } from "../../../general/object/mapValues";
+import { DATE_GROUPING_PROPERTY } from "../../constants/DATE_GROUPING_PROPERTY";
+import { COMMON_CONSTANTS } from "../constants/COMMON";
+/**
+ * Build a proper relative date statement type
+ * @param {RelativeStatement} statement
+ * @returns {RelativeStatement}
+ */
+export function formatStatement(statement) {
+    const loweredStatement = mapValues(statement, s => typeof s === 'string' ? s.toLowerCase() : s);
+    return {
+        cursor: _get(loweredStatement, 'cursor', RELATIVE_CURSOR.THIS),
+        unit: _get(loweredStatement, 'unit', DATE_GROUPING_PROPERTY.DAY),
+        number: _get(loweredStatement, 'number', 0),
+        anchor: _get(loweredStatement, 'anchor', COMMON_CONSTANTS.NOW_TOKEN),
+        isCalendarDate: _get(loweredStatement, 'isCalendarDate', true),
+        includeCurrent: _get(loweredStatement, 'includeCurrent', true)
+    };
+}

package/dist/dates/relative/helpers/getStatementCase.js

@@ -0,0 +1,13 @@
+import { COMMON_CONSTANTS } from '../constants/COMMON';
+/**
+ * Returns a number/constant that identifies a relative date case
+ * @param {boolean} includeCurrent
+ * @param {boolean} isCalendarDate
+ * @returns {number}
+ */
+export function getStatementCase(includeCurrent, isCalendarDate) {
+    return includeCurrent && isCalendarDate ? COMMON_CONSTANTS.INCLUSIVE_AND_CALENDAR
+        : !includeCurrent && isCalendarDate ? COMMON_CONSTANTS.EXCLUSIVE_AND_CALENDAR
+            : !includeCurrent && !isCalendarDate ? COMMON_CONSTANTS.EXCLUSIVE_AND_ROLLING
+                : COMMON_CONSTANTS.INCLUSIVE_AND_ROLLING;
+}

package/dist/dates/relative/interfaces/AbsoluteStatement.js

@@ -0,0 +1 @@
+export {};

package/dist/dates/relative/interfaces/Anchor.d.ts

@@ -0,0 +1,8 @@
+import { RELATIVE_CURSOR } from "../constants/RELATIVE_CURSOR";
+import { IDateGroupingProperty } from "../../interfaces/IDateGroupingProperty";
+export interface Anchor {
+    cursor: RELATIVE_CURSOR;
+    unit: IDateGroupingProperty;
+    number: string | number;
+    anchor?: Anchor | string;
+}

package/dist/dates/relative/interfaces/Anchor.js

@@ -0,0 +1 @@
+export {};

package/dist/dates/relative/interfaces/RelativeCursor.d.ts

@@ -0,0 +1,2 @@
+import { RELATIVE_CURSOR } from "../constants/RELATIVE_CURSOR";
+export declare type RelativeCursor = RELATIVE_CURSOR;

package/dist/dates/relative/interfaces/RelativeCursor.js

@@ -0,0 +1 @@
+export {};

package/dist/dates/relative/interfaces/RelativeInput.js

@@ -0,0 +1 @@
+export {};

package/dist/dates/relative/interfaces/RelativeStatement.d.ts

@@ -0,0 +1,11 @@
+import { IDateGroupingProperty } from '../../interfaces/IDateGroupingProperty';
+import { RELATIVE_CURSOR } from '../constants/RELATIVE_CURSOR';
+import { Anchor } from './Anchor';
+export interface RelativeStatement {
+    cursor: RELATIVE_CURSOR;
+    unit: IDateGroupingProperty;
+    number?: number;
+    includeCurrent?: boolean;
+    isCalendarDate?: boolean;
+    anchor?: Anchor | string;
+}

package/dist/dates/relative/interfaces/RelativeStatement.js

@@ -0,0 +1 @@
+export {};

package/dist/dates/relative/interfaces/RelativeToAbsoluteStruct.d.ts

@@ -0,0 +1,9 @@
+import { Dayjs } from '../helpers/dayjs-module';
+import { COMMON_CONSTANTS } from '../constants/COMMON';
+export interface RelativeToAbsoluteStruct {
+    pivot: string | Date | Dayjs;
+    unit: string;
+    steps?: number;
+    setTo?: COMMON_CONSTANTS;
+    resolveAsCalendar?: boolean;
+}

package/dist/dates/relative/interfaces/RelativeToAbsoluteStruct.js

@@ -0,0 +1 @@
+export {};

package/dist/dates/relative/interfaces/ui/IRelativeSectionConfig.js

@@ -0,0 +1 @@
+export {};

package/dist/dates/relative/interfaces/ui/IRelativeSectionItem.d.ts

@@ -0,0 +1,7 @@
+import { RelativeCursor } from "../RelativeCursor";
+import { IDateGroupingProperty } from "../../../interfaces/IDateGroupingProperty";
+export interface IRelativeSectionItem {
+    cursor: RelativeCursor;
+    unit: IDateGroupingProperty;
+    number: string | number;
+}

package/dist/dates/relative/interfaces/ui/IRelativeSectionItem.js

@@ -0,0 +1 @@
+export {};

package/dist/dates/relative/interfaces/ui/IRelativeSectionMode.d.ts

@@ -0,0 +1,2 @@
+import { RELATIVE_MODE } from "../../constants/ui/RELATIVE_MODE";
+export declare type IRelativeSectionMode = RELATIVE_MODE;

package/dist/dates/relative/interfaces/ui/IRelativeSectionMode.js

@@ -0,0 +1 @@
+export {};

package/dist/dates/relative/relative.d.ts

@@ -0,0 +1,22 @@
+import { RelativeStatement } from './interfaces/RelativeStatement';
+/**
+ * Resolve a list of relative statements according to operator
+ * @example
+ * Input:
+ * {
+ *  "cursor": "the_next",
+ *  "unit": "year",
+ *  "number": 1,
+ *  "includeCurrent": false,
+ *  "isCalendarDate": false,
+ *  "anchor": "03/05/2021"
+ * }
+ *
+ * Output:
+ * { gte: "03/06/2021 00:00:00", lte: "03/05/2022 23:59:59" }
+ *
+ * @param {RelativeStatement[]|string[]} statements - Raw statements/values
+ * @param {Date} clock - Clock/time reference for relative date resolution
+ * @returns {AbsoluteRange[]|string[]}
+ */
+export declare function resolveRelative(statements: RelativeStatement[], clock?: Date): (string | import("./interfaces").AbsoluteStatement)[];

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

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

package/dist/filters/adapters/FDToFlatUI.js

@@ -1,7 +1,9 @@
-import { cloneDeep, isEmpty, _get } from "../../general";
-import { getUIValues } from "../helpers";
-import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
 import { adaptFilterValues } from "./adaptFilterValues";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { _get } from "../../general/object/get";
+import { getUIValues } from "../helpers/ui/getUIValues";
 /**
  * Generates a Flattened UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
@@ -39,7 +41,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                         const datasetInfo = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
                         let columnInfo;
                         if (!isEmpty(datasetInfo))
-                            columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
+                            columnInfo = datasetInfo.options.find(cInfo => { var _a, _b; return cInfo.id === filter.column.id && ((_a = cInfo.dataset) === null || _a === void 0 ? void 0 : _a.qrveyid) === filter.column.qrveyid && ((_b = cInfo.dataset) === null || _b === void 0 ? void 0 : _b.linkid) === filter.column.linkid; });
                         const info = !isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
                         const property = adaptDateGroupingProperty(filter.property);
                         const uFilter = {
@@ -50,8 +52,8 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                                 qrveyid: filter.column.qrveyid,
                                 aggregate: filter.column.aggregate,
                                 calculation: filter.column.calculation,
-                                label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.text,
-                                linkid: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linkid,
+                                label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
+                                linkid: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid,
                                 linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
                                 outputFormat: _get(datasetInfo, 'outputFormat'),
                                 type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
@@ -71,7 +73,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                                     collapsed: dataset.collapsed,
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
-                                    label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.name,
+                                    label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label,
                                     linkid: dataset.linkid,
                                 } }),
                             filterid: filter.filterid,

package/dist/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/filters/adapters/FDToLogic.js

@@ -1,6 +1,6 @@
 // FROM Logic structure = Old logic structure (v2.0)
 // TO Logic structure = Cleaner logic structure
-import { isEmpty } from "../../general";
+import { isEmpty } from "../../general/mix/isEmpty";
 import { buildFilters } from "../helpers/backend/buildFilters";
 /**
  * Generates a Filter Logic structure from Filter Data structure.

package/dist/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/filters/adapters/FDToUI.js

@@ -1,8 +1,11 @@
-import { adaptDateGroupingProperty } from ".";
-import { cloneDeep, isEmpty, _get } from "../../general";
-import { FILTER_STRUCTURE_VERSION } from "../constants";
-import { getUIValues } from "../helpers";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
 import { adaptFilterValues } from "./adaptFilterValues";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
+import { _get } from "../../general/object/get";
+import { getUIValues } from "../helpers/ui/getUIValues";
 /**
  * Generates a UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
@@ -30,7 +33,7 @@ export function FDToUI(filterData, datasetsInfo = []) {
  * @param datasetsInfo Collection of datasets information
  * @returns a UI filter Structure
  */
-function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, datasetsInfo = [], version = FILTER_STRUCTURE_VERSION) {
+function FD21ToUI(scopes = [], section = FILTER_SECTION.ANYWHERE, enabled = true, datasetsInfo = [], version = FILTER_STRUCTURE_VERSION) {
     if (scopes.length === 0)
         return;
     const ufData = {
@@ -41,7 +44,8 @@ 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 (!isEmpty(datasetInfo))
                         columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
@@ -51,9 +55,9 @@ function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = tr
                             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),
+                            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: _get(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,

package/dist/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/filters/adapters/UIToFD.js

@@ -1,4 +1,5 @@
-import { cloneDeep, isEmpty } from "../../general";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { isEmpty } from "../../general/mix/isEmpty";
 /**
  * Generates a Filter Data Structure structure from UI Filter Data structure.
  * @param filterData The UI filter data object.

package/dist/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/filters/adapters/UIToFlatUI.js

@@ -1,7 +1,8 @@
-import { adaptDateGroupingProperty } from ".";
-import { cloneDeep, isEmpty } from "../../general";
-import { getUIValues } from "../helpers";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
 import { adaptFilterValues } from "./adaptFilterValues";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { getUIValues } from "../helpers/ui/getUIValues";
 /**
  * Generates a Flattened UI filter structure from UI Filter Data structure.
  * @param filterData The UI filter data object.
@@ -49,7 +50,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,
@@ -70,7 +71,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,

package/dist/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/filters/adapters/UIToOldLogic.js

@@ -1,9 +1,15 @@
-import { adaptDateGroupingProperty } from ".";
-import { cloneDeep, isEmpty } from "../../general";
-import { getBackendGroupValue, getBackendProperty, getBackendValidator, getBackendValues, getUIValues } from "../helpers";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
 import { adaptFilterValues } from "./adaptFilterValues";
 import { flatUIToOldLogic } from "./flatUIToOldLogic";
 import { UIToFlatUI } from "./UIToFlatUI";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { getBackendGroupValue } from "../helpers/backend/getBackendGroupValue";
+import { getBackendProperty } from "../helpers/backend/getBackendProperty";
+import { getBackendValidator } from "../helpers/backend/getBackendValidator";
+import { getBackendValues } from "../helpers/backend/getBackendValues";
+import { getUIValues } from "../helpers/ui/getUIValues";
 export function UIToOldLogic(uFilterData, flattedMethod = true) {
     let oldFilterData;
     if (isEmpty(uFilterData) || isEmpty(uFilterData.scopes))
@@ -46,12 +52,12 @@ function buildFilters(datasetSection, scope) {
         const filter = {
             expressions: [{
                     expressions: buildExpressions(dataset.filters, scope, dataset),
-                    operator: "OR" /* OR */,
+                    operator: FILTER_OPERATOR.OR,
                     uiExtras: {
                         expressionid: '' // CANNOT ADD AT THIS SCOPE.
                     }
                 }],
-            operator: "AND" /* AND */
+            operator: FILTER_OPERATOR.AND
         };
         filters.push(filter);
         return filters;
@@ -77,24 +83,25 @@ 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,
-        };
-    }
+    // 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 (!isEmpty(filter.extras.info)) {
         info = {
             icon: filter.extras.info.icon,
@@ -106,15 +113,15 @@ const getFilterDetail = (filter, scope, dataset) => {
         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,

package/dist/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/filters/adapters/adaptDateGroupingProperty.js

@@ -1,3 +1,5 @@
+import { DATE_DISTINCT_PROPERTY } from "../../dates/constants/DATE_DISTINCT_PROPERTY";
+import { DATE_DISTINCT_TIME_PROPERTY } from "../../dates/constants/DATE_DISTINCT_TIME_PROPERTY";
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties
@@ -5,11 +7,11 @@
  * @returns
  */
 export 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.YEAR_QUARTER :
+        property === 'p&month' ? DATE_DISTINCT_PROPERTY.YEAR_MONTH :
+            property === 'p&day' ? DATE_DISTINCT_PROPERTY.MONTH_DAY :
+                property === 'p&hour' ? DATE_DISTINCT_TIME_PROPERTY.DAY_HOUR :
+                    property === 'p&minute' ? DATE_DISTINCT_TIME_PROPERTY.HOUR_MINUTE :
+                        property === 'p&second' ? DATE_DISTINCT_TIME_PROPERTY.MINUTE_SECOND :
                             property;
 }

package/dist/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/filters/adapters/adaptFilterData.js

@@ -1,8 +1,10 @@
-import { cloneDeep, isEmpty, _get } from "../../general";
-import { FDToUI } from "./FDToUI";
-import { logicToFD } from "./logicToFD";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { cloneDeep } from "../../general/object/cloneDeep";
+import { _get } from "../../general/object/get";
 import { logicToUI } from "./logicToUI";
+import { FDToUI } from "./FDToUI";
 import { UIToFD } from "./UIToFD";
+import { logicToFD } from "./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

package/dist/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/filters/adapters/adaptFilterValues.js

@@ -1,4 +1,5 @@
-import { COLUMN, isEmpty } from "../..";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { COLUMN } from "../../columns/constants/COLUMN";
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Gets an adapted filter value array. Validates the enabled property and sets

package/dist/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/filters/adapters/flatUIToFD.js

@@ -1,14 +1,15 @@
-import { adaptDateGroupingProperty } from ".";
-import { isEmpty } from "../../general";
-import { FILTER_STRUCTURE_VERSION } from "../constants";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { isEmpty } from "../../general/mix/isEmpty";
 import { adaptFilterValues } from "./adaptFilterValues";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+import { FILTER_STRUCTURE_VERSION } from "../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.
  */
-export function flatUIToFD(uFilters = [], section = "ANYWHERE" /* ANYWHERE */, enabled = true, version = FILTER_STRUCTURE_VERSION) {
+export function flatUIToFD(uFilters = [], section = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION) {
     return {
         enabled,
         section,

package/dist/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/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