@easyquery/core 7.2.5-rc02 → 7.2.5

package/dist/easyquery.core.cjs.js

@@ -1,10 +1,10 @@
 
 /*
- * EasyQuery.JS Core v7.2.5-rc02
+ * EasyQuery.JS Core v7.2.5
  * Copyright 2024 Korzh.com
  * Licensed under MIT
  *
- * Build time: 1/9/2024 11:22:26 AM
+ * Build time: 1/18/2024 1:26:55 PM
  */
 
 'use strict';
@@ -2211,7 +2211,7 @@ class Query {
         return hasChanged;
     }
     createSubQuery() {
-        return new Query(this.model, null, { context: this.context });
+        return new Query(this.model, null, { parent: this, context: this.context });
     }
     useAggregation(settingsTuner, silent = false) {
         this.aggrSettings.clear();
@@ -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;
@@ -4004,7 +4008,7 @@ class EqServiceProvider {
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = (_) => new DataModel();
         this.modelStorageResolver = null;
-        this.queryResolver = (context) => new Query(context.getModel(), null, { context });
+        this.queryResolver = (context) => new Query(context.getModel(), null, { context: context });
         this.modelLoaderResolver = (context) => new EqServerModelLoader(context);
         this.queryStorageResolver = (context) => new BrowserQueryStorage(context);
         this.querySynchronizerResolver = (context) => new EqServerQuerySynchronizer(context);
@@ -4769,7 +4773,7 @@ class EqContext {
     }
     /**
      * Sets the content of the current data model
-    */
+     */
     loadModelFromData(modelPlainData) {
         this.getQuery().loadModelData(modelPlainData);
         this.dataModel = this.getQuery().getModel();

package/dist/easyquery.core.esm.js

@@ -1,10 +1,10 @@
 
 /*
- * EasyQuery.JS Core v7.2.5-rc02
+ * EasyQuery.JS Core v7.2.5
  * Copyright 2024 Korzh.com
  * Licensed under MIT
  *
- * Build time: 1/9/2024 11:22:26 AM
+ * Build time: 1/18/2024 1:26:55 PM
  */
 
 import { i18n, DataType, utils, ValueEditor, MetaEntity, MetaEntityAttr, EditorTag, MetaData, EventEmitter, AggregationSettings, HttpClient, EasyDataTable } from '@easydata/core';
@@ -2210,7 +2210,7 @@ class Query {
         return hasChanged;
     }
     createSubQuery() {
-        return new Query(this.model, null, { context: this.context });
+        return new Query(this.model, null, { parent: this, context: this.context });
     }
     useAggregation(settingsTuner, silent = false) {
         this.aggrSettings.clear();
@@ -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;
@@ -4003,7 +4007,7 @@ class EqServiceProvider {
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = (_) => new DataModel();
         this.modelStorageResolver = null;
-        this.queryResolver = (context) => new Query(context.getModel(), null, { context });
+        this.queryResolver = (context) => new Query(context.getModel(), null, { context: context });
         this.modelLoaderResolver = (context) => new EqServerModelLoader(context);
         this.queryStorageResolver = (context) => new BrowserQueryStorage(context);
         this.querySynchronizerResolver = (context) => new EqServerQuerySynchronizer(context);
@@ -4768,7 +4772,7 @@ class EqContext {
     }
     /**
      * Sets the content of the current data model
-    */
+     */
     loadModelFromData(modelPlainData) {
         this.getQuery().loadModelData(modelPlainData);
         this.dataModel = this.getQuery().getModel();

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

@@ -162,7 +162,7 @@ export declare class EqContext {
     getModel(): DataModel;
     /**
      * Sets the content of the current data model
-    */
+     */
     loadModelFromData(modelPlainData: ModelPlainData): void;
     /**
      * Sets the ID of the default model

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-rc02",
+    "version": "7.2.5",
     "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",