@easyquery/core 7.2.3-rc03 → 7.2.4-beta03

package/dist/lib/utils/format_parser.js

@@ -1,88 +1,88 @@
-/**
- * Represents a parser for format expressions in operators
- */
-var FormatParser = /** @class */ (function () {
-    function FormatParser(format) {
-        this.start(format);
-    }
-    /**
-     * Starts parsing of the format string passed in the parameter
-     * @param format
-     */
-    FormatParser.prototype.start = function (format) {
-        this.formatStr = format;
-        this.pos = 0;
-        this.exprNum = 0;
-        this.tokenText = '';
-    };
-    /**
-     * Skips all spcaes till the beginning of next token
-     */
-    FormatParser.prototype.skipSpaces = function () {
-        while (this.pos < this.formatStr.length && this.formatStr.charAt(this.pos) === ' ')
-            this.pos++;
-    };
-    /**
-     * Scans the source and gets the next token
-     */
-    FormatParser.prototype.next = function () {
-        this.skipSpaces();
-        if (this.pos >= this.formatStr.length)
-            return false;
-        var npos = 0;
-        if (this.formatStr.charAt(this.pos) === '{') {
-            npos = this.formatStr.indexOf('}', this.pos);
-            if (npos < 0)
-                return false;
-            this.tokenText = this.formatStr.substring(this.pos, npos + 1);
-            if (this.tokenText.indexOf('{expr') === 0) {
-                this.token = 'expression';
-                this.exprNum = parseInt(this.tokenText.substring(5, this.tokenText.length));
-            }
-            this.pos = npos + 1;
-        }
-        else if (this.formatStr.charAt(this.pos) === '[' && this.pos < this.formatStr.length - 1 && this.formatStr.charAt(this.pos + 1) === '[') {
-            this.pos += 2;
-            npos = this.formatStr.indexOf(']]', this.pos);
-            this.token = 'operator';
-            this.tokenText = this.formatStr.substring(this.pos, npos);
-            this.pos = npos + 2;
-        }
-        else {
-            this.token = 'text';
-            var npos1 = this.formatStr.indexOf('{', this.pos);
-            if (npos1 < 0)
-                npos1 = this.formatStr.length;
-            var npos2 = this.formatStr.indexOf('[[', this.pos);
-            if (npos2 < 0)
-                npos2 = this.formatStr.length;
-            npos = Math.min(npos1, npos2);
-            this.tokenText = this.formatStr.substring(this.pos, npos).trim();
-            this.pos = npos;
-        }
-        return true;
-    };
-    /**
-     * Returns current token
-     */
-    FormatParser.prototype.getToken = function () {
-        return {
-            type: this.token,
-            text: this.tokenText,
-            index: this.exprNum - 1
-        };
-    };
-    /**
-     * Parses all source string passed in constructor and returns the list of tokens
-     */
-    FormatParser.prototype.parse = function () {
-        var result = [];
-        while (this.next()) {
-            result.push(this.getToken());
-        }
-        return result;
-    };
-    return FormatParser;
-}());
-export { FormatParser };
+/**
+ * Represents a parser for format expressions in operators
+ */
+var FormatParser = /** @class */ (function () {
+    function FormatParser(format) {
+        this.start(format);
+    }
+    /**
+     * Starts parsing of the format string passed in the parameter
+     * @param format
+     */
+    FormatParser.prototype.start = function (format) {
+        this.formatStr = format;
+        this.pos = 0;
+        this.exprNum = 0;
+        this.tokenText = '';
+    };
+    /**
+     * Skips all spcaes till the beginning of next token
+     */
+    FormatParser.prototype.skipSpaces = function () {
+        while (this.pos < this.formatStr.length && this.formatStr.charAt(this.pos) === ' ')
+            this.pos++;
+    };
+    /**
+     * Scans the source and gets the next token
+     */
+    FormatParser.prototype.next = function () {
+        this.skipSpaces();
+        if (this.pos >= this.formatStr.length)
+            return false;
+        var npos = 0;
+        if (this.formatStr.charAt(this.pos) === '{') {
+            npos = this.formatStr.indexOf('}', this.pos);
+            if (npos < 0)
+                return false;
+            this.tokenText = this.formatStr.substring(this.pos, npos + 1);
+            if (this.tokenText.indexOf('{expr') === 0) {
+                this.token = 'expression';
+                this.exprNum = parseInt(this.tokenText.substring(5, this.tokenText.length));
+            }
+            this.pos = npos + 1;
+        }
+        else if (this.formatStr.charAt(this.pos) === '[' && this.pos < this.formatStr.length - 1 && this.formatStr.charAt(this.pos + 1) === '[') {
+            this.pos += 2;
+            npos = this.formatStr.indexOf(']]', this.pos);
+            this.token = 'operator';
+            this.tokenText = this.formatStr.substring(this.pos, npos);
+            this.pos = npos + 2;
+        }
+        else {
+            this.token = 'text';
+            var npos1 = this.formatStr.indexOf('{', this.pos);
+            if (npos1 < 0)
+                npos1 = this.formatStr.length;
+            var npos2 = this.formatStr.indexOf('[[', this.pos);
+            if (npos2 < 0)
+                npos2 = this.formatStr.length;
+            npos = Math.min(npos1, npos2);
+            this.tokenText = this.formatStr.substring(this.pos, npos).trim();
+            this.pos = npos;
+        }
+        return true;
+    };
+    /**
+     * Returns current token
+     */
+    FormatParser.prototype.getToken = function () {
+        return {
+            type: this.token,
+            text: this.tokenText,
+            index: this.exprNum - 1
+        };
+    };
+    /**
+     * Parses all source string passed in constructor and returns the list of tokens
+     */
+    FormatParser.prototype.parse = function () {
+        var result = [];
+        while (this.next()) {
+            result.push(this.getToken());
+        }
+        return result;
+    };
+    return FormatParser;
+}());
+export { FormatParser };
 //# sourceMappingURL=format_parser.js.map

