@qrvey/utils 1.1.2-0 → 1.1.4

package/dist/date/constants/DATE_TIME_VALUES.js

@@ -1,5 +1,5 @@
 export const DATE_TIME_VALUES = [
-    { label: 'Hours', value: "hour" /* DATE_HOUR */, display: true },
-    { label: 'Minutes', value: "minute" /* DATE_MINUTE */, display: true },
-    { label: 'Seconds', value: "second" /* DATE_SECOND */, display: true },
+    { label: 'Date, Hour', value: "hour" /* DATE_HOUR */, display: true },
+    { label: 'Date, Minute', value: "minute" /* DATE_MINUTE */, display: true },
+    { label: 'Date, Second', value: "second" /* DATE_SECOND */, display: true },
 ];

package/dist/date/constants/DATE_VALUES.d.ts

@@ -0,0 +1,6 @@
+import { COLUMN_PROPERTY } from "../../constants";
+export declare const DATE_VALUES: {
+    value: COLUMN_PROPERTY;
+    label: string;
+    display: boolean;
+}[];

package/dist/date/constants/DATE_VALUES.js

@@ -0,0 +1,7 @@
+export const DATE_VALUES = [
+    { value: "day" /* DATE_DAY */, label: 'Full Date', display: true },
+    { value: "year" /* DATE_YEAR */, label: 'Year', display: true },
+    { value: "quarter" /* DATE_QUARTER */, label: 'Quarter, Year', display: true },
+    { value: "month" /* DATE_MONTH */, label: 'Month, Year', display: true },
+    { value: "week" /* DATE_WEEK */, label: 'Week, Year', display: true }
+];

package/dist/filters/adapters/FDToFlatUI.js

@@ -1,5 +1,6 @@
 import { cloneDeep, isEmpty, _get } from "../../general";
 import { getUIValues } from "../helpers";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
 /**
  * Generates a Flattened UI filter structure from Filter Data structure.
  * @param filterData The filter data object.
@@ -39,6 +40,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                         if (!isEmpty(datasetInfo))
                             columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.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 = {
                             collapsed: filter.collapsed,
                             column: {
@@ -75,7 +77,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,
                             operator: filter.operator,
-                            property: filter.property,
+                            property: property,
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
                             values: filter.values,

package/dist/filters/adapters/FDToUI.js

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { cloneDeep, isEmpty, _get } from "../../general";
 import { FILTER_STRUCTURE_VERSION } from "../constants";
 import { getUIValues } from "../helpers";
@@ -43,6 +44,7 @@ function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = tr
                     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);
+                    const property = adaptDateGroupingProperty(filter.property);
                     return Object.assign(Object.assign({}, filter), { column: {
                             aggregate: filter.column.aggregate,
                             calculation: filter.column.calculation,
@@ -54,7 +56,7 @@ function FD21ToUI(scopes = [], section = "ANYWHERE" /* ANYWHERE */, enabled = tr
                             outputFormat: _get(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
-                        }, uiValues: getUIValues(filter) });
+                        }, property, uiValues: getUIValues(filter) });
                 }) });
         }) })));
     return ufData;

package/dist/filters/adapters/UIToFlatUI.js

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { cloneDeep, isEmpty } from "../../general";
 import { getUIValues } from "../helpers";
 /**
@@ -38,6 +39,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                         if (!isEmpty(datasetInfo))
                             columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.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 = {
                             collapsed: filter.collapsed,
                             column: {
@@ -74,7 +76,7 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                             lookupDisplayIndex: filter.lookupDisplayIndex,
                             nullValues: filter.nullValues,
                             operator: filter.operator,
-                            property: filter.property,
+                            property,
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
                             values: filter.values,

package/dist/filters/adapters/UIToOldLogic.js

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { cloneDeep, isEmpty } from "../../general";
 import { getBackendGroupValue, getBackendProperty, getBackendValidator, getBackendValues, getUIValues } from "../helpers";
 import { flatUIToOldLogic } from "./flatUIToOldLogic";
@@ -99,6 +100,7 @@ const getFilterDetail = (filter, scope, dataset) => {
             label: filter.extras.info.label,
         };
     }
+    const property = adaptDateGroupingProperty(filter.property);
     return {
         collapsed: filter.collapsed,
         column: {
@@ -126,7 +128,7 @@ const getFilterDetail = (filter, scope, dataset) => {
         lookupDisplayIndex: filter.lookupDisplayIndex,
         nullValues: filter.nullValues,
         operator: filter.operator,
-        property: filter.property,
+        property,
         scope: scope.scope,
         scopeid: filter.extras.scopeid,
         scopeEnabled: scope.enabled,

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

@@ -0,0 +1,8 @@
+import { IFProperty } from "..";
+/**
+ * [TODO: For 2022, eliminate this adapter]
+ * Get the new property base on the old date grouping properties
+ * @param property
+ * @returns
+ */
+export declare function adaptDateGroupingProperty(property: IFProperty | any): IFProperty;

