@easyquery/core 7.1.2-rc04 → 7.1.3-beta02

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,7 +759,7 @@ 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
 
 
 
@@ -1148,10 +1148,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 +1161,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 +1173,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 +1276,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 +1301,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 ||
@@ -1384,7 +1401,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 +1443,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 +1453,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 +1474,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++) {
@@ -1558,7 +1579,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 +1645,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,7 +2137,7 @@ 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
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/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) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -2269,7 +2290,7 @@ var AggregationSettings = /** @class */ (function () {
 }());
 
 //# 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
+// CONCATENATED MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/core/dist/lib/data/data_column.js
 
 
 var ColumnAlignment;
@@ -2295,6 +2316,7 @@ var data_column_DataColumn = /** @class */ (function () {
         this.displayFormat = desc.dfmt;
         this.groupFooterColumnTemplate = desc.gfct;
         this.style = desc.style || {};
+        this.description = desc.description;
     }
     return DataColumn;
 }());
@@ -2376,7 +2398,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 +2444,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
 
 
 
@@ -2702,7 +2724,7 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
 }());
 
 //# 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 +2745,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 +2871,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
 
 
@@ -2880,6 +2918,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 +3174,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
@@ -3834,11 +3873,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 +4606,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 +4697,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 +4731,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 +4743,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;
     };
@@ -6366,12 +6421,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;
@@ -7021,9 +7076,14 @@ var EqServerDataFetcher = /** @class */ (function () {
         var query = fetchOptions.query || this.context.getQuery();
         var queryId = query.getId();
         var requestData = {
-            'query': query.toJSONData(),
             'options': fetchOptions.options
         };
+        if (typeof (fetchOptions.queryId) !== 'undefined') {
+            requestData.queryId = fetchOptions.queryId;
+        }
+        else {
+            requestData.query = query.toJSONData();
+        }
         if (fetchOptions.debug) {
             requestData.debug = fetchOptions.debug;
         }
@@ -7505,18 +7565,23 @@ var EqServerExporter = /** @class */ (function () {
         this.format = format;
         this.responseType = responseType;
     };
-    EqServerExporter.prototype.export = function (options) {
-        options = options || {};
+    EqServerExporter.prototype.export = function (exportOptions) {
+        exportOptions = exportOptions || {};
         var http = this.context.getServices().getHttpClient();
         var format = this.format || "csv";
-        var query = options.query || this.context.getQuery();
+        var query = exportOptions.query || this.context.getQuery();
         var modelId = query.getModel().getId();
-        var data = {
-            'query': query.toJSONData(),
-            'settings': options.settings,
+        var requestData = {
+            'settings': exportOptions.settings,
         };
+        if (typeof (exportOptions.queryId) !== 'undefined') {
+            requestData.queryId = exportOptions.queryId;
+        }
+        else {
+            requestData.query = query.toJSONData();
+        }
         var url = this.context.resolveEndpoint('ExportResult', { modelId: modelId, format: format });
-        var actionResult = http.post(url, data, { responseType: this.responseType });
+        var actionResult = http.post(url, requestData, { responseType: this.responseType });
         var request = actionResult.getRequest();
         return actionResult.then(function (responseData) {
             var blob = new Blob([responseData]);
@@ -7576,10 +7641,11 @@ 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;
+        this.useStoredQueryOnFetch = false;
         this.debugMode = false;
         //----------- endpoint processing functions --------------
         this.endpointVarsRegex = /\{.*?\}/g;
@@ -7587,18 +7653,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;
@@ -7667,6 +7731,15 @@ var context_EqContext = /** @class */ (function () {
             loader: this.dataLoader
         });
         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;
@@ -7744,13 +7817,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;
@@ -7760,7 +7837,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);
@@ -7811,19 +7887,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;
             }
@@ -7957,7 +8023,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();
@@ -8620,11 +8686,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';
@@ -8745,6 +8815,10 @@ var context_EqContext = /** @class */ (function () {
             this.beforeFetchData(this, options);
         }
         var queryId = this.getQuery().getId();
+        var fetchOptions = options || {};
+        if (this.useStoredQueryOnFetch) {
+            fetchOptions.queryId = this.query.getId();
+        }
         this.startProcess({
             action: EqAction.FetchData,
             text: 'Fetching data for the query: ' + queryId
@@ -8879,6 +8953,9 @@ var context_EqContext = /** @class */ (function () {
             var exporter = this.getExporter(format);
             if (exporter) {
                 var queryId_1 = this.getQuery().getId();
+                if (this.useStoredQueryOnFetch) {
+                    options.queryId = queryId_1;
+                }
                 this.startProcess({
                     action: EqAction.ExportResult,
                     text: 'Exporting result for query: ' + queryId_1