@futdevpro/fsm-dynamo 1.10.15 → 1.10.16

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 (55) hide show
  1. package/.github/workflows/main.yml +1 -2
  2. package/build/_collections/utils/stack.util.d.ts +7 -0
  3. package/build/_collections/utils/stack.util.d.ts.map +1 -0
  4. package/build/_collections/utils/stack.util.js +31 -0
  5. package/build/_collections/utils/stack.util.js.map +1 -0
  6. package/build/_models/control-models/data-model-params.control-model.d.ts.map +1 -1
  7. package/build/_models/control-models/data-model-params.control-model.js +29 -15
  8. package/build/_models/control-models/data-model-params.control-model.js.map +1 -1
  9. package/build/_models/control-models/data-model-params.control-model.spec.js +3 -3
  10. package/build/_models/control-models/data-model-params.control-model.spec.js.map +1 -1
  11. package/build/_models/control-models/data-property-params.control-model.d.ts +1 -2
  12. package/build/_models/control-models/data-property-params.control-model.d.ts.map +1 -1
  13. package/build/_models/control-models/data-property-params.control-model.js +14 -8
  14. package/build/_models/control-models/data-property-params.control-model.js.map +1 -1
  15. package/build/_models/control-models/data-property-params.control-model.spec.js +3 -16
  16. package/build/_models/control-models/data-property-params.control-model.spec.js.map +1 -1
  17. package/build/_models/control-models/poll.control-model.d.ts +25 -16
  18. package/build/_models/control-models/poll.control-model.d.ts.map +1 -1
  19. package/build/_models/control-models/poll.control-model.js +40 -14
  20. package/build/_models/control-models/poll.control-model.js.map +1 -1
  21. package/build/_modules/socket/_models/sck-client-params.control-model.d.ts.map +1 -1
  22. package/build/_modules/socket/_models/sck-client-params.control-model.js +6 -2
  23. package/build/_modules/socket/_models/sck-client-params.control-model.js.map +1 -1
  24. package/build/_modules/socket/_models/sck-client-params.control-model.spec.js +1 -1
  25. package/build/_modules/socket/_models/sck-socket-event.control-model.d.ts +1 -0
  26. package/build/_modules/socket/_models/sck-socket-event.control-model.d.ts.map +1 -1
  27. package/build/_modules/socket/_models/sck-socket-event.control-model.js +3 -0
  28. package/build/_modules/socket/_models/sck-socket-event.control-model.js.map +1 -1
  29. package/build/_modules/socket/_services/sck-client.service-base.d.ts +1 -0
  30. package/build/_modules/socket/_services/sck-client.service-base.d.ts.map +1 -1
  31. package/build/_modules/socket/_services/sck-client.service-base.js +26 -5
  32. package/build/_modules/socket/_services/sck-client.service-base.js.map +1 -1
  33. package/build/_modules/test/_collections/tst-module-settings.const.d.ts +14 -8
  34. package/build/_modules/test/_collections/tst-module-settings.const.d.ts.map +1 -1
  35. package/build/_modules/test/_collections/tst-module-settings.const.js +11 -8
  36. package/build/_modules/test/_collections/tst-module-settings.const.js.map +1 -1
  37. package/build/index.d.ts +2 -0
  38. package/build/index.d.ts.map +1 -1
  39. package/build/index.js +2 -0
  40. package/build/index.js.map +1 -1
  41. package/futdevpro-fsm-dynamo-01.10.16.tgz +0 -0
  42. package/package.json +1 -1
  43. package/src/_collections/utils/stack.util.ts +33 -0
  44. package/src/_models/control-models/data-model-params.control-model.spec.ts +3 -4
  45. package/src/_models/control-models/data-model-params.control-model.ts +21 -5
  46. package/src/_models/control-models/data-property-params.control-model.spec.ts +3 -23
  47. package/src/_models/control-models/data-property-params.control-model.ts +22 -13
  48. package/src/_models/control-models/poll.control-model.ts +47 -29
  49. package/src/_modules/socket/_models/sck-client-params.control-model.spec.ts +1 -1
  50. package/src/_modules/socket/_models/sck-client-params.control-model.ts +13 -2
  51. package/src/_modules/socket/_models/sck-socket-event.control-model.ts +5 -0
  52. package/src/_modules/socket/_services/sck-client.service-base.ts +29 -5
  53. package/src/_modules/test/_collections/tst-module-settings.const.ts +15 -9
  54. package/src/index.ts +2 -0
  55. package/futdevpro-fsm-dynamo-01.10.15.tgz +0 -0
@@ -1,5 +1,3 @@
1
-
2
-
3
1
  name: Test and Deploy
4
2
  on:
5
3
  push:
@@ -33,6 +31,7 @@ jobs:
33
31
  args: ":brick: Dynamo-FSM event: ${{ github.event_name }}\n\
34
32
  - :bust_in_silhouette: Author: ${{ github.actor }}\n\
35
33
  - :memo: Commit Message: ${{ github.event.head_commit.message }}\n\
34
+ - :tanabata_tree: Branch: ${{ github.ref_name }}\n\
36
35
  - :checkered_flag: [Test and other processes are starting now... :link:](
37
36
  https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})\n\
38
37
  :brick: (${{ github.run_number }})"