package/dist/lib/utils/utils.d.ts

@@ -1,34 +1,34 @@
-import { DataType } from '@easydata/core';
-import { FormatToken } from "./format_parser";
-import { LinkType } from '../types/link_type';
-export declare namespace equtils {
-    /**
-     * Adds two paths and returns the result
-     * Correctly processes leading and trailing slashes
-     * @param path1
-     * @param path2
-     */
-    function combinePath(path1: string, path2: string): string;
-    /**
-     * Converts a string to a `LinkType` value
-     * @param str
-     */
-    function strToLinkType(str: string): LinkType;
-    /**
-     * Converts a `LinkType` value to a string
-     * @param type
-     */
-    function linkTypeToStr(type: LinkType): string;
-    /**
-     * Parses the operator's format string and returns a list of tokens
-     * @param operator
-     */
-    function parseOperatorFormat(operator: any): FormatToken[];
-    /**
-     * Converts a value from one DataType to another
-     * @param value
-     * @param fromDataType - the original data type
-     * @param toDataType - the data type we want to get
-     */
-    function convertValue(value: string, fromDataType: DataType, toDataType: DataType): string;
-}
+import { DataType } from '@easydata/core';
+import { FormatToken } from "./format_parser";
+import { LinkType } from '../types/link_type';
+export declare namespace equtils {
+    /**
+     * Adds two paths and returns the result
+     * Correctly processes leading and trailing slashes
+     * @param path1
+     * @param path2
+     */
+    function combinePath(path1: string, path2: string): string;
+    /**
+     * Converts a string to a `LinkType` value
+     * @param str
+     */
+    function strToLinkType(str: string): LinkType;
+    /**
+     * Converts a `LinkType` value to a string
+     * @param type
+     */
+    function linkTypeToStr(type: LinkType): string;
+    /**
+     * Parses the operator's format string and returns a list of tokens
+     * @param operator
+     */
+    function parseOperatorFormat(operator: any): FormatToken[];
+    /**
+     * Converts a value from one DataType to another
+     * @param value
+     * @param fromDataType - the original data type
+     * @param toDataType - the data type we want to get
+     */
+    function convertValue(value: string, fromDataType: DataType, toDataType: DataType): string;
+}

