@easyquery/core 7.1.2-rc07 → 7.2.0-rc01

package/dist/bundles/easyquery.core.js

@@ -114,9 +114,9 @@ __webpack_require__.d(__webpack_exports__, "e", function() { return /* reexport
 __webpack_require__.d(__webpack_exports__, "k", function() { return /* reexport */ i18n_i18n; });
 __webpack_require__.d(__webpack_exports__, "l", function() { return /* reexport */ utils_utils; });
 
-// UNUSED EXPORTS: EntityAttrKind, HttpMethod, HttpRequest, HttpResponseError, ColumnAlignment, DataColumn, DataColumnList, DataRow, EasyGuid, repeatString, reverseString, strEndsWith, combinePath
+// UNUSED EXPORTS: EntityAttrKind, HttpMethod, HttpRequest, HttpResponseError, ColumnAlignment, DataColumn, DataColumnList, DataRow, EasyGuid, repeatString, reverseString, strEndsWith, combinePath, liquid
 
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/types/data_type.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/types/data_type.js
 /** Represents the common types of the data. */
 var DataType;
 (function (DataType) {
@@ -163,7 +163,7 @@ var DataType;
     DataType[DataType["Geography"] = 19] = "Geography";
 })(DataType || (DataType = {}));
 //# sourceMappingURL=data_type.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/types/entity_attr_kind.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/types/entity_attr_kind.js
 var EntityAttrKind;
 (function (EntityAttrKind) {
     EntityAttrKind[EntityAttrKind["Data"] = 0] = "Data";
@@ -171,7 +171,7 @@ var EntityAttrKind;
     EntityAttrKind[EntityAttrKind["Lookup"] = 2] = "Lookup";
 })(EntityAttrKind || (EntityAttrKind = {}));
 //# sourceMappingURL=entity_attr_kind.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/types/editor_tag.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/types/editor_tag.js
 var EditorTag = {
     /** Unknown tag value */
     Unknown: "Unknown",
@@ -187,7 +187,7 @@ var EditorTag = {
     File: "FILE"
 };
 //# sourceMappingURL=editor_tag.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/http/http_method.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/http/http_method.js
 var HttpMethod;
 (function (HttpMethod) {
     HttpMethod["Trace"] = "TRACE";
@@ -198,7 +198,7 @@ var HttpMethod;
     HttpMethod["Delete"] = "DELETE";
 })(HttpMethod || (HttpMethod = {}));
 //# sourceMappingURL=http_method.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/http/http_request.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/http/http_request.js
 var HttpRequest = /** @class */ (function () {
     function HttpRequest(xhr, descriptor) {
         this.xhr = xhr;
@@ -257,7 +257,7 @@ var HttpRequest = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=http_request.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/utils/string_utils.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/string_utils.js
 function repeatString(str, times) {
     var result = "";
     for (var i = 0; i < times; i++) {
@@ -290,7 +290,7 @@ function combinePath(path1, path2) {
     return result;
 }
 //# sourceMappingURL=string_utils.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/i18n/i18n.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/i18n/i18n.js
 
 
 /**
@@ -759,14 +759,14 @@ var i18n_i18n;
     }
 })(i18n_i18n || (i18n_i18n = {}));
 //# sourceMappingURL=i18n.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/utils/utils.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/utils.js
 
 
 
 var utils_utils;
 (function (utils) {
     function getAllDataTypes() {
-        return Object.values(DataType);
+        return Object.values(DataType).filter(function (item) { return typeof item === "number"; });
     }
     utils.getAllDataTypes = getAllDataTypes;
     function getDateDataTypes() {
@@ -774,12 +774,16 @@ var utils_utils;
     }
     utils.getDateDataTypes = getDateDataTypes;
     function getStringDataTypes() {
-        return [DataType.String, DataType.Memo];
+        return [DataType.String, DataType.Memo, DataType.FixedChar];
     }
     utils.getStringDataTypes = getStringDataTypes;
     var _numericTypes = [DataType.Byte, DataType.Word, DataType.Int32,
-        DataType.Int64, DataType.Float, DataType.Currency];
-    var _intTypes = [DataType.Byte, DataType.Word, DataType.Int32, DataType.Int64];
+        DataType.Int64, DataType.Float, DataType.Currency, DataType.Autoinc];
+    function getNumericDataTypes() {
+        return _numericTypes;
+    }
+    utils.getNumericDataTypes = getNumericDataTypes;
+    var _intTypes = [DataType.Byte, DataType.Word, DataType.Int32, DataType.Int64, DataType.Autoinc];
     //-------------- object functions -------------------
     /**
      * Copy the content of all objests passed in `args` parameters into `target`
@@ -844,7 +848,7 @@ var utils_utils;
                                     hashSet.set(sourceVal, target[key]);
                                 }
                                 else {
-                                    if (typeof target[key] == 'undefined') {
+                                    if (typeof target[key] == 'undefined' || target[key] == null) {
                                         target[key] = Object.create(Object.getPrototypeOf(sourceVal));
                                     }
                                     hashSet.set(sourceVal, target[key]);
@@ -1148,10 +1152,10 @@ var utils_utils;
         return (621355968e9 + (new Date()).getTime() * 1e4);
     }
     function safeParseInt(str) {
-        var isnum = /^\d+$/.test(str);
-        if (!isnum)
-            throw "Is not a valid number";
-        return parseInt(str);
+        var res = parseInt(str);
+        if (isNaN(res))
+            throw "\"" + str + "\" is not a valid number";
+        return res;
     }
     function getDaysInMonth(month, year) {
         return new Date(year, month + 1, 0).getDate();
@@ -1161,10 +1165,10 @@ var utils_utils;
     function strToDateTime(value, format) {
         if (!value || value.length == 0)
             return new Date();
-        var normalized = value.replace(/[^a-zA-Z0-9_]/g, '-');
+        var normalizedValue = value.replace(/[^a-zA-Z0-9_]/g, '-');
         var normalizedFormat = format.replace(/[^a-zA-Z0-9_]/g, '-');
         var formatItems = normalizedFormat.split('-');
-        var dateItems = normalized.split('-');
+        var dateItems = normalizedValue.split('-');
         var monthIndex = formatItems.indexOf("MM");
         var dayIndex = formatItems.indexOf("dd");
         var yearIndex = formatItems.indexOf("yyyy");
@@ -1173,41 +1177,58 @@ var utils_utils;
         var secondsIndex = formatItems.indexOf("ss");
         var today = new Date();
         try {
-            var year = yearIndex > -1 && yearIndex < dateItems.length ? safeParseInt(dateItems[yearIndex]) : today.getFullYear();
-            var month = monthIndex > -1 && monthIndex < dateItems.length ? safeParseInt(dateItems[monthIndex]) - 1 : today.getMonth() - 1;
+            var year = yearIndex > -1 && yearIndex < dateItems.length
+                ? safeParseInt(dateItems[yearIndex])
+                : today.getFullYear();
+            var month = monthIndex > -1 && monthIndex < dateItems.length
+                ? safeParseInt(dateItems[monthIndex]) - 1
+                : today.getMonth() - 1;
             if (month > 11)
                 throw '';
-            var day = dayIndex > -1 && dayIndex < dateItems.length ? safeParseInt(dateItems[dayIndex]) : today.getDate();
+            var day = dayIndex > -1 && dayIndex < dateItems.length
+                ? safeParseInt(dateItems[dayIndex])
+                : today.getDate();
             if (day > getDaysInMonth(month, year))
                 throw '';
-            var hour = hourIndex > -1 && hourIndex < dateItems.length ? safeParseInt(dateItems[hourIndex]) : 0;
+            var hour = hourIndex > -1 && hourIndex < dateItems.length
+                ? safeParseInt(dateItems[hourIndex])
+                : 0;
             if (hour > 23)
                 throw '';
-            var minute = minutesIndex > -1 && minutesIndex < dateItems.length ? safeParseInt(dateItems[minutesIndex]) : 0;
+            var minute = minutesIndex > -1 && minutesIndex < dateItems.length
+                ? safeParseInt(dateItems[minutesIndex])
+                : 0;
             if (minute > 59)
                 throw '';
-            var second = secondsIndex > -1 && secondsIndex < dateItems.length ? safeParseInt(dateItems[secondsIndex]) : 0;
+            var second = secondsIndex > -1 && secondsIndex < dateItems.length
+                ? safeParseInt(dateItems[secondsIndex])
+                : 0;
             if (second > 59)
                 throw '';
             return new Date(year, month, day, hour, minute, second);
         }
         catch (_a) {
-            throw "Is not a valid date time.";
+            throw value + " is not a valid date.";
         }
     }
     utils.strToDateTime = strToDateTime;
     function strToTime(str) {
         var timeItems = str.split(':');
-        var hour = timeItems.length > 0 ? safeParseInt(timeItems[0]) : 0;
-        if (hour > 23)
-            throw '';
-        var minute = timeItems.length > 1 ? safeParseInt(timeItems[1]) : 0;
-        if (minute > 59)
-            throw '';
-        var second = timeItems.length > 1 ? safeParseInt(timeItems[1]) : 0;
-        if (second > 59)
-            throw '';
-        return new Date(0, 0, 0, hour, minute, second);
+        try {
+            var hour = timeItems.length > 0 ? safeParseInt(timeItems[0]) : 0;
+            if (hour > 23)
+                throw '';
+            var minute = timeItems.length > 1 ? safeParseInt(timeItems[1]) : 0;
+            if (minute > 59)
+                throw '';
+            var second = timeItems.length > 1 ? safeParseInt(timeItems[1]) : 0;
+            if (second > 59)
+                throw '';
+            return new Date(0, 0, 0, hour, minute, second);
+        }
+        catch (_a) {
+            throw str + " is not a valid time.";
+        }
     }
     utils.strToTime = strToTime;
     var DT_FORMAT_RGEX = /\[([^\]]+)]|y{4}|M{1,4}|d{1,2}|H{1,2}|h{1,2}|m{2}|s{2}|t{2}/g;
@@ -1259,7 +1280,7 @@ var utils_utils;
     utils.numberToStr = numberToStr;
 })(utils_utils || (utils_utils = {}));
 //# sourceMappingURL=utils.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/http/http_action_result.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/http/http_action_result.js
 var HttpActionResult = /** @class */ (function () {
     function HttpActionResult(request, promise) {
         this.request = request;
@@ -1284,7 +1305,7 @@ var HttpActionResult = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=http_action_result.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/http/http_client.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/http/http_client.js
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -1356,7 +1377,7 @@ var http_client_HttpClient = /** @class */ (function () {
         var desc = {
             method: method,
             url: url,
-            headers: __assign({}, this.defaultHeaders, options.headers || {}),
+            headers: __assign(__assign({}, this.defaultHeaders), options.headers || {}),
             queryParams: options.queryParams || {},
             data: data
         };
@@ -1384,7 +1405,7 @@ var http_client_HttpClient = /** @class */ (function () {
                 }
                 var responseContentType = xhr.getResponseHeader('Content-Type') || '';
                 var status = xhr.status;
-                if (status >= 300 || status < 200) {
+                if (status >= 400) {
                     var rtPromise = (xhr.responseType === 'arraybuffer'
                         || xhr.responseType === 'blob')
                         ? HttpClient.decodeArrayBuffer(xhr.response)
@@ -1426,7 +1447,7 @@ var http_client_HttpClient = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=http_client.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/meta/meta_entity.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/meta/meta_entity.js
 
 
 
@@ -1436,6 +1457,8 @@ var http_client_HttpClient = /** @class */ (function () {
 var MetaEntity = /** @class */ (function () {
     /** The default constructor. */
     function MetaEntity(parent) {
+        /** Returns false if this entity is read-only */
+        this.isEditable = true;
         this.name = "";
         this.caption = "";
         this.description = "";
@@ -1455,6 +1478,8 @@ var MetaEntity = /** @class */ (function () {
             this.captionPlural = dto.namePlur;
             this.caption = dto.name;
             this.description = dto.desc;
+            if (typeof (dto.ied) !== 'undefined')
+                this.isEditable = dto.ied;
             this.subEntities = new Array();
             if (dto.ents) {
                 for (var i = 0; i < dto.ents.length; i++) {
@@ -1498,6 +1523,12 @@ var MetaEntity = /** @class */ (function () {
         };
         internalProcessEntity(this);
     };
+    MetaEntity.prototype.getFirstPrimaryAttr = function () {
+        return this.getPrimaryAttrs()[0];
+    };
+    MetaEntity.prototype.getPrimaryAttrs = function () {
+        return this.attributes.filter(function (attr) { return attr.isPrimaryKey; });
+    };
     return MetaEntity;
 }());
 
@@ -1558,7 +1589,7 @@ var meta_entity_MetaEntityAttr = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=meta_entity.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/meta/value_editor.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/meta/value_editor.js
 
 
 /**
@@ -1624,7 +1655,7 @@ var value_editor_ValueEditor = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=value_editor.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/meta/meta_data.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/meta/meta_data.js
 
 
 
@@ -2116,9 +2147,9 @@ var meta_data_MetaData = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=meta_data.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/data/aggr_calculator.js
-var aggr_calculator_assign = (undefined && undefined.__assign) || function () {
-    aggr_calculator_assign = Object.assign || function(t) {
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/aggr_settings.js
+var aggr_settings_assign = (undefined && undefined.__assign) || function () {
+    aggr_settings_assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
             s = arguments[i];
             for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
@@ -2126,7 +2157,7 @@ var aggr_calculator_assign = (undefined && undefined.__assign) || function () {
         }
         return t;
     };
-    return aggr_calculator_assign.apply(this, arguments);
+    return aggr_settings_assign.apply(this, arguments);
 };
 /**
  * Defines aggregations settings for the current context.
@@ -2139,16 +2170,32 @@ var AggregationSettings = /** @class */ (function () {
         this.groups = [];
         this.useGrandTotals = false;
         this.useRecordCount = false;
-        this.caseSensitiveGroups = false;
+        this._caseSensitiveGroups = false;
         this.COUNT_FIELD_NAME = 'GRPRECCNT';
     }
+    Object.defineProperty(AggregationSettings.prototype, "caseSensitiveGroups", {
+        get: function () {
+            return this._caseSensitiveGroups;
+        },
+        set: function (value) {
+            this._caseSensitiveGroups = value;
+            this.updateCompareProc();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    AggregationSettings.prototype.updateCompareProc = function () {
+        this.compareValues = this._caseSensitiveGroups
+            ? this.strictCompare
+            : this.caseInsensitiveCompare;
+    };
     AggregationSettings.prototype.addGroup = function (settings) {
         var cols = settings.columns || this.colStore.getColumnIds(settings.from, settings.to);
         if (!this.colStore.validateColumns(cols))
             throw "Invalid columns: " + cols;
         if (this.hasColumnsInUse(cols))
             throw "Can't add same columns to different groups/aggregates";
-        this.groups.push(aggr_calculator_assign({ columns: cols, aggregates: null }, settings));
+        this.groups.push(aggr_settings_assign({ columns: cols }, settings));
         return this;
     };
     AggregationSettings.prototype.addAggregateColumn = function (colIndexOrId, funcId) {
@@ -2173,7 +2220,7 @@ var AggregationSettings = /** @class */ (function () {
         var cols = [];
         var mappedGrops = this.groups.map(function (grp) {
             cols = cols.concat(grp.columns);
-            return aggr_calculator_assign({}, grp, { columns: Array.from(cols), aggregates: Array.from(_this.aggregates) });
+            return aggr_settings_assign(aggr_settings_assign({}, grp), { columns: Array.from(cols), aggregates: Array.from(_this.aggregates) });
         });
         return mappedGrops;
     };
@@ -2265,11 +2312,36 @@ var AggregationSettings = /** @class */ (function () {
             }
         }
     };
+    AggregationSettings.prototype.buildGroupKey = function (group, row) {
+        var caseInsensitive = !this.caseSensitiveGroups;
+        var result = {};
+        if (group) {
+            for (var _i = 0, _a = group.columns; _i < _a.length; _i++) {
+                var colId = _a[_i];
+                var keyVal = row.getValue(colId);
+                if (caseInsensitive && typeof (keyVal) === 'string') {
+                    keyVal = keyVal.toLowerCase();
+                }
+                result[colId] = keyVal;
+            }
+        }
+        return result;
+    };
+    //returns true if value1 == value2
+    AggregationSettings.prototype.strictCompare = function (value1, value2) {
+        return value1 === value2;
+    };
+    //makes a case insensative comparision of two values and return true if there are equal
+    AggregationSettings.prototype.caseInsensitiveCompare = function (value1, value2) {
+        var val1 = (typeof value1 === 'string') ? value1.toLowerCase() : value1;
+        var val2 = (typeof value2 === 'string') ? value2.toLowerCase() : value2;
+        return val1 === val2;
+    };
     return AggregationSettings;
 }());
 
-//# sourceMappingURL=aggr_calculator.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/data/data_column.js
+//# sourceMappingURL=aggr_settings.js.map
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/data_column.js
 
 
 var ColumnAlignment;
@@ -2295,6 +2367,8 @@ var data_column_DataColumn = /** @class */ (function () {
         this.displayFormat = desc.dfmt;
         this.groupFooterColumnTemplate = desc.gfct;
         this.style = desc.style || {};
+        this.description = desc.description;
+        this.calculatedWidth = 0;
     }
     return DataColumn;
 }());
@@ -2334,9 +2408,10 @@ var data_column_DataColumnList = /** @class */ (function () {
             .map(function (col, index) { return index; });
     };
     DataColumnList.prototype.put = function (index, col) {
-        //!!!!!!!!!check on "out of index"
-        this.items[index] = col;
-        this.updateDateColumnIdx();
+        if (index >= 0 && index < this.count) {
+            this.items[index] = col;
+            this.updateDateColumnIdx();
+        }
     };
     DataColumnList.prototype.move = function (col, newIndex) {
         var oldIndex = this.items.indexOf(col);
@@ -2346,8 +2421,12 @@ var data_column_DataColumnList = /** @class */ (function () {
         }
     };
     DataColumnList.prototype.get = function (index) {
-        //!!!!!!!!!check on "out of index"
-        return this.items[index];
+        if (index >= 0 && index < this.count) {
+            return this.items[index];
+        }
+        else {
+            return null;
+        }
     };
     DataColumnList.prototype.getIndex = function (id) {
         return this.mapper[id];
@@ -2376,7 +2455,7 @@ var data_column_DataColumnList = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=data_column.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/data/data_row.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/data_row.js
 var DataRow = /** @class */ (function () {
     function DataRow(columns, values) {
         this.columns = columns;
@@ -2422,7 +2501,7 @@ var DataRow = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=data_row.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/data/easy_data_table.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/easy_data_table.js
 
 
 
@@ -2431,16 +2510,23 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
     function EasyDataTable(options) {
         this._chunkSize = 1000;
         this._elasticChunks = false;
-        // object keeps number keys sorted
-        this.chunkMap = {};
+        this.cachedRows = [];
         this.total = 0;
         this.loader = null;
         this.needTotal = true;
+        this.isInMemory = false;
         options = options || {};
         this._chunkSize = options.chunkSize || this._chunkSize;
         this._elasticChunks = options.elasticChunks || this._elasticChunks;
         this.loader = options.loader;
+        if (typeof options.inMemory !== 'undefined') {
+            this.isInMemory = options.inMemory;
+        }
+        if (this.isInMemory) {
+            this.needTotal = false;
+        }
         this._columns = new data_column_DataColumnList();
+        this.onUpdate = options.onUpdate;
         if (options.columns) {
             for (var _i = 0, _a = options.columns; _i < _a.length; _i++) {
                 var colDesc = _a[_i];
@@ -2471,7 +2557,7 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
             this._chunkSize = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -2484,7 +2570,7 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
             this._elasticChunks = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -2512,22 +2598,12 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
                 endIndex = this.total;
             }
         }
-        var lbChunk = Math.trunc(fromIndex / this._chunkSize);
-        var ubChunk = Math.trunc((endIndex - 1) / this._chunkSize);
-        var allChunksCached = true;
-        for (var i = lbChunk; i <= ubChunk; i++) {
-            if (!this.chunkMap[i]) {
-                allChunksCached = false;
-                break;
-            }
+        if (this.isInMemory && endIndex > this.cachedRows.length) {
+            endIndex = this.cachedRows.length;
         }
+        var allChunksCached = endIndex <= this.cachedRows.length;
         if (allChunksCached) {
-            var resultArr = [];
-            for (var i = lbChunk; i <= ubChunk; i++) {
-                resultArr = resultArr.concat(this.chunkMap[i].rows);
-            }
-            var firstChunkOffset = this.chunkMap[lbChunk].offset;
-            return Promise.resolve(resultArr.slice(fromIndex - firstChunkOffset, endIndex - firstChunkOffset));
+            return Promise.resolve(this.cachedRows.slice(fromIndex, endIndex));
         }
         //if loader is not defined
         if (!this.loader) {
@@ -2538,53 +2614,34 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         if (this.needTotal) {
             this.needTotal = false;
         }
-        var limit = this._chunkSize * (ubChunk - lbChunk + 1);
-        if (this.elasticChunks)
-            limit++;
-        return this.loader.loadChunk({
-            offset: lbChunk * this._chunkSize,
+        var offset = this.cachedRows.length;
+        var limit = endIndex - offset;
+        if (limit < this._chunkSize) {
+            limit = this._chunkSize;
+        }
+        var resultPromise = this.loader.loadChunk({
+            offset: offset,
             limit: limit,
             needTotal: needTotal
         })
             .then(function (result) {
-            var chunks = result.table.getCachedChunks();
             if (needTotal) {
                 _this.total = result.total;
-                if (endIndex > _this.total) {
-                    endIndex = _this.total;
-                }
             }
-            var index = lbChunk;
-            for (var _i = 0, chunks_1 = chunks; _i < chunks_1.length; _i++) {
-                var chunk = chunks_1[_i];
-                _this.chunkMap[index] = {
-                    offset: index * _this._chunkSize,
-                    rows: chunk.rows
-                };
-                index++;
+            Array.prototype.push.apply(_this.cachedRows, result.table.getCachedRows());
+            if (endIndex > _this.cachedRows.length) {
+                endIndex = _this.cachedRows.length;
             }
             if (_this.elasticChunks) {
                 var count_1 = result.table.getCachedCount();
-                if (count_1 > 0) {
-                    var chunk = _this.chunkMap[index - 1];
-                    if (count_1 === limit) {
-                        chunk.rows.splice(chunk.rows.length - 1, 1);
-                        if (chunk.rows.length == 0) {
-                            delete _this.chunkMap[index - 1];
-                        }
-                    }
-                    if (count_1 < limit) {
-                        _this.total = _this.getCachedCount();
-                    }
+                if (count_1 < limit) {
+                    _this.total = _this.cachedRows.length;
                 }
             }
-            var resultArr = [];
-            for (var i = lbChunk; i <= ubChunk; i++) {
-                resultArr = resultArr.concat(_this.chunkMap[i].rows);
-            }
-            var firstChunkOffset = _this.chunkMap[lbChunk].offset;
-            return resultArr.slice(fromIndex - firstChunkOffset, endIndex - firstChunkOffset);
+            _this.fireUpdated();
+            return _this.cachedRows.slice(fromIndex, endIndex);
         });
+        return resultPromise;
     };
     EasyDataTable.prototype.getRow = function (index) {
         return this.getRows({ offset: index, limit: 1 })
@@ -2596,14 +2653,13 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
     EasyDataTable.prototype.setTotal = function (total) {
         this.total = total;
         this.needTotal = false;
-        this.chunkMap = {};
     };
     EasyDataTable.prototype.getCachedCount = function () {
-        return this.getCachedRows().length;
+        return this.cachedRows.length;
     };
     EasyDataTable.prototype.clear = function () {
         this.columns.clear();
-        this.chunkMap = {};
+        this.cachedRows = [];
         this.total = 0;
         this.needTotal = !this._elasticChunks;
     };
@@ -2636,60 +2692,33 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         }
         return null;
     };
-    EasyDataTable.prototype.addRow = function (rowOrValue) {
+    EasyDataTable.prototype.addRow = function (rowOrValues) {
         var newRow;
-        if (Array.isArray(rowOrValue)) {
+        if (Array.isArray(rowOrValues)) {
+            var values = rowOrValues;
             var dateIdx = this._columns.getDateColumnIndexes();
             if (dateIdx.length > 0) {
                 for (var _i = 0, dateIdx_1 = dateIdx; _i < dateIdx_1.length; _i++) {
                     var idx = dateIdx_1[_i];
-                    if (rowOrValue[idx]) {
-                        rowOrValue[idx] = this.mapDate(rowOrValue[idx], this._columns.get(idx).type);
+                    if (values[idx]) {
+                        values[idx] = this.mapDate(values[idx], this._columns.get(idx).type);
                     }
                 }
             }
-            newRow = new DataRow(this._columns, rowOrValue);
+            newRow = new DataRow(this._columns, values);
         }
         else {
-            newRow = this.createRow(rowOrValue);
+            newRow = this.createRow(rowOrValues);
         }
-        var lastChunk = this.getLastChunk();
-        if (!lastChunk || lastChunk.rows.length >= this._chunkSize) {
-            lastChunk = this.createChunk();
-        }
-        lastChunk.rows.push(newRow);
+        this.cachedRows.push(newRow);
         var cachedTotal = this.getCachedCount();
         if (cachedTotal > this.total) {
             this.total = cachedTotal;
         }
         return newRow;
     };
-    EasyDataTable.prototype.createChunk = function (index) {
-        if (typeof index == 'undefined') {
-            index = this.getLastChunkIndex() + 1;
-        }
-        var chunk = { offset: index * this._chunkSize, rows: [] };
-        this.chunkMap[index] = chunk;
-        return chunk;
-    };
-    EasyDataTable.prototype.getLastChunkIndex = function () {
-        var keys = Object.keys(this.chunkMap);
-        return keys.length > 0
-            ? parseInt(keys[keys.length - 1])
-            : -1;
-    };
-    EasyDataTable.prototype.getLastChunk = function () {
-        var index = this.getLastChunkIndex();
-        return index > -1
-            ? this.chunkMap[index]
-            : null;
-    };
     EasyDataTable.prototype.getCachedRows = function () {
-        return this.getCachedChunks()
-            .reduce(function (acc, v) { return acc.concat(v.rows); }, []);
-    };
-    EasyDataTable.prototype.getCachedChunks = function () {
-        return Object.values(this.chunkMap);
+        return this.cachedRows;
     };
     EasyDataTable.prototype.totalIsKnown = function () {
         if (this.elasticChunks) {
@@ -2698,11 +2727,16 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         }
         return !this.needTotal;
     };
+    EasyDataTable.prototype.fireUpdated = function () {
+        if (this.onUpdate) {
+            this.onUpdate(this);
+        }
+    };
     return EasyDataTable;
 }());
 
 //# sourceMappingURL=easy_data_table.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/utils/easy_guid.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/easy_guid.js
 /**
  * EasyData representation of GUID.
  */
@@ -2723,7 +2757,7 @@ var EasyGuid = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=easy_guid.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/event/event_emitter.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/event/event_emitter.js
 
 /**
  * The representation of event emitter.
@@ -2849,11 +2883,27 @@ var event_emitter_EventEmitter = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=event_emitter.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/i18n/load_default_locale_settings.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/utils/liquid.js
+var liquid;
+(function (liquid) {
+    function renderLiquidTemplate(template, vars) {
+        var result = template;
+        if (vars) {
+            for (var v in vars) {
+                var liquidVarRegexp = new RegExp('\{\{' + v + '\}\}', 'g');
+                result = result.replace(liquidVarRegexp, vars[v]);
+            }
+        }
+        return result;
+    }
+    liquid.renderLiquidTemplate = renderLiquidTemplate;
+})(liquid || (liquid = {}));
+//# sourceMappingURL=liquid.js.map
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/i18n/load_default_locale_settings.js
 
 i18n_i18n.resetLocales();
 //# sourceMappingURL=load_default_locale_settings.js.map
-// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/public_api.js
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js
 //types
 
 
@@ -2866,7 +2916,6 @@ i18n_i18n.resetLocales();
 
 
 
-//data
 
 
 
@@ -2880,6 +2929,7 @@ i18n_i18n.resetLocales();
 
 
 
+
 if (typeof Object.values !== 'function') {
     Object.values = function (obj) {
         return Object.keys(obj).map(function (key) { return obj[key]; });
@@ -3135,7 +3185,7 @@ __webpack_require__.d(__webpack_exports__, "FormatParser", function() { return /
 __webpack_require__.d(__webpack_exports__, "versionInfo", function() { return /* reexport */ versionInfo; });
 __webpack_require__.d(__webpack_exports__, "i18n", function() { return /* reexport */ public_api["k" /* i18n */]; });
 
-// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/30/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 20 modules
+// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/public_api.js + 21 modules
 var public_api = __webpack_require__(0);
 
 // CONCATENATED MODULE: ./src/utils/format_parser.ts
@@ -3707,7 +3757,7 @@ var __assign = (undefined && undefined.__assign) || function () {
 };
 
 /** Represents editor tags*/
-var EqEditorTag = __assign({}, public_api["d" /* EditorTag */], { 
+var EqEditorTag = __assign(__assign({}, public_api["d" /* EditorTag */]), { 
     /** SqlList tag value */
     SqlList: "SQLLIST", 
     /** SubQuery tag value */
@@ -3834,11 +3884,11 @@ var data_model_DataModel = /** @class */ (function (_super) {
         _this.operators = new Array();
         _this.rootEntity = new Entity();
         _this.aggrFunctions = new Array();
-        _this.dateMacros = ['${{Today}}', '${{Yesterday}}',
-            '${{Tomorrow}}', '${{FirstDayOfMonth}}', '${{LastDayOfMonth}}',
-            '${{FirstDayOfWeek}}', '${{FirstDayOfYear}}', '${{FirstDayOfNextWeek}}', '${{FirstDayOfPrevMonth}}',
-            '${{FirstDayOfNextMonth}}', '${{FirstDayOfNextYear}}', '${{FirstDayOfPrevYear}}', '${{FirstDayOfPrevWeek}}'];
-        _this.timeMacros = ['${{Now}}', '${{HourStart}}', '${{Midnight}}', '${{Noon}}'];
+        _this.dateMacros = ['Today', 'Yesterday',
+            'Tomorrow', 'FirstDayOfMonth', 'LastDayOfMonth',
+            'FirstDayOfWeek', 'FirstDayOfYear', 'FirstDayOfNextWeek', 'FirstDayOfPrevMonth',
+            'FirstDayOfNextMonth', 'FirstDayOfNextYear', 'FirstDayOfPrevYear', 'FirstDayOfPrevWeek'];
+        _this.timeMacros = ['Now', 'HourStart', 'Midnight', 'Noon'];
         _this.links = [];
         return _this;
     }
@@ -4567,16 +4617,51 @@ var data_model_DataModel = /** @class */ (function (_super) {
     DataModel.prototype.getAggrFunctions = function () {
         return this.aggrFunctions;
     };
+    /**
+     * Checks wether macro value is date.
+     * @param macroExpr The macro value.
+     * @retruns `true` if the macro value is date, otherwise `false`.
+     */
+    DataModel.prototype.isDateMacro = function (macroExpr, macroProcessor) {
+        var match = macroExpr.match(/\${{?(.*?)}?}/);
+        if (match != null) {
+            var macroId = match[1];
+            if (public_api["l" /* utils */].indexOfArrayItem(this.dateMacros, macroId) >= 0) {
+                if (macroProcessor) {
+                    macroProcessor(macroId);
+                }
+                return true;
+            }
+        }
+        return false;
+    };
+    /**
+     * Checks whether the expression passed in the parameter is an time macro.
+     * @param macroExpr The macro expression
+     * @retruns `true` if the expression is a time macro (like Now), otherwise `false`.
+     */
+    DataModel.prototype.isTimeMacro = function (macroExpr, macroProcessor) {
+        var match = macroExpr.match(/\${{?(.*?)}?}/);
+        if (match != null) {
+            var macroId = match[1];
+            if (public_api["l" /* utils */].indexOfArrayItem(this.timeMacros, macroId) >= 0) {
+                if (macroProcessor) {
+                    macroProcessor(macroId);
+                }
+                return true;
+            }
+        }
+        return false;
+    };
     /**
      * Gets date by its macro value.
-     * @param macro The macro value.
+     * @param macroExpr The macro value.
      * @returns The date or `null`
      */
-    DataModel.prototype.getDateMacroValue = function (macro) {
-        if (this.isDateMacro(macro)) {
-            var d = new Date();
-            var macroName = macro.match(/\${{(.*?)}}/)[1];
-            switch (macroName) {
+    DataModel.prototype.getDateMacroValue = function (macroExpr) {
+        var d = new Date();
+        var res = this.isDateMacro(macroExpr, function (macroId) {
+            switch (macroId) {
                 case 'Today':
                     break;
                 case 'Yesterday':
@@ -4623,37 +4708,27 @@ var data_model_DataModel = /** @class */ (function (_super) {
                     break;
             }
             ;
-            return d;
-        }
-        return null;
-    };
-    /**
-     * Checks wether macro value is date.
-     * @param macro The macro value.
-     * @retruns `true` if the macro value is date, otherwise `false`.
-     */
-    DataModel.prototype.isDateMacro = function (macro) {
-        return public_api["l" /* utils */].indexOfArrayItem(this.dateMacros, macro) >= 0;
+        });
+        return res ? d : null;
     };
     /**
-    * Gets date  or macro by macro value.
-    * @param macroValue The macro value.
+    * Gets the date value by a macro expression of the expression itself.
+    * @param macroExpr The macro value.
     * @returns The date or macro valu.
     */
-    DataModel.prototype.getDateOrMacroValue = function (macroValue) {
-        var d = this.getDateMacroValue(macroValue);
-        return d ? d : macroValue;
+    DataModel.prototype.getDateOrMacroValue = function (macroExpr) {
+        var d = this.getDateMacroValue(macroExpr);
+        return d ? d : macroExpr;
     };
     /**
     * Gets time by its macro value.
-    * @param macro The macro value.
+    * @param macroExpr The macro value.
     * @returns The date or `null`.
     */
-    DataModel.prototype.getTimeMacroValue = function (macro) {
+    DataModel.prototype.getTimeMacroValue = function (macroExpr) {
         var d = new Date();
-        if (this.isTimeMacro(macro)) {
-            var macroName = macro.match(/\${{(.*?)}}/)[1];
-            switch (macroName) {
+        var res = this.isDateMacro(macroExpr, function (macroId) {
+            switch (macroId) {
                 case 'Now':
                     break;
                 case 'HourStart':
@@ -4667,17 +4742,8 @@ var data_model_DataModel = /** @class */ (function (_super) {
                     break;
             }
             ;
-            return d;
-        }
-        return null;
-    };
-    /**
-    * Checks wether macro value is time.
-    * @param macro The macro value.
-    * @retruns `true` if the macro value is time, otherwise `false`.
-    */
-    DataModel.prototype.isTimeMacro = function (macro) {
-        return public_api["l" /* utils */].indexOfArrayItem(this.timeMacros, macro) >= 0;
+        });
+        return res ? d : null;
     };
     /**
      * Gets time or macro by macro value.
@@ -4688,10 +4754,10 @@ var data_model_DataModel = /** @class */ (function (_super) {
         var t = this.getTimeMacroValue(time);
         return t ? t : time;
     };
-    /**
-     * Gets all date marcos.
-     * @returns The array of marcos
-     */
+    // /**
+    //  * Gets all date marcos.
+    //  * @returns The array of marcos
+    //  */
     DataModel.prototype.getAllDateMacros = function () {
         return this.dateMacros;
     };
@@ -5565,20 +5631,19 @@ var query_Query = /** @class */ (function () {
                 this.processQueryForAggregation();
                 var aggrCols = this.columns.filter(function (c) { return c.enabled
                     && c.expr.tag == ExprTag.AggregateFunction; });
-                // query contains aggregate columns
-                if (aggrCols.length) {
-                    for (var _i = 0, aggrCols_1 = aggrCols; _i < aggrCols_1.length; _i++) {
-                        var col = aggrCols_1[_i];
-                        var attr = this.model.getAttributeById(col.expr.args[0].value);
-                        this.changeColumnType(col, ExprTag.EntityAttribute, {
-                            caption: this.model.getAttributeText(attr, "{attr}")
-                        });
-                    }
-                    this.fireChangedEvent({
-                        part: QueryChangePart.Columns,
-                        wasModified: true
-                    });
-                }
+                // // query contains aggregate columns
+                // if (aggrCols.length) {
+                //     for (const col of aggrCols) {
+                //         const attr = this.model.getAttributeById(col.expr.args[0].value);
+                //         this.changeColumnType(col, ExprTag.EntityAttribute, {
+                //             caption: this.model.getAttributeText(attr, `{attr}`)
+                //         });
+                //     }
+                //     this.fireChangedEvent({
+                //         part: QueryChangePart.Columns,
+                //         wasModified: true
+                //     });
+                // }    
             }
             if (!this._enableAggregation) {
                 this.aggrSettings.clear();
@@ -5613,8 +5678,8 @@ var query_Query = /** @class */ (function () {
                 var colsToGroup = _this.columns.filter(function (c) { return c.enabled
                     && c.expr.tag == ExprTag.EntityAttribute; });
                 var aggrsToAdd = [];
-                for (var _i = 0, aggrCols_2 = aggrCols; _i < aggrCols_2.length; _i++) {
-                    var col = aggrCols_2[_i];
+                for (var _i = 0, aggrCols_1 = aggrCols; _i < aggrCols_1.length; _i++) {
+                    var col = aggrCols_1[_i];
                     aggrsToAdd.push({ id: col.id, func: col.expr.func });
                     _this.changeColumnType(col, ExprTag.EntityAttribute);
                 }
@@ -6366,12 +6431,12 @@ var query_Query = /** @class */ (function () {
         if (column.isJustSorted())
             return;
         args = args || {};
-        if (typeof args.caption !== 'undefined') {
-            column.caption = args.caption;
-        }
+        column.caption = (typeof args.caption !== 'undefined')
+            ? args.caption
+            : '';
         if (tag === ExprTag.AggregateFunction) {
             if (!args.funcId)
-                throw Error("'funcId' argument is not defined");
+                throw Error('"funcId" argument is not defined');
             if (column.expr.tag == ExprTag.AggregateFunction) {
                 column.expr.func = args.funcId;
                 return;
@@ -7127,9 +7192,9 @@ var EqQueryFileLoader = /** @class */ (function () {
                 fileName = options.fileName
                     + fileName.substring(fileName.lastIndexOf('.'));
             }
-            if (window.navigator.msSaveOrOpenBlob) {
+            if (window.navigator['msSaveOrOpenBlob']) {
                 // Internet Explorer
-                window.navigator.msSaveOrOpenBlob(blob, fileName);
+                window.navigator['msSaveOrOpenBlob'](blob, fileName);
             }
             else {
                 var a = document.createElement("a");
@@ -7165,13 +7230,12 @@ var EqAggregatesContainer = /** @class */ (function () {
         this.context = context;
         this.levels = {};
     }
-    EqAggregatesContainer.prototype.getAggregates = function (level, key) {
+    EqAggregatesContainer.prototype.getAggregateData = function (level, groupKey) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            var desc = _this.getLevelDesc(level);
             var processFunc = function (data) {
                 // map values
-                var keyStr = JSON.stringify(key);
+                var keyStr = _this.groupKeyToStr(groupKey);
                 var value = data.get(keyStr);
                 if (value) {
                     resolve(value);
@@ -7180,33 +7244,43 @@ var EqAggregatesContainer = /** @class */ (function () {
                     reject("Can't find data for " + keyStr);
                 }
             };
-            if (desc.data) {
+            var desc = _this.getLevelDesc(level, false);
+            if (desc && desc.data) {
                 processFunc(desc.data);
             }
             else {
-                desc.recivedCallbacks.push(processFunc);
+                desc.receivedCallbacks.push(processFunc);
             }
         });
     };
-    EqAggregatesContainer.prototype.setAggregates = function (level, data) {
-        var desc = this.getLevelDesc(level);
+    EqAggregatesContainer.prototype.setAggregateData = function (level, data) {
+        var desc = this.getLevelDesc(level, true);
         desc.data = data;
-        if (desc.recivedCallbacks) {
-            for (var _i = 0, _a = desc.recivedCallbacks; _i < _a.length; _i++) {
+        if (desc.receivedCallbacks) {
+            for (var _i = 0, _a = desc.receivedCallbacks; _i < _a.length; _i++) {
                 var callback = _a[_i];
                 callback(desc.data);
             }
         }
-        desc.recivedCallbacks = [];
+        desc.receivedCallbacks = [];
     };
-    EqAggregatesContainer.prototype.getLevelDesc = function (level) {
+    EqAggregatesContainer.prototype.updateAggregateData = function (level, groupKey, values) {
+        var desc = this.getLevelDesc(level, true);
+        var key = this.groupKeyToStr(groupKey);
+        desc.data.set(key, values);
+    };
+    EqAggregatesContainer.prototype.groupKeyToStr = function (groupKey) {
+        return JSON.stringify(groupKey);
+    };
+    EqAggregatesContainer.prototype.getLevelDesc = function (level, createIfNotExists) {
         var desc = this.levels[level];
-        if (!desc) {
+        if (!desc && createIfNotExists) {
             desc = {
-                recivedCallbacks: []
+                receivedCallbacks: [],
+                data: new Map()
             };
+            this.levels[level] = desc;
         }
-        this.levels[level] = desc;
         return desc;
     };
     EqAggregatesContainer.prototype.clear = function () {
@@ -7239,18 +7313,23 @@ var DefaultAggregatesCalculator = /** @class */ (function () {
             columns[i].enabled = false;
         }
         if (settings.hasGrandTotals()) {
-            this.aggrs.setAggregates(0, new Map());
+            this.aggrs.setAggregateData(0, new Map());
             if (options.resultObtained)
                 options.resultObtained({}, 0);
         }
         var groups = settings.getGroups();
         for (var level = 1; level <= groups.length && level <= options.maxLevel; level++) {
-            this.aggrs.setAggregates(level, new Map());
+            this.aggrs.setAggregateData(level, new Map());
             if (options.resultObtained)
                 options.resultObtained({}, level);
         }
         return Promise.resolve();
     };
+    DefaultAggregatesCalculator.prototype.needRecalculation = function () {
+        return true;
+    };
+    DefaultAggregatesCalculator.prototype.reset = function () {
+    };
     return DefaultAggregatesCalculator;
 }());
 
@@ -7365,7 +7444,7 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
     EqServiceProvider.prototype.getAggregatesCalculator = function () {
         if (!this.aggrCalculator) {
             if (!this.aggrCalculatoResolver) {
-                throw 'Resolver for TotalCalculator is not defined';
+                throw 'Resolver for AggregatesCalculator is not defined';
             }
             this.aggrCalculator = this.aggrCalculatoResolver(this.context);
         }
@@ -7414,7 +7493,6 @@ var eq_data_loader_EasyQueryDataLoader = /** @class */ (function () {
         // different grids
         this.dataLoadPromise = new Promise(function (resolve, reject) {
             var fetchOptions = {
-                skipAggr: true,
                 chunk: chunk,
                 success: function (result) {
                     var dataTable = new public_api["c" /* EasyDataTable */]({
@@ -7532,9 +7610,9 @@ var EqServerExporter = /** @class */ (function () {
             var blob = new Blob([responseData]);
             var filename = request.getXMLHttpRequest()
                 .getResponseHeader("Content-Disposition").match(/filename="(.*)"/)[1];
-            if (window.navigator.msSaveOrOpenBlob) {
+            if (window.navigator['msSaveOrOpenBlob']) {
                 // Internet Explorer
-                window.navigator.msSaveOrOpenBlob(blob, filename);
+                window.navigator['msSaveOrOpenBlob'](blob, filename);
             }
             else {
                 var a = document.createElement("a");
@@ -7586,7 +7664,7 @@ var context_assign = (undefined && undefined.__assign) || function () {
 var context_EqContext = /** @class */ (function () {
     function EqContext() {
         var _this = this;
-        this.isInitialized = false;
+        this.servicesInitialized = false;
         this.internalListCache = {};
         this.loadModelOnStart = true;
         this.loadQueryOnStart = false;
@@ -7598,18 +7676,16 @@ var context_EqContext = /** @class */ (function () {
         this._predefinedListRequestHandlers = {
             '_DSDE': function (params, onResult) {
                 var data = _this.getModel().getAllDateMacros()
-                    .map(function (macro) {
-                    var macroName = macro.match(/\${{(.*?)}}/)[1];
-                    return { id: macro, text: public_api["k" /* i18n */].getText(macroName) };
+                    .map(function (macroId) {
+                    return { id: '${{' + macroId + '}}', text: public_api["k" /* i18n */].getText(macroId) };
                 });
                 onResult(data);
                 return true;
             },
             '_DSTE': function (params, onResult) {
                 var data = _this.getModel().getAllTimeMacros()
-                    .map(function (macro) {
-                    var macroName = macro.match(/\${{(.*?)}}/)[1];
-                    return { id: macro, text: public_api["k" /* i18n */].getText(macroName) };
+                    .map(function (macroId) {
+                    return { id: '${{' + macroId + '}}', text: public_api["k" /* i18n */].getText(macroId) };
                 });
                 onResult(data);
                 return true;
@@ -7675,9 +7751,19 @@ var context_EqContext = /** @class */ (function () {
         this.endpoints = new Map();
         this.dataLoader = new eq_data_loader_EasyQueryDataLoader(this);
         this.resultTable = new public_api["c" /* EasyDataTable */]({
-            loader: this.dataLoader
+            loader: this.dataLoader,
+            onUpdate: this.onResultTableUpdate.bind(this)
         });
         this.resultTable.id = 'ResultTable';
+        this.errorHandlerId = this.addEventListener('error', function (context, status) {
+            status.result = EqActionResult.Error;
+            var msgTitle = status.action ? status.action + ' error' : 'Error';
+            var msgText = status.text ? status.text : '';
+            if (status.sourceError && status.sourceError.message !== msgText) {
+                msgText += '\n' + status.sourceError;
+            }
+            console.error(msgTitle + ': ' + msgText);
+        });
     }
     EqContext.prototype.getServices = function () {
         return this.eqServices;
@@ -7755,13 +7841,17 @@ var context_EqContext = /** @class */ (function () {
         this.setEnpointIfNotExist('GetQueryFile', utils_equtils.combinePath(endpointBase, 'models/{modelId}/getqueryfile/{format}'));
         this.setEnpointIfNotExist('UploadQueryFile', utils_equtils.combinePath(endpointBase, 'models/{modelId}/uploadqueryfile'));
     };
+    EqContext.prototype.initStart = function () {
+        this.servicesInitialized = true;
+    };
     /**
      * Initializes the context
      * @param options
      */
     EqContext.prototype.init = function (options) {
         var _this = this;
-        this.isInitialized = true;
+        if (!this.servicesInitialized)
+            this.initStart();
         options = options || {};
         if (typeof (options.debugMode) !== 'undefined') {
             this.debugMode = options.debugMode;
@@ -7771,7 +7861,6 @@ var context_EqContext = /** @class */ (function () {
         }
         if (typeof (options.elasticPaging) !== 'undefined') {
             this.elasticPaging = options.elasticPaging;
-            this.resultTable.elasticChunks = this.elasticPaging;
         }
         if (options.listCache) {
             this.setExternalListCache(options.listCache);
@@ -7822,19 +7911,9 @@ var context_EqContext = /** @class */ (function () {
                 this.addEventListener('processEnd', options.handlers.onProcessEnd);
             }
             if (options.handlers.onError) {
+                this.removeEventListener('error', this.errorHandlerId);
                 this.addEventListener('error', options.handlers.onError);
             }
-            else {
-                this.addEventListener('error', function (context, msg) {
-                    msg.result = EqActionResult.Error;
-                    var msgTitle = msg && msg ? msg.action + ' error' : 'Error';
-                    var msgText = msg && msg.text ? msg.text : '';
-                    if (msg.sourceError.message !== msgText) {
-                        msgText += '\n' + msg.sourceError;
-                    }
-                    console.error(msgTitle + ': ' + msgText);
-                });
-            }
             if (options.handlers.onListRequest) {
                 this.clientListRequestHandler = options.handlers.onListRequest;
             }
@@ -7968,7 +8047,7 @@ var context_EqContext = /** @class */ (function () {
      */
     EqContext.prototype.getQuery = function () {
         if (!this.query) {
-            if (!this.isInitialized) {
+            if (!this.servicesInitialized) {
                 throw new Error("Can't create query until the context is initialized");
             }
             this.query = this.createQuery();
@@ -8631,11 +8710,15 @@ var context_EqContext = /** @class */ (function () {
     EqContext.prototype.fetchData = function (options) {
         var _this = this;
         options = options || {};
+        var elasticPaging = typeof (options.elasticPaging) !== 'undefined'
+            ? options.elasticPaging
+            : this.elasticPaging;
+        this.resultTable.elasticChunks = elasticPaging;
         options.chunk = options.chunk ||
             {
                 offset: 0,
                 limit: this.resultTable.chunkSize,
-                needTotal: !this.elasticPaging
+                needTotal: !elasticPaging
             };
         if (this.debugMode) {
             options.debug = 'Fetching the result set. Initial chunk';
@@ -8645,14 +8728,20 @@ var context_EqContext = /** @class */ (function () {
         })) {
             return;
         }
+        //just to support the old way of catching "group fetch" operation finish
+        if (options.groupFetchSuccess) {
+            this.afterGroupFetch = options.groupFetchSuccess;
+        }
         if (this.resultTable.elasticChunks) {
             options.chunk.limit++;
         }
-        this.fetchDataChunk(context_assign({}, options, { success: function (result) {
+        this.fetchDataChunk(context_assign(context_assign({}, options), { success: function (result) {
                 if (result.statement) {
                     _this.resultStatement = result.statement;
                     _this.refreshWidgets(WidgetGroup.Statement);
                 }
+                var aggrCalculator = _this.getServices().getAggregatesCalculator();
+                aggrCalculator.reset();
                 _this.resultContent = result;
                 if (result.resultSet) {
                     _this.resultTable.clear();
@@ -8677,6 +8766,7 @@ var context_EqContext = /** @class */ (function () {
                             ? resultSet.rows.length
                             : 0;
                     }
+                    _this.resultTable.fireUpdated();
                 }
                 if (options.success) {
                     options.success(result);
@@ -8752,55 +8842,30 @@ var context_EqContext = /** @class */ (function () {
     };
     EqContext.prototype.fetchDataChunk = function (options) {
         var _this = this;
-        if (this.beforeFetchData) {
-            this.beforeFetchData(this, options);
-        }
         var queryId = this.getQuery().getId();
         var fetchOptions = options || {};
         if (this.useStoredQueryOnFetch) {
             fetchOptions.queryId = this.query.getId();
         }
+        if (this.beforeFetchData) {
+            this.beforeFetchData(this, fetchOptions);
+        }
         this.startProcess({
             action: EqAction.FetchData,
             text: 'Fetching data for the query: ' + queryId
         }, WidgetGroup.Result);
         var dataFetcher = this.eqServices.getDataFetcher();
-        dataFetcher.fetchData(options)
+        dataFetcher.fetchData(fetchOptions)
             .then(function (result) {
             if (result.statement) {
                 _this.resultStatement = result.statement;
             }
             _this.resultContent = result;
-            if (!options.skipAggr) {
-                var aggrSettings = _this.query.getAggregationSettings();
-                if (aggrSettings.needAggrCalculation()) {
-                    var calculator = _this.getServices().getAggregatesCalculator();
-                    calculator.calculate({
-                        maxLevel: aggrSettings.getGroups().length + 1,
-                        resultObtained: function (result, level) {
-                            if (options.groupFetchSucess) {
-                                options.groupFetchSucess(result);
-                            }
-                        },
-                        errorOccurred: function (error) {
-                            var errorMessage = "Data fetching error on group level " + error.level + " query. \n" + error.message;
-                            _this.throwError({
-                                action: EqAction.FetchData,
-                                text: errorMessage,
-                                sourceError: error
-                            });
-                            if (options.error) {
-                                options.error(errorMessage, EqAction.FetchData);
-                            }
-                        }
-                    });
-                }
-            }
             // we need to call success callback before firing fetchData,
             // because otherwise, it won't update the result table 
             // in the context before afterFetchData callback is called.
-            if (options.success) {
-                options.success(result);
+            if (fetchOptions.success) {
+                fetchOptions.success(result);
             }
             _this.fireEvent('fetchData');
             _this.endProcess({
@@ -8817,11 +8882,34 @@ var context_EqContext = /** @class */ (function () {
                 text: errorMessage,
                 sourceError: error
             }, WidgetGroup.Result);
-            if (options.error) {
-                options.error(errorMessage, EqAction.FetchData);
+            if (fetchOptions.error) {
+                fetchOptions.error(errorMessage, EqAction.FetchData);
             }
         });
     };
+    EqContext.prototype.onResultTableUpdate = function () {
+        var _this = this;
+        var aggrSettings = this.query.getAggregationSettings();
+        var calculator = this.getServices().getAggregatesCalculator();
+        if (aggrSettings.needAggrCalculation() && calculator.needRecalculation()) {
+            calculator.calculate({
+                maxLevel: aggrSettings.getGroups().length + 1,
+                resultObtained: function (result, level) {
+                    if (_this.afterGroupFetch) {
+                        _this.afterGroupFetch(result);
+                    }
+                },
+                errorOccurred: function (error) {
+                    var errorMessage = "Data fetching error on group level " + error.level + " query. \n" + error.message;
+                    _this.throwError({
+                        action: EqAction.FetchData,
+                        text: errorMessage,
+                        sourceError: error
+                    });
+                }
+            });
+        }
+    };
     /**
      * Fetches the data for a drill-down query (if defined) and processes the result.
      * @param options