@easyquery/core 7.2.4-rc03 → 7.2.4-rc05

package/dist/bundles/easyquery.core.js

@@ -18,7 +18,7 @@ return /******/ (() => { // webpackBootstrap
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   e: () => (/* binding */ GoogleDataConverter)
 /* harmony export */ });
-/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(907);
+/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(902);
 
 /**
  * Represents Google data table class
@@ -196,7 +196,7 @@ var GoogleDataConverter = /** @class */ (function () {
 
 /***/ }),
 
-/***/ 907:
+/***/ 902:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 
@@ -359,39 +359,6 @@ var HttpRequest = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=http_request.js.map
-;// CONCATENATED MODULE: ../../easydata/easydata.js/packs/core/dist/lib/utils/string_utils.js
-function repeatString(str, times) {
-    var result = "";
-    for (var i = 0; i < times; i++) {
-        result += str;
-    }
-    return result;
-}
-function reverseString(str) {
-    return str.split("").reverse().join("");
-}
-function strEndsWith(str, symbol) {
-    return str && str.lastIndexOf(symbol) == (str.length - symbol.length);
-}
-/**
- * Adds two paths and returns the result
- * Correctly processes leading and trailing slashes
- * @param path1
- * @param path2
- */
-function combinePath(path1, path2) {
-    var result = path1;
-    if (result != null && result.length > 0) {
-        if (result.charAt(result.length - 1) != '/')
-            result += "/";
-        result += path2;
-    }
-    else {
-        result = path2;
-    }
-    return result;
-}
-//# sourceMappingURL=string_utils.js.map
 ;// CONCATENATED MODULE: ../../easydata/easydata.js/packs/core/dist/lib/i18n/i18n.js
 
 
@@ -865,7 +832,6 @@ var i18n;
 ;// CONCATENATED MODULE: ../../easydata/easydata.js/packs/core/dist/lib/utils/utils.js
 
 
-
 var utils;
 (function (utils) {
     function getAllDataTypes() {
@@ -1188,27 +1154,26 @@ var utils;
         if (prfx && prfx.length > 0) {
             prfx += "-";
         }
-        //adding 2 random symbols
-        var randValue = repeatString("", 2);
-        ;
-        var maxSymbolIndex = symbols.length - 1;
-        randValue = replaceAtString(randValue, 0, symbols[getRandomInt(0, maxSymbolIndex)]);
-        randValue = replaceAtString(randValue, 1, symbols[getRandomInt(0, maxSymbolIndex)]);
-        //generating main ID part (64-base representation of the current value of the time ticks)
-        var ticksNum64 = intToNum36(getNowTicks() - magicTicks);
-        return prfx + randValue + ticksNum64;
+        //adding 3 random symbols
+        var randCharPart = symbols[getRandomInt(0, symbols.length)] +
+            symbols[getRandomInt(0, symbols.length)] +
+            symbols[getRandomInt(0, symbols.length)];
+        var randInt = getRandomInt(0, 10000);
+        //generating main ID part 
+        //it's a 36-base representation of some random number based on current value of ticks
+        var ticksNum36 = intToNumBase(getNowTicks() - magicTicks - randInt);
+        return prfx + randCharPart + ticksNum36;
     }
     utils.generateId = generateId;
-    function intToNum36(value) {
-        var targetBase = 36;
-        var i = 14;
-        var buffer = repeatString("", i);
+    function intToNumBase(value, targetBase) {
+        if (targetBase === void 0) { targetBase = 36; }
+        var buffer = '';
         var rest = value;
         do {
-            buffer = replaceAtString(buffer, i--, symbols[rest % targetBase]);
+            buffer = symbols[rest % targetBase] + buffer;
             rest = Math.floor(rest /= targetBase);
         } while (rest > 0);
-        return reverseString(buffer.trim());
+        return buffer;
     }
     function squeezeMoniker(str, maxlen) {
         var parts = str.split('-');
@@ -1245,8 +1210,8 @@ var utils;
             return str;
         }
     }
-    function replaceAtString(str, index, value) {
-        return str.substr(0, index) + value + str.substr(index + value.length);
+    function replaceAtString(str, index, replacement) {
+        return str.substring(0, index) + replacement + str.substring(index + replacement.length);
     }
     function getRandomInt(min, max) {
         return Math.floor(Math.random() * (max - min)) + min;
@@ -3210,8 +3175,8 @@ __webpack_require__.d(__webpack_exports__, {
   versionInfo: () => (/* reexport */ versionInfo)
 });
 
-// EXTERNAL MODULE: ../../easydata/easydata.js/packs/core/dist/lib/public_api.js + 21 modules
-var public_api = __webpack_require__(907);
+// EXTERNAL MODULE: ../../easydata/easydata.js/packs/core/dist/lib/public_api.js + 20 modules
+var public_api = __webpack_require__(902);
 ;// CONCATENATED MODULE: ./src/utils/format_parser.ts
 /**
  * Represents a parser for format expressions in operators
@@ -5964,7 +5929,7 @@ var Query = /** @class */ (function () {
                         throw new InvalidQueryError(entityAttrNotExistError + column.expr.args[0].value);
                     }
                 }
-                else if (column.expr.tag !== ExprTag.CustomSql) {
+                else if (column.expr.tag === ExprTag.Unknown) {
                     throw new InvalidQueryError(wrongExprTag + column.expr.tag);
                 }
             }
@@ -6447,7 +6412,6 @@ var Query = /** @class */ (function () {
         }
         public_api/* utils.moveArrayItem */.P6.moveArrayItem(this.sortedColumns, colIdx, index);
         this.fixupSortingIndices();
-        this.fireColumnsChangedEvent(QueryChangeAction.All);
     };
     Query.prototype.getColumnSorting = function (col) {
         var idx = this.getColumnSortIndex(col);
@@ -6474,7 +6438,6 @@ var Query = /** @class */ (function () {
             }
         }
         this.adjustColumnsSorting();
-        this.fireColumnsChangedEvent(QueryChangeAction.Modify, col, col.isJustSorted());
     };
     Query.prototype.fixupSortingIndices = function () {
         this.sortedColumns.forEach(function (col, index) {
@@ -6523,10 +6486,8 @@ var Query = /** @class */ (function () {
      *     sortIndex: SortDirection.Ascending
      * }});
      */
-    Query.prototype.addColumn = function (descriptor, author) {
-        // let columns = (descriptor.justsorted) 
-        //     ? this.justsorted 
-        //     : this.columns;
+    Query.prototype.addColumn = function (descriptor, silent) {
+        if (silent === void 0) { silent = false; }
         var newColumn;
         if (descriptor.column) {
             newColumn = descriptor.column;
@@ -6543,10 +6504,10 @@ var Query = /** @class */ (function () {
                     throw new Error("Incorrect attribute id (".concat(descriptor.attributeId, "): addColumn"));
                 }
             }
-            else {
-                throw new Error('Not enought data for addColumn operation. Need attribute or attributeId');
+            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.useInResult) {
+            if (attr && !attr.useInResult) {
                 if (attr.lookupAttr) {
                     attr = this.model.getAttributeById(attr.lookupAttr);
                 }
@@ -6554,22 +6515,29 @@ var Query = /** @class */ (function () {
                     throw new Error("Can't use this attribute for a column");
                 }
             }
-            if (descriptor.aggrFuncId && descriptor.cusomtSql) {
+            if (descriptor.aggrFuncId && descriptor.customSql) {
                 console.warn("Column cannot be created using aggrFuncId and customSql at the same time. " +
                     "cusomSql will be used.");
             }
-            if (descriptor.cusomtSql) {
+            if (typeof descriptor.constValue !== 'undefined') {
+                newColumn.expr.tag = ExprTag.Constant;
+                newColumn.expr.setValue(descriptor.constValue);
+                newColumn.expr.kind = DataKind.Scalar;
+                newColumn.expr.dataType = descriptor.constType || public_api/* DataType.String */.g.String;
+            }
+            else if (descriptor.customSql) {
                 newColumn.caption = 'Custom SQL Column';
                 newColumn.expr.tag = ExprTag.CustomSql;
-                newColumn.expr.baseAttrId = attr.id;
-                newColumn.expr.sql = descriptor.cusomtSql;
+                newColumn.expr.sql = descriptor.customSql;
                 newColumn.expr.kind = DataKind.Query;
                 newColumn.expr.dataType = public_api/* DataType.Unknown */.g.Unknown;
+                newColumn.expr.baseAttrId = descriptor.attributeId;
+                if (!this.context.options.allowCustomExpressions) {
+                    newColumn.enabled = false;
+                }
             }
             else if (descriptor.aggrFuncId) {
                 var funcId = descriptor.aggrFuncId;
-                newColumn.caption = attr.caption + ' '
-                    + this.model.getAggrFunctionCaption(descriptor.aggrFuncId);
                 newColumn.expr.tag = ExprTag.AggregateFunction;
                 newColumn.expr.func = descriptor.aggrFuncId;
                 newColumn.expr.kind = DataKind.Scalar;
@@ -6578,16 +6546,18 @@ var Query = /** @class */ (function () {
                 var arg = new Expression(newColumn);
                 arg.setValue(attr.id, true);
                 arg.tag = ExprTag.EntityAttribute;
+                arg.kind = DataKind.Attribute;
                 arg.dataType = attr.dataType;
                 newColumn.expr.args.push(arg);
             }
             else {
-                newColumn.caption = attr.caption;
                 newColumn.expr.setValue(attr.id, true);
                 newColumn.expr.tag = ExprTag.EntityAttribute;
+                newColumn.expr.kind = DataKind.Attribute;
                 newColumn.expr.dataType = attr.dataType;
+                newColumn.params.concat(attr.params);
             }
-            newColumn.caption = descriptor.caption || newColumn.caption;
+            newColumn.caption = descriptor.caption || this.context.getDefaultColumnCaption(newColumn);
             newColumn._sorting = descriptor.sorting || SortDirection.None;
             newColumn._sortIndex = descriptor.sortIndex || -1;
             newColumn.enabled = public_api/* utils.getIfDefined */.P6.getIfDefined(descriptor.enabled, true);
@@ -6603,7 +6573,9 @@ var Query = /** @class */ (function () {
             }
         }
         this.setColumnSorting(newColumn, newColumn._sorting);
-        this.fireColumnsChangedEvent(QueryChangeAction.Add, newColumn, justsorted);
+        if (!silent) {
+            this.fireColumnsChangedEvent(QueryChangeAction.Add, newColumn, justsorted);
+        }
         return newColumn;
     };
     /**
@@ -6657,9 +6629,6 @@ var Query = /** @class */ (function () {
         if (column.isJustSorted())
             return;
         args = args || {};
-        column.caption = (typeof args.caption !== 'undefined')
-            ? args.caption
-            : '';
         if (tag === ExprTag.AggregateFunction) {
             if (!args.funcId)
                 throw Error('"funcId" argument is not defined');
@@ -6697,22 +6666,24 @@ var Query = /** @class */ (function () {
                 || column.expr.tag === ExprTag.ParentEntityAttribute) {
                 return;
             }
-            var exprId = (column.expr.tag === ExprTag.CustomSql)
-                ? column.expr.baseAttrId
-                : column.expr.args[0].value;
-            var attr = this.model.getAttributeById(exprId);
+            var attrId = (column.expr.tag == ExprTag.AggregateFunction)
+                ? column.expr.args[0].value
+                : column.expr.baseAttrId;
+            var attr = attrId
+                ? this.model.getAttributeById(attrId)
+                : this.model.getFirstUICAttr();
             var expr = new Expression(column);
             expr.tag = ExprTag.EntityAttribute;
-            expr.dataType = attr != null ? attr.dataType : public_api/* DataType.Unknown */.g.Unknown;
-            expr.setValue(exprId, true);
+            expr.dataType = attr.dataType;
+            expr.setValue(attr.id, true);
             column.expr = expr;
         }
+        column.caption = this.context.getDefaultColumnCaption(column);
     };
     /**
      * Moves the column with specified index to another position.
      * @param index1 The index of the column that should be moved.
      * @param index2 The index of the position the column should be moved to
-     * @param author The author
      */
     Query.prototype.moveColumn = function (index1, index2) {
         var columns = this.getColumns();
@@ -6722,12 +6693,8 @@ var Query = /** @class */ (function () {
     /**
      * Removes the column.
      * @param column The column to be removed.
-     * @param author The author
      */
-    Query.prototype.removeColumn = function (column, author) {
-        // const columns = (column.isJustSorted()) 
-        //     ? this.getJustSortedColumns()
-        //     : this.getColumns();
+    Query.prototype.removeColumn = function (column) {
         public_api/* utils.removeArrayItem */.P6.removeArrayItem(this.columns, column);
         public_api/* utils.removeArrayItem */.P6.removeArrayItem(this.sortedColumns, column);
     };
@@ -6988,7 +6955,9 @@ var Query = /** @class */ (function () {
                                 var expr = cond.expressions[part.index];
                                 if (expr.kind == DataKind.Attribute || expr.tag == ExprTag.EntityAttribute) {
                                     var attr = model.getAttributeById(expr.value);
-                                    txt = model.getAttributeText(attr, "{entity} {attr}");
+                                    if (attr != null) {
+                                        txt = model.getAttributeText(attr, "{entity} {attr}");
+                                    }
                                 }
                                 else {
                                     txt = expr.getText();
@@ -7839,13 +7808,6 @@ var InMemoryModelStorage = /** @class */ (function () {
 }());
 
 
-;// CONCATENATED MODULE: ./src/main/action.ts
-var EqActionResult;
-(function (EqActionResult) {
-    EqActionResult[EqActionResult["Error"] = 0] = "Error";
-    EqActionResult[EqActionResult["Success"] = 1] = "Success";
-})(EqActionResult || (EqActionResult = {}));
-
 ;// CONCATENATED MODULE: ./src/eqs/eqs_exporter.ts
 
 var EqServerExporter = /** @class */ (function () {
@@ -7907,6 +7869,13 @@ var EqServerExporter = /** @class */ (function () {
 }());
 
 
+;// CONCATENATED MODULE: ./src/main/action.ts
+var EqActionResult;
+(function (EqActionResult) {
+    EqActionResult[EqActionResult["Error"] = 0] = "Error";
+    EqActionResult[EqActionResult["Success"] = 1] = "Success";
+})(EqActionResult || (EqActionResult = {}));
+
 ;// CONCATENATED MODULE: ./src/main/context.ts
 var context_assign = (undefined && undefined.__assign) || function () {
     context_assign = Object.assign || function(t) {
@@ -7944,7 +7913,9 @@ var EqContext = /** @class */ (function () {
     function EqContext() {
         var _this = this;
         this.options = {
-            syncSortOrderWithColumnsOrder: true
+            syncSortOrderWithColumnsOrder: true,
+            attributeFormat: '{entity} {attr}',
+            columnTitleFormat: null //means it will be the same as attributeFormat
         };
         this.servicesInitialized = false;
         this.internalListCache = {};
@@ -9363,6 +9334,37 @@ var EqContext = /** @class */ (function () {
             });
         }
     };
+    EqContext.prototype.getAttributeTitle = function (attr) {
+        var format = this.options.attributeFormat;
+        return this.getModel().getAttributeText(attr, format);
+    };
+    EqContext.prototype.getColumnTitle = function (attr) {
+        var format = this.options.columnTitleFormat || this.options.attributeFormat;
+        return this.getModel().getAttributeText(attr, format);
+    };
+    EqContext.prototype.getDefaultColumnCaption = function (column) {
+        var attr;
+        var model = this.getModel();
+        switch (column.expr.tag) {
+            case ExprTag.Constant:
+                return "Contant Column";
+            case ExprTag.CustomSql:
+                return "SQL Column";
+            case ExprTag.ParentColumn:
+                return "Parent Column";
+            case ExprTag.Query:
+                return "Query Column";
+            case ExprTag.EntityAttribute:
+            case ExprTag.ParentEntityAttribute:
+                attr = model.getAttributeById(column.expr.value);
+                return this.getColumnTitle(attr);
+            case ExprTag.AggregateFunction:
+                attr = model.getAttributeById(column.expr.args[0].value);
+                return this.getColumnTitle(attr) + ' ' + model.getAggrFunctionCaption(column.expr.func);
+            default:
+                return 'Column';
+        }
+    };
     return EqContext;
 }());