@easyquery/core 7.2.3-rc03 → 7.2.4-beta03

package/dist/lib/dm/entity.js

@@ -1,89 +1,91 @@
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-import { MetaEntity, MetaEntityAttr } from '@easydata/core';
-/**
- * Represents one entity.
- */
-var Entity = /** @class */ (function (_super) {
-    __extends(Entity, _super);
-    /** The default constructor. */
-    function Entity(parent) {
-        var _this = _super.call(this, parent) || this;
-        _this.useInConditions = false;
-        _this.useInResult = false;
-        _this.useInSorting = false;
-        return _this;
-    }
-    /**
-    * Loads entity from its JSON representation object.
-    * @param model The Data Model.
-    * @param data The JSON representation object.
-    */
-    Entity.prototype.loadFromData = function (model, data) {
-        _super.prototype.loadFromData.call(this, model, data);
-        if (data) {
-            this.useInConditions = data.uic;
-            this.useInResult = data.uir;
-            this.useInSorting = data.uis;
-        }
-    };
-    Entity.prototype.scan = function (processAttribute, processEntity) {
-        _super.prototype.scan.call(this, function (attr, opts) { return processAttribute && processAttribute(attr, opts); }, function (entity, opts) { return processEntity && processEntity(entity, opts); });
-    };
-    return Entity;
-}(MetaEntity));
-export { Entity };
-/**
- * Represents entity attribute.
- */
-var EntityAttr = /** @class */ (function (_super) {
-    __extends(EntityAttr, _super);
-    /** The default constructor. */
-    function EntityAttr(entity) {
-        var _this = _super.call(this, entity) || this;
-        /**
-         * The parameters associated with this entity attribute
-         */
-        _this.params = [];
-        _this.useInConditions = true;
-        _this.useInResult = true;
-        _this.useInSorting = true;
-        _this.defaultOperator = "";
-        _this.operators = new Array();
-        _this.lookupAttr = "";
-        _this.expr = "";
-        return _this;
-    }
-    /**
-     * Loads entity attribute from JSON representation object.
-     * @param model The Data Model.
-     * @param data The JSON representation object.
-     */
-    EntityAttr.prototype.loadFromData = function (model, data) {
-        _super.prototype.loadFromData.call(this, model, data);
-        if (data) {
-            this.useInConditions = data.uic;
-            this.useInResult = data.uir;
-            this.useInSorting = data.uis;
-            this.expr = data.sql;
-            this.defaultOperator = data.defOperator;
-            this.operators = data.ops;
-            if (data.udata)
-                this.userData = data.udata;
-        }
-    };
-    return EntityAttr;
-}(MetaEntityAttr));
-export { EntityAttr };
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+import { MetaEntity, MetaEntityAttr } from '@easydata/core';
+/**
+ * Represents one entity.
+ */
+var Entity = /** @class */ (function (_super) {
+    __extends(Entity, _super);
+    /** The default constructor. */
+    function Entity(parent) {
+        var _this = _super.call(this, parent) || this;
+        _this.useInConditions = false;
+        _this.useInResult = false;
+        _this.useInSorting = false;
+        return _this;
+    }
+    /**
+    * Loads entity from its JSON representation object.
+    * @param model The Data Model.
+    * @param data The JSON representation object.
+    */
+    Entity.prototype.loadFromData = function (model, data) {
+        _super.prototype.loadFromData.call(this, model, data);
+        if (data) {
+            this.useInConditions = data.uic;
+            this.useInResult = data.uir;
+            this.useInSorting = data.uis;
+        }
+    };
+    Entity.prototype.scan = function (processAttribute, processEntity) {
+        _super.prototype.scan.call(this, function (attr, opts) { return processAttribute && processAttribute(attr, opts); }, function (entity, opts) { return processEntity && processEntity(entity, opts); });
+    };
+    return Entity;
+}(MetaEntity));
+export { Entity };
+/**
+ * Represents entity attribute.
+ */
+var EntityAttr = /** @class */ (function (_super) {
+    __extends(EntityAttr, _super);
+    /** The default constructor. */
+    function EntityAttr(entity) {
+        var _this = _super.call(this, entity) || this;
+        /**
+         * The parameters associated with this entity attribute
+         */
+        _this.params = [];
+        _this.useInConditions = true;
+        _this.useInResult = true;
+        _this.useInSorting = true;
+        _this.defaultOperator = "";
+        _this.operators = new Array();
+        _this.lookupAttr = "";
+        _this.expr = "";
+        return _this;
+    }
+    /**
+     * Loads entity attribute from JSON representation object.
+     * @param model The Data Model.
+     * @param data The JSON representation object.
+     */
+    EntityAttr.prototype.loadFromData = function (model, data) {
+        _super.prototype.loadFromData.call(this, model, data);
+        if (data) {
+            this.useInConditions = data.uic;
+            this.useInResult = data.uir;
+            this.useInSorting = data.uis;
+            this.expr = data.sql;
+            this.defaultOperator = data.defOperator;
+            this.operators = data.ops;
+            if (data.udata)
+                this.userData = data.udata;
+        }
+    };
+    return EntityAttr;
+}(MetaEntityAttr));
+export { EntityAttr };
 //# sourceMappingURL=entity.js.map