package/dist/lib/utils/utils.js

@@ -1,103 +1,103 @@
-import { DataType } from '@easydata/core';
-import { i18n } from '@easydata/core';
-import { FormatParser } from "./format_parser";
-import { LinkType } from '../types/link_type';
-export var equtils;
-(function (equtils) {
-    /**
-     * 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;
-    }
-    equtils.combinePath = combinePath;
-    /**
-     * Converts a string to a `LinkType` value
-     * @param str
-     */
-    function strToLinkType(str) {
-        if (str == "All") {
-            return LinkType.All;
-        }
-        else if (str == "NotAll") {
-            return LinkType.NotAll;
-        }
-        else if (str == "Any") {
-            return LinkType.Any;
-        }
-        else {
-            return LinkType.None;
-        }
-    }
-    equtils.strToLinkType = strToLinkType;
-    /**
-     * Converts a `LinkType` value to a string
-     * @param type
-     */
-    function linkTypeToStr(type) {
-        if (type === LinkType.All) {
-            return "All";
-        }
-        else if (type === LinkType.NotAll) {
-            return "NotAll";
-        }
-        else if (type == LinkType.Any) {
-            return "Any";
-        }
-        else {
-            return "None";
-        }
-    }
-    equtils.linkTypeToStr = linkTypeToStr;
-    /**
-     * Parses the operator's format string and returns a list of tokens
-     * @param operator
-     */
-    function parseOperatorFormat(operator) {
-        var format = i18n.getText('Operators', operator.id, 'format');
-        if (!format) {
-            format = i18n.getText('Operators', operator.id, 'displayFormat');
-        }
-        if (!format) {
-            format = operator.displayFormat;
-        }
-        var parser = new FormatParser(format);
-        return parser.parse();
-    }
-    equtils.parseOperatorFormat = parseOperatorFormat;
-    //----------- value converstion utils --------------
-    /**
-     * Converts a value from one DataType to another
-     * @param value
-     * @param fromDataType - the original data type
-     * @param toDataType - the data type we want to get
-     */
-    function convertValue(value, fromDataType, toDataType) {
-        switch (toDataType) {
-            case DataType.String:
-                return value;
-            case (DataType.Autoinc, DataType.Byte, DataType.Int32, DataType.Int64, DataType.Word):
-                var resInt = parseInt(value);
-                return isNaN(resInt) ? '' : resInt.toString();
-            case (DataType.Currency, DataType.Float):
-                var resFloat = parseFloat(value);
-                return isNaN(resFloat) ? '' : resFloat.toString();
-            default:
-                return '';
-        }
-    }
-    equtils.convertValue = convertValue;
-})(equtils || (equtils = {}));
+import { DataType } from '@easydata/core';
+import { i18n } from '@easydata/core';
+import { FormatParser } from "./format_parser";
+import { LinkType } from '../types/link_type';
+export var equtils;
+(function (equtils) {
+    /**
+     * 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;
+    }
+    equtils.combinePath = combinePath;
+    /**
+     * Converts a string to a `LinkType` value
+     * @param str
+     */
+    function strToLinkType(str) {
+        if (str == "All") {
+            return LinkType.All;
+        }
+        else if (str == "NotAll") {
+            return LinkType.NotAll;
+        }
+        else if (str == "Any") {
+            return LinkType.Any;
+        }
+        else {
+            return LinkType.None;
+        }
+    }
+    equtils.strToLinkType = strToLinkType;
+    /**
+     * Converts a `LinkType` value to a string
+     * @param type
+     */
+    function linkTypeToStr(type) {
+        if (type === LinkType.All) {
+            return "All";
+        }
+        else if (type === LinkType.NotAll) {
+            return "NotAll";
+        }
+        else if (type == LinkType.Any) {
+            return "Any";
+        }
+        else {
+            return "None";
+        }
+    }
+    equtils.linkTypeToStr = linkTypeToStr;
+    /**
+     * Parses the operator's format string and returns a list of tokens
+     * @param operator
+     */
+    function parseOperatorFormat(operator) {
+        var format = i18n.getText('Operators', operator.id, 'format');
+        if (!format) {
+            format = i18n.getText('Operators', operator.id, 'displayFormat');
+        }
+        if (!format) {
+            format = operator.displayFormat;
+        }
+        var parser = new FormatParser(format);
+        return parser.parse();
+    }
+    equtils.parseOperatorFormat = parseOperatorFormat;
+    //----------- value converstion utils --------------
+    /**
+     * Converts a value from one DataType to another
+     * @param value
+     * @param fromDataType - the original data type
+     * @param toDataType - the data type we want to get
+     */
+    function convertValue(value, fromDataType, toDataType) {
+        switch (toDataType) {
+            case DataType.String:
+                return value;
+            case (DataType.Autoinc, DataType.Byte, DataType.Int32, DataType.Int64, DataType.Word):
+                var resInt = parseInt(value);
+                return isNaN(resInt) ? '' : resInt.toString();
+            case (DataType.Currency, DataType.Float):
+                var resFloat = parseFloat(value);
+                return isNaN(resFloat) ? '' : resFloat.toString();
+            default:
+                return '';
+        }
+    }
+    equtils.convertValue = convertValue;
+})(equtils || (equtils = {}));
 //# sourceMappingURL=utils.js.map

