eservices-back-core 1.2.63 → 1.2.65
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/actions-controller.js +2 -1
- package/dist/controller/close-api/actions-controller.js.map +1 -1
- package/dist/controller/close-api/metadata-controller.d.ts.map +1 -1
- package/dist/controller/close-api/metadata-controller.js +5 -4
- package/dist/controller/close-api/metadata-controller.js.map +1 -1
- package/dist/services/criterion-service.d.ts.map +1 -1
- package/dist/services/criterion-service.js +5 -2
- package/dist/services/criterion-service.js.map +1 -1
- package/package.json +1 -1
|
@@ -49,6 +49,7 @@ class ActionsController {
|
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
51
|
static getById(request, response, next) {
|
|
52
|
+
var _a;
|
|
52
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
53
54
|
try {
|
|
54
55
|
const { entity, id } = request.params;
|
|
@@ -58,7 +59,7 @@ class ActionsController {
|
|
|
58
59
|
const actionCriterion = yield criterionService.get({
|
|
59
60
|
entity,
|
|
60
61
|
id: Number.parseInt(id, 10),
|
|
61
|
-
criterion: Store_1.default.getMetadataSettingsForEntity(entity).criterionForAction || [],
|
|
62
|
+
criterion: ((_a = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _a === void 0 ? void 0 : _a.criterionForAction) || ["StatusCode"],
|
|
62
63
|
preset: (0, get_criterion_preset_1.default)(request),
|
|
63
64
|
masterEntities: (0, get_master_entities_1.default)(request)
|
|
64
65
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,mFAA0D;AAC1D,sFAA4D;AAE5D,yFAAgE;AAChE,8DAAsC;AACtC,4FAAkE;AAClE,0FAAgE;AAEhE,MAAqB,iBAAiB;IAErC,MAAM,CAAO,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YACjD,IAAI;gBACH,MAAM,EAAC,SAAS,EAAC,GAAG,GAAG,CAAC,KAAK,CAAC;gBAC9B,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAErD,MAAM,EAAE,GAAG,IAAI,wBAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,SAAS,EAAC,CAAC,CAAC;gBAElD,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACxB;YAAC,OAAO,CAAC,EAAE;gBAAE,IAAI,CAAC,CAAC,CAAC,CAAA;aAAE;QAExB,CAAC;KAAA;IAED,MAAM,CAAO,OAAO,CAAC,OAAgB,EAAE,QAAkB,EAAE,IAAI;;YAC9D,IAAI;gBACH,MAAM,EAAC,IAAI,EAAC,GAAG,OAAO,CAAC,MAAM,CAAC;gBAC9B,MAAM,EAAC,IAAI,EAAE,SAAS,EAAC,GAAG,OAAO,CAAC,IAAI,CAAC;gBACvC,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAEzD,MAAM,EAAE,GAAG,IAAI,wBAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC9C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC,CAAC;gBAElE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aAErB;YAAC,OAAO,CAAC,EAAE;gBACX,IAAI,CAAC,CAAC,CAAC,CAAC;aACR;QACF,CAAC;KAAA;IAED,MAAM,CAAO,OAAO,CAAC,OAAgB,EAAE,QAAkB,EAAE,IAAI
|
|
1
|
+
{"version":3,"file":"actions-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,mFAA0D;AAC1D,sFAA4D;AAE5D,yFAAgE;AAChE,8DAAsC;AACtC,4FAAkE;AAClE,0FAAgE;AAEhE,MAAqB,iBAAiB;IAErC,MAAM,CAAO,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YACjD,IAAI;gBACH,MAAM,EAAC,SAAS,EAAC,GAAG,GAAG,CAAC,KAAK,CAAC;gBAC9B,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAErD,MAAM,EAAE,GAAG,IAAI,wBAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,SAAS,EAAC,CAAC,CAAC;gBAElD,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACxB;YAAC,OAAO,CAAC,EAAE;gBAAE,IAAI,CAAC,CAAC,CAAC,CAAA;aAAE;QAExB,CAAC;KAAA;IAED,MAAM,CAAO,OAAO,CAAC,OAAgB,EAAE,QAAkB,EAAE,IAAI;;YAC9D,IAAI;gBACH,MAAM,EAAC,IAAI,EAAC,GAAG,OAAO,CAAC,MAAM,CAAC;gBAC9B,MAAM,EAAC,IAAI,EAAE,SAAS,EAAC,GAAG,OAAO,CAAC,IAAI,CAAC;gBACvC,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAEzD,MAAM,EAAE,GAAG,IAAI,wBAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC9C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC,CAAC;gBAElE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aAErB;YAAC,OAAO,CAAC,EAAE;gBACX,IAAI,CAAC,CAAC,CAAC,CAAC;aACR;QACF,CAAC;KAAA;IAED,MAAM,CAAO,OAAO,CAAC,OAAgB,EAAE,QAAkB,EAAE,IAAI;;;YAC9D,IAAI;gBACH,MAAM,EAAC,MAAM,EAAE,EAAE,EAAC,GAAG,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAEzD,MAAM,aAAa,GAAG,IAAI,wBAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACzD,MAAM,gBAAgB,GAAK,IAAI,2BAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAEjE,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC;oBAClD,MAAM;oBACN,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;oBAC3B,SAAS,EAAE,CAAA,MAAA,eAAK,CAAC,4BAA4B,CAAC,MAAM,CAAC,0CAAE,kBAAkB,KAAI,CAAC,YAAY,CAAC;oBAC3F,MAAM,EAAE,IAAA,8BAAkB,EAAC,OAAO,CAAC;oBACnC,cAAc,EAAE,IAAA,6BAAiB,EAAC,OAAO,CAAC;iBAC1C,CAAC,CAAC;gBAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAC,CAAC,CAAC;gBAE9E,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC7B;YAAC,OAAO,CAAC,EAAE;gBAAE,IAAI,CAAC,CAAC,CAAC,CAAA;aAAE;;KACvB;CAGD;AAtDD,oCAsDC"}
|
|
@@ -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;AAa1C,MAAM,CAAC,OAAO,OAAO,kBAAkB;WAEzB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAuClD;;;;OAIG;WACU,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;
|
|
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;AAa1C,MAAM,CAAC,OAAO,OAAO,kBAAkB;WAEzB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAuClD;;;;OAIG;WACU,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAgCzC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAc3C,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CA4B1D"}
|
|
@@ -59,7 +59,7 @@ class MetadataController {
|
|
|
59
59
|
* @warning В данной реализации забито поле StatusCode.
|
|
60
60
|
*/
|
|
61
61
|
static getById(req, res, next) {
|
|
62
|
-
var _a;
|
|
62
|
+
var _a, _b;
|
|
63
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
64
64
|
try {
|
|
65
65
|
const metadataLogger = winston_1.loggers.get('metadata');
|
|
@@ -71,7 +71,7 @@ class MetadataController {
|
|
|
71
71
|
const valueCriterion = yield criterionService.get({
|
|
72
72
|
entity,
|
|
73
73
|
id: Number.parseInt(id, 10),
|
|
74
|
-
criterion: Store_1.default.getMetadataSettingsForEntity(entity).criterion || [],
|
|
74
|
+
criterion: ((_b = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _b === void 0 ? void 0 : _b.criterion) || ["StatusCode"],
|
|
75
75
|
preset: (0, get_criterion_preset_1.default)(req),
|
|
76
76
|
masterEntities: (0, get_master_entities_1.default)(req)
|
|
77
77
|
});
|
|
@@ -81,6 +81,7 @@ class MetadataController {
|
|
|
81
81
|
res.json(metadata);
|
|
82
82
|
}
|
|
83
83
|
catch (e) {
|
|
84
|
+
console.log(e);
|
|
84
85
|
next(e);
|
|
85
86
|
}
|
|
86
87
|
});
|
|
@@ -99,7 +100,7 @@ class MetadataController {
|
|
|
99
100
|
});
|
|
100
101
|
}
|
|
101
102
|
static getByMaster(req, res, next) {
|
|
102
|
-
var _a;
|
|
103
|
+
var _a, _b;
|
|
103
104
|
return __awaiter(this, void 0, void 0, function* () {
|
|
104
105
|
try {
|
|
105
106
|
const { entity } = req.params;
|
|
@@ -108,7 +109,7 @@ class MetadataController {
|
|
|
108
109
|
const criterionService = new criterion_service_1.default(req.__token);
|
|
109
110
|
const valueCriterion = yield criterionService.get({
|
|
110
111
|
entity,
|
|
111
|
-
criterion: Store_1.default.getMetadataSettingsForEntity(entity).criterionByMaster,
|
|
112
|
+
criterion: ((_b = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _b === void 0 ? void 0 : _b.criterionByMaster) || [],
|
|
112
113
|
masterEntities: (0, get_master_entities_1.default)(req),
|
|
113
114
|
preset: (0, get_criterion_preset_1.default)(req)
|
|
114
115
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,+EAAsD;AACtD,sFAA8D;AAC9D,uFAA8D;AAC9D,qCAAgC;AAChC,sFAA4D;AAC5D,uEAA8C;AAC9C,8DAAsC;AACtC,4FAAkE;AAClE,yFAAgE;AAChE,0FAAgE;AAGhE,MAAqB,kBAAkB;IAEtC,MAAM,CAAO,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YACjD,IAAI;gBACH,MAAM,cAAc,GAAG,iBAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC/C,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC5B,MAAM,EAAC,EAAE,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC,KAAK,CAAC;gBAEjC,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAErD,IAAI,aAAa,GAAG,OAAO,QAAQ,KAAK,QAAQ,CAAA,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBAEhE,IAAI,EAAE,EAAE;oBACP,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;oBACjD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE;wBACpD,MAAM,EAAE,aAAa;qBACrB,CAAC,CAAC;oBAEH,aAAa,GAAG,IAAA,2BAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAW,CAAC;iBACtE;gBAED,MAAM,eAAe,GAAG,IAAI,0BAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAEzD,cAAc,CAAC,IAAI,CAAC,cAAc,EAAE;oBACnC,OAAO;oBACP,aAAa;oBACb,MAAM;oBACN,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO;iBAC5B,CAAC,CAAA;gBAGF,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;gBAE/E,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAEnB;YAAC,OAAO,CAAC,EAAE;gBACX,IAAI,CAAC,CAAC,CAAC,CAAC;aACR;QAEF,CAAC;KAAA;IAED;;;;OAIG;IACH,MAAM,CAAO,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;;YACrD,IAAI;gBAEH,MAAM,cAAc,GAAG,iBAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC/C,MAAM,EAAC,MAAM,EAAE,EAAE,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;gBAEhC,IAAI,CAAC,EAAE;oBAAE,MAAM,mBAAQ,CAAC,WAAW,EAAE,CAAC;gBAEtC,MAAM,OAAO,GAAG,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,OAAO,0CAAE,QAAQ,EAAE,KAAI,IAAA,2BAAe,EAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAEtF,MAAM,gBAAgB,GAAK,IAAI,2BAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC7D,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC;oBACjD,MAAM;oBACN,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;oBAC3B,SAAS,EAAE,eAAK,CAAC,4BAA4B,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAE5D,OAAO,EAAC,cAAc,EAAuC,MAAM,eAAe,CAAC;AAGnF;;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;AAE5D,OAAO,EAAC,cAAc,EAAuC,MAAM,eAAe,CAAC;AAGnF;;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;YAetB,iBAAiB;IAiB/B,OAAO,CAAC,sBAAsB;IA4C9B;;OAEG;IACH,OAAO,CAAC,aAAa;IAIrB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAatB;;OAEG;YACW,oBAAoB;IAelC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAuChC,OAAO,CAAC,iBAAiB;IAQzB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAGrB;;;;;;;;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,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC3B"}
|
|
@@ -25,6 +25,7 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
25
25
|
if (!params.id)
|
|
26
26
|
throw api_error_1.default.UndefinedId();
|
|
27
27
|
const parsedCriterion = this.parseCriterion(params.criterion);
|
|
28
|
+
console.log(parsedCriterion);
|
|
28
29
|
const entities = [
|
|
29
30
|
[params.entity, params.id],
|
|
30
31
|
...params.masterEntities
|
|
@@ -39,6 +40,8 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
39
40
|
const fieldsStore = this.parseFieldsFromCriterion(parsedCriterion, entities);
|
|
40
41
|
// 2. Загрузка значений с сервера для полученных полей
|
|
41
42
|
const entitiesValues = yield this.loadValueForEntities(fieldsStore);
|
|
43
|
+
if (entitiesValues.length === 0)
|
|
44
|
+
throw new Error(`In current version you must provide least one entity to get criterion.`);
|
|
42
45
|
// 3. На данном шаге у нас есть значения всех полей, теперь мы можем просто пройтись по конфигурации и составить
|
|
43
46
|
// итоговый criterion.
|
|
44
47
|
const result = this.generateCriterionArray(parsedCriterion, preset, entitiesValues);
|
|
@@ -177,11 +180,11 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
177
180
|
* В будущем будет иметь вид X&Y&Z, что на AppServer будет хранится как [X][Y][Z]
|
|
178
181
|
*/
|
|
179
182
|
parseCriterion(criterion) {
|
|
180
|
-
return criterion.map(item => {
|
|
183
|
+
return (Array.isArray(criterion) ? criterion : [criterion]).map(item => {
|
|
181
184
|
if (typeof item === 'string')
|
|
182
185
|
return this.parseStringCriterion(item);
|
|
183
186
|
if (Array.isArray(item))
|
|
184
|
-
return item
|
|
187
|
+
return item;
|
|
185
188
|
return [item];
|
|
186
189
|
});
|
|
187
190
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;AAC5D,oEAA2C;AAE3C,kEAAyC;AAEzC;;GAEG;AACH,MAAqB,gBAAiB,SAAQ,gCAAoB;IAS3D,GAAG,CAAC,MAA0B;;YACnC,6BAA6B;YAC7B,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,MAAM,mBAAQ,CAAC,WAAW,EAAE,CAAC;YAC7C,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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"}
|