@dcupl/common 0.0.81-beta.5 → 0.0.81-beta.7
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/changeDetection.d.ts +7 -7
- package/dist/lib-cjs/changeDetection.js +29 -32
- package/dist/lib-cjs/changeDetection.js.map +1 -1
- package/dist/lib-cjs/getFacets.js +5 -5
- package/dist/lib-cjs/getFacets.js.map +1 -1
- package/dist/lib-cjs/query-builder.d.ts +10 -9
- package/dist/lib-cjs/query-builder.js +103 -92
- package/dist/lib-cjs/query-builder.js.map +1 -1
- package/dist/lib-cjs/queryData.js +14 -14
- package/dist/lib-cjs/queryData.js.map +1 -1
- package/dist/lib-cjs/tsconfig-cjs.tsbuildinfo +1 -1
- package/dist/lib-cjs/types/aggregation.types.d.ts +79 -0
- package/dist/lib-cjs/types/aggregation.types.js +3 -0
- package/dist/lib-cjs/types/aggregation.types.js.map +1 -0
- package/dist/lib-cjs/types/dcupl.types.d.ts +4 -67
- package/dist/lib-cjs/types/dcupl.types.js +0 -12
- package/dist/lib-cjs/types/dcupl.types.js.map +1 -1
- package/dist/lib-cjs/types/facets.types.d.ts +20 -0
- package/dist/lib-cjs/types/facets.types.js +3 -0
- package/dist/lib-cjs/types/facets.types.js.map +1 -0
- package/dist/lib-cjs/types/index.d.ts +4 -1
- package/dist/lib-cjs/types/index.js +4 -1
- package/dist/lib-cjs/types/index.js.map +1 -1
- package/dist/lib-cjs/types/list.types.d.ts +7 -51
- package/dist/lib-cjs/types/query.types.d.ts +70 -0
- package/dist/lib-cjs/types/query.types.js +15 -0
- package/dist/lib-cjs/types/query.types.js.map +1 -0
- package/dist/lib-cjs/types/section.types.d.ts +1 -1
- package/dist/lib-cjs/types/selection.types.d.ts +1 -1
- package/dist/lib-cjs/types/suggestion.types.d.ts +12 -0
- package/dist/lib-esm/changeDetection.d.ts +7 -7
- package/dist/lib-esm/changeDetection.js +29 -32
- package/dist/lib-esm/changeDetection.js.map +1 -1
- package/dist/lib-esm/getFacets.js +6 -6
- package/dist/lib-esm/getFacets.js.map +1 -1
- package/dist/lib-esm/query-builder.d.ts +10 -9
- package/dist/lib-esm/query-builder.js +102 -91
- package/dist/lib-esm/query-builder.js.map +1 -1
- package/dist/lib-esm/queryData.js +15 -15
- package/dist/lib-esm/queryData.js.map +1 -1
- package/dist/lib-esm/tsconfig.tsbuildinfo +1 -1
- package/dist/lib-esm/types/aggregation.types.d.ts +79 -0
- package/dist/lib-esm/types/aggregation.types.js +2 -0
- package/dist/lib-esm/types/aggregation.types.js.map +1 -0
- package/dist/lib-esm/types/dcupl.types.d.ts +4 -67
- package/dist/lib-esm/types/dcupl.types.js +1 -11
- package/dist/lib-esm/types/dcupl.types.js.map +1 -1
- package/dist/lib-esm/types/facets.types.d.ts +20 -0
- package/dist/lib-esm/types/facets.types.js +2 -0
- package/dist/lib-esm/types/facets.types.js.map +1 -0
- package/dist/lib-esm/types/index.d.ts +4 -1
- package/dist/lib-esm/types/index.js +4 -1
- package/dist/lib-esm/types/index.js.map +1 -1
- package/dist/lib-esm/types/list.types.d.ts +7 -51
- package/dist/lib-esm/types/query.types.d.ts +70 -0
- package/dist/lib-esm/types/query.types.js +12 -0
- package/dist/lib-esm/types/query.types.js.map +1 -0
- package/dist/lib-esm/types/section.types.d.ts +1 -1
- package/dist/lib-esm/types/selection.types.d.ts +1 -1
- package/dist/lib-esm/types/suggestion.types.d.ts +12 -0
- package/package.json +2 -4
|
@@ -35,13 +35,13 @@ var __values = (this && this.__values) || function(o) {
|
|
|
35
35
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
36
36
|
};
|
|
37
37
|
import { queryData } from './queryData';
|
|
38
|
-
import {
|
|
38
|
+
import { DcuplQueryBuilder } from './query-builder';
|
|
39
39
|
import { cloneDeep } from 'lodash';
|
|
40
|
-
var queryBuilder = new
|
|
40
|
+
var queryBuilder = new DcuplQueryBuilder();
|
|
41
41
|
export function getFacets(modelData, remoteModelData, options, query, attributeKey, modelIndexMap) {
|
|
42
42
|
var e_1, _a, e_2, _b, e_3, _c;
|
|
43
43
|
var filterItemEntries = [];
|
|
44
|
-
var queryWithoutCurrentFilter = queryBuilder.removeQuery({
|
|
44
|
+
var queryWithoutCurrentFilter = queryBuilder.removeQuery({ groupKey: attributeKey }, cloneDeep(query));
|
|
45
45
|
var currentFilteredData = queryData(modelData, queryWithoutCurrentFilter, false, modelIndexMap);
|
|
46
46
|
var remoteModelDataKeys = remoteModelData ? __spreadArray([], __read(remoteModelData === null || remoteModelData === void 0 ? void 0 : remoteModelData.keys()), false) : [];
|
|
47
47
|
var validFacetKeys = new Set(remoteModelDataKeys);
|
|
@@ -119,10 +119,10 @@ export function getFacets(modelData, remoteModelData, options, query, attributeK
|
|
|
119
119
|
return filterItemEntries;
|
|
120
120
|
}
|
|
121
121
|
var isFilterItemEntrySelected = function (groupKey, facetKey, query) {
|
|
122
|
-
var idx = query.
|
|
122
|
+
var idx = query.queries.findIndex(function (query) { return queryBuilder.isQueryGroup(query) && query.groupKey === groupKey; });
|
|
123
123
|
if (idx > -1) {
|
|
124
|
-
var queryGroup = query.
|
|
125
|
-
return !!queryGroup.
|
|
124
|
+
var queryGroup = query.queries[idx];
|
|
125
|
+
return !!queryGroup.queries.find(function (query) {
|
|
126
126
|
var _a;
|
|
127
127
|
if (queryBuilder.isQuery(query)) {
|
|
128
128
|
var key = ((_a = query.value) === null || _a === void 0 ? void 0 : _a.key) || query.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFacets.js","sourceRoot":"","sources":["../../src/getFacets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"getFacets.js","sourceRoot":"","sources":["../../src/getFacets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
import { DcuplGlobalQueryOptionsNew, DcuplItemsOptions, DcuplQuery, DcuplQueryGroup } from './types';
|
|
2
|
-
export declare class
|
|
2
|
+
export declare class DcuplQueryBuilder {
|
|
3
3
|
private _defaultQueryOptions;
|
|
4
4
|
private _initOptions;
|
|
5
|
-
private
|
|
5
|
+
private currentQuery;
|
|
6
6
|
constructor();
|
|
7
7
|
init(options: {
|
|
8
|
-
|
|
8
|
+
modelKey: string;
|
|
9
9
|
}): void;
|
|
10
|
-
reset():
|
|
10
|
+
reset(): DcuplGlobalQueryOptionsNew<any>;
|
|
11
11
|
isQuery(query: Partial<DcuplQuery> | Partial<DcuplQueryGroup>): query is DcuplQuery;
|
|
12
12
|
isQueryGroup(query: Partial<DcuplQuery> | Partial<DcuplQueryGroup>): query is DcuplQueryGroup;
|
|
13
|
-
isRootQueryGroup(
|
|
14
|
-
getQueryGroup(
|
|
13
|
+
isRootQueryGroup(groupOrQuery: Partial<DcuplGlobalQueryOptionsNew<any>> | Partial<DcuplQuery> | Partial<DcuplQueryGroup>): groupOrQuery is DcuplGlobalQueryOptionsNew<any>;
|
|
14
|
+
getQueryGroup(groupKey?: string): DcuplQueryGroup | undefined;
|
|
15
15
|
getQuery(): DcuplGlobalQueryOptionsNew<any>;
|
|
16
|
-
hasQueryGroup(
|
|
17
|
-
|
|
18
|
-
applyQuery(queryToApply: DcuplQueryGroup | DcuplQuery | DcuplQuery[] | DcuplQueryGroup[], options?: {
|
|
16
|
+
hasQueryGroup(groupKey: string): boolean;
|
|
17
|
+
applyOptions(options: DcuplItemsOptions<any>, mode?: 'set' | 'update'): DcuplGlobalQueryOptionsNew<any>;
|
|
18
|
+
applyQuery(queryToApply: DcuplGlobalQueryOptionsNew<any> | DcuplQueryGroup | DcuplQuery | DcuplQuery[] | DcuplQueryGroup[], options?: {
|
|
19
19
|
mode?: 'set' | 'add';
|
|
20
20
|
}, relevantQuery?: DcuplGlobalQueryOptionsNew<any>): DcuplGlobalQueryOptionsNew<any>;
|
|
21
|
+
removeAllQueries(): DcuplGlobalQueryOptionsNew<any>;
|
|
21
22
|
removeQuery(queryToRemove: Partial<DcuplQueryGroup> | DcuplQuery, relevantQuery?: DcuplGlobalQueryOptionsNew<any>): DcuplGlobalQueryOptionsNew<any>;
|
|
22
23
|
}
|
|
@@ -35,65 +35,74 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
35
35
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
36
36
|
};
|
|
37
37
|
import { cloneDeep, findIndex } from 'lodash';
|
|
38
|
-
var
|
|
39
|
-
function
|
|
38
|
+
var DcuplQueryBuilder = /** @class */ (function () {
|
|
39
|
+
function DcuplQueryBuilder() {
|
|
40
40
|
this._defaultQueryOptions = {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
41
|
+
modelKey: '',
|
|
42
|
+
groupKey: 'root',
|
|
43
|
+
groupType: 'and',
|
|
44
|
+
queries: [],
|
|
45
45
|
};
|
|
46
|
-
this.
|
|
46
|
+
this.currentQuery = cloneDeep(this._defaultQueryOptions);
|
|
47
47
|
}
|
|
48
|
-
|
|
48
|
+
DcuplQueryBuilder.prototype.init = function (options) {
|
|
49
49
|
this._initOptions = cloneDeep(options);
|
|
50
|
-
this.
|
|
51
|
-
this.
|
|
50
|
+
this.currentQuery = cloneDeep(this._defaultQueryOptions);
|
|
51
|
+
this.currentQuery.modelKey = options.modelKey;
|
|
52
52
|
};
|
|
53
|
-
|
|
53
|
+
DcuplQueryBuilder.prototype.reset = function () {
|
|
54
54
|
this.init(this._initOptions);
|
|
55
|
+
return this.getQuery();
|
|
55
56
|
};
|
|
56
|
-
|
|
57
|
+
DcuplQueryBuilder.prototype.isQuery = function (query) {
|
|
57
58
|
return 'attribute' in query;
|
|
58
59
|
};
|
|
59
|
-
|
|
60
|
-
return '
|
|
60
|
+
DcuplQueryBuilder.prototype.isQueryGroup = function (query) {
|
|
61
|
+
return 'groupKey' in query;
|
|
61
62
|
};
|
|
62
|
-
|
|
63
|
-
return
|
|
63
|
+
DcuplQueryBuilder.prototype.isRootQueryGroup = function (groupOrQuery) {
|
|
64
|
+
return this.isQueryGroup(groupOrQuery) && groupOrQuery.groupKey === 'root';
|
|
64
65
|
};
|
|
65
|
-
|
|
66
|
+
DcuplQueryBuilder.prototype.getQueryGroup = function (groupKey) {
|
|
66
67
|
var _this = this;
|
|
67
|
-
return this.
|
|
68
|
+
return this.currentQuery.queries.find(function (q) { return _this.isQueryGroup(q) && q.groupKey === groupKey; });
|
|
68
69
|
};
|
|
69
|
-
|
|
70
|
-
return cloneDeep(this.
|
|
70
|
+
DcuplQueryBuilder.prototype.getQuery = function () {
|
|
71
|
+
return cloneDeep(this.currentQuery);
|
|
71
72
|
};
|
|
72
|
-
|
|
73
|
+
DcuplQueryBuilder.prototype.hasQueryGroup = function (groupKey) {
|
|
73
74
|
var _this = this;
|
|
74
|
-
return this.
|
|
75
|
+
return this.currentQuery.queries.some(function (query) { return _this.isQueryGroup(query) && query.groupKey === groupKey; });
|
|
75
76
|
};
|
|
76
|
-
|
|
77
|
-
if (
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
this.
|
|
82
|
-
|
|
83
|
-
if (typeof (options === null || options === void 0 ? void 0 : options.start) !== 'undefined') {
|
|
84
|
-
this.queryOptions.start = options === null || options === void 0 ? void 0 : options.start;
|
|
77
|
+
DcuplQueryBuilder.prototype.applyOptions = function (options, mode) {
|
|
78
|
+
if (mode === void 0) { mode = 'update'; }
|
|
79
|
+
if (mode === 'set') {
|
|
80
|
+
this.currentQuery.count = options.count;
|
|
81
|
+
this.currentQuery.start = options.start;
|
|
82
|
+
this.currentQuery.sort = options.sort;
|
|
83
|
+
this.currentQuery.projection = options.projection;
|
|
85
84
|
}
|
|
86
|
-
|
|
87
|
-
|
|
85
|
+
else {
|
|
86
|
+
if (typeof (options === null || options === void 0 ? void 0 : options.sort) !== 'undefined') {
|
|
87
|
+
this.currentQuery.sort = options.sort;
|
|
88
|
+
}
|
|
89
|
+
if (typeof (options === null || options === void 0 ? void 0 : options.count) !== 'undefined') {
|
|
90
|
+
this.currentQuery.count = options.count;
|
|
91
|
+
}
|
|
92
|
+
if (typeof (options === null || options === void 0 ? void 0 : options.start) !== 'undefined') {
|
|
93
|
+
this.currentQuery.start = options === null || options === void 0 ? void 0 : options.start;
|
|
94
|
+
}
|
|
95
|
+
if (typeof (options === null || options === void 0 ? void 0 : options.projection) !== 'undefined') {
|
|
96
|
+
this.currentQuery.projection = options === null || options === void 0 ? void 0 : options.projection;
|
|
97
|
+
}
|
|
88
98
|
}
|
|
89
99
|
return this.getQuery();
|
|
90
100
|
};
|
|
91
|
-
|
|
92
|
-
// handle default query
|
|
101
|
+
DcuplQueryBuilder.prototype.applyQuery = function (queryToApply, options, relevantQuery) {
|
|
93
102
|
var e_1, _a;
|
|
94
103
|
var _this = this;
|
|
95
104
|
if (!relevantQuery)
|
|
96
|
-
relevantQuery = this.
|
|
105
|
+
relevantQuery = this.currentQuery;
|
|
97
106
|
if (Array.isArray(queryToApply)) {
|
|
98
107
|
try {
|
|
99
108
|
for (var queryToApply_1 = __values(queryToApply), queryToApply_1_1 = queryToApply_1.next(); !queryToApply_1_1.done; queryToApply_1_1 = queryToApply_1.next()) {
|
|
@@ -109,99 +118,101 @@ var QueryBuilder = /** @class */ (function () {
|
|
|
109
118
|
finally { if (e_1) throw e_1.error; }
|
|
110
119
|
}
|
|
111
120
|
}
|
|
121
|
+
else if (this.isRootQueryGroup(queryToApply)) {
|
|
122
|
+
if (queryToApply.groupType)
|
|
123
|
+
relevantQuery.groupType = queryToApply.groupType;
|
|
124
|
+
if (queryToApply.options)
|
|
125
|
+
relevantQuery.options = queryToApply.options;
|
|
126
|
+
if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
|
|
127
|
+
relevantQuery.queries = queryToApply.queries;
|
|
128
|
+
}
|
|
129
|
+
else {
|
|
130
|
+
relevantQuery.queries = __spreadArray(__spreadArray([], __read(relevantQuery.queries), false), __read(queryToApply.queries), false);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
112
133
|
else if (this.isQuery(queryToApply)) {
|
|
113
|
-
var idx = relevantQuery.
|
|
134
|
+
var idx = relevantQuery.queries.findIndex(function (query) { return _this.isQueryGroup(query) && query.groupKey === queryToApply.attribute; });
|
|
114
135
|
if (idx > -1) {
|
|
115
|
-
var queryGroup = relevantQuery.
|
|
136
|
+
var queryGroup = relevantQuery.queries[idx];
|
|
116
137
|
if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
|
|
117
|
-
queryGroup.
|
|
138
|
+
queryGroup.queries = [queryToApply];
|
|
118
139
|
}
|
|
119
140
|
else {
|
|
120
|
-
queryGroup.
|
|
141
|
+
queryGroup.queries.push(queryToApply);
|
|
121
142
|
}
|
|
122
143
|
}
|
|
123
144
|
else {
|
|
124
|
-
relevantQuery.
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
145
|
+
relevantQuery.queries.push({
|
|
146
|
+
groupKey: queryToApply.attribute,
|
|
147
|
+
groupType: 'or',
|
|
148
|
+
queries: [queryToApply],
|
|
128
149
|
});
|
|
129
150
|
}
|
|
130
151
|
// handle query group
|
|
131
152
|
}
|
|
132
153
|
else if (this.isQueryGroup(queryToApply)) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
154
|
+
var idx = relevantQuery.queries.findIndex(function (query) { return _this.isQueryGroup(query) && query.groupKey === queryToApply.groupKey; });
|
|
155
|
+
if (idx > -1) {
|
|
156
|
+
var queryGroup = relevantQuery.queries[idx];
|
|
157
|
+
if (queryToApply.groupType)
|
|
158
|
+
queryGroup.groupType = queryToApply.groupType;
|
|
136
159
|
if (queryToApply.options)
|
|
137
|
-
|
|
160
|
+
queryGroup.options = queryToApply.options;
|
|
138
161
|
if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
|
|
139
|
-
relevantQuery.
|
|
162
|
+
relevantQuery.queries[idx] = queryToApply;
|
|
140
163
|
}
|
|
141
164
|
else {
|
|
142
|
-
|
|
165
|
+
queryGroup.queries = __spreadArray(__spreadArray([], __read(queryGroup.queries), false), __read(queryToApply.queries), false);
|
|
143
166
|
}
|
|
144
167
|
}
|
|
145
168
|
else {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
queryGroup.options = queryToApply.options;
|
|
153
|
-
if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
|
|
154
|
-
relevantQuery.query[idx] = queryToApply;
|
|
155
|
-
}
|
|
156
|
-
else {
|
|
157
|
-
queryGroup.query = __spreadArray(__spreadArray([], __read(queryGroup.query), false), __read(queryToApply.query), false);
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
else {
|
|
161
|
-
relevantQuery.query.push({
|
|
162
|
-
queryKey: queryToApply.queryKey,
|
|
163
|
-
queryType: queryToApply.queryType || 'or',
|
|
164
|
-
query: queryToApply.query,
|
|
165
|
-
options: queryToApply.options,
|
|
166
|
-
});
|
|
167
|
-
}
|
|
169
|
+
relevantQuery.queries.push({
|
|
170
|
+
groupKey: queryToApply.groupKey,
|
|
171
|
+
groupType: queryToApply.groupType || 'or',
|
|
172
|
+
queries: queryToApply.queries,
|
|
173
|
+
options: queryToApply.options,
|
|
174
|
+
});
|
|
168
175
|
}
|
|
169
176
|
}
|
|
170
177
|
return relevantQuery;
|
|
171
178
|
};
|
|
172
|
-
|
|
179
|
+
DcuplQueryBuilder.prototype.removeAllQueries = function () {
|
|
180
|
+
this.currentQuery.queries = [];
|
|
181
|
+
return this.getQuery();
|
|
182
|
+
};
|
|
183
|
+
DcuplQueryBuilder.prototype.removeQuery = function (queryToRemove, relevantQuery) {
|
|
173
184
|
// handle default query
|
|
174
185
|
var e_2, _a;
|
|
175
186
|
var _this = this;
|
|
176
187
|
if (!relevantQuery)
|
|
177
|
-
relevantQuery = this.
|
|
188
|
+
relevantQuery = this.currentQuery;
|
|
178
189
|
if (this.isQuery(queryToRemove)) {
|
|
179
|
-
var idx = relevantQuery.
|
|
190
|
+
var idx = relevantQuery.queries.findIndex(function (query) { return _this.isQueryGroup(query) && query.groupKey === queryToRemove.attribute; });
|
|
180
191
|
if (idx > -1) {
|
|
181
|
-
var queryGroup = relevantQuery.
|
|
182
|
-
var idxOfQueryToRemove = findIndex(queryGroup.
|
|
192
|
+
var queryGroup = relevantQuery.queries[idx];
|
|
193
|
+
var idxOfQueryToRemove = findIndex(queryGroup.queries, queryToRemove);
|
|
183
194
|
if (idxOfQueryToRemove > -1) {
|
|
184
|
-
queryGroup.
|
|
195
|
+
queryGroup.queries.splice(idxOfQueryToRemove, 1);
|
|
185
196
|
}
|
|
186
|
-
if (queryGroup.
|
|
187
|
-
relevantQuery.
|
|
197
|
+
if (queryGroup.queries.length === 0) {
|
|
198
|
+
relevantQuery.queries.splice(idx, 1);
|
|
188
199
|
}
|
|
189
200
|
}
|
|
190
201
|
}
|
|
191
202
|
else if (this.isQueryGroup(queryToRemove)) {
|
|
192
|
-
var idx = relevantQuery.
|
|
203
|
+
var idx = relevantQuery.queries.findIndex(function (query) { return _this.isQueryGroup(query) && query.groupKey === queryToRemove.groupKey; });
|
|
193
204
|
if (idx > -1) {
|
|
194
|
-
if (!queryToRemove.
|
|
195
|
-
relevantQuery.
|
|
205
|
+
if (!queryToRemove.queries) {
|
|
206
|
+
relevantQuery.queries.splice(idx, 1);
|
|
196
207
|
}
|
|
197
208
|
else {
|
|
198
|
-
var queryGroup = relevantQuery.
|
|
209
|
+
var queryGroup = relevantQuery.queries[idx];
|
|
199
210
|
try {
|
|
200
|
-
for (var _b = __values(queryToRemove.
|
|
211
|
+
for (var _b = __values(queryToRemove.queries), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
201
212
|
var q = _c.value;
|
|
202
|
-
var idxOfQueryToRemove = findIndex(queryGroup.
|
|
213
|
+
var idxOfQueryToRemove = findIndex(queryGroup.queries, q);
|
|
203
214
|
if (idxOfQueryToRemove > -1) {
|
|
204
|
-
queryGroup.
|
|
215
|
+
queryGroup.queries.splice(idxOfQueryToRemove, 1);
|
|
205
216
|
}
|
|
206
217
|
}
|
|
207
218
|
}
|
|
@@ -212,15 +223,15 @@ var QueryBuilder = /** @class */ (function () {
|
|
|
212
223
|
}
|
|
213
224
|
finally { if (e_2) throw e_2.error; }
|
|
214
225
|
}
|
|
215
|
-
if (queryGroup.
|
|
216
|
-
relevantQuery.
|
|
226
|
+
if (queryGroup.queries.length === 0) {
|
|
227
|
+
relevantQuery.queries.splice(idx, 1);
|
|
217
228
|
}
|
|
218
229
|
}
|
|
219
230
|
}
|
|
220
231
|
}
|
|
221
232
|
return relevantQuery;
|
|
222
233
|
};
|
|
223
|
-
return
|
|
234
|
+
return DcuplQueryBuilder;
|
|
224
235
|
}());
|
|
225
|
-
export {
|
|
236
|
+
export { DcuplQueryBuilder };
|
|
226
237
|
//# sourceMappingURL=query-builder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAG9C;IAUE;QATQ,yBAAoB,GAAoC;YAC9D,
|
|
1
|
+
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,8 +26,8 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
26
26
|
return ar;
|
|
27
27
|
};
|
|
28
28
|
import { get, isEqual, find, size, startsWith, isEqualWith, differenceBy, every, some, cloneDeep } from 'lodash';
|
|
29
|
-
import {
|
|
30
|
-
var queryBuilder = new
|
|
29
|
+
import { DcuplQueryBuilder } from './query-builder';
|
|
30
|
+
var queryBuilder = new DcuplQueryBuilder();
|
|
31
31
|
var transformValue = function (value, transformers) {
|
|
32
32
|
var e_1, _a;
|
|
33
33
|
if (typeof value !== 'string') {
|
|
@@ -202,8 +202,8 @@ var validateQuery = function (query) {
|
|
|
202
202
|
throw new Error('invalid query - find operator cannot have array value');
|
|
203
203
|
return true;
|
|
204
204
|
}
|
|
205
|
-
else if (
|
|
206
|
-
return every(query.
|
|
205
|
+
else if (queryBuilder.isQueryGroup(query)) {
|
|
206
|
+
return every(query.queries, function (q) { return validateQuery(q); });
|
|
207
207
|
}
|
|
208
208
|
else {
|
|
209
209
|
throw new Error('invalid query - missing query or attribute');
|
|
@@ -270,11 +270,11 @@ var evaluateQueryGroup = function (queryGroup, initialDataset, earlyReturn, inde
|
|
|
270
270
|
var filteredData = new Map();
|
|
271
271
|
var currentDataset = initialDataset;
|
|
272
272
|
earlyReturn;
|
|
273
|
-
if (!queryGroup.
|
|
273
|
+
if (!queryGroup.queries || ((_c = queryGroup.queries) === null || _c === void 0 ? void 0 : _c.length) === 0) {
|
|
274
274
|
return currentDataset;
|
|
275
275
|
}
|
|
276
276
|
try {
|
|
277
|
-
for (var _d = __values(queryGroup.
|
|
277
|
+
for (var _d = __values(queryGroup.queries), _e = _d.next(); !_e.done; _e = _d.next()) {
|
|
278
278
|
var query = _e.value;
|
|
279
279
|
var result = new Map();
|
|
280
280
|
if (queryBuilder.isQuery(query)) {
|
|
@@ -286,7 +286,7 @@ var evaluateQueryGroup = function (queryGroup, initialDataset, earlyReturn, inde
|
|
|
286
286
|
if (filteredData.size === 0) {
|
|
287
287
|
filteredData = result;
|
|
288
288
|
}
|
|
289
|
-
if (queryGroup.
|
|
289
|
+
if (queryGroup.groupType === 'or') {
|
|
290
290
|
result.forEach(function (item) {
|
|
291
291
|
filteredData.set(item.key, item);
|
|
292
292
|
});
|
|
@@ -307,7 +307,7 @@ var evaluateQueryGroup = function (queryGroup, initialDataset, earlyReturn, inde
|
|
|
307
307
|
finally { if (e_6) throw e_6.error; }
|
|
308
308
|
}
|
|
309
309
|
}
|
|
310
|
-
if (queryGroup.
|
|
310
|
+
if (queryGroup.groupType === 'and') {
|
|
311
311
|
currentDataset = filteredData;
|
|
312
312
|
}
|
|
313
313
|
else {
|
|
@@ -327,17 +327,17 @@ var evaluateQueryGroup = function (queryGroup, initialDataset, earlyReturn, inde
|
|
|
327
327
|
export function queryData(initialData, rootQuery, earlyReturn, indexMap) {
|
|
328
328
|
// const currentDataset = new Map(initialData);
|
|
329
329
|
var currentDataset = initialData;
|
|
330
|
-
if (rootQuery.
|
|
330
|
+
if (rootQuery.queries.length === 0) {
|
|
331
331
|
return initialData;
|
|
332
332
|
}
|
|
333
|
-
if (!rootQuery.
|
|
334
|
-
rootQuery.
|
|
333
|
+
if (!rootQuery.groupKey) {
|
|
334
|
+
rootQuery.groupKey = 'root';
|
|
335
335
|
}
|
|
336
|
-
if (!rootQuery.
|
|
337
|
-
rootQuery.
|
|
336
|
+
if (!rootQuery.groupType) {
|
|
337
|
+
rootQuery.groupType = 'and';
|
|
338
338
|
}
|
|
339
|
-
if (!rootQuery.
|
|
340
|
-
rootQuery.
|
|
339
|
+
if (!rootQuery.queries) {
|
|
340
|
+
rootQuery.queries = [];
|
|
341
341
|
}
|
|
342
342
|
validateQuery(rootQuery);
|
|
343
343
|
return evaluateQueryGroup(rootQuery, currentDataset, earlyReturn, indexMap);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryData.js","sourceRoot":"","sources":["../../src/queryData.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACjH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"queryData.js","sourceRoot":"","sources":["../../src/queryData.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACjH,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,IAAM,YAAY,GAAG,IAAI,iBAAiB,EAAE,CAAC;AAE7C,IAAM,cAAc,GAAG,UAAC,KAAU,EAAE,YAA0C;;IAC5E,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;;QACD,KAA0B,IAAA,iBAAA,SAAA,YAAY,CAAA,0CAAA,oEAAE;YAAnC,IAAM,WAAW,yBAAA;YACpB,IAAI,WAAW,KAAK,WAAW,EAAE;gBAC/B,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;aAC7B;iBAAM,IAAI,WAAW,KAAK,MAAM,EAAE;gBACjC,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;aACtB;iBAAM,IAAI,WAAW,KAAK,kBAAkB,EAAE;gBAC7C,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;aAClC;SACF;;;;;;;;;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,IAAM,aAAa,GAAG,UAAC,KAAiB,EAAE,SAAmB;;IAC3D,IAAI,cAAc,CAAC;IACnB,IAAI,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC;IAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAA,KAAK,CAAC,OAAO,0CAAE,SAAS,CAAC,IAAI,KAAK,CAAC,OAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QAClF,UAAU,GAAG,cAAc,CAAC,UAAU,EAAE,KAAK,CAAC,OAAQ,CAAC,SAAS,CAAC,CAAC;KACnE;IAED,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAClE,cAAc,GAAG,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;KAClD;SAAM;QACL,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;KAC7C;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAA,KAAK,CAAC,OAAO,0CAAE,SAAS,CAAC,IAAI,KAAK,CAAC,OAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QAClF,cAAc,GAAG,cAAc,CAAC,cAAc,EAAE,KAAK,CAAC,OAAQ,CAAC,SAAS,CAAC,CAAC;KAC3E;IAED,IAAI,OAAO,cAAc,KAAK,WAAW,IAAI,cAAc,KAAK,IAAI,EAAE;QACpE,IAAM,gCAAgC,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,gCAAgC,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAC9D,OAAO,KAAK,CAAC;SACd;KACF;IAED,QAAQ,KAAK,CAAC,QAAQ,EAAE;QACtB,KAAK,IAAI;YACP,IAAI,CAAC,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,MAAM,CAAA,EAAE;gBAC1B,OAAO,OAAO,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;aAC5C;iBAAM;gBACL,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;aAC7C;QACH,KAAK,MAAM,CAAC,CAAC;YACX,IAAI,CAAC,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,MAAM,CAAA,EAAE;gBAC1B,OAAO,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;aAC9C;iBAAM;gBACL,OAAO,CAAC,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;aAC/C;SACF;QACD,KAAK,IAAI;YACP,OAAO,cAAc,GAAG,UAAU,CAAC;QACrC,KAAK,IAAI;YACP,OAAO,cAAc,GAAG,UAAU,CAAC;QACrC,KAAK,KAAK;YACR,OAAO,cAAc,IAAI,UAAU,CAAC;QACtC,KAAK,KAAK;YACR,OAAO,cAAc,IAAI,UAAU,CAAC;QACtC,KAAK,QAAQ;YACX,IAAI,CAAC,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,MAAM,CAAA,EAAE;gBAC1B,OAAO,OAAO,cAAc,KAAK,UAAU,CAAC;aAC7C;iBAAM;gBACL,OAAO,OAAO,cAAc,KAAK,UAAU,CAAC;aAC7C;QACH,KAAK,UAAU;YACb,IAAI,UAAU,KAAK,IAAI,EAAE;gBACvB,OAAO,CAAC,CAAC,cAAc,CAAC;aACzB;iBAAM;gBACL,OAAO,CAAC,cAAc,CAAC;aACxB;QACH,KAAK,MAAM;YACT,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,UAAU,CAAC;KAC9C;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,IAAM,kBAAkB,GAAG,UACzB,KAAiB,EACjB,cAAqC,EACrC,QAAkC;;;IAElC,IAAM,YAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IAEtD,IAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,OAAO,EAAE;QACX,IAAI,KAAK,SAAoB,CAAC;QAC9B,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE;YACnC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;SACrB;aAAM,IAAI,CAAA,MAAA,KAAK,CAAC,KAAK,0CAAE,GAAG,KAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACpE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;SACzB;QAED,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;YAChC,IAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,WAAW,EAAE;gBACf,WAAW,CAAC,OAAO,CAAC,UAAC,GAAG;oBACtB,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;wBAC3B,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,CAAC;qBACjD;gBACH,CAAC,CAAC,CAAC;gBACH,OAAO,YAAY,CAAC;aACrB;SACF;KACF;;QAED,8CAA8C;QAC9C,KAA2B,IAAA,mBAAA,SAAA,cAAc,CAAA,8CAAA,0EAAE;YAAhC,IAAA,KAAA,mCAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YACpB,IAAI,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;gBAC/B,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aAC9B;SACF;;;;;;;;;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,IAAM,YAAY,GAAG,UAAC,KAAU,EAAE,UAAe;IAC/C,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE;QACjE,IAAM,KAAK,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC1B;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC/B,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,YAAY,CAAC,EAA1C,CAA0C,CAAC,CAAC;KAC1E;SAAM;QACL,OAAO,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;KACnC;AACH,CAAC,CAAC;AAEF,IAAM,SAAS,GAAG,UAAC,UAAuB,EAAE,UAAe;IACzD,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7B,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,OAAO,UAAU,KAAK,SAAS,EAAE;YACvG,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,UAAC,KAAK,IAAK,OAAA,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,EAA5C,CAA4C,CAAC,CAAC;SACnF;aAAM;YACL,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC7B,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;aACvC;iBAAM;gBACL,OAAO,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;aAC1D;SACF;KACF;SAAM;QACL,OAAO,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;KAC1D;AACH,CAAC,CAAC;AAEF,IAAM,aAAa,GAAG,UAAC,KAAmC;IACxD,IAAI,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC/B,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QAE1G,IAAI,KAAK,CAAC,QAAQ,KAAK,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAE3E,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;QAC3C,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,UAAC,CAAC,IAAK,OAAA,aAAa,CAAC,CAAC,CAAC,EAAhB,CAAgB,CAAC,CAAC;KACtD;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;AACH,CAAC,CAAC;AAEF,IAAM,wBAAwB,GAAG,UAC/B,KAAiB,EACjB,cAAqC,EACrC,QAAkC;;IAElC,IAAM,YAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IAEtD,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACnC,IAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gCAEzC,GAAG,EAAE,KAAK;YACpB,IAAM,UAAU,GAAU,KAAK,CAAC,SAAS,CAAC,CAAC;YAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC7B,IAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,UAAC,SAAS,EAAE,KAAK;oBAC9C,SAAS,CAAC;oBACV,IAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;oBACnC,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,WAAI,KAAK,MAAG,CAAC,CAAC;oBACvE,OAAO,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;gBACzC,CAAC,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE;oBACjB,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;iBAC9B;aACF;;;YAbH,KAA2B,IAAA,mBAAA,SAAA,cAAc,CAAA,8CAAA;gBAA9B,IAAA,KAAA,mCAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;wBAAV,GAAG,EAAE,KAAK;aAcrB;;;;;;;;;KACF;SAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE;QAClC,OAAO,kBAAkB,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;KAC5D;SAAM;;YACL,KAA2B,IAAA,mBAAA,SAAA,cAAc,CAAA,8CAAA,0EAAE;gBAAhC,IAAA,KAAA,mCAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;gBACpB,IAAI,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;oBAC/B,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;iBAC9B;aACF;;;;;;;;;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,IAAM,kBAAkB,GAAG,UACzB,UAA2B,EAC3B,cAAqC,EACrC,WAAoB,EACpB,QAAkC;;;IAElC,IAAI,YAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IACpD,IAAI,cAAc,GAAG,cAAc,CAAC;IACpC,WAAW,CAAC;IAEZ,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAA,MAAA,UAAU,CAAC,OAAO,0CAAE,MAAM,MAAK,CAAC,EAAE;QAC3D,OAAO,cAAc,CAAC;KACvB;;QAED,KAAoB,IAAA,KAAA,SAAA,UAAU,CAAC,OAAO,CAAA,gBAAA,4BAAE;YAAnC,IAAM,KAAK,WAAA;YACd,IAAI,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YAEvB,IAAI,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC/B,MAAM,GAAG,wBAAwB,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;aACpE;iBAAM;gBACL,MAAM,GAAG,kBAAkB,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;aAC3E;YAED,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE;gBAC3B,YAAY,GAAG,MAAM,CAAC;aACvB;YAED,IAAI,UAAU,CAAC,SAAS,KAAK,IAAI,EAAE;gBACjC,MAAM,CAAC,OAAO,CAAC,UAAC,IAAI;oBAClB,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACnC,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,IAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;;oBACjG,KAAmB,IAAA,wBAAA,SAAA,IAAI,CAAA,CAAA,0BAAA,4CAAE;wBAApB,IAAM,IAAI,iBAAA;wBACb,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;qBAC/B;;;;;;;;;aACF;YAED,IAAI,UAAU,CAAC,SAAS,KAAK,KAAK,EAAE;gBAClC,cAAc,GAAG,YAAY,CAAC;aAC/B;iBAAM;gBACL,cAAc,GAAG,cAAc,CAAC;aACjC;SACF;;;;;;;;;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,UAAU,SAAS,CACvB,WAAkC,EAClC,SAA0B,EAC1B,WAAoB,EACpB,QAAkC;IAElC,+CAA+C;IAC/C,IAAM,cAAc,GAAG,WAAW,CAAC;IAEnC,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;QACvB,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAC;KAC7B;IACD,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;QACxB,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC;KAC7B;IACD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;QACtB,SAAS,CAAC,OAAO,GAAG,EAAE,CAAC;KACxB;IAED,aAAa,CAAC,SAAS,CAAC,CAAC;IAEzB,OAAO,kBAAkB,CAAC,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,CAA0B,CAAC;AACvG,CAAC"}
|