@allgemein/expressions 1.4.0 → 1.4.1
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/libs/descriptors/AndDesc.d.ts +2 -2
- package/libs/descriptors/AndDesc.js +4 -4
- package/libs/descriptors/AndDesc.js.map +1 -1
- package/libs/descriptors/EqDesc.d.ts +3 -3
- package/libs/descriptors/EqDesc.js +4 -4
- package/libs/descriptors/EqDesc.js.map +1 -1
- package/libs/descriptors/ExprDesc.js +25 -25
- package/libs/descriptors/ExprDesc.js.map +1 -1
- package/libs/descriptors/GeDesc.d.ts +3 -3
- package/libs/descriptors/GeDesc.js +3 -3
- package/libs/descriptors/GeDesc.js.map +1 -1
- package/libs/descriptors/GroupDesc.d.ts +1 -1
- package/libs/descriptors/GroupDesc.js +1 -1
- package/libs/descriptors/GroupDesc.js.map +1 -1
- package/libs/descriptors/GtDesc.d.ts +3 -3
- package/libs/descriptors/GtDesc.js +3 -3
- package/libs/descriptors/GtDesc.js.map +1 -1
- package/libs/descriptors/InDesc.d.ts +3 -3
- package/libs/descriptors/InDesc.js +4 -4
- package/libs/descriptors/InDesc.js.map +1 -1
- package/libs/descriptors/KeyDesc.d.ts +1 -1
- package/libs/descriptors/KeyDesc.js +1 -1
- package/libs/descriptors/KeyDesc.js.map +1 -1
- package/libs/descriptors/LeDesc.d.ts +3 -3
- package/libs/descriptors/LeDesc.js +3 -3
- package/libs/descriptors/LeDesc.js.map +1 -1
- package/libs/descriptors/LikeDesc.d.ts +3 -3
- package/libs/descriptors/LikeDesc.js +4 -4
- package/libs/descriptors/LikeDesc.js.map +1 -1
- package/libs/descriptors/LtDesc.d.ts +3 -3
- package/libs/descriptors/LtDesc.js +3 -3
- package/libs/descriptors/LtDesc.js.map +1 -1
- package/libs/descriptors/NeqDesc.d.ts +3 -3
- package/libs/descriptors/NeqDesc.js +4 -4
- package/libs/descriptors/NeqDesc.js.map +1 -1
- package/libs/descriptors/OpDesc.d.ts +3 -3
- package/libs/descriptors/OpDesc.js +2 -2
- package/libs/descriptors/OrDesc.d.ts +2 -2
- package/libs/descriptors/OrDesc.js +4 -4
- package/libs/descriptors/OrDesc.js.map +1 -1
- package/libs/descriptors/Selector.d.ts +1 -1
- package/libs/descriptors/Selector.js.map +1 -1
- package/libs/descriptors/ValueDesc.d.ts +1 -1
- package/libs/descriptors/ValueDesc.js +1 -1
- package/libs/descriptors/ValueDesc.js.map +1 -1
- package/libs/exceptions/ExpressionValidationError.js.map +1 -1
- package/libs/expressions/ExpressionInterpreter.d.ts +1 -1
- package/libs/expressions/ExpressionInterpreter.js +41 -43
- package/libs/expressions/ExpressionInterpreter.js.map +1 -1
- package/libs/expressions/Expressions.js +33 -33
- package/libs/expressions/Expressions.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { GroupDesc } from
|
|
2
|
-
import { ExprDesc } from
|
|
1
|
+
import { GroupDesc } from './GroupDesc.js';
|
|
2
|
+
import { ExprDesc } from './ExprDesc.js';
|
|
3
3
|
export declare class AndDesc extends GroupDesc {
|
|
4
4
|
readonly type: string;
|
|
5
5
|
constructor(...values: ExprDesc[]);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { GroupDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { GroupDesc } from './GroupDesc.js';
|
|
3
3
|
export class AndDesc extends GroupDesc {
|
|
4
4
|
constructor(...values) {
|
|
5
5
|
super(...values);
|
|
@@ -8,7 +8,7 @@ export class AndDesc extends GroupDesc {
|
|
|
8
8
|
lookup(source) {
|
|
9
9
|
const checks = _.map(this.values, v => v.lookup(source));
|
|
10
10
|
return function (target) {
|
|
11
|
-
for (
|
|
11
|
+
for (const fn of checks) {
|
|
12
12
|
if (!fn(target)) {
|
|
13
13
|
return false;
|
|
14
14
|
}
|
|
@@ -18,7 +18,7 @@ export class AndDesc extends GroupDesc {
|
|
|
18
18
|
}
|
|
19
19
|
for(source, keyMap = {}) {
|
|
20
20
|
const checks = _.map(this.values, v => v.for(source, keyMap));
|
|
21
|
-
|
|
21
|
+
const c = {};
|
|
22
22
|
c['$and'] = checks;
|
|
23
23
|
return c;
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AndDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/AndDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAKzC,MAAM,OAAO,OAAQ,SAAQ,SAAS;IAKpC,YAAY,GAAG,MAAkB;QAC/B,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QAJV,SAAI,
|
|
1
|
+
{"version":3,"file":"AndDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/AndDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAKzC,MAAM,OAAO,OAAQ,SAAQ,SAAS;IAKpC,YAAY,GAAG,MAAkB;QAC/B,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QAJV,SAAI,GAAW,KAAK,CAAC;IAK9B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACzD,OAAO,UAAU,MAAW;YAC1B,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;gBACxB,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;oBAChB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,MAAW,EAAE,MAAM,GAAQ,EAAE;QAC/B,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,GAAQ,EAAE,CAAC;QAClB,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;QACnB,OAAO,CAAC,CAAC;IACX,CAAC;CAEF;AAID,MAAM,UAAU,GAAG,CAAC,GAAG,MAAkB;IACvC,OAAO,IAAI,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Selector } from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import { Selector } from './Selector.js';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export declare class EqDesc extends OpDesc {
|
|
5
5
|
readonly type: string;
|
|
6
6
|
constructor(key: string | KeyDesc, value: Selector);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export class EqDesc extends OpDesc {
|
|
5
5
|
constructor(key, value) {
|
|
6
6
|
super(key, value);
|
|
@@ -16,7 +16,7 @@ export class EqDesc extends OpDesc {
|
|
|
16
16
|
for(source, keyMap = {}) {
|
|
17
17
|
const value = this.value instanceof KeyDesc ? source[this.value.key] : _.clone(this.value.value);
|
|
18
18
|
const key = _.get(keyMap, this.key, this.key);
|
|
19
|
-
|
|
19
|
+
const c = {};
|
|
20
20
|
c[key] = value;
|
|
21
21
|
return c;
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EqDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/EqDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAEhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAFX,SAAI,
|
|
1
|
+
{"version":3,"file":"EqDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/EqDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAEhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAFX,SAAI,GAAW,IAAI,CAAC;IAG7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC;QAC/B,CAAC,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,MAAW,EAAE,MAAM,GAAQ,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,CAAC,GAAQ,EAAE,CAAC;QAClB,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACf,OAAO,CAAC,CAAC;IACX,CAAC;CAEF;AAED,MAAM,UAAU,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { KeyDesc } from './KeyDesc.js';
|
|
|
2
2
|
import { NotSupportedError, NotYetImplementedError } from '@allgemein/base';
|
|
3
3
|
import { ValueDesc } from './ValueDesc.js';
|
|
4
4
|
import { ExpressionValidationError } from '../exceptions/ExpressionValidationError.js';
|
|
5
|
-
import { concat, has, map, merge, uniq } from
|
|
5
|
+
import { concat, has, map, merge, uniq } from '@allgemein/base';
|
|
6
6
|
export class ExprDesc {
|
|
7
7
|
constructor() {
|
|
8
8
|
this.type = 'cond';
|
|
@@ -47,7 +47,7 @@ export class ExprDesc {
|
|
|
47
47
|
return uniq(keys);
|
|
48
48
|
}
|
|
49
49
|
applyOn(target, source, force = false) {
|
|
50
|
-
if (this.type
|
|
50
|
+
if (this.type === 'eq') {
|
|
51
51
|
if (!has(target, this.key) || false) {
|
|
52
52
|
if (this.value instanceof ValueDesc) {
|
|
53
53
|
// @ts-ignore
|
|
@@ -62,10 +62,10 @@ export class ExprDesc {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
-
else if (this.type
|
|
65
|
+
else if (this.type === 'and') {
|
|
66
66
|
map(this.values, v => v.applyOn(target, source, force));
|
|
67
67
|
}
|
|
68
|
-
else if (this.type
|
|
68
|
+
else if (this.type === 'or') {
|
|
69
69
|
map(this.values, v => v.applyOn(target, source, force));
|
|
70
70
|
}
|
|
71
71
|
else {
|
|
@@ -73,7 +73,7 @@ export class ExprDesc {
|
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
applyReverseOn(target, source, force = false) {
|
|
76
|
-
if (this.type
|
|
76
|
+
if (this.type === 'eq') {
|
|
77
77
|
if (!has(target, this.key) || false) {
|
|
78
78
|
if (this.value instanceof KeyDesc) {
|
|
79
79
|
// @ts-ignore
|
|
@@ -84,10 +84,10 @@ export class ExprDesc {
|
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
else if (this.type
|
|
87
|
+
else if (this.type === 'and') {
|
|
88
88
|
map(this.values, v => v.applyReverseOn(target, source, force));
|
|
89
89
|
}
|
|
90
|
-
else if (this.type
|
|
90
|
+
else if (this.type === 'or') {
|
|
91
91
|
map(this.values, v => v.applyReverseOn(target, source, force));
|
|
92
92
|
}
|
|
93
93
|
else {
|
|
@@ -99,8 +99,8 @@ export class ExprDesc {
|
|
|
99
99
|
* (sometimes needed for join definitions).
|
|
100
100
|
*/
|
|
101
101
|
getMap() {
|
|
102
|
-
|
|
103
|
-
if (this.type
|
|
102
|
+
const map = {};
|
|
103
|
+
if (this.type === 'eq') {
|
|
104
104
|
if (this.value instanceof KeyDesc) {
|
|
105
105
|
map[this.key] = this.value.key;
|
|
106
106
|
}
|
|
@@ -111,10 +111,10 @@ export class ExprDesc {
|
|
|
111
111
|
throw new NotYetImplementedError();
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
|
-
else if (this.type
|
|
114
|
+
else if (this.type === 'and') {
|
|
115
115
|
merge(map, ...this.values.map((v) => v.getMap()));
|
|
116
116
|
}
|
|
117
|
-
else if (this.type
|
|
117
|
+
else if (this.type === 'or') {
|
|
118
118
|
merge(map, ...this.values.map((v) => v.getMap()));
|
|
119
119
|
}
|
|
120
120
|
else {
|
|
@@ -132,13 +132,13 @@ export class ExprDesc {
|
|
|
132
132
|
* Test if conditions matching class properties and references
|
|
133
133
|
*/
|
|
134
134
|
test(sourceRef, errors = []) {
|
|
135
|
-
|
|
136
|
-
for (
|
|
137
|
-
|
|
135
|
+
const sourceKeys = this.getSourceKeys();
|
|
136
|
+
for (const sourceKey of sourceKeys) {
|
|
137
|
+
const keyChain = sourceKey.split('.');
|
|
138
138
|
let root = sourceRef;
|
|
139
139
|
while (keyChain.length > 0) {
|
|
140
|
-
|
|
141
|
-
|
|
140
|
+
const _k = keyChain.shift();
|
|
141
|
+
const p = root.getPropertyRef(_k);
|
|
142
142
|
if (p) {
|
|
143
143
|
if (p.isReference()) {
|
|
144
144
|
root = p.getTargetRef();
|
|
@@ -149,7 +149,7 @@ export class ExprDesc {
|
|
|
149
149
|
}
|
|
150
150
|
}
|
|
151
151
|
}
|
|
152
|
-
return errors.length
|
|
152
|
+
return errors.length === 0;
|
|
153
153
|
}
|
|
154
154
|
/**
|
|
155
155
|
* Validate if defined keys match source and target element
|
|
@@ -157,17 +157,17 @@ export class ExprDesc {
|
|
|
157
157
|
* - source = referrer
|
|
158
158
|
*/
|
|
159
159
|
validate(registry, targetRef, sourceRef, throwing = true) {
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
if (sourceKeys.length
|
|
160
|
+
const sourceKeys = this.getSourceKeys();
|
|
161
|
+
const targetKeys = this.getTargetKeys();
|
|
162
|
+
const targetProps = targetRef.getPropertyRefs().map(p => p.name).filter(pn => sourceKeys.indexOf(pn) !== -1);
|
|
163
|
+
const sourceProps = sourceRef ? sourceRef.getPropertyRefs().map(p => p.name).filter(pn => targetKeys.indexOf(pn) !== -1) : [];
|
|
164
|
+
if (sourceKeys.length !== targetProps.length) {
|
|
165
165
|
if (throwing) {
|
|
166
166
|
throw new ExpressionValidationError('referred key(s) ' + sourceKeys.filter(k => targetProps.indexOf(k) === -1).join(',') + ' not in sourceRef');
|
|
167
167
|
}
|
|
168
168
|
return false;
|
|
169
169
|
}
|
|
170
|
-
if (targetKeys.length
|
|
170
|
+
if (targetKeys.length !== sourceProps.length) {
|
|
171
171
|
if (throwing) {
|
|
172
172
|
throw new ExpressionValidationError('referrer key(s) ' + targetKeys.filter(k => sourceProps.indexOf(k) === -1).join(',') + ' not in targetRef');
|
|
173
173
|
}
|
|
@@ -177,12 +177,12 @@ export class ExprDesc {
|
|
|
177
177
|
}
|
|
178
178
|
toJson() {
|
|
179
179
|
if (this.isGroup()) {
|
|
180
|
-
|
|
180
|
+
const res = {};
|
|
181
181
|
res['$' + this.type] = map(this.values, x => x.toJson());
|
|
182
182
|
return res;
|
|
183
183
|
}
|
|
184
184
|
else if (this.isOp()) {
|
|
185
|
-
|
|
185
|
+
const res = {};
|
|
186
186
|
res[this.key] = {};
|
|
187
187
|
res[this.key]['$' + this.type] = this.value.toJson ? this.value.toJson() : this.value;
|
|
188
188
|
return res;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExprDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/ExprDesc.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EAAC,iBAAiB,EAAE,sBAAsB,EAAC,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAC,yBAAyB,EAAC,MAAM,4CAA4C,CAAC;AACrF,OAAO,EAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAG9D,MAAM,OAAO,QAAQ;IAArB;QAEW,SAAI,GAAW,MAAM,CAAC;IAoMjC,CAAC;IAhMC,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAW,GAAG,CAAC,KAAU;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAMD,IAAI;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,OAAO,KAAK,CAAC;IACf,CAAC;IAED,aAAa;QACX,IAAI,IAAI,GAAa,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB;;;;eAIG;QACL,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAC1B,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAGD,aAAa;QACX,IAAI,IAAI,GAAa,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,KAAK,YAAY,OAAO,EAAE,CAAC;gBAClC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAC1B,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAGD,OAAO,CAAC,MAAW,EAAE,MAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"ExprDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/ExprDesc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Selector } from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import { Selector } from './Selector.js';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export declare class GeDesc extends OpDesc {
|
|
5
5
|
readonly type: string;
|
|
6
6
|
constructor(key: string | KeyDesc, value: Selector);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export class GeDesc extends OpDesc {
|
|
5
5
|
constructor(key, value) {
|
|
6
6
|
super(key, value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/GeDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAGrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;QAC9B,CAAC,
|
|
1
|
+
{"version":3,"file":"GeDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/GeDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAGrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;QAC9B,CAAC,CAAC;IACJ,CAAC;CACF;AAGD,MAAM,UAAU,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/GroupDesc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC,MAAM,OAAO,SAAU,SAAQ,QAAQ;IAQrC,YAAY,GAAG,MAAkB;QAC/B,KAAK,EAAE,CAAC;QAPD,SAAI,
|
|
1
|
+
{"version":3,"file":"GroupDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/GroupDesc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC,MAAM,OAAO,SAAU,SAAQ,QAAQ;IAQrC,YAAY,GAAG,MAAkB;QAC/B,KAAK,EAAE,CAAC;QAPD,SAAI,GAAW,OAAO,CAAC;QAEhC,WAAM,GAAe,EAAE,CAAC;QAMtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAGD,IAAI;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC;IACd,CAAC;CAEF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Selector } from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import { Selector } from './Selector.js';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export declare class GtDesc extends OpDesc {
|
|
5
5
|
readonly type: string;
|
|
6
6
|
constructor(key: string | KeyDesc, value: Selector);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export class GtDesc extends OpDesc {
|
|
5
5
|
constructor(key, value) {
|
|
6
6
|
super(key, value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GtDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/GtDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAGrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC,
|
|
1
|
+
{"version":3,"file":"GtDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/GtDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAGrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;CACF;AAGD,MAAM,UAAU,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Selector } from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import { Selector } from './Selector.js';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export declare class InDesc extends OpDesc {
|
|
5
5
|
readonly type: string;
|
|
6
6
|
constructor(key: string | KeyDesc, value: Selector);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export class InDesc extends OpDesc {
|
|
5
5
|
constructor(key, value) {
|
|
6
6
|
super(key, value);
|
|
@@ -10,7 +10,7 @@ export class InDesc extends OpDesc {
|
|
|
10
10
|
const value = this.value instanceof KeyDesc ? source[this.value.key] : _.clone(this.value.value);
|
|
11
11
|
const key = this.key;
|
|
12
12
|
return function (target) {
|
|
13
|
-
return _.intersection(target[key], value).length
|
|
13
|
+
return _.intersection(target[key], value).length === value.length;
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/InDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAGrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"InDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/InDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAGrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC;QACpE,CAAC,CAAC;IACJ,CAAC;CACF;AAGD,MAAM,UAAU,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeyDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/KeyDesc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAGvC,MAAM,OAAO,OAAQ,SAAQ,QAAQ;IAInC,YAAY,GAAW;QACrB,KAAK,EAAE,CAAC;QAJD,SAAI,GAAW,KAAK,CAAC;QAK5B,IAAI,CAAC,GAAG,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"KeyDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/KeyDesc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAGvC,MAAM,OAAO,OAAQ,SAAQ,QAAQ;IAInC,YAAY,GAAW;QACrB,KAAK,EAAE,CAAC;QAJD,SAAI,GAAW,KAAK,CAAC;QAK5B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,MAAM;QACJ,OAAO,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAC,CAAC;IAC1B,CAAC;CAEF;AAED;;GAEG;AACH,MAAM,UAAU,GAAG,CAAC,CAAS;IAC3B,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AACxB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Selector } from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import { Selector } from './Selector.js';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export declare class LeDesc extends OpDesc {
|
|
5
5
|
readonly type: string;
|
|
6
6
|
constructor(key: string | KeyDesc, value: Selector);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export class LeDesc extends OpDesc {
|
|
5
5
|
constructor(key, value) {
|
|
6
6
|
super(key, value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LeDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/LeDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAKrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;QAC9B,CAAC,
|
|
1
|
+
{"version":3,"file":"LeDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/LeDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAKrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;QAC9B,CAAC,CAAC;IACJ,CAAC;CACF;AAED,MAAM,UAAU,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Selector } from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import { Selector } from './Selector.js';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export declare class LikeDesc extends OpDesc {
|
|
5
5
|
readonly type: string;
|
|
6
6
|
constructor(key: string | KeyDesc, value: Selector);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export class LikeDesc extends OpDesc {
|
|
5
5
|
constructor(key, value) {
|
|
6
6
|
super(key, value);
|
|
@@ -16,7 +16,7 @@ export class LikeDesc extends OpDesc {
|
|
|
16
16
|
for(source, keyMap = {}) {
|
|
17
17
|
const value = this.value instanceof KeyDesc ? source[this.value.key] : _.clone(this.value.value);
|
|
18
18
|
const key = _.get(keyMap, this.key, this.key);
|
|
19
|
-
|
|
19
|
+
const c = {};
|
|
20
20
|
c[key] = value;
|
|
21
21
|
return c;
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LikeDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/LikeDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,QAAS,SAAQ,MAAM;IAGlC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,MAAM,CAAC;IAI/B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC,
|
|
1
|
+
{"version":3,"file":"LikeDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/LikeDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,QAAS,SAAQ,MAAM;IAGlC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,MAAM,CAAC;IAI/B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,MAAW,EAAE,MAAM,GAAQ,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,CAAC,GAAQ,EAAE,CAAC;QAClB,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACf,OAAO,CAAC,CAAC;IACX,CAAC;CAEF;AAED,MAAM,UAAU,IAAI,CAAC,GAAqB,EAAE,KAAe;IACzD,OAAO,IAAI,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Selector } from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import { Selector } from './Selector.js';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export declare class LtDesc extends OpDesc {
|
|
5
5
|
readonly type: string;
|
|
6
6
|
constructor(key: string | KeyDesc, value: Selector);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export class LtDesc extends OpDesc {
|
|
5
5
|
constructor(key, value) {
|
|
6
6
|
super(key, value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LtDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/LtDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAKrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC,
|
|
1
|
+
{"version":3,"file":"LtDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/LtDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAKrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,MAAO,SAAQ,MAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;CACF;AAED,MAAM,UAAU,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Selector } from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import { Selector } from './Selector.js';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export declare class NeqDesc extends OpDesc {
|
|
5
5
|
readonly type: string;
|
|
6
6
|
constructor(key: string | KeyDesc, value: Selector);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { KeyDesc } from
|
|
3
|
-
import { OpDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
3
|
+
import { OpDesc } from './OpDesc.js';
|
|
4
4
|
export class NeqDesc extends OpDesc {
|
|
5
5
|
constructor(key, value) {
|
|
6
6
|
super(key, value);
|
|
@@ -10,7 +10,7 @@ export class NeqDesc extends OpDesc {
|
|
|
10
10
|
const value = this.value instanceof KeyDesc ? source[this.value.key] : _.clone(this.value.value);
|
|
11
11
|
const key = this.key;
|
|
12
12
|
return function (target) {
|
|
13
|
-
return target[key]
|
|
13
|
+
return target[key] !== value;
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeqDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/NeqDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,OAAQ,SAAQ,MAAM;IAEjC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAFX,SAAI,
|
|
1
|
+
{"version":3,"file":"NeqDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/NeqDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,OAAQ,SAAQ,MAAM;IAEjC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAFX,SAAI,GAAW,IAAI,CAAC;IAG7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC;QAC/B,CAAC,CAAC;IACJ,CAAC;CAEF;AAED,MAAM,UAAU,GAAG,CAAC,GAAqB,EAAE,KAAe;IACxD,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACjC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Selector } from
|
|
2
|
-
import { ExprDesc } from
|
|
3
|
-
import { KeyDesc } from
|
|
1
|
+
import { Selector } from './Selector.js';
|
|
2
|
+
import { ExprDesc } from './ExprDesc.js';
|
|
3
|
+
import { KeyDesc } from './KeyDesc.js';
|
|
4
4
|
export declare class OpDesc extends ExprDesc {
|
|
5
5
|
readonly type: string;
|
|
6
6
|
_key: string | KeyDesc;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { GroupDesc } from
|
|
2
|
-
import { ExprDesc } from
|
|
1
|
+
import { GroupDesc } from './GroupDesc.js';
|
|
2
|
+
import { ExprDesc } from './ExprDesc.js';
|
|
3
3
|
export declare class OrDesc extends GroupDesc {
|
|
4
4
|
readonly type: string;
|
|
5
5
|
constructor(...values: ExprDesc[]);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as _ from
|
|
2
|
-
import { GroupDesc } from
|
|
1
|
+
import * as _ from '@allgemein/base';
|
|
2
|
+
import { GroupDesc } from './GroupDesc.js';
|
|
3
3
|
export class OrDesc extends GroupDesc {
|
|
4
4
|
constructor(...values) {
|
|
5
5
|
super(...values);
|
|
@@ -8,7 +8,7 @@ export class OrDesc extends GroupDesc {
|
|
|
8
8
|
lookup(source) {
|
|
9
9
|
const checks = _.map(this.values, v => v.lookup(source));
|
|
10
10
|
return function (target) {
|
|
11
|
-
for (
|
|
11
|
+
for (const fn of checks) {
|
|
12
12
|
if (fn(target)) {
|
|
13
13
|
return true;
|
|
14
14
|
}
|
|
@@ -18,7 +18,7 @@ export class OrDesc extends GroupDesc {
|
|
|
18
18
|
}
|
|
19
19
|
for(source, keyMap = {}) {
|
|
20
20
|
const checks = _.map(this.values, v => v.for(source, keyMap));
|
|
21
|
-
|
|
21
|
+
const c = {};
|
|
22
22
|
c['$or'] = checks;
|
|
23
23
|
return c;
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/OrDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAKzC,MAAM,OAAO,MAAO,SAAQ,SAAS;IAEnC,YAAY,GAAG,MAAkB;QAC/B,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QAFV,SAAI,
|
|
1
|
+
{"version":3,"file":"OrDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/OrDesc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAKzC,MAAM,OAAO,MAAO,SAAQ,SAAS;IAEnC,YAAY,GAAG,MAAkB;QAC/B,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QAFV,SAAI,GAAW,IAAI,CAAC;IAG7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACzD,OAAO,UAAU,MAAW;YAC1B,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;gBACxB,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;oBACf,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,MAAW,EAAE,MAAM,GAAQ,EAAE;QAC/B,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,GAAQ,EAAE,CAAC;QAClB,CAAC,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;QAClB,OAAO,CAAC,CAAC;IACX,CAAC;CAEF;AAED,MAAM,UAAU,EAAE,CAAC,GAAG,MAAkB;IACtC,OAAO,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC;AAC/B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Selector.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/Selector.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,QAAQ;IAArB;QACW,SAAI,
|
|
1
|
+
{"version":3,"file":"Selector.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/Selector.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,QAAQ;IAArB;QACW,SAAI,GAAW,UAAU,CAAC;IACrC,CAAC;CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/ValueDesc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC,MAAM,OAAO,SAAU,SAAQ,QAAQ;IAIrC,YAAY,KAAsB;QAChC,KAAK,EAAE,CAAC;QAJD,SAAI,
|
|
1
|
+
{"version":3,"file":"ValueDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/ValueDesc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC,MAAM,OAAO,SAAU,SAAQ,QAAQ;IAIrC,YAAY,KAAsB;QAChC,KAAK,EAAE,CAAC;QAJD,SAAI,GAAW,OAAO,CAAC;QAK9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CAEF;AAGD;;;GAGG;AACH,MAAM,UAAU,KAAK,CAAC,CAAkB;IACtC,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressionValidationError.js","sourceRoot":"","sources":["../../../../src/libs/exceptions/ExpressionValidationError.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IAElD,YAAY,
|
|
1
|
+
{"version":3,"file":"ExpressionValidationError.js","sourceRoot":"","sources":["../../../../src/libs/exceptions/ExpressionValidationError.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IAElD,YAAY,GAAW;QACrB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,yBAAyB,CAAC,SAAS,CAAC,CAAC;IACnE,CAAC;CAEF"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
import { Like } from
|
|
2
|
-
import { Lt } from
|
|
3
|
-
import { Gt } from
|
|
4
|
-
import { In } from
|
|
5
|
-
import { Neq } from
|
|
6
|
-
import { Eq } from
|
|
7
|
-
import { Le } from
|
|
8
|
-
import { Key } from
|
|
9
|
-
import { Value } from
|
|
10
|
-
import { Ge } from
|
|
11
|
-
import { GroupDesc } from
|
|
12
|
-
import { And } from
|
|
13
|
-
import { Or } from
|
|
14
|
-
import { findIndex, first, isEmpty, isUndefined, last, remove } from
|
|
1
|
+
import { Like } from '../descriptors/LikeDesc.js';
|
|
2
|
+
import { Lt } from '../descriptors/LtDesc.js';
|
|
3
|
+
import { Gt } from '../descriptors/GtDesc.js';
|
|
4
|
+
import { In } from '../descriptors/InDesc.js';
|
|
5
|
+
import { Neq } from '../descriptors/NeqDesc.js';
|
|
6
|
+
import { Eq } from '../descriptors/EqDesc.js';
|
|
7
|
+
import { Le } from '../descriptors/LeDesc.js';
|
|
8
|
+
import { Key } from '../descriptors/KeyDesc.js';
|
|
9
|
+
import { Value } from '../descriptors/ValueDesc.js';
|
|
10
|
+
import { Ge } from '../descriptors/GeDesc.js';
|
|
11
|
+
import { GroupDesc } from '../descriptors/GroupDesc.js';
|
|
12
|
+
import { And } from '../descriptors/AndDesc.js';
|
|
13
|
+
import { Or } from '../descriptors/OrDesc.js';
|
|
14
|
+
import { findIndex, first, isEmpty, isUndefined, last, remove } from '@allgemein/base';
|
|
15
15
|
export class ExpressionInterpreter {
|
|
16
16
|
constructor() {
|
|
17
|
-
//rootEntityDef:EntityDef;
|
|
17
|
+
// rootEntityDef:EntityDef;
|
|
18
18
|
this.groupLevel = 0;
|
|
19
19
|
this.ops = [
|
|
20
20
|
{
|
|
@@ -31,9 +31,7 @@ export class ExpressionInterpreter {
|
|
|
31
31
|
name: 'leaveGroup',
|
|
32
32
|
regex: /\)/,
|
|
33
33
|
method: this.leaveGroup,
|
|
34
|
-
condition: () =>
|
|
35
|
-
return this.groupLevel > 0;
|
|
36
|
-
},
|
|
34
|
+
condition: () => this.groupLevel > 0,
|
|
37
35
|
after: [
|
|
38
36
|
'onValue',
|
|
39
37
|
'leaveGroup'
|
|
@@ -81,15 +79,15 @@ export class ExpressionInterpreter {
|
|
|
81
79
|
];
|
|
82
80
|
this.res = [];
|
|
83
81
|
this.queue = [];
|
|
84
|
-
//this.rootEntityDef = entityDef;
|
|
82
|
+
// this.rootEntityDef = entityDef;
|
|
85
83
|
}
|
|
86
84
|
interprete(str) {
|
|
87
85
|
this.fragmentize(str);
|
|
88
86
|
return first(this.res);
|
|
89
87
|
}
|
|
90
88
|
fragmentize(str) {
|
|
91
|
-
|
|
92
|
-
|
|
89
|
+
const lastState = last(this.queue);
|
|
90
|
+
const currentOps = this.ops.filter(x => {
|
|
93
91
|
let _true = true;
|
|
94
92
|
if (x.condition) {
|
|
95
93
|
_true = x.condition();
|
|
@@ -104,21 +102,21 @@ export class ExpressionInterpreter {
|
|
|
104
102
|
return _true && x.after.indexOf(lastState.state) > -1;
|
|
105
103
|
}
|
|
106
104
|
});
|
|
107
|
-
//console.log(currentOps.map(x => x.name));
|
|
105
|
+
// console.log(currentOps.map(x => x.name));
|
|
108
106
|
let inc = 0;
|
|
109
|
-
|
|
107
|
+
const map = {};
|
|
110
108
|
currentOps.map((x, index) => {
|
|
111
109
|
map[inc] = index;
|
|
112
110
|
inc = x.skipIndex ? inc + x.skipIndex : inc + 1;
|
|
113
111
|
});
|
|
114
112
|
const regex = new RegExp('^\\s*' + currentOps.map(x => '(' + x.regex.source + ')').join('|'), 'gim');
|
|
115
|
-
|
|
113
|
+
const arr = regex.exec(str);
|
|
116
114
|
if (arr) {
|
|
117
115
|
// let index = arr.findIndex(x => !isUndefined(x));
|
|
118
|
-
|
|
116
|
+
const index = findIndex(arr, x => !isUndefined(x), 1) - 1;
|
|
119
117
|
if (index > -1) {
|
|
120
|
-
|
|
121
|
-
|
|
118
|
+
const opId = map[index];
|
|
119
|
+
const op = currentOps[opId];
|
|
122
120
|
// console.log(map, regex, arr, regex.lastIndex,op.name);
|
|
123
121
|
op.method.apply(this, [arr[index + 1], str]);
|
|
124
122
|
const nextStr = str.substring(regex.lastIndex);
|
|
@@ -145,7 +143,7 @@ export class ExpressionInterpreter {
|
|
|
145
143
|
}
|
|
146
144
|
*/
|
|
147
145
|
onKey(match, str) {
|
|
148
|
-
|
|
146
|
+
const key = match.replace(/^('|")|('|")$/g, '');
|
|
149
147
|
this.queue.push({
|
|
150
148
|
group: this.groupLevel,
|
|
151
149
|
value: key,
|
|
@@ -186,10 +184,10 @@ export class ExpressionInterpreter {
|
|
|
186
184
|
return value2;
|
|
187
185
|
});
|
|
188
186
|
}
|
|
189
|
-
|
|
190
|
-
|
|
187
|
+
const op = this.queue.pop();
|
|
188
|
+
const key = this.queue.pop();
|
|
191
189
|
let erg;
|
|
192
|
-
if (op.state
|
|
190
|
+
if (op.state === 'onOperator' && key && key.state === 'onKey') {
|
|
193
191
|
switch (op.value.trim().toLowerCase()) {
|
|
194
192
|
case '=':
|
|
195
193
|
erg = Eq(Key(key.value), Value(value));
|
|
@@ -230,7 +228,7 @@ export class ExpressionInterpreter {
|
|
|
230
228
|
key: key,
|
|
231
229
|
desc: erg
|
|
232
230
|
});
|
|
233
|
-
|
|
231
|
+
const res = last(this.res);
|
|
234
232
|
if (res instanceof GroupDesc) {
|
|
235
233
|
res.values.push(erg);
|
|
236
234
|
}
|
|
@@ -240,7 +238,7 @@ export class ExpressionInterpreter {
|
|
|
240
238
|
}
|
|
241
239
|
visitGroup() {
|
|
242
240
|
this.groupLevel++;
|
|
243
|
-
|
|
241
|
+
const groupDesc = new GroupDesc();
|
|
244
242
|
groupDesc.id = this.groupLevel;
|
|
245
243
|
this.res.push(groupDesc);
|
|
246
244
|
this.queue.push({
|
|
@@ -250,12 +248,12 @@ export class ExpressionInterpreter {
|
|
|
250
248
|
});
|
|
251
249
|
}
|
|
252
250
|
leaveGroup() {
|
|
253
|
-
|
|
254
|
-
if (group && group.type
|
|
255
|
-
remove(this.res, g => g instanceof GroupDesc ? g.id
|
|
251
|
+
const group = this.res.find(g => g instanceof GroupDesc ? g.id === this.groupLevel : false);
|
|
252
|
+
if (group && group.type === 'group') {
|
|
253
|
+
remove(this.res, g => g instanceof GroupDesc ? g.id === this.groupLevel : false);
|
|
256
254
|
// embedded withotu bool
|
|
257
|
-
|
|
258
|
-
|
|
255
|
+
const prevGid = this.groupLevel - 1;
|
|
256
|
+
const prevGroup = this.res.find(g => g instanceof GroupDesc ? g.id === prevGid : false);
|
|
259
257
|
if (prevGroup) {
|
|
260
258
|
group.values.forEach((v) => prevGroup.values.push(v));
|
|
261
259
|
group.values = [];
|
|
@@ -269,19 +267,19 @@ export class ExpressionInterpreter {
|
|
|
269
267
|
state: 'leaveGroup',
|
|
270
268
|
desc: group
|
|
271
269
|
});
|
|
272
|
-
//this.
|
|
270
|
+
// this.
|
|
273
271
|
this.groupLevel--;
|
|
274
272
|
}
|
|
275
273
|
onBool(match) {
|
|
276
|
-
|
|
277
|
-
|
|
274
|
+
const bool = match.trim().toLocaleUpperCase();
|
|
275
|
+
const last = this.res.pop();
|
|
278
276
|
let group;
|
|
279
|
-
if (last instanceof GroupDesc && last.id
|
|
277
|
+
if (last instanceof GroupDesc && last.id === this.groupLevel && last.type.toLowerCase() === bool.toLowerCase()) {
|
|
280
278
|
// DO NOTTING
|
|
281
279
|
group = last;
|
|
282
280
|
this.res.push(group);
|
|
283
281
|
}
|
|
284
|
-
else if (last instanceof GroupDesc && last.type
|
|
282
|
+
else if (last instanceof GroupDesc && last.type === 'group') {
|
|
285
283
|
// undefined
|
|
286
284
|
switch (bool) {
|
|
287
285
|
case 'AND':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressionInterpreter.js","sourceRoot":"","sources":["../../../../src/libs/expressions/ExpressionInterpreter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAE9C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAC9C,OAAO,EAAC,KAAK,EAAC,MAAM,6BAA6B,CAAC;AAClD,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAC9C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAGrF,MAAM,OAAO,qBAAqB;
|
|
1
|
+
{"version":3,"file":"ExpressionInterpreter.js","sourceRoot":"","sources":["../../../../src/libs/expressions/ExpressionInterpreter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAE9C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAC9C,OAAO,EAAC,KAAK,EAAC,MAAM,6BAA6B,CAAC;AAClD,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAC9C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAGrF,MAAM,OAAO,qBAAqB;IA0EhC;QAxEA,2BAA2B;QAE3B,eAAU,GAAW,CAAC,CAAC;QAEvB,QAAG,GAAU;YACX;gBACE,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI,CAAC,UAAU;gBACvB,KAAK,EAAE;oBACL,IAAI;oBACJ,YAAY;oBACZ,QAAQ;iBACT;aACF;YACD;gBACE,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI,CAAC,UAAU;gBACvB,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC;gBACpC,KAAK,EAAE;oBACL,SAAS;oBACT,YAAY;iBACb;aACF;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,iCAAiC;gBACxC,MAAM,EAAE,IAAI,CAAC,KAAK;gBAClB,SAAS,EAAE,CAAC;gBACZ,KAAK,EAAE;oBACL,IAAI;oBACJ,YAAY;oBACZ,QAAQ;iBACT;aACF;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,mBAAmB;gBAC1B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,SAAS,EAAE,CAAC;gBACZ,KAAK,EAAE;oBACL,YAAY;oBACZ,SAAS;iBACV;aACF;YACD;gBACE,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,0CAA0C;gBACjD,MAAM,EAAE,IAAI,CAAC,UAAU;gBACvB,SAAS,EAAE,CAAC;gBACZ,KAAK,EAAE;oBACL,OAAO;iBACR;aACF;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,oFAAoF;gBAC3F,MAAM,EAAE,IAAI,CAAC,OAAO;gBACpB,SAAS,EAAE,CAAC;gBACZ,KAAK,EAAE;oBACL,YAAY;iBACb;aACF;SACF,CAAC;QAEF,QAAG,GAAe,EAAE,CAAC;QAErB,UAAK,GAAU,EAAE,CAAC;QAKhB,kCAAkC;IACpC,CAAC;IAGD,UAAU,CAAC,GAAW;QACpB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAGD,WAAW,CAAC,GAAW;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YACrC,IAAI,KAAK,GAAG,IAAI,CAAC;YACjB,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;gBAChB,KAAK,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;YACxB,CAAC;YACD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACxD,CAAC;QAEH,CAAC,CAAC,CAAC;QACH,4CAA4C;QAC5C,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,MAAM,GAAG,GAAQ,EAAE,CAAC;QACpB,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACjB,GAAG,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QACrG,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,GAAG,EAAE,CAAC;YACR,mDAAmD;YACnD,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;YAE1D,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;gBACf,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;gBACxB,MAAM,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC5B,yDAAyD;gBACzD,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC7C,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC/C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;oBACtB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,GAAG,GAAG,eAAe,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED;;;;;;;;;MASE;IAEF,KAAK,CAAC,KAAa,EAAE,GAAW;QAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,OAAO;SACf,CAAC,CAAC;IAEL,CAAC;IAGD,UAAU,CAAC,KAAa,EAAE,GAAW;QACnC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;IACL,CAAC;IAGD,OAAO,CAAC,KAAa,EAAE,GAAW;QAChC,IAAI,KAAU,CAAC;QACf,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QAC9C,CAAC;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;iBAChE,GAAG,CAAC,CAAC,CAAC,EAAE;gBACP,IAAI,MAAM,GAAQ,CAAC,CAAC;gBACpB,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5B,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;gBAC3C,CAAC;qBAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3B,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACvB,CAAC;qBAAM,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBAChC,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QAGD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAG7B,IAAI,GAAa,CAAC;QAClB,IAAI,EAAE,CAAC,KAAK,KAAK,YAAY,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YAC9D,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;gBACtC,KAAK,GAAG;oBACN,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,MAAM;oBACT,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACzC,MAAM;gBACR,KAAK,IAAI;oBACP,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,IAAI;oBACP,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,GAAG;oBACN,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,GAAG;oBACN,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,IAAI;oBACP,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,IAAI;oBACP,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACxC,MAAM;gBACR;oBACE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxC,CAAC;QAGD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,SAAS;YAChB,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,GAAG;SACV,CAAC,CAAC;QAGH,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,GAAG,YAAY,SAAS,EAAE,CAAC;YAC7B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IAGD,UAAU;QACR,IAAI,CAAC,UAAU,EAAE,CAAC;QAGlB,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAClC,SAAS,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;IACL,CAAC;IAGD,UAAU;QAER,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5F,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACjF,wBAAwB;YACxB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;YACpC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACxF,IAAI,SAAS,EAAE,CAAC;gBACd,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChE,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAGH,QAAQ;QAER,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,KAAa;QAClB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QAC5B,IAAI,KAAgB,CAAC;QAErB,IAAI,IAAI,YAAY,SAAS,IAAI,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YAC/G,aAAa;YACb,KAAK,GAAG,IAAI,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;aAAM,IAAI,IAAI,YAAY,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC9D,YAAY;YACZ,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,KAAK;oBACR,KAAK,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC5B,MAAM;gBACR,KAAK,IAAI;oBACP,KAAK,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC3B,MAAM;YACV,CAAC;YACD,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,KAAK;oBACR,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;oBAClB,MAAM;gBACR,KAAK,IAAI;oBACP,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;oBACjB,MAAM;YACV,CAAC;YACD,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,iBAAiB,EAAE;YACvC,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;IAEL,CAAC;CAGF"}
|
|
@@ -13,7 +13,7 @@ import { Value } from '../descriptors/ValueDesc.js';
|
|
|
13
13
|
import { GroupDesc } from '../descriptors/GroupDesc.js';
|
|
14
14
|
import { ExpressionInterpreter } from './ExpressionInterpreter.js';
|
|
15
15
|
import { Like } from '../descriptors/LikeDesc.js';
|
|
16
|
-
import { clone, first, has, isArray, isPlainObject, isString } from
|
|
16
|
+
import { clone, first, has, isArray, isPlainObject, isString } from '@allgemein/base';
|
|
17
17
|
const REGEX_ID = /^(([\w_]+)=((\d+)|(\d+(\.|\,)\d+)|\'([^\']*)\'),?)$/;
|
|
18
18
|
const REGEX_ID_G = /^(([\w_]+)=((\d+)|(\d+(\.|\,)\d+)|\'([^\']*)\'),?)$ /g;
|
|
19
19
|
const REGEX_ID_K = /^((\d+)|(\d+(\.|\,)\d+),?)+$/;
|
|
@@ -24,12 +24,12 @@ export class Expressions {
|
|
|
24
24
|
if (isString(str)) {
|
|
25
25
|
// check if JSON string
|
|
26
26
|
try {
|
|
27
|
-
|
|
27
|
+
const obj = JSON.parse(str.trim());
|
|
28
28
|
return this.fromJson(obj);
|
|
29
29
|
}
|
|
30
30
|
catch (e) {
|
|
31
31
|
try {
|
|
32
|
-
|
|
32
|
+
const interpreter = new ExpressionInterpreter();
|
|
33
33
|
return interpreter.interprete(str);
|
|
34
34
|
}
|
|
35
35
|
catch (e) {
|
|
@@ -44,7 +44,7 @@ export class Expressions {
|
|
|
44
44
|
throw new NotSupportedError('object cant be interpreted to conditions, wrong format');
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
//static validate(entityDef:EntityDef, condition:CondDesc)
|
|
47
|
+
// static validate(entityDef:EntityDef, condition:CondDesc)
|
|
48
48
|
/*
|
|
49
49
|
static fromJson(object: any): CondDesc {
|
|
50
50
|
let cond: CondDesc;
|
|
@@ -55,14 +55,14 @@ export class Expressions {
|
|
|
55
55
|
if (/^(\$and|\$or)$/.test(data.key) && isArray(data.value)) {
|
|
56
56
|
console.log(data.key);
|
|
57
57
|
|
|
58
|
-
if (data.key
|
|
58
|
+
if (data.key === '$and') {
|
|
59
59
|
op = And()
|
|
60
|
-
} else if (data.key
|
|
60
|
+
} else if (data.key === '$or') {
|
|
61
61
|
op = Or()
|
|
62
62
|
}
|
|
63
63
|
(<any>data).cond = op;
|
|
64
64
|
} else if (data.key.startsWith('$') && !isPlainObject(data.value)) {
|
|
65
|
-
if (data.key
|
|
65
|
+
if (data.key === '$eq') {
|
|
66
66
|
let value = null;
|
|
67
67
|
if (isPlainObject(data.value)) {
|
|
68
68
|
if (has(data.value, '$key')) {
|
|
@@ -104,8 +104,8 @@ export class Expressions {
|
|
|
104
104
|
if (!parent || !(parent instanceof GroupDesc)) {
|
|
105
105
|
parent = Or();
|
|
106
106
|
}
|
|
107
|
-
for (
|
|
108
|
-
|
|
107
|
+
for (const obj of object) {
|
|
108
|
+
const sub = this.fromJson(obj, null, parent);
|
|
109
109
|
if (!(sub instanceof GroupDesc)) {
|
|
110
110
|
parent.values.push(sub);
|
|
111
111
|
}
|
|
@@ -113,13 +113,13 @@ export class Expressions {
|
|
|
113
113
|
return parent;
|
|
114
114
|
}
|
|
115
115
|
else if (isPlainObject(object)) {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
if (keys.length
|
|
119
|
-
|
|
120
|
-
if (op
|
|
116
|
+
const keys = Object.keys(object);
|
|
117
|
+
const operator = keys.filter(k => k.startsWith('$'));
|
|
118
|
+
if (keys.length === 1 && operator.length === 1) {
|
|
119
|
+
const op = operator.shift();
|
|
120
|
+
if (op === '$or' || op === '$and') {
|
|
121
121
|
if (isArray(object[op])) {
|
|
122
|
-
|
|
122
|
+
const desc = op === '$or' ? Or() : And();
|
|
123
123
|
if (parent instanceof GroupDesc) {
|
|
124
124
|
parent.values.push(desc);
|
|
125
125
|
}
|
|
@@ -130,7 +130,7 @@ export class Expressions {
|
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
132
|
else if (this.exprKeys().indexOf(op) > -1) {
|
|
133
|
-
|
|
133
|
+
const key = Key(srcKey);
|
|
134
134
|
let value = null;
|
|
135
135
|
if (isArray(object[op])) {
|
|
136
136
|
value = Value(object[op]);
|
|
@@ -154,12 +154,12 @@ export class Expressions {
|
|
|
154
154
|
throw new NotSupportedError('operator ' + op + ' not supported');
|
|
155
155
|
}
|
|
156
156
|
}
|
|
157
|
-
else if (operator.length
|
|
158
|
-
|
|
159
|
-
for (
|
|
157
|
+
else if (operator.length === 0) {
|
|
158
|
+
const desc = [];
|
|
159
|
+
for (const k of keys) {
|
|
160
160
|
desc.push(this.fromJson(object[k], k, null));
|
|
161
161
|
}
|
|
162
|
-
if (desc.length
|
|
162
|
+
if (desc.length === 1) {
|
|
163
163
|
return desc.shift();
|
|
164
164
|
}
|
|
165
165
|
else {
|
|
@@ -178,19 +178,19 @@ export class Expressions {
|
|
|
178
178
|
}
|
|
179
179
|
}
|
|
180
180
|
static parseLookupConditions(ref, id) {
|
|
181
|
-
|
|
181
|
+
const idProps = ref.getPropertyRefs().filter(p => p.isIdentifier());
|
|
182
182
|
if (/^\(.*(\)\s*,\s*\()?.*\)$/.test(id)) {
|
|
183
|
-
|
|
183
|
+
const ids = id.replace(/^\(|\)$/g, '').split(/\)\s*,\s*\(/);
|
|
184
184
|
return ids.map((_id) => this.parseLookupConditions(ref, _id));
|
|
185
185
|
}
|
|
186
186
|
else if (REGEX_ID.test(id)) {
|
|
187
|
-
|
|
187
|
+
const cond = {};
|
|
188
188
|
let e;
|
|
189
|
-
|
|
189
|
+
const keys = {};
|
|
190
190
|
while ((e = REGEX_ID_G.exec(id)) !== null) {
|
|
191
191
|
keys[e[2]] = e[4] || e[5] || e[7];
|
|
192
192
|
}
|
|
193
|
-
for (
|
|
193
|
+
for (const idp of idProps) {
|
|
194
194
|
if (keys[idp.name]) {
|
|
195
195
|
cond[idp.name] = idp.convert(keys[idp.name]);
|
|
196
196
|
}
|
|
@@ -198,7 +198,7 @@ export class Expressions {
|
|
|
198
198
|
return cond;
|
|
199
199
|
}
|
|
200
200
|
else if (/^\d+(,\d+)+$/.test(id)) {
|
|
201
|
-
|
|
201
|
+
const ids = id.split(',');
|
|
202
202
|
return ids.map((_id) => this.parseLookupConditions(ref, isString(_id) ? parseInt(_id, 0) : _id));
|
|
203
203
|
}
|
|
204
204
|
else if (REGEX_ID_K.test(id)) {
|
|
@@ -210,8 +210,8 @@ export class Expressions {
|
|
|
210
210
|
let e;
|
|
211
211
|
let c = 0;
|
|
212
212
|
while ((e = REGEX_ID_KG.exec(id)) !== null) {
|
|
213
|
-
|
|
214
|
-
|
|
213
|
+
const p = idProps[c];
|
|
214
|
+
const v = e[2] || e[3];
|
|
215
215
|
c += 1;
|
|
216
216
|
cond[p.name] = p.convert(v);
|
|
217
217
|
if (c >= idProps.length) {
|
|
@@ -223,7 +223,7 @@ export class Expressions {
|
|
|
223
223
|
return conds.length === 1 ? conds.shift() : conds;
|
|
224
224
|
}
|
|
225
225
|
else {
|
|
226
|
-
if (idProps.length
|
|
226
|
+
if (idProps.length === 1) {
|
|
227
227
|
const prop = first(idProps);
|
|
228
228
|
const ids = id.split(',').map((x) => x.trim());
|
|
229
229
|
const conds = [];
|
|
@@ -240,9 +240,9 @@ export class Expressions {
|
|
|
240
240
|
throw new NotYetImplementedError('for ' + id);
|
|
241
241
|
}
|
|
242
242
|
static buildLookupConditions(ref, data) {
|
|
243
|
-
|
|
243
|
+
const idProps = ref.getPropertyRefs().filter(p => p.isIdentifier());
|
|
244
244
|
if (isArray(data)) {
|
|
245
|
-
|
|
245
|
+
const collect = [];
|
|
246
246
|
data.forEach(d => {
|
|
247
247
|
collect.push(this._buildLookupconditions(idProps, d));
|
|
248
248
|
});
|
|
@@ -258,9 +258,9 @@ export class Expressions {
|
|
|
258
258
|
}
|
|
259
259
|
}
|
|
260
260
|
static _buildLookupconditions(idProps, data) {
|
|
261
|
-
|
|
261
|
+
const idPk = [];
|
|
262
262
|
idProps.forEach(id => {
|
|
263
|
-
|
|
263
|
+
const v = id.get(data);
|
|
264
264
|
if (isString(v)) {
|
|
265
265
|
idPk.push('\'' + v + '\'');
|
|
266
266
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Expressions.js","sourceRoot":"","sources":["../../../../src/libs/expressions/Expressions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,iBAAiB,EAAE,sBAAsB,EAAC,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAC9C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAC9C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAU,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,KAAK,EAAC,MAAM,6BAA6B,CAAC;AAClD,OAAO,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAC,qBAAqB,EAAC,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAEhD,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAGpF,MAAM,QAAQ,GAAG,qDAAqD,CAAC;AACvE,MAAM,UAAU,GAAG,uDAAuD,CAAC;AAE3E,MAAM,UAAU,GAAG,8BAA8B,CAAC;AAClD,MAAM,WAAW,GAAG,+BAA+B,CAAC;AAEpD,MAAM,UAAU,GAAG,qBAAqB,CAAC;AAEzC,MAAM,OAAO,WAAW;IAatB,MAAM,CAAC,KAAK,CAAC,GAAQ;QACnB,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,uBAAuB;YACvB,IAAI,CAAC;gBACH,
|
|
1
|
+
{"version":3,"file":"Expressions.js","sourceRoot":"","sources":["../../../../src/libs/expressions/Expressions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,iBAAiB,EAAE,sBAAsB,EAAC,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAC9C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,2BAA2B,CAAC;AAC9C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAU,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,KAAK,EAAC,MAAM,6BAA6B,CAAC;AAClD,OAAO,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAC,qBAAqB,EAAC,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAEhD,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAGpF,MAAM,QAAQ,GAAG,qDAAqD,CAAC;AACvE,MAAM,UAAU,GAAG,uDAAuD,CAAC;AAE3E,MAAM,UAAU,GAAG,8BAA8B,CAAC;AAClD,MAAM,WAAW,GAAG,+BAA+B,CAAC;AAEpD,MAAM,UAAU,GAAG,qBAAqB,CAAC;AAEzC,MAAM,OAAO,WAAW;IAatB,MAAM,CAAC,KAAK,CAAC,GAAQ;QACnB,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,uBAAuB;YACvB,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;gBACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC;oBACH,MAAM,WAAW,GAAG,IAAI,qBAAqB,EAAE,CAAC;oBAChD,OAAO,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACrC,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,CAAC;gBACV,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,iBAAiB,CAAC,wDAAwD,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAGD,2DAA2D;IAE3D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAkDE;IAEF,MAAM,CAAC,QAAQ;QACb,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,MAAW,EAAE,MAAM,GAAW,IAAI,EAAE,MAAM,GAAa,IAAI;QAEzE,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,YAAY,SAAS,CAAC,EAAE,CAAC;gBAC9C,MAAM,GAAG,EAAE,EAAE,CAAC;YAChB,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;gBACzB,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC7C,IAAI,CAAC,CAAC,GAAG,YAAY,SAAS,CAAC,EAAE,CAAC;oBAChC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC1B,CAAC;YAEH,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;aAAM,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/C,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAC5B,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC;oBAClC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;wBACxB,MAAM,IAAI,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;wBACzC,IAAI,MAAM,YAAY,SAAS,EAAE,CAAC;4BAChC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC3B,CAAC;wBACD,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC/C,CAAC;yBAAM,CAAC;wBACN,MAAM,IAAI,iBAAiB,CAAC,qCAAqC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;oBACvG,CAAC;gBACH,CAAC;qBAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;oBAC5C,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;oBACxB,IAAI,KAAK,GAAQ,IAAI,CAAC;oBACtB,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;wBACxB,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAQ,CAAC,CAAC;oBACnC,CAAC;yBAAM,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;wBACrC,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;4BAC5B,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;wBAC/B,CAAC;6BAAM,CAAC;4BACN,MAAM;4BACN,MAAM,IAAI,iBAAiB,CAAC,yCAAyC,CAAC,CAAC;wBACzE,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC5B,CAAC;oBACD,aAAa;oBACb,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC5C,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,iBAAiB,CAAC,WAAW,GAAG,EAAE,GAAG,gBAAgB,CAAC,CAAC;gBACnE,CAAC;YAEH,CAAC;iBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,GAAe,EAAE,CAAC;gBAE5B,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;oBACrB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC/C,CAAC;gBAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACtB,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;gBACtB,CAAC;qBAAM,CAAC;oBACN,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,iBAAiB,CAAC,wBAAwB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC;YACD,MAAM,IAAI,iBAAiB,CAAC,0BAA0B,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAGD,MAAM,CAAC,qBAAqB,CAAC,GAA2B,EAAE,EAAO;QAC/D,MAAM,OAAO,GAAG,GAAG,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;QAGpE,IAAI,0BAA0B,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACxC,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAC5D,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAQ,EAAE,CAAC;YACrB,IAAI,CAAC,CAAC;YACN,MAAM,IAAI,GAAQ,EAAE,CAAC;YACrB,OAAO,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC1C,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;oBACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC/C,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1B,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3G,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACxB,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAClC,CAAC;YACD,MAAM,KAAK,GAAU,EAAE,CAAC;YAExB,IAAI,IAAI,GAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC3C,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBACrB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvB,CAAC,IAAI,CAAC,CAAC;gBACP,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC5B,IAAI,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBACxB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;oBACxB,IAAI,GAAG,EAAE,CAAC;oBACV,CAAC,GAAG,CAAC,CAAC;gBACR,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QAEpD,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC5B,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACvD,MAAM,KAAK,GAAa,EAAE,CAAC;gBAC3B,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;oBACtB,MAAM,IAAI,GAAQ,EAAE,CAAC;oBACrB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBACpC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,CAAC;gBAED,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACpD,CAAC;iBAAM,CAAC;YAER,CAAC;QACH,CAAC;QACD,MAAM,IAAI,sBAAsB,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAChD,CAAC;IAGD,MAAM,CAAC,qBAAqB,CAAC,GAA2B,EAAE,IAAiB;QACzE,MAAM,OAAO,GAAG,GAAG,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;QACpE,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAClB,MAAM,OAAO,GAAa,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACf,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;YACH,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAGO,MAAM,CAAC,sBAAsB,CAAC,OAAuB,EAAE,IAAS;QACtE,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACnB,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAExB,CAAC;CAGF;AA1QQ,yBAAa,GAAG;IACrB,KAAK,EAAE,CAAC,CAAU,EAAE,CAAW,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5C,KAAK,EAAE,CAAC,CAAU,EAAE,CAAW,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IAC7C,KAAK,EAAE,CAAC,CAAU,EAAE,CAAW,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5C,KAAK,EAAE,CAAC,CAAU,EAAE,CAAW,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5C,KAAK,EAAE,CAAC,CAAU,EAAE,CAAW,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5C,KAAK,EAAE,CAAC,CAAU,EAAE,CAAW,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAU,EAAE,CAAW,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IAChD,KAAK,EAAE,CAAC,CAAU,EAAE,CAAW,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;CAC7C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@allgemein/expressions",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Library for mango expressions",
|
|
6
6
|
"main": "index.js",
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
},
|
|
27
27
|
"homepage": "https://github.com/allgemein-node/expressions#readme",
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@allgemein/base": "^1.10.
|
|
30
|
-
"@allgemein/schema-api": "^1.8.
|
|
29
|
+
"@allgemein/base": "^1.10.1",
|
|
30
|
+
"@allgemein/schema-api": "^1.8.1",
|
|
31
31
|
"@types/json-schema": "^7.0.7",
|
|
32
32
|
"glob": "^11.0.0",
|
|
33
33
|
"reflect-metadata": "^0.2.2"
|