@trudb/tru-common-lib 0.0.260 → 0.0.262

package/fesm2020/trudb-tru-common-lib.mjs

@@ -642,7 +642,7 @@ TruFormulaEval.compareResultForMismatchedParams = {
 class TruPredicate {
     constructor(field, operator, value, propertyQueryPath, overQuoted = false) {
         this._breezePredicate = null;
-        this.handleOperator = (fieldOrPredicate, operator, value, oper) => {
+        this.handleOperator = (fieldOrPredicate, oper, operator, value) => {
             var breezePredicate;
             if (Array.isArray(fieldOrPredicate)) {
                 breezePredicate = new TruPredicate(fieldOrPredicate[0], fieldOrPredicate[1], fieldOrPredicate[2], []);
@@ -658,11 +658,11 @@ class TruPredicate {
         };
         this.and = (fieldOrPredicate, operator, value) => {
             var that = this;
-            return this.handleOperator(fieldOrPredicate, operator, value, function (p) { return that._breezePredicate.and(p); });
+            return this.handleOperator(fieldOrPredicate, function (p) { return that._breezePredicate.and(p); }, operator, value);
         };
         this.or = (fieldOrPredicate, operator, value) => {
             var that = this;
-            return this.handleOperator(fieldOrPredicate, operator, value, function (p) { return that._breezePredicate.or(p); });
+            return this.handleOperator(fieldOrPredicate, function (p) { return that._breezePredicate.and(p); }, operator, value);
         };
         this.not = () => {
             var breezePredicate = this._breezePredicate.not();
@@ -808,12 +808,12 @@ class TruQueryPredicateManager {
         this.clear = () => {
             this.setPredicate(null);
         };
-        this.set = (queryPredicate) => {
-            if (this._predicate !== queryPredicate && this._predicateMap !== null) {
-                this._predicate = queryPredicate;
-                this._predicateMap[this._predicateName] = this._predicate === null ? null : this._predicate;
-            }
-        };
+        //set = (queryPredicate: TruPredicate) => {
+        //  if (this._predicate !== queryPredicate && this._predicateMap !== null) {
+        //    this._predicate = queryPredicate;
+        //    this._predicateMap[this._predicateName] = this._predicate === null ? null : this._predicate;
+        //  }
+        //}
         /**
        * Returns a new query predicate.
        *
@@ -824,6 +824,14 @@ class TruQueryPredicateManager {
         this.create = (field, operator, value, overQuoted) => {
             return new TruPredicate(field, operator, value, this._propertyQueryPath, overQuoted)._breezePredicate;
         };
+        this.set = (fieldOrPredicate, operator, value, overQuoted = false) => {
+            var predicate;
+            if (fieldOrPredicate.constructor === TruPredicate)
+                predicate = fieldOrPredicate;
+            else
+                predicate = this.create(fieldOrPredicate, operator, value, overQuoted);
+            this.setPredicate(predicate);
+        };
         this._propertyQueryPath = propertyQueryPath;
         this._predicateName = predicateName;
         this._predicateMap = predicateMap;