@futdevpro/nts-dynamo 1.9.35 → 1.9.37

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.
Files changed (23) hide show
  1. package/build/_models/control-models/endpoint-params.control-model.d.ts.map +1 -1
  2. package/build/_models/control-models/endpoint-params.control-model.js +13 -10
  3. package/build/_models/control-models/endpoint-params.control-model.js.map +1 -1
  4. package/build/_modules/usage/usage.controller.d.ts.map +1 -1
  5. package/build/_modules/usage/usage.controller.js +7 -1
  6. package/build/_modules/usage/usage.controller.js.map +1 -1
  7. package/build/_services/base/data.service.d.ts.map +1 -1
  8. package/build/_services/base/data.service.js +17 -15
  9. package/build/_services/base/data.service.js.map +1 -1
  10. package/build/_services/base/db.service.js +25 -25
  11. package/build/_services/base/db.service.js.map +1 -1
  12. package/build/_services/base/singleton.service.d.ts.map +1 -1
  13. package/build/_services/base/singleton.service.js +1 -0
  14. package/build/_services/base/singleton.service.js.map +1 -1
  15. package/build/_services/core/global.service.js +2 -2
  16. package/build/_services/core/global.service.js.map +1 -1
  17. package/package.json +1 -1
  18. package/src/_models/control-models/endpoint-params.control-model.ts +17 -11
  19. package/src/_modules/usage/usage.controller.ts +7 -1
  20. package/src/_services/base/data.service.ts +18 -17
  21. package/src/_services/base/db.service.ts +25 -25
  22. package/src/_services/base/singleton.service.ts +1 -0
  23. package/src/_services/core/global.service.ts +2 -2
package/build/_models/control-models/endpoint-params.control-model.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"endpoint-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAI3E;;;;GAIG;AACH,qBAAa,qBAAqB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,mBAAmB,CAAC;IAE9B,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IAKjB,OAAO,CAAC,UAAU,CAAW;IAE7B,OAAO,CAAC,YAAY,CAAqD;IACzE,OAAO,CAAC,KAAK,CAAsE;IAEnF,OAAO,CAAC,UAAU,CAAU;IAC5B,OAAO,CAAC,iBAAiB,CAAU;IACnC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,KAAK,CAAS;gBAGpB,GAAG,EAAE;QACH;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;QACb;;;;WAIG;QACH,QAAQ,CAAC,EAAE,mBAAmB,CAAC;QAE/B;;WAEG;QACH,IAAI,EAAE,kBAAkB,CAAC;QACzB;;;;WAIG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;WAGG;QACH,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAClE;;;WAGG;QACH,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAE3E;;WAEG;QACH,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB;;WAEG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B;IAoDH;;;OAGG;YACW,MAAM;IA0BpB,OAAO,CAAC,gBAAgB;IAYxB;;;OAGG;IACH,gBAAgB,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC;IA4ClE;;;;OAIG;YACW,KAAK;IA6EnB,OAAO,CAAC,eAAe;IAkCvB,OAAO,CAAC,uBAAuB;CAShC"}
1
+ {"version":3,"file":"endpoint-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAI3E;;;;GAIG;AACH,qBAAa,qBAAqB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,mBAAmB,CAAC;IAE9B,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IAKjB,OAAO,CAAC,UAAU,CAAW;IAE7B,OAAO,CAAC,YAAY,CAAqD;IACzE,OAAO,CAAC,KAAK,CAAsE;IAEnF,OAAO,CAAC,UAAU,CAAU;IAC5B,OAAO,CAAC,iBAAiB,CAAU;IACnC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,KAAK,CAAS;gBAGpB,GAAG,EAAE;QACH;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;QACb;;;;WAIG;QACH,QAAQ,CAAC,EAAE,mBAAmB,CAAC;QAE/B;;WAEG;QACH,IAAI,EAAE,kBAAkB,CAAC;QACzB;;;;WAIG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;WAGG;QACH,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAClE;;;WAGG;QACH,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAE3E;;WAEG;QACH,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB;;WAEG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B;IAoDH;;;OAGG;YACW,MAAM;IA0BpB,OAAO,CAAC,gBAAgB;IAUxB;;;OAGG;IACH,gBAAgB,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC;IA2ClE;;;;OAIG;YACW,KAAK;IAsFnB,OAAO,CAAC,eAAe;IAkCvB,OAAO,CAAC,uBAAuB;CAShC"}
package/build/_models/control-models/endpoint-params.control-model.js CHANGED
@@ -91,14 +91,11 @@ class DyNTS_Endpoint_Params {
91
91
  }
92
92
  }
93
93
  getStackLocation() {
94
- return new Error().stack;
95
- /* DyFM_Log.info(`\nTRYING TO FIND STACK LOCATION FOR: ${this.name}`); */
96
- /* DyFM_Log.info(`\n..."${this.stack}"`); */
97
- /* this.stack = this.stack?.split('\n').filter(
98
- (line: string): boolean => !line.includes('node_modules')
99
- ).join('\n');
100
- this.stack = this.stack.replace(' at ', ''); */
101
- /* DyFM_Log.H_info(`\n stack location: "${this.stack}"`); */
94
+ let stack = new Error().stack;
95
+ stack = stack?.split('\n')?.[3]?.replace(' at ', '');
96
+ stack = stack?.replace('.setupEndpoints (', ': ');
97
+ stack = stack?.replace(')', '');
98
+ return stack;
102
99
  }
103
100
  /**
104
101
  *
@@ -113,8 +110,7 @@ class DyNTS_Endpoint_Params {
113
110
  await this.preLog(req, res, issuer);
114
111
  }
115
112
  if (global_settings_const_1.DyNTS_global_settings.log_settings.requestStackLocation) {
116
- /* this.logStackLocation(); */
117
- fsm_dynamo_1.DyFM_Log.H_info(`\n stack location: "${this.stack}"`);
113
+ fsm_dynamo_1.DyFM_Log.info(` endpoint location: "${this.stack}"`);
118
114
  }
