@qrvey/utils 1.1.0-9 → 1.1.2-1

package/src/date/constants/DATE_YEAR_MONTHS.ts

@@ -0,0 +1,2 @@
+
+export const DATE_YEAR_MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];

package/src/date/constants/DATE_YEAR_QUARTERS.ts

@@ -0,0 +1 @@
+export const DATE_YEAR_QUARTERS = ['Q1', 'Q2', 'Q3', 'Q4'];

package/src/date/constants/index.ts

@@ -1,3 +1,15 @@
+export * from './DATE_DAY_HOURS';
+export * from './DATE_HOUR_MINUTES';
+export * from './DATE_MINUTE_SECONDS';
+export * from './DATE_MONTH_DAYS';
+export * from './DATE_P_PROPERTIES';
+export * from './DATE_P_VALUES';
 export * from './DATE_PROPERTY';
+export * from './DATE_PROPERTY_VALUE';
+export * from './DATE_TIME_P_VALUES';
 export * from './DATE_TIME_PROPERTIES';
 export * from './DATE_TIME_VALUES';
+export * from './DATE_WEEK_DAYS';
+export * from './DATE_YEAR_DAYS';
+export * from './DATE_YEAR_MONTHS';
+export * from './DATE_YEAR_QUARTERS';

package/src/date/range/getDateRange.ts

@@ -1,4 +1,5 @@
 import { capitalize } from "../../general/index";
+import { isTokenLabel } from "../../tokens";
 
 /**
  * Get date range object from a string date value
@@ -34,68 +35,75 @@ import { capitalize } from "../../general/index";
  *    to: '10/31/2020 23:59:59'
  * }
  */
