eservices-back-core 1.2.73 → 1.2.75
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/controller/close-api/metadata-controller.d.ts +4 -0
- package/dist/controller/close-api/metadata-controller.d.ts.map +1 -1
- package/dist/controller/close-api/metadata-controller.js +23 -18
- package/dist/controller/close-api/metadata-controller.js.map +1 -1
- package/dist/services/criterion-service.d.ts +5 -1
- package/dist/services/criterion-service.d.ts.map +1 -1
- package/dist/services/criterion-service.js +51 -25
- package/dist/services/criterion-service.js.map +1 -1
- package/dist/types/main.d.ts +9 -5
- package/dist/types/main.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -2,12 +2,16 @@ import { Request, Response } from "express";
|
|
|
2
2
|
export default class MetadataController {
|
|
3
3
|
static get(req: Request, res: Response, next: any): Promise<void>;
|
|
4
4
|
/**
|
|
5
|
+
* @deprecated
|
|
5
6
|
* @description Метод создан для упрощения работы с метаданными. Данная функцию получает метаданные по идентификатору
|
|
6
7
|
* тем самым упрощает реализацию прямиком в браузере: нет необходимости тащить с браузера criterion.
|
|
7
8
|
* @warning В данной реализации забито поле StatusCode.
|
|
8
9
|
*/
|
|
9
10
|
static getById(req: Request, res: Response, next: any): Promise<void>;
|
|
10
11
|
static getFields(req: Request, res: Response, next: any): Promise<void>;
|
|
12
|
+
/**
|
|
13
|
+
* @deprecated
|
|
14
|
+
*/
|
|
11
15
|
static getByMaster(req: Request, res: Response, next: any): Promise<void>;
|
|
12
16
|
}
|
|
13
17
|
//# sourceMappingURL=metadata-controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"metadata-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAW1C,MAAM,CAAC,OAAO,OAAO,kBAAkB;WAEzB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAmClD;;;;;OAKG;WACU,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAiCzC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAaxD;;OAEG;WACU,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CA4B1D"}
|
|
@@ -12,8 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const data_service_1 = __importDefault(require("../../services/data-service"));
|
|
16
|
-
const getPropFromObject_1 = __importDefault(require("../../utils/getPropFromObject"));
|
|
17
15
|
const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
|
|
18
16
|
const winston_1 = require("winston");
|
|
19
17
|
const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
|
|
@@ -24,36 +22,39 @@ const criterion_service_1 = __importDefault(require("../../services/criterion-se
|
|
|
24
22
|
const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
|
|
25
23
|
class MetadataController {
|
|
26
24
|
static get(req, res, next) {
|
|
25
|
+
var _a;
|
|
27
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
27
|
try {
|
|
29
28
|
const metadataLogger = winston_1.loggers.get('metadata');
|
|
30
|
-
const { entity } = req.params;
|
|
31
|
-
const { id, criteria } = req.query;
|
|
32
29
|
const context = (0, get_usage_context_1.default)(req.headers.referer);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
});
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
const metadataService = new metadata_service_1.default(req.__token);
|
|
42
|
-
metadataLogger.info('Get metadata', {
|
|
43
|
-
context,
|
|
44
|
-
ruleCriterion,
|
|
30
|
+
const { type, id } = req.query;
|
|
31
|
+
const { entity } = req.params;
|
|
32
|
+
const parsedType = type ? String(type) : 'criterion';
|
|
33
|
+
const cs = new criterion_service_1.default(req.__token);
|
|
34
|
+
if (!Store_1.default.getMetadataSettingsForEntity(entity))
|
|
35
|
+
console.log(`For entity ${entity} can't found rule criterion in metadata-settings.json`);
|
|
36
|
+
const criterion = yield cs.get({
|
|
45
37
|
entity,
|
|
46
|
-
|
|
38
|
+
id: Number.parseInt(id, 10),
|
|
39
|
+
criterion: ((_a = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _a === void 0 ? void 0 : _a[parsedType]) || ["StatusCode"],
|
|
40
|
+
preset: {
|
|
41
|
+
currentContextId: req.session.currentContextId
|
|
42
|
+
},
|
|
43
|
+
masterEntities: (0, get_master_entities_1.default)(req)
|
|
47
44
|
});
|
|
48
|
-
const
|
|
45
|
+
const metadataService = new metadata_service_1.default(req.__token);
|
|
46
|
+
metadataLogger.info('Get metadata', { context, ruleCriterion: criterion, entity, referer: req.headers.referer });
|
|
47
|
+
const metadata = yield metadataService.getFull(entity, criterion, context);
|
|
49
48
|
res.json(metadata);
|
|
50
49
|
}
|
|
51
50
|
catch (e) {
|
|
51
|
+
console.log(e);
|
|
52
52
|
next(e);
|
|
53
53
|
}
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
56
|
/**
|
|
57
|
+
* @deprecated
|
|
57
58
|
* @description Метод создан для упрощения работы с метаданными. Данная функцию получает метаданные по идентификатору
|
|
58
59
|
* тем самым упрощает реализацию прямиком в браузере: нет необходимости тащить с браузера criterion.
|
|
59
60
|
* @warning В данной реализации забито поле StatusCode.
|
|
@@ -68,6 +69,7 @@ class MetadataController {
|
|
|
68
69
|
throw api_error_1.default.UndefinedId();
|
|
69
70
|
const context = ((_a = req.query.context) === null || _a === void 0 ? void 0 : _a.toString()) || (0, get_usage_context_1.default)(req.headers.referer);
|
|
70
71
|
const criterionService = new criterion_service_1.default(req.__token);
|
|
72
|
+
console.log('++');
|
|
71
73
|
const valueCriterion = yield criterionService.get({
|
|
72
74
|
entity,
|
|
73
75
|
id: Number.parseInt(id, 10),
|
|
@@ -99,6 +101,9 @@ class MetadataController {
|
|
|
99
101
|
}
|
|
100
102
|
});
|
|
101
103
|
}
|
|
104
|
+
/**
|
|
105
|
+
* @deprecated
|
|
106
|
+
*/
|
|
102
107
|
static getByMaster(req, res, next) {
|
|
103
108
|
var _a, _b;
|
|
104
109
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA
|
|
1
|
+
{"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,12 +40,15 @@ export default class CriterionService extends InterfaceAuthService {
|
|
|
40
40
|
* @description Собирает все поля для сущностей, которые используются в конфигурации criterion
|
|
41
41
|
*/
|
|
42
42
|
private parseFieldsFromCriterion;
|
|
43
|
+
private isNamedCriterion;
|
|
44
|
+
private isFieldsCriterion;
|
|
43
45
|
private isMasterCriterion;
|
|
44
46
|
/**
|
|
45
47
|
* @description Функция проверяет, является ли предоставленное поле - константным значением. Константное значение
|
|
46
48
|
* или preset должно начинаться со знака @ или $, также является не регистрозависисмым.
|
|
47
49
|
*/
|
|
48
50
|
private isPresetField;
|
|
51
|
+
private isEntityField;
|
|
49
52
|
/**
|
|
50
53
|
* @description Метод приводит критерии к опрятному(единому) виду.
|
|
51
54
|
* [
|
|
@@ -68,8 +71,9 @@ interface CriterionGetParams {
|
|
|
68
71
|
* зависит от родительской, рекомендуется использовать локальное поле: "License.StatusCode" например, чтобы получить
|
|
69
72
|
* зависимость от StatusCode в лицензии.
|
|
70
73
|
*/
|
|
71
|
-
masterEntities: [
|
|
74
|
+
masterEntities: MasterEntity[];
|
|
72
75
|
preset: Record<string, any>;
|
|
73
76
|
}
|
|
77
|
+
declare type MasterEntity = [entityName: string, id: number];
|
|
74
78
|
export {};
|
|
75
79
|
//# sourceMappingURL=criterion-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-service.d.ts","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACN,cAAc,EAGd,gBAAgB,EAChB,MAAM,eAAe,CAAC;AAGvB;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,OAAM;IAElC;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,OAAO;IAE9B,GAAG,CAAC,MAAM,EAAE,kBAAkB;
|
|
1
|
+
{"version":3,"file":"criterion-service.d.ts","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACN,cAAc,EAGd,gBAAgB,EAChB,MAAM,eAAe,CAAC;AAGvB;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,OAAM;IAElC;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,OAAO;IAE9B,GAAG,CAAC,MAAM,EAAE,kBAAkB;YAWtB,iBAAiB;IAiB/B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAsD9B;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAKT,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,gBAAgB;IAKlE;;OAEG;IACH,OAAO,CAAC,aAAa;IAIrB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAatB;;OAEG;YACW,oBAAoB;IAelC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAqDhC,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,iBAAiB;IAOzB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,aAAa;IAIrB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,oBAAoB;CAG5B;AAED,UAAU,kBAAkB;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,cAAc,CAAC;IAC1B;;;;;OAKG;IACH,cAAc,EAAE,YAAY,EAAE,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC3B;AAWD,aAAK,YAAY,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
|
|
@@ -60,7 +60,7 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
60
60
|
const getValuesByEntity = (entityName) => {
|
|
61
61
|
const config = entityValues.find(e => e.entity === entityName);
|
|
62
62
|
if (!config)
|
|
63
|
-
throw new Error(`
|
|
63
|
+
throw new Error(`[criterion-service]: In func getValuesByEntities was founded exception. Values for entity ${entityName} is not provided.`);
|
|
64
64
|
return config.values;
|
|
65
65
|
};
|
|
66
66
|
/**
|
|
@@ -71,20 +71,22 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
71
71
|
function parse(elem, entity) {
|
|
72
72
|
if (Array.isArray(elem))
|
|
73
73
|
return parseArray(elem, CriterionService.SYMBOL_CONCAT, entity);
|
|
74
|
-
|
|
75
|
-
return parse.call(this, elem.fields, elem.entity);
|
|
74
|
+
entity = this.isMasterCriterion(elem) ? elem.entity : entity;
|
|
76
75
|
if (!checkEntity(entity)) {
|
|
77
|
-
console.log(`[criterion-service]:
|
|
76
|
+
console.log(`[criterion-service]: Entity ${entity} hasn't treated. Please check that entity or id for current entity was provided.`);
|
|
78
77
|
return null;
|
|
79
78
|
}
|
|
80
79
|
if (typeof elem === 'string')
|
|
81
80
|
return this.getExpression(parseName(elem, entity), this.getValueByName(elem, getValuesByEntity(entity), preset));
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
81
|
+
if (this.isFieldsCriterion(elem))
|
|
82
|
+
return parse.call(this, elem.fields, entity);
|
|
83
|
+
if (this.isNamedCriterion(elem)) {
|
|
84
|
+
const expression = elem.expression;
|
|
85
|
+
const equal = expression.equal;
|
|
86
|
+
const values = getValuesByEntity(entity);
|
|
87
|
+
if (this.getValue(equal[0], { values, preset }) === this.getValue(equal[1], { values, preset }))
|
|
88
|
+
return elem.name;
|
|
89
|
+
}
|
|
88
90
|
return null;
|
|
89
91
|
}
|
|
90
92
|
return parseArray(parsedCriterion, '&', mainEntity);
|
|
@@ -163,23 +165,31 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
163
165
|
});
|
|
164
166
|
store.get(entityName).fields.push(...names);
|
|
165
167
|
};
|
|
168
|
+
const parseObject = (data) => {
|
|
169
|
+
if (this.isFieldsCriterion(data))
|
|
170
|
+
return data.fields;
|
|
171
|
+
if (this.isNamedCriterion(data)) {
|
|
172
|
+
const answer = [];
|
|
173
|
+
// В данном случае поля expression в объекте не присутствует. Это значит, что метка будет добавлена без
|
|
174
|
+
// проверки. Возвращаем пустой массив полей.
|
|
175
|
+
if (!Object.prototype.hasOwnProperty.call(data, 'expression'))
|
|
176
|
+
return [];
|
|
177
|
+
// В данной реализации полей expression может хранить лишь один объект: equal.
|
|
178
|
+
const equal = data.expression.equal;
|
|
179
|
+
if (this.isEntityField(equal[0]))
|
|
180
|
+
answer.push(equal[0]);
|
|
181
|
+
if (this.isEntityField(equal[1]))
|
|
182
|
+
answer.push(equal[1]);
|
|
183
|
+
return answer;
|
|
184
|
+
}
|
|
185
|
+
console.log('[criterion-service] error to parse fields. Unknown object.', data);
|
|
186
|
+
return [];
|
|
187
|
+
};
|
|
166
188
|
parsedCriterion.forEach(item => {
|
|
167
189
|
item.forEach(criterion => {
|
|
168
190
|
if (typeof criterion === 'string')
|
|
169
191
|
return add(null, criterion);
|
|
170
|
-
|
|
171
|
-
return add(criterion.entity, ...criterion.fields);
|
|
172
|
-
// Is custom criterion
|
|
173
|
-
// Делаем перебор equal
|
|
174
|
-
const equal = criterion.expression.equal;
|
|
175
|
-
// Здесь нужно привести к стандартной форме
|
|
176
|
-
// getFieldNameFormCustomRef
|
|
177
|
-
// @ts-ignore
|
|
178
|
-
if (!this.isPresetField(equal[0]))
|
|
179
|
-
add(null, equal[0]);
|
|
180
|
-
// @ts-ignore
|
|
181
|
-
if (!this.isPresetField(equal[1]))
|
|
182
|
-
add(null, equal[1]);
|
|
192
|
+
add(this.isMasterCriterion(criterion) ? criterion.entity : null, ...parseObject(criterion));
|
|
183
193
|
});
|
|
184
194
|
});
|
|
185
195
|
const result = [];
|
|
@@ -188,11 +198,22 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
188
198
|
});
|
|
189
199
|
return result;
|
|
190
200
|
}
|
|
201
|
+
isNamedCriterion(data) {
|
|
202
|
+
if (typeof data !== 'object' || data === null)
|
|
203
|
+
return false;
|
|
204
|
+
// @ts-ignore
|
|
205
|
+
return (Object.prototype.hasOwnProperty.call(data, 'name'));
|
|
206
|
+
}
|
|
207
|
+
isFieldsCriterion(data) {
|
|
208
|
+
if (typeof data !== 'object' || data === null)
|
|
209
|
+
return false;
|
|
210
|
+
// @ts-ignore
|
|
211
|
+
return (Object.prototype.hasOwnProperty.call(data, 'fields') && Array.isArray(data.fields));
|
|
212
|
+
}
|
|
191
213
|
isMasterCriterion(data) {
|
|
192
214
|
if (typeof data !== 'object' || data === null)
|
|
193
215
|
return false;
|
|
194
|
-
return (Object.prototype.hasOwnProperty.call(data, 'entity')
|
|
195
|
-
&& Object.prototype.hasOwnProperty.call(data, 'fields'));
|
|
216
|
+
return (Object.prototype.hasOwnProperty.call(data, 'entity'));
|
|
196
217
|
}
|
|
197
218
|
/**
|
|
198
219
|
* @description Функция проверяет, является ли предоставленное поле - константным значением. Константное значение
|
|
@@ -203,6 +224,11 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
203
224
|
return false;
|
|
204
225
|
return !!(/[@$](.+)/.exec(fieldName));
|
|
205
226
|
}
|
|
227
|
+
isEntityField(fieldName) {
|
|
228
|
+
if (typeof fieldName !== 'string')
|
|
229
|
+
return false;
|
|
230
|
+
return !!(/^[a-zA-Z0-9]+$/.exec(fieldName));
|
|
231
|
+
}
|
|
206
232
|
/**
|
|
207
233
|
* @description Метод приводит критерии к опрятному(единому) виду.
|
|
208
234
|
* [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;AAO5D,kEAAyC;AAEzC;;GAEG;AACH,MAAqB,gBAAiB,SAAQ,gCAAoB;IAS3D,GAAG,CAAC,MAA0B;;YACnC,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAE9D,MAAM,QAAQ,GAAuB;gBACpC,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC1B,GAAG,MAAM,CAAC,cAAc;aACxB,CAAA;
|
|
1
|
+
{"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"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"}
|
package/dist/types/main.d.ts
CHANGED
|
@@ -102,20 +102,24 @@ export interface MetadataField {
|
|
|
102
102
|
export declare type MetadataResponse = Metadata & {
|
|
103
103
|
_filter: string;
|
|
104
104
|
};
|
|
105
|
-
export interface
|
|
106
|
-
|
|
107
|
-
"expression"
|
|
105
|
+
export interface NamedCriterion {
|
|
106
|
+
name: string;
|
|
107
|
+
"expression"?: {
|
|
108
108
|
"equal"?: [CustomCriterionEqualItem, CustomCriterionEqualItem];
|
|
109
109
|
};
|
|
110
110
|
}
|
|
111
|
+
export declare type MasterNamedCriterion = NamedCriterion & MasterEntityCriterion;
|
|
112
|
+
export interface FieldsCriterion {
|
|
113
|
+
fields: string[];
|
|
114
|
+
}
|
|
115
|
+
export declare type MasterFieldsCriterion = FieldsCriterion & MasterEntityCriterion;
|
|
111
116
|
export declare type CustomCriterionEqualItem = string | RefCriterionItem;
|
|
112
117
|
export declare type RefCriterionItem = {
|
|
113
118
|
value: string | number | null;
|
|
114
119
|
};
|
|
115
120
|
export interface MasterEntityCriterion {
|
|
116
121
|
entity: string;
|
|
117
|
-
fields: string[];
|
|
118
122
|
}
|
|
119
|
-
export declare type CriterionItem = string |
|
|
123
|
+
export declare type CriterionItem = string | NamedCriterion | MasterNamedCriterion | FieldsCriterion | MasterFieldsCriterion;
|
|
120
124
|
export declare type CriterionGroup = (CriterionItem | CriterionItem[])[];
|
|
121
125
|
//# sourceMappingURL=main.d.ts.map
|
package/dist/types/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/types/main.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACjC,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,oBAAY,OAAO,GAAG,MAAM,CAAA;AAE5B,MAAM,WAAW,oBAAoB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAA;CAClB;AACD,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAG,MAAM,CAAC;IAEd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,oBAAoB,EAAE,CAAA;CAClC;AAED,MAAM,WAAW,oBAAoB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAClC,aAAa,EAAE,qBAAqB,EAAE,CAAA;CACzC;AACD,MAAM,WAAW,eAAe;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAA;CACxB;AACD,MAAM,WAAW,qBAAqB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,KAAK;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,QAAQ;IACrB,eAAe,EAAE,OAAO,CAAA;IACxB,mBAAmB,EAAE,OAAO,CAAA;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,OAAO,CAAA;IACvB,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,cAAc,EAAE,OAAO,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,EAAE,OAAO,CAAA;IACnB,SAAS,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,mBAAmB,EAAE,OAAO,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,OAAO,CAAA;IACd,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,cAAc,EAAE,OAAO,CAAA;IACvB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,YAAY,EAAE;QACV,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAA;KAChC,CAAA;CACJ;AACD,MAAM,WAAW,aAAa;IAC1B,gBAAgB,EAAE,IAAI,GAAG,MAAM,CAAA;IAC/B,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,aAAa,EAAE,OAAO,CAAA;IACtB,YAAY,EAAE,OAAO,CAAA;IACrB,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,CAAA;IACpF,WAAW,EAAE,OAAO,CAAA;IACpB,UAAU,EAAE,IAAI,GAAG,MAAM,CAAA;IACzB,4BAA4B,EAAE,IAAI,GAAG,MAAM,CAAA;IAC3C,UAAU,EAAE,OAAO,CAAA;IACnB,YAAY,EAAE,OAAO,CAAA;IACrB,YAAY,EAAE,OAAO,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,EAAE,IAAI,GAAG,MAAM,CAAA;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,kBAAkB,EAAE,IAAI,GAAG,MAAM,CAAA;IACjC,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,OAAO,CAAC;IACxD,SAAS,EAAE,IAAI,GAAG,MAAM,CAAA;CAC3B;AAED,oBAAY,gBAAgB,GAAI,QAAQ,GAAG;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/types/main.ts"],"names":[],"mappings":"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"}
|