119
115
  await fsm_dynamo_1.DyFM_Array.asyncForEach(this.preProcesses, async (preProcess) => {
120
116
  await preProcess(req, res);
@@ -146,6 +142,7 @@ class DyNTS_Endpoint_Params {
146
142
  try {
147
143
  let msg = `Endpoint caught an error. '${this.name}' (${this.endpoint})`;
148
144
  msg += this.getPathParamsLogContent(req);
145
+ msg += '\n at ' + this.stack;
149
146
  fsm_dynamo_1.DyFM_Log.error(msg);
150
147
  if (global_settings_const_1.DyNTS_global_settings.log_settings.highDetailedLogs ||
151
148
  !(error instanceof fsm_dynamo_1.DyFM_Error)) {
@@ -168,6 +165,12 @@ class DyNTS_Endpoint_Params {
168
165
  error.confidentialContent) {
169
166
  delete error.confidentialContent;
170
167
  }
168
+ try {
169
+ JSON.stringify(error);
170
+ }
171
+ catch (error) {
172
+ fsm_dynamo_1.DyFM_Log.H_error('DyNTS_Endpoint_Params: error object is not serializable!', error);
173
+ }
171
174
  res.status(error?.___status ?? 501);
172
175
  res.send(error);
173
176
  if (this.logRequest) {
package/build/_models/control-models/endpoint-params.control-model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"endpoint-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"endpoint-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"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"}
package/build/_modules/usage/usage.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"usage.controller.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAO5E,qBAAa,sBAAuB,SAAQ,gBAAgB;IAE1D,MAAM,CAAC,WAAW,IAAI,sBAAsB;IAK5C,OAAO,CAAC,WAAW,CAAoB;IAEvC,cAAc,IAAI,IAAI;CA2FvB"}
1
+ {"version":3,"file":"usage.controller.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAO5E,qBAAa,sBAAuB,SAAQ,gBAAgB;IAE1D,MAAM,CAAC,WAAW,IAAI,sBAAsB;IAK5C,OAAO,CAAC,WAAW,CAAoB;IAEvC,cAAc,IAAI,IAAI;CAiGvB"}
package/build/_modules/usage/usage.controller.js CHANGED
@@ -22,7 +22,13 @@ class DyNTS_Usage_Controller extends controller_service_1.DyNTS_Controller {
22
22
  endpoint: usage_1.DyFM_usageModule_settings.endPoints.newSession,
23
23
  tasks: [
24
24
  async (req, res, issuer) => {
25
- const username = this.authService.getUsernameFromRequest(req);
25
+ let username;
26
+ try {
27
+ username = this.authService.getUsernameFromRequest(req);
28
+ }
29
+ catch {
30
+ username = 'unknown';
31
+ }
26
32
  const usageService = new usage_data_service_1.DyNTS_Usage_DataService({
27
33
  usageSession: new usage_1.DyFM_UsageSession({
28
34
  sessionStart: new Date(),
package/build/_modules/usage/usage.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"usage.controller.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"usage.controller.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"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"}
package/build/_services/base/data.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
package/build/_services/base/data.service.js CHANGED
@@ -64,8 +64,8 @@ class DyNTS_DataService {
64
64
  catch (error) {
65
65
  throw new fsm_dynamo_1.DyFM_Error({
66
66
  ...this._getDefaultErrorSettings('constructor', error),
67
- message: `The dataService construction failed for ${dataParams?.dataName}. ` +
68
- `${this.serviceName} (${this.constructor.name})` +
67
+ message: `The dataService construction failed for "${dataParams?.dataName}". ` +
68
+ `at "${this.serviceName}" (${this.constructor.name})` +
69
69
  `\nMaybe you forgot to add the dbService to the GlobalService?\n\n`,
70
70
  level: fsm_dynamo_1.DyFM_ErrorLevel.critical,
71
71
  errorCode: 'NTS-DS0-C00',
@@ -87,7 +87,7 @@ class DyNTS_DataService {
87
87
  try {
88
88
  const dataListExists = await this.dataDBService.getAll().catch((error) => {
89
89
  if (error?.errorCode === 'NTS-DBS-GA1') {
90
- fsm_dynamo_1.DyFM_Log.warn(`getAll ${this.dataParams.dataName} didn't found any.`);
90
+ fsm_dynamo_1.DyFM_Log.warn(`getAll "${this.dataParams.dataName}" didn't found any.`);
91
91
  return [];
92
92
  }
93
93
  else {
@@ -190,14 +190,14 @@ class DyNTS_DataService {
190
190
  }
191
191
  if (!dependencyId && !this.data[this.depKey]) {
192
192
  throw new fsm_dynamo_1.DyFM_Error({
193
- ...this._getDefaultErrorSettings('getDataByDependencyId', new Error(`getDataByDependencyId failed, ${this.depKey} is missing! ` +
193
+ ...this._getDefaultErrorSettings('getDataByDependencyId', new Error(`getDataByDependencyId failed, "${this.depKey}" is missing! ` +
194
194
  `(${this.dataParams.dataName})`)),
195
195
  errorCode: 'NTS-DS0-GD2',
196
196
  });
197
197
  }
198
198
  const dataExists = await this.dataDBService.getDataByDependencyId(dependencyId ?? this.data[this.depKey]).catch((error) => {
199
199
  if (error?.errorCode === 'NTS-DBS-GD2') {
200
- fsm_dynamo_1.DyFM_Log.warn(`getDataByDependencyId failed; ${this.dataParams.dataName} ` +
200
+ fsm_dynamo_1.DyFM_Log.warn(`getDataByDependencyId failed; "${this.dataParams.dataName}" ` +
201
201
  `(${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
202
202
  return null;
203
203
  }
@@ -274,15 +274,15 @@ class DyNTS_DataService {
274
274
  }
275
275
  if (!dependencyId && !this.data[this.depKey]) {
276
276
  throw new fsm_dynamo_1.DyFM_Error({
277
- ...this._getDefaultErrorSettings('getDataListByDependencyId', new Error(`getDataListByDependencyId failed, ${this.depKey} is missing! ` +
277
+ ...this._getDefaultErrorSettings('getDataListByDependencyId', new Error(`getDataListByDependencyId failed, "${this.depKey}" is missing! ` +
278
278
  `(${this.dataParams.dataName})`)),
279
279
  errorCode: 'NTS-DS0-GLD2',
280
280
  });
281
281
  }
282
282
  const dataListExists = await this.dataDBService.getDataListByDependencyId(dependencyId ?? this.data[this.depKey]).catch((error) => {
283
283
  if (error?.errorCode === 'NTS-DBS-GLD2') {
284
- fsm_dynamo_1.DyFM_Log.warn(`getDataListByDependencyId ${this.dataParams.dataName} ` +
285
- `(${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
284
+ fsm_dynamo_1.DyFM_Log.warn(`getDataListByDependencyId "${this.dataParams.dataName}" ` +
285
+ `(${this.depKey}: "${dependencyId ?? this.data[this.depKey]}") didn't found any.`);
286
286
  return [];
287
287
  }
288
288
  else {
@@ -340,7 +340,7 @@ class DyNTS_DataService {
340
340
  try {
341
341
  const dataExists = await this.dataDBService.findOne(filterBy).catch((error) => {
342
342
  if (error?.errorCode === 'NTS-DBS-FO1') {
343
- fsm_dynamo_1.DyFM_Log.warn(`findData ${this.dataParams.dataName} didn't found any.`);
343
+ fsm_dynamo_1.DyFM_Log.warn(`findData "${this.dataParams.dataName}" didn't found any.`);
344
344
  return null;
345
345
  }
346
346
  else {
@@ -393,7 +393,7 @@ class DyNTS_DataService {
393
393
  try {
394
394
  const dataListExists = await this.dataDBService.find(filterBy).catch((error) => {
395
395
  if (error?.errorCode === 'NTS-DBS-F1') {
396
- fsm_dynamo_1.DyFM_Log.warn(`findDataList ${this.dataParams.dataName} didn't found any.`);
396
+ fsm_dynamo_1.DyFM_Log.warn(`findDataList "${this.dataParams.dataName}" didn't found any.`);
397
397
  return [];
398
398
  }
399
399
  else {
@@ -576,7 +576,7 @@ class DyNTS_DataService {
576
576
  if (!dependencyExists) {
577
577
  throw new fsm_dynamo_1.DyFM_Error({
578
578
  ...this._getDefaultErrorSettings('saveData', new Error(`saveData was unsuccessful: dependency data not exists ` +
579
- `(key: ${this.depKey}, id: ${data[this.depKey]}, ` +
579
+ `(key: ${this.depKey}, id: "${data[this.depKey]}", ` +
580
580
  `${this.dataParams.dataName})`)),
581
581
  errorCode: 'NTS-DS0-SD3',
582
582
  });
@@ -645,7 +645,7 @@ class DyNTS_DataService {
645
645
  (this.data[element.key] === null ||
646
646
  this.data[element.key] === undefined))) {
647
647
  throw new fsm_dynamo_1.DyFM_Error({
648
- ...this._getDefaultErrorSettings('validateForSave', new Error(`validateForSave failed, ${element.key} is missing! ` +
648
+ ...this._getDefaultErrorSettings('validateForSave', new Error(`validateForSave failed, "${element.key}" is missing! ` +
649
649
  `(${this.dataParams.dataName})`)),
650
650
  status: 522,
651
651
  errorCode: 'NTS-DS0-VD1',
@@ -656,7 +656,7 @@ class DyNTS_DataService {
656
656
  if (element.type === 'Date' &&
657
657
  !(new Date(this.data[element.key]) instanceof Date)) {
658
658
  throw new fsm_dynamo_1.DyFM_Error({
659
- ...this._getDefaultErrorSettings('validateForSave', new Error(`validateForSave failed, ${element.key} is not a date! ` +
659
+ ...this._getDefaultErrorSettings('validateForSave', new Error(`validateForSave failed, "${element.key}" is not a date! ` +
660
660
  `(${this.dataParams.dataName})`)),
661
661
  status: 522,
662
662
  errorCode: 'NTS-DS0-VD2',
@@ -710,8 +710,8 @@ class DyNTS_DataService {
710
710
  if (!this.depDBServiceKey) {
711
711
  throw new fsm_dynamo_1.DyFM_Error({
712
712
  ...this._getDefaultErrorSettings('getDependencyDataDBService', new Error(`getDependencyDataDBService was unsuccessful, service key not setted up! ` +
713
- `(${this.dataParams.dataName}))`)),
714
- status: 501,
713
+ `(${this.dataParams.dataName})`)),
714
+ status: 500,
715
715
  errorCode: 'NTS-DS0-GDDB0',
716
716
  });
717
717
  }
@@ -727,6 +727,7 @@ class DyNTS_DataService {
727
727
  return {
728
728
  status: error?.___status ?? 500,
729
729
  message: error?.message ??
730
+ error?._message ??
730
731
  `${fnName} was UNSUCCESSFUL (NTS; ${this.dataParams.dataName})`,
731
732
  addECToUserMsg: !error?.__userMessage,
732
733
  userMessage: error?.__userMessage ?? this.defaultErrorUserMsg,
@@ -739,6 +740,7 @@ class DyNTS_DataService {
739
740
  return {
740
741
  status: error?.___status ?? 500,
741
742
  message: error?.message ??
743
+ error?._message ??
742
744
  `${fnName} was UNSUCCESSFUL (${global_settings_const_1.DyNTS_global_settings.systemShortCodeName})`,
743
745
  addECToUserMsg: !error?.__userMessage,
744
746
  userMessage: error?.__userMessage ?? this.defaultErrorUserMsg,
package/build/_services/base/data.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"data.service.js","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data.service.js","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
package/build/_services/base/db.service.js CHANGED
@@ -71,7 +71,7 @@ class DyNTS_DBService {
71
71
  }
72
72
  else {
73
73
  throw new fsm_dynamo_1.DyFM_Error({
74
- ...this._getDefaultErrorSettings('createData', new Error(`createData failed, save ${this.dataParams.dbName} result not found! (NTS DB)`), issuer),
74
+ ...this._getDefaultErrorSettings('createData', new Error(`createData failed, save "${this.dataParams.dbName}" result not found! (NTS DB)`), issuer),
75
75
  status: 544,
76
76
  errorCode: 'NTS-DBS-CD1',
77
77
  additionalContent: { data },
@@ -88,7 +88,7 @@ class DyNTS_DBService {
88
88
  status: 522,
89
89
  errorCode: 'NTS-DBS-CD0',
90
90
  additionalContent: { data, dataModel },
91
- message: `createData failed, Create new ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
91
+ message: `createData failed, Create new "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
92
92
  issuer,
93
93
  });
94
94
  }
@@ -115,7 +115,7 @@ class DyNTS_DBService {
115
115
  throw new DyFM_Error({
116
116
  ...this._getDefaultErrorSettings(
117
117
  'modifyData',
118
- new Error(`modifyData failed, modify ${this.dataParams.dbName} result not found! (NTS DB)`),
118
+ new Error(`modifyData failed, modify "${this.dataParams.dbName}" result not found! (NTS DB)`),
119
119
  issuer,
120
120
  ),
121
121
 
@@ -130,7 +130,7 @@ class DyNTS_DBService {
130
130
  ...this._getDefaultErrorSettings('modifyData', error, issuer),
131
131
  errorCode: 'NTS-DBS-FU0',
132
132
  additionalContent: { data },
133
- message: `modifyData ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
133
+ message: `modifyData "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
134
134
  issuer,
135
135
  });
136
136
  });
@@ -147,7 +147,7 @@ class DyNTS_DBService {
147
147
  throw new fsm_dynamo_1.DyFM_Error({
148
148
  ...this._getDefaultErrorSettings('getDataById', new Error(`No ID provided! (NTS DB)`)),
149
149
  errorCode: 'NTS-DBS-GI1',
150
- message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)`,
150
+ message: `get "${this.dataParams.dbName}" by ID was unsuccessful (NTS DB)`,
151
151
  });
152
152
  }
153
153
  let data = await this.dataModel
@@ -158,7 +158,7 @@ class DyNTS_DBService {
158
158
  ...this._getDefaultErrorSettings('getDataById', error),
159
159
  errorCode: 'NTS-DBS-GI0',
160
160
  additionalContent: { id },
161
- message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)`,
161
+ message: `get "${this.dataParams.dbName}" by ID was unsuccessful (NTS DB)`,
162
162
  });
163
163
  });
164
164
  data = this.stringifyDataId(data, 'getDataById');
@@ -176,7 +176,7 @@ class DyNTS_DBService {
176
176
  throw new fsm_dynamo_1.DyFM_Error({
177
177
  ...this._getDefaultErrorSettings('getDataByDependencyId', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) ` +
178
178
  `(NTS DB)`)),
179
- status: 501,
179
+ status: 500,
180
180
  errorCode: 'NTS-DBS-GD0',
181
181
  });
182
182
  }
@@ -188,7 +188,7 @@ class DyNTS_DBService {
188
188
  ...this._getDefaultErrorSettings('getDataByDependencyId', error),
189
189
  errorCode: 'NTS-DBS-GD1',
190
190
  additionalContent: { dependencyId },
191
- message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
191
+ message: `get "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
192
192
  });
193
193
  });
194
194
  data = this.stringifyDataId(data, 'getDataByDependencyId');
@@ -206,7 +206,7 @@ class DyNTS_DBService {
206
206
  throw new fsm_dynamo_1.DyFM_Error({
207
207
  ...this._getDefaultErrorSettings('getDataListByDependencyId', new Error(`isDependencyHook not setted up for this dataModel (${this.dataParams.dbName}) ` +
208
208
  `(NTS DB)`)),
209
- status: 501,
209
+ status: 500,
210
210
  errorCode: 'NTS-DBS-GLD0',
211
211
  additionalContent: {
212
212
  dataModel: this.dataModel,
@@ -221,7 +221,7 @@ class DyNTS_DBService {
221
221
  ...this._getDefaultErrorSettings('getDataListByDependencyId', error),
222
222
  errorCode: 'NTS-DBS-GLD1',
223
223
  additionalContent: { dependencyId },
224
- message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
224
+ message: `get "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
225
225
  });
226
226
  });
227
227
  dataList.forEach((data) => {
@@ -241,7 +241,7 @@ class DyNTS_DBService {
241
241
  throw new fsm_dynamo_1.DyFM_Error({
242
242
  ...this._getDefaultErrorSettings('getDataListByDependencyIds', new Error(`getDataListByDependencyIds not setted up for this db-service ` +
243
243
  `(${this.dataParams.dbName}) (NTS DB)`)),
244
- status: 501,
244
+ status: 500,
245
245
  errorCode: 'NTS-DBS-GLDS0',
246
246
  });
247
247
  }
@@ -253,7 +253,7 @@ class DyNTS_DBService {
253
253
  ...this._getDefaultErrorSettings('getDataListByDependencyIds', error),
254
254
  errorCode: 'NTS-DBS-GLDS1',
255
255
  additionalContent: { dependencyIds },
256
- message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
256
+ message: `get "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
257
257
  });
258
258
  });
259
259
  dataList.forEach((data) => {
@@ -272,7 +272,7 @@ class DyNTS_DBService {
272
272
  )
273
273
  ),
274
274
 
275
- status: 501,
275
+ status: 500,
276
276
  errorCode: 'NTS-DBS-GLDS0',
277
277
  });
278
278
  }
@@ -311,7 +311,7 @@ class DyNTS_DBService {
311
311
  throw new fsm_dynamo_1.DyFM_Error({
312
312
  ...this._getDefaultErrorSettings('getAll', error),
313
313
  errorCode: 'NTS-DBS-GA0',
314
- message: `get all ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
314
+ message: `get all "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
315
315
  });
316
316
  });
317
317
  dataList.forEach((data) => {
@@ -331,7 +331,7 @@ class DyNTS_DBService {
331
331
  ...this._getDefaultErrorSettings('deleteDataById', error),
332
332
  errorCode: 'NTS-DBS-DD0',
333
333
  additionalContent: { id },
334
- message: `delete ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
334
+ message: `delete "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
335
335
  });
336
336
  });
337
337
  }
@@ -344,7 +344,7 @@ class DyNTS_DBService {
344
344
  throw new fsm_dynamo_1.DyFM_Error({
345
345
  ...this._getDefaultErrorSettings('deleteDataByDependencyId', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) ` +
346
346
  `(NTS DB)`)),
347
- status: 501,
347
+ status: 500,
348
348
  errorCode: 'NTS-DBS-DDD0',
349
349
  });
350
350
  }
@@ -355,7 +355,7 @@ class DyNTS_DBService {
355
355
  ...this._getDefaultErrorSettings('deleteDataByDependencyId', error),
356
356
  errorCode: 'NTS-DBS-DDD1',
357
357
  additionalContent: { dependencyId },
358
- message: `delete ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
358
+ message: `delete "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
359
359
  });
360
360
  });
361
361
  }
@@ -374,7 +374,7 @@ class DyNTS_DBService {
374
374
  throw new fsm_dynamo_1.DyFM_Error({
375
375
  ...this._getDefaultErrorSettings('searchData', new Error(`dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) ` +
376
376
  `(NTS DB)`)),
377
- status: 501,
377
+ status: 500,
378
378
  errorCode: 'NTS-DBS-SD0',
379
379
  });
380
380
  }
@@ -431,7 +431,7 @@ class DyNTS_DBService {
431
431
  ...this._getDefaultErrorSettings('searchData', error),
432
432
  errorCode: 'NTS-DBS-SD1',
433
433
  additionalContent: { filterBy, narrowByDependencyIds },
434
- message: `search ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
434
+ message: `search "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
435
435
  });
436
436
  });
437
437
  dataList.forEach((data) => {
@@ -478,7 +478,7 @@ class DyNTS_DBService {
478
478
  ...this._getDefaultErrorSettings('findOne', error),
479
479
  errorCode: 'NTS-DBS-FO0',
480
480
  additionalContent: { filterBy },
481
- message: `findOne ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
481
+ message: `findOne "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
482
482
  });
483
483
  });
484
484
  data = this.stringifyDataId(data, 'findOne');
@@ -520,7 +520,7 @@ class DyNTS_DBService {
520
520
  ...this._getDefaultErrorSettings('find', error),
521
521
  errorCode: 'NTS-DBS-F0',
522
522
  additionalContent: { filterBy },
523
- message: `find ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
523
+ message: `find "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
524
524
  });
525
525
  });
526
526
  dataList.forEach((data) => {
@@ -573,7 +573,7 @@ class DyNTS_DBService {
573
573
  ...this._getDefaultErrorSettings('findWithPaging', error),
574
574
  errorCode: 'NTS-DBS-WP0',
575
575
  additionalContent: { filterBy, page, pageSize, sort },
576
- message: `findWithPaging ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
576
+ message: `findWithPaging "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
577
577
  });
578
578
  });
579
579
  dataList.forEach((data) => {
@@ -601,7 +601,7 @@ class DyNTS_DBService {
601
601
  ...this._getDefaultErrorSettings('findByIdAndUpdate', error, issuer),
602
602
  errorCode: 'NTS-DBS-FIU0',
603
603
  additionalContent: { id, update },
604
- message: `findByIdAndUpdate ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
604
+ message: `findByIdAndUpdate "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
605
605
  issuer,
606
606
  });
607
607
  });
@@ -670,7 +670,7 @@ class DyNTS_DBService {
670
670
  ...this._getDefaultErrorSettings('updateOne', error, issuer),
671
671
  errorCode: 'NTS-DBS-UO0',
672
672
  additionalContent: { filterBy, update },
673
- message: `updateOne ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
673
+ message: `updateOne "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
674
674
  issuer,
675
675
  });
676
676
  });
@@ -736,7 +736,7 @@ class DyNTS_DBService {
736
736
  ...this._getDefaultErrorSettings('updateMany', error, issuer),
737
737
  errorCode: 'NTS-DBS-UM0',
738
738
  additionalContent: { filterBy, update },
739
- message: `updateMany ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
739
+ message: `updateMany "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
740
740
  issuer,
741
741
  });
742
742
  });
package/build/_services/base/db.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"db.service.js","sourceRoot":"","sources":["../../../src/_services/base/db.service.ts"],"names":[],"mappings":";;;;AACA,2DAAqC;AACrC,uCAAkC;AAElC,sDAG+B;AAI/B;;GAEG;AACH,MAAa,eAAe;IAmBjB;IAjBT,WAAW,CAAS;IAEpB,SAAS,CAAA,yBAAyB,CAAC,CAAC,8DAA8D;IAE1F,WAAW,CAAS;IAE5B,mBAAmB,GACjB,wCAAwC;QACxC,oDAAoD,CAAC;IAEvD;;;;;OAKG;IACH,YACS,UAAiC;QAAjC,eAAU,GAAV,UAAU,CAAuB;QAExC,IAAI,CAAC;YACH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC;YAE1C,IAAI,CAAC;gBACH,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC3D,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;YAED,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,OAAO,EACL,wCAAwC,UAAU,CAAC,QAAQ,MAAM,IAAI,CAAC,WAAW,EAAE;gBACrF,SAAS,EAAE,aAAa;gBACxB,KAAK,EAAE,4BAAe,CAAC,QAAQ;gBAC/B,iBAAiB,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;gBAClD,KAAK;aACN,CAAC,CAAC;YACH;;;;;iBAKK;QACP,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAC,IAAO,EAAE,MAAc;QACtC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC1B,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAE/B,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,OAAO,GAAM,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAK,EAAE;YACtD,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO,GAAG,EAAE,QAAQ,EAAO,CAAC;YAE9B,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,YAAY,EACZ,IAAI,KAAK,CACP,2BAA2B,IAAI,CAAC,UAAU,CAAC,MAAM,6BAA6B,CAC/E,EACD,MAAM,CACP;oBAED,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE,aAAa;oBACxB,iBAAiB,EAAE,EAAE,IAAI,EAAE;oBAC3B,MAAM;iBACP,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACvB,IAAI,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,MAAM,KAAK,CAAC;YAEd,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC;oBAE7D,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE,aAAa;oBACxB,iBAAiB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oBACtC,OAAO,EACL,iCAAiC,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;oBACrF,MAAM;iBACP,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAEtD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAC,IAAO,EAAE,MAAc;QACtC,IAAI,CAAC,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAE/B;;;aAGK;QACL,sBAAsB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACzF;;;;;;;;;;;;;;;gBAeI;QACN,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACvB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC;gBAE7D,SAAS,EAAE,aAAa;gBACxB,iBAAiB,EAAE,EAAE,IAAI,EAAE;gBAC3B,OAAO,EAAE,cAAc,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;gBACzE,MAAM;aACP,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,4DAA4D;QAE5D,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW,CAAC,EAAU;QAC1B,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAEtF,SAAS,EAAE,aAAa;gBACxB,OAAO,EAAE,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,kCAAkC;aACzE,CAAC,CAAC;QACL,CAAC;QAED,IAAI,IAAI,GAAM,MAAM,IAAI,CAAC,SAAS;aAC/B,QAAQ,CAAC,EAAE,CAAC;aACZ,IAAI,CAAC,CAAC,GAAG,EAAK,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAO,IAAI,IAAI,CAAC;aAC9C,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,KAAK,CAAC;gBAEtD,SAAS,EAAE,aAAa;gBACxB,iBAAiB,EAAE,EAAE,EAAE,EAAE;gBACzB,OAAO,EAAE,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,kCAAkC;aACzE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAEjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qBAAqB,CAAC,YAAoB;QAC9C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,uBAAuB,EACvB,IAAI,KAAK,CACP,0DAA0D,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI;oBACpF,UAAU,CACX,CACF;gBAED,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,aAAa;aACzB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,IAAI,GAAM,MAAM,IAAI,CAAC,SAAS;aAC/B,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC;aAC7C,IAAI,CAAC,CAAC,GAAG,EAAK,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAO,IAAI,IAAI,CAAC;aAC9C,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,uBAAuB,EAAE,KAAK,CAAC;gBAEhE,SAAS,EAAE,aAAa;gBACxB,iBAAiB,EAAE,EAAE,YAAY,EAAE;gBACnC,OAAO,EACL,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,OAAO,IAAI,CAAC,WAAW,4BAA4B;aACnF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;QAE3D,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,yBAAyB,CAAC,YAAoB;QAClD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,2BAA2B,EAC3B,IAAI,KAAK,CACP,sDAAsD,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI;oBAChF,UAAU,CACX,CACF;gBAED,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,cAAc;gBACzB,iBAAiB,EAAE;oBACjB,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,SAAS;aACvC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC;aAC1C,IAAI,CAAC,CAAC,GAAG,EAAO,EAAE,CAAC,GAAU,IAAI,EAAE,CAAC;aACpC,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,2BAA2B,EAAE,KAAK,CAAC;gBAEpE,SAAS,EAAE,cAAc;gBACzB,iBAAiB,EAAE,EAAE,YAAY,EAAE;gBACnC,OAAO,EACL,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,OAAO,IAAI,CAAC,WAAW,4BAA4B;aACnF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAO,EAAQ,EAAE;YACjC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,2BAA2B,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,0BAA0B,CAAC,aAAuB;QACtD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,4BAA4B,EAC5B,IAAI,KAAK,CACP,+DAA+D;oBAC/D,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,YAAY,CACvC,CACF;gBAED,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,eAAe;aAC3B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,SAAS;aACvC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,EAAC,CAAC;aACnD,IAAI,CAAC,CAAC,GAAG,EAAO,EAAE,CAAC,GAAU,IAAI,EAAE,CAAC;aACpC,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,4BAA4B,EAAE,KAAK,CAAC;gBAErE,SAAS,EAAE,eAAe;gBAC1B,iBAAiB,EAAE,EAAE,aAAa,EAAE;gBACpC,OAAO,EAAE,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,OAAO,IAAI,CAAC,WAAW,4BAA4B;aAC1F,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAO,EAAQ,EAAE;YACjC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,4BAA4B,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAmCI;IAEJ;;;;;OAKG;IACH,KAAK,CAAC,MAAM;QACV,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,SAAS;aACvC,IAAI,CAAC,EAAE,CAAC;aACR,IAAI,CAAC,CAAC,GAAG,EAAO,EAAE,CAAC,GAAU,IAAI,EAAE,CAAC;aACpC,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,KAAK,CAAC;gBAEjD,SAAS,EAAE,aAAa;gBACxB,OAAO,EAAE,WAAW,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;aACvE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAO,EAAQ,EAAE;YACjC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,OAAO,QAAe,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,cAAc,CAAC,EAAU;QAC7B,MAAM,IAAI,CAAC,SAAS;aACjB,iBAAiB,CAAC,EAAE,CAAC;aACrB,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,KAAK,CAAC;gBAEzD,SAAS,EAAE,aAAa;gBACxB,iBAAiB,EAAE,EAAE,EAAE,EAAE;gBACzB,OAAO,EAAE,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;aACtE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,wBAAwB,CAAC,YAAoB;QACjD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,0BAA0B,EAC1B,IAAI,KAAK,CACP,0DAA0D,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI;oBACpF,UAAU,CACX,CACF;gBAED,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,cAAc;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,CAAC,SAAS;aACjB,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC;aAChD,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,0BAA0B,EAAE,KAAK,CAAC;gBAEnE,SAAS,EAAE,cAAc;gBACzB,iBAAiB,EAAE,EAAE,YAAY,EAAE;gBACnC,OAAO,EACL,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,OAAO,IAAI,CAAC,WAAW,4BAA4B;aACtF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,UAAU,CACd,QAA2B,EAC3B,qBAAgC;QAEhC,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,IAAI,CAAC,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC;YACrC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACtB,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,YAAY,EACZ,IAAI,KAAK,CACP,0DAA0D,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI;wBACpF,UAAU,CACX,CACF;oBAED,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE,aAAa;iBACzB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC;QAC5D,CAAC;QAED,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,UAAoC,EAAQ,EAAE;YACtF,IACE,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC;gBAC7E,QAAQ,CAAC,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,EAClC,CAAC;gBACD,IAAI,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBACvE,uDAAuD;oBACvD,IAAI,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;wBACrC,MAAM,0BAA0B,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;wBAEpE,IACE,QAAQ,CAAC,0BAA0B,CAAC,KAAK,IAAI;4BAC7C,QAAQ,CAAC,0BAA0B,CAAC,KAAK,SAAS,EAClD,CAAC;4BACD,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG;gCACvB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,0BAA0B,CAAC,EAAE;gCACpD,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,0BAA0B,CAAC,EAAE;6BACnD,CAAC;wBACJ,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,IACE,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI;4BACjC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,SAAS,EACtC,CAAC;4BACD,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC7D,CAAC;oBACH,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,sBAAsB;oBACtB,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,EAAE,CAAC;wBACvC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC;4BACrF,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;4BAE5B,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;gCAC5C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC;4BACxE,CAAC;4BAED,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC;gCAC1C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;4BACtE,CAAC;wBACH,CAAC;oBACH,CAAC;yBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;wBACvF,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACxC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC7D,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,SAAS;aACvC,IAAI,CAAC,MAAM,CAAC;aACZ,IAAI,CAAC,CAAC,GAAG,EAAO,EAAE,CAAC,GAAU,IAAI,EAAE,CAAC;aACpC,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,YAAY,EAAE,KAAK,CAAC;gBAErD,SAAS,EAAE,aAAa;gBACxB,iBAAiB,EAAE,EAAE,QAAQ,EAAE,qBAAqB,EAAE;gBACtD,OAAO,EAAE,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;aACtE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAO,EAAQ,EAAE;YACjC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,qFAAqF;IACrF,qFAAqF;IACrF,qFAAqF;IACrF,yDAAyD;IAEzD;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,KAAK,CAAC,OAAO,CAAC,QAA2B;QACvC,IAAI,IAAI,GAAM,MAAM,IAAI,CAAC,SAAS;aAC/B,OAAO,CAAC,QAAQ,CAAC;aACjB,IAAI,CAAC,CAAC,GAAG,EAAK,EAAE,CAAC,GAAQ,IAAI,IAAI,CAAC;aAClC,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,SAAS,EAAE,KAAK,CAAC;gBAElD,SAAS,EAAE,aAAa;gBACxB,iBAAiB,EAAE,EAAE,QAAQ,EAAE;gBAC/B,OAAO,EAAE,WAAW,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;aACvE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,KAAK,CAAC,IAAI,CAAC,QAA2B;QACpC,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,SAAS;aACvC,IAAI,CAAC,QAAQ,CAAC;aACd,IAAI,CAAC,CAAC,GAAG,EAAO,EAAE,CAAC,GAAU,IAAI,EAAE,CAAC;aACpC,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC;gBAE/C,SAAS,EAAE,YAAY;gBACvB,iBAAiB,EAAE,EAAE,QAAQ,EAAE;gBAC/B,OAAO,EAAE,QAAQ,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;aACpE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAO,EAAQ,EAAE;YACjC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,OAAO,QAAe,CAAC;IACzB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,KAAK,CAAC,cAAc,CAClB,QAA2B,EAC3B,IAAY,EACZ,QAAgB,EAChB,IAAU;QAEV,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,SAAS;aACvC,IAAI,CAAC,QAAQ,CAAC;aACd,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;aACrB,KAAK,CAAC,QAAQ,CAAC;aACf,IAAI,CAAC,CAAC,GAAG,EAAK,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC;aAC3B,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,KAAK,CAAC;gBAEzD,SAAS,EAAE,aAAa;gBACxB,iBAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;gBACrD,OAAO,EAAE,kBAAkB,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;aAC9E,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAO,EAAQ,EAAE;YACjC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,iBAAiB,CAAC,EAAU,EAAE,MAAyB,EAAE,MAAc;QAC3E,MAAM,CAAC,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC;QACnC,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAEjC,IAAI,OAAO,GAAM,MAAM,IAAI,CAAC,SAAS;aAClC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC;aAC7B,IAAI,CAAC,CAAC,GAAG,EAAK,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAO,IAAI,IAAI,CAAC;aAC9C,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,EAAE,KAAK,EAAE,MAAM,CAAC;gBAEpE,SAAS,EAAE,cAAc;gBACzB,iBAAiB,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;gBACjC,OAAO,EAAE,qBAAqB,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;gBAChF,MAAM;aACP,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAE7D,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmDG;IACH,KAAK,CAAC,SAAS,CACb,QAA2B,EAC3B,MAAyB,EACzB,MAAc;QAEd,MAAM,CAAC,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC;QACnC,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAEjC,MAAM,IAAI,CAAC,SAAS;aACjB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;aAC3B,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC;gBAE5D,SAAS,EAAE,aAAa;gBACxB,iBAAiB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;gBACvC,OAAO,EAAE,aAAa,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;gBACxE,MAAM;aACP,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkDG;IACH,KAAK,CAAC,UAAU,CACd,QAA2B,EAC3B,MAAyB,EACzB,MAAc;QAEd,MAAM,CAAC,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC;QACnC,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAEjC,MAAM,IAAI,CAAC,SAAS;aACjB,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC;aAC5B,KAAK,CAAC,CAAC,KAAK,EAAQ,EAAE;YACrB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC;gBAE7D,SAAS,EAAE,aAAa;gBACxB,iBAAiB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;gBACvC,OAAO,EAAE,cAAc,IAAI,CAAC,UAAU,CAAC,MAAM,4BAA4B;gBACzE,MAAM;aACP,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,qFAAqF;IACrF,qFAAqF;IACrF,qFAAqF;IACrF,oBAAoB;IAEZ,eAAe,CAAC,IAAO,EAAE,MAAc;QAC7C,IAAI,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,EAAE,CAAC;YAChF,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAEzB,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACjE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;gBAExC,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;oBACjE,qBAAQ,CAAC,KAAK,CACZ,wEAAwE;wBACxE,IAAI,MAAM,GAAG,EACb,IAAI,KAAK,EAAE,CACZ,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,wBAAwB,CAC9B,MAAc,EACd,KAAoB,EACpB,MAAe;QAEf,OAAO;YACL,MAAM,EAAG,KAAoB,EAAE,SAAS,IAAI,GAAG;YAC/C,OAAO,EAAG,KAAe,EAAE,OAAO,IAAI,GAAG,MAAM,4BAA4B;YAC3E,cAAc,EAAE,CAAE,KAAoB,EAAE,aAAa;YACrD,WAAW,EAAG,KAAoB,EAAE,aAAa,IAAI,IAAI,CAAC,mBAAmB;YAC7E,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,IAAI,CAAC,WAAW;YAC/B,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;IAED,qFAAqF;IACrF,0BAA0B;IAE1B;;;OAGG;IACK,SAAS;QACf,IAAI,MAAM,GAAQ,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAE1D,MAAM,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;QAE/C,8CAA8C;QAC9C,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAClB,8CAA8C;YAC9C,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QAED,OAAO,IAAI,iBAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACK,gCAAgC,CAAC,MAAmC;QAC1E,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAE7B,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QACtC,CAAC;QAED,MAAM,CAAC,OAAO,CAAC,CAAC,QAAkC,EAAQ,EAAE;YAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE7C,IACE,MAAM,KAAK,MAAM;gBACjB,CAAC,QAAQ,EAAE,eAAe;gBAC1B,QAAQ,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC,EACtC,CAAC;gBACD,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG;oBAChC,IAAI,EAAE,MAAM;iBACb,CAAC;gBAEF,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACnB,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC;gBAC/C,CAAC;gBAED,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACpB,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC;gBAChD,CAAC;gBAED,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;oBACtB,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;gBAClD,CAAC;gBAED,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;oBACvB,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;gBACjE,CAAC;gBAED,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;oBACvB,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;gBACjE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,gCAAgC,CACrE,QAAQ,CAAC,eAAe,CACzB,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,SAAS,CACf,IAAY;QAEZ,QAAQ,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAEjC,KAAK,QAAQ;gBACX,OAAO,MAAM,CAAC;YAEhB,KAAK,QAAQ;gBACX,OAAO,MAAM,CAAC;YAEhB,KAAK,SAAS;gBACZ,OAAO,OAAO,CAAC;YAEjB,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC;YAEd,KAAK,QAAQ;gBACX,OAAO,MAAM,CAAC;YAEhB;gBACE,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;oBAClD,OAAO,KAAK,CAAC;gBACf,CAAC;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC5D,OAAO,QAAQ,CAAC;gBAClB,CAAC;qBAAM,CAAC;oBACN,OAAO,MAAM,CAAC;gBAChB,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,wBAAwB,CAAC,MAAW;QAC1C,MAAM,CAAC,SAAS,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAClC,MAAM,CAAC,WAAW,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QACtC,MAAM,CAAC,cAAc,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACvC,MAAM,CAAC,gBAAgB,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAE3C,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,6BAA6B;QACnC,MAAM,eAAe,GAA6B,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAC/E,CAAC,WAAqC,EAAW,EAAE,CAAC,WAAW,CAAC,gBAAgB,CACjF,CAAC;QAEF,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC;QACzC,CAAC;IACH,CAAC;CACF;AAxhCD,0CAwhCC"}
1
+ {"version":3,"file":"db.service.js","sourceRoot":"","sources":["../../../src/_services/base/db.service.ts"],"names":[],"mappings":"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"}
package/build/_services/base/singleton.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"singleton.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/singleton.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAc,MAAM,uBAAuB,CAAC;AAGvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,0BAA0B;IAEpE,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAEmB;IAEvD,SAAS,CAAC,uBAAuB,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,GACb,mBAAmB;CAYvB"}
1
+ {"version":3,"file":"singleton.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/singleton.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAc,MAAM,uBAAuB,CAAC;AAGvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,0BAA0B;IAEpE,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAEmB;IAEvD,SAAS,CAAC,uBAAuB,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,GACb,mBAAmB;CAavB"}
package/build/_services/base/singleton.service.js CHANGED
@@ -13,6 +13,7 @@ class DyNTS_SingletonService extends singleton_service_base_1.DyNTS_SingletonSer
13
13
  return {
14
14
  status: error?.___status ?? 500,
15
15
  message: error?.message ??
16
+ error?._message ??
16
17
  `${fnName} was UNSUCCESSFUL (${global_settings_const_1.DyNTS_global_settings.systemShortCodeName})`,
17
18
  addECToUserMsg: !error?.__userMessage,
18
19
  userMessage: error?.__userMessage ?? this.defaultErrorUserMsg,
package/build/_services/base/singleton.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"singleton.service.js","sourceRoot":"","sources":["../../../src/_services/base/singleton.service.ts"],"names":[],"mappings":";;;AAEA,oFAAiF;AACjF,qEAAsE;AAEtE;;GAEG;AACH,MAAa,sBAAuB,SAAQ,mDAA0B;IAE3D,mBAAmB,GAC1B,qDAAqD;QACrD,oDAAoD,CAAC;IAE7C,uBAAuB,CAC/B,MAAc,EACd,KAAoB,EACpB,MAAc;QAEd,OAAO;YACL,MAAM,EAAG,KAAoB,EAAE,SAAS,IAAI,GAAG;YAC/C,OAAO,EAAG,KAAe,EAAE,OAAO;gBAChC,GAAG,MAAM,sBAAsB,6CAAqB,CAAC,mBAAmB,GAAG;YAC7E,cAAc,EAAE,CAAE,KAAoB,EAAE,aAAa;YACrD,WAAW,EAAG,KAAoB,EAAE,aAAa,IAAI,IAAI,CAAC,mBAAmB;YAC7E,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI;YACrC,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;CACF;AAtBD,wDAsBC"}
1
+ {"version":3,"file":"singleton.service.js","sourceRoot":"","sources":["../../../src/_services/base/singleton.service.ts"],"names":[],"mappings":";;;AAEA,oFAAiF;AACjF,qEAAsE;AAEtE;;GAEG;AACH,MAAa,sBAAuB,SAAQ,mDAA0B;IAE3D,mBAAmB,GAC1B,qDAAqD;QACrD,oDAAoD,CAAC;IAE7C,uBAAuB,CAC/B,MAAc,EACd,KAAoB,EACpB,MAAc;QAEd,OAAO;YACL,MAAM,EAAG,KAAoB,EAAE,SAAS,IAAI,GAAG;YAC/C,OAAO,EAAG,KAAe,EAAE,OAAO;gBAC/B,KAAoB,EAAE,QAAQ;gBAC/B,GAAG,MAAM,sBAAsB,6CAAqB,CAAC,mBAAmB,GAAG;YAC7E,cAAc,EAAE,CAAE,KAAoB,EAAE,aAAa;YACrD,WAAW,EAAG,KAAoB,EAAE,aAAa,IAAI,IAAI,CAAC,mBAAmB;YAC7E,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI;YACrC,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;CACF;AAvBD,wDAuBC"}
package/build/_services/core/global.service.js CHANGED
@@ -124,9 +124,9 @@ class DyNTS_GlobalService extends singleton_service_1.DyNTS_SingletonService {
124
124
  fsm_dynamo_1.DyFM_Log.warn(`globalErrorHandler not set! (set in app.getGlobalServiceCollection)`, '\nwill use default-logging');
125
125
  if (global_settings_const_1.DyNTS_global_settings.log_settings.highDetailedLogs ||
126
126
  !(error instanceof fsm_dynamo_1.DyFM_Error)) {
127
- fsm_dynamo_1.DyFM_Log.H_error(`Error caught by globalErrorHandler.`, `\n ERROR:`, error);
127
+ fsm_dynamo_1.DyFM_Log.H_error(`Error caught by globalErrorHandler.`, `\n ERROR:`, error?.replaceAll?.('at', ' at') ?? error);
128
128
  }
129
- else {
129
+ else /* if (!error.___logged) */ {
130
130
  error.logSimple(`Error caught by globalErrorHandler.`);
131
131
  }
132
132
  }
package/build/_services/core/global.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"global.service.js","sourceRoot":"","sources":["../../../src/_services/core/global.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"global.service.js","sourceRoot":"","sources":["../../../src/_services/core/global.service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@futdevpro/nts-dynamo",
3
- "version": "01.09.35",
3
+ "version": "01.09.37",
4
4
  "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
5
5
  "scripts": {
6
6
  "prep": "npm i rimraf nodemon -g",
package/src/_models/control-models/endpoint-params.control-model.ts CHANGED
@@ -168,15 +168,13 @@ export class DyNTS_Endpoint_Params {
168
168
  }
169
169
 
170
170
  private getStackLocation(): string {
171
- return new Error().stack;
172
- /* DyFM_Log.info(`\nTRYING TO FIND STACK LOCATION FOR: ${this.name}`); */
173
- /* DyFM_Log.info(`\n..."${this.stack}"`); */
174
-
175
- /* this.stack = this.stack?.split('\n').filter(
176
- (line: string): boolean => !line.includes('node_modules')
177
- ).join('\n');
178
- this.stack = this.stack.replace(' at ', ''); */
179
- /* DyFM_Log.H_info(`\n stack location: "${this.stack}"`); */
171
+ let stack: string = new Error().stack;
172
+
173
+ stack = stack?.split('\n')?.[3]?.replace(' at ', '');
174
+ stack = stack?.replace('.setupEndpoints (', ': ');
175
+ stack = stack?.replace(')', '');
176
+
177
+ return stack;
180
178
  }
181
179
 
182
180
  /**
@@ -195,8 +193,7 @@ export class DyNTS_Endpoint_Params {
195
193
  }
196
194
 
197
195
  if (DyNTS_global_settings.log_settings.requestStackLocation) {
198
- /* this.logStackLocation(); */
199
- DyFM_Log.H_info(`\n stack location: "${this.stack}"`);
196
+ DyFM_Log.info(` endpoint location: "${this.stack}"`);
200
197
  }
201
198
 
202
199
  await DyFM_Array.asyncForEach(this.preProcesses,
@@ -242,6 +239,7 @@ export class DyNTS_Endpoint_Params {
242
239
  let msg: string = `Endpoint caught an error. '${this.name}' (${this.endpoint})`;
243
240
 
244
241
  msg += this.getPathParamsLogContent(req);
242
+ msg += '\n at ' + this.stack;
245
243
 
246
244
  DyFM_Log.error(msg);
247
245
 
@@ -284,6 +282,14 @@ export class DyNTS_Endpoint_Params {
284
282
  delete (error as DyFM_Error).confidentialContent;
285
283
  }
286
284
 
285
+ try {
286
+ JSON.stringify(error);
287
+ } catch (error) {
288
+ DyFM_Log.H_error(
289
+ 'DyNTS_Endpoint_Params: error object is not serializable!', error
290
+ );
291
+ }
292
+
287
293
  res.status((error as DyFM_Error)?.___status ?? 501);
288
294
  res.send(error);
289
295
 
package/src/_modules/usage/usage.controller.ts CHANGED
@@ -34,7 +34,13 @@ export class DyNTS_Usage_Controller extends DyNTS_Controller {
34
34
  endpoint: DyFM_usageModule_settings.endPoints.newSession,
35
35
  tasks: [
36
36
  async (req: Request, res: Response, issuer: string): Promise<void> => {
37
- const username = this.authService.getUsernameFromRequest(req);
37
+ let username: string;
38
+
39
+ try {
40
+ username = this.authService.getUsernameFromRequest(req);
41
+ } catch {
42
+ username = 'unknown';
43
+ }
38
44
  const usageService = new DyNTS_Usage_DataService({
39
45
  usageSession: new DyFM_UsageSession({
40
46
  sessionStart: new Date(),
package/src/_services/base/data.service.ts CHANGED
@@ -79,8 +79,8 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
79
79
  } catch (error) {
80
80
  throw new DyFM_Error({
81
81
  ...this._getDefaultErrorSettings('constructor', error),
82
- message: `The dataService construction failed for ${dataParams?.dataName}. ` +
83
- `${this.serviceName} (${this.constructor.name})` +
82
+ message: `The dataService construction failed for "${dataParams?.dataName}". ` +
83
+ `at "${this.serviceName}" (${this.constructor.name})` +
84
84
  `\nMaybe you forgot to add the dbService to the GlobalService?\n\n`,
85
85
  level: DyFM_ErrorLevel.critical,
86
86
 
@@ -104,7 +104,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
104
104
  try {
105
105
  const dataListExists: T[] = await this.dataDBService.getAll().catch((error): T[] => {
106
106
  if (error?.errorCode === 'NTS-DBS-GA1') {
107
- DyFM_Log.warn(`getAll ${this.dataParams.dataName} didn't found any.`);
107
+ DyFM_Log.warn(`getAll "${this.dataParams.dataName}" didn't found any.`);
108
108
 
109
109
  return [];
110
110
  } else {
@@ -237,7 +237,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
237
237
  ...this._getDefaultErrorSettings(
238
238
  'getDataByDependencyId',
239
239
  new Error(
240
- `getDataByDependencyId failed, ${this.depKey} is missing! ` +
240
+ `getDataByDependencyId failed, "${this.depKey}" is missing! ` +
241
241
  `(${this.dataParams.dataName})`
242
242
  )
243
243
  ),
@@ -251,7 +251,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
251
251
  ).catch((error): null => {
252
252
  if (error?.errorCode === 'NTS-DBS-GD2') {
253
253
  DyFM_Log.warn(
254
- `getDataByDependencyId failed; ${this.dataParams.dataName} ` +
254
+ `getDataByDependencyId failed; "${this.dataParams.dataName}" ` +
255
255
  `(${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`
256
256
  );
257
257
 
@@ -361,7 +361,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
361
361
  ...this._getDefaultErrorSettings(
362
362
  'getDataListByDependencyId',
363
363
  new Error(
364
- `getDataListByDependencyId failed, ${this.depKey} is missing! ` +
364
+ `getDataListByDependencyId failed, "${this.depKey}" is missing! ` +
365
365
  `(${this.dataParams.dataName})`
366
366
  )
367
367
  ),
@@ -375,8 +375,8 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
375
375
  ).catch((error): T[] => {
376
376
  if (error?.errorCode === 'NTS-DBS-GLD2') {
377
377
  DyFM_Log.warn(
378
- `getDataListByDependencyId ${this.dataParams.dataName} ` +
379
- `(${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`
378
+ `getDataListByDependencyId "${this.dataParams.dataName}" ` +
379
+ `(${this.depKey}: "${dependencyId ?? this.data[this.depKey]}") didn't found any.`
380
380
  );
381
381
 
382
382
  return [];
@@ -438,7 +438,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
438
438
  try {
439
439
  const dataExists: T = await this.dataDBService.findOne(filterBy).catch((error): null => {
440
440
  if (error?.errorCode === 'NTS-DBS-FO1') {
441
- DyFM_Log.warn(`findData ${this.dataParams.dataName} didn't found any.`);
441
+ DyFM_Log.warn(`findData "${this.dataParams.dataName}" didn't found any.`);
442
442
 
443
443
  return null;
444
444
  } else {
@@ -494,7 +494,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
494
494
  try {
495
495
  const dataListExists: T[] = await this.dataDBService.find(filterBy).catch((error): T[] => {
496
496
  if (error?.errorCode === 'NTS-DBS-F1') {
497
- DyFM_Log.warn(`findDataList ${this.dataParams.dataName} didn't found any.`);
497
+ DyFM_Log.warn(`findDataList "${this.dataParams.dataName}" didn't found any.`);
498
498
 
499
499
  return [];
500
500
  } else {
@@ -733,7 +733,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
733
733
  'saveData',
734
734
  new Error(
735
735
  `saveData was unsuccessful: dependency data not exists ` +
736
- `(key: ${this.depKey}, id: ${data[this.depKey]}, ` +
736
+ `(key: ${this.depKey}, id: "${data[this.depKey]}", ` +
737
737
  `${this.dataParams.dataName})`
738
738
  )
739
739
  ),
@@ -825,7 +825,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
825
825
  ...this._getDefaultErrorSettings(
826
826
  'validateForSave',
827
827
  new Error(
828
- `validateForSave failed, ${element.key} is missing! ` +
828
+ `validateForSave failed, "${element.key}" is missing! ` +
829
829
  `(${this.dataParams.dataName})`
830
830
  )
831
831
  ),
@@ -844,7 +844,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
844
844
  ...this._getDefaultErrorSettings(
845
845
  'validateForSave',
846
846
  new Error(
847
- `validateForSave failed, ${element.key} is not a date! ` +
847
+ `validateForSave failed, "${element.key}" is not a date! ` +
848
848
  `(${this.dataParams.dataName})`
849
849
  )
850
850
  ),
@@ -914,11 +914,11 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
914
914
  'getDependencyDataDBService',
915
915
  new Error(
916
916
  `getDependencyDataDBService was unsuccessful, service key not setted up! ` +
917
- `(${this.dataParams.dataName}))`
917
+ `(${this.dataParams.dataName})`
918
918
  )
919
919
  ),
920
920
 
921
- status: 501,
921
+ status: 500,
922
922
  errorCode: 'NTS-DS0-GDDB0',
923
923
  });
924
924
  }
@@ -938,8 +938,8 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
938
938
  ): DyFM_Error_Settings {
939
939
  return {
940
940
  status: (error as DyFM_Error)?.___status ?? 500,
941
- message:
942
- (error as Error)?.message ??
941
+ message: (error as Error)?.message ??
942
+ (error as DyFM_Error)?._message ??
943
943
  `${fnName} was UNSUCCESSFUL (NTS; ${this.dataParams.dataName})`,
944
944
  addECToUserMsg: !(error as DyFM_Error)?.__userMessage,
945
945
  userMessage: (error as DyFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,
@@ -956,6 +956,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
956
956
  return {
957
957
  status: (error as DyFM_Error)?.___status ?? 500,
958
958
  message: (error as Error)?.message ??
959
+ (error as DyFM_Error)?._message ??
959
960
  `${fnName} was UNSUCCESSFUL (${DyNTS_global_settings.systemShortCodeName})`,
960
961
  addECToUserMsg: !(error as DyFM_Error)?.__userMessage,
961
962
  userMessage: (error as DyFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,
package/src/_services/base/db.service.ts CHANGED
@@ -86,7 +86,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
86
86
  ...this._getDefaultErrorSettings(
87
87
  'createData',
88
88
  new Error(
89
- `createData failed, save ${this.dataParams.dbName} result not found! (NTS DB)`
89
+ `createData failed, save "${this.dataParams.dbName}" result not found! (NTS DB)`
90
90
  ),
91
91
  issuer
92
92
  ),
@@ -109,7 +109,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
109
109
  errorCode: 'NTS-DBS-CD0',
110
110
  additionalContent: { data, dataModel },
111
111
  message:
112
- `createData failed, Create new ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
112
+ `createData failed, Create new "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
113
113
  issuer,
114
114
  });
115
115
  }
@@ -140,7 +140,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
140
140
  throw new DyFM_Error({
141
141
  ...this._getDefaultErrorSettings(
142
142
  'modifyData',
143
- new Error(`modifyData failed, modify ${this.dataParams.dbName} result not found! (NTS DB)`),
143
+ new Error(`modifyData failed, modify "${this.dataParams.dbName}" result not found! (NTS DB)`),
144
144
  issuer,
145
145
  ),
146
146
 
@@ -156,7 +156,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
156
156
 
157
157
  errorCode: 'NTS-DBS-FU0',
158
158
  additionalContent: { data },
159
- message: `modifyData ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
159
+ message: `modifyData "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
160
160
  issuer,
161
161
  });
162
162
  });
@@ -177,7 +177,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
177
177
  ...this._getDefaultErrorSettings('getDataById', new Error(`No ID provided! (NTS DB)`)),
178
178
 
179
179
  errorCode: 'NTS-DBS-GI1',
180
- message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)`,
180
+ message: `get "${this.dataParams.dbName}" by ID was unsuccessful (NTS DB)`,
181
181
  });
182
182
  }
183
183
 
@@ -190,7 +190,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
190
190
 
191
191
  errorCode: 'NTS-DBS-GI0',
192
192
  additionalContent: { id },
193
- message: `get ${this.dataParams.dbName} by ID was unsuccessful (NTS DB)`,
193
+ message: `get "${this.dataParams.dbName}" by ID was unsuccessful (NTS DB)`,
194
194
  });
195
195
  });
196
196
 
@@ -217,7 +217,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
217
217
  )
218
218
  ),
219
219
 
220
- status: 501,
220
+ status: 500,
221
221
  errorCode: 'NTS-DBS-GD0',
222
222
  });
223
223
  }
@@ -232,7 +232,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
232
232
  errorCode: 'NTS-DBS-GD1',
233
233
  additionalContent: { dependencyId },
234
234
  message:
235
- `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
235
+ `get "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
236
236
  });
237
237
  });
238
238
 
@@ -259,7 +259,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
259
259
  )
260
260
  ),
261
261
 
262
- status: 501,
262
+ status: 500,
263
263
  errorCode: 'NTS-DBS-GLD0',
264
264
  additionalContent: {
265
265
  dataModel: this.dataModel,
@@ -277,7 +277,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
277
277
  errorCode: 'NTS-DBS-GLD1',
278
278
  additionalContent: { dependencyId },
279
279
  message:
280
- `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
280
+ `get "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
281
281
  });
282
282
  });
283
283
 
@@ -306,7 +306,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
306
306
  )
307
307
  ),
308
308
 
309
- status: 501,
309
+ status: 500,
310
310
  errorCode: 'NTS-DBS-GLDS0',
311
311
  });
312
312
  }
@@ -320,7 +320,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
320
320
 
321
321
  errorCode: 'NTS-DBS-GLDS1',
322
322
  additionalContent: { dependencyIds },
323
- message: `get ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
323
+ message: `get "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
324
324
  });
325
325
  });
326
326
 
@@ -342,7 +342,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
342
342
  )
343
343
  ),
344
344
 
345
- status: 501,
345
+ status: 500,
346
346
  errorCode: 'NTS-DBS-GLDS0',
347
347
  });
348
348
  }
@@ -383,7 +383,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
383
383
  ...this._getDefaultErrorSettings('getAll', error),
384
384
 
385
385
  errorCode: 'NTS-DBS-GA0',
386
- message: `get all ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
386
+ message: `get all "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
387
387
  });
388
388
  });
389
389
 
@@ -407,7 +407,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
407
407
 
408
408
  errorCode: 'NTS-DBS-DD0',
409
409
  additionalContent: { id },
410
- message: `delete ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
410
+ message: `delete "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
411
411
  });
412
412
  });
413
413
  }
@@ -427,7 +427,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
427
427
  )
428
428
  ),
429
429
 
430
- status: 501,
430
+ status: 500,
431
431
  errorCode: 'NTS-DBS-DDD0',
432
432
  });
433
433
  }
@@ -441,7 +441,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
441
441
  errorCode: 'NTS-DBS-DDD1',
442
442
  additionalContent: { dependencyId },
443
443
  message:
444
- `delete ${this.dataParams.dbName} by ${this.depDataName} was unsuccessful (NTS DB)`,
444
+ `delete "${this.dataParams.dbName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
445
445
  });
446
446
  });
447
447
  }
@@ -471,7 +471,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
471
471
  )
472
472
  ),
473
473
 
474
- status: 501,
474
+ status: 500,
475
475
  errorCode: 'NTS-DBS-SD0',
476
476
  });
477
477
  }
@@ -538,7 +538,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
538
538
 
539
539
  errorCode: 'NTS-DBS-SD1',
540
540
  additionalContent: { filterBy, narrowByDependencyIds },
541
- message: `search ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
541
+ message: `search "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
542
542
  });
543
543
  });
544
544
 
@@ -590,7 +590,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
590
590
 
591
591
  errorCode: 'NTS-DBS-FO0',
592
592
  additionalContent: { filterBy },
593
- message: `findOne ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
593
+ message: `findOne "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
594
594
  });
595
595
  });
596
596
 
@@ -636,7 +636,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
636
636
 
637
637
  errorCode: 'NTS-DBS-F0',
638
638
  additionalContent: { filterBy },
639
- message: `find ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
639
+ message: `find "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
640
640
  });
641
641
  });
642
642
 
@@ -698,7 +698,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
698
698
 
699
699
  errorCode: 'NTS-DBS-WP0',
700
700
  additionalContent: { filterBy, page, pageSize, sort },
701
- message: `findWithPaging ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
701
+ message: `findWithPaging "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
702
702
  });
703
703
  });
704
704
 
@@ -731,7 +731,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
731
731
 
732
732
  errorCode: 'NTS-DBS-FIU0',
733
733
  additionalContent: { id, update },
734
- message: `findByIdAndUpdate ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
734
+ message: `findByIdAndUpdate "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
735
735
  issuer,
736
736
  });
737
737
  });
@@ -809,7 +809,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
809
809
 
810
810
  errorCode: 'NTS-DBS-UO0',
811
811
  additionalContent: { filterBy, update },
812
- message: `updateOne ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
812
+ message: `updateOne "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
813
813
  issuer,
814
814
  });
815
815
  });
@@ -882,7 +882,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
882
882
 
883
883
  errorCode: 'NTS-DBS-UM0',
884
884
  additionalContent: { filterBy, update },
885
- message: `updateMany ${this.dataParams.dbName} was unsuccessful (NTS DB)`,
885
+ message: `updateMany "${this.dataParams.dbName}" was unsuccessful (NTS DB)`,
886
886
  issuer,
887
887
  });
888
888
  });
package/src/_services/base/singleton.service.ts CHANGED
@@ -20,6 +20,7 @@ export class DyNTS_SingletonService extends DyNTS_SingletonServiceBase {
20
20
  return {
21
21
  status: (error as DyFM_Error)?.___status ?? 500,
22
22
  message: (error as Error)?.message ??
23
+ (error as DyFM_Error)?._message ??
23
24
  `${fnName} was UNSUCCESSFUL (${DyNTS_global_settings.systemShortCodeName})`,
24
25
  addECToUserMsg: !(error as DyFM_Error)?.__userMessage,
25
26
  userMessage: (error as DyFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,
package/src/_services/core/global.service.ts CHANGED
@@ -179,9 +179,9 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
179
179
  ) {
180
180
  DyFM_Log.H_error(
181
181
  `Error caught by globalErrorHandler.`,
182
- `\n ERROR:`, error
182
+ `\n ERROR:`, error?.replaceAll?.('at', ' at') ?? error
183
183
  );
184
- } else {
184
+ } else /* if (!error.___logged) */ {
185
185
  error.logSimple(
186
186
  `Error caught by globalErrorHandler.`
187
187
  );