@trudb/tru-common-lib 0.0.260 → 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/esm2020/lib/classes/tru-query-predicate-manager.mjs +15 -7
- package/fesm2015/trudb-tru-common-lib.mjs +17 -9
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +17 -9
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/classes/tru-predicate.d.ts +3 -3
- package/lib/classes/tru-query-predicate-manager.d.ts +1 -1
- 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==
|
|
@@ -23,12 +23,12 @@ export class TruQueryPredicateManager {
|
|
|
23
23
|
this.clear = () => {
|
|
24
24
|
this.setPredicate(null);
|
|
25
25
|
};
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
26
|
+
//set = (queryPredicate: TruPredicate) => {
|
|
27
|
+
// if (this._predicate !== queryPredicate && this._predicateMap !== null) {
|
|
28
|
+
// this._predicate = queryPredicate;
|
|
29
|
+
// this._predicateMap[this._predicateName] = this._predicate === null ? null : this._predicate;
|
|
30
|
+
// }
|
|
31
|
+
//}
|
|
32
32
|
/**
|
|
33
33
|
* Returns a new query predicate.
|
|
34
34
|
*
|
|
@@ -39,9 +39,17 @@ export class TruQueryPredicateManager {
|
|
|
39
39
|
this.create = (field, operator, value, overQuoted) => {
|
|
40
40
|
return new TruPredicate(field, operator, value, this._propertyQueryPath, overQuoted)._breezePredicate;
|
|
41
41
|
};
|
|
42
|
+
this.set = (fieldOrPredicate, operator, value, overQuoted = false) => {
|
|
43
|
+
var predicate;
|
|
44
|
+
if (fieldOrPredicate.constructor === TruPredicate)
|
|
45
|
+
predicate = fieldOrPredicate;
|
|
46
|
+
else
|
|
47
|
+
predicate = this.create(fieldOrPredicate, operator, value, overQuoted);
|
|
48
|
+
this.setPredicate(predicate);
|
|
49
|
+
};
|
|
42
50
|
this._propertyQueryPath = propertyQueryPath;
|
|
43
51
|
this._predicateName = predicateName;
|
|
44
52
|
this._predicateMap = predicateMap;
|
|
45
53
|
}
|
|
46
54
|
}
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LXF1ZXJ5LXByZWRpY2F0ZS1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jbGFzc2VzL3RydS1xdWVyeS1wcmVkaWNhdGUtbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFL0MsTUFBTSxPQUFPLHdCQUF3QjtJQU1uQyxZQUFZLGlCQUFnQyxFQUFFLGFBQXFCLEVBQUUsWUFBaUI7UUFMdEYsZUFBVSxHQUF3QixJQUFJLENBQUM7UUFDdkMsdUJBQWtCLEdBQXlCLElBQUksQ0FBQztRQUNoRCxtQkFBYyxHQUFXLEVBQUUsQ0FBQztRQUM1QixrQkFBYSxHQUFRLEVBQUUsQ0FBQztRQVFoQixpQkFBWSxHQUFHLENBQUMsY0FBbUMsRUFBRSxFQUFFO1lBQzdELElBQUksSUFBSSxDQUFDLFVBQVUsS0FBSyxjQUFjLElBQUksSUFBSSxDQUFDLGFBQWEsS0FBSyxJQUFJLEVBQUU7Z0JBQ3JFLElBQUksQ0FBQyxVQUFVLEdBQUcsY0FBYyxDQUFDO2dCQUNqQyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxJQUFJLENBQUMsVUFBVSxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDO2FBQzdGO1FBQ0gsQ0FBQyxDQUFBO1FBRUQ7O1dBRUc7UUFDSCxRQUFHLEdBQUcsR0FBRyxFQUFFO1lBQ1QsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ3pCLENBQUMsQ0FBQztRQUVGOztTQUVDO1FBQ0QsVUFBSyxHQUFHLEdBQUcsRUFBRTtZQUNYLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDMUIsQ0FBQyxDQUFBO1FBRUQsMkNBQTJDO1FBQzNDLDRFQUE0RTtRQUM1RSx1Q0FBdUM7UUFDdkMsa0dBQWtHO1FBQ2xHLEtBQUs7UUFDTCxHQUFHO1FBRUg7Ozs7OztTQU1DO1FBQ0QsV0FBTSxHQUFHLENBQUMsS0FBYSxFQUFFLFFBQWdCLEVBQUUsS0FBVSxFQUFFLFVBQW1CLEVBQUUsRUFBRTtZQUM1RSxPQUFPLElBQUksWUFBWSxDQUFDLEtBQUssRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxVQUFVLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQztRQUN4RyxDQUFDLENBQUE7UUFFRCxRQUFHLEdBQUcsQ0FBQyxnQkFBdUMsRUFBRSxRQUFpQixFQUFFLEtBQVcsRUFBRSxhQUFzQixLQUFLLEVBQVEsRUFBRTtZQUNuSCxJQUFJLFNBQVMsQ0FBQztZQUNkLElBQUksZ0JBQWdCLENBQUMsV0FBVyxLQUFLLFlBQVk7Z0JBQy9DLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQzs7Z0JBRTdCLFNBQVMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUEwQixFQUFFLFFBQWtCLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBQzdGLElBQUksQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDL0IsQ0FBQyxDQUFDO1FBbkRBLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxpQkFBaUIsQ0FBQztRQUM1QyxJQUFJLENBQUMsY0FBYyxHQUFHLGFBQWEsQ0FBQztRQUNwQyxJQUFJLENBQUMsYUFBYSxHQUFHLFlBQVksQ0FBQztJQUNwQyxDQUFDO0NBaURGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJ1UHJlZGljYXRlIH0gZnJvbSBcIi4vdHJ1LXByZWRpY2F0ZVwiO1xyXG5cclxuZXhwb3J0IGNsYXNzIFRydVF1ZXJ5UHJlZGljYXRlTWFuYWdlciB7XHJcbiAgX3ByZWRpY2F0ZTogVHJ1UHJlZGljYXRlIHwgbnVsbCA9IG51bGw7XHJcbiAgX3Byb3BlcnR5UXVlcnlQYXRoOiBBcnJheTxzdHJpbmc+IHwgbnVsbCA9IG51bGw7XHJcbiAgX3ByZWRpY2F0ZU5hbWU6IHN0cmluZyA9ICcnO1xyXG4gIF9wcmVkaWNhdGVNYXA6IGFueSA9IHt9O1xyXG5cclxuICBjb25zdHJ1Y3Rvcihwcm9wZXJ0eVF1ZXJ5UGF0aDogQXJyYXk8c3RyaW5nPiwgcHJlZGljYXRlTmFtZTogc3RyaW5nLCBwcmVkaWNhdGVNYXA6IGFueSkge1xyXG4gICAgdGhpcy5fcHJvcGVydHlRdWVyeVBhdGggPSBwcm9wZXJ0eVF1ZXJ5UGF0aDtcclxuICAgIHRoaXMuX3ByZWRpY2F0ZU5hbWUgPSBwcmVkaWNhdGVOYW1lO1xyXG4gICAgdGhpcy5fcHJlZGljYXRlTWFwID0gcHJlZGljYXRlTWFwO1xyXG4gIH1cclxuXHJcbiAgcHJpdmF0ZSBzZXRQcmVkaWNhdGUgPSAocXVlcnlQcmVkaWNhdGU6IFRydVByZWRpY2F0ZSB8IG51bGwpID0+IHtcclxuICAgIGlmICh0aGlzLl9wcmVkaWNhdGUgIT09IHF1ZXJ5UHJlZGljYXRlICYmIHRoaXMuX3ByZWRpY2F0ZU1hcCAhPT0gbnVsbCkge1xyXG4gICAgICB0aGlzLl9wcmVkaWNhdGUgPSBxdWVyeVByZWRpY2F0ZTtcclxuICAgICAgdGhpcy5fcHJlZGljYXRlTWFwW3RoaXMuX3ByZWRpY2F0ZU5hbWVdID0gdGhpcy5fcHJlZGljYXRlID09PSBudWxsID8gbnVsbCA6IHRoaXMuX3ByZWRpY2F0ZTtcclxuICAgIH1cclxuICB9XHJcblxyXG4gIC8qKlxyXG4gICAqIFJldHVybnMgdGhlIHF1ZXJ5IHByZWRpY2F0ZS5cclxuICAgKi9cclxuICBnZXQgPSAoKSA9PiB7XHJcbiAgICByZXR1cm4gdGhpcy5fcHJlZGljYXRlO1xyXG4gIH07XHJcblxyXG4gIC8qKlxyXG4gKiBDbGVhcnMgdGhlIHF1ZXJ5IHByZWRpY2F0ZS5cclxuICovXHJcbiAgY2xlYXIgPSAoKSA9PiB7XHJcbiAgICB0aGlzLnNldFByZWRpY2F0ZShudWxsKTtcclxuICB9XHJcblxyXG4gIC8vc2V0ID0gKHF1ZXJ5UHJlZGljYXRlOiBUcnVQcmVkaWNhdGUpID0+IHtcclxuICAvLyAgaWYgKHRoaXMuX3ByZWRpY2F0ZSAhPT0gcXVlcnlQcmVkaWNhdGUgJiYgdGhpcy5fcHJlZGljYXRlTWFwICE9PSBudWxsKSB7XHJcbiAgLy8gICAgdGhpcy5fcHJlZGljYXRlID0gcXVlcnlQcmVkaWNhdGU7XHJcbiAgLy8gICAgdGhpcy5fcHJlZGljYXRlTWFwW3RoaXMuX3ByZWRpY2F0ZU5hbWVdID0gdGhpcy5fcHJlZGljYXRlID09PSBudWxsID8gbnVsbCA6IHRoaXMuX3ByZWRpY2F0ZTtcclxuICAvLyAgfVxyXG4gIC8vfVxyXG5cclxuICAvKipcclxuICogUmV0dXJucyBhIG5ldyBxdWVyeSBwcmVkaWNhdGUuXHJcbiAqIFxyXG4gKiBAcGFyYW0ge3N0cmluZ30gZmllbGQgLSBOYW1lIG9mIHRoZSBzdG9yYWdlIGZpZWxkIHJlbGF0aXZlIHRvIHRoZSBpbnRlbnQgcHJvcGVydHkuXHJcbiAqIEBwYXJhbSB7c3RyaW5nfSBvcGVyYXRvciAtIE5hbWUgb2YgdGhlIHByZWRpY2F0ZSBvcGVyYXRvci5cclxuICogQHBhcmFtIHsqfSB2YWx1ZSAtIExpdGVyYWwgdmFsdWUuXHJcbiAqL1xyXG4gIGNyZWF0ZSA9IChmaWVsZDogc3RyaW5nLCBvcGVyYXRvcjogc3RyaW5nLCB2YWx1ZTogYW55LCBvdmVyUXVvdGVkOiBib29sZWFuKSA9PiB7XHJcbiAgICByZXR1cm4gbmV3IFRydVByZWRpY2F0ZShmaWVsZCwgb3BlcmF0b3IsIHZhbHVlLCB0aGlzLl9wcm9wZXJ0eVF1ZXJ5UGF0aCwgb3ZlclF1b3RlZCkuX2JyZWV6ZVByZWRpY2F0ZTtcclxuICB9XHJcblxyXG4gIHNldCA9IChmaWVsZE9yUHJlZGljYXRlOiBzdHJpbmcgfCBUcnVQcmVkaWNhdGUsIG9wZXJhdG9yPzogc3RyaW5nLCB2YWx1ZT86IGFueSwgb3ZlclF1b3RlZDogYm9vbGVhbiA9IGZhbHNlKTogdm9pZCA9PiB7IFxyXG4gICAgdmFyIHByZWRpY2F0ZTtcclxuICAgIGlmIChmaWVsZE9yUHJlZGljYXRlLmNvbnN0cnVjdG9yID09PSBUcnVQcmVkaWNhdGUpXHJcbiAgICAgIHByZWRpY2F0ZSA9IGZpZWxkT3JQcmVkaWNhdGU7XHJcbiAgICBlbHNlXHJcbiAgICAgIHByZWRpY2F0ZSA9IHRoaXMuY3JlYXRlKGZpZWxkT3JQcmVkaWNhdGUgYXMgc3RyaW5nLCBvcGVyYXRvciBhcyBzdHJpbmcsIHZhbHVlLCBvdmVyUXVvdGVkKTtcclxuICAgIHRoaXMuc2V0UHJlZGljYXRlKHByZWRpY2F0ZSk7XHJcbiAgfTtcclxufVxyXG4iXX0=
|
|
@@ -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();
|
|
@@ -808,12 +808,12 @@ class TruQueryPredicateManager {
|
|
|
808
808
|
this.clear = () => {
|
|
809
809
|
this.setPredicate(null);
|
|
810
810
|
};
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
}
|
|
811
|
+
//set = (queryPredicate: TruPredicate) => {
|
|
812
|
+
// if (this._predicate !== queryPredicate && this._predicateMap !== null) {
|
|
813
|
+
// this._predicate = queryPredicate;
|
|
814
|
+
// this._predicateMap[this._predicateName] = this._predicate === null ? null : this._predicate;
|
|
815
|
+
// }
|
|
816
|
+
//}
|
|
817
817
|
/**
|
|
818
818
|
* Returns a new query predicate.
|
|
819
819
|
*
|
|
@@ -824,6 +824,14 @@ class TruQueryPredicateManager {
|
|
|
824
824
|
this.create = (field, operator, value, overQuoted) => {
|
|
825
825
|
return new TruPredicate(field, operator, value, this._propertyQueryPath, overQuoted)._breezePredicate;
|
|
826
826
|
};
|
|
827
|
+
this.set = (fieldOrPredicate, operator, value, overQuoted = false) => {
|
|
828
|
+
var predicate;
|
|
829
|
+
if (fieldOrPredicate.constructor === TruPredicate)
|
|
830
|
+
predicate = fieldOrPredicate;
|
|
831
|
+
else
|
|
832
|
+
predicate = this.create(fieldOrPredicate, operator, value, overQuoted);
|
|
833
|
+
this.setPredicate(predicate);
|
|
834
|
+
};
|
|
827
835
|
this._propertyQueryPath = propertyQueryPath;
|
|
828
836
|
this._predicateName = predicateName;
|
|
829
837
|
this._predicateMap = predicateMap;
|