package/dist/lib/utils/version_info.d.ts

@@ -1,9 +1,9 @@
-declare class EqVersionInfo {
-    major: number;
-    minor: number;
-    update: number;
-    constructor(major: number, minor: number, update: number);
-    toString(): string;
-}
-export declare const versionInfo: EqVersionInfo;
-export {};
+declare class EqVersionInfo {
+    major: number;
+    minor: number;
+    update: number;
+    constructor(major: number, minor: number, update: number);
+    toString(): string;
+}
+export declare const versionInfo: EqVersionInfo;
+export {};

package/dist/lib/utils/version_info.js

@@ -1,13 +1,13 @@
-var EqVersionInfo = /** @class */ (function () {
-    function EqVersionInfo(major, minor, update) {
-        this.major = major;
-        this.minor = minor;
-        this.update = update;
-    }
-    EqVersionInfo.prototype.toString = function () {
-        return this.major + "." + this.minor + "." + this.update;
-    };
-    return EqVersionInfo;
-}());
-export var versionInfo = new EqVersionInfo(6, 2, 0);
+var EqVersionInfo = /** @class */ (function () {
+    function EqVersionInfo(major, minor, update) {
+        this.major = major;
+        this.minor = minor;
+        this.update = update;
+    }
+    EqVersionInfo.prototype.toString = function () {
+        return "".concat(this.major, ".").concat(this.minor, ".").concat(this.update);
+    };
+    return EqVersionInfo;
+}());
+export var versionInfo = new EqVersionInfo(6, 2, 0);
 //# sourceMappingURL=version_info.js.map

package/dist/lib/utils/version_info.js.map