package/dist/filters/adapters/adaptDateGroupingProperty.js

@@ -0,0 +1,15 @@
+/**
+ * [TODO: For 2022, eliminate this adapter]
+ * Get the new property base on the old date grouping properties
+ * @param property
+ * @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 */ :
+                            property;
+}

package/dist/filters/adapters/adaptFilterData.js

@@ -10,7 +10,7 @@ import { UIToFD } from "./UIToFD";
  * @param datasetsInfo Collection of datasets information. If getUIFilterData is true, the datasetsInfo should be mandatory
  * @returns A new filter data structure v2.1
  */
-export function adaptFilterData(filterData, getUIFilterData = false, datasetsInfo = []) {
+export function adaptFilterData(filterData, getUIFilterData = true, datasetsInfo = []) {
     if (isEmpty(filterData))
         return;
     filterData = cloneDeep(filterData);

package/dist/filters/adapters/flatUIToFD.js

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { isEmpty } from "../../general";
 import { FILTER_STRUCTURE_VERSION } from "../constants";
 /**
@@ -76,6 +77,7 @@ function buildDataset(uFilter) {
  */
 function buildFilter(uFilter) {
     const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const property = adaptDateGroupingProperty(uFilter.property);
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -94,7 +96,7 @@ function buildFilter(uFilter) {
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
-        property: uFilter.property,
+        property,
         validator: uFilter.validator,
         values: uFilter.values,
     };

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -165,14 +165,10 @@ function getGroupValue(props) {
     }
 }
 function getProperty(props) {
-    var _a;
     if (isEmpty(props.column.aggregate)) {
-        if (isNullValidator(props.validator)) {
+        if (isNullValidator(props.validator) || isDateColumn(props.column)) {
             return undefined;
         }
-        else if (isDateColumn(props.column)) {
-            return arePropertiesDateP(props.column, props.property) ? (_a = props.property) === null || _a === void 0 ? void 0 : _a.split('p&')[1] : undefined;
-        }
         else if (props.column.type === COLUMN.EXPRESSION && props.property != null) {
             return undefined;
         }

package/dist/filters/adapters/flatUIToUI.js

@@ -1,3 +1,4 @@
+import { adaptDateGroupingProperty } from ".";
 import { isEmpty, getLastIndexFromArray } from "../../general";
 import { FILTER_STRUCTURE_VERSION } from "../constants";
 import { getUIValues } from "../helpers";
@@ -83,6 +84,7 @@ function buildDataset(uFilter) {
  */
 function buildFilter(uFilter) {
     const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
+    const property = adaptDateGroupingProperty(uFilter.property);
     return {
         collapsed: uFilter.collapsed,
         column: {
@@ -108,7 +110,7 @@ function buildFilter(uFilter) {
         lookupDisplayIndex: uFilter.lookupDisplayIndex,
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
-        property: uFilter.property,
+        property,
         uiValues: getUIValues(uFilter),
         validator: uFilter.validator,
         values: uFilter.values,

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

@@ -1,4 +1,5 @@
 export * from './transformFilters';
+export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
 export * from './FDToFlatUI';
 export * from './FDToLogic';

package/dist/filters/adapters/index.js

@@ -1,4 +1,5 @@
 export * from './transformFilters';
+export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
 export * from './FDToFlatUI';
 export * from './FDToLogic';

package/dist/filters/adapters/logicToFlatUI.js

@@ -1,9 +1,10 @@
 // FROM Logic structure = Old logic structure (v2.0)
 // TO Logic structure = Cleaner logic structure
+import { adaptDateGroupingProperty } from ".";
 import { COLUMN } from "../../constants";
-import { isEmpty, _get } from "../../general";
+import { isEmpty, _get, _hasProperty } from "../../general";
 import { FILTER_VALIDATOR_VALUE } from "../constants";
-import { getFilterid, getUIValues, isNullValidator } from "../helpers";
+import { getFilterid, getUIValues, isNullValidator, } from "../helpers";
 /**
  * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
  * @param logics The old logic structure (v2.0)
@@ -16,75 +17,88 @@ export function logicToFlatUI(logics = []) {
     logics.forEach(scopeItem => {
         if (scopeItem.filters.length > 0) {
             scopeItem.filters.forEach(filterItem => {
-                filterItem.expressions[0].expressions.forEach((expression) => {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-                    const uiExtras = expression.uiExtras;
-                    const index = uiExtras.column.type === COLUMN.RANKING ? getFilter(uFilters, expression.uiExtras, true) : -1;
-                    if (index === -1 && (!uiExtras.nullValues || expression.validationType !== "IS_EMPTY" /* IS_NULL */)) {
-                        const scopeid = scopeItem.scope !== "GLOBAL" /* GLOBAL */ ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
-                        const info = !isEmpty(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : undefined;
-                        const uFilter = {
-                            collapsed: uiExtras.collapsed,
-                            column: {
-                                id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
-                                formulaType: (_b = uiExtras.column) === null || _b === void 0 ? void 0 : _b.formulaType,
-                                linkid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.linkid,
-                                linked: (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.linked,
-                                qrveyid: (_e = uiExtras.column) === null || _e === void 0 ? void 0 : _e.qrveyid,
-                                aggregate: (_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label,
-                                calculation: (_j = (_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.calculation) === null || _j === void 0 ? void 0 : _j.value,
-                                label: (_k = uiExtras.column) === null || _k === void 0 ? void 0 : _k.text,
-                                property: uiExtras.column.property,
-                                sorting: uiExtras.column.sorting,
-                                outputFormat: (_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.outputFormat,
-                                type: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.type,
-                            },
-                            dateSection: uiExtras.dateSection,
-                            displayed: true,
-                            enabled: expression.enabled,
-                            extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
-                                scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
-                                    collapsed: (_o = scopeItem.uiExtras) === null || _o === void 0 ? void 0 : _o.collapsed,
-                                    enabled: scopeItem.enabled,
-                                    displayed: true,
-                                    scope: scopeItem.scope,
-                                    scopeid,
-                                }, dataset: {
-                                    collapsed: false,
-                                    enabled: true,
-                                    displayed: true,
-                                    qrveyid: (_p = uiExtras.column) === null || _p === void 0 ? void 0 : _p.qrveyid,
-                                    label: (_r = (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.dataset) === null || _r === void 0 ? void 0 : _r.name,
-                                    linkid: (_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.linkid,
-                                } }),
-                            filterid: undefined,
-                            lookupDisplayIndex: uiExtras.lookupDisplayIndex,
-                            nullValues: uiExtras.nullValues,
-                            operator: uiExtras.operator,
-                            property: uiExtras.property,
-                            uiValues: getUIValues(uiExtras),
-                            validator: uiExtras.validator,
-                            values: getValues(uiExtras),
-                        };
-                        uFilter.filterid = getFilterid(uFilter);
-                        uFilters.push(uFilter);
-                    }
-                    if (uiExtras.column.type === COLUMN.RANKING && isEmpty(uiExtras.column.aggregate)) {
-                        // Restore uiExtras.values array into single IFilterDetail object values array
-                        if (index > -1)
-                            uFilters[index].values.push(uiExtras.values[0]);
-                        const refinedRankingValues = refineRankingValues((index > -1 ? uFilters[index].values : uiExtras.values), uiExtras.uiValue);
-                        if (index > -1)
-                            uFilters[index].values = refinedRankingValues;
-                        else
-                            uFilters[uFilters.length - 1].values = refinedRankingValues;
-                    }
+                filterItem.expressions.forEach((expression1) => {
+                    _hasProperty(expression1, 'expressions') ? expression1.expressions.forEach((expression2) => {
+                        buildFilterByExpression(expression2, scopeItem, uFilters);
+                    }) : buildFilterByExpression(expression1, scopeItem, uFilters);
                 });
+                // (filterItem.expressions[0].expressions as OLD_IFilterExpression[]).forEach((expression: OLD_IFilterExpression) => {
+                //     buildFilterByExpression(expression, scopeItem, uFilters);
+                // });
             });
         }
     });
     return uFilters;
 }
+function buildFilterByExpression(expression, scopeItem, uFilters) {
+    const uiExtras = expression.uiExtras;
+    const index = uiExtras.column.type === COLUMN.RANKING ? getFilter(uFilters, expression.uiExtras, true) : -1;
+    if (index === -1 && (!uiExtras.nullValues || expression.validationType !== "IS_EMPTY" /* IS_NULL */)) {
+        const uFilter = getFilterByExpression(expression, scopeItem);
+        uFilter.filterid = getFilterid(uFilter);
+        uFilters.push(uFilter);
+    }
+    if (uiExtras.column.type === COLUMN.RANKING && isEmpty(uiExtras.column.aggregate)) {
+        // Restore uiExtras.values array into single IFilterDetail object values array
+        if (index > -1)
+            uFilters[index].values.push(uiExtras.values[0]);
+        const refinedRankingValues = refineRankingValues((index > -1 ? uFilters[index].values : uiExtras.values), uiExtras.uiValue);
+        if (index > -1)
+            uFilters[index].values = refinedRankingValues;
+        else
+            uFilters[uFilters.length - 1].values = refinedRankingValues;
+    }
+}
+function getFilterByExpression(expression, scopeItem) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    const uiExtras = expression.uiExtras;
+    const scopeid = scopeItem.scope !== "GLOBAL" /* GLOBAL */ ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
+    const info = !isEmpty(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : undefined;
+    const property = adaptDateGroupingProperty(uiExtras.property);
+    return {
+        collapsed: uiExtras.collapsed,
+        column: {
+            id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
+            formulaType: (_b = uiExtras.column) === null || _b === void 0 ? void 0 : _b.formulaType,
+            linkid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.linkid,
+            linked: (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.linked,
+            qrveyid: (_e = uiExtras.column) === null || _e === void 0 ? void 0 : _e.qrveyid,
+            aggregate: (_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label,
+            calculation: (_j = (_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.calculation) === null || _j === void 0 ? void 0 : _j.value,
+            label: (_k = uiExtras.column) === null || _k === void 0 ? void 0 : _k.text,
+            property: uiExtras.column.property,
+            sorting: uiExtras.column.sorting,
+            outputFormat: (_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.outputFormat,
+            type: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.type,
+        },
+        dateSection: uiExtras.dateSection,
+        displayed: true,
+        enabled: expression.enabled,
+        extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
+            scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
+                collapsed: (_o = scopeItem.uiExtras) === null || _o === void 0 ? void 0 : _o.collapsed,
+                enabled: scopeItem.enabled,
+                displayed: true,
+                scope: scopeItem.scope,
+                scopeid,
+            }, dataset: {
+                collapsed: false,
+                enabled: true,
+                displayed: true,
+                qrveyid: (_p = uiExtras.column) === null || _p === void 0 ? void 0 : _p.qrveyid,
+                label: (_r = (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.dataset) === null || _r === void 0 ? void 0 : _r.name,
+                linkid: (_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.linkid,
+            } }),
+        filterid: undefined,
+        lookupDisplayIndex: uiExtras.lookupDisplayIndex,
+        nullValues: uiExtras.nullValues,
+        operator: uiExtras.operator,
+        property,
+        uiValues: getUIValues(uiExtras),
+        validator: uiExtras.validator,
+        values: getValues(uiExtras),
+    };
+}
 function getValues(uiExtras) {
     if (isNullValidator(uiExtras.validator) && isEmpty(uiExtras.values)) {
         return [{ value: FILTER_VALIDATOR_VALUE[uiExtras.validator].label, enabled: uiExtras.uiValue[0].enabled != null ? uiExtras.uiValue[0].enabled : true }];

package/dist/filters/helpers/backend/getBackendGroupValue.js

@@ -1,13 +1,14 @@
+import { adaptDateGroupingProperty } from "../..";
 import { isEmpty } from "../../../general";
 import { isDateColumn } from "../../../qrvey/isDateColumn";
-import { arePropertiesDateP } from "../common";
 /**
  * Gets a group value for the backend logic structure
  * @param filter The filter
  * @returns a property
  */
 export function getBackendGroupValue(filter) {
-    if (!arePropertiesDateP(filter.column, filter.property) && isEmpty(filter.column.aggregate) && isDateColumn(filter.column) && filter.property != null) {
-        return filter.property;
+    if (isEmpty(filter.column.aggregate) && isDateColumn(filter.column) && filter.property != null) {
+        const property = adaptDateGroupingProperty(filter.property);
+        return property;
     }
 }

package/dist/filters/helpers/backend/getBackendProperty.js

@@ -1,21 +1,17 @@
 import { COLUMN } from "../../../constants";
 import { isEmpty } from "../../../general";
 import { isDateColumn } from "../../../qrvey/isDateColumn";
-import { arePropertiesDateP, isNullValidator } from "../common";
+import { isNullValidator } from "../common";
 /**
  * Gets a property for the logic structure
  * @param filter The filter
  * @returns a property
  */
 export function getBackendProperty(filter) {
-    var _a;
     if (isEmpty(filter.column.aggregate)) {
-        if (isNullValidator(filter.validator)) {
+        if (isNullValidator(filter.validator) || isDateColumn(filter.column)) {
             return undefined;
         }
-        else if (isDateColumn(filter.column)) {
-            return arePropertiesDateP(filter.column, filter.property) ? (_a = filter.property) === null || _a === void 0 ? void 0 : _a.split('p&')[1] : undefined;
-        }
         else if (filter.column.type === COLUMN.EXPRESSION && filter.property != null) {
             return undefined;
         }

package/dist/filters/helpers/ui/getFilterPropertyLabel.d.ts

@@ -0,0 +1,7 @@
+import { IFSFilter, IFUFilter } from "../..";
+/**
+     * Gets the label of the filter property
+     * @param filter The UI Filter
+     * @returns a string of the filter property label
+     */
+export declare function getFilterPropertyLabel(filter: IFUFilter | IFSFilter): string;

package/dist/filters/helpers/ui/getFilterPropertyLabel.js

@@ -0,0 +1,9 @@
+import { getPropertyLabel } from "../../..";
+/**
+     * Gets the label of the filter property
+     * @param filter The UI Filter
+     * @returns a string of the filter property label
+     */
+export function getFilterPropertyLabel(filter) {
+    return getPropertyLabel(filter.column, filter.property);
+}

package/dist/filters/helpers/ui/index.d.ts

@@ -1,5 +1,6 @@
 export * from './excludeUIFiltersByAggregate';
 export * from './excludeUIFlatFiltersByScopes';
+export * from './getFilterPropertyLabel';
 export * from './getOutputFormatByColumn';
 export * from './getUIFlatFilterByParams';
 export * from './getUIFlatFiltersByParams';

package/dist/filters/helpers/ui/index.js

@@ -1,5 +1,6 @@
 export * from './excludeUIFiltersByAggregate';
 export * from './excludeUIFlatFiltersByScopes';
+export * from './getFilterPropertyLabel';
 export * from './getOutputFormatByColumn';
 export * from './getUIFlatFilterByParams';
 export * from './getUIFlatFiltersByParams';

package/dist/general/array/filterNestedTree.d.ts

@@ -1,8 +1,11 @@
 /**
- * Filters a nested tree array by a custom condition on the las child node
+ * Filters a nested tree array by a custom condition on the last child node
+ * - If the given arguments are not valid, the function returns the first argument.
+ * - If the childArrKey is not matched in the object, the condition tries to resolve the filter anyway and returns an empty array.
+ * - If the condition is not fulfilled, the function returns a filtered array, probably a empty array inside of the child array
  * @param arr nested tree array
  * @param childArrKey property representing the children array on the nested tree
  * @param condition function callback that determines if the filter is applied on the last child node of the nested tree
  * @returns array filtered
  */
-export declare function filterNestedTree(arr: any[], childArrKey: string, condition: any): any[];
+export declare function filterNestedTree<T = any>(arr?: T[], childArrKey?: string, condition?: any): T[];

package/dist/general/array/filterNestedTree.js

@@ -1,19 +1,27 @@
 import { isEmpty } from "../mix";
 import { cloneDeep } from "../object/cloneDeep";
 /**
- * Filters a nested tree array by a custom condition on the las child node
+ * Filters a nested tree array by a custom condition on the last child node
+ * - If the given arguments are not valid, the function returns the first argument.
+ * - If the childArrKey is not matched in the object, the condition tries to resolve the filter anyway and returns an empty array.
+ * - If the condition is not fulfilled, the function returns a filtered array, probably a empty array inside of the child array
  * @param arr nested tree array
  * @param childArrKey property representing the children array on the nested tree
  * @param condition function callback that determines if the filter is applied on the last child node of the nested tree
  * @returns array filtered
  */
-export function filterNestedTree(arr, childArrKey, condition) {
-    if (isEmpty(arr))
-        return [];
+export function filterNestedTree(arr = [], childArrKey = '', condition = undefined) {
+    if (!isValid(arr, childArrKey, condition))
+        return arr;
     return cloneDeep(arr).filter(obj => {
-        const hasChildArr = Array.isArray(obj[childArrKey]) && obj[childArrKey].length;
+        const hasChildArr = Array.isArray(obj[childArrKey]) && obj[childArrKey].length > 0;
         if (hasChildArr)
             obj[childArrKey] = filterNestedTree(obj[childArrKey], childArrKey, condition);
         return hasChildArr || condition(obj);
     });
 }
+function isValid(arr = [], childArrKey = '', condition = undefined) {
+    return (!isEmpty(arr) && Array.isArray(arr))
+        && (!isEmpty(childArrKey) && typeof childArrKey === 'string')
+        && (!isEmpty(condition) && typeof condition === "function");
+}

package/dist/general/mix/getTag.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Gets the `toStringTag` of `value`.
+ *
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+export declare function getTag(value: any): string;

package/dist/general/mix/getTag.js

@@ -0,0 +1,12 @@
+/**
+ * Gets the `toStringTag` of `value`.
+ *
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+export function getTag(value) {
+    if (value == null) {
+        return value === undefined ? '[object Undefined]' : '[object Null]';
+    }
+    return Object.prototype.toString.call(value);
+}

package/dist/general/mix/index.d.ts

@@ -3,3 +3,4 @@ export * from './randomId';
 export * from './isNull';
 export * from './isEmpty';
 export * from './importScripts';
+export * from './getTag';

package/dist/general/mix/index.js

@@ -3,3 +3,4 @@ export * from './randomId';
 export * from './isNull';
 export * from './isEmpty';
 export * from './importScripts';
+export * from './getTag';

package/dist/general/mix/isEmpty.js

@@ -1,3 +1,5 @@
+import { getTag } from ".";
+import { isObject } from "..";
 /**
  * Validates if the given argument is empty
  * @param variable the given variable
@@ -5,11 +7,13 @@
  * @returns true: the given argument is empty; false: is not.
  */
 export function isEmpty(variable, includeFalsy = false) {
-    return typeof variable == 'undefined'
-        || variable == null
+    return variable == null
         || (typeof variable == 'number' && includeFalsy && (Number(variable) === 0 || Object.is(variable, -0) || isNaN(variable)))
-        || (typeof variable == 'string' && variable === "")
+        || (typeof variable == 'string' && variable.length === 0)
         || (typeof variable == 'boolean' && includeFalsy && variable === false)
         || (Array.isArray(variable) && variable.length === 0)
-        || (variable.constructor === Object && Object.entries(variable).length === 0);
+        || ((getTag(variable) === '[object Map]' || getTag(variable) === '[object Set]') && variable.size === 0)
+        || (variable instanceof Date && isNaN(variable.valueOf()))
+        || (typeof variable === 'function' && Object.prototype.toString.call(variable).indexOf("Function") === 0)
+        || ((!(variable instanceof Date) && typeof variable !== 'function') && isObject(variable) && Object.entries(variable).length === 0);
 }

package/dist/general/mix/isNull.js

@@ -5,5 +5,5 @@
  * @returns {Boolean}
  */
 export function isNull(arg) {
-    return arg === null || arg === undefined;
+    return arg == null;
 }

package/dist/general/mix/randomId.d.ts

@@ -1,6 +1,9 @@
 /**
- * create random unique string
+ * Creates a random string
+ * - If the first given argument is different than a length number, the variable is replaced by a default number
+ * - If the optional second given argument is passed the random string is permutated.
  * @param {Number} length size of the generated string. Default 8
- * @return {String}
+ * @param {Array} exclude collection of strings that is going to be excluded of the random string.
+ * @return {String} Random string
  */
-export declare function randomId(_length?: number): string;
+export declare function randomId(length?: number, exclude?: string[]): string;