@@ -0,0 +1,7 @@
1
+ /**
2
+ * Get the stack location of the constructor call
3
+ * use it in the constructor of a class to get the stack location of the constructor call
4
+ * @returns The stack location of the constructor call
5
+ */
6
+ export declare function DyFM_getStackLocation(): string;
7
+ //# sourceMappingURL=stack.util.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"stack.util.d.ts","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAyB9C"}
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.DyFM_getStackLocation = void 0;
4
+ const log_util_1 = require("./log.util");
5
+ /**
6
+ * Get the stack location of the constructor call
7
+ * use it in the constructor of a class to get the stack location of the constructor call
8
+ * @returns The stack location of the constructor call
9
+ */
10
+ function DyFM_getStackLocation() {
11
+ let stack = new Error().stack;
12
+ // Split the stack into lines and remove the first line (Error:)
13
+ const stackLines = stack?.split('\n')?.slice(1);
14
+ // Find the line that contains the constructor call
15
+ // It will be the FIRST line that doesn't contain 'getStackLocation'
16
+ let constructorLine = stackLines?.find(line => !line.includes('getStackLocation') &&
17
+ !line.includes('at new'));
18
+ if (!constructorLine) {
19
+ log_util_1.DyFM_Log.warn('No constructor line found');
20
+ return '';
21
+ }
22
+ // Remove the 'constructorLine at ... (' and the ')'
23
+ constructorLine = constructorLine.split('(')[1]?.split(')')[0];
24
+ if (!constructorLine) {
25
+ log_util_1.DyFM_Log.warn('No constructor line found');
26
+ return '';
27
+ }
28
+ return constructorLine;
29
+ }
30
+ exports.DyFM_getStackLocation = DyFM_getStackLocation;
31
+ //# sourceMappingURL=stack.util.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"stack.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC;;;;GAIG;AACH,SAAgB,qBAAqB;IACnC,IAAI,KAAK,GAAW,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC;IAEtC,gEAAgE;IAChE,MAAM,UAAU,GAAG,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAEhD,mDAAmD;IACnD,oEAAoE;IACpE,IAAI,eAAe,GAAG,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAC5C,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QAClC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACzB,CAAC;IACF,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,mBAAQ,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,wDAAwD;IACxD,eAAe,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,mBAAQ,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAzBD,sDAyBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"data-model-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErG,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAAC;AACxD,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAAC;AAC/D,qBAAa,uBAAuB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,aAAa;IACjF,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC;CACpC;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;AACtD,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAC3D,qBAAa,qBAAqB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,uBAAuB,CAAC,CAAC,CAAC;gBAK1F,GAAG,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAsDjC,WAAW,CAAC,IAAI,OAAO;IAIvB,yBAAyB,CAAC,CAAC,QAAQ,EAAE,wBAAwB,CAAC,GAAG,CAAC,GAAG,IAAI;CAkB1E"}
1
+ {"version":3,"file":"data-model-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAErG,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAAC;AACxD,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,uBAAuB,CAAC,CAAC,CAAC,CAAC;AAC/D,qBAAa,uBAAuB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,aAAa;IACjF,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC;CACpC;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;AACtD,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAC3D,qBAAa,qBAAqB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,uBAAuB,CAAC,CAAC,CAAC;gBAK1F,GAAG,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAuEjC,WAAW,CAAC,IAAI,OAAO;IAIvB,yBAAyB,CAAC,CAAC,QAAQ,EAAE,wBAAwB,CAAC,GAAG,CAAC,GAAG,IAAI;CAkB1E"}
@@ -21,13 +21,13 @@ class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
21
21
  }
22
22
  if (!this.properties || typeof this.properties !== 'object') {
23
23
  log_util_1.DyFM_Log.error('DyFM_DataModel_Params.constructor: ' +
24
- 'Properties are missing in ' + this.dataName + ' model.');
24
+ `Properties are missing in "${this.dataName}" model.`);
25
25
  this.properties = {};
26
26
  }
