@wix/filter-builder 1.0.39 → 1.0.41
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/dist/cjs/filter-builder.js +1 -2
- package/dist/cjs/filter-builder.js.map +1 -1
- package/dist/cjs/filter-mixin.js +15 -40
- package/dist/cjs/filter-mixin.js.map +1 -1
- package/dist/cjs/index.js +1 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/query-optimiser.js +5 -13
- package/dist/cjs/query-optimiser.js.map +1 -1
- package/dist/esm/__tests__/filter.spec.js +67 -72
- package/dist/esm/__tests__/filter.spec.js.map +1 -1
- package/dist/esm/__tests__/query-optimizer.spec.js +12 -12
- package/dist/esm/__tests__/query-optimizer.spec.js.map +1 -1
- package/dist/esm/clone.js +2 -2
- package/dist/esm/clone.js.map +1 -1
- package/dist/esm/filter-builder.js +7 -19
- package/dist/esm/filter-builder.js.map +1 -1
- package/dist/esm/filter-mixin.js +205 -270
- package/dist/esm/filter-mixin.js.map +1 -1
- package/dist/esm/filter-validator.js +42 -78
- package/dist/esm/filter-validator.js.map +1 -1
- package/dist/esm/query-optimiser.js +49 -65
- package/dist/esm/query-optimiser.js.map +1 -1
- package/dist/esm/type-utils.js +2 -2
- package/dist/esm/type-utils.js.map +1 -1
- package/dist/statics/filter-builder.umd.js +123 -195
- package/dist/statics/filter-builder.umd.js.map +1 -1
- package/dist/statics/filter-builder.umd.min.js +1 -1
- package/dist/statics/filter-builder.umd.min.js.map +1 -1
- package/dist/statics/manifest.json +1 -1
- package/dist/statics/manifest.min.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
package/dist/esm/filter-mixin.js
CHANGED
|
@@ -1,267 +1,212 @@
|
|
|
1
|
-
import { __assign, __extends, __spreadArray } from "tslib";
|
|
2
1
|
import { isArray, isFunction } from './type-utils';
|
|
3
2
|
import clone from './clone';
|
|
4
3
|
import { FilterValidator } from './filter-validator';
|
|
5
4
|
import { optimisedQuery } from './query-optimiser';
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
const filterMixin = (Base = class {
|
|
6
|
+
}) => class extends Base {
|
|
7
|
+
constructor(obj = {}) {
|
|
8
|
+
super(obj);
|
|
9
|
+
this.filterTree = obj.filterTree || { $and: [] };
|
|
10
|
+
this.invalidArguments = obj.invalidArguments || [];
|
|
11
|
+
this.encoder = obj.encoder || {};
|
|
12
|
+
}
|
|
13
|
+
eq(...args) {
|
|
14
|
+
return this._binaryAnd('$eq', '.eq', args);
|
|
15
|
+
}
|
|
16
|
+
ne(...args) {
|
|
17
|
+
return this._binaryAnd('$ne', '.ne', args);
|
|
18
|
+
}
|
|
19
|
+
ge(...args) {
|
|
20
|
+
return this._AndLogicalEquivalence('$gte', '.ge', args);
|
|
21
|
+
}
|
|
22
|
+
gt(...args) {
|
|
23
|
+
return this._AndLogicalEquivalence('$gt', '.gt', args);
|
|
24
|
+
}
|
|
25
|
+
le(...args) {
|
|
26
|
+
return this._AndLogicalEquivalence('$lte', '.le', args);
|
|
27
|
+
}
|
|
28
|
+
lt(...args) {
|
|
29
|
+
return this._AndLogicalEquivalence('$lt', '.lt', args);
|
|
30
|
+
}
|
|
31
|
+
isNotEmpty(field) {
|
|
32
|
+
const [newInvalidArguments, valid] = this._filterValidator('.isNotEmpty')
|
|
33
|
+
.arityIsOne(arguments)
|
|
34
|
+
.validFieldName(field)
|
|
35
|
+
.validateAndAggregate();
|
|
36
|
+
if (valid) {
|
|
37
|
+
return this.ne(field, null);
|
|
9
38
|
}
|
|
10
|
-
return
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
_this.encoder = obj.encoder || {};
|
|
20
|
-
return _this;
|
|
39
|
+
return this._copy(this.filterTree, newInvalidArguments);
|
|
40
|
+
}
|
|
41
|
+
isEmpty(field) {
|
|
42
|
+
const [newInvalidArguments, valid] = this._filterValidator('.isEmpty')
|
|
43
|
+
.arityIsOne(arguments)
|
|
44
|
+
.validFieldName(field)
|
|
45
|
+
.validateAndAggregate();
|
|
46
|
+
if (valid) {
|
|
47
|
+
return this.eq(field, null);
|
|
21
48
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
};
|
|
50
|
-
class_2.prototype.le = function () {
|
|
51
|
-
var args = [];
|
|
52
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
53
|
-
args[_i] = arguments[_i];
|
|
54
|
-
}
|
|
55
|
-
return this._AndLogicalEquivalence('$lte', '.le', args);
|
|
56
|
-
};
|
|
57
|
-
class_2.prototype.lt = function () {
|
|
58
|
-
var args = [];
|
|
59
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
60
|
-
args[_i] = arguments[_i];
|
|
61
|
-
}
|
|
62
|
-
return this._AndLogicalEquivalence('$lt', '.lt', args);
|
|
63
|
-
};
|
|
64
|
-
class_2.prototype.isNotEmpty = function (field) {
|
|
65
|
-
var _a = this._filterValidator('.isNotEmpty')
|
|
66
|
-
.arityIsOne(arguments)
|
|
67
|
-
.validFieldName(field)
|
|
68
|
-
.validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
|
|
69
|
-
if (valid) {
|
|
70
|
-
return this.ne(field, null);
|
|
71
|
-
}
|
|
49
|
+
return this._copy(this.filterTree, newInvalidArguments);
|
|
50
|
+
}
|
|
51
|
+
startsWith(...args) {
|
|
52
|
+
return this._AndStringOperand('$startsWith', '.startsWith', args);
|
|
53
|
+
}
|
|
54
|
+
endsWith(...args) {
|
|
55
|
+
return this._AndStringOperand('$endsWith', '.endsWith', args);
|
|
56
|
+
}
|
|
57
|
+
contains(...args) {
|
|
58
|
+
return this._AndStringOperand('$contains', '.contains', args);
|
|
59
|
+
}
|
|
60
|
+
hasSome(...args) {
|
|
61
|
+
return this._AndSetOperand('$hasSome', '.hasSome', args);
|
|
62
|
+
}
|
|
63
|
+
hasAll(...args) {
|
|
64
|
+
return this._AndSetOperand('$hasAll', '.hasAll', args);
|
|
65
|
+
}
|
|
66
|
+
or(orQuery) {
|
|
67
|
+
const [newInvalidArguments, valid] = this._filterValidator('.or')
|
|
68
|
+
.arityIsOne(arguments)
|
|
69
|
+
.isInstanceOfSameClass(orQuery)
|
|
70
|
+
.validateAndAggregate();
|
|
71
|
+
if (valid) {
|
|
72
|
+
const prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree];
|
|
73
|
+
return this._copy(inAnd({ $or: [...prefix, orQuery.filterTree] }), newInvalidArguments.concat(orQuery.invalidArguments));
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
72
76
|
return this._copy(this.filterTree, newInvalidArguments);
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
and(andQuery) {
|
|
80
|
+
const [newInvalidArguments, valid] = this._filterValidator('.and')
|
|
81
|
+
.arityIsOne(arguments)
|
|
82
|
+
.isInstanceOfSameClass(andQuery)
|
|
83
|
+
.validateAndAggregate();
|
|
84
|
+
if (valid) {
|
|
85
|
+
const prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree];
|
|
86
|
+
return this._copy(inAnd(...prefix, andQuery.filterTree), newInvalidArguments.concat(andQuery.invalidArguments));
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
82
89
|
return this._copy(this.filterTree, newInvalidArguments);
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
};
|
|
98
|
-
class_2.prototype.contains = function () {
|
|
99
|
-
var args = [];
|
|
100
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
101
|
-
args[_i] = arguments[_i];
|
|
102
|
-
}
|
|
103
|
-
return this._AndStringOperand('$contains', '.contains', args);
|
|
104
|
-
};
|
|
105
|
-
class_2.prototype.hasSome = function () {
|
|
106
|
-
var args = [];
|
|
107
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
108
|
-
args[_i] = arguments[_i];
|
|
109
|
-
}
|
|
110
|
-
return this._AndSetOperand('$hasSome', '.hasSome', args);
|
|
111
|
-
};
|
|
112
|
-
class_2.prototype.hasAll = function () {
|
|
113
|
-
var args = [];
|
|
114
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
115
|
-
args[_i] = arguments[_i];
|
|
116
|
-
}
|
|
117
|
-
return this._AndSetOperand('$hasAll', '.hasAll', args);
|
|
118
|
-
};
|
|
119
|
-
class_2.prototype.or = function (orQuery) {
|
|
120
|
-
var _a = this._filterValidator('.or')
|
|
121
|
-
.arityIsOne(arguments)
|
|
122
|
-
.isInstanceOfSameClass(orQuery)
|
|
123
|
-
.validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
|
|
124
|
-
if (valid) {
|
|
125
|
-
var prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree];
|
|
126
|
-
return this._copy(inAnd({ $or: __spreadArray(__spreadArray([], prefix, true), [orQuery.filterTree], false) }), newInvalidArguments.concat(orQuery.invalidArguments));
|
|
127
|
-
}
|
|
128
|
-
else {
|
|
129
|
-
return this._copy(this.filterTree, newInvalidArguments);
|
|
130
|
-
}
|
|
131
|
-
};
|
|
132
|
-
class_2.prototype.and = function (andQuery) {
|
|
133
|
-
var _a = this._filterValidator('.and')
|
|
134
|
-
.arityIsOne(arguments)
|
|
135
|
-
.isInstanceOfSameClass(andQuery)
|
|
136
|
-
.validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
|
|
137
|
-
if (valid) {
|
|
138
|
-
var prefix = isEmptyAnd(this.filterTree) ? [] : [this.filterTree];
|
|
139
|
-
return this._copy(inAnd.apply(void 0, __spreadArray(__spreadArray([], prefix, false), [andQuery.filterTree], false)), newInvalidArguments.concat(andQuery.invalidArguments));
|
|
140
|
-
}
|
|
141
|
-
else {
|
|
142
|
-
return this._copy(this.filterTree, newInvalidArguments);
|
|
143
|
-
}
|
|
144
|
-
};
|
|
145
|
-
class_2.prototype.not = function (notQuery) {
|
|
146
|
-
var _a = this._filterValidator('.not')
|
|
147
|
-
.arityIsOne(arguments)
|
|
148
|
-
.isInstanceOfSameClass(notQuery)
|
|
149
|
-
.validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
|
|
150
|
-
if (valid) {
|
|
151
|
-
var newFilterTree = clone(this.filterTree);
|
|
152
|
-
var notClause = { $not: [notQuery.filterTree] };
|
|
153
|
-
var resultingFilter = inAndOptimized(newFilterTree, notClause);
|
|
154
|
-
return this._copy(resultingFilter, newInvalidArguments.concat(notQuery.invalidArguments));
|
|
155
|
-
}
|
|
156
|
-
else {
|
|
157
|
-
return this._copy(this.filterTree, newInvalidArguments);
|
|
158
|
-
}
|
|
159
|
-
};
|
|
160
|
-
class_2.prototype.between = function (field, rangeStart, rangeEnd) {
|
|
161
|
-
var _a = this._filterValidator('.between')
|
|
162
|
-
.arityIsThree(arguments)
|
|
163
|
-
.sameType(rangeStart, rangeEnd)
|
|
164
|
-
.typeIsStringNumberOrDate(rangeStart)
|
|
165
|
-
.typeIsStringNumberOrDate(rangeEnd)
|
|
166
|
-
.validateAndAggregate(), newInvalidArguments = _a[0], valid = _a[1];
|
|
167
|
-
if (valid) {
|
|
168
|
-
return this.ge(field, rangeStart).lt(field, rangeEnd);
|
|
169
|
-
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
not(notQuery) {
|
|
93
|
+
const [newInvalidArguments, valid] = this._filterValidator('.not')
|
|
94
|
+
.arityIsOne(arguments)
|
|
95
|
+
.isInstanceOfSameClass(notQuery)
|
|
96
|
+
.validateAndAggregate();
|
|
97
|
+
if (valid) {
|
|
98
|
+
const newFilterTree = clone(this.filterTree);
|
|
99
|
+
const notClause = { $not: [notQuery.filterTree] };
|
|
100
|
+
const resultingFilter = inAndOptimized(newFilterTree, notClause);
|
|
101
|
+
return this._copy(resultingFilter, newInvalidArguments.concat(notQuery.invalidArguments));
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
170
104
|
return this._copy(this.filterTree, newInvalidArguments);
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
}
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
between(field, rangeStart, rangeEnd) {
|
|
108
|
+
const [newInvalidArguments, valid] = this._filterValidator('.between')
|
|
109
|
+
.arityIsThree(arguments)
|
|
110
|
+
.sameType(rangeStart, rangeEnd)
|
|
111
|
+
.typeIsStringNumberOrDate(rangeStart)
|
|
112
|
+
.typeIsStringNumberOrDate(rangeEnd)
|
|
113
|
+
.validateAndAggregate();
|
|
114
|
+
if (valid) {
|
|
115
|
+
return this.ge(field, rangeStart).lt(field, rangeEnd);
|
|
116
|
+
}
|
|
117
|
+
return this._copy(this.filterTree, newInvalidArguments);
|
|
118
|
+
}
|
|
119
|
+
getFilterModel() {
|
|
120
|
+
if (this.invalidArguments.length > 0) {
|
|
121
|
+
throw new Error(this.invalidArguments.join(' '));
|
|
122
|
+
}
|
|
123
|
+
return optimisedQuery(this.filterTree);
|
|
124
|
+
}
|
|
125
|
+
setFilterModel(filterModel) {
|
|
126
|
+
return this._copy(filterModel, []);
|
|
127
|
+
}
|
|
128
|
+
_binaryAnd(filterOperatorSymbol, operatorName, args) {
|
|
129
|
+
const [field, operand] = Array.prototype.slice.call(args);
|
|
130
|
+
const [newInvalidArguments] = this._filterValidator(operatorName)
|
|
131
|
+
.arityIsTwo(args)
|
|
132
|
+
.validFieldName(field)
|
|
133
|
+
.validateAndAggregate();
|
|
134
|
+
const newFilterTree = this._makeNewFilter(field, filterOperatorSymbol, operand);
|
|
135
|
+
return this._copy(newFilterTree, newInvalidArguments);
|
|
136
|
+
}
|
|
137
|
+
_AndLogicalEquivalence(filterOperatorSymbol, operatorName, args) {
|
|
138
|
+
const [field, operand] = Array.prototype.slice.call(args);
|
|
139
|
+
const [newInvalidArguments] = this._filterValidator(operatorName)
|
|
140
|
+
.arityIsTwo(args)
|
|
141
|
+
.validFieldName(field)
|
|
142
|
+
.typeIsStringNumberOrDate(operand)
|
|
143
|
+
.validateAndAggregate();
|
|
144
|
+
const newFilterTree = this._makeNewFilter(field, filterOperatorSymbol, operand);
|
|
145
|
+
return this._copy(newFilterTree, newInvalidArguments);
|
|
146
|
+
}
|
|
147
|
+
_AndStringOperand(filterOperatorName, operatorName, args) {
|
|
148
|
+
const [field, operand] = Array.prototype.slice.call(args);
|
|
149
|
+
const [newInvalidArguments] = this._filterValidator(operatorName)
|
|
150
|
+
.arityIsTwo(args)
|
|
151
|
+
.validFieldName(field)
|
|
152
|
+
.typeIsString(operand)
|
|
153
|
+
.validateAndAggregate();
|
|
154
|
+
const newFilterTree = this._makeNewFilter(field, filterOperatorName, operand);
|
|
155
|
+
return this._copy(newFilterTree, newInvalidArguments);
|
|
156
|
+
}
|
|
157
|
+
_AndSetOperand(filterOperatorName, operatorName, args) {
|
|
158
|
+
const [field, ...rawOperands] = Array.prototype.slice.call(args);
|
|
159
|
+
const operands = isArray(rawOperands[0]) ? rawOperands[0] : rawOperands;
|
|
160
|
+
const [newInvalidArguments] = this._filterValidator(operatorName)
|
|
161
|
+
.arityIsAtLeastTwo(args)
|
|
162
|
+
.validFieldName(field)
|
|
163
|
+
.typeIsStringNumberOrDateForAll(operands)
|
|
164
|
+
.validateAndAggregate();
|
|
165
|
+
const newFilterTree = this._makeNewFilter(field, filterOperatorName, operands);
|
|
166
|
+
return this._copy(newFilterTree, newInvalidArguments);
|
|
167
|
+
}
|
|
168
|
+
_makeNewFilter(field, filterOperatorName, operand) {
|
|
169
|
+
const newFilterTree = clone(this.filterTree);
|
|
170
|
+
const serializableOperand = operand === undefined ? null : operand;
|
|
171
|
+
const newFilter = this._buildFilter(field, filterOperatorName, serializableOperand);
|
|
172
|
+
if (isArray(newFilterTree.$and)) {
|
|
173
|
+
newFilterTree.$and.push(newFilter);
|
|
174
|
+
return newFilterTree;
|
|
175
|
+
}
|
|
176
|
+
else {
|
|
177
|
+
const result = isEmptyObject(newFilterTree)
|
|
178
|
+
? inAnd(newFilter)
|
|
179
|
+
: inAnd(newFilterTree, newFilter);
|
|
180
|
+
return result;
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
_buildFilter(field, filterOperatorName, operand) {
|
|
184
|
+
if (filterOperatorName !== '$eq') {
|
|
185
|
+
const newFilter = {};
|
|
186
|
+
newFilter[field] = {};
|
|
187
|
+
newFilter[field][filterOperatorName] = this._encode(operand);
|
|
188
|
+
return newFilter;
|
|
189
|
+
}
|
|
190
|
+
else {
|
|
191
|
+
const newFilter = {};
|
|
192
|
+
newFilter[field] = this._encode(operand);
|
|
193
|
+
return newFilter;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
_encode(operand) {
|
|
197
|
+
if (isFunction(this.encoder)) {
|
|
198
|
+
return this.encoder(operand);
|
|
199
|
+
}
|
|
200
|
+
else {
|
|
201
|
+
return operand;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
_copy(filterTree, invalidArguments) {
|
|
205
|
+
return new this.constructor({ ...this, filterTree, invalidArguments });
|
|
206
|
+
}
|
|
207
|
+
_filterValidator(filterOperatorName) {
|
|
208
|
+
return new FilterValidator(filterOperatorName, this.invalidArguments, this.constructor);
|
|
209
|
+
}
|
|
265
210
|
};
|
|
266
211
|
function isConjunctiveFormFilter(filterTree) {
|
|
267
212
|
return isArray(filterTree.$and);
|
|
@@ -269,26 +214,16 @@ function isConjunctiveFormFilter(filterTree) {
|
|
|
269
214
|
function isEmptyObject(obj) {
|
|
270
215
|
return Object.keys(obj).length === 0;
|
|
271
216
|
}
|
|
272
|
-
function inAnd() {
|
|
273
|
-
var args = [];
|
|
274
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
275
|
-
args[_i] = arguments[_i];
|
|
276
|
-
}
|
|
217
|
+
function inAnd(...args) {
|
|
277
218
|
return {
|
|
278
219
|
$and: args,
|
|
279
220
|
};
|
|
280
221
|
}
|
|
281
|
-
function inAndOptimized() {
|
|
282
|
-
var args = [];
|
|
283
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
284
|
-
args[_i] = arguments[_i];
|
|
285
|
-
}
|
|
222
|
+
function inAndOptimized(...args) {
|
|
286
223
|
return {
|
|
287
|
-
$and: args.reduce(
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
: aggr.concat([val]);
|
|
291
|
-
}, []),
|
|
224
|
+
$and: args.reduce((aggr, val) => isConjunctiveFormFilter(val)
|
|
225
|
+
? aggr.concat(val.$and)
|
|
226
|
+
: aggr.concat([val]), []),
|
|
292
227
|
};
|
|
293
228
|
}
|
|
294
229
|
function isEmptyAnd(node) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-mixin.js","sourceRoot":"","sources":["../../src/filter-mixin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"filter-mixin.js","sourceRoot":"","sources":["../../src/filter-mixin.ts"],"names":[],"mappings":"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"}
|