-export function getDateRange(value: string, dateGroupLabel = 'DAY', withTime = true) {
+export function getDateRange(value: string, dateGroupLabel = 'DAY', withTime = true): { from?: string; to?: string } {
   const range: { from?: string, to?: string } = {};
   const upperCaseDateGroup = dateGroupLabel.toUpperCase();
-  const [ timeFrom, timeTo ] = withTime ? getStringTimeRange(value, upperCaseDateGroup) : [ '', '' ]
-  const isToken = isTokenBoxLabel(value)
+  const [ timeFrom, timeTo ] = withTime ? getStringTimeRange(value, upperCaseDateGroup) : [ '', '' ];
+  const isToken = isTokenLabel(value);
 
 
   switch (upperCaseDateGroup) {
-    case 'YEAR':
+    case 'YEAR': {
       const yearRange = !isToken ? getYearRange(value) : { from: `01/01/${value}`, to: `12/31/${value}` };
       range.from = `${yearRange.from}${timeFrom}`;
-      range.to = `${yearRange.to}${timeTo}`;
+      range.to = `${yearRange.to}${timeTo}`; 
       break;
-    case 'QUARTER':
-      const quarterRange = !isToken ? getQuarterRange(value) : {from: value, to: value} ;
+    }
+    case 'QUARTER': {
+      const quarterRange = !isToken ? getQuarterRange(value) : { from: value, to: value };
       range.from = `${quarterRange.from}${timeFrom}`;
       range.to = `${quarterRange.to}${timeTo}`;
       break;
-    case 'MONTH':
-      const monthRange = monthInclideTokens(value) ? getMonthRangeWithToken(value)  : getMonthRange(value);
+    }
+    case 'MONTH': {
+      const monthRange = monthInclideTokens(value) ? getMonthRangeWithToken(value) : getMonthRange(value);
       range.from = `${monthRange.from}${timeFrom}`;
       range.to = `${monthRange.to}${timeTo}`;
       break;
-    case 'WEEK':
-      const weekRange = !isToken ?  getWeekRange(value) : {from: value, to: value};
+    }
+    case 'WEEK': {
+      const weekRange = !isToken ?  getWeekRange(value) : { from: value, to: value };
       range.from = `${weekRange.from}${timeFrom}`;
       range.to = `${weekRange.to}${timeTo}`;
       break;
-    case 'HOUR':
-      const hourRange = !isToken ? getHourRange(value) : {from: value, to: value};
+    }
+    case 'HOUR': {
+      const hourRange = !isToken ? getHourRange(value) : { from: value, to: value };
       range.from = hourRange.from;
       range.to = hourRange.to;
       break;
-    case 'MINUTE':
-      const minuteRange = !isToken ? getMinuteRange(value) : {from: value, to: value};
+    }
+    case 'MINUTE': {
+      const minuteRange = !isToken ? getMinuteRange(value) : { from: value, to: value };
       range.from = minuteRange.from;
       range.to = minuteRange.to;
       break;
-    default:
+    }
+    default: {
       const dayFrom = new Date(value);
       const dayTo = new Date(value);
-      const includTokens  = includeTokens(value, '/')
+      const includTokens  = includeTokens(value, '/');
       range.from = `${ !includTokens ? getStringDate(dayFrom) : value }${timeFrom}`;
       range.to = `${ !includTokens  ? getStringDate(dayTo) : value }${timeTo}`;
       break;
+    }
   }
   return range;
 }
 
 function getStringTimeRange(value: string, dateGroupLabel: string) {
-  const addLeadingZero = (unit: number): string => `${unit < 10 ? '0': ''}${unit}`
+  const addLeadingZero = (unit: number): string => `${unit < 10 ? '0': ''}${unit}`;
   const dateValue = new Date(value);
   const hours = addLeadingZero(dateValue.getHours());
   const minutes = addLeadingZero(dateValue.getMinutes());
 
   switch (dateGroupLabel) {
     case 'HOUR':
-      return [` ${hours}:00:00`, ` ${hours}:59:59`]
+      return [` ${hours}:00:00`, ` ${hours}:59:59`];
     case 'MINUTE':
-      return [` ${hours}:${minutes}:00`, ` ${hours}:${minutes}:59`]
+      return [` ${hours}:${minutes}:00`, ` ${hours}:${minutes}:59`];
     default:
-      return [' 00:00:00', ' 23:59:59']
+      return [' 00:00:00', ' 23:59:59'];
   }
 }
 
@@ -110,7 +118,7 @@ function getYearRange(value: string) {
   return {
     from: getStringDate(dateFrom),
     to: getStringDate(dateTo)
-  }
+  };
 }
 
 function getQuarterRange(value: string) {
@@ -118,12 +126,12 @@ function getQuarterRange(value: string) {
   const quarterStartMonths = [0, 3, 6, 9];
   const quarterIndex = Number(capitalize(quarter).replace('Q', '')) - 1;
   const monthValue = quarterStartMonths[quarterIndex];
-  const dateFrom = new Date(Number(year), monthValue || monthValue === 0 ? monthValue : NaN , 1);
+  const dateFrom = new Date(Number(year), monthValue || monthValue === 0 ? monthValue : NaN, 1);
   const dateTo = new Date(Number(year), (monthValue || monthValue === 0 ? monthValue : NaN) + 3, 0);
   return {
     from: getStringDate(dateFrom),
     to: getStringDate(dateTo)
-  }
+  };
 }
 
 function getMonthRange(value: string) {
@@ -136,7 +144,7 @@ function getMonthRange(value: string) {
   return {
     from: getStringDate(dateFrom),
     to: getStringDate(dateTo)
-  }
+  };
 }
 
 function getWeekRange(value: string) {
@@ -164,51 +172,47 @@ function getWeek(date) {
   if (target.getDay() !== 4) {
     target.setMonth(0, 1 + ((4 - target.getDay()) + 7) % 7);
   }
-  return 1 + Math.ceil((firstThursday - (+target)) / 604800000);
+  return 1 + Math.ceil((firstThursday - +target) / 604800000);
 }
 
 function getHourRange(date) {
   const target = new Date(date.valueOf());
-  const stringDate = getStringDate(target)
+  const stringDate = getStringDate(target);
   const [ timeFrom, timeTo ] = getStringTimeRange(date, 'HOUR');
   return { from: `${stringDate}${timeFrom}`, to: `${stringDate}${timeTo}` };
 }
 
 function getMinuteRange(date) {
   const target = new Date(date.valueOf());
-  const stringDate = getStringDate(target)
+  const stringDate = getStringDate(target);
   const [ timeFrom, timeTo ] = getStringTimeRange(date, 'MINUTE');
   return { from: `${stringDate}${timeFrom}`, to: `${stringDate}${timeTo}` };
 }
 
 function getMonthRangeWithToken(value: string) {
-  let [month, year] = value.split(' ');
+  const [month, year] = value.split(' ');
+  let monthToReturn = month;
 
-  if(!isTokenBoxLabel(month)) {
+  if(!isTokenLabel(month)) {
     const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-    const monthIndex = months.indexOf(month) + 1;
-    month = `${monthIndex <= 9 ? '0': ''}${monthIndex}`
+    const monthIndex = months.indexOf(monthToReturn) + 1;
+    monthToReturn = `${monthIndex <= 9 ? '0': ''}${monthIndex}`;
   }
 
   return {
-      from: `${month}/01/${year}`,
-      to: `${month}/{{LAST_DAY_MONTH}}/${year}`
-  }
+      from: `${monthToReturn}/01/${year}`,
+      to: `${monthToReturn}/{{LAST_DAY_MONTH}}/${year}`
+  };
 }
 
 function monthInclideTokens(value:string) {
   const [month, year] = value.split(' ');
-  return isTokenBoxLabel(month) || isTokenBoxLabel(year)
-}
-
-function isTokenBoxLabel(label: string): boolean {
-  const regex = new RegExp('^(\{\{)([^{}]+)(\}\})$', 'gi');
-  return regex.test(label);
+  return isTokenLabel(month) || isTokenLabel(year);
 }
 
 function includeTokens(date: string, separator: string) {
   const dateSeparet = date.split(separator);
   for (const iterator of dateSeparet) {
-      if (isTokenBoxLabel(iterator)) return true;
+      if (isTokenLabel(iterator)) return true;
   }
 }

package/src/date/relative/Adapter.ts

@@ -1,5 +1,5 @@
 import { OpUnitType } from './helpers/dayjs-module';
-import { get } from '../../general/object/index';
+import { _get } from '../../general/object/index';
 import { parseDate, formatStatement, getStatementCase } from './helpers/index';
 import {
   COMMON_CONSTANTS, 
@@ -76,7 +76,7 @@ export default class RelativeStatementAdapter {
       : this.cursor === RELATIVE_CURSOR.NEXT ? 'lte'
       : '';
 
-    return get(value, path, new Date());
+    return _get(value, path, new Date());
   }
 
 

package/src/date/relative/constants/DATE_FORMATS.ts

@@ -1,11 +1,10 @@
-export const DATETIME_FORMAT = 'MM-DD-YYYY HH:mm:ss';
+export const DATETIME_FORMAT = 'MM/DD/YYYY HH:mm:ss';
 
 export const INPUT_FORMATS = [
+  DATETIME_FORMAT,
   'MM/DD/YYYY',
   'MM-DD-YYYY',
   'YYYY-MM-DD',
-  'MM/DD/YYYY HH:mm:ss',
+  'MM-DD-YYYY HH:mm:ss',
   'YYYY-MM-DD HH:mm:ss',
-  DATETIME_FORMAT
 ];
-

package/src/date/relative/constants/RELATIVE_CURSOR_VALUE.ts

@@ -4,4 +4,4 @@ export const RELATIVE_CURSOR_VALUE = {
     [RELATIVE_CURSOR.THIS]: { label: 'This', value: 'this' },
     [RELATIVE_CURSOR.NEXT]: { label: 'The next', value: 'the next' },
     [RELATIVE_CURSOR.LAST]: { label: 'The last', value: 'the last' },
-}
+};

package/src/date/relative/helpers/formatStatement.ts

@@ -1,4 +1,4 @@
-import { get, mapValues } from '../../../general/object/index';
+import { _get, mapValues } from '../../../general/object/index';
 import { RelativeStatement } from '../interfaces/index';
 import { COMMON_CONSTANTS, RELATIVE_CURSOR } from '../constants/index';
 import { DATE_PROPERTY } from '../../constants';
@@ -11,11 +11,11 @@ import { DATE_PROPERTY } from '../../constants';
 export function formatStatement(statement: RelativeStatement): RelativeStatement {
   const loweredStatement = mapValues(statement, s => typeof s === 'string' ? s.toLowerCase() : s);
   return {
-    cursor: get(loweredStatement, 'cursor', RELATIVE_CURSOR.THIS),
-    unit: get(loweredStatement, 'unit', DATE_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)
-  }
+    cursor: _get(loweredStatement, 'cursor', RELATIVE_CURSOR.THIS),
+    unit: _get(loweredStatement, 'unit', DATE_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/src/date/relative/index.ts

@@ -3,4 +3,4 @@ export * from './relative';
 
 export * from './constants/index';
 export * from './helpers/index';
-export * from './interfaces/index'
+export * from './interfaces/index';

package/src/filters/adapters/FDToFlatUI.ts

@@ -30,7 +30,7 @@ import { IFSData, IFSScope, IFUFlattenedFilter } from "../interfaces";
  * @returns a flattened UI filters array
  */
 function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = []): IFUFlattenedFilter[] {
-    let uFilters: IFUFlattenedFilter[] = [];
+    const uFilters: IFUFlattenedFilter[] = [];
     if (scopes.length === 0) return uFilters;
     scopes.forEach(scope => {
         if (scope.datasets.length > 0) {
@@ -40,6 +40,8 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = [
                         const datasetInfo: IQrveyDataset = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
                         let columnInfo: IQrveyColumn;
                         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 uFilter: IFUFlattenedFilter = {
                             collapsed: filter.collapsed,
                             column: {
@@ -58,8 +60,10 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = [
                             displayed: filter.displayed,
                             enabled: filter.enabled,
                             extras: {
+                                ...filter.extras,
                                 panelid: filter.extras.panelid,
                                 filterLabel: filter.extras.filterLabel,
+                                info,
                                 scope: filter.extras.scope,
                                 scopeid: filter.extras.scopeid,
                                 section: filter.extras.section,
@@ -88,9 +92,9 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IQrveyDataset[] = [
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
                             values: filter.values,
-                        }
+                        };
                         uFilters.push(uFilter);
-                    })
+                    });
                 }
             });
         }

package/src/filters/adapters/FDToUI.ts

@@ -32,11 +32,10 @@ import { IFSData, IFSection, IFSScope, IFUData, IFUScope } from "../interfaces";
  * @param datasetsInfo Collection of datasets information
  * @returns a UI filter Structure
  */
- function FD21ToUI(scopes: IFSScope[] = [], section: IFSection = FILTER_SECTION.ANYWHERE , enabled = true, datasetsInfo: IQrveyDataset[] = [], version = FILTER_STRUCTURE_VERSION): IFUData {
-    let ufData: IFUData;
-    if (scopes.length === 0) return ufData;
+ function FD21ToUI(scopes: IFSScope[] = [], section: IFSection = FILTER_SECTION.ANYWHERE, enabled = true, datasetsInfo: IQrveyDataset[] = [], version = FILTER_STRUCTURE_VERSION): IFUData {
+    if (scopes.length === 0) return;
 
-    ufData = {
+    const ufData: IFUData = {
         enabled,
         section,
         version,
@@ -67,9 +66,9 @@ import { IFSData, IFSection, IFSScope, IFUData, IFUScope } from "../interfaces";
                             type: columnInfo?.type || filter.column.type,
                         },
                         uiValues: getUIValues(filter),
-                    }
+                    };
                 })
-            }
+            };
         })
     }));
     return ufData;