@@ -1 +1 @@
-{"version":3,"file":"version_info.js","sourceRoot":"","sources":["../../../src/utils/version_info.ts"],"names":[],"mappings":"AAAA;IAEG,uBAAmB,KAAa,EAAS,KAAa,EAAS,MAAc;QAA1D,UAAK,GAAL,KAAK,CAAQ;QAAS,UAAK,GAAL,KAAK,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAG1E,gCAAQ,GAAf;QACI,OAAU,IAAI,CAAC,KAAK,SAAI,IAAI,CAAC,KAAK,SAAI,IAAI,CAAC,MAAQ,CAAA;IACvD,CAAC;IACJ,oBAAC;AAAD,CAAC,AARD,IAQC;AAED,MAAM,CAAC,IAAM,WAAW,GAAG,IAAI,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"version_info.js","sourceRoot":"","sources":["../../../src/utils/version_info.ts"],"names":[],"mappings":"AAAA;IAEG,uBAAmB,KAAa,EAAS,KAAa,EAAS,MAAc;QAA1D,UAAK,GAAL,KAAK,CAAQ;QAAS,UAAK,GAAL,KAAK,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAG1E,gCAAQ,GAAf;QACI,OAAO,UAAG,IAAI,CAAC,KAAK,cAAI,IAAI,CAAC,KAAK,cAAI,IAAI,CAAC,MAAM,CAAE,CAAA;IACvD,CAAC;IACJ,oBAAC;AAAD,CAAC,AARD,IAQC;AAED,MAAM,CAAC,IAAM,WAAW,GAAG,IAAI,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@easyquery/core",
-    "version": "7.2.3-rc03",
+    "version": "7.2.4-beta03",
     "description": "EasyQuery.JS Community core modules",
     "types": "./dist/lib/public_api.d.ts",
     "main": "./dist/bundles/easyquery.core.js",
@@ -31,24 +31,24 @@
     "bugs": "https://korzh.com/support",
     "license": "LGPL-3.0",
     "peerDependencies": {
-        "@easydata/core": "^1.4.13"
+        "@easydata/core": "^1.4.16"
     },
     "devDependencies": {
-        "@types/jasmine": "^3.3.12",
-        "@types/node": "12.7.8",
-        "es6-promise": "^4.2.6",
-        "jasmine": "^3.4.0",
+        "@olton/typedoc-webpack-plugin": "^0.1.0",
+        "@types/jasmine": "^4.3.2",
+        "@types/node": "20.2.5",
+        "es6-promise": "^4.2.8",
+        "jasmine": "^5.0.0",
         "jasmine-ts-console-reporter": "^3.1.1",
-        "jsdom": "^15.1.1",
-        "nodemon": "1.18.10",
-        "rimraf": "2.6.3",
-        "terser-webpack-plugin": "^4.2.3",
-        "ts-loader": "^5.3.3",
-        "typedoc": "^0.15.0",
-        "typedoc-webpack-plugin": "^1.1.4",
-        "typescript": "3.7.*",
-        "webpack": "^4.36.1",
-        "webpack-cli": "^3.3.6"
+        "jsdom": "^22.1.0",
+        "nodemon": "2.0.22",
+        "rimraf": "5.0.1",
+        "terser-webpack-plugin": "^5.3.9",
+        "ts-loader": "^9.4.3",
+        "typedoc": "^0.24.7",
+        "typescript": "5.0.*",
+        "webpack": "^5.84.1",
+        "webpack-cli": "^5.1.1"
     },
     "nodemonConfig": {
         "watch": [

package/webpack.config.js

@@ -1,7 +1,7 @@
 const path = require("path");
 const TerserPlugin = require('terser-webpack-plugin');
 const libName = "easyqueryCore";
-const TypedocWebpackPlugin = require('typedoc-webpack-plugin');
+const TypedocWebpackPlugin = require('@olton/typedoc-webpack-plugin');
 
 module.exports = {
     entry: {
@@ -31,8 +31,8 @@ module.exports = {
     optimization: {
         minimizer: [new TerserPlugin({
             include: /\.min\.js$/,
-            sourceMap: true,
 			terserOptions: {
+                sourceMap: true,
 				compress: {
 					pure_funcs: ['console.log', 'console.info', 'console.debug']
 				}
@@ -41,10 +41,11 @@ module.exports = {
     },
     plugins: [
         new TypedocWebpackPlugin({
-            mode: 'file',
             json: '../../../../docs/core.json',
-            includeDeclarations: false,
-			ignoreCompilerErrors: true
+            out: "docs",
+            entryPoints: ["./src/**/*.ts"],
+            tsconfig: "tsconfig.json",
+            compilerOptions: {}
         })
     ]
 }