package/dist/lib/dm/entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/dm/entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAO5D;;GAEG;AACH;IAA4B,0BAAU;IAuBlC,+BAA+B;IAC/B,gBAAY,MAAe;QAA3B,YACI,kBAAM,MAAM,CAAC,SAIhB;QAHG,KAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,KAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,KAAI,CAAC,YAAY,GAAG,KAAK,CAAC;;IAC9B,CAAC;IAGA;;;;MAIE;IACI,6BAAY,GAAnB,UAAoB,KAAgB,EAAE,IAAgB;QAElD,iBAAM,YAAY,YAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAC/B,IAAI,IAAI,EAAE;YACN,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC;YAChC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC;YAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC;SAChC;IACL,CAAC;IAGM,qBAAI,GAAX,UAAY,gBAAwD,EAChE,aAAmD;QACpD,iBAAM,IAAI,YACN,UAAC,IAAI,EAAE,IAAI,IAAK,OAAA,gBAAgB,IAAI,gBAAgB,CAAC,IAAkB,EAAE,IAAI,CAAC,EAA9D,CAA8D,EAC9E,UAAC,MAAM,EAAE,IAAI,IAAK,OAAA,aAAa,IAAI,aAAa,CAAC,MAAgB,EAAE,IAAI,CAAC,EAAtD,CAAsD,CAC1E,CAAC;IACN,CAAC;IAEL,aAAC;AAAD,CAAC,AAxDD,CAA4B,UAAU,GAwDrC;;AAED;;GAEG;AACH;IAAgC,8BAAc;IAmC1C,+BAA+B;IAC/B,oBAAY,MAAc;QAA1B,YACI,kBAAM,MAAM,CAAC,SAQhB;QApBD;;WAEG;QACI,YAAM,GAAiB,EAAE,CAAC;QAU7B,KAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,KAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,KAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,KAAI,CAAC,SAAS,GAAG,IAAI,KAAK,EAAU,CAAC;QACrC,KAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,KAAI,CAAC,IAAI,GAAG,EAAE,CAAC;;IACnB,CAAC;IAED;;;;OAIG;IACI,iCAAY,GAAnB,UAAoB,KAAgB,EAAE,IAAoB;QAEtD,iBAAM,YAAY,YAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEhC,IAAI,IAAI,EAAE;YAEN,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC;YAChC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC;YAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC;YAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;YACrB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC;YACxC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;YAE1B,IAAI,IAAI,CAAC,KAAK;gBACV,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;SAElC;IACL,CAAC;IACL,iBAAC;AAAD,CAAC,AAtED,CAAgC,cAAc,GAsE7C"}
+{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/dm/entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAO5D;;GAEG;AACH;IAA4B,0BAAU;IAuBlC,+BAA+B;IAC/B,gBAAY,MAAe;QAA3B,YACI,kBAAM,MAAM,CAAC,SAIhB;QAHG,KAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,KAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,KAAI,CAAC,YAAY,GAAG,KAAK,CAAC;;IAC9B,CAAC;IAGA;;;;MAIE;IACI,6BAAY,GAAnB,UAAoB,KAAgB,EAAE,IAAgB;QAElD,iBAAM,YAAY,YAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAC/B,IAAI,IAAI,EAAE;YACN,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC;YAChC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC;YAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC;SAChC;IACL,CAAC;IAGM,qBAAI,GAAX,UAAY,gBAAwD,EAChE,aAAmD;QACpD,iBAAM,IAAI,YACN,UAAC,IAAI,EAAE,IAAI,IAAK,OAAA,gBAAgB,IAAI,gBAAgB,CAAC,IAAkB,EAAE,IAAI,CAAC,EAA9D,CAA8D,EAC9E,UAAC,MAAM,EAAE,IAAI,IAAK,OAAA,aAAa,IAAI,aAAa,CAAC,MAAgB,EAAE,IAAI,CAAC,EAAtD,CAAsD,CAC1E,CAAC;IACN,CAAC;IAEL,aAAC;AAAD,CAAC,AAxDD,CAA4B,UAAU,GAwDrC;;AAED;;GAEG;AACH;IAAgC,8BAAc;IAmC1C,+BAA+B;IAC/B,oBAAY,MAAc;QAA1B,YACI,kBAAM,MAAM,CAAC,SAQhB;QApBD;;WAEG;QACI,YAAM,GAAiB,EAAE,CAAC;QAU7B,KAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,KAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,KAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,KAAI,CAAC,SAAS,GAAG,IAAI,KAAK,EAAU,CAAC;QACrC,KAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,KAAI,CAAC,IAAI,GAAG,EAAE,CAAC;;IACnB,CAAC;IAED;;;;OAIG;IACI,iCAAY,GAAnB,UAAoB,KAAgB,EAAE,IAAoB;QAEtD,iBAAM,YAAY,YAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEhC,IAAI,IAAI,EAAE;YAEN,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC;YAChC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC;YAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC;YAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;YACrB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC;YACxC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;YAE1B,IAAI,IAAI,CAAC,KAAK;gBACV,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;SAElC;IACL,CAAC;IACL,iBAAC;AAAD,CAAC,AAtED,CAAgC,cAAc,GAsE7C"}

package/dist/lib/dm/link.d.ts

@@ -1,7 +1,7 @@
-import { Entity, EntityAttr } from "./entity";
-export interface Link {
-    entityFrom: Entity;
-    attrFrom: EntityAttr;
-    entityTo: Entity;
-    attrTo: EntityAttr;
-}
+import { Entity, EntityAttr } from "./entity";
+export interface Link {
+    entityFrom: Entity;
+    attrFrom: EntityAttr;
+    entityTo: Entity;
+    attrTo: EntityAttr;
+}

package/dist/lib/dm/link.js

@@ -1 +1,2 @@
+export {};
 //# sourceMappingURL=link.js.map

package/dist/lib/dm/operator.d.ts

@@ -1,80 +1,80 @@
-import { DataType } from '@easydata/core';
-import { EqValueEditor } from './value_editor';
-import { DataModel } from '../dm/data_model';
-import { DataKind } from '../types/data_kind';
-import { OperatorData, OperandData } from './dto/operator_data';
-/**
- * Represents a logical expression or predicate, like comparisions or `LIKE` predicate.
- */
-export declare class Operator {
-    /** The operator ID. */
-    id: string;
-    /** The operator caption. */
-    caption: string;
-    /** The display format of operator. */
-    displayFormat: string;
-    /**
-     * The value indicating whether this operator requires range values so first value must be less than the second one.
-     */
-    isRange: boolean;
-    /**
-     * The value indicating whether the operator is case insensative.
-     */
-    caseIns: boolean;
-    /**
-     *  The number of parameters which are taken by the operator.
-     */
-    paramCount: number;
-    defaultOperand: Operand;
-    /** The operands for this operator. */
-    operands: Operand[];
-    expr: string;
-    constValueFormat: string;
-    appliedTypes: DataType[];
-    /** The default constructor. */
-    constructor();
-    /**
-    * Loads operator from its JSON representation object.
-    * @param model The Data Model.
-    * @param data The JSON representation object.
-    */
-    loadFromData(model: DataModel, data: OperatorData): void;
-}
-/**
- * Represents one operand in some operator's expression
- */
-export declare class Operand {
-    /**
-     * The kind of operand (`scalar`, `list`, etc)
-     */
-    kind: DataKind;
-    /**
-     * The type of the data.
-     */
-    dataType: DataType;
-    /**
-     * The value editor associated with this operand.
-     */
-    editor: EqValueEditor;
-    /**
-     * The default value for this operand.
-     */
-    defValue: string;
-    /**
-     * The text for default operand value.
-     */
-    defText: string;
-    /** The default constructor. */
-    constructor();
-    /**
-     * Loads operand from its JSON representation object.
-     * @param model The Data Model.
-     * @param data The JSON representation object.
-     */
-    loadFromData(model: DataModel, operand: OperandData): void;
-    /**
-     * Copies operand from other operand.
-     * @param scr The operand.
-     */
-    copyFrom(src: Operand): void;
-}
+import { DataType } from '@easydata/core';
+import { EqValueEditor } from './value_editor';
+import { DataModel } from '../dm/data_model';
+import { DataKind } from '../types/data_kind';
+import { OperatorData, OperandData } from './dto/operator_data';
+/**
+ * Represents a logical expression or predicate, like comparisions or `LIKE` predicate.
+ */
+export declare class Operator {
+    /** The operator ID. */
+    id: string;
+    /** The operator caption. */
+    caption: string;
+    /** The display format of operator. */
+    displayFormat: string;
+    /**
+     * The value indicating whether this operator requires range values so first value must be less than the second one.
+     */
+    isRange: boolean;
+    /**
+     * The value indicating whether the operator is case insensative.
+     */
+    caseIns: boolean;
+    /**
+     *  The number of parameters which are taken by the operator.
+     */
+    paramCount: number;
+    defaultOperand: Operand;
+    /** The operands for this operator. */
+    operands: Operand[];
+    expr: string;
+    constValueFormat: string;
+    appliedTypes: DataType[];
+    /** The default constructor. */
+    constructor();
+    /**
+    * Loads operator from its JSON representation object.
+    * @param model The Data Model.
+    * @param data The JSON representation object.
+    */
+    loadFromData(model: DataModel, data: OperatorData): void;
+}
+/**
+ * Represents one operand in some operator's expression
+ */
+export declare class Operand {
+    /**
+     * The kind of operand (`scalar`, `list`, etc)
+     */
+    kind: DataKind;
+    /**
+     * The type of the data.
+     */
+    dataType: DataType;
+    /**
+     * The value editor associated with this operand.
+     */
+    editor: EqValueEditor;
+    /**
+     * The default value for this operand.
+     */
+    defValue: string;
+    /**
+     * The text for default operand value.
+     */
+    defText: string;
+    /** The default constructor. */
+    constructor();
+    /**
+     * Loads operand from its JSON representation object.
+     * @param model The Data Model.
+     * @param data The JSON representation object.
+     */
+    loadFromData(model: DataModel, operand: OperandData): void;
+    /**
+     * Copies operand from other operand.
+     * @param scr The operand.
+     */
+    copyFrom(src: Operand): void;
+}

package/dist/lib/dm/operator.js

@@ -1,94 +1,94 @@
-import { DataType, utils as dataUtils } from '@easydata/core';
-import { EqValueEditor } from './value_editor';
-import { DataKind } from '../types/data_kind';
-/**
- * Represents a logical expression or predicate, like comparisions or `LIKE` predicate.
- */
-var Operator = /** @class */ (function () {
-    /** The default constructor. */
-    function Operator() {
-        this.id = "";
-        this.expr = "";
-        this.constValueFormat = "{const}";
-        this.caption = "{Unrecognized operator}";
-        this.displayFormat = "{expr1} [[{unrecognized operator}]] {expr2}";
-        this.isRange = false;
-        this.caseIns = false;
-        this.paramCount = 2;
-        this.defaultOperand = new Operand();
-        this.appliedTypes = [];
-        this.operands = new Array();
-    }
-    /**
-    * Loads operator from its JSON representation object.
-    * @param model The Data Model.
-    * @param data The JSON representation object.
-    */
-    Operator.prototype.loadFromData = function (model, data) {
-        if (data) {
-            this.id = data.id;
-            this.caption = data.cptn;
-            this.caseIns = data.caseIns;
-            this.isRange = data.isRange;
-            this.displayFormat = data.fmt;
-            this.paramCount = data.pcnt;
-            this.expr = data.expr;
-            this.appliedTypes = data.dtypes || this.appliedTypes;
-            if (data.defOperand) {
-                this.defaultOperand.loadFromData(model, data.defOperand);
-            }
-            if (data.editor) {
-                this.defaultOperand.editor = model.getEditorById(data.editor) || new EqValueEditor();
-            }
-            if (data.operands) {
-                for (var i = 0; i < data.operands.length; i++) {
-                    var newOperand = new Operand();
-                    newOperand.loadFromData(model, data.operands[i]);
-                    if (data.editor) {
-                        newOperand.editor = model.getEditorById(data.editor) || new EqValueEditor();
-                    }
-                    this.operands.push(newOperand);
-                }
-            }
-        }
-    };
-    return Operator;
-}());
-export { Operator };
-/**
- * Represents one operand in some operator's expression
- */
-var Operand = /** @class */ (function () {
-    /** The default constructor. */
-    function Operand() {
-        this.kind = DataKind.Scalar;
-        this.dataType = DataType.Unknown;
-        this.editor = new EqValueEditor();
-        this.defValue = "";
-    }
-    /**
-     * Loads operand from its JSON representation object.
-     * @param model The Data Model.
-     * @param data The JSON representation object.
-     */
-    Operand.prototype.loadFromData = function (model, operand) {
-        this.kind = operand.kind;
-        this.dataType = operand.dtype;
-        this.defValue = operand.val;
-        this.defText = operand.txt;
-        ;
-        if (operand.editor) {
-            this.editor = model.getEditorById(operand.editor) || new EqValueEditor();
-        }
-    };
-    /**
-     * Copies operand from other operand.
-     * @param scr The operand.
-     */
-    Operand.prototype.copyFrom = function (src) {
-        dataUtils.assign(this, src);
-    };
-    return Operand;
-}());
-export { Operand };
+import { DataType, utils as dataUtils } from '@easydata/core';
+import { EqValueEditor } from './value_editor';
+import { DataKind } from '../types/data_kind';
+/**
+ * Represents a logical expression or predicate, like comparisions or `LIKE` predicate.
+ */
+var Operator = /** @class */ (function () {
+    /** The default constructor. */
+    function Operator() {
+        this.id = "";
+        this.expr = "";
+        this.constValueFormat = "{const}";
+        this.caption = "{Unrecognized operator}";
+        this.displayFormat = "{expr1} [[{unrecognized operator}]] {expr2}";
+        this.isRange = false;
+        this.caseIns = false;
+        this.paramCount = 2;
+        this.defaultOperand = new Operand();
+        this.appliedTypes = [];
+        this.operands = new Array();
+    }
+    /**
+    * Loads operator from its JSON representation object.
+    * @param model The Data Model.
+    * @param data The JSON representation object.
+    */
+    Operator.prototype.loadFromData = function (model, data) {
+        if (data) {
+            this.id = data.id;
+            this.caption = data.cptn;
+            this.caseIns = data.caseIns;
+            this.isRange = data.isRange;
+            this.displayFormat = data.fmt;
+            this.paramCount = data.pcnt;
+            this.expr = data.expr;
+            this.appliedTypes = data.dtypes || this.appliedTypes;
+            if (data.defOperand) {
+                this.defaultOperand.loadFromData(model, data.defOperand);
+            }
+            if (data.editor) {
+                this.defaultOperand.editor = model.getEditorById(data.editor) || new EqValueEditor();
+            }
+            if (data.operands) {
+                for (var i = 0; i < data.operands.length; i++) {
+                    var newOperand = new Operand();
+                    newOperand.loadFromData(model, data.operands[i]);
+                    if (data.editor) {
+                        newOperand.editor = model.getEditorById(data.editor) || new EqValueEditor();
+                    }
+                    this.operands.push(newOperand);
+                }
+            }
+        }
+    };
+    return Operator;
+}());
+export { Operator };
+/**
+ * Represents one operand in some operator's expression
+ */
+var Operand = /** @class */ (function () {
+    /** The default constructor. */
+    function Operand() {
+        this.kind = DataKind.Scalar;
+        this.dataType = DataType.Unknown;
+        this.editor = new EqValueEditor();
+        this.defValue = "";
+    }
+    /**
+     * Loads operand from its JSON representation object.
+     * @param model The Data Model.
+     * @param data The JSON representation object.
+     */
+    Operand.prototype.loadFromData = function (model, operand) {
+        this.kind = operand.kind;
+        this.dataType = operand.dtype;
+        this.defValue = operand.val;
+        this.defText = operand.txt;
+        ;
+        if (operand.editor) {
+            this.editor = model.getEditorById(operand.editor) || new EqValueEditor();
+        }
+    };
+    /**
+     * Copies operand from other operand.
+     * @param scr The operand.
+     */
+    Operand.prototype.copyFrom = function (src) {
+        dataUtils.assign(this, src);
+    };
+    return Operand;
+}());
+export { Operand };
 //# sourceMappingURL=operator.js.map

package/dist/lib/dm/value_editor.d.ts

@@ -1,16 +1,16 @@
-import { ValueEditor } from '@easydata/core';
-import { EqEditorTag } from '../types/eq_editor_tag';
-import { ValueEditorData } from './dto/ve_data';
-/**
- * Represents a value editor.
- */
-export declare class EqValueEditor extends ValueEditor {
-    tag: EqEditorTag;
-    /** The default constructor. */
-    constructor();
-    /**
-     * Loads value editor from its JSON representation object.
-     * @param data The JSON representation object.
-     */
-    loadFromData(data: ValueEditorData): void;
-}
+import { ValueEditor } from '@easydata/core';
+import { EqEditorTag } from '../types/eq_editor_tag';
+import { ValueEditorData } from './dto/ve_data';
+/**
+ * Represents a value editor.
+ */
+export declare class EqValueEditor extends ValueEditor {
+    tag: EqEditorTag;
+    /** The default constructor. */
+    constructor();
+    /**
+     * Loads value editor from its JSON representation object.
+     * @param data The JSON representation object.
+     */
+    loadFromData(data: ValueEditorData): void;
+}