@easyquery/core 7.4.1-rc03 → 7.4.1-rc04

package/LICENSE.md

@@ -1,163 +1,163 @@
-GNU Lesser General Public License
-=================================
-
-_Version 3, 29 June 2007_  
-_Copyright © 2007 Free Software Foundation, Inc. &lt;<http://fsf.org/>&gt;_
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-
-This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-### 0. Additional Definitions
-
-As used herein, “this License” refers to version 3 of the GNU Lesser
-General Public License, and the “GNU GPL” refers to version 3 of the GNU
-General Public License.
-
-“The Library” refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-An “Application” is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-A “Combined Work” is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the “Linked
-Version”.
-
-The “Minimal Corresponding Source” for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-The “Corresponding Application Code” for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-### 1. Exception to Section 3 of the GNU GPL
-
-You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-### 2. Conveying Modified Versions
-
-If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-* **a)** under this License, provided that you make a good faith effort to
-ensure that, in the event an Application does not supply the
-function or data, the facility still operates, and performs
-whatever part of its purpose remains meaningful, or
-
-* **b)** under the GNU GPL, with none of the additional permissions of
-this License applicable to that copy.
-
-### 3. Object Code Incorporating Material from Library Header Files
-
-The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-* **a)** Give prominent notice with each copy of the object code that the
-Library is used in it and that the Library and its use are
-covered by this License.
-* **b)** Accompany the object code with a copy of the GNU GPL and this license
-document.
-
-### 4. Combined Works
-
-You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-* **a)** Give prominent notice with each copy of the Combined Work that
-the Library is used in it and that the Library and its use are
-covered by this License.
-
-* **b)** Accompany the Combined Work with a copy of the GNU GPL and this license
-document.
-
-* **c)** For a Combined Work that displays copyright notices during
-execution, include the copyright notice for the Library among
-these notices, as well as a reference directing the user to the
-copies of the GNU GPL and this license document.
-
-* **d)** Do one of the following:
-    - **0)** Convey the Minimal Corresponding Source under the terms of this
-License, and the Corresponding Application Code in a form
-suitable for, and under terms that permit, the user to
-recombine or relink the Application with a modified version of
-the Linked Version to produce a modified Combined Work, in the
-manner specified by section 6 of the GNU GPL for conveying
-Corresponding Source.
-    - **1)** Use a suitable shared library mechanism for linking with the
-Library.  A suitable mechanism is one that **(a)** uses at run time
-a copy of the Library already present on the user's computer
-system, and **(b)** will operate properly with a modified version
-of the Library that is interface-compatible with the Linked
-Version.
-
-* **e)** Provide Installation Information, but only if you would otherwise
-be required to provide such information under section 6 of the
-GNU GPL, and only to the extent that such information is
-necessary to install and execute a modified version of the
-Combined Work produced by recombining or relinking the
-Application with a modified version of the Linked Version. (If
-you use option **4d0**, the Installation Information must accompany
-the Minimal Corresponding Source and Corresponding Application
-Code. If you use option **4d1**, you must provide the Installation
-Information in the manner specified by section 6 of the GNU GPL
-for conveying Corresponding Source.)
-
-### 5. Combined Libraries
-
-You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-* **a)** Accompany the combined library with a copy of the same work based
-on the Library, uncombined with any other library facilities,
-conveyed under the terms of this License.
-* **b)** Give prominent notice with the combined library that part of it
-is a work based on the Library, and explaining where to find the
-accompanying uncombined form of the same work.
-
-### 6. Revised Versions of the GNU Lesser General Public License
-
-The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License “or any later version”
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
+GNU Lesser General Public License
+=================================
+
+_Version 3, 29 June 2007_  
+_Copyright © 2007 Free Software Foundation, Inc. &lt;<http://fsf.org/>&gt;_
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+### 0. Additional Definitions
+
+As used herein, “this License” refers to version 3 of the GNU Lesser
+General Public License, and the “GNU GPL” refers to version 3 of the GNU
+General Public License.
+
+“The Library” refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+An “Application” is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+A “Combined Work” is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the “Linked
+Version”.
+
+The “Minimal Corresponding Source” for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+The “Corresponding Application Code” for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+### 1. Exception to Section 3 of the GNU GPL
+
+You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+### 2. Conveying Modified Versions
+
+If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+* **a)** under this License, provided that you make a good faith effort to
+ensure that, in the event an Application does not supply the
+function or data, the facility still operates, and performs
+whatever part of its purpose remains meaningful, or
+
+* **b)** under the GNU GPL, with none of the additional permissions of
+this License applicable to that copy.
+
+### 3. Object Code Incorporating Material from Library Header Files
+
+The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+* **a)** Give prominent notice with each copy of the object code that the
+Library is used in it and that the Library and its use are
+covered by this License.
+* **b)** Accompany the object code with a copy of the GNU GPL and this license
+document.
+
+### 4. Combined Works
+
+You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+* **a)** Give prominent notice with each copy of the Combined Work that
+the Library is used in it and that the Library and its use are
+covered by this License.
+
+* **b)** Accompany the Combined Work with a copy of the GNU GPL and this license
+document.
+
+* **c)** For a Combined Work that displays copyright notices during
+execution, include the copyright notice for the Library among
+these notices, as well as a reference directing the user to the
+copies of the GNU GPL and this license document.
+
+* **d)** Do one of the following:
+    - **0)** Convey the Minimal Corresponding Source under the terms of this
+License, and the Corresponding Application Code in a form
+suitable for, and under terms that permit, the user to
+recombine or relink the Application with a modified version of
+the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying
+Corresponding Source.
+    - **1)** Use a suitable shared library mechanism for linking with the
+Library.  A suitable mechanism is one that **(a)** uses at run time
+a copy of the Library already present on the user's computer
+system, and **(b)** will operate properly with a modified version
+of the Library that is interface-compatible with the Linked
+Version.
+
+* **e)** Provide Installation Information, but only if you would otherwise
+be required to provide such information under section 6 of the
+GNU GPL, and only to the extent that such information is
+necessary to install and execute a modified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option **4d0**, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option **4d1**, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+
+### 5. Combined Libraries
+
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+* **a)** Accompany the combined library with a copy of the same work based
+on the Library, uncombined with any other library facilities,
+conveyed under the terms of this License.
+* **b)** Give prominent notice with the combined library that part of it
+is a work based on the Library, and explaining where to find the
+accompanying uncombined form of the same work.
+
+### 6. Revised Versions of the GNU Lesser General Public License
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License “or any later version”
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
 Library.

package/README.md

@@ -1,35 +1,35 @@
-# @easyquery/core (part of EasyQuery.JS)
-
-EasyQuery library provides you with the means to add an ad-hoc reporting or advanced search functionality to your web application.
-
-It gives you a simple to use but a quite powerful user interface to build queries or filters to your data. Your end-users will get the power of SQL with the simplicity of a natural language.
-
-Take a look at [EasyQuery web-page](https://korzh.com/easyquery) for more information.
-
-This `core` package defines the basic functions and structures of EasyQuery library such as `DataModel`, `Query`, `Condition`, `Column` and other classes and interfaces.
-
-## Usage
-
-A general overview of EasyQuery.JS, getting started instructions and tutorials can be found on [EasyQuery.JS documentation](https://korzh.com/easyquery/javascript/docs) web-site.
-
-If you plan to use it with ASP.NET (Core) backend - we suggest you proceed with a "bundle": [EasyQuery for ASP.NET (Core)](https://korzh.com/easyquery) which includes both EasyQuery.JS library and the server-side packages for .NET (Core).
-
-For other platforms, you will also need a special EasyQuery Server which can be installed on any Linux, Windows or Mac server. For more information please read [How EasyQuery works](https://korzh.com/easyquery/javascript#HDIW) section on EasyQuery.JS web page.
-
-## Live examples
-
-You can test EasyQuery in several different scenarios on our [live demos page](https://korzh.com/demo/easyquery-asp-net-core-razor).
-
-The source code for these sample web-applications is available on [GitHub](https://github.com/easyquery/DotNetSamples).
-
-## Documentation
-
-* [Getting started and tutorials](https://korzh.com/easyquery/javascript/docs)
-* [API Reference](https://korzh.com/easyquery/javascript/docs/api-reference-7x)
-
-## License
-
-The package is distributed under LGPL-3.0 license.
-
-The server-side part (which is required to build a working solution) is licensed separately. 
-For more information please see [EasyQuery.NET Licensing](https://korzh.com/easyquery/licensing) page.
+# @easyquery/core (part of EasyQuery.JS)
+
+EasyQuery library provides you with the means to add an ad-hoc reporting or advanced search functionality to your web application.
+
+It gives you a simple to use but a quite powerful user interface to build queries or filters to your data. Your end-users will get the power of SQL with the simplicity of a natural language.
+
+Take a look at [EasyQuery web-page](https://korzh.com/easyquery) for more information.
+
+This `core` package defines the basic functions and structures of EasyQuery library such as `DataModel`, `Query`, `Condition`, `Column` and other classes and interfaces.
+
+## Usage
+
+A general overview of EasyQuery.JS, getting started instructions and tutorials can be found on [EasyQuery.JS documentation](https://korzh.com/easyquery/javascript/docs) web-site.
+
+If you plan to use it with ASP.NET (Core) backend - we suggest you proceed with a "bundle": [EasyQuery for ASP.NET (Core)](https://korzh.com/easyquery) which includes both EasyQuery.JS library and the server-side packages for .NET (Core).
+
+For other platforms, you will also need a special EasyQuery Server which can be installed on any Linux, Windows or Mac server. For more information please read [How EasyQuery works](https://korzh.com/easyquery/javascript#HDIW) section on EasyQuery.JS web page.
+
+## Live examples
+
+You can test EasyQuery in several different scenarios on our [live demos page](https://korzh.com/demo/easyquery-asp-net-core-razor).
+
+The source code for these sample web-applications is available on [GitHub](https://github.com/easyquery/DotNetSamples).
+
+## Documentation
+
+* [Getting started and tutorials](https://korzh.com/easyquery/javascript/docs)
+* [API Reference](https://korzh.com/easyquery/javascript/docs/api-reference-7x)
+
+## License
+
+The package is distributed under LGPL-3.0 license.
+
+The server-side part (which is required to build a working solution) is licensed separately. 
+For more information please see [EasyQuery.NET Licensing](https://korzh.com/easyquery/licensing) page.

package/dist/easyquery.core.cjs.js

@@ -1,10 +1,10 @@
 
 /*
- * EasyQuery.JS Core v7.4.1-rc03
- * Copyright 2025 Korzh.com
+ * EasyQuery.JS Core v7.4.1-rc04
+ * Copyright 2026 Korzh.com
  * Licensed under MIT
  *
- * Build time: 10/19/2025 10:48:25 PM
+ * Build time: 1/5/2026 11:26:54 PM
  */
 
 'use strict';
@@ -213,6 +213,24 @@ exports.equtils = void 0;
         }
     }
     equtils.convertValue = convertValue;
+    function downloadFile(data, filename) {
+        const blob = new Blob([data]);
+        if (window.navigator['msSaveOrOpenBlob']) {
+            // Internet Explorer
+            window.navigator['msSaveOrOpenBlob'](blob, filename);
+        }
+        else {
+            var a = document.createElement("a");
+            document.body.appendChild(a);
+            a.style.display = "none";
+            a.href = window.URL.createObjectURL(blob);
+            a.download = filename;
+            a.click();
+            window.URL.revokeObjectURL(a.href);
+            document.body.removeChild(a);
+        }
+    }
+    equtils.downloadFile = downloadFile;
 })(exports.equtils || (exports.equtils = {}));
 
 /**
@@ -327,7 +345,7 @@ class Operator {
             this.caseIns = data.caseIns;
             this.isRange = data.isRange;
             this.displayFormat = data.fmt;
-            this.paramCount = data.pcnt;
+            this.paramCount = data.pcnt || 0;
             this.expr = data.expr;
             this.appliedTypes = data.dtypes || this.appliedTypes;
             if (data.defOperand) {
@@ -499,16 +517,19 @@ class DataModel extends core.MetaData {
      * @param data The JSON representation object.
      */
     loadFromData(data) {
+        if (!data || !data.entroot)
+            throw 'Invalid data model object value';
         super.loadFromData(data);
         //Operators
-        this.operators = new Array();
+        const newOperators = new Array();
         if (data.operators) {
             for (let i = 0; i < data.operators.length; i++) {
                 let newOperator = new Operator();
                 newOperator.loadFromData(this, data.operators[i]);
-                this.operators.push(newOperator);
+                newOperators.push(newOperator);
             }
         }
+        this.operators = newOperators;
         //rootEntity
         this.rootEntity.loadFromData(this, data.entroot);
         //Aggr Functions
@@ -2780,7 +2801,12 @@ class Query {
      * @param name New name.
      */
     setName(name) {
-        this.name = name;
+        this.name = this.validateName(name);
+    }
+    validateName(name) {
+        let validName = name || 'query';
+        //remove invalid characters
+        return validName.replace(/["'<>\\]/g, '').trim();
     }
     /**
      * Gets description of the query.
@@ -3166,6 +3192,17 @@ class Query {
     createCondition(tag = exports.CondTag.Simple) {
         return new Condition(this, tag);
     }
+    safeStringify(obj) {
+        const seen = new WeakSet();
+        return JSON.stringify(obj, function (key, value) {
+            if (typeof value === "object" && value !== null) {
+                if (seen.has(value))
+                    return "[Circular]";
+                seen.add(value);
+            }
+            return value;
+        });
+    }
     /**
      *  Adds a new simple condition (a predicate)
      * @param descriptor The descriptor which defines different parameters of the new condition
@@ -3182,11 +3219,14 @@ class Query {
         if (!descriptor.attribute) {
             descriptor.attribute = model.getAttributeById(descriptor.attributeId);
             if (!descriptor.attribute) {
-                throw new Error("Could not find this attribute: " + descriptor.attributeId);
+                throw new Error("Could not find attribute: " + descriptor.attributeId);
             }
         }
         if (!descriptor.operator && descriptor.operatorId) {
             descriptor.operator = model.getOperatorById(descriptor.operatorId);
+            if (!descriptor.operator) {
+                throw new Error("Could not find operator: " + descriptor.operatorId);
+            }
         }
         if (!descriptor.operator) {
             descriptor.operator = model.getDefaultOperatorForAttr(descriptor.attribute);
@@ -4184,29 +4224,15 @@ class EqServerExporter {
         if (exportOptions.options) {
             requestData.options = exportOptions.options;
         }
-        const url = this.context.resolveEndpoint('ExportResult', { modelId: modelId, format: format });
+        const url = this.context.resolveEndpoint('ExportTotal', { modelId: modelId, format: format });
         const actionResult = http.post(url, requestData, { responseType: this.responseType });
         const request = actionResult.getRequest();
         return actionResult.then((responseData) => {
-            const blob = new Blob([responseData]);
             const dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
             const filename = dispositionHeader
                 ? dispositionHeader.match(/filename="?([^"]*)"?$/)[1]
                 : 'export-data.' + format;
-            if (window.navigator['msSaveOrOpenBlob']) {
-                // Internet Explorer
-                window.navigator['msSaveOrOpenBlob'](blob, filename);
-            }
-            else {
-                var a = document.createElement("a");
-                document.body.appendChild(a);
-                a.style.display = "none";
-                a.href = window.URL.createObjectURL(blob);
-                a.download = filename;
-                a.click();
-                window.URL.revokeObjectURL(a.href);
-                document.body.removeChild(a);
-            }
+            exports.equtils.downloadFile(responseData, filename);
         });
     }
 }
@@ -4549,7 +4575,10 @@ class EqContext {
         this.setEndpointIfNotExist('GetQueryList', exports.equtils.combinePath(endpointBase, 'models/{modelId}/queries'));
         this.setEndpointIfNotExist('FetchData', exports.equtils.combinePath(endpointBase, 'models/{modelId}/fetch'));
         this.setEndpointIfNotExist('GetValueList', exports.equtils.combinePath(endpointBase, 'models/{modelId}/valuelists/{listId}'));
-        this.setEndpointIfNotExist('ExportResult', exports.equtils.combinePath(endpointBase, 'models/{modelId}/export/{format}'));
+        this.setEndpointIfNotExist('ExportTotal', exports.equtils.combinePath(endpointBase, 'models/{modelId}/export/{format}'));
+        this.setEndpointIfNotExist('ExportStart', exports.equtils.combinePath(endpointBase, 'models/{modelId}/export/start/{format}'));
+        this.setEndpointIfNotExist('ExportStatus', exports.equtils.combinePath(endpointBase, 'models/{modelId}/export/status/{exportId}'));
+        this.setEndpointIfNotExist('ExportGetResult', exports.equtils.combinePath(endpointBase, 'models/{modelId}/export/result/{exportId}'));
         this.setEndpointIfNotExist('GetQueryFile', exports.equtils.combinePath(endpointBase, 'models/{modelId}/getqueryfile/{format}'));
         this.setEndpointIfNotExist('UploadQueryFile', exports.equtils.combinePath(endpointBase, 'models/{modelId}/uploadqueryfile'));
     }
@@ -5700,7 +5729,7 @@ class EqContext {
         });
     }
     /**
-     * Fetches the data for defined by this context and exports them to the specified format.
+     * Fetches the data for the query defined in this context and exports them to the specified format.
      * @param options
      * The content of the `options` parameter depends on `EqExporter` implementation.
      * Usually it contains `format` property which defines the format of the exported data (e.g. `csv`),
@@ -5767,6 +5796,118 @@ class EqContext {
             }
         }
     }
+    /**
+     * Initiates the data export process for the query defined in this context.
+     * @param options
+     * The content of the `options` parameter depends on `EqExporter` implementation.
+     * Usually it contains `format` property which defines the format of the exported data (e.g. `csv`),
+     * and `success` and `error` callbacks
+     * @example
+     * context.exportStart({
+     *      format: csv
+     * });
+     *
+     */
+    exportStart(options) {
+        let exportOptions = options || {};
+        exportOptions.chunk = exportOptions.chunk || EmptyChunk;
+        exportOptions.data = exportOptions.data || {}; //add data property for convenience
+        if (this.beforeExportResult) {
+            this.beforeExportResult(this, exportOptions);
+        }
+        const format = exportOptions.format || 'csv';
+        {
+            const queryId = this.getQuery().getId();
+            if (this.useStoredQueryOnFetch) {
+                exportOptions.queryId = queryId;
+            }
+            const localeSettings = core.i18n.getLocaleSettings();
+            exportOptions.settings = localeSettings;
+            const aggrSettings = this.query.getAggregationSettings();
+            if (aggrSettings.hasAggregates()
+                && (aggrSettings.hasGrandTotals() || aggrSettings.hasGroups())) {
+                exportOptions.aggregates = aggrSettings.saveToData();
+            }
+            const query = exportOptions.query || this.getQuery();
+            const modelId = query.getModel().getId();
+            let requestData = {
+                'settings': exportOptions.settings,
+                'chunk': EmptyChunk
+            };
+            if (typeof (exportOptions.queryId) !== 'undefined') {
+                requestData.queryId = exportOptions.queryId;
+            }
+            else {
+                requestData.query = query.toJSONData();
+            }
+            if (exportOptions.data) {
+                requestData.data = exportOptions.data;
+            }
+            if (exportOptions.options) {
+                requestData.options = exportOptions.options;
+            }
+            const http = this.getServices().getHttpClient();
+            const url = this.resolveEndpoint('ExportStart', { modelId: modelId, format: format });
+            const actionResult = http.post(url, requestData);
+            actionResult
+                .then((responseData) => {
+                this.fireEvent('exportStart');
+                if (exportOptions.success) {
+                    exportOptions.success();
+                }
+                this.startExportStatusCheck(responseData.exportId);
+            })
+                .catch((error) => {
+                const errorMessage = `Error on initating data export for query  ${queryId}. \n${error.message}`;
+                this.endProcess({
+                    result: exports.EqActionResult.Error,
+                    action: exports.EqAction.ExportResult,
+                    text: errorMessage,
+                    sourceError: error
+                }, exports.WidgetGroup.Result);
+                if (exportOptions.error) {
+                    exportOptions.error(errorMessage, 'ExportResult');
+                }
+            });
+        }
+    }
+    startExportStatusCheck(exportId) {
+        let interval;
+        const checkStatus = () => {
+            const http = this.getServices().getHttpClient();
+            const url = this.resolveEndpoint('ExportStatus', { exportId: exportId });
+            const actionResult = http.get(url);
+            actionResult
+                .then((responseData) => {
+                if (responseData.status === 2) {
+                    clearInterval(interval);
+                    const url = this.resolveEndpoint('ExportGetResult', { exportId: exportId });
+                    const actionResult = http.get(url, { responseType: 'blob' });
+                    const request = actionResult.getRequest();
+                    return actionResult.then((downloadResponseData) => {
+                        const dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
+                        const filename = dispositionHeader
+                            ? dispositionHeader.match(/filename="?([^"]*)"?$/)[1]
+                            : 'export-data';
+                        exports.equtils.downloadFile(downloadResponseData, filename);
+                    });
+                }
+                else if (responseData.status === 3) {
+                    clearInterval(interval);
+                }
+            })
+                .catch((error) => {
+                clearInterval(interval);
+                const errorMessage = `Error on checking data export status for exportId  ${exportId}. \n${error.message}`;
+                console.error(errorMessage);
+            });
+        };
+        interval = setInterval(() => {
+            checkStatus();
+        }, 3000);
+        //initial check
+        checkStatus();
+    }
     limitCustomSqlColumns() {
         if (!this.options.allowCustomExpressions) {
             this.query.getColumns().forEach(col => {

package/dist/easyquery.core.esm.js

@@ -1,10 +1,10 @@
 
 /*
- * EasyQuery.JS Core v7.4.1-rc03
- * Copyright 2025 Korzh.com
+ * EasyQuery.JS Core v7.4.1-rc04
+ * Copyright 2026 Korzh.com
  * Licensed under MIT
  *
- * Build time: 10/19/2025 10:48:25 PM
+ * Build time: 1/5/2026 11:26:54 PM
  */
 
 import { i18n, DataType, utils, ValueEditor, MetaEntity, MetaEntityAttr, EditorTag, MetaData, EventEmitter, AggregationSettings, HttpClient, EasyDataTable } from '@easydata/core';
@@ -212,6 +212,24 @@ var equtils;
         }
     }
     equtils.convertValue = convertValue;
+    function downloadFile(data, filename) {
+        const blob = new Blob([data]);
+        if (window.navigator['msSaveOrOpenBlob']) {
+            // Internet Explorer
+            window.navigator['msSaveOrOpenBlob'](blob, filename);
+        }
+        else {
+            var a = document.createElement("a");
+            document.body.appendChild(a);
+            a.style.display = "none";
+            a.href = window.URL.createObjectURL(blob);
+            a.download = filename;
+            a.click();
+            window.URL.revokeObjectURL(a.href);
+            document.body.removeChild(a);
+        }
+    }
+    equtils.downloadFile = downloadFile;
 })(equtils || (equtils = {}));
 
 /**
@@ -326,7 +344,7 @@ class Operator {
             this.caseIns = data.caseIns;
             this.isRange = data.isRange;
             this.displayFormat = data.fmt;
-            this.paramCount = data.pcnt;
+            this.paramCount = data.pcnt || 0;
             this.expr = data.expr;
             this.appliedTypes = data.dtypes || this.appliedTypes;
             if (data.defOperand) {
@@ -498,16 +516,19 @@ class DataModel extends MetaData {
      * @param data The JSON representation object.
      */
     loadFromData(data) {
+        if (!data || !data.entroot)
+            throw 'Invalid data model object value';
         super.loadFromData(data);
         //Operators
-        this.operators = new Array();
+        const newOperators = new Array();
         if (data.operators) {
             for (let i = 0; i < data.operators.length; i++) {
                 let newOperator = new Operator();
                 newOperator.loadFromData(this, data.operators[i]);
-                this.operators.push(newOperator);
+                newOperators.push(newOperator);
             }
         }
+        this.operators = newOperators;
         //rootEntity
         this.rootEntity.loadFromData(this, data.entroot);
         //Aggr Functions
@@ -2779,7 +2800,12 @@ class Query {
      * @param name New name.
      */
     setName(name) {
-        this.name = name;
+        this.name = this.validateName(name);
+    }
+    validateName(name) {
+        let validName = name || 'query';
+        //remove invalid characters
+        return validName.replace(/["'<>\\]/g, '').trim();
     }
     /**
      * Gets description of the query.
@@ -3165,6 +3191,17 @@ class Query {
     createCondition(tag = CondTag.Simple) {
         return new Condition(this, tag);
     }
+    safeStringify(obj) {
+        const seen = new WeakSet();
+        return JSON.stringify(obj, function (key, value) {
+            if (typeof value === "object" && value !== null) {
+                if (seen.has(value))
+                    return "[Circular]";
+                seen.add(value);
+            }
+            return value;
+        });
+    }
     /**
      *  Adds a new simple condition (a predicate)
      * @param descriptor The descriptor which defines different parameters of the new condition
@@ -3181,11 +3218,14 @@ class Query {
         if (!descriptor.attribute) {
             descriptor.attribute = model.getAttributeById(descriptor.attributeId);
             if (!descriptor.attribute) {
-                throw new Error("Could not find this attribute: " + descriptor.attributeId);
+                throw new Error("Could not find attribute: " + descriptor.attributeId);
             }
         }
         if (!descriptor.operator && descriptor.operatorId) {
             descriptor.operator = model.getOperatorById(descriptor.operatorId);
+            if (!descriptor.operator) {
+                throw new Error("Could not find operator: " + descriptor.operatorId);
+            }
         }
         if (!descriptor.operator) {
             descriptor.operator = model.getDefaultOperatorForAttr(descriptor.attribute);
@@ -4183,29 +4223,15 @@ class EqServerExporter {
         if (exportOptions.options) {
             requestData.options = exportOptions.options;
         }
-        const url = this.context.resolveEndpoint('ExportResult', { modelId: modelId, format: format });
+        const url = this.context.resolveEndpoint('ExportTotal', { modelId: modelId, format: format });
         const actionResult = http.post(url, requestData, { responseType: this.responseType });
         const request = actionResult.getRequest();
         return actionResult.then((responseData) => {
-            const blob = new Blob([responseData]);
             const dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
             const filename = dispositionHeader
                 ? dispositionHeader.match(/filename="?([^"]*)"?$/)[1]
                 : 'export-data.' + format;
-            if (window.navigator['msSaveOrOpenBlob']) {
-                // Internet Explorer
-                window.navigator['msSaveOrOpenBlob'](blob, filename);
-            }
-            else {
-                var a = document.createElement("a");
-                document.body.appendChild(a);
-                a.style.display = "none";
-                a.href = window.URL.createObjectURL(blob);
-                a.download = filename;
-                a.click();
-                window.URL.revokeObjectURL(a.href);
-                document.body.removeChild(a);
-            }
+            equtils.downloadFile(responseData, filename);
         });
     }
 }
@@ -4548,7 +4574,10 @@ class EqContext {
         this.setEndpointIfNotExist('GetQueryList', equtils.combinePath(endpointBase, 'models/{modelId}/queries'));
         this.setEndpointIfNotExist('FetchData', equtils.combinePath(endpointBase, 'models/{modelId}/fetch'));
         this.setEndpointIfNotExist('GetValueList', equtils.combinePath(endpointBase, 'models/{modelId}/valuelists/{listId}'));
-        this.setEndpointIfNotExist('ExportResult', equtils.combinePath(endpointBase, 'models/{modelId}/export/{format}'));
+        this.setEndpointIfNotExist('ExportTotal', equtils.combinePath(endpointBase, 'models/{modelId}/export/{format}'));
+        this.setEndpointIfNotExist('ExportStart', equtils.combinePath(endpointBase, 'models/{modelId}/export/start/{format}'));
+        this.setEndpointIfNotExist('ExportStatus', equtils.combinePath(endpointBase, 'models/{modelId}/export/status/{exportId}'));
+        this.setEndpointIfNotExist('ExportGetResult', equtils.combinePath(endpointBase, 'models/{modelId}/export/result/{exportId}'));
         this.setEndpointIfNotExist('GetQueryFile', equtils.combinePath(endpointBase, 'models/{modelId}/getqueryfile/{format}'));
         this.setEndpointIfNotExist('UploadQueryFile', equtils.combinePath(endpointBase, 'models/{modelId}/uploadqueryfile'));
     }
@@ -5699,7 +5728,7 @@ class EqContext {
         });
     }
     /**
-     * Fetches the data for defined by this context and exports them to the specified format.
+     * Fetches the data for the query defined in this context and exports them to the specified format.
      * @param options
      * The content of the `options` parameter depends on `EqExporter` implementation.
      * Usually it contains `format` property which defines the format of the exported data (e.g. `csv`),
@@ -5766,6 +5795,118 @@ class EqContext {
             }
         }
     }
+    /**
+     * Initiates the data export process for the query defined in this context.
+     * @param options
+     * The content of the `options` parameter depends on `EqExporter` implementation.
+     * Usually it contains `format` property which defines the format of the exported data (e.g. `csv`),
+     * and `success` and `error` callbacks
+     * @example
+     * context.exportStart({
+     *      format: csv
+     * });
+     *
+     */
+    exportStart(options) {
+        let exportOptions = options || {};
+        exportOptions.chunk = exportOptions.chunk || EmptyChunk;
+        exportOptions.data = exportOptions.data || {}; //add data property for convenience
+        if (this.beforeExportResult) {
+            this.beforeExportResult(this, exportOptions);
+        }
+        const format = exportOptions.format || 'csv';
+        {
+            const queryId = this.getQuery().getId();
+            if (this.useStoredQueryOnFetch) {
+                exportOptions.queryId = queryId;
+            }
+            const localeSettings = i18n.getLocaleSettings();
+            exportOptions.settings = localeSettings;
+            const aggrSettings = this.query.getAggregationSettings();
+            if (aggrSettings.hasAggregates()
+                && (aggrSettings.hasGrandTotals() || aggrSettings.hasGroups())) {
+                exportOptions.aggregates = aggrSettings.saveToData();
+            }
+            const query = exportOptions.query || this.getQuery();
+            const modelId = query.getModel().getId();
+            let requestData = {
+                'settings': exportOptions.settings,
+                'chunk': EmptyChunk
+            };
+            if (typeof (exportOptions.queryId) !== 'undefined') {
+                requestData.queryId = exportOptions.queryId;
+            }
+            else {
+                requestData.query = query.toJSONData();
+            }
+            if (exportOptions.data) {
+                requestData.data = exportOptions.data;
+            }
+            if (exportOptions.options) {
+                requestData.options = exportOptions.options;
+            }
+            const http = this.getServices().getHttpClient();
+            const url = this.resolveEndpoint('ExportStart', { modelId: modelId, format: format });
+            const actionResult = http.post(url, requestData);
+            actionResult
+                .then((responseData) => {
+                this.fireEvent('exportStart');
+                if (exportOptions.success) {
+                    exportOptions.success();
+                }
+                this.startExportStatusCheck(responseData.exportId);
+            })
+                .catch((error) => {
+                const errorMessage = `Error on initating data export for query  ${queryId}. \n${error.message}`;
+                this.endProcess({
+                    result: EqActionResult.Error,
+                    action: EqAction.ExportResult,
+                    text: errorMessage,
+                    sourceError: error
+                }, WidgetGroup.Result);
+                if (exportOptions.error) {
+                    exportOptions.error(errorMessage, 'ExportResult');
+                }
+            });
+        }
+    }
+    startExportStatusCheck(exportId) {
+        let interval;
+        const checkStatus = () => {
+            const http = this.getServices().getHttpClient();
+            const url = this.resolveEndpoint('ExportStatus', { exportId: exportId });
+            const actionResult = http.get(url);
+            actionResult
+                .then((responseData) => {
+                if (responseData.status === 2) {
+                    clearInterval(interval);
+                    const url = this.resolveEndpoint('ExportGetResult', { exportId: exportId });
+                    const actionResult = http.get(url, { responseType: 'blob' });
+                    const request = actionResult.getRequest();
+                    return actionResult.then((downloadResponseData) => {
+                        const dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
+                        const filename = dispositionHeader
+                            ? dispositionHeader.match(/filename="?([^"]*)"?$/)[1]
+                            : 'export-data';
+                        equtils.downloadFile(downloadResponseData, filename);
+                    });
+                }
+                else if (responseData.status === 3) {
+                    clearInterval(interval);
+                }
+            })
+                .catch((error) => {
+                clearInterval(interval);
+                const errorMessage = `Error on checking data export status for exportId  ${exportId}. \n${error.message}`;
+                console.error(errorMessage);
+            });
+        };
+        interval = setInterval(() => {
+            checkStatus();
+        }, 3000);
+        //initial check
+        checkStatus();
+    }
     limitCustomSqlColumns() {
         if (!this.options.allowCustomExpressions) {
             this.query.getColumns().forEach(col => {

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

@@ -272,7 +272,7 @@ export declare class EqContext {
      * Fires event.
      * @param eventType The event type.
      */
-    fireEvent(eventType: 'ready' | 'loadModel' | 'initialModelLoad' | 'loadQuery' | 'syncQuery' | 'fetchData' | 'exportResult'): any;
+    fireEvent(eventType: 'ready' | 'loadModel' | 'initialModelLoad' | 'loadQuery' | 'syncQuery' | 'fetchData' | 'exportResult' | 'exportStart' | 'exportReady', data?: any): any;
     fireEvent(eventType: 'processStart' | 'processEnd', data: ActionStatus): any;
     fireEvent(eventType: 'error', data: Error): any;
     private baseEndpoint;
@@ -367,7 +367,7 @@ export declare class EqContext {
      */
     fetchDrillDownData(options: ContextFetchDataOptions): void;
     /**
-     * Fetches the data for defined by this context and exports them to the specified format.
+     * Fetches the data for the query defined in this context and exports them to the specified format.
      * @param options
      * The content of the `options` parameter depends on `EqExporter` implementation.
      * Usually it contains `format` property which defines the format of the exported data (e.g. `csv`),
@@ -379,12 +379,26 @@ export declare class EqContext {
      *
      */
     exportResult(options?: ContextExportResultOptions): void;
+    /**
+     * Initiates the data export process for the query defined in this context.
+     * @param options
+     * The content of the `options` parameter depends on `EqExporter` implementation.
+     * Usually it contains `format` property which defines the format of the exported data (e.g. `csv`),
+     * and `success` and `error` callbacks
+     * @example
+     * context.exportStart({
+     *      format: csv
+     * });
+     *
+     */
+    exportStart(options?: ContextExportResultOptions): void;
+    protected startExportStatusCheck(exportId: string): void;
     private limitCustomSqlColumns;
     getAttributeTitle(attr: EntityAttr): string;
     getColumnTitle(attr: EntityAttr): string;
     getDefaultColumnCaption(column: QueryColumn): string;
 }
-type EqEndpointKey = 'GetModel' | 'GetQuery' | 'SaveQuery' | 'NewQuery' | 'RemoveQuery' | 'GetQueryList' | 'SyncQuery' | 'FetchData' | 'GetValueList' | 'ExportResult' | 'GetQueryFile' | 'UploadQueryFile';
+type EqEndpointKey = 'GetModel' | 'GetQuery' | 'SaveQuery' | 'NewQuery' | 'RemoveQuery' | 'GetQueryList' | 'SyncQuery' | 'FetchData' | 'GetValueList' | 'ExportTotal' | 'ExportStart' | 'ExportStatus' | 'ExportGetResult' | 'GetQueryFile' | 'UploadQueryFile';
 export interface EqBackendInfo {
     type?: string;
     subType?: string;

package/dist/types/query/query.d.ts

@@ -238,6 +238,7 @@ export declare class Query implements AggregationColumnStore {
      * @param name New name.
      */
     setName(name: string): void;
+    validateName(name: string): string;
     /**
      * Gets description of the query.
      * @retruns The description.
@@ -336,6 +337,7 @@ export declare class Query implements AggregationColumnStore {
     addConditionGroup(descriptor: ConditionGroupDescriptor, addChildCondition?: boolean): Condition;
     addExtraConditionGroup(descriptor: ConditionGroupDescriptor, addChildCondition?: boolean): Condition;
     createCondition(tag?: CondTag): Condition;
+    private safeStringify;
     /**
      *  Adds a new simple condition (a predicate)
      * @param descriptor The descriptor which defines different parameters of the new condition

package/dist/types/types/eq_editor_tag.d.ts

@@ -1,17 +1,3 @@
 /** Represents editor tags*/
-export declare const EqEditorTag: {
-    /** SqlList tag value */
-    SqlList: string;
-    /** SubQuery tag value */
-    SubQuery: string;
-    /** Bind to parent column tag value */
-    BindToParentColumn: string;
-    Unknown: string;
-    Edit: string;
-    /** SqlList tag value */
-    DateTime: string;
-    List: string;
-    CustomList: string;
-    File: string;
-};
+export declare const EqEditorTag: any;
 export type EqEditorTag = (typeof EqEditorTag)[keyof typeof EqEditorTag];

package/dist/types/utils/utils.d.ts

@@ -31,4 +31,5 @@ export declare namespace equtils {
      * @param toDataType - the data type we want to get
      */
     function convertValue(value: string, fromDataType: DataType, toDataType: DataType): string;
+    function downloadFile(data: any, filename: string): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@easyquery/core",
-    "version": "7.4.1-rc03",
+    "version": "7.4.1-rc04",
     "description": "EasyQuery.JS Community core modules",
     "types": "./dist/types/public_api.d.ts",
     "main": "./dist/easyquery.core.cjs.js",