@dcupl/common 0.0.81-beta.2 → 0.0.81-beta.3
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/lib-cjs/getFacets.js +7 -4
- package/dist/lib-cjs/getFacets.js.map +1 -1
- package/dist/lib-cjs/index.d.ts +1 -0
- package/dist/lib-cjs/index.js +1 -0
- package/dist/lib-cjs/index.js.map +1 -1
- package/dist/lib-cjs/query-builder.d.ts +22 -0
- package/dist/lib-cjs/query-builder.js +229 -0
- package/dist/lib-cjs/query-builder.js.map +1 -0
- package/dist/lib-cjs/queryData.js +56 -15
- package/dist/lib-cjs/queryData.js.map +1 -1
- package/dist/lib-cjs/tsconfig-cjs.tsbuildinfo +1 -1
- package/dist/lib-cjs/types/dcupl.types.d.ts +5 -7
- package/dist/lib-cjs/types/dcupl.types.js +12 -0
- package/dist/lib-cjs/types/dcupl.types.js.map +1 -1
- package/dist/lib-cjs/types/filter.types.d.ts +4 -3
- package/dist/lib-cjs/types/filter.types.js.map +1 -1
- package/dist/lib-cjs/types/list.types.d.ts +2 -2
- package/dist/lib-esm/getFacets.js +7 -4
- package/dist/lib-esm/getFacets.js.map +1 -1
- package/dist/lib-esm/index.d.ts +1 -0
- package/dist/lib-esm/index.js +1 -0
- package/dist/lib-esm/index.js.map +1 -1
- package/dist/lib-esm/query-builder.d.ts +22 -0
- package/dist/lib-esm/query-builder.js +226 -0
- package/dist/lib-esm/query-builder.js.map +1 -0
- package/dist/lib-esm/queryData.js +57 -16
- package/dist/lib-esm/queryData.js.map +1 -1
- package/dist/lib-esm/tsconfig.tsbuildinfo +1 -1
- package/dist/lib-esm/types/dcupl.types.d.ts +5 -7
- package/dist/lib-esm/types/dcupl.types.js +11 -1
- package/dist/lib-esm/types/dcupl.types.js.map +1 -1
- package/dist/lib-esm/types/filter.types.d.ts +4 -3
- package/dist/lib-esm/types/filter.types.js.map +1 -1
- package/dist/lib-esm/types/list.types.d.ts +2 -2
- package/package.json +1 -1
|
@@ -38,10 +38,14 @@ var __values = (this && this.__values) || function(o) {
|
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.getFacets = void 0;
|
|
40
40
|
var queryData_1 = require("./queryData");
|
|
41
|
+
var query_builder_1 = require("./query-builder");
|
|
42
|
+
var lodash_1 = require("lodash");
|
|
43
|
+
var queryBuilder = new query_builder_1.QueryBuilder();
|
|
41
44
|
function getFacets(modelData, remoteModelData, options, query, attributeKey, modelIndexMap) {
|
|
42
45
|
var e_1, _a, e_2, _b, e_3, _c;
|
|
43
46
|
var filterItemEntries = [];
|
|
44
|
-
var
|
|
47
|
+
var queryWithoutCurrentFilter = queryBuilder.removeQuery({ queryKey: attributeKey }, (0, lodash_1.cloneDeep)(query));
|
|
48
|
+
var currentFilteredData = (0, queryData_1.queryData)(modelData, queryWithoutCurrentFilter, false, modelIndexMap);
|
|
45
49
|
var remoteModelDataKeys = remoteModelData ? __spreadArray([], __read(remoteModelData === null || remoteModelData === void 0 ? void 0 : remoteModelData.keys()), false) : [];
|
|
46
50
|
var validFacetKeys = new Set(remoteModelDataKeys);
|
|
47
51
|
var indexMap = modelIndexMap.get(attributeKey);
|
|
@@ -119,13 +123,12 @@ function getFacets(modelData, remoteModelData, options, query, attributeKey, mod
|
|
|
119
123
|
}
|
|
120
124
|
exports.getFacets = getFacets;
|
|
121
125
|
var isFilterItemEntrySelected = function (groupKey, facetKey, query) {
|
|
122
|
-
var idx = query.query.findIndex(function (query) { return
|
|
123
|
-
// console.log('isFilterItemEntrySelected', groupKey, facetKey, JSON.stringify(query, null, 2), idx);
|
|
126
|
+
var idx = query.query.findIndex(function (query) { return queryBuilder.isQueryGroup(query) && query.queryKey === groupKey; });
|
|
124
127
|
if (idx > -1) {
|
|
125
128
|
var queryGroup = query.query[idx];
|
|
126
129
|
return !!queryGroup.query.find(function (query) {
|
|
127
130
|
var _a;
|
|
128
|
-
if (
|
|
131
|
+
if (queryBuilder.isQuery(query)) {
|
|
129
132
|
var key = ((_a = query.value) === null || _a === void 0 ? void 0 : _a.key) || query.value;
|
|
130
133
|
return query.attribute === groupKey && key === facetKey;
|
|
131
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFacets.js","sourceRoot":"","sources":["../../src/getFacets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,yCAAwC;AAExC,SAAgB,SAAS,CACvB,SAAgC,EAChC,eAAsC,EACtC,OAA2B,EAC3B,KAAsC,EACtC,YAAoB,EACpB,aAAuC;;IAEvC,IAAM,iBAAiB,GAAsB,EAAE,CAAC;IAEhD,IAAM,mBAAmB,GAAG,IAAA,qBAAS,
|
|
1
|
+
{"version":3,"file":"getFacets.js","sourceRoot":"","sources":["../../src/getFacets.ts"],"names":[],"mappings":"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"}
|
package/dist/lib-cjs/index.d.ts
CHANGED
package/dist/lib-cjs/index.js
CHANGED
|
@@ -24,4 +24,5 @@ __exportStar(require("./getConstraints"), exports);
|
|
|
24
24
|
__exportStar(require("./types"), exports);
|
|
25
25
|
__exportStar(require("./changeDetection"), exports);
|
|
26
26
|
__exportStar(require("./performance"), exports);
|
|
27
|
+
__exportStar(require("./query-builder"), exports);
|
|
27
28
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,8CAA4B;AAC5B,uDAAqC;AACrC,2CAAyB;AACzB,oDAAkC;AAClC,8CAA4B;AAC5B,mDAAiC;AACjC,0CAAwB;AACxB,oDAAkC;AAClC,gDAA8B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,8CAA4B;AAC5B,uDAAqC;AACrC,2CAAyB;AACzB,oDAAkC;AAClC,8CAA4B;AAC5B,mDAAiC;AACjC,0CAAwB;AACxB,oDAAkC;AAClC,gDAA8B;AAC9B,kDAAgC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { DcuplGlobalQueryOptionsNew, DcuplItemsOptions, DcuplQuery, DcuplQueryGroup } from './types';
|
|
2
|
+
export declare class QueryBuilder {
|
|
3
|
+
private _defaultQueryOptions;
|
|
4
|
+
private _initOptions;
|
|
5
|
+
private queryOptions;
|
|
6
|
+
constructor();
|
|
7
|
+
init(options: {
|
|
8
|
+
listKey: string;
|
|
9
|
+
}): void;
|
|
10
|
+
reset(): void;
|
|
11
|
+
isQuery(query: Partial<DcuplQuery> | Partial<DcuplQueryGroup>): query is DcuplQuery;
|
|
12
|
+
isQueryGroup(query: Partial<DcuplQuery> | Partial<DcuplQueryGroup>): query is DcuplQueryGroup;
|
|
13
|
+
isRootQueryGroup(query: Partial<DcuplQuery> | Partial<DcuplQueryGroup>): query is DcuplGlobalQueryOptionsNew<any>;
|
|
14
|
+
getQueryGroup(queryKey?: string): DcuplQueryGroup | undefined;
|
|
15
|
+
getQuery(): DcuplGlobalQueryOptionsNew<any>;
|
|
16
|
+
hasQueryGroup(queryKey: string): boolean;
|
|
17
|
+
applyItemOptions(options: DcuplItemsOptions<any>): DcuplGlobalQueryOptionsNew<any>;
|
|
18
|
+
applyQuery(queryToApply: DcuplQueryGroup | DcuplQuery | DcuplQuery[] | DcuplQueryGroup[], options?: {
|
|
19
|
+
mode?: 'set' | 'add';
|
|
20
|
+
}, relevantQuery?: DcuplGlobalQueryOptionsNew<any>): DcuplGlobalQueryOptionsNew<any>;
|
|
21
|
+
removeQuery(queryToRemove: Partial<DcuplQueryGroup> | DcuplQuery, relevantQuery?: DcuplGlobalQueryOptionsNew<any>): DcuplGlobalQueryOptionsNew<any>;
|
|
22
|
+
}
|
|
@@ -0,0 +1,229 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __values = (this && this.__values) || function(o) {
|
|
3
|
+
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
4
|
+
if (m) return m.call(o);
|
|
5
|
+
if (o && typeof o.length === "number") return {
|
|
6
|
+
next: function () {
|
|
7
|
+
if (o && i >= o.length) o = void 0;
|
|
8
|
+
return { value: o && o[i++], done: !o };
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
12
|
+
};
|
|
13
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
14
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
15
|
+
if (!m) return o;
|
|
16
|
+
var i = m.call(o), r, ar = [], e;
|
|
17
|
+
try {
|
|
18
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
19
|
+
}
|
|
20
|
+
catch (error) { e = { error: error }; }
|
|
21
|
+
finally {
|
|
22
|
+
try {
|
|
23
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
24
|
+
}
|
|
25
|
+
finally { if (e) throw e.error; }
|
|
26
|
+
}
|
|
27
|
+
return ar;
|
|
28
|
+
};
|
|
29
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
30
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
31
|
+
if (ar || !(i in from)) {
|
|
32
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
33
|
+
ar[i] = from[i];
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.QueryBuilder = void 0;
|
|
40
|
+
var lodash_1 = require("lodash");
|
|
41
|
+
var QueryBuilder = /** @class */ (function () {
|
|
42
|
+
function QueryBuilder() {
|
|
43
|
+
this._defaultQueryOptions = {
|
|
44
|
+
listKey: '',
|
|
45
|
+
queryKey: 'root',
|
|
46
|
+
queryType: 'and',
|
|
47
|
+
query: [],
|
|
48
|
+
};
|
|
49
|
+
this.queryOptions = (0, lodash_1.cloneDeep)(this._defaultQueryOptions);
|
|
50
|
+
}
|
|
51
|
+
QueryBuilder.prototype.init = function (options) {
|
|
52
|
+
this._initOptions = (0, lodash_1.cloneDeep)(options);
|
|
53
|
+
this.queryOptions = (0, lodash_1.cloneDeep)(this._defaultQueryOptions);
|
|
54
|
+
this.queryOptions.listKey = options.listKey;
|
|
55
|
+
};
|
|
56
|
+
QueryBuilder.prototype.reset = function () {
|
|
57
|
+
this.init(this._initOptions);
|
|
58
|
+
};
|
|
59
|
+
QueryBuilder.prototype.isQuery = function (query) {
|
|
60
|
+
return 'attribute' in query;
|
|
61
|
+
};
|
|
62
|
+
QueryBuilder.prototype.isQueryGroup = function (query) {
|
|
63
|
+
return 'queryKey' in query;
|
|
64
|
+
};
|
|
65
|
+
QueryBuilder.prototype.isRootQueryGroup = function (query) {
|
|
66
|
+
return 'queryKey' in query && query.queryKey === 'root';
|
|
67
|
+
};
|
|
68
|
+
QueryBuilder.prototype.getQueryGroup = function (queryKey) {
|
|
69
|
+
var _this = this;
|
|
70
|
+
return this.queryOptions.query.find(function (q) { return _this.isQueryGroup(q) && q.queryKey === queryKey; });
|
|
71
|
+
};
|
|
72
|
+
QueryBuilder.prototype.getQuery = function () {
|
|
73
|
+
return (0, lodash_1.cloneDeep)(this.queryOptions);
|
|
74
|
+
};
|
|
75
|
+
QueryBuilder.prototype.hasQueryGroup = function (queryKey) {
|
|
76
|
+
var _this = this;
|
|
77
|
+
return this.queryOptions.query.some(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryKey; });
|
|
78
|
+
};
|
|
79
|
+
QueryBuilder.prototype.applyItemOptions = function (options) {
|
|
80
|
+
if (options === null || options === void 0 ? void 0 : options.sort) {
|
|
81
|
+
this.queryOptions.sort = options.sort;
|
|
82
|
+
}
|
|
83
|
+
if (typeof (options === null || options === void 0 ? void 0 : options.count) !== 'undefined') {
|
|
84
|
+
this.queryOptions.count = options.count;
|
|
85
|
+
}
|
|
86
|
+
if (typeof (options === null || options === void 0 ? void 0 : options.start) !== 'undefined') {
|
|
87
|
+
this.queryOptions.start = options === null || options === void 0 ? void 0 : options.start;
|
|
88
|
+
}
|
|
89
|
+
if (typeof (options === null || options === void 0 ? void 0 : options.projection) !== 'undefined') {
|
|
90
|
+
this.queryOptions.projection = options === null || options === void 0 ? void 0 : options.projection;
|
|
91
|
+
}
|
|
92
|
+
return this.getQuery();
|
|
93
|
+
};
|
|
94
|
+
QueryBuilder.prototype.applyQuery = function (queryToApply, options, relevantQuery) {
|
|
95
|
+
// handle default query
|
|
96
|
+
var e_1, _a;
|
|
97
|
+
var _this = this;
|
|
98
|
+
if (!relevantQuery)
|
|
99
|
+
relevantQuery = this.queryOptions;
|
|
100
|
+
if (Array.isArray(queryToApply)) {
|
|
101
|
+
try {
|
|
102
|
+
for (var queryToApply_1 = __values(queryToApply), queryToApply_1_1 = queryToApply_1.next(); !queryToApply_1_1.done; queryToApply_1_1 = queryToApply_1.next()) {
|
|
103
|
+
var query = queryToApply_1_1.value;
|
|
104
|
+
this.applyQuery(query, undefined, relevantQuery);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
108
|
+
finally {
|
|
109
|
+
try {
|
|
110
|
+
if (queryToApply_1_1 && !queryToApply_1_1.done && (_a = queryToApply_1.return)) _a.call(queryToApply_1);
|
|
111
|
+
}
|
|
112
|
+
finally { if (e_1) throw e_1.error; }
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
else if (this.isQuery(queryToApply)) {
|
|
116
|
+
var idx = relevantQuery.query.findIndex(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryToApply.attribute; });
|
|
117
|
+
if (idx > -1) {
|
|
118
|
+
var queryGroup = relevantQuery.query[idx];
|
|
119
|
+
if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
|
|
120
|
+
queryGroup.query = [queryToApply];
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
queryGroup.query.push(queryToApply);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
relevantQuery.query.push({
|
|
128
|
+
queryKey: queryToApply.attribute,
|
|
129
|
+
queryType: 'or',
|
|
130
|
+
query: [queryToApply],
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
// handle query group
|
|
134
|
+
}
|
|
135
|
+
else if (this.isQueryGroup(queryToApply)) {
|
|
136
|
+
if (this.isRootQueryGroup(queryToApply)) {
|
|
137
|
+
if (queryToApply.queryType)
|
|
138
|
+
relevantQuery.queryType = queryToApply.queryType;
|
|
139
|
+
if (queryToApply.options)
|
|
140
|
+
relevantQuery.options = queryToApply.options;
|
|
141
|
+
if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
|
|
142
|
+
relevantQuery.query = queryToApply.query;
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
relevantQuery.query = __spreadArray(__spreadArray([], __read(relevantQuery.query), false), __read(queryToApply.query), false);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
else {
|
|
149
|
+
var idx = relevantQuery.query.findIndex(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryToApply.queryKey; });
|
|
150
|
+
if (idx > -1) {
|
|
151
|
+
var queryGroup = relevantQuery.query[idx];
|
|
152
|
+
if (queryToApply.queryType)
|
|
153
|
+
queryGroup.queryType = queryToApply.queryType;
|
|
154
|
+
if (queryToApply.options)
|
|
155
|
+
queryGroup.options = queryToApply.options;
|
|
156
|
+
if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
|
|
157
|
+
relevantQuery.query[idx] = queryToApply;
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
queryGroup.query = __spreadArray(__spreadArray([], __read(queryGroup.query), false), __read(queryToApply.query), false);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
relevantQuery.query.push({
|
|
165
|
+
queryKey: queryToApply.queryKey,
|
|
166
|
+
queryType: queryToApply.queryType || 'or',
|
|
167
|
+
query: queryToApply.query,
|
|
168
|
+
options: queryToApply.options,
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
return relevantQuery;
|
|
174
|
+
};
|
|
175
|
+
QueryBuilder.prototype.removeQuery = function (queryToRemove, relevantQuery) {
|
|
176
|
+
// handle default query
|
|
177
|
+
var e_2, _a;
|
|
178
|
+
var _this = this;
|
|
179
|
+
if (!relevantQuery)
|
|
180
|
+
relevantQuery = this.queryOptions;
|
|
181
|
+
if (this.isQuery(queryToRemove)) {
|
|
182
|
+
var idx = relevantQuery.query.findIndex(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryToRemove.attribute; });
|
|
183
|
+
if (idx > -1) {
|
|
184
|
+
var queryGroup = relevantQuery.query[idx];
|
|
185
|
+
var idxOfQueryToRemove = (0, lodash_1.findIndex)(queryGroup.query, queryToRemove);
|
|
186
|
+
if (idxOfQueryToRemove > -1) {
|
|
187
|
+
queryGroup.query.splice(idxOfQueryToRemove, 1);
|
|
188
|
+
}
|
|
189
|
+
if (queryGroup.query.length === 0) {
|
|
190
|
+
relevantQuery.query.splice(idx, 1);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
else if (this.isQueryGroup(queryToRemove)) {
|
|
195
|
+
var idx = relevantQuery.query.findIndex(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryToRemove.queryKey; });
|
|
196
|
+
if (idx > -1) {
|
|
197
|
+
if (!queryToRemove.query) {
|
|
198
|
+
relevantQuery.query.splice(idx, 1);
|
|
199
|
+
}
|
|
200
|
+
else {
|
|
201
|
+
var queryGroup = relevantQuery.query[idx];
|
|
202
|
+
try {
|
|
203
|
+
for (var _b = __values(queryToRemove.query), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
204
|
+
var q = _c.value;
|
|
205
|
+
var idxOfQueryToRemove = (0, lodash_1.findIndex)(queryGroup.query, q);
|
|
206
|
+
if (idxOfQueryToRemove > -1) {
|
|
207
|
+
queryGroup.query.splice(idxOfQueryToRemove, 1);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
212
|
+
finally {
|
|
213
|
+
try {
|
|
214
|
+
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
215
|
+
}
|
|
216
|
+
finally { if (e_2) throw e_2.error; }
|
|
217
|
+
}
|
|
218
|
+
if (queryGroup.query.length === 0) {
|
|
219
|
+
relevantQuery.query.splice(idx, 1);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
return relevantQuery;
|
|
225
|
+
};
|
|
226
|
+
return QueryBuilder;
|
|
227
|
+
}());
|
|
228
|
+
exports.QueryBuilder = QueryBuilder;
|
|
229
|
+
//# sourceMappingURL=query-builder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,8 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
29
29
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
30
|
exports.queryData = void 0;
|
|
31
31
|
var lodash_1 = require("lodash");
|
|
32
|
+
var query_builder_1 = require("./query-builder");
|
|
33
|
+
var queryBuilder = new query_builder_1.QueryBuilder();
|
|
32
34
|
var transformValue = function (value, transformers) {
|
|
33
35
|
var e_1, _a;
|
|
34
36
|
if (typeof value !== 'string') {
|
|
@@ -196,7 +198,7 @@ var queryFind = function (entryValue, queryValue) {
|
|
|
196
198
|
}
|
|
197
199
|
};
|
|
198
200
|
var validateQuery = function (query) {
|
|
199
|
-
if (
|
|
201
|
+
if (queryBuilder.isQuery(query)) {
|
|
200
202
|
if (!query.attribute || !query.operator)
|
|
201
203
|
throw new Error('invalid query - missing attribute or operator');
|
|
202
204
|
if (query.operator === 'find' && Array.isArray(query.value))
|
|
@@ -211,32 +213,62 @@ var validateQuery = function (query) {
|
|
|
211
213
|
}
|
|
212
214
|
};
|
|
213
215
|
var getEvaluatedQueryDataset = function (query, initialDataset, indexMap) {
|
|
214
|
-
var e_3, _a;
|
|
216
|
+
var e_3, _a, e_4, _b;
|
|
215
217
|
var filteredData = new Map();
|
|
216
|
-
if (query.
|
|
218
|
+
if (query.attribute.includes('[*]')) {
|
|
219
|
+
var attribute = query.attribute.replace('[*]', '');
|
|
220
|
+
var _loop_1 = function (key, value) {
|
|
221
|
+
var arrayValue = value[attribute];
|
|
222
|
+
if (Array.isArray(arrayValue)) {
|
|
223
|
+
var results = arrayValue.map(function (arrayItem, index) {
|
|
224
|
+
arrayItem;
|
|
225
|
+
var queryCopy = (0, lodash_1.cloneDeep)(query);
|
|
226
|
+
queryCopy.attribute = queryCopy.attribute.replace('[*]', "[".concat(index, "]"));
|
|
227
|
+
return evaluateQuery(queryCopy, value);
|
|
228
|
+
});
|
|
229
|
+
if ((0, lodash_1.some)(results)) {
|
|
230
|
+
filteredData.set(key, value);
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
};
|
|
234
|
+
try {
|
|
235
|
+
for (var initialDataset_2 = __values(initialDataset), initialDataset_2_1 = initialDataset_2.next(); !initialDataset_2_1.done; initialDataset_2_1 = initialDataset_2.next()) {
|
|
236
|
+
var _c = __read(initialDataset_2_1.value, 2), key = _c[0], value = _c[1];
|
|
237
|
+
_loop_1(key, value);
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
241
|
+
finally {
|
|
242
|
+
try {
|
|
243
|
+
if (initialDataset_2_1 && !initialDataset_2_1.done && (_a = initialDataset_2.return)) _a.call(initialDataset_2);
|
|
244
|
+
}
|
|
245
|
+
finally { if (e_3) throw e_3.error; }
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
else if (query.operator === 'eq') {
|
|
217
249
|
return evaluateEqOperator(query, initialDataset, indexMap);
|
|
218
250
|
}
|
|
219
251
|
else {
|
|
220
252
|
try {
|
|
221
|
-
for (var
|
|
222
|
-
var
|
|
253
|
+
for (var initialDataset_3 = __values(initialDataset), initialDataset_3_1 = initialDataset_3.next(); !initialDataset_3_1.done; initialDataset_3_1 = initialDataset_3.next()) {
|
|
254
|
+
var _d = __read(initialDataset_3_1.value, 2), key = _d[0], value = _d[1];
|
|
223
255
|
if (evaluateQuery(query, value)) {
|
|
224
256
|
filteredData.set(key, value);
|
|
225
257
|
}
|
|
226
258
|
}
|
|
227
259
|
}
|
|
228
|
-
catch (
|
|
260
|
+
catch (e_4_1) { e_4 = { error: e_4_1 }; }
|
|
229
261
|
finally {
|
|
230
262
|
try {
|
|
231
|
-
if (
|
|
263
|
+
if (initialDataset_3_1 && !initialDataset_3_1.done && (_b = initialDataset_3.return)) _b.call(initialDataset_3);
|
|
232
264
|
}
|
|
233
|
-
finally { if (
|
|
265
|
+
finally { if (e_4) throw e_4.error; }
|
|
234
266
|
}
|
|
235
267
|
}
|
|
236
268
|
return filteredData;
|
|
237
269
|
};
|
|
238
270
|
var evaluateQueryGroup = function (queryGroup, initialDataset, earlyReturn, indexMap) {
|
|
239
|
-
var
|
|
271
|
+
var e_5, _a, e_6, _b;
|
|
240
272
|
var _c;
|
|
241
273
|
var filteredData = new Map();
|
|
242
274
|
var currentDataset = initialDataset;
|
|
@@ -248,7 +280,7 @@ var evaluateQueryGroup = function (queryGroup, initialDataset, earlyReturn, inde
|
|
|
248
280
|
for (var _d = __values(queryGroup.query), _e = _d.next(); !_e.done; _e = _d.next()) {
|
|
249
281
|
var query = _e.value;
|
|
250
282
|
var result = new Map();
|
|
251
|
-
if (
|
|
283
|
+
if (queryBuilder.isQuery(query)) {
|
|
252
284
|
result = getEvaluatedQueryDataset(query, currentDataset, indexMap);
|
|
253
285
|
}
|
|
254
286
|
else {
|
|
@@ -265,17 +297,17 @@ var evaluateQueryGroup = function (queryGroup, initialDataset, earlyReturn, inde
|
|
|
265
297
|
else {
|
|
266
298
|
var diff = (0, lodash_1.differenceBy)(Array.from(filteredData.values()), Array.from(result.values()), 'key');
|
|
267
299
|
try {
|
|
268
|
-
for (var diff_1 = (
|
|
300
|
+
for (var diff_1 = (e_6 = void 0, __values(diff)), diff_1_1 = diff_1.next(); !diff_1_1.done; diff_1_1 = diff_1.next()) {
|
|
269
301
|
var item = diff_1_1.value;
|
|
270
302
|
filteredData.delete(item.key);
|
|
271
303
|
}
|
|
272
304
|
}
|
|
273
|
-
catch (
|
|
305
|
+
catch (e_6_1) { e_6 = { error: e_6_1 }; }
|
|
274
306
|
finally {
|
|
275
307
|
try {
|
|
276
308
|
if (diff_1_1 && !diff_1_1.done && (_b = diff_1.return)) _b.call(diff_1);
|
|
277
309
|
}
|
|
278
|
-
finally { if (
|
|
310
|
+
finally { if (e_6) throw e_6.error; }
|
|
279
311
|
}
|
|
280
312
|
}
|
|
281
313
|
if (queryGroup.queryType === 'and') {
|
|
@@ -286,12 +318,12 @@ var evaluateQueryGroup = function (queryGroup, initialDataset, earlyReturn, inde
|
|
|
286
318
|
}
|
|
287
319
|
}
|
|
288
320
|
}
|
|
289
|
-
catch (
|
|
321
|
+
catch (e_5_1) { e_5 = { error: e_5_1 }; }
|
|
290
322
|
finally {
|
|
291
323
|
try {
|
|
292
324
|
if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
|
|
293
325
|
}
|
|
294
|
-
finally { if (
|
|
326
|
+
finally { if (e_5) throw e_5.error; }
|
|
295
327
|
}
|
|
296
328
|
return filteredData;
|
|
297
329
|
};
|
|
@@ -301,6 +333,15 @@ function queryData(initialData, rootQuery, earlyReturn, indexMap) {
|
|
|
301
333
|
if (rootQuery.query.length === 0) {
|
|
302
334
|
return initialData;
|
|
303
335
|
}
|
|
336
|
+
if (!rootQuery.queryKey) {
|
|
337
|
+
rootQuery.queryKey = 'root';
|
|
338
|
+
}
|
|
339
|
+
if (!rootQuery.queryType) {
|
|
340
|
+
rootQuery.queryType = 'and';
|
|
341
|
+
}
|
|
342
|
+
if (!rootQuery.query) {
|
|
343
|
+
rootQuery.query = [];
|
|
344
|
+
}
|
|
304
345
|
validateQuery(rootQuery);
|
|
305
346
|
return evaluateQueryGroup(rootQuery, currentDataset, earlyReturn, indexMap);
|
|
306
347
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryData.js","sourceRoot":"","sources":["../../src/queryData.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"queryData.js","sourceRoot":"","sources":["../../src/queryData.ts"],"names":[],"mappings":"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"}
|