@trudb/tru-common-lib 0.0.261 → 0.0.262
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/classes/tru-predicate.mjs +4 -4
- package/fesm2015/trudb-tru-common-lib.mjs +3 -3
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +3 -3
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/classes/tru-predicate.d.ts +3 -3
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@ import { AndOrPredicate, BinaryPredicate, breeze } from "breeze-client";
|
|
|
2
2
|
export class TruPredicate {
|
|
3
3
|
constructor(field, operator, value, propertyQueryPath, overQuoted = false) {
|
|
4
4
|
this._breezePredicate = null;
|
|
5
|
-
this.handleOperator = (fieldOrPredicate, operator, value
|
|
5
|
+
this.handleOperator = (fieldOrPredicate, oper, operator, value) => {
|
|
6
6
|
var breezePredicate;
|
|
7
7
|
if (Array.isArray(fieldOrPredicate)) {
|
|
8
8
|
breezePredicate = new TruPredicate(fieldOrPredicate[0], fieldOrPredicate[1], fieldOrPredicate[2], []);
|
|
@@ -18,11 +18,11 @@ export class TruPredicate {
|
|
|
18
18
|
};
|
|
19
19
|
this.and = (fieldOrPredicate, operator, value) => {
|
|
20
20
|
var that = this;
|
|
21
|
-
return this.handleOperator(fieldOrPredicate,
|
|
21
|
+
return this.handleOperator(fieldOrPredicate, function (p) { return that._breezePredicate.and(p); }, operator, value);
|
|
22
22
|
};
|
|
23
23
|
this.or = (fieldOrPredicate, operator, value) => {
|
|
24
24
|
var that = this;
|
|
25
|
-
return this.handleOperator(fieldOrPredicate,
|
|
25
|
+
return this.handleOperator(fieldOrPredicate, function (p) { return that._breezePredicate.and(p); }, operator, value);
|
|
26
26
|
};
|
|
27
27
|
this.not = () => {
|
|
28
28
|
var breezePredicate = this._breezePredicate.not();
|
|
@@ -44,4 +44,4 @@ export class TruPredicate {
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LXByZWRpY2F0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3RydS1jb21tb24tbGliL3NyYy9saWIvY2xhc3Nlcy90cnUtcHJlZGljYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsZUFBZSxFQUFFLE1BQU0sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV4RSxNQUFNLE9BQU8sWUFBWTtJQUd2QixZQUFZLEtBQVUsRUFBRSxRQUF1QixFQUFFLEtBQVUsRUFBRSxpQkFBdUMsRUFBRSxhQUFzQixLQUFLO1FBRmpJLHFCQUFnQixHQUFRLElBQUksQ0FBQztRQWlCN0IsbUJBQWMsR0FBRyxDQUFDLGdCQUFxQixFQUFFLElBQW9CLEVBQUUsUUFBaUIsRUFBRSxLQUFXLEVBQUUsRUFBRTtZQUMvRixJQUFJLGVBQWUsQ0FBQztZQUNwQixJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsRUFBRTtnQkFDbkMsZUFBZSxHQUFHLElBQUksWUFBWSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO2FBQ3ZHO2lCQUFNLElBQUksZ0JBQWdCLENBQUMsV0FBVyxLQUFLLFlBQVksSUFBSSxnQkFBZ0IsQ0FBQyxXQUFXLEtBQUssZUFBZSxJQUFJLGdCQUFnQixDQUFDLFdBQVcsS0FBSyxjQUFjLEVBQUU7Z0JBQy9KLGVBQWUsR0FBRyxnQkFBZ0IsQ0FBQzthQUNwQztpQkFBTTtnQkFDTCxNQUFNLElBQUksU0FBUyxDQUFDLDZCQUE2QixHQUFHLGdCQUFnQixDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsQ0FBQzthQUMxRjtZQUNELGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7WUFDeEMsT0FBTyxJQUFJLFlBQVksQ0FBQyxlQUFlLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUM3RCxDQUFDLENBQUE7UUFFRCxRQUFHLEdBQUcsQ0FBQyxnQkFBcUIsRUFBRSxRQUFpQixFQUFFLEtBQVcsRUFBRSxFQUFFO1lBQzlELElBQUksSUFBSSxHQUFHLElBQUksQ0FBQztZQUNoQixPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLElBQUksT0FBTyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN2SCxDQUFDLENBQUE7UUFFRCxPQUFFLEdBQUcsQ0FBQyxnQkFBcUIsRUFBRSxRQUFpQixFQUFFLEtBQVcsRUFBRSxFQUFFO1lBQzdELElBQUksSUFBSSxHQUFHLElBQUksQ0FBQztZQUNoQixPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLElBQUksT0FBTyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN2SCxDQUFDLENBQUE7UUFFRCxRQUFHLEdBQUcsR0FBRyxFQUFFO1lBQ1QsSUFBSSxlQUFlLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ2xELE9BQU8sSUFBSSxZQUFZLENBQUMsZUFBZSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDN0QsQ0FBQyxDQUFBO1FBeENDLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxFQUFFO1lBQzdCLElBQUksSUFBSSxHQUFHLGlCQUFpQixFQUFFLEtBQUssQ0FBQyxDQUFDLENBQWUsQ0FBQztZQUNyRCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUM7WUFDL0IsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFrQixDQUFDLENBQUM7WUFDOUIsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNqQixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxNQUFNLENBQUMsU0FBUyxDQUFDLElBQWtCLENBQUMsQ0FBQztZQUNqRSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztTQUMvQzthQUFNLElBQUksU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsS0FBSyxZQUFZLElBQUksU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsS0FBSyxlQUFlLElBQUksU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsS0FBSyxjQUFjLEVBQUU7WUFDbkosSUFBSSxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUN0QzthQUFNO1lBQ0wsTUFBTSxJQUFJLFNBQVMsQ0FBQyw2QkFBNkIsR0FBRyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxDQUFDO1NBQ3RGO0lBQ0gsQ0FBQztDQTZCRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFuZE9yUHJlZGljYXRlLCBCaW5hcnlQcmVkaWNhdGUsIGJyZWV6ZSB9IGZyb20gXCJicmVlemUtY2xpZW50XCI7XHJcblxyXG5leHBvcnQgY2xhc3MgVHJ1UHJlZGljYXRlIHtcclxuICBfYnJlZXplUHJlZGljYXRlOiBhbnkgPSBudWxsO1xyXG5cclxuICBjb25zdHJ1Y3RvcihmaWVsZDogYW55LCBvcGVyYXRvcjogc3RyaW5nIHwgbnVsbCwgdmFsdWU6IGFueSwgcHJvcGVydHlRdWVyeVBhdGg6IEFycmF5PHN0cmluZz4gfCBudWxsLCBvdmVyUXVvdGVkOiBib29sZWFuID0gZmFsc2UpIHtcclxuICAgIGlmICh0eXBlb2YgZmllbGQgPT09ICdzdHJpbmcnKSB7XHJcbiAgICAgIHZhciBhcmdzID0gcHJvcGVydHlRdWVyeVBhdGg/LnNsaWNlKDApIGFzIEFycmF5PGFueT47XHJcbiAgICAgIGFyZ3NbYXJncy5sZW5ndGggLSAxXSArPSBmaWVsZDtcclxuICAgICAgYXJncy5wdXNoKG9wZXJhdG9yIGFzIHN0cmluZyk7XHJcbiAgICAgIGFyZ3MucHVzaCh2YWx1ZSk7XHJcbiAgICAgIHRoaXMuX2JyZWV6ZVByZWRpY2F0ZSA9IG5ldyBicmVlemUuUHJlZGljYXRlKGFyZ3MgYXMgQXJyYXk8YW55Pik7XHJcbiAgICAgIHRoaXMuX2JyZWV6ZVByZWRpY2F0ZS5vdmVyUXVvdGVkID0gb3ZlclF1b3RlZDtcclxuICAgIH0gZWxzZSBpZiAoYXJndW1lbnRzWzBdLmNvbnN0cnVjdG9yID09PSBUcnVQcmVkaWNhdGUgfHwgYXJndW1lbnRzWzBdLmNvbnN0cnVjdG9yID09PSBCaW5hcnlQcmVkaWNhdGUgfHwgYXJndW1lbnRzWzBdLmNvbnN0cnVjdG9yID09PSBBbmRPclByZWRpY2F0ZSkge1xyXG4gICAgICB0aGlzLl9icmVlemVQcmVkaWNhdGUgPSBhcmd1bWVudHNbMF07XHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCdVbmV4cGVjdGVkIHBhcmFtZXRlciB0eXBlIDwnICsgYXJndW1lbnRzWzBdLmNvbnN0cnVjdG9yICsgJz4uJyk7XHJcbiAgICB9XHJcbiAgfVxyXG5cclxuICBoYW5kbGVPcGVyYXRvciA9IChmaWVsZE9yUHJlZGljYXRlOiBhbnksIG9wZXI6IChwOiBhbnkpID0+IHt9LCBvcGVyYXRvcj86IHN0cmluZywgdmFsdWU/OiBhbnkpID0+IHtcclxuICAgIHZhciBicmVlemVQcmVkaWNhdGU7XHJcbiAgICBpZiAoQXJyYXkuaXNBcnJheShmaWVsZE9yUHJlZGljYXRlKSkge1xyXG4gICAgICBicmVlemVQcmVkaWNhdGUgPSBuZXcgVHJ1UHJlZGljYXRlKGZpZWxkT3JQcmVkaWNhdGVbMF0sIGZpZWxkT3JQcmVkaWNhdGVbMV0sIGZpZWxkT3JQcmVkaWNhdGVbMl0sIFtdKTtcclxuICAgIH0gZWxzZSBpZiAoZmllbGRPclByZWRpY2F0ZS5jb25zdHJ1Y3RvciA9PT0gVHJ1UHJlZGljYXRlIHx8IGZpZWxkT3JQcmVkaWNhdGUuY29uc3RydWN0b3IgPT09IEJpbmFyeVByZWRpY2F0ZSB8fCBmaWVsZE9yUHJlZGljYXRlLmNvbnN0cnVjdG9yID09PSBBbmRPclByZWRpY2F0ZSkge1xyXG4gICAgICBicmVlemVQcmVkaWNhdGUgPSBmaWVsZE9yUHJlZGljYXRlO1xyXG4gICAgfSBlbHNlIHtcclxuICAgICAgdGhyb3cgbmV3IFR5cGVFcnJvcignVW5leHBlY3RlZCBwYXJhbWV0ZXIgdHlwZSA8JyArIGZpZWxkT3JQcmVkaWNhdGUuY29uc3RydWN0b3IgKyAnPi4nKTtcclxuICAgIH1cclxuICAgIGJyZWV6ZVByZWRpY2F0ZSA9IG9wZXIoYnJlZXplUHJlZGljYXRlKTtcclxuICAgIHJldHVybiBuZXcgVHJ1UHJlZGljYXRlKGJyZWV6ZVByZWRpY2F0ZSwgbnVsbCwgbnVsbCwgbnVsbCk7XHJcbiAgfVxyXG5cclxuICBhbmQgPSAoZmllbGRPclByZWRpY2F0ZTogYW55LCBvcGVyYXRvcj86IHN0cmluZywgdmFsdWU/OiBhbnkpID0+IHtcclxuICAgIHZhciB0aGF0ID0gdGhpcztcclxuICAgIHJldHVybiB0aGlzLmhhbmRsZU9wZXJhdG9yKGZpZWxkT3JQcmVkaWNhdGUsIGZ1bmN0aW9uIChwKSB7IHJldHVybiB0aGF0Ll9icmVlemVQcmVkaWNhdGUuYW5kKHApOyB9LCBvcGVyYXRvciwgdmFsdWUpO1xyXG4gIH1cclxuXHJcbiAgb3IgPSAoZmllbGRPclByZWRpY2F0ZTogYW55LCBvcGVyYXRvcj86IHN0cmluZywgdmFsdWU/OiBhbnkpID0+IHtcclxuICAgIHZhciB0aGF0ID0gdGhpcztcclxuICAgIHJldHVybiB0aGlzLmhhbmRsZU9wZXJhdG9yKGZpZWxkT3JQcmVkaWNhdGUsIGZ1bmN0aW9uIChwKSB7IHJldHVybiB0aGF0Ll9icmVlemVQcmVkaWNhdGUuYW5kKHApOyB9LCBvcGVyYXRvciwgdmFsdWUpO1xyXG4gIH1cclxuXHJcbiAgbm90ID0gKCkgPT4ge1xyXG4gICAgdmFyIGJyZWV6ZVByZWRpY2F0ZSA9IHRoaXMuX2JyZWV6ZVByZWRpY2F0ZS5ub3QoKTtcclxuICAgIHJldHVybiBuZXcgVHJ1UHJlZGljYXRlKGJyZWV6ZVByZWRpY2F0ZSwgbnVsbCwgbnVsbCwgbnVsbCk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -642,7 +642,7 @@ TruFormulaEval.compareResultForMismatchedParams = {
|
|
|
642
642
|
class TruPredicate {
|
|
643
643
|
constructor(field, operator, value, propertyQueryPath, overQuoted = false) {
|
|
644
644
|
this._breezePredicate = null;
|
|
645
|
-
this.handleOperator = (fieldOrPredicate, operator, value
|
|
645
|
+
this.handleOperator = (fieldOrPredicate, oper, operator, value) => {
|
|
646
646
|
var breezePredicate;
|
|
647
647
|
if (Array.isArray(fieldOrPredicate)) {
|
|
648
648
|
breezePredicate = new TruPredicate(fieldOrPredicate[0], fieldOrPredicate[1], fieldOrPredicate[2], []);
|
|
@@ -658,11 +658,11 @@ class TruPredicate {
|
|
|
658
658
|
};
|
|
659
659
|
this.and = (fieldOrPredicate, operator, value) => {
|
|
660
660
|
var that = this;
|
|
661
|
-
return this.handleOperator(fieldOrPredicate,
|
|
661
|
+
return this.handleOperator(fieldOrPredicate, function (p) { return that._breezePredicate.and(p); }, operator, value);
|
|
662
662
|
};
|
|
663
663
|
this.or = (fieldOrPredicate, operator, value) => {
|
|
664
664
|
var that = this;
|
|
665
|
-
return this.handleOperator(fieldOrPredicate,
|
|
665
|
+
return this.handleOperator(fieldOrPredicate, function (p) { return that._breezePredicate.and(p); }, operator, value);
|
|
666
666
|
};
|
|
667
667
|
this.not = () => {
|
|
668
668
|
var breezePredicate = this._breezePredicate.not();
|