27
27
  Object.keys(this.properties).forEach((key) => {
28
28
  if (!key) {
29
29
  log_util_1.DyFM_Log.error('DyFM_DataModel_Params.constructor: ' +
30
- 'A property key is missing in ' + this.dataName + ' model.');
30
+ `A property key is missing in "${this.dataName}" model.`);
31
31
  }
32
32
  this.properties[key].key = key;
33
33
  if (this.properties[key].subObjectParams) {
@@ -37,18 +37,32 @@ class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
37
37
  if (!this?.modelType || this?.modelType == data_model_type_enum_1.DyFM_DataModel_Type.data) {
38
38
  this.modelType = data_model_type_enum_1.DyFM_DataModel_Type.data;
39
39
  }
40
- if (!this.dbName && this?.modelType == data_model_type_enum_1.DyFM_DataModel_Type.data) {
41
- // upper case first letter
42
- this.dbName = this.dataName.charAt(0).toUpperCase() + this.dataName.slice(1);
43
- this.dbName.split('').forEach((char, index) => {
44
- if (index > 0 &&
45
- this.dbName[index - 1] === '_' &&
46
- char === char.toUpperCase()) {
47
- this.dbName = this.dbName.slice(0, index) +
48
- char.toLowerCase() +
49
- this.dbName.slice(index + 1);
50
- }
51
- });
40
+ /* if (!this.dbName && this?.modelType == DyFM_DataModel_Type.data) {
41
+ // upper case first letter
42
+ this.dbName = this.dataName.charAt(0).toUpperCase() + this.dataName.slice(1);
43
+
44
+ this.dbName.split('').forEach((char: string, index: number): void => {
45
+ if (
46
+ index > 0 &&
47
+ this.dbName[index - 1] === '_' &&
48
+ char === char.toUpperCase()
49
+ ) {
50
+ this.dbName = this.dbName.slice(0, index) +
51
+ char.toLowerCase() +
52
+ this.dbName.slice(index + 1);
53
+ }
54
+ });
55
+ } */
56
+ // check for any Uppercase letters in dbName
57
+ if (RegExp(/[A-Z]/).exec(this.dataName)) {
58
+ log_util_1.DyFM_Log.warn('DyFM_DataModel_Params.constructor: ' +
59
+ `dbName should be in snake_case in "${this.dataName}" model.` +
60
+ 'For future compatibility.');
61
+ }
62
+ if (this.dataName.includes('-')) {
63
+ log_util_1.DyFM_Log.warn('DyFM_DataModel_Params.constructor: ' +
64
+ `dataName should be in snake_case in "${this.dataName}" model.` +
65
+ 'For future compatibility.');
52
66
  }
53
67
  }
54
68
  constructed() {
@@ -59,7 +73,7 @@ class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
59
73
  Object.keys(property.subObjectParams).forEach((key) => {
60
74
  if (!key) {
61
75
  log_util_1.DyFM_Log.error('DyFM_DataModel_Params.setKeysForSubObjectParams: ' +
62
- 'A subObjectParams key is missing in ' + this.dataName + ' model.');
76
+ `A subObjectParams key is missing in "${this.dataName}" model.`);
63
77
  }
64
78
  property.subObjectParams[key].key = key;
65
79
  if (property.subObjectParams[key].subObjectParams) {
@@ -1 +1 @@
1
- {"version":3,"file":"data-model-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-model-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"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"}
@@ -23,14 +23,14 @@ describe('DyFM_DataModel_Params', () => {
23
23
  spyOn(log_util_1.DyFM_Log, 'error');
24
24
  mockSettings.properties = null;
25
25
  const params = new data_model_params_control_model_1.DyFM_DataModel_Params(mockSettings);
26
- expect(log_util_1.DyFM_Log.error).toHaveBeenCalledWith('DyFM_DataModel_Params.constructor: Properties are missing in testModel model.');
26
+ expect(log_util_1.DyFM_Log.error).toHaveBeenCalledWith('DyFM_DataModel_Params.constructor: Properties are missing in "testModel" model.');
27
27
  expect(params.properties).toEqual({});
28
28
  });
29
29
  it('should log an error if a property key is missing', () => {
30
30
  spyOn(log_util_1.DyFM_Log, 'error');
31
31
  mockSettings.properties = { '': { key: '' } };
32
32
  new data_model_params_control_model_1.DyFM_DataModel_Params(mockSettings);
33
- expect(log_util_1.DyFM_Log.error).toHaveBeenCalledWith('DyFM_DataModel_Params.constructor: A property key is missing in testModel model.');
33
+ expect(log_util_1.DyFM_Log.error).toHaveBeenCalledWith('DyFM_DataModel_Params.constructor: A property key is missing in "testModel" model.');
34
34
  });
35
35
  it('should set modelType to data if not provided or is data', () => {
36
36
  const params = new data_model_params_control_model_1.DyFM_DataModel_Params(mockSettings);
@@ -38,7 +38,7 @@ describe('DyFM_DataModel_Params', () => {
38
38
  });
39
39
  it('should set dbName based on dataName if not provided', () => {
40
40
  const params = new data_model_params_control_model_1.DyFM_DataModel_Params(mockSettings);
41
- expect(params.dbName).toBe('TestModel');
41
+ expect(params.dbName).toBeUndefined();
42
42
  });
43
43
  xit('should convert dbName to camelCase if it contains underscores', () => {
44
44
  mockSettings.dataName = 'test_model';
@@ -1 +1 @@
1
- {"version":3,"file":"data-model-params.control-model.spec.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.spec.ts"],"names":[],"mappings":";;AACA,gEAA6D;AAC7D,4EAAwE;AACxE,4EAAmE;AACnE,uFAAmG;AAGnG,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,YAAa,SAAQ,mCAAa;KAEvC;IAED,IAAI,YAAmD,CAAC;IAExD,UAAU,CAAC,GAAG,EAAE;QACd,YAAY,GAAG;YACb,QAAQ,EAAE,WAAW;YACrB,UAAU,EAAE,EAAuC;SACpD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,KAAK,CAAC,mBAAQ,EAAE,OAAO,CAAC,CAAC;QACzB,YAAY,CAAC,UAAU,GAAG,IAAW,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,mBAAQ,CAAC,KAAK,CAAC,CAAC,oBAAoB,CACzC,+EAA+E,CAChF,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,KAAK,CAAC,mBAAQ,EAAE,OAAO,CAAC,CAAC;QACzB,YAAY,CAAC,UAAU,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAS,CAAC;QACrD,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACxC,MAAM,CAAC,mBAAQ,CAAC,KAAK,CAAC,CAAC,oBAAoB,CACzC,kFAAkF,CACnF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,0CAAmB,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACxE,YAAY,CAAC,QAAQ,GAAG,YAAY,CAAC;QACrC,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"data-model-params.control-model.spec.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.spec.ts"],"names":[],"mappings":";;AAAA,gEAA6D;AAC7D,4EAAwE;AACxE,4EAAmE;AACnE,uFAAmG;AAGnG,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,YAAa,SAAQ,mCAAa;KAEvC;IAED,IAAI,YAAmD,CAAC;IAExD,UAAU,CAAC,GAAG,EAAE;QACd,YAAY,GAAG;YACb,QAAQ,EAAE,WAAW;YACrB,UAAU,EAAE,EAAuC;SACpD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,KAAK,CAAC,mBAAQ,EAAE,OAAO,CAAC,CAAC;QACzB,YAAY,CAAC,UAAU,GAAG,IAAW,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,mBAAQ,CAAC,KAAK,CAAC,CAAC,oBAAoB,CACzC,iFAAiF,CAClF,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,KAAK,CAAC,mBAAQ,EAAE,OAAO,CAAC,CAAC;QACzB,YAAY,CAAC,UAAU,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAS,CAAC;QACrD,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACxC,MAAM,CAAC,mBAAQ,CAAC,KAAK,CAAC,CAAC,oBAAoB,CACzC,oFAAoF,CACrF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,0CAAmB,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACxE,YAAY,CAAC,QAAQ,GAAG,YAAY,CAAC;QACrC,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,MAAM,GAAG,IAAI,uDAAqB,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -11,14 +11,13 @@ export declare class DyFM_DataProperty_Settings<T> {
11
11
  readonly?: boolean;
12
12
  required?: boolean;
13
13
  index?: boolean;
14
- isDependencyHook?: boolean;
15
14
  /**
16
15
  * This will be used to prehook dependency db service to data service by
17
16
  * dataName from dependency data's DyNTS_DataPropertyParams
18
17
  * Use the dependency data's DyNTS_DataPropertyParams.
19
18
  *
20
19
  * @example
21
- * dependencyName: accountModelParams.dataName
20
+ * accountId: { dependencyName: accountModelParams.dataName }
22
21
  */
23
22
  dependencyDataName?: string;
24
23
  archiveable?: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"data-property-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/C,CAAA;AAED,MAAM,MAAM,yBAAyB,CAAC,CAAC,GAAG,GAAG,IAAI,0BAA0B,CAAC,CAAC,CAAC,CAAC;AAE/E,qBAAa,0BAA0B,CAAC,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,uBAAuB,GAAG,MAAM,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,eAAe,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAE3C,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAiB,IAAI,CAAC,EAAE,CAAC;CAC5D;AAGD,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI,wBAAwB,CAAC,CAAC,CAAC,CAAC;AACrE,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,wBAAwB,CAAC,CAAC,CAAC,CAAC;AAC1D;;;GAGG;AACH,qBAAa,wBAAwB,CAAC,CAAC,CAAE,SAAQ,0BAA0B,CAAC,CAAC,CAAC;IAKnE,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,EAAE,CAAM;gBAG3D,GAAG,EAAE,0BAA0B,CAAC,CAAC,CAAC;IA6BpC,WAAW,CAAC,IAAI,OAAO;IAKvB,SAAS,CAAC,IAAI,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI;CAyBhF"}
1
+ {"version":3,"file":"data-property-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/C,CAAA;AAED,MAAM,MAAM,yBAAyB,CAAC,CAAC,GAAG,GAAG,IAAI,0BAA0B,CAAC,CAAC,CAAC,CAAC;AAE/E,qBAAa,0BAA0B,CAAC,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,uBAAuB,GAAG,MAAM,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAGhB;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,eAAe,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAE3C,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAiB,IAAI,CAAC,EAAE,CAAC;CAC5D;AAGD,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI,wBAAwB,CAAC,CAAC,CAAC,CAAC;AACrE,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,wBAAwB,CAAC,CAAC,CAAC,CAAC;AAC1D;;;GAGG;AACH,qBAAa,wBAAwB,CAAC,CAAC,CAAE,SAAQ,0BAA0B,CAAC,CAAC,CAAC;IAKnE,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,EAAE,CAAM;gBAG3D,GAAG,EAAE,0BAA0B,CAAC,CAAC,CAAC;IAqCpC,WAAW,CAAC,IAAI,OAAO;IAKvB,SAAS,CAAC,IAAI,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI;CAyBhF"}
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DyFM_DataProperty_Params = exports.DyFM_DataProperty_Settings = void 0;
4
+ const log_util_1 = require("../../_collections/utils/log.util");
4
5
  const basic_property_type_enum_1 = require("../../_enums/basic-property-type.enum");
5
6
  class DyFM_DataProperty_Settings {
6
7
  key;
@@ -10,14 +11,14 @@ class DyFM_DataProperty_Settings {
10
11
  readonly;
11
12
  required;
12
13
  index;
13
- isDependencyHook;
14
+ /* isDependencyHook?: boolean; */
14
15
  /**
15
16
  * This will be used to prehook dependency db service to data service by
16
17
  * dataName from dependency data's DyNTS_DataPropertyParams
17
18
  * Use the dependency data's DyNTS_DataPropertyParams.
18
19
  *
19
20
  * @example
20
- * dependencyName: accountModelParams.dataName
21
+ * accountId: { dependencyName: accountModelParams.dataName }
21
22
  */
22
23
  dependencyDataName;
23
24
  archiveable;
@@ -40,17 +41,22 @@ class DyFM_DataProperty_Params extends DyFM_DataProperty_Settings {
40
41
  super();
41
42
  if (set) {
42
43
  if (!set.type) {
43
- console.error(`DYNAMO ERROR: `, `\n type is missing from DynamoBEDataPropertyParams`);
44
+ log_util_1.DyFM_Log.error('DYNAMO ERROR: ', '\n type is missing from DynamoBEDataPropertyParams');
44
45
  }
45
- if (set.isDependencyHook && !set.dependencyDataName) {
46
- console.error(`DYNAMO ERROR: `, `\n dependencyName missing for dependencyHook from ` +
47
- `DynamoBEDataPropertyParams` // (${set.key})`,
48
- );
46
+ if (set.dependencyDataName) {
47
+ if (set.required === false) {
48
+ log_util_1.DyFM_Log.warn('DYNAMO WARNING: ', '\n required is not recommended to be false if dependency is set');
49
+ }
50
+ else if (set.required === undefined) {
51
+ log_util_1.DyFM_Log.warn('DYNAMO WARNING: ', '\n required is recommended to be set if dependency is set. ' +
52
+ `It will be set to true by while you are not setting it.`);
53
+ set.required = true;
54
+ }
49
55
  }
50
56
  Object.assign(this, set);
51
57
  }
52
58
  else {
53
- console.error('DYNAMO ERROR: ', '\nMISSING DynamoBEDataPropertyParams constructor input');
59
+ log_util_1.DyFM_Log.error('DYNAMO ERROR: ', '\nMISSING DynamoBEDataPropertyParams constructor input');
54
60
  }
55
61
  }
56
62
  constructed() {
@@ -1 +1 @@
1
- {"version":3,"file":"data-property-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":";;;AAAA,oFAAgF;AAQhF,MAAa,0BAA0B;IACrC,GAAG,CAAU;IACb,IAAI,CAAmC;IACvC,OAAO,CAAK;IAEZ,MAAM,CAAW;IACjB,QAAQ,CAAW;IACnB,QAAQ,CAAW;IACnB,KAAK,CAAW;IAEhB,gBAAgB,CAAW;IAC3B;;;;;;;OAOG;IACH,kBAAkB,CAAU;IAC5B,WAAW,CAAW;IACtB,gBAAgB,CAAU;IAE1B,SAAS,CAAU;IACnB,SAAS,CAAU;IAEnB,eAAe,CAA4B;IAE3C,oBAAoB,CAAuC;CAC5D;AA7BD,gEA6BC;AAKD;;;GAGG;AACH,MAAa,wBAA4B,SAAQ,0BAA6B;IAE5E,mEAAmE;IACnE,0DAA0D;IAEjD,oBAAoB,GAA6B,EAAE,CAAC;IAE7D,YACE,GAAkC;QAElC,KAAK,EAAE,CAAC;QAER,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACd,OAAO,CAAC,KAAK,CACX,gBAAgB,EAChB,oDAAoD,CACrD,CAAC;YACJ,CAAC;YAED,IAAI,GAAG,CAAC,gBAAgB,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;gBACpD,OAAO,CAAC,KAAK,CACX,gBAAgB,EAChB,oDAAoD;oBAClD,4BAA4B,CAAA,kBAAkB;iBACjD,CAAC;YACJ,CAAC;YAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CACX,gBAAgB,EAChB,wDAAwD,CACzD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sCAAsC;IACtC,SAAS;QACP,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,kDAAuB,CAAC,MAAM;gBACjC,OAAO,MAAM,CAAC;YAEhB,KAAK,kDAAuB,CAAC,MAAM;gBACjC,OAAO,MAAM,CAAC;YAEhB,KAAK,kDAAuB,CAAC,OAAO;gBAClC,OAAO,OAAO,CAAC;YAEjB,KAAK,kDAAuB,CAAC,IAAI;gBAC/B,OAAO,IAAI,CAAC;YAEd,KAAK,kDAAuB,CAAC,MAAM,CAAC;YACpC;gBACE,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,OAAO,KAAK,CAAC;gBACf,CAAC;qBAAM,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACxE,OAAO,QAAQ,CAAC;gBAClB,CAAC;qBAAM,CAAC;oBACN,OAAO,MAAM,CAAC;gBAChB,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAnED,4DAmEC"}
1
+ {"version":3,"file":"data-property-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAC7D,oFAAgF;AAQhF,MAAa,0BAA0B;IACrC,GAAG,CAAU;IACb,IAAI,CAAmC;IACvC,OAAO,CAAK;IAEZ,MAAM,CAAW;IACjB,QAAQ,CAAW;IACnB,QAAQ,CAAW;IACnB,KAAK,CAAW;IAEhB,iCAAiC;IACjC;;;;;;;OAOG;IACH,kBAAkB,CAAU;IAC5B,WAAW,CAAW;IACtB,gBAAgB,CAAU;IAE1B,SAAS,CAAU;IACnB,SAAS,CAAU;IAEnB,eAAe,CAA4B;IAE3C,oBAAoB,CAAuC;CAC5D;AA7BD,gEA6BC;AAKD;;;GAGG;AACH,MAAa,wBAA4B,SAAQ,0BAA6B;IAE5E,mEAAmE;IACnE,0DAA0D;IAEjD,oBAAoB,GAA6B,EAAE,CAAC;IAE7D,YACE,GAAkC;QAElC,KAAK,EAAE,CAAC;QAER,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACd,mBAAQ,CAAC,KAAK,CACZ,gBAAgB,EAChB,oDAAoD,CACrD,CAAC;YACJ,CAAC;YAED,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC;gBAC3B,IAAI,GAAG,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;oBAC3B,mBAAQ,CAAC,IAAI,CACX,kBAAkB,EAClB,iEAAiE,CAClE,CAAC;gBACJ,CAAC;qBAAM,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;oBACtC,mBAAQ,CAAC,IAAI,CACX,kBAAkB,EAClB,6DAA6D;wBAC7D,yDAAyD,CAC1D,CAAC;oBACF,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACtB,CAAC;YACH,CAAC;YAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,mBAAQ,CAAC,KAAK,CACZ,gBAAgB,EAChB,wDAAwD,CACzD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sCAAsC;IACtC,SAAS;QACP,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,kDAAuB,CAAC,MAAM;gBACjC,OAAO,MAAM,CAAC;YAEhB,KAAK,kDAAuB,CAAC,MAAM;gBACjC,OAAO,MAAM,CAAC;YAEhB,KAAK,kDAAuB,CAAC,OAAO;gBAClC,OAAO,OAAO,CAAC;YAEjB,KAAK,kDAAuB,CAAC,IAAI;gBAC/B,OAAO,IAAI,CAAC;YAEd,KAAK,kDAAuB,CAAC,MAAM,CAAC;YACpC;gBACE,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,OAAO,KAAK,CAAC;gBACf,CAAC;qBAAM,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACxE,OAAO,QAAQ,CAAC;gBAClB,CAAC;qBAAM,CAAC;oBACN,OAAO,MAAM,CAAC;gBAChB,CAAC;QACL,CAAC;IACH,CAAC;CACF;AA3ED,4DA2EC"}
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ const log_util_1 = require("../../_collections/utils/log.util");
3
4
  const basic_property_type_enum_1 = require("../../_enums/basic-property-type.enum");
4
5
  const data_property_params_control_model_1 = require("./data-property-params.control-model");
5
6
  describe('DyFM_DataProperty_Params', () => {
@@ -12,7 +13,6 @@ describe('DyFM_DataProperty_Params', () => {
12
13
  readonly: false,
13
14
  required: true,
14
15
  index: false,
15
- isDependencyHook: false,
16
16
  dependencyDataName: 'dependencyName',
17
17
  minlength: 5,
18
18
  maxlength: 10,
@@ -27,7 +27,6 @@ describe('DyFM_DataProperty_Params', () => {
27
27
  expect(instance.readonly).toBe(false);
28
28
  expect(instance.required).toBe(true);
29
29
  expect(instance.index).toBe(false);
30
- expect(instance.isDependencyHook).toBe(false);
31
30
  expect(instance.dependencyDataName).toBe('dependencyName');
32
31
  expect(instance.minlength).toBe(5);
33
32
  expect(instance.maxlength).toBe(10);
@@ -35,7 +34,7 @@ describe('DyFM_DataProperty_Params', () => {
35
34
  expect(instance.additionalValidators?.length).toBe(1);
36
35
  });
37
36
  it('should log error if type is missing', () => {
38
- const consoleErrorSpy = spyOn(console, 'error');
37
+ const consoleErrorSpy = spyOn(log_util_1.DyFM_Log, 'error');
39
38
  const settings = {
40
39
  key: 'testKey',
41
40
  type: undefined, // Simulating missing type
@@ -43,20 +42,8 @@ describe('DyFM_DataProperty_Params', () => {
43
42
  new data_property_params_control_model_1.DyFM_DataProperty_Params(settings);
44
43
  expect(consoleErrorSpy).toHaveBeenCalledWith('DYNAMO ERROR: ', '\n type is missing from DynamoBEDataPropertyParams');
45
44
  });
46
- it('should log error if isDependencyHook is true but dependencyDataName is missing', () => {
47
- const consoleErrorSpy = spyOn(console, 'error');
48
- const settings = {
49
- key: 'testKey',
50
- type: basic_property_type_enum_1.DyFM_BasicProperty_Type.string,
51
- isDependencyHook: true,
52
- dependencyDataName: undefined
53
- };
54
- new data_property_params_control_model_1.DyFM_DataProperty_Params(settings);
55
- expect(consoleErrorSpy).toHaveBeenCalledWith('DYNAMO ERROR: ', '\n dependencyName missing for dependencyHook from ' +
56
- 'DynamoBEDataPropertyParams');
57
- });
58
45
  it('should log error if settings are not provided', () => {
59
- const consoleErrorSpy = spyOn(console, 'error');
46
+ const consoleErrorSpy = spyOn(log_util_1.DyFM_Log, 'error');
60
47
  new data_property_params_control_model_1.DyFM_DataProperty_Params(undefined);
61
48
  expect(consoleErrorSpy).toHaveBeenCalledWith('DYNAMO ERROR: ', '\nMISSING DynamoBEDataPropertyParams constructor input');
62
49
  });
@@ -1 +1 @@
1
- {"version":3,"file":"data-property-params.control-model.spec.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-property-params.control-model.spec.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.spec.ts"],"names":[],"mappings":";;AAAA,gEAA6D;AAC7D,oFAAgF;AAChF,6FAA4G;AAE5G,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,QAAQ,GAAuC;YACnD,GAAG,EAAE,SAAS;YACd,IAAI,EAAE,kDAAuB,CAAC,MAAM;YACpC,OAAO,EAAE,cAAc;YACvB,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,KAAK;YACZ,kBAAkB,EAAE,gBAAgB;YACpC,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,EAAE;YACb,eAAe,EAAE,EAAE;YACnB,oBAAoB,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACzD,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,6DAAwB,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,kDAAuB,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC9C,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC3D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7C,MAAM,CAAC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,eAAe,GAAG,KAAK,CAAC,mBAAQ,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAuC;YACnD,GAAG,EAAE,SAAS;YACd,IAAI,EAAE,SAAgB,EAAE,0BAA0B;SACnD,CAAC;QAEF,IAAI,6DAAwB,CAAC,QAAQ,CAAC,CAAC;QAEvC,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC1C,gBAAgB,EAChB,oDAAoD,CACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,eAAe,GAAG,KAAK,CAAC,mBAAQ,EAAE,OAAO,CAAC,CAAC;QAEjD,IAAI,6DAAwB,CAAC,SAAgB,CAAC,CAAC;QAE/C,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC1C,gBAAgB,EAChB,wDAAwD,CACzD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACrD,MAAM,QAAQ,GAAoC;YAChD,IAAI,EAAE,kDAAuB,CAAC,MAAM;SACrC,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,6DAAwB,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1C,QAAQ,CAAC,IAAI,GAAG,kDAAuB,CAAC,MAAM,CAAC;QAC/C,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1C,QAAQ,CAAC,IAAI,GAAG,kDAAuB,CAAC,OAAO,CAAC;QAChD,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE3C,QAAQ,CAAC,IAAI,GAAG,kDAAuB,CAAC,IAAI,CAAC;QAC7C,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExC,QAAQ,CAAC,IAAI,GAAG,kDAAuB,CAAC,MAAM,CAAC;QAC/C,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1C,QAAQ,CAAC,IAAI,GAAG,cAAc,CAAC;QAC/B,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEzC,QAAQ,CAAC,IAAI,GAAG,mBAAmB,CAAC;QACpC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -5,24 +5,33 @@ import { Subscription } from 'rxjs';
5
5
  * waiting a specific result
6
6
  */
7
7
  export declare class DyFM_Poll<T> {
8
+ name: string;
8
9
  poll: Subscription;
9
10
  running: boolean;
10
- private readonly pollDo;
11
- private readonly pollWhile;
12
- private readonly pollEnd;
13
- private readonly args?;
14
- private readonly pollDelay?;
15
- private readonly pollPeriod?;
16
- private readonly stopOnFail?;
17
- constructor(set: {
18
- pollDo: (...args: any[]) => Promise<T>;
19
- pollWhile: (res: T) => boolean;
20
- pollEnd: (res: T) => void;
21
- args?: any[];
22
- pollDelay?: number;
23
- pollPeriod?: number;
24
- stopOnFail?: boolean;
25
- });
11
+ /**
12
+ * The function that will be called to poll the endpoint,
13
+ * it will be called every pollPeriod
14
+ */
15
+ readonly pollDo: (...args: any[]) => Promise<T>;
16
+ /**
17
+ * The function that will be called to check if the poll should continue,
18
+ * if this returns false, the poll will end
19
+ */
20
+ readonly pollWhile: (res: T) => boolean;
21
+ /**
22
+ * The function that will be called to end the poll
23
+ */
24
+ readonly pollEnd?: (res: T) => void;
25
+ /**
26
+ * The function that will be called to handle the error
27
+ */
28
+ readonly pollDoError?: (error: any) => void;
29
+ readonly args?: any[];
30
+ readonly pollDelay: number;
31
+ readonly pollPeriod: number;
32
+ readonly stopOnFail: boolean;
33
+ readonly delayFirst: boolean;
34
+ constructor(set: Partial<DyFM_Poll<T>>);
26
35
  private startPoll;
27
36
  restartPoll(args?: any[]): void;
28
37
  stop(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"poll.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/poll.control-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAS,MAAM,MAAM,CAAC;AAI3C;;;;GAIG;AACH,qBAAa,SAAS,CAAC,CAAC;IACtB,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IAEjB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAC3C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAU;gBAGpC,GAAG,EAAE;QACH,MAAM,EAAE,CAAC,GAAG,IAAI,OAAA,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;QAChC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;QAC/B,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC;QAE1B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB;IAgCH,OAAO,CAAC,SAAS;IA0BjB,WAAW,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAe/B,IAAI,IAAI,IAAI;IAKZ,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;CAKrB"}
1
+ {"version":3,"file":"poll.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/poll.control-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAS,MAAM,MAAM,CAAC;AAM3C;;;;GAIG;AACH,qBAAa,SAAS,CAAC,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,OAAA,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;IACxC;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC;IACpC;;OAEG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC5C,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAK;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAc;IACzC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAS;IACrC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAS;gBAGnC,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YA8Bd,SAAS;IAmCvB,WAAW,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAe/B,IAAI,IAAI,IAAI;IAKZ,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;CAKrB"}
@@ -3,36 +3,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DyFM_Poll = void 0;
4
4
  const rxjs_1 = require("rxjs");
5
5
  const error_control_model_1 = require("./error.control-model");
6
+ const times_const_1 = require("../../_collections/constants/times.const");
7
+ const utilities_util_1 = require("../../_collections/utils/utilities.util");
6
8
  /**
7
9
  * DynamoFSM_Poll is a predefined class is
8
10
  * for polling a specific endpoint
9
11
  * waiting a specific result
10
12
  */
11
13
  class DyFM_Poll {
14
+ name;
12
15
  poll;
13
16
  running;
17
+ /**
18
+ * The function that will be called to poll the endpoint,
19
+ * it will be called every pollPeriod
20
+ */
14
21
  pollDo;
22
+ /**
23
+ * The function that will be called to check if the poll should continue,
24
+ * if this returns false, the poll will end
25
+ */
15
26
  pollWhile;
27
+ /**
28
+ * The function that will be called to end the poll
29
+ */
16
30
  pollEnd;
31
+ /**
32
+ * The function that will be called to handle the error
33
+ */
34
+ pollDoError;
17
35
  args;
18
- pollDelay;
19
- pollPeriod;
20
- stopOnFail;
36
+ pollDelay = 0;
37
+ pollPeriod = 3 * times_const_1.second;
38
+ stopOnFail = false;
39
+ delayFirst = false;
21
40
  constructor(set) {
22
41
  try {
23
- this.pollDo = set.pollDo;
24
- this.pollWhile = set.pollWhile;
25
- this.pollEnd = set.pollEnd;
26
- this.args = set.args;
27
- this.pollDelay = set.pollDelay ? set.pollDelay : 0;
42
+ Object.assign(this, set);
28
43
  if (set.pollPeriod === 0) {
29
44
  console.error('DYNAMO ERROR: creating polls with 0ms period is not supported! ' +
30
45
  '(it will reset to 1000ms (1s))');
46
+ this.pollPeriod = 1 * times_const_1.second;
31
47
  }
32
- this.pollPeriod = set.pollPeriod ? set.pollPeriod : 1000;
33
48
  if (this.pollPeriod < 300) {
34
49
  console.warn('DYNAMO WARNING: creating polls with less than 300ms period is not recommended!');
35
50
  }
51
+ this.name = set.name ?? 'Unnamed DyFM_Poll';
36
52
  this.stopOnFail = set.stopOnFail;
37
53
  this.startPoll(this.args);
38
54
  }
@@ -42,8 +58,11 @@ class DyFM_Poll {
42
58
  });
43
59
  }
44
60
  }
45
- startPoll(...args) {
61
+ async startPoll(...args) {
46
62
  try {
63
+ if (this.delayFirst) {
64
+ await (0, utilities_util_1.DyFM_wait)(this.pollDelay);
65
+ }
47
66
  this.poll = (0, rxjs_1.timer)(this.pollDelay, this.pollPeriod).subscribe(async () => {
48
67
  await this.pollDo(...args).then((res) => {
49
68
  if (!this.pollWhile(res)) {
@@ -53,9 +72,16 @@ class DyFM_Poll {
53
72
  if (this.stopOnFail) {
54
73
  this.stop();
55
74
  }
56
- throw new error_control_model_1.DyFM_Error({
57
- message: 'DYNAMO ERROR: \nDynamoPoll: pollDo was UNSUCCESSFUL',
58
- });
75
+ if (this.pollDoError) {
76
+ this.pollDoError(error);
77
+ }
78
+ else {
79
+ throw new error_control_model_1.DyFM_Error({
80
+ message: `DYNAMO ERROR: ` +
81
+ `\nDynamoPoll: "${this.name}" pollDo was UNSUCCESSFUL`,
82
+ error: error,
83
+ });
84
+ }
59
85
  });
60
86
  });
61
87
  this.running = true;
@@ -89,7 +115,7 @@ class DyFM_Poll {
89
115
  }
90
116
  end(result) {
91
117
  this.poll.unsubscribe();
92
- this.pollEnd(result);
118
+ this.pollEnd?.(result);
93
119
  this.running = false;
94
120
  }
95
121
  }
@@ -1 +1 @@
1
- {"version":3,"file":"poll.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/poll.control-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"poll.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/poll.control-model.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"sck-client-params.control-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-client-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AAGnD,qBAAa,wBAAwB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAe;IACtC,SAAS,CAAC,EAAE,OAAO,CAAQ;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,cAAc,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;gBAGpF,GAAG,EAAE,wBAAwB;CAUhC"}
1
+ {"version":3,"file":"sck-client-params.control-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-client-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AAKnD,qBAAa,wBAAwB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAe;IACtC,SAAS,CAAC,EAAE,OAAO,CAAQ;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,cAAc,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;gBAGpF,GAAG,EAAE,wBAAwB;CAmBhC"}
@@ -2,18 +2,22 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DyFM_SocketClient_Params = void 0;
4
4
  const times_const_1 = require("../../../_collections/constants/times.const");
5
+ const log_util_1 = require("../../../_collections/utils/log.util");
5
6
  class DyFM_SocketClient_Params {
6
7
  name;
7
8
  service;
8
9
  address;
9
10
  port;
10
- reconnectDelay = times_const_1.second * 10;
11
+ reconnectDelay = times_const_1.second * 30;
11
12
  reconnect = true;
12
13
  socketOptions;
13
14
  constructor(set) {
14
15
  Object.assign(this, set);
15
16
  this.reconnect = !!this.reconnectDelay;
16
- if (this.socketOptions?.autoConnect || this.socketOptions?.reconnection) {
17
+ if (this.socketOptions?.autoConnect ||
18
+ this.socketOptions?.reconnection ||
19
+ this.socketOptions?.reconnectionDelay) {
20
+ log_util_1.DyFM_Log.warn('autoConnect or reconnection is set to true in socketOptions, so reconnect is set to false', '\nThis means that the reconnection will use the socket.io reconnection logic, ', 'not the Dynamo implementations.');
17
21
  this.reconnect = false;
18
22
  }
19
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"sck-client-params.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-client-params.control-model.ts"],"names":[],"mappings":";;;AAEA,6EAAqE;AAErE,MAAa,wBAAwB;IACnC,IAAI,CAAU;IACd,OAAO,CAAU;IACjB,OAAO,CAAU;IACjB,IAAI,CAAU;IACd,cAAc,GAAY,oBAAM,GAAG,EAAE,CAAC;IACtC,SAAS,GAAa,IAAI,CAAC;IAC3B,aAAa,CAAyE;IAEtF,YACE,GAA6B;QAE7B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QAEvC,IAAI,IAAI,CAAC,aAAa,EAAE,WAAW,IAAI,IAAI,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC;YACxE,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACzB,CAAC;IACH,CAAC;CACF;AApBD,4DAoBC"}
1
+ {"version":3,"file":"sck-client-params.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-client-params.control-model.ts"],"names":[],"mappings":";;;AAGA,6EAAqE;AACrE,mEAAgE;AAEhE,MAAa,wBAAwB;IACnC,IAAI,CAAU;IACd,OAAO,CAAU;IACjB,OAAO,CAAU;IACjB,IAAI,CAAU;IACd,cAAc,GAAY,oBAAM,GAAG,EAAE,CAAC;IACtC,SAAS,GAAa,IAAI,CAAC;IAC3B,aAAa,CAAyE;IAEtF,YACE,GAA6B;QAE7B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QAEvC,IACE,IAAI,CAAC,aAAa,EAAE,WAAW;YAC/B,IAAI,CAAC,aAAa,EAAE,YAAY;YAChC,IAAI,CAAC,aAAa,EAAE,iBAAiB,EACrC,CAAC;YACD,mBAAQ,CAAC,IAAI,CACX,2FAA2F,EAC3F,gFAAgF,EAChF,iCAAiC,CAClC,CAAC;YACF,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACzB,CAAC;IACH,CAAC;CACF;AA7BD,4DA6BC"}
@@ -25,7 +25,7 @@ describe('DyFM_SocketClient_Params', () => {
25
25
  it('should set default values for reconnectDelay and reconnect', () => {
26
26
  const params = {};
27
27
  const instance = new sck_client_params_control_model_1.DyFM_SocketClient_Params(params);
28
- expect(instance.reconnectDelay).toBe(times_const_1.second * 10);
28
+ expect(instance.reconnectDelay).toBe(times_const_1.second * 30);
29
29
  expect(instance.reconnect).toBe(true);
30
30
  });
31
31
  it('should set reconnect to false if socketOptions.autoConnect is true', () => {
@@ -12,6 +12,7 @@ export declare class DyFM_SocketEvent<T> {
12
12
  tasks?: DyFM_SocketEventTask<T>[];
13
13
  logEvent?: boolean;
14
14
  logEventContent?: boolean;
15
+ readonly stackLocation?: string;
15
16
  constructor(set: {
16
17
  /**
17
18
  * naming the socket will help to follow eveFM on service,
@@ -1 +1 @@
1
- {"version":3,"file":"sck-socket-event.control-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-socket-event.control-model.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,MAAM,8BAA8B,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,IACzD,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAC/C,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEtF;;GAEG;AACH,qBAAa,gBAAgB,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,oBAAoB,GAAG,MAAM,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,YAAY,CAAC,EAAE,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;IAC1D,KAAK,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;IAElC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;gBAGxB,GAAG,EAAE;QACH;;;WAGG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;WAGG;QACH,QAAQ,EAAE,oBAAoB,GAAG,MAAM,CAAC;QACxC;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB;;;;;WAKG;QACH,YAAY,CAAC,EAAE,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;QAC1D;;WAEG;QACH,KAAK,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;WAEG;QACH,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;IAsCH;;;OAGG;YACW,SAAS;IAevB;;;OAGG;IACG,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBrE"}
1
+ {"version":3,"file":"sck-socket-event.control-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-socket-event.control-model.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,MAAM,8BAA8B,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,IACzD,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAC/C,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEtF;;GAEG;AACH,qBAAa,gBAAgB,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,oBAAoB,GAAG,MAAM,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,YAAY,CAAC,EAAE,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;IAC1D,KAAK,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;IAElC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;gBAG9B,GAAG,EAAE;QACH;;;WAGG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;WAGG;QACH,QAAQ,EAAE,oBAAoB,GAAG,MAAM,CAAC;QACxC;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB;;;;;WAKG;QACH,YAAY,CAAC,EAAE,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;QAC1D;;WAEG;QACH,KAAK,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;WAEG;QACH,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;IAwCH;;;OAGG;YACW,SAAS;IAevB;;;OAGG;IACG,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBrE"}