package/src/filters/adapters/UIToFD.ts

@@ -47,5 +47,5 @@ function UI21ToFD(uFilterData: IFUData, version): IFSData {
             scopes.push(scope);
             return scopes;
         }, [] as IFSScope[])
-    }
+    };
 }

package/src/filters/adapters/UIToFlatUI.ts

@@ -1,7 +1,7 @@
-import { cloneDeep, isEmpty, _get } from "../../general";
+import { cloneDeep, isEmpty } from "../../general";
 import { IQrveyColumn, IQrveyDataset } from "../../interfaces/Qrvey.Interface";
 import { getUIValues } from "../helpers";
-import { IFSData, IFSScope, IFUData, IFUFlattenedFilter, IFUScope } from "../interfaces";
+import { IFUData, IFUFlattenedFilter, IFUScope } from "../interfaces";
 
 /**
  * Generates a Flattened UI filter structure from UI Filter Data structure.
@@ -29,7 +29,7 @@ import { IFSData, IFSScope, IFUData, IFUFlattenedFilter, IFUScope } from "../int
  * @returns a flattened UI filters array
  */
 function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = []): IFUFlattenedFilter[] {
-    let uFilters: IFUFlattenedFilter[] = [];
+    const uFilters: IFUFlattenedFilter[] = [];
     if (scopes.length === 0) return uFilters;
     scopes.forEach(scope => {
         if (scope.datasets.length > 0) {
@@ -39,6 +39,8 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = [
                         const datasetInfo: IQrveyDataset = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
                         let columnInfo: IQrveyColumn;
                         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 uFilter: IFUFlattenedFilter = {
                             collapsed: filter.collapsed,
                             column: {
@@ -57,8 +59,10 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = [
                             displayed: filter.displayed,
                             enabled: filter.enabled,
                             extras: {
+                                ...filter.extras,
                                 panelid: filter.extras.panelid,
                                 filterLabel: filter.extras.filterLabel,
+                                info,
                                 scope: filter.extras.scope,
                                 scopeid: filter.extras.scopeid,
                                 section: filter.extras.section,
@@ -87,9 +91,9 @@ function UI21ToFlatUI(scopes: IFUScope[] = [], datasetsInfo: IQrveyDataset[] = [
                             uiValues: getUIValues(filter),
                             validator: filter.validator,
                             values: filter.values,
-                        }
+                        };
                         uFilters.push(uFilter);
-                    })
+                    });
                 }
             });
         }

package/src/filters/adapters/UIToOldLogic.ts

@@ -25,7 +25,7 @@ function UI21ToOldLogic(uFilterData: IFUData): OLD_IFilterData {
         enabled: true,
         section: uFilterData.section,
         logic: buildLogics(uFilterData.scopes, uFilterData.section),
-    }
+    };
 }
 
 function buildLogics(scopeSection: IFUScope[], section: IFSection): OLD_IFilterLogic[] {
@@ -39,7 +39,7 @@ function buildLogics(scopeSection: IFUScope[], section: IFSection): OLD_IFilterL
                 collapsed: scope.collapsed,
                 section: section
             }
-        }
+        };
         logics.push(logic);
         return logics;
     }, [] as OLD_IFilterLogic[]);
@@ -83,7 +83,7 @@ function buildExpressions(filterSection: IFUFilter[], scope: IFUScope, dataset:
 }
 
 const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset): OLD_IFilterDetail => {
-    let aggregate, calculation;
+    let aggregate, calculation, info;
     if (filter.column.aggregate != null) {
         aggregate = {
             abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
@@ -101,6 +101,12 @@ const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset
             value: filter.column.calculation,
         };
     }
+    if (!isEmpty(filter.extras.info)) {
+        info = {
+            icon: filter.extras.info.icon,
+            label: filter.extras.info.label,
+        };
+    }
     return {
         collapsed: filter.collapsed,
         column: {
@@ -123,6 +129,8 @@ const getFilterDetail = (filter: IFUFilter, scope: IFUScope, dataset: IFUDataset
         },
         dateSection: filter.dateSection,
         enabled: filter.enabled,
+        extras: filter.extras,
+        info,
         lookupDisplayIndex: filter.lookupDisplayIndex,
         nullValues: filter.nullValues,
         operator: filter.operator,