eservices-back-core 1.2.74 → 1.2.76

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.
@@ -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: [string, number][];
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;YAWtB,iBAAiB;IAkB/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;IA+ChC,OAAO,CAAC,iBAAiB;IAQzB;;;OAGG;IACH,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,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC3B"}
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;AAIvB;;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;IAwB/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"}
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const interface_auth_service_1 = __importDefault(require("./interface-auth-service"));
16
16
  const data_service_1 = __importDefault(require("./data-service"));
17
+ const winston_1 = require("winston");
17
18
  /**
18
19
  * @description Класс предназначен для получения, парсинг criterion.
19
20
  */
@@ -30,6 +31,7 @@ class CriterionService extends interface_auth_service_1.default {
30
31
  }
31
32
  generateCriterion(parsedCriterion, preset, entities) {
32
33
  return __awaiter(this, void 0, void 0, function* () {
34
+ const actionLogger = winston_1.loggers.get('actions');
33
35
  // 1. Пройтись по parsedCriterion - выбрать все поля для сущностей.
34
36
  // Record<string, string[]>
35
37
  const fieldsStore = this.parseFieldsFromCriterion(parsedCriterion, entities);
@@ -37,6 +39,10 @@ class CriterionService extends interface_auth_service_1.default {
37
39
  const entitiesValues = yield this.loadValueForEntities(fieldsStore);
38
40
  if (entitiesValues.length === 0)
39
41
  throw new Error(`In current version you must provide least one entity to get criterion.`);
42
+ actionLogger.info({
43
+ entitiesValues,
44
+ parsedCriterion
45
+ });
40
46
  // 3. На данном шаге у нас есть значения всех полей, теперь мы можем просто пройтись по конфигурации и составить
41
47
  // итоговый criterion.
42
48
  const result = this.generateCriterionArray(parsedCriterion, preset, entitiesValues, entities[0][0]);
@@ -60,7 +66,7 @@ class CriterionService extends interface_auth_service_1.default {
60
66
  const getValuesByEntity = (entityName) => {
61
67
  const config = entityValues.find(e => e.entity === entityName);
62
68
  if (!config)
63
- throw new Error(`CriterionService: Can't found values config config for entity ${entityName}`);
69
+ throw new Error(`[criterion-service]: In func getValuesByEntities was founded exception. Values for entity ${entityName} is not provided.`);
64
70
  return config.values;
65
71
  };
66
72
  /**
@@ -71,20 +77,22 @@ class CriterionService extends interface_auth_service_1.default {
71
77
  function parse(elem, entity) {
72
78
  if (Array.isArray(elem))
73
79
  return parseArray(elem, CriterionService.SYMBOL_CONCAT, entity);
74
- if (this.isMasterCriterion(elem))
75
- return parse.call(this, elem.fields, elem.entity);
80
+ entity = this.isMasterCriterion(elem) ? elem.entity : entity;
76
81
  if (!checkEntity(entity)) {
77
- console.log(`[criterion-service]: entity ${entity} was not inited. Please check that id for current entity was provided.`);
82
+ console.log(`[criterion-service]: Entity ${entity} hasn't treated. Please check that entity or id for current entity was provided.`);
78
83
  return null;
79
84
  }
80
85
  if (typeof elem === 'string')
81
86
  return this.getExpression(parseName(elem, entity), this.getValueByName(elem, getValuesByEntity(entity), preset));
82
- // Custom Criterion
83
- const expression = elem.expression;
84
- const equal = expression.equal;
85
- const values = getValuesByEntity(entity);
86
- if (this.getValue(equal[0], { values, preset }) === this.getValue(equal[1], { values, preset }))
87
- return elem.name;
87
+ if (this.isFieldsCriterion(elem))
88
+ return parse.call(this, elem.fields, entity);
89
+ if (this.isNamedCriterion(elem)) {
90
+ const expression = elem.expression;
91
+ const equal = expression.equal;
92
+ const values = getValuesByEntity(entity);
93
+ if (this.getValue(equal[0], { values, preset }) === this.getValue(equal[1], { values, preset }))
94
+ return elem.name;
95
+ }
88
96
  return null;
89
97
  }
90
98
  return parseArray(parsedCriterion, '&', mainEntity);
@@ -163,23 +171,31 @@ class CriterionService extends interface_auth_service_1.default {
163
171
  });
164
172
  store.get(entityName).fields.push(...names);
165
173
  };
174
+ const parseObject = (data) => {
175
+ if (this.isFieldsCriterion(data))
176
+ return data.fields;
177
+ if (this.isNamedCriterion(data)) {
178
+ const answer = [];
179
+ // В данном случае поля expression в объекте не присутствует. Это значит, что метка будет добавлена без
180
+ // проверки. Возвращаем пустой массив полей.
181
+ if (!Object.prototype.hasOwnProperty.call(data, 'expression'))
182
+ return [];
183
+ // В данной реализации полей expression может хранить лишь один объект: equal.
184
+ const equal = data.expression.equal;
185
+ if (this.isEntityField(equal[0]))
186
+ answer.push(equal[0]);
187
+ if (this.isEntityField(equal[1]))
188
+ answer.push(equal[1]);
189
+ return answer;
190
+ }
191
+ console.log('[criterion-service] error to parse fields. Unknown object.', data);
192
+ return [];
193
+ };
166
194
  parsedCriterion.forEach(item => {
167
195
  item.forEach(criterion => {
168
196
  if (typeof criterion === 'string')
169
197
  return add(null, criterion);
170
- if (this.isMasterCriterion(criterion))
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]);
198
+ add(this.isMasterCriterion(criterion) ? criterion.entity : null, ...parseObject(criterion));
183
199
  });
184
200
  });
185
201
  const result = [];
@@ -188,11 +204,22 @@ class CriterionService extends interface_auth_service_1.default {
188
204
  });
189
205
  return result;
190
206
  }
207
+ isNamedCriterion(data) {
208
+ if (typeof data !== 'object' || data === null)
209
+ return false;
210
+ // @ts-ignore
211
+ return (Object.prototype.hasOwnProperty.call(data, 'name'));
212
+ }
213
+ isFieldsCriterion(data) {
214
+ if (typeof data !== 'object' || data === null)
215
+ return false;
216
+ // @ts-ignore
217
+ return (Object.prototype.hasOwnProperty.call(data, 'fields') && Array.isArray(data.fields));
218
+ }
191
219
  isMasterCriterion(data) {
192
220
  if (typeof data !== 'object' || data === null)
193
221
  return false;
194
- return (Object.prototype.hasOwnProperty.call(data, 'entity')
195
- && Object.prototype.hasOwnProperty.call(data, 'fields'));
222
+ return (Object.prototype.hasOwnProperty.call(data, 'entity'));
196
223
  }
197
224
  /**
198
225
  * @description Функция проверяет, является ли предоставленное поле - константным значением. Константное значение
@@ -203,6 +230,11 @@ class CriterionService extends interface_auth_service_1.default {
203
230
  return false;
204
231
  return !!(/[@$](.+)/.exec(fieldName));
205
232
  }
233
+ isEntityField(fieldName) {
234
+ if (typeof fieldName !== 'string')
235
+ return false;
236
+ return !!(/^[a-zA-Z0-9]+$/.exec(fieldName));
237
+ }
206
238
  /**
207
239
  * @description Метод приводит критерии к опрятному(единому) виду.
208
240
  * [
@@ -1 +1 @@
1
- {"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;AAO5D,kEAAyC;AACzC,qCAAgC;AAEhC;;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;YAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzE,CAAC;KAAA;IAEa,iBAAiB,CAAC,eAAsC,EAAE,MAAW,EAAE,QAA4B;;YAChH,MAAM,YAAY,GAAG,iBAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YAG3C,mEAAmE;YACnE,2BAA2B;YAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,wBAAwB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;YAE7E,sDAAsD;YACtD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAEpE,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;YAE3H,YAAY,CAAC,IAAI,CAAC;gBACjB,cAAc;gBACd,eAAe;aACf,CAAC,CAAA;YAEF,gHAAgH;YAChH,sBAAsB;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpG,OAAO,MAAM,CAAC;QACf,CAAC;KAAA;IAED;;;OAGG;IACK,sBAAsB,CAAC,eAAsC,EAAE,MAAW,EAAE,YAAsC,EAAE,UAAkB;QAC7I,MAAM,UAAU,GAAG,CAAC,KAAY,EAAE,SAAiB,EAAE,MAAc,EAAE,EAAE;YACtE,MAAM,MAAM,GAAG,KAAK;iBACnB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;iBAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAA;YAExB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACrD,CAAC,CAAA;QAED,gHAAgH;QAChH,uDAAuD;QACvD,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE,CAAC,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5G,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;YAChD,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;YAC/D,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,6FAA6F,UAAU,mBAAmB,CAAC,CAAC;YACzJ,OAAO,MAAM,CAAC,MAAM,CAAC;QACtB,CAAC,CAAA;QACD;;;WAGG;QACH,MAAM,WAAW,GAAG,CAAC,UAAkB,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;QAE5F,SAAS,KAAK,CAAyB,IAAmB,EAAE,MAAc;YAEzE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBAAE,OAAO,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAEzF,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;YAE7D,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;gBACzB,OAAO,CAAC,GAAG,CAAC,+BAA+B,MAAM,kFAAkF,CAAC,CAAA;gBACpI,OAAO,IAAI,CAAC;aACZ;YAED,IAAI,OAAO,IAAI,KAAK,QAAQ;gBAAE,OAAO,IAAI,CAAC,aAAa,CAAE,SAAS,CAAC,IAAI,EAAE,MAAM,CAAE,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAE,CAAC;YAElJ,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAAE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAE/E,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE;gBAChC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;gBACnC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;gBAE/B,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBAEzC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC;oBAAE,OAAO,IAAI,CAAC,IAAI,CAAC;aAE9G;YAED,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO,UAAU,CAAC,eAAe,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IACpD,CAAC;IAED;;;OAGG;IACK,QAAQ,CAAC,MAAW,EAAE,OAAqC;QAClE,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;YAAE,OAAO,MAAM,CAAC,KAAK,CAAC;QAEzD,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC;IACM,kBAAkB,CAAC,IAAa;QACtC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QAC5D,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;YAAE,OAAO,IAAI,CAAC;QACrE,OAAO,KAAK,CAAC;IACd,CAAC;IACD;;OAEG;IACK,aAAa,CAAC,IAAY,EAAE,KAAU;QAC7C,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC,CAAC,qBAAqB;QACnE,OAAO,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC;IAC3B,CAAC;IACD;;;OAGG;IACK,cAAc,CAAC,IAAY,EAAE,MAAW,EAAE,MAAM;QACvD,sCAAsC;QACtC,MAAM,mBAAmB,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,mBAAmB,EAAE;YACxB,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YAExD,IAAI,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAAE,OAAO,MAAM,CAAC,gBAAgB,CAAC;YACrF,MAAM,IAAI,KAAK,CAAC,uBAAuB,UAAU,EAAE,CAAC,CAAA;SACpD;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED;;OAEG;IACW,oBAAoB,CAAC,WAA2B;;YAE7D,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEhD,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE;gBACjG,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;aAC/B,CAAC,CAAC,CAAA;YAEH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAEpD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,iBACzC,MAAM,IACH,WAAW,CAAC,KAAK,CAAC,EACpB,CAAC,CAAA;QACJ,CAAC;KAAA;IACD;;OAEG;IACK,wBAAwB,CAAC,eAAsC,EAAE,QAAwB;QAChG,MAAM,KAAK,GAAG,IAAI,GAAG,EAA0C,CAAA;QAC/D,MAAM,GAAG,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,GAAG,KAAe,EAAE,EAAE;;YACvE,IAAI,UAAU,KAAK,IAAI;gBAAE,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAErD,MAAM,EAAE,GAAG,MAAA,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,0CAAG,CAAC,CAAC,CAAC;YACxD,IAAI,CAAC,EAAE,EAAE;gBACR,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,2CAA2C,UAAU,sBAAsB,CAAC,CAAC;gBACrG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC3B,OAAO;aACP;YAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC;gBAAE,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE;oBACjD,MAAM,EAAE,EAAE;oBACV,EAAE;iBACF,CAAC,CAAC;YACH,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QAC7C,CAAC,CAAA;QAED,MAAM,WAAW,GAAG,CAAC,IAAoC,EAAE,EAAE;YAC5D,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC,MAAM,CAAC;YAErD,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE;gBAChC,MAAM,MAAM,GAAY,EAAE,CAAA;gBAC1B,uGAAuG;gBACvG,4CAA4C;gBAC5C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC;oBAAE,OAAO,EAAE,CAAA;gBAExE,8EAA8E;gBAC9E,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBAEpC,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;gBACvD,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;gBAEvD,OAAO,MAAM,CAAC;aACd;YACD,OAAO,CAAC,GAAG,CAAC,4DAA4D,EAAE,IAAI,CAAC,CAAA;YAC/E,OAAO,EAAE,CAAA;QACV,CAAC,CAAA;QAED,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBACxB,IAAI,OAAO,SAAS,KAAK,QAAQ;oBAAE,OAAQ,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;gBAC/D,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAA;YAC5F,CAAC,CAAC,CAAA;QACH,CAAC,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YAChC,MAAM,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,IAAG,CAAA;QACnC,CAAC,CAAC,CAAA;QAEF,OAAO,MAAM,CAAC;IACf,CAAC;IACO,gBAAgB,CAAC,IAAa;QACrC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QAC5D,aAAa;QACb,OAAO,CAAE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAE,CAAA;IAC9D,CAAC;IACO,iBAAiB,CAAC,IAAa;QACtC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QAC5D,aAAa;QACb,OAAO,CAAE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAE,CAAA;IAC9F,CAAC;IAEO,iBAAiB,CAAC,IAAa;QACtC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QAC5D,OAAO,CACN,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CACpD,CAAA;IACF,CAAC;IAED;;;OAGG;IACK,aAAa,CAAC,SAAkB;QACvC,IAAI,OAAO,SAAS,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAChD,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACvC,CAAC;IACO,aAAa,CAAC,SAAkB;QACvC,IAAI,OAAO,SAAS,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAChD,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD;;;;;;;;OAQG;IACK,cAAc,CAAC,SAAyB;QAE/C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACtE,IAAI,OAAO,IAAI,KAAK,QAAQ;gBAAE,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;YACrE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC;YAErC,OAAO,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAA;IACH,CAAC;IACO,oBAAoB,CAAC,SAAiB;QAC7C,OAAO,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACvD,CAAC;;AAxQF,mCAyQC;AAxQgB,6BAAY,GAAG,GAAG,CAAA;AAElC;;;GAGG;AACa,8BAAa,GAAG,GAAG,CAAC"}
@@ -102,20 +102,24 @@ export interface MetadataField {
102
102
  export declare type MetadataResponse = Metadata & {
103
103
  _filter: string;
104
104
  };
105
- export interface CustomCriterion {
106
- "name": string;
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 | CustomCriterion | MasterEntityCriterion;
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
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/types/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/types/main.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eservices-back-core",
3
- "version": "1.2.74",
3
+ "version": "1.2.76",
4
4
  "description": "",
5
5
  "main": "dist/Server.js",
6
6
  "scripts": {