@easyquery/core 7.2.5-rc03 → 7.3.0-rc01

package/dist/easyquery.core.cjs.js

@@ -1,10 +1,10 @@
 
 /*
- * EasyQuery.JS Core v7.2.5-rc03
+ * EasyQuery.JS Core v7.3.0-rc01
  * Copyright 2024 Korzh.com
  * Licensed under MIT
  *
- * Build time: 1/15/2024 11:04:57 AM
+ * Build time: 2/10/2024 10:51:56 AM
  */
 
 'use strict';
@@ -2937,6 +2937,7 @@ class Query {
      */
     addColumn(descriptor, silent = false) {
         let newColumn;
+        const justsorted = descriptor.justsorted || (descriptor.column && descriptor.column.isJustSorted());
         if (descriptor.column) {
             newColumn = descriptor.column;
         }
@@ -2955,12 +2956,16 @@ class Query {
             else if (typeof descriptor.constValue === 'undefined' && !descriptor.customSql) {
                 throw new Error('Not enought data for addColumn operation. One of the following options must be defined: attribute, attributeId, constValue or customSlq');
             }
-            if (attr && !attr.useInResult) {
-                if (attr.lookupAttr) {
-                    attr = this.model.getAttributeById(attr.lookupAttr);
-                }
-                if (!attr || !attr.useInResult) {
-                    throw new Error(`Can't use this attribute for a column`);
+            if (attr) {
+                let checkedOption = justsorted ? attr.useInSorting : attr.useInResult;
+                if (!checkedOption) {
+                    if (attr.lookupAttr) {
+                        attr = this.model.getAttributeById(attr.lookupAttr);
+                        checkedOption = justsorted ? attr.useInSorting : attr.useInResult;
+                    }
+                    if (!checkedOption) {
+                        throw new Error(`Can't use this attribute for a column`);
+                    }
                 }
             }
             if (descriptor.aggrFuncId && descriptor.customSql) {
@@ -3011,7 +3016,6 @@ class Query {
             newColumn.enabled = core.utils.getIfDefined(descriptor.enabled, true);
             newColumn.setReadOnly(core.utils.getIfDefined(descriptor.readonly, false));
         }
-        const justsorted = descriptor.justsorted || (descriptor.column && descriptor.column.isJustSorted());
         if (!justsorted) {
             if (descriptor.index && descriptor.index >= 0 && descriptor.index < this.columns.length) {
                 this.columns.splice(descriptor.index, 0, newColumn);
@@ -3035,7 +3039,7 @@ class Query {
      * const column = new Column();
      * column.caption = "Company name";
      *
-     * query.addColumn(column, 1)
+     * query.addColumnObj(column, 1)
      */
     addColumnObj(column, index, author) {
         let columns = this.columns;
@@ -3374,15 +3378,15 @@ class Query {
         if (!model)
             return '';
         const getConditionGroupText = (group) => {
-            let result = '', conjKey = "Conj" + exports.equtils.linkTypeToStr(group.linkType), conjText = core.i18n.getText(conjKey), condText, i;
+            let result = '', conjKey = 'Conj' + exports.equtils.linkTypeToStr(group.linkType), conjText = core.i18n.getText(conjKey), condText, i;
             for (i = 0; i < group.getConditions().length; i++) {
-                condText = "";
+                condText = '';
                 let cond = group.getConditions()[i];
-                if (cond.enabled || typeof (cond.enabled) === "undefined") {
+                if (cond.enabled || typeof (cond.enabled) === 'undefined') {
                     if (cond.isGroup()) {
                         condText = getConditionGroupText(cond);
                         if (condText) {
-                            condText = "(" + condText + ")";
+                            condText = '(' + condText + ')';
                         }
                     }
                     else {
@@ -3393,14 +3397,17 @@ class Query {
                         for (let pi = 0; pi < plen; pi++) {
                             let part = parts[pi];
                             let txt = part.text;
-                            if (part.type == "expression") {
+                            if (part.type == 'expression') {
                                 let expr = cond.expressions[part.index];
                                 if (expr.kind == exports.DataKind.Attribute || expr.tag == exports.ExprTag.EntityAttribute) {
                                     let attr = model.getAttributeById(expr.value);
                                     if (attr != null) {
-                                        txt = model.getAttributeText(attr, "{entity} {attr}");
+                                        txt = model.getAttributeText(attr, '{entity} {attr}');
                                     }
                                 }
+                                if (expr.kind == exports.DataKind.Query) {
+                                    txt = ': (' + expr.subQuery.getConditionsText() + ')';
+                                }
                                 else {
                                     txt = expr.getText();
                                     if (this.model.isDateMacro(txt) || this.model.isTimeMacro(txt)) {
@@ -3411,20 +3418,20 @@ class Query {
                                 }
                             }
                             if (pi > 0)
-                                condText += " ";
+                                condText += ' ';
                             condText += txt;
                         }
                     }
                 }
                 if (condText) {
                     if (i > 0 && result) {
-                        result += " " + conjText + " ";
+                        result += ' ' + conjText + ' ';
                     }
                     result += condText;
                 }
             }
             if (group.linkType == exports.LinkType.None || group.linkType == exports.LinkType.NotAll) {
-                result = "not ( " + result + " )";
+                result = 'not ( " + result + " )';
             }
             return result;
         };
@@ -4641,7 +4648,7 @@ class EqContext {
         }
     }
     setOptions(options) {
-        core.utils.assignDeep(this.options, options);
+        core.utils.assign(this.options, options);
     }
     get backendInfo() {
         return this._backendInfo;
@@ -4843,19 +4850,28 @@ class EqContext {
                         queryId: this.defaultQueryId,
                         modelId: this.defaultModelId,
                         success: () => {
-                            this.refreshWidgets(exports.WidgetGroup.Query);
-                            //if we load query on start - then we should call 'ready' event only after its successful loading
-                            this.fireEvent('ready');
+                            //if we load query on start - then we should throw the 'ready' event only after its successful loading
+                            this.throwReady();
+                        },
+                        error: () => {
+                            //if the default query can't be loaded - we still throw the 'ready' event
+                            this.throwReady();
                         }
                     });
                 }
                 else {
-                    this.refreshWidgets(exports.WidgetGroup.Query);
-                    this.fireEvent('ready');
+                    this.throwReady();
                 }
             }
         });
     }
+    /**
+     * Refreshes all widgets and raises 'ready' event
+     */
+    throwReady() {
+        this.refreshWidgets(exports.WidgetGroup.Query);
+        this.fireEvent('ready');
+    }
     /**
      * Clears the content of the current query
      */
@@ -5707,6 +5723,9 @@ class EqContext {
                     }
                 });
             }
+            else {
+                console.error('No exporter for this format: ' + format);
+            }
         }
     }
     limitCustomSqlColumns() {

package/dist/easyquery.core.esm.js

@@ -1,10 +1,10 @@
 
 /*
- * EasyQuery.JS Core v7.2.5-rc03
+ * EasyQuery.JS Core v7.3.0-rc01
  * Copyright 2024 Korzh.com
  * Licensed under MIT
  *
- * Build time: 1/15/2024 11:04:57 AM
+ * Build time: 2/10/2024 10:51:56 AM
  */
 
 import { i18n, DataType, utils, ValueEditor, MetaEntity, MetaEntityAttr, EditorTag, MetaData, EventEmitter, AggregationSettings, HttpClient, EasyDataTable } from '@easydata/core';
@@ -2936,6 +2936,7 @@ class Query {
      */
     addColumn(descriptor, silent = false) {
         let newColumn;
+        const justsorted = descriptor.justsorted || (descriptor.column && descriptor.column.isJustSorted());
         if (descriptor.column) {
             newColumn = descriptor.column;
         }
@@ -2954,12 +2955,16 @@ class Query {
             else if (typeof descriptor.constValue === 'undefined' && !descriptor.customSql) {
                 throw new Error('Not enought data for addColumn operation. One of the following options must be defined: attribute, attributeId, constValue or customSlq');
             }
-            if (attr && !attr.useInResult) {
-                if (attr.lookupAttr) {
-                    attr = this.model.getAttributeById(attr.lookupAttr);
-                }
-                if (!attr || !attr.useInResult) {
-                    throw new Error(`Can't use this attribute for a column`);
+            if (attr) {
+                let checkedOption = justsorted ? attr.useInSorting : attr.useInResult;
+                if (!checkedOption) {
+                    if (attr.lookupAttr) {
+                        attr = this.model.getAttributeById(attr.lookupAttr);
+                        checkedOption = justsorted ? attr.useInSorting : attr.useInResult;
+                    }
+                    if (!checkedOption) {
+                        throw new Error(`Can't use this attribute for a column`);
+                    }
                 }
             }
             if (descriptor.aggrFuncId && descriptor.customSql) {
@@ -3010,7 +3015,6 @@ class Query {
             newColumn.enabled = utils.getIfDefined(descriptor.enabled, true);
             newColumn.setReadOnly(utils.getIfDefined(descriptor.readonly, false));
         }
-        const justsorted = descriptor.justsorted || (descriptor.column && descriptor.column.isJustSorted());
         if (!justsorted) {
             if (descriptor.index && descriptor.index >= 0 && descriptor.index < this.columns.length) {
                 this.columns.splice(descriptor.index, 0, newColumn);
@@ -3034,7 +3038,7 @@ class Query {
      * const column = new Column();
      * column.caption = "Company name";
      *
-     * query.addColumn(column, 1)
+     * query.addColumnObj(column, 1)
      */
     addColumnObj(column, index, author) {
         let columns = this.columns;
@@ -3373,15 +3377,15 @@ class Query {
         if (!model)
             return '';
         const getConditionGroupText = (group) => {
-            let result = '', conjKey = "Conj" + equtils.linkTypeToStr(group.linkType), conjText = i18n.getText(conjKey), condText, i;
+            let result = '', conjKey = 'Conj' + equtils.linkTypeToStr(group.linkType), conjText = i18n.getText(conjKey), condText, i;
             for (i = 0; i < group.getConditions().length; i++) {
-                condText = "";
+                condText = '';
                 let cond = group.getConditions()[i];
-                if (cond.enabled || typeof (cond.enabled) === "undefined") {
+                if (cond.enabled || typeof (cond.enabled) === 'undefined') {
                     if (cond.isGroup()) {
                         condText = getConditionGroupText(cond);
                         if (condText) {
-                            condText = "(" + condText + ")";
+                            condText = '(' + condText + ')';
                         }
                     }
                     else {
@@ -3392,14 +3396,17 @@ class Query {
                         for (let pi = 0; pi < plen; pi++) {
                             let part = parts[pi];
                             let txt = part.text;
-                            if (part.type == "expression") {
+                            if (part.type == 'expression') {
                                 let expr = cond.expressions[part.index];
                                 if (expr.kind == DataKind.Attribute || expr.tag == ExprTag.EntityAttribute) {
                                     let attr = model.getAttributeById(expr.value);
                                     if (attr != null) {
-                                        txt = model.getAttributeText(attr, "{entity} {attr}");
+                                        txt = model.getAttributeText(attr, '{entity} {attr}');
                                     }
                                 }
+                                if (expr.kind == DataKind.Query) {
+                                    txt = ': (' + expr.subQuery.getConditionsText() + ')';
+                                }
                                 else {
                                     txt = expr.getText();
                                     if (this.model.isDateMacro(txt) || this.model.isTimeMacro(txt)) {
@@ -3410,20 +3417,20 @@ class Query {
                                 }
                             }
                             if (pi > 0)
-                                condText += " ";
+                                condText += ' ';
                             condText += txt;
                         }
                     }
                 }
                 if (condText) {
                     if (i > 0 && result) {
-                        result += " " + conjText + " ";
+                        result += ' ' + conjText + ' ';
                     }
                     result += condText;
                 }
             }
             if (group.linkType == LinkType.None || group.linkType == LinkType.NotAll) {
-                result = "not ( " + result + " )";
+                result = 'not ( " + result + " )';
             }
             return result;
         };
@@ -4640,7 +4647,7 @@ class EqContext {
         }
     }
     setOptions(options) {
-        utils.assignDeep(this.options, options);
+        utils.assign(this.options, options);
     }
     get backendInfo() {
         return this._backendInfo;
@@ -4842,19 +4849,28 @@ class EqContext {
                         queryId: this.defaultQueryId,
                         modelId: this.defaultModelId,
                         success: () => {
-                            this.refreshWidgets(WidgetGroup.Query);
-                            //if we load query on start - then we should call 'ready' event only after its successful loading
-                            this.fireEvent('ready');
+                            //if we load query on start - then we should throw the 'ready' event only after its successful loading
+                            this.throwReady();
+                        },
+                        error: () => {
+                            //if the default query can't be loaded - we still throw the 'ready' event
+                            this.throwReady();
                         }
                     });
                 }
                 else {
-                    this.refreshWidgets(WidgetGroup.Query);
-                    this.fireEvent('ready');
+                    this.throwReady();
                 }
             }
         });
     }
+    /**
+     * Refreshes all widgets and raises 'ready' event
+     */
+    throwReady() {
+        this.refreshWidgets(WidgetGroup.Query);
+        this.fireEvent('ready');
+    }
     /**
      * Clears the content of the current query
      */
@@ -5706,6 +5722,9 @@ class EqContext {
                     }
                 });
             }
+            else {
+                console.error('No exporter for this format: ' + format);
+            }
         }
     }
     limitCustomSqlColumns() {

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

@@ -194,6 +194,10 @@ export declare class EqContext {
      * to load the model with such ID.
      */
     loadDefaultModel(): void;
+    /**
+     * Refreshes all widgets and raises 'ready' event
+     */
+    protected throwReady(): void;
     /**
      * Clears the content of the current query
      */

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

@@ -307,7 +307,7 @@ export declare class Query implements AggregationColumnStore {
      * const column = new Column();
      * column.caption = "Company name";
      *
-     * query.addColumn(column, 1)
+     * query.addColumnObj(column, 1)
      */
     addColumnObj(column: QueryColumn | QueryColumn[], index: any, author: any): void;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@easyquery/core",
-    "version": "7.2.5-rc03",
+    "version": "7.3.0-rc01",
     "description": "EasyQuery.JS Community core modules",
     "types": "./dist/types/public_api.d.ts",
     "main": "./dist/easyquery.core.cjs.js",
@@ -10,7 +10,7 @@
         "build": "npm run clear && rollup -c",
         "watch": "npm run clear && rollup -c -w",
         "docs": "typedoc src/public_api.ts --out ./docs",
-        "test": "jest"
+        "test": "vitest run"
     },
     "author": "Korzh.com",
     "homepage": "https://korzh.com/easyquery/javascript",
@@ -30,8 +30,5 @@
     "license": "LGPL-3.0",
     "files": [
         "dist"
-    ],
-    "peerDependencies": {
-        "@easydata/core": "^1.4.21"
-    }
+    ]
 }