@easyquery/core 7.1.2-rc04 → 7.1.3-beta02

package/dist/lib/common/eq_services.js.map

@@ -1 +1 @@
-{"version":3,"file":"eq_services.js","sourceRoot":"","sources":["../../../src/common/eq_services.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eq_services.js","sourceRoot":"","sources":["../../../src/common/eq_services.ts"],"names":[],"mappings":"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"}

package/dist/lib/dm/data_model.d.ts

@@ -280,46 +280,42 @@ export declare class DataModel extends MetaData {
      * @returns AN array of aggregate functions.
      */
     getAggrFunctions(): AggrFunction[];
-    /**
-     * Gets date by its macro value.
-     * @param macro The macro value.
-     * @returns The date or `null`
-     */
-    getDateMacroValue(macro: string): Date | null;
     /**
      * Checks wether macro value is date.
-     * @param macro The macro value.
+     * @param macroExpr The macro value.
      * @retruns `true` if the macro value is date, otherwise `false`.
      */
-    isDateMacro(macro: string): boolean;
+    isDateMacro(macroExpr: string, macroProcessor?: (macroId: any) => void): boolean;
     /**
-    * Gets date  or macro by macro value.
-    * @param macroValue The macro value.
+     * 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`.
+     */
+    isTimeMacro(macroExpr: string, macroProcessor?: (macroId: any) => void): boolean;
+    /**
+     * Gets date by its macro value.
+     * @param macroExpr The macro value.
+     * @returns The date or `null`
+     */
+    getDateMacroValue(macroExpr: string): Date | null;
+    /**
+    * Gets the date value by a macro expression of the expression itself.
+    * @param macroExpr The macro value.
     * @returns The date or macro valu.
     */
-    getDateOrMacroValue(macroValue: string): string | Date;
+    getDateOrMacroValue(macroExpr: string): string | Date;
     /**
     * Gets time by its macro value.
-    * @param macro The macro value.
+    * @param macroExpr The macro value.
     * @returns The date or `null`.
     */
-    getTimeMacroValue(macro: string): Date | null;
-    /**
-    * Checks wether macro value is time.
-    * @param macro The macro value.
-    * @retruns `true` if the macro value is time, otherwise `false`.
-    */
-    isTimeMacro(macro: string): boolean;
+    getTimeMacroValue(macroExpr: string): Date | null;
     /**
      * Gets time or macro by macro value.
      * @param macroValue The macro value.
      * @returns The time or macro valu.
      */
     getTimeOrMacroValue(time: string): string | Date;
-    /**
-     * Gets all date marcos.
-     * @returns The array of marcos
-     */
     getAllDateMacros(): string[];
     /**
      * Gets all time marcos.

package/dist/lib/dm/data_model.js

@@ -35,11 +35,11 @@ var 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;
     }
@@ -768,16 +768,51 @@ var 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 (dataUtils.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 (dataUtils.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':
@@ -824,37 +859,27 @@ var 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 dataUtils.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':
@@ -868,17 +893,8 @@ var 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 dataUtils.indexOfArrayItem(this.timeMacros, macro) >= 0;
+        });
+        return res ? d : null;
     };
     /**
      * Gets time or macro by macro value.
@@ -889,10 +905,10 @@ var 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;
     };

package/dist/lib/dm/data_model.js.map

@@ -1 +1 @@
-{"version":3,"file":"data_model.js","sourceRoot":"","sources":["../../../src/dm/data_model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data_model.js","sourceRoot":"","sources":["../../../src/dm/data_model.ts"],"names":[],"mappings":"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"}

package/dist/lib/eqs/eqs_data_fetcher.d.ts

@@ -1,7 +1,7 @@
-import { FetchOptions, DataFetcher } from '../main/data_fetcher';
+import { FetchDataOptions, DataFetcher } from '../main/data_fetcher';
 import { EqContext } from '../main/context';
 export declare class EqServerDataFetcher implements DataFetcher {
     private context;
     constructor(context: EqContext);
-    fetchData(fetchOptions?: FetchOptions): Promise<any>;
+    fetchData(fetchOptions?: FetchDataOptions): Promise<any>;
 }

package/dist/lib/eqs/eqs_data_fetcher.js

@@ -6,9 +6,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;
         }

package/dist/lib/eqs/eqs_data_fetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"eqs_data_fetcher.js","sourceRoot":"","sources":["../../../src/eqs/eqs_data_fetcher.ts"],"names":[],"mappings":"AAIA;IACI,6BAAoB,OAAkB;QAAlB,YAAO,GAAP,OAAO,CAAW;IACtC,CAAC;IAEM,uCAAS,GAAhB,UAAiB,YAA2B;QACxC,IAAM,KAAK,GAAG,YAAY,CAAC,KAAc,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrE,IAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAE9B,IAAI,WAAW,GAAQ;YACnB,OAAO,EAAE,KAAK,CAAC,UAAU,EAAE;YAC3B,SAAS,EAAE,YAAY,CAAC,OAAO;SAClC,CAAC;QAEF,IAAI,YAAY,CAAC,KAAK,EAAE;YACpB,WAAW,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;SAC1C;QAED,IAAI,YAAY,CAAC,KAAK,EAAE;YACpB,WAAW,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;SAC1C;QAED,IAAI,YAAY,CAAC,IAAI,EAAE;YACnB,WAAW,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;SACxC;QAED,IAAI,OAAM,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,WAAW,EAAE;YACzC,WAAW,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;SACtC;QAED,IAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW,EAChD,EAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAC5D,IAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC;QAExD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC;aAC7B,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,EAAJ,CAAI,CAAC,CAAC;IAC5B,CAAC;IACL,0BAAC;AAAD,CAAC,AApCD,IAoCC"}
+{"version":3,"file":"eqs_data_fetcher.js","sourceRoot":"","sources":["../../../src/eqs/eqs_data_fetcher.ts"],"names":[],"mappings":"AAIA;IACI,6BAAoB,OAAkB;QAAlB,YAAO,GAAP,OAAO,CAAW;IACtC,CAAC;IAEM,uCAAS,GAAhB,UAAiB,YAA+B;QAC5C,IAAM,KAAK,GAAG,YAAY,CAAC,KAAc,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrE,IAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAE9B,IAAI,WAAW,GAAQ;YACnB,SAAS,EAAE,YAAY,CAAC,OAAO;SAClC,CAAC;QAEF,IAAI,OAAM,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,WAAW,EAAE;YAC9C,WAAW,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;SAC9C;aACI;YACD,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;SAC1C;QAED,IAAI,YAAY,CAAC,KAAK,EAAE;YACpB,WAAW,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;SAC1C;QAED,IAAI,YAAY,CAAC,KAAK,EAAE;YACpB,WAAW,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;SAC1C;QAED,IAAI,YAAY,CAAC,IAAI,EAAE;YACnB,WAAW,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;SACxC;QAED,IAAI,OAAM,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,WAAW,EAAE;YACzC,WAAW,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;SACtC;QAED,IAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW,EAChD,EAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAC5D,IAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC;QAExD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC;aAC7B,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,EAAJ,CAAI,CAAC,CAAC;IAC5B,CAAC;IACL,0BAAC;AAAD,CAAC,AA1CD,IA0CC"}

package/dist/lib/eqs/eqs_exporter.d.ts

@@ -6,5 +6,5 @@ export declare class EqServerExporter implements EqExporter {
     private context;
     constructor(context: EqContext);
     setFormat(format: string, responseType?: XMLHttpRequestResponseType): void;
-    export(options?: ExportOptions): Promise<any>;
+    export(exportOptions?: ExportOptions): Promise<any>;
 }

package/dist/lib/eqs/eqs_exporter.js

@@ -6,18 +6,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]);

package/dist/lib/eqs/eqs_exporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"eqs_exporter.js","sourceRoot":"","sources":["../../../src/eqs/eqs_exporter.ts"],"names":[],"mappings":"AAGA;IAOI,0BAAY,OAAkB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,oCAAS,GAAhB,UAAiB,MAAc,EAAE,YAAyC;QACtE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAEM,iCAAM,GAAb,UAAc,OAAuB;QACjC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,IAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC;QACxD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;QAEpC,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACvD,IAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC;QAEzC,IAAM,IAAI,GAAG;YACT,OAAO,EAAE,KAAK,CAAC,UAAU,EAAE;YAC3B,UAAU,EAAE,OAAO,CAAC,QAAQ;SAC/B,CAAA;QAED,IAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAClD,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,IAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAE/E,IAAM,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAE1C,OAAO,YAAY,CAAC,IAAI,CAAC,UAAC,YAAY;YAClC,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;YACtC,IAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,EAAE;iBAC3B,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;YAEtF,IAAI,MAAM,CAAC,SAAS,CAAC,gBAAgB,EAAE;gBACnC,oBAAoB;gBACpB,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aACrD;iBAAM;gBACH,IAAI,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBACpC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC,CAAC,KAAK,CAAE,OAAO,GAAE,MAAM,CAAC;gBACzB,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC1C,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACtB,CAAC,CAAC,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACnC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IACL,uBAAC;AAAD,CAAC,AAvDD,IAuDC"}
+{"version":3,"file":"eqs_exporter.js","sourceRoot":"","sources":["../../../src/eqs/eqs_exporter.ts"],"names":[],"mappings":"AAGA;IAOI,0BAAY,OAAkB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,oCAAS,GAAhB,UAAiB,MAAc,EAAE,YAAyC;QACtE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAEM,iCAAM,GAAb,UAAc,aAA6B;QACvC,aAAa,GAAG,aAAa,IAAI,EAAE,CAAC;QACpC,IAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC;QACxD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;QAEpC,IAAM,KAAK,GAAG,aAAa,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC7D,IAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC;QAEzC,IAAI,WAAW,GAAQ;YACnB,UAAU,EAAE,aAAa,CAAC,QAAQ;SACrC,CAAA;QAED,IAAI,OAAM,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,EAAE;YAC/C,WAAW,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC;SAC/C;aACI;YACD,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;SAC1C;QAED,IAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAClD,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,IAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAEtF,IAAM,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAE1C,OAAO,YAAY,CAAC,IAAI,CAAC,UAAC,YAAY;YAClC,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;YACtC,IAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,EAAE;iBAC3B,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;YAEtF,IAAI,MAAM,CAAC,SAAS,CAAC,gBAAgB,EAAE;gBACnC,oBAAoB;gBACpB,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aACrD;iBAAM;gBACH,IAAI,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBACpC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC,CAAC,KAAK,CAAE,OAAO,GAAE,MAAM,CAAC;gBACzB,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC1C,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACtB,CAAC,CAAC,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACnC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IACL,uBAAC;AAAD,CAAC,AA7DD,IA6DC"}

package/dist/lib/export/exporter.d.ts

@@ -1,6 +1,7 @@
 import { i18n } from '@easydata/core';
 import { Query } from '../query/query';
 export interface ExportOptions {
+    queryId?: string;
     query?: Query;
     settings?: i18n.LocaleSettings;
     [param: string]: any;

package/dist/lib/main/context.d.ts

@@ -23,7 +23,7 @@ declare type EqExporterResolver = (context: EqContext) => EqExporter;
  *  - several UI widgets.
  */
 export declare class EqContext {
-    private isInitialized;
+    private servicesInitialized;
     private eqServices;
     private internalListCache;
     private externalListCache?;
@@ -38,11 +38,13 @@ export declare class EqContext {
     resultStatement?: string;
     private widgets;
     private eventEmitter;
+    private errorHandlerId;
     clientListRequestHandler: (data: any, callback: (list: any) => void) => boolean;
     loadModelOnStart: boolean;
     loadQueryOnStart: boolean;
     private exporters;
     private endpoints;
+    useStoredQueryOnFetch: boolean;
     debugMode: boolean;
     /**
      * Tuners.
@@ -66,6 +68,7 @@ export declare class EqContext {
     setEnpointIfNotExist(key: EqEndpointKey, value: string): void;
     private setDefaultEndpoints;
     private elasticPaging;
+    initStart(): void;
     /**
      * Initializes the context
      * @param options

package/dist/lib/main/context.js

@@ -31,10 +31,11 @@ import { EasyQueryDataLoader } from '../data/eq_data_loader';
 var 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;
@@ -42,18 +43,16 @@ var 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: i18n.getText(macroName) };
+                    .map(function (macroId) {
+                    return { id: '${{' + macroId + '}}', text: 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: i18n.getText(macroName) };
+                    .map(function (macroId) {
+                    return { id: '${{' + macroId + '}}', text: i18n.getText(macroId) };
                 });
                 onResult(data);
                 return true;
@@ -122,6 +121,15 @@ var 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;
@@ -199,13 +207,17 @@ var EqContext = /** @class */ (function () {
         this.setEnpointIfNotExist('GetQueryFile', equtils.combinePath(endpointBase, 'models/{modelId}/getqueryfile/{format}'));
         this.setEnpointIfNotExist('UploadQueryFile', 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;
@@ -215,7 +227,6 @@ var EqContext = /** @class */ (function () {
         }
         if (typeof (options.elasticPaging) !== 'undefined') {
             this.elasticPaging = options.elasticPaging;
-            this.resultTable.elasticChunks = this.elasticPaging;
         }
         if (options.listCache) {
             this.setExternalListCache(options.listCache);
@@ -266,19 +277,9 @@ var 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;
             }
@@ -412,7 +413,7 @@ var 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();
@@ -1075,11 +1076,15 @@ var 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';
@@ -1200,6 +1205,10 @@ var 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
@@ -1334,6 +1343,9 @@ var 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