@easyquery/core 7.2.4-rc03 → 7.2.4-rc04

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);
                 }
             }
@@ -6988,7 +6953,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();