@easyquery/core 7.3.4 → 7.3.5-rc01

package/dist/easyquery.core.cjs.js

@@ -1,10 +1,10 @@
 
 /*
- * EasyQuery.JS Core v7.3.4
+ * EasyQuery.JS Core v7.3.5-rc01
  * Copyright 2024 Korzh.com
  * Licensed under MIT
  *
- * Build time: 17.11.2024 18:54:26
+ * Build time: 17.12.2024 17:27:59
  */
 
 'use strict';
@@ -3614,7 +3614,7 @@ class BrowserQueryStorage {
     }
     newQuery(options) {
         return new Promise((resolve, reject) => {
-            const query = new Query(this.context.getModel(), null, { context: this.context });
+            const query = this.context.createQuery();
             query.reset();
             query.setDefaultName();
             if (options) {
@@ -3853,7 +3853,7 @@ class EqQueryFileLoader {
             const blob = new Blob([responseData]);
             const dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
             let fileName = dispositionHeader
-                ? dispositionHeader.match(/filename="(.*)"/)[1]
+                ? dispositionHeader.match(/filename="?([^"]*)"?$/)[1]
                 : 'query.json';
             if (options.fileName) {
                 fileName = options.fileName
@@ -4002,13 +4002,6 @@ class EqServiceProvider {
         return EqServiceProvider._instance;
     }
     constructor() {
-        this.modelLoader = null;
-        this.queryStorage = null;
-        this.querySynchronizer = null;
-        this.dataFetcher = null;
-        this.valueListResolver = null;
-        this.queryFileLoader = null;
-        this.aggrCalculator = null;
         this.services = {};
         this.httpClient = new core.HttpClient();
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.3.0';
@@ -4018,16 +4011,12 @@ class EqServiceProvider {
         this.modelLoaderResolver = (context) => new EqServerModelLoader(context);
         this.queryStorageResolver = (context) => new BrowserQueryStorage(context);
         this.querySynchronizerResolver = (context) => new EqServerQuerySynchronizer(context);
-        this.vlrResolver = (context) => new EqServerValueListResolver(context);
+        this.vllResolver = (context) => new EqServerValueListResolver(context);
         this.dataFetcherResolver = (context) => new EqServerDataFetcher(context);
         this.queryFileLoaderResolver = (context) => new EqQueryFileLoader(context);
         this.aggrCalculatoResolver = (context) => new DefaultAggregatesCalculator(context);
     }
     reset() {
-        this.modelStorage = null;
-        this.modelLoader = null;
-        this.queryStorage = null;
-        this.querySynchronizer = null;
     }
     getHttpClient() {
         return this.httpClient;
@@ -4044,108 +4033,90 @@ class EqServiceProvider {
         }
         return this.queryResolver(context);
     }
-    getModelLoader(context) {
-        if (!this.modelLoader) {
-            if (!this.modelLoaderResolver) {
-                throw 'ModelLoaderResolver is not defined';
-            }
-            this.modelLoader = this.modelLoaderResolver(context);
-        }
-        return this.modelLoader;
-    }
-    getModelStorage(context) {
-        if (!this.modelStorage) {
-            if (!this.modelStorageResolver) {
-                throw 'ModelStorageResolver is not defined';
-            }
-            this.modelStorage = this.modelStorageResolver(context);
-        }
-        return this.modelStorage;
-    }
-    getQueryStorage(context) {
-        if (!this.queryStorage) {
-            if (!this.queryStorageResolver) {
-                throw 'QueryStorageResolver is not defined';
-            }
-            this.queryStorage = this.queryStorageResolver(context);
-        }
-        return this.queryStorage;
-    }
-    getQuerySynchronizer(context) {
-        if (!this.querySynchronizer) {
-            if (!this.querySynchronizerResolver) {
-                throw 'QuerySynchronizerResolver is not defined';
-            }
-            this.querySynchronizer = this.querySynchronizerResolver(context);
-        }
-        return this.querySynchronizer;
-    }
-    getDataFetcher(context) {
-        if (!this.dataFetcher) {
-            if (!this.dataFetcherResolver) {
-                throw 'DataFetcherResolver is not defined';
-            }
-            this.dataFetcher = this.dataFetcherResolver(context);
-        }
-        return this.dataFetcher;
-    }
-    getValueListResolver(context) {
-        if (!this.valueListResolver) {
-            if (!this.vlrResolver) {
-                throw 'Resolver for ValueListResolver is not defined';
-            }
-            this.valueListResolver = this.vlrResolver(context);
-        }
-        return this.valueListResolver;
-    }
-    getQueryFileLoader(context) {
-        if (!this.queryFileLoader) {
-            if (!this.queryFileLoaderResolver) {
-                throw 'Resolver for QueryFileLoader is not defined';
-            }
-            this.queryFileLoader = this.queryFileLoaderResolver(context);
-        }
-        return this.queryFileLoader;
-    }
-    getAggregatesCalculator(context) {
-        if (!this.aggrCalculator) {
-            if (!this.aggrCalculatoResolver) {
-                throw 'Resolver for AggregatesCalculator is not defined';
-            }
-            this.aggrCalculator = this.aggrCalculatoResolver(context);
-        }
-        return this.aggrCalculator;
-    }
     registerDataModelResolver(resolver) {
         this.modelResolver = resolver;
     }
+    getDataModelResolver() {
+        return this.modelResolver;
+    }
     registerQueryResolver(resolver) {
         this.queryResolver = resolver;
     }
+    getQueryResolver() {
+        return this.queryResolver;
+    }
     registerModelLoaderResolver(resolver) {
         this.modelLoaderResolver = resolver;
     }
+    getModelLoaderResolver() {
+        if (!this.modelLoaderResolver) {
+            throw 'ModelLoaderResolver is not defined';
+        }
+        return this.modelLoaderResolver;
+    }
     registerModelStorageResolver(resolver) {
         this.modelStorageResolver = resolver;
     }
+    getModelStorageResolver() {
+        if (!this.modelStorageResolver) {
+            throw 'ModelStorageResolver is not defined';
+        }
+        return this.modelStorageResolver;
+    }
     registerQueryStorageResolver(resolver) {
         this.queryStorageResolver = resolver;
     }
+    getQueryStorageResolver() {
+        if (!this.queryStorageResolver) {
+            throw 'QueryStorageResolver is not defined';
+        }
+        return this.queryStorageResolver;
+    }
     registerDataFetcherResolver(resolver) {
         this.dataFetcherResolver = resolver;
     }
+    getDataFetcherResolver() {
+        if (!this.dataFetcherResolver) {
+            throw 'DataFetcherResolver is not defined';
+        }
+        return this.dataFetcherResolver;
+    }
     registerQuerySyncronizerResolver(resolver) {
         this.querySynchronizerResolver = resolver;
     }
-    registerValueListResolver(resolver) {
-        this.vlrResolver = resolver;
+    getQuerySynchronizerResolver() {
+        if (!this.querySynchronizerResolver) {
+            throw 'QuerySynchronizerResolver is not defined';
+        }
+        return this.querySynchronizerResolver;
+    }
+    registerValueListLoaderResolver(resolver) {
+        this.vllResolver = resolver;
+    }
+    getValueListLoaderResolver() {
+        if (!this.vllResolver) {
+            throw 'Resolver for ValueListLoader is not defined';
+        }
+        return this.vllResolver;
     }
     registerQueryFileLoaderResolver(resolver) {
         this.queryFileLoaderResolver = resolver;
     }
+    getQueryFileLoaderResolver() {
+        if (!this.queryFileLoaderResolver) {
+            throw 'Resolver for QueryFileLoader is not defined';
+        }
+        return this.queryFileLoaderResolver;
+    }
     registerAggregatesCalculator(resolver) {
         this.aggrCalculatoResolver = resolver;
     }
+    getAggregatesCalculatorResolver() {
+        if (!this.aggrCalculatoResolver) {
+            throw 'Resolver for AggregatesCalculator is not defined';
+        }
+        return this.aggrCalculatoResolver;
+    }
     registerService(serviceId, serviceResolver) {
         this.services[serviceId] = serviceResolver;
     }
@@ -4220,7 +4191,7 @@ class EqServerExporter {
             const blob = new Blob([responseData]);
             const dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
             const filename = dispositionHeader
-                ? dispositionHeader.match(/filename="(.*)"/)[1]
+                ? dispositionHeader.match(/filename="?([^"]*)"?$/)[1]
                 : 'export-data.' + format;
             if (window.navigator['msSaveOrOpenBlob']) {
                 // Internet Explorer
@@ -4323,6 +4294,13 @@ class EqContext {
             columnTitleFormat: null //means it will be the same as attributeFormat
         };
         this.servicesInitialized = false;
+        this.modelLoader = null;
+        this.queryStorage = null;
+        this.querySynchronizer = null;
+        this.dataFetcher = null;
+        this.valueListLoader = null;
+        this.queryFileLoader = null;
+        this.aggrCalculator = null;
         this.internalListCache = {};
         this.loadModelOnStart = true;
         this.loadQueryOnStart = false;
@@ -4430,6 +4408,62 @@ class EqContext {
     getServices() {
         return this.eqServices;
     }
+    getModelLoader() {
+        if (!this.modelLoader) {
+            const modelLoaderResolver = this.eqServices.getModelLoaderResolver();
+            this.modelLoader = modelLoaderResolver(this);
+        }
+        return this.modelLoader;
+    }
+    getModelStorage() {
+        if (!this.modelStorage) {
+            const modelStorageResolver = this.eqServices.getModelStorageResolver();
+            this.modelStorage = modelStorageResolver(this);
+        }
+        return this.modelStorage;
+    }
+    getQueryStorage() {
+        if (!this.queryStorage) {
+            const queryStorageResolver = this.eqServices.getQueryStorageResolver();
+            this.queryStorage = queryStorageResolver(this);
+        }
+        return this.queryStorage;
+    }
+    getQuerySynchronizer() {
+        if (!this.querySynchronizer) {
+            const querySynchronizerResolver = this.eqServices.getQuerySynchronizerResolver();
+            this.querySynchronizer = querySynchronizerResolver(this);
+        }
+        return this.querySynchronizer;
+    }
+    getDataFetcher() {
+        if (!this.dataFetcher) {
+            const dataFetcherResolver = this.eqServices.getDataFetcherResolver();
+            this.dataFetcher = dataFetcherResolver(this);
+        }
+        return this.dataFetcher;
+    }
+    getValueListLoader() {
+        if (!this.valueListLoader) {
+            const vllResolver = this.eqServices.getValueListLoaderResolver();
+            this.valueListLoader = vllResolver(this);
+        }
+        return this.valueListLoader;
+    }
+    getQueryFileLoader() {
+        if (!this.queryFileLoader) {
+            const queryFileLoaderResolver = this.eqServices.getQueryFileLoaderResolver();
+            this.queryFileLoader = queryFileLoaderResolver(this);
+        }
+        return this.queryFileLoader;
+    }
+    getAggregatesCalculator() {
+        if (!this.aggrCalculator) {
+            const aggrCalculatorResolver = this.eqServices.getAggregatesCalculatorResolver();
+            this.aggrCalculator = aggrCalculatorResolver(this);
+        }
+        return this.aggrCalculator;
+    }
     /**
     * Activates `Enterprise` functionality of the library. Works only with @easyquery/enterprise packag and a proper license key.
     * @param keyOrInitCallback The license key or a callback wich is called after
@@ -4618,9 +4652,9 @@ class EqContext {
         this.initialQuery = options.initialQuery;
         this.defaultQueryId = options.defaultQueryId || '';
         this.defaultModelId = options.defaultModelId || '__default';
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         modelLoader.init(options);
-        const queryStorage = this.eqServices.getQueryStorage(this);
+        const queryStorage = this.getQueryStorage();
         queryStorage.init(options);
         if (options.useDefaultExporters !== false) {
             this.addDefaultExporters();
@@ -4980,7 +5014,7 @@ class EqContext {
             action: exports.EqAction.GetValueList,
             text: 'Loading values'
         }, exports.WidgetGroup.Result);
-        const valueListResolver = this.eqServices.getValueListResolver(this);
+        const valueListResolver = this.getValueListLoader();
         valueListResolver.loadValueList(options)
             .then((values) => {
             this.endProcess({
@@ -5027,7 +5061,7 @@ class EqContext {
             action: exports.EqAction.LoadModel,
             text: 'Loading model: ' + modelId
         }, exports.WidgetGroup.Model);
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         return modelLoader.startModelLoading(options)
             .then((value) => {
             if (value) {
@@ -5070,7 +5104,7 @@ class EqContext {
         });
     }
     callWhenModelLoaded(callFunc) {
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         modelLoader.getModelPromise().then(() => {
             callFunc();
         });
@@ -5087,7 +5121,7 @@ class EqContext {
      */
     loadQuery(options) {
         options = options || {};
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         this.clearResult();
         modelLoader.getModelPromise()
             .then(() => {
@@ -5101,7 +5135,7 @@ class EqContext {
                 action: exports.EqAction.LoadQuery,
                 text: "Query loading: " + queryId
             }, exports.WidgetGroup.Query);
-            const queryStorage = this.eqServices.getQueryStorage(this);
+            const queryStorage = this.getQueryStorage();
             queryStorage.loadQuery(options)
                 .then((data) => {
                 if (data) {
@@ -5153,7 +5187,7 @@ class EqContext {
      * Usually it contains `success`, `error` callbacks
      */
     loadQueryList(options) {
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         modelLoader.getModelPromise()
             .then(() => {
             this.startQueryListLoading(options);
@@ -5169,7 +5203,7 @@ class EqContext {
     }
     startQueryListLoading(options) {
         options = options || {};
-        const queryStorage = this.eqServices.getQueryStorage(this);
+        const queryStorage = this.getQueryStorage();
         const queryListLoadingPromise = queryStorage.getQueryList(options);
         queryListLoadingPromise
             .then((queries) => {
@@ -5234,7 +5268,7 @@ class EqContext {
                 action: exports.EqAction.NewQuery,
                 text: 'New query creation...'
             }, exports.WidgetGroup.Query);
-            const queryStorage = this.eqServices.getQueryStorage(this);
+            const queryStorage = this.getQueryStorage();
             queryStorage.newQuery(options)
                 .then((queryData) => {
                 if (queryData) {
@@ -5281,7 +5315,7 @@ class EqContext {
             action: exports.EqAction.SaveQuery,
             text: 'Query saving: ' + query.getId()
         }, exports.WidgetGroup.Query);
-        const queryStorage = this.eqServices.getQueryStorage(this);
+        const queryStorage = this.getQueryStorage();
         queryStorage.saveQuery(options)
             .then((data) => {
             this.endProcess({
@@ -5324,7 +5358,7 @@ class EqContext {
             action: exports.EqAction.RemoveQuery,
             text: 'Query deleting: ' + query.getId()
         }, exports.WidgetGroup.Query);
-        const queryStorage = this.eqServices.getQueryStorage(this);
+        const queryStorage = this.getQueryStorage();
         queryStorage.removeQuery(options)
             .then(() => {
             query.reset();
@@ -5366,7 +5400,7 @@ class EqContext {
             action: exports.EqAction.SyncQuery,
             text: 'Query syncing: ' + query.getId()
         }, exports.WidgetGroup.Query);
-        const querySyncrhonizer = this.eqServices.getQuerySynchronizer(this);
+        const querySyncrhonizer = this.getQuerySynchronizer();
         querySyncrhonizer.syncQuery(options)
             .then((result) => {
             this.resultStatement = result && result.statement
@@ -5451,7 +5485,7 @@ class EqContext {
                     this.resultStatement = result.statement;
                     this.refreshWidgets(exports.WidgetGroup.Statement);
                 }
-                const aggrCalculator = this.getServices().getAggregatesCalculator(this);
+                const aggrCalculator = this.getAggregatesCalculator();
                 aggrCalculator.reset();
                 this.resultContent = result;
                 if (result.resultSet) {
@@ -5489,7 +5523,7 @@ class EqContext {
             action: exports.EqAction.GetQueryFile,
             text: 'Getting query file: ' + query.getId()
         }, exports.WidgetGroup.Query);
-        const queryFileLoader = this.getServices().getQueryFileLoader(this);
+        const queryFileLoader = this.getQueryFileLoader();
         queryFileLoader.getQueryFile(options)
             .then(() => {
             this.endProcess({
@@ -5520,7 +5554,7 @@ class EqContext {
             action: exports.EqAction.UploadQueryFile,
             text: 'Uploading query file: ' + query.getId()
         }, exports.WidgetGroup.Query);
-        const queryFileLoader = this.getServices().getQueryFileLoader(this);
+        const queryFileLoader = this.getQueryFileLoader();
         queryFileLoader.uploadQueryFile(options)
             .then((data) => {
             query.loadFromData(data);
@@ -5551,6 +5585,7 @@ class EqContext {
     fetchDataChunk(options) {
         const queryId = this.getQuery().getId();
         let fetchOptions = options || {};
+        fetchOptions.data = fetchOptions.data || {}; // add empty data property for convenience
         if (this.useStoredQueryOnFetch) {
             fetchOptions.queryId = this.query.getId();
         }
@@ -5561,7 +5596,7 @@ class EqContext {
             action: exports.EqAction.FetchData,
             text: 'Fetching data for the query: ' + queryId
         }, exports.WidgetGroup.Result);
-        const dataFetcher = this.eqServices.getDataFetcher(this);
+        const dataFetcher = this.getDataFetcher();
         dataFetcher.fetchData(fetchOptions)
             .then((result) => {
             if (result.statement) {
@@ -5596,7 +5631,7 @@ class EqContext {
     }
     onResultTableUpdate() {
         const aggrSettings = this.query.getAggregationSettings();
-        const calculator = this.getServices().getAggregatesCalculator(this);
+        const calculator = this.getAggregatesCalculator();
         if (aggrSettings.needAggrCalculation() && calculator.needRecalculation()) {
             calculator.calculate({
                 maxLevel: aggrSettings.getGroups().length + 1,
@@ -5634,7 +5669,7 @@ class EqContext {
             action: exports.EqAction.FetchData,
             text: 'DrillDown executing: ' + queryId
         }, exports.WidgetGroup.Result);
-        const queryExecutor = this.eqServices.getDataFetcher(this);
+        const queryExecutor = this.getDataFetcher();
         queryExecutor.fetchData(options)
             .then((result) => {
             this.endProcess({
@@ -5677,31 +5712,32 @@ class EqContext {
      *
      */
     exportResult(options) {
-        options = options || {};
-        options.chunk = options.chunk || EmptyChunk;
+        let exportOptions = options || {};
+        exportOptions.chunk = exportOptions.chunk || EmptyChunk;
+        exportOptions.data = exportOptions.data || {}; //add data property for convenience
         if (this.beforeExportResult) {
-            this.beforeExportResult(this, options);
+            this.beforeExportResult(this, exportOptions);
         }
-        const format = options.format;
+        const format = exportOptions.format;
         if (format) {
             const exporter = this.getExporter(format);
             if (exporter) {
                 const queryId = this.getQuery().getId();
                 if (this.useStoredQueryOnFetch) {
-                    options.queryId = queryId;
+                    exportOptions.queryId = queryId;
                 }
                 this.startProcess({
                     action: exports.EqAction.ExportResult,
                     text: 'Exporting result for query: ' + queryId
                 }, exports.WidgetGroup.Result);
                 const localeSettings = core.i18n.getLocaleSettings();
-                options.settings = localeSettings;
+                exportOptions.settings = localeSettings;
                 const aggrSettings = this.query.getAggregationSettings();
                 if (aggrSettings.hasAggregates()
                     && (aggrSettings.hasGrandTotals() || aggrSettings.hasGroups())) {
-                    options.aggregates = aggrSettings.saveToData();
+                    exportOptions.aggregates = aggrSettings.saveToData();
                 }
-                exporter.export(options)
+                exporter.export(exportOptions)
                     .then((result) => {
                     this.fireEvent('exportResult');
                     this.endProcess({
@@ -5709,8 +5745,8 @@ class EqContext {
                         action: exports.EqAction.ExportResult,
                         text: `The result set for query [${queryId}] has been successfully exported`
                     }, exports.WidgetGroup.Result);
-                    if (options.success) {
-                        options.success();
+                    if (exportOptions.success) {
+                        exportOptions.success();
                     }
                 })
                     .catch((error) => {
@@ -5721,8 +5757,8 @@ class EqContext {
                         text: errorMessage,
                         sourceError: error
                     }, exports.WidgetGroup.Result);
-                    if (options.error) {
-                        options.error(errorMessage, 'ExportResult');
+                    if (exportOptions.error) {
+                        exportOptions.error(errorMessage, 'ExportResult');
                     }
                 });
             }

package/dist/easyquery.core.esm.js

@@ -1,13 +1,13 @@
 
 /*
- * EasyQuery.JS Core v7.3.4
+ * EasyQuery.JS Core v7.3.5-rc01
  * Copyright 2024 Korzh.com
  * Licensed under MIT
  *
- * Build time: 17.11.2024 18:54:26
+ * Build time: 17.12.2024 17:27:59
  */
 
-import { i18n, DataType, utils, ValueEditor, MetaEntityAttr, MetaEntity, EditorTag, MetaData, EventEmitter, AggregationSettings, HttpClient, EasyDataTable } from '@easydata/core';
+import { i18n, DataType, utils, ValueEditor, MetaEntity, MetaEntityAttr, EditorTag, MetaData, EventEmitter, AggregationSettings, HttpClient, EasyDataTable } from '@easydata/core';
 export { i18n } from '@easydata/core';
 
 /**
@@ -3613,7 +3613,7 @@ class BrowserQueryStorage {
     }
     newQuery(options) {
         return new Promise((resolve, reject) => {
-            const query = new Query(this.context.getModel(), null, { context: this.context });
+            const query = this.context.createQuery();
             query.reset();
             query.setDefaultName();
             if (options) {
@@ -3852,7 +3852,7 @@ class EqQueryFileLoader {
             const blob = new Blob([responseData]);
             const dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
             let fileName = dispositionHeader
-                ? dispositionHeader.match(/filename="(.*)"/)[1]
+                ? dispositionHeader.match(/filename="?([^"]*)"?$/)[1]
                 : 'query.json';
             if (options.fileName) {
                 fileName = options.fileName
@@ -4001,13 +4001,6 @@ class EqServiceProvider {
         return EqServiceProvider._instance;
     }
     constructor() {
-        this.modelLoader = null;
-        this.queryStorage = null;
-        this.querySynchronizer = null;
-        this.dataFetcher = null;
-        this.valueListResolver = null;
-        this.queryFileLoader = null;
-        this.aggrCalculator = null;
         this.services = {};
         this.httpClient = new HttpClient();
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.3.0';
@@ -4017,16 +4010,12 @@ class EqServiceProvider {
         this.modelLoaderResolver = (context) => new EqServerModelLoader(context);
         this.queryStorageResolver = (context) => new BrowserQueryStorage(context);
         this.querySynchronizerResolver = (context) => new EqServerQuerySynchronizer(context);
-        this.vlrResolver = (context) => new EqServerValueListResolver(context);
+        this.vllResolver = (context) => new EqServerValueListResolver(context);
         this.dataFetcherResolver = (context) => new EqServerDataFetcher(context);
         this.queryFileLoaderResolver = (context) => new EqQueryFileLoader(context);
         this.aggrCalculatoResolver = (context) => new DefaultAggregatesCalculator(context);
     }
     reset() {
-        this.modelStorage = null;
-        this.modelLoader = null;
-        this.queryStorage = null;
-        this.querySynchronizer = null;
     }
     getHttpClient() {
         return this.httpClient;
@@ -4043,108 +4032,90 @@ class EqServiceProvider {
         }
         return this.queryResolver(context);
     }
-    getModelLoader(context) {
-        if (!this.modelLoader) {
-            if (!this.modelLoaderResolver) {
-                throw 'ModelLoaderResolver is not defined';
-            }
-            this.modelLoader = this.modelLoaderResolver(context);
-        }
-        return this.modelLoader;
-    }
-    getModelStorage(context) {
-        if (!this.modelStorage) {
-            if (!this.modelStorageResolver) {
-                throw 'ModelStorageResolver is not defined';
-            }
-            this.modelStorage = this.modelStorageResolver(context);
-        }
-        return this.modelStorage;
-    }
-    getQueryStorage(context) {
-        if (!this.queryStorage) {
-            if (!this.queryStorageResolver) {
-                throw 'QueryStorageResolver is not defined';
-            }
-            this.queryStorage = this.queryStorageResolver(context);
-        }
-        return this.queryStorage;
-    }
-    getQuerySynchronizer(context) {
-        if (!this.querySynchronizer) {
-            if (!this.querySynchronizerResolver) {
-                throw 'QuerySynchronizerResolver is not defined';
-            }
-            this.querySynchronizer = this.querySynchronizerResolver(context);
-        }
-        return this.querySynchronizer;
-    }
-    getDataFetcher(context) {
-        if (!this.dataFetcher) {
-            if (!this.dataFetcherResolver) {
-                throw 'DataFetcherResolver is not defined';
-            }
-            this.dataFetcher = this.dataFetcherResolver(context);
-        }
-        return this.dataFetcher;
-    }
-    getValueListResolver(context) {
-        if (!this.valueListResolver) {
-            if (!this.vlrResolver) {
-                throw 'Resolver for ValueListResolver is not defined';
-            }
-            this.valueListResolver = this.vlrResolver(context);
-        }
-        return this.valueListResolver;
-    }
-    getQueryFileLoader(context) {
-        if (!this.queryFileLoader) {
-            if (!this.queryFileLoaderResolver) {
-                throw 'Resolver for QueryFileLoader is not defined';
-            }
-            this.queryFileLoader = this.queryFileLoaderResolver(context);
-        }
-        return this.queryFileLoader;
-    }
-    getAggregatesCalculator(context) {
-        if (!this.aggrCalculator) {
-            if (!this.aggrCalculatoResolver) {
-                throw 'Resolver for AggregatesCalculator is not defined';
-            }
-            this.aggrCalculator = this.aggrCalculatoResolver(context);
-        }
-        return this.aggrCalculator;
-    }
     registerDataModelResolver(resolver) {
         this.modelResolver = resolver;
     }
+    getDataModelResolver() {
+        return this.modelResolver;
+    }
     registerQueryResolver(resolver) {
         this.queryResolver = resolver;
     }
+    getQueryResolver() {
+        return this.queryResolver;
+    }
     registerModelLoaderResolver(resolver) {
         this.modelLoaderResolver = resolver;
     }
+    getModelLoaderResolver() {
+        if (!this.modelLoaderResolver) {
+            throw 'ModelLoaderResolver is not defined';
+        }
+        return this.modelLoaderResolver;
+    }
     registerModelStorageResolver(resolver) {
         this.modelStorageResolver = resolver;
     }
+    getModelStorageResolver() {
+        if (!this.modelStorageResolver) {
+            throw 'ModelStorageResolver is not defined';
+        }
+        return this.modelStorageResolver;
+    }
     registerQueryStorageResolver(resolver) {
         this.queryStorageResolver = resolver;
     }
+    getQueryStorageResolver() {
+        if (!this.queryStorageResolver) {
+            throw 'QueryStorageResolver is not defined';
+        }
+        return this.queryStorageResolver;
+    }
     registerDataFetcherResolver(resolver) {
         this.dataFetcherResolver = resolver;
     }
+    getDataFetcherResolver() {
+        if (!this.dataFetcherResolver) {
+            throw 'DataFetcherResolver is not defined';
+        }
+        return this.dataFetcherResolver;
+    }
     registerQuerySyncronizerResolver(resolver) {
         this.querySynchronizerResolver = resolver;
     }
-    registerValueListResolver(resolver) {
-        this.vlrResolver = resolver;
+    getQuerySynchronizerResolver() {
+        if (!this.querySynchronizerResolver) {
+            throw 'QuerySynchronizerResolver is not defined';
+        }
+        return this.querySynchronizerResolver;
+    }
+    registerValueListLoaderResolver(resolver) {
+        this.vllResolver = resolver;
+    }
+    getValueListLoaderResolver() {
+        if (!this.vllResolver) {
+            throw 'Resolver for ValueListLoader is not defined';
+        }
+        return this.vllResolver;
     }
     registerQueryFileLoaderResolver(resolver) {
         this.queryFileLoaderResolver = resolver;
     }
+    getQueryFileLoaderResolver() {
+        if (!this.queryFileLoaderResolver) {
+            throw 'Resolver for QueryFileLoader is not defined';
+        }
+        return this.queryFileLoaderResolver;
+    }
     registerAggregatesCalculator(resolver) {
         this.aggrCalculatoResolver = resolver;
     }
+    getAggregatesCalculatorResolver() {
+        if (!this.aggrCalculatoResolver) {
+            throw 'Resolver for AggregatesCalculator is not defined';
+        }
+        return this.aggrCalculatoResolver;
+    }
     registerService(serviceId, serviceResolver) {
         this.services[serviceId] = serviceResolver;
     }
@@ -4219,7 +4190,7 @@ class EqServerExporter {
             const blob = new Blob([responseData]);
             const dispositionHeader = request.getXMLHttpRequest().getResponseHeader("Content-Disposition");
             const filename = dispositionHeader
-                ? dispositionHeader.match(/filename="(.*)"/)[1]
+                ? dispositionHeader.match(/filename="?([^"]*)"?$/)[1]
                 : 'export-data.' + format;
             if (window.navigator['msSaveOrOpenBlob']) {
                 // Internet Explorer
@@ -4322,6 +4293,13 @@ class EqContext {
             columnTitleFormat: null //means it will be the same as attributeFormat
         };
         this.servicesInitialized = false;
+        this.modelLoader = null;
+        this.queryStorage = null;
+        this.querySynchronizer = null;
+        this.dataFetcher = null;
+        this.valueListLoader = null;
+        this.queryFileLoader = null;
+        this.aggrCalculator = null;
         this.internalListCache = {};
         this.loadModelOnStart = true;
         this.loadQueryOnStart = false;
@@ -4429,6 +4407,62 @@ class EqContext {
     getServices() {
         return this.eqServices;
     }
+    getModelLoader() {
+        if (!this.modelLoader) {
+            const modelLoaderResolver = this.eqServices.getModelLoaderResolver();
+            this.modelLoader = modelLoaderResolver(this);
+        }
+        return this.modelLoader;
+    }
+    getModelStorage() {
+        if (!this.modelStorage) {
+            const modelStorageResolver = this.eqServices.getModelStorageResolver();
+            this.modelStorage = modelStorageResolver(this);
+        }
+        return this.modelStorage;
+    }
+    getQueryStorage() {
+        if (!this.queryStorage) {
+            const queryStorageResolver = this.eqServices.getQueryStorageResolver();
+            this.queryStorage = queryStorageResolver(this);
+        }
+        return this.queryStorage;
+    }
+    getQuerySynchronizer() {
+        if (!this.querySynchronizer) {
+            const querySynchronizerResolver = this.eqServices.getQuerySynchronizerResolver();
+            this.querySynchronizer = querySynchronizerResolver(this);
+        }
+        return this.querySynchronizer;
+    }
+    getDataFetcher() {
+        if (!this.dataFetcher) {
+            const dataFetcherResolver = this.eqServices.getDataFetcherResolver();
+            this.dataFetcher = dataFetcherResolver(this);
+        }
+        return this.dataFetcher;
+    }
+    getValueListLoader() {
+        if (!this.valueListLoader) {
+            const vllResolver = this.eqServices.getValueListLoaderResolver();
+            this.valueListLoader = vllResolver(this);
+        }
+        return this.valueListLoader;
+    }
+    getQueryFileLoader() {
+        if (!this.queryFileLoader) {
+            const queryFileLoaderResolver = this.eqServices.getQueryFileLoaderResolver();
+            this.queryFileLoader = queryFileLoaderResolver(this);
+        }
+        return this.queryFileLoader;
+    }
+    getAggregatesCalculator() {
+        if (!this.aggrCalculator) {
+            const aggrCalculatorResolver = this.eqServices.getAggregatesCalculatorResolver();
+            this.aggrCalculator = aggrCalculatorResolver(this);
+        }
+        return this.aggrCalculator;
+    }
     /**
     * Activates `Enterprise` functionality of the library. Works only with @easyquery/enterprise packag and a proper license key.
     * @param keyOrInitCallback The license key or a callback wich is called after
@@ -4617,9 +4651,9 @@ class EqContext {
         this.initialQuery = options.initialQuery;
         this.defaultQueryId = options.defaultQueryId || '';
         this.defaultModelId = options.defaultModelId || '__default';
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         modelLoader.init(options);
-        const queryStorage = this.eqServices.getQueryStorage(this);
+        const queryStorage = this.getQueryStorage();
         queryStorage.init(options);
         if (options.useDefaultExporters !== false) {
             this.addDefaultExporters();
@@ -4979,7 +5013,7 @@ class EqContext {
             action: EqAction.GetValueList,
             text: 'Loading values'
         }, WidgetGroup.Result);
-        const valueListResolver = this.eqServices.getValueListResolver(this);
+        const valueListResolver = this.getValueListLoader();
         valueListResolver.loadValueList(options)
             .then((values) => {
             this.endProcess({
@@ -5026,7 +5060,7 @@ class EqContext {
             action: EqAction.LoadModel,
             text: 'Loading model: ' + modelId
         }, WidgetGroup.Model);
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         return modelLoader.startModelLoading(options)
             .then((value) => {
             if (value) {
@@ -5069,7 +5103,7 @@ class EqContext {
         });
     }
     callWhenModelLoaded(callFunc) {
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         modelLoader.getModelPromise().then(() => {
             callFunc();
         });
@@ -5086,7 +5120,7 @@ class EqContext {
      */
     loadQuery(options) {
         options = options || {};
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         this.clearResult();
         modelLoader.getModelPromise()
             .then(() => {
@@ -5100,7 +5134,7 @@ class EqContext {
                 action: EqAction.LoadQuery,
                 text: "Query loading: " + queryId
             }, WidgetGroup.Query);
-            const queryStorage = this.eqServices.getQueryStorage(this);
+            const queryStorage = this.getQueryStorage();
             queryStorage.loadQuery(options)
                 .then((data) => {
                 if (data) {
@@ -5152,7 +5186,7 @@ class EqContext {
      * Usually it contains `success`, `error` callbacks
      */
     loadQueryList(options) {
-        const modelLoader = this.eqServices.getModelLoader(this);
+        const modelLoader = this.getModelLoader();
         modelLoader.getModelPromise()
             .then(() => {
             this.startQueryListLoading(options);
@@ -5168,7 +5202,7 @@ class EqContext {
     }
     startQueryListLoading(options) {
         options = options || {};
-        const queryStorage = this.eqServices.getQueryStorage(this);
+        const queryStorage = this.getQueryStorage();
         const queryListLoadingPromise = queryStorage.getQueryList(options);
         queryListLoadingPromise
             .then((queries) => {
@@ -5233,7 +5267,7 @@ class EqContext {
                 action: EqAction.NewQuery,
                 text: 'New query creation...'
             }, WidgetGroup.Query);
-            const queryStorage = this.eqServices.getQueryStorage(this);
+            const queryStorage = this.getQueryStorage();
             queryStorage.newQuery(options)
                 .then((queryData) => {
                 if (queryData) {
@@ -5280,7 +5314,7 @@ class EqContext {
             action: EqAction.SaveQuery,
             text: 'Query saving: ' + query.getId()
         }, WidgetGroup.Query);
-        const queryStorage = this.eqServices.getQueryStorage(this);
+        const queryStorage = this.getQueryStorage();
         queryStorage.saveQuery(options)
             .then((data) => {
             this.endProcess({
@@ -5323,7 +5357,7 @@ class EqContext {
             action: EqAction.RemoveQuery,
             text: 'Query deleting: ' + query.getId()
         }, WidgetGroup.Query);
-        const queryStorage = this.eqServices.getQueryStorage(this);
+        const queryStorage = this.getQueryStorage();
         queryStorage.removeQuery(options)
             .then(() => {
             query.reset();
@@ -5365,7 +5399,7 @@ class EqContext {
             action: EqAction.SyncQuery,
             text: 'Query syncing: ' + query.getId()
         }, WidgetGroup.Query);
-        const querySyncrhonizer = this.eqServices.getQuerySynchronizer(this);
+        const querySyncrhonizer = this.getQuerySynchronizer();
         querySyncrhonizer.syncQuery(options)
             .then((result) => {
             this.resultStatement = result && result.statement
@@ -5450,7 +5484,7 @@ class EqContext {
                     this.resultStatement = result.statement;
                     this.refreshWidgets(WidgetGroup.Statement);
                 }
-                const aggrCalculator = this.getServices().getAggregatesCalculator(this);
+                const aggrCalculator = this.getAggregatesCalculator();
                 aggrCalculator.reset();
                 this.resultContent = result;
                 if (result.resultSet) {
@@ -5488,7 +5522,7 @@ class EqContext {
             action: EqAction.GetQueryFile,
             text: 'Getting query file: ' + query.getId()
         }, WidgetGroup.Query);
-        const queryFileLoader = this.getServices().getQueryFileLoader(this);
+        const queryFileLoader = this.getQueryFileLoader();
         queryFileLoader.getQueryFile(options)
             .then(() => {
             this.endProcess({
@@ -5519,7 +5553,7 @@ class EqContext {
             action: EqAction.UploadQueryFile,
             text: 'Uploading query file: ' + query.getId()
         }, WidgetGroup.Query);
-        const queryFileLoader = this.getServices().getQueryFileLoader(this);
+        const queryFileLoader = this.getQueryFileLoader();
         queryFileLoader.uploadQueryFile(options)
             .then((data) => {
             query.loadFromData(data);
@@ -5550,6 +5584,7 @@ class EqContext {
     fetchDataChunk(options) {
         const queryId = this.getQuery().getId();
         let fetchOptions = options || {};
+        fetchOptions.data = fetchOptions.data || {}; // add empty data property for convenience
         if (this.useStoredQueryOnFetch) {
             fetchOptions.queryId = this.query.getId();
         }
@@ -5560,7 +5595,7 @@ class EqContext {
             action: EqAction.FetchData,
             text: 'Fetching data for the query: ' + queryId
         }, WidgetGroup.Result);
-        const dataFetcher = this.eqServices.getDataFetcher(this);
+        const dataFetcher = this.getDataFetcher();
         dataFetcher.fetchData(fetchOptions)
             .then((result) => {
             if (result.statement) {
@@ -5595,7 +5630,7 @@ class EqContext {
     }
     onResultTableUpdate() {
         const aggrSettings = this.query.getAggregationSettings();
-        const calculator = this.getServices().getAggregatesCalculator(this);
+        const calculator = this.getAggregatesCalculator();
         if (aggrSettings.needAggrCalculation() && calculator.needRecalculation()) {
             calculator.calculate({
                 maxLevel: aggrSettings.getGroups().length + 1,
@@ -5633,7 +5668,7 @@ class EqContext {
             action: EqAction.FetchData,
             text: 'DrillDown executing: ' + queryId
         }, WidgetGroup.Result);
-        const queryExecutor = this.eqServices.getDataFetcher(this);
+        const queryExecutor = this.getDataFetcher();
         queryExecutor.fetchData(options)
             .then((result) => {
             this.endProcess({
@@ -5676,31 +5711,32 @@ class EqContext {
      *
      */
     exportResult(options) {
-        options = options || {};
-        options.chunk = options.chunk || EmptyChunk;
+        let exportOptions = options || {};
+        exportOptions.chunk = exportOptions.chunk || EmptyChunk;
+        exportOptions.data = exportOptions.data || {}; //add data property for convenience
         if (this.beforeExportResult) {
-            this.beforeExportResult(this, options);
+            this.beforeExportResult(this, exportOptions);
         }
-        const format = options.format;
+        const format = exportOptions.format;
         if (format) {
             const exporter = this.getExporter(format);
             if (exporter) {
                 const queryId = this.getQuery().getId();
                 if (this.useStoredQueryOnFetch) {
-                    options.queryId = queryId;
+                    exportOptions.queryId = queryId;
                 }
                 this.startProcess({
                     action: EqAction.ExportResult,
                     text: 'Exporting result for query: ' + queryId
                 }, WidgetGroup.Result);
                 const localeSettings = i18n.getLocaleSettings();
-                options.settings = localeSettings;
+                exportOptions.settings = localeSettings;
                 const aggrSettings = this.query.getAggregationSettings();
                 if (aggrSettings.hasAggregates()
                     && (aggrSettings.hasGrandTotals() || aggrSettings.hasGroups())) {
-                    options.aggregates = aggrSettings.saveToData();
+                    exportOptions.aggregates = aggrSettings.saveToData();
                 }
-                exporter.export(options)
+                exporter.export(exportOptions)
                     .then((result) => {
                     this.fireEvent('exportResult');
                     this.endProcess({
@@ -5708,8 +5744,8 @@ class EqContext {
                         action: EqAction.ExportResult,
                         text: `The result set for query [${queryId}] has been successfully exported`
                     }, WidgetGroup.Result);
-                    if (options.success) {
-                        options.success();
+                    if (exportOptions.success) {
+                        exportOptions.success();
                     }
                 })
                     .catch((error) => {
@@ -5720,8 +5756,8 @@ class EqContext {
                         text: errorMessage,
                         sourceError: error
                     }, WidgetGroup.Result);
-                    if (options.error) {
-                        options.error(errorMessage, 'ExportResult');
+                    if (exportOptions.error) {
+                        exportOptions.error(errorMessage, 'ExportResult');
                     }
                 });
             }

package/dist/types/common/eq_services.d.ts

@@ -7,7 +7,7 @@ import { DataModelStorage } from '../main/model_storage';
 import { QueryStorage } from '../main/query_storage';
 import { QuerySynchronizer } from '../main/query_synchronizer';
 import { DataFetcher } from '../main/data_fetcher';
-import { EqValueListResolver } from '../main/value_list_resolver';
+import { EqValueListLoader } from '../main/value_list_resolver';
 import { QueryFileLoader } from '../main/query_file_loader';
 export declare class EqServiceProvider {
     private static _instance;
@@ -15,20 +15,12 @@ export declare class EqServiceProvider {
     private httpClient;
     private queryResolver;
     private modelResolver;
-    private modelStorage;
-    private modelLoader;
-    private queryStorage;
-    private querySynchronizer;
-    private dataFetcher;
-    private valueListResolver;
-    private queryFileLoader;
-    private aggrCalculator;
     private modelStorageResolver;
     private modelLoaderResolver;
     private queryStorageResolver;
     private querySynchronizerResolver;
     private dataFetcherResolver;
-    private vlrResolver;
+    private vllResolver;
     private queryFileLoaderResolver;
     private aggrCalculatoResolver;
     constructor();
@@ -36,24 +28,26 @@ export declare class EqServiceProvider {
     getHttpClient(): HttpClient;
     createDataModel(context: EqContext): DataModel;
     createQuery(context: EqContext): Query;
-    getModelLoader(context: EqContext): EqModelLoader;
-    getModelStorage(context: EqContext): DataModelStorage;
-    getQueryStorage(context: EqContext): QueryStorage;
-    getQuerySynchronizer(context: EqContext): QuerySynchronizer;
-    getDataFetcher(context: EqContext): DataFetcher;
-    getValueListResolver(context: EqContext): EqValueListResolver;
-    getQueryFileLoader(context: EqContext): QueryFileLoader;
-    getAggregatesCalculator(context: EqContext): AggregatesCalculator;
     registerDataModelResolver(resolver: (context: EqContext) => DataModel): void;
+    getDataModelResolver(): (context: EqContext) => DataModel;
     registerQueryResolver(resolver: (context: EqContext) => Query): void;
+    getQueryResolver(): (context: EqContext) => Query;
     registerModelLoaderResolver(resolver: (context: EqContext) => EqModelLoader): void;
+    getModelLoaderResolver(): (context: EqContext) => EqModelLoader;
     registerModelStorageResolver(resolver: (context: EqContext) => DataModelStorage): void;
+    getModelStorageResolver(): (context: EqContext) => DataModelStorage;
     registerQueryStorageResolver(resolver: (context: EqContext) => QueryStorage): void;
+    getQueryStorageResolver(): (context: EqContext) => QueryStorage;
     registerDataFetcherResolver(resolver: (context: EqContext) => DataFetcher): void;
+    getDataFetcherResolver(): (context: EqContext) => DataFetcher;
     registerQuerySyncronizerResolver(resolver: (context: EqContext) => QuerySynchronizer): void;
-    registerValueListResolver(resolver: (context: EqContext) => EqValueListResolver): void;
+    getQuerySynchronizerResolver(): (context: EqContext) => QuerySynchronizer;
+    registerValueListLoaderResolver(resolver: (context: EqContext) => EqValueListLoader): void;
+    getValueListLoaderResolver(): (context: EqContext) => EqValueListLoader;
     registerQueryFileLoaderResolver(resolver: (context: EqContext) => QueryFileLoader): void;
+    getQueryFileLoaderResolver(): (context: EqContext) => QueryFileLoader;
     registerAggregatesCalculator(resolver: (context: EqContext) => AggregatesCalculator): void;
+    getAggregatesCalculatorResolver(): (context: EqContext) => AggregatesCalculator;
     private services;
     registerService<T>(serviceId: string, serviceResolver: () => T): void;
     getService<T>(serviceId: string): T | undefined;

package/dist/types/eqs/eqs_query_synchronizer.d.ts

@@ -1,7 +1,7 @@
 import { EqContext } from '../main/context';
 import { QuerySynchronizer, SyncOptions } from '../main/query_synchronizer';
 export declare class EqServerQuerySynchronizer implements QuerySynchronizer {
-    private context;
+    protected context: EqContext;
     constructor(context: EqContext);
     syncQuery(options?: SyncOptions): Promise<any>;
 }

package/dist/types/eqs/eqs_value_list_resolver.d.ts

@@ -1,6 +1,6 @@
-import { EqValueListResolver, LoadValueListOptions, ValueListItem } from '../main/value_list_resolver';
+import { EqValueListLoader, LoadValueListOptions, ValueListItem } from '../main/value_list_resolver';
 import { EqContext } from '../main/context';
-export declare class EqServerValueListResolver implements EqValueListResolver {
+export declare class EqServerValueListResolver implements EqValueListLoader {
     private context;
     constructor(context: EqContext);
     loadValueList(options?: LoadValueListOptions): Promise<ValueListItem[]>;

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

@@ -1,6 +1,13 @@
-import { EasyDataTable } from '@easydata/core';
+import { EasyDataTable, AggregatesCalculator } from '@easydata/core';
 import { i18n } from '@easydata/core';
 import { EqServiceProvider } from '../common/eq_services';
+import { EqModelLoader } from '../main/model_loader';
+import { DataModelStorage } from '../main/model_storage';
+import { QueryStorage } from '../main/query_storage';
+import { QuerySynchronizer } from '../main/query_synchronizer';
+import { DataFetcher } from '../main/data_fetcher';
+import { EqValueListLoader } from '../main/value_list_resolver';
+import { QueryFileLoader } from '../main/query_file_loader';
 import { DataModel } from '../dm/data_model';
 import { EntityAttr } from '../dm/entity';
 import { ModelPlainData } from '../dm/dto/dm_data';
@@ -28,6 +35,14 @@ export declare class EqContext {
     options: EqContextOptions;
     private servicesInitialized;
     private eqServices;
+    private modelStorage;
+    private modelLoader;
+    private queryStorage;
+    private querySynchronizer;
+    private dataFetcher;
+    private valueListLoader;
+    private queryFileLoader;
+    private aggrCalculator;
     private internalListCache;
     private externalListCache?;
     private dataModel;
@@ -62,6 +77,14 @@ export declare class EqContext {
     private afterGroupFetch?;
     constructor();
     getServices(): EqServiceProvider;
+    getModelLoader(): EqModelLoader;
+    getModelStorage(): DataModelStorage;
+    getQueryStorage(): QueryStorage;
+    getQuerySynchronizer(): QuerySynchronizer;
+    getDataFetcher(): DataFetcher;
+    getValueListLoader(): EqValueListLoader;
+    getQueryFileLoader(): QueryFileLoader;
+    getAggregatesCalculator(): AggregatesCalculator;
     /**
     * Activates `Enterprise` functionality of the library. Works only with @easyquery/enterprise packag and a proper license key.
     * @param keyOrInitCallback The license key or a callback wich is called after

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

@@ -13,6 +13,6 @@ export interface ValueListItem {
     text?: string;
     items?: ValueListItem[];
 }
-export interface EqValueListResolver {
+export interface EqValueListLoader {
     loadValueList(options?: LoadValueListOptions): Promise<ValueListItem[]>;
 }

package/package.json

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