@futdevpro/fsm-dynamo 1.10.5 → 1.10.6

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.
@@ -1,6 +1,6 @@
1
1
  import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
2
2
  import { DyFM_Metadata } from '../data-models/metadata.data-model';
3
- import { DyFM_DataProperties } from './data-property-params.control-model';
3
+ import { DyFM_DataProperties, DyFM_DataProperty_Params } from './data-property-params.control-model';
4
4
  export type DyFM_Data_S<T> = DyFM_DataModel_Settings<T>;
5
5
  export type DyFM_Data_Settings<T> = DyFM_DataModel_Settings<T>;
6
6
  export declare class DyFM_DataModel_Settings<T extends DyFM_Metadata> extends DyFM_Metadata {
@@ -15,5 +15,6 @@ export type DyFM_Data_Params<T> = DyFM_DataModel_Params<T>;
15
15
  export declare class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataModel_Settings<T> {
16
16
  constructor(set: DyFM_DataModel_Settings<T>);
17
17
  constructed?(): boolean;
18
+ setKeysForSubObjectParams?(property: DyFM_DataProperty_Params<any>): void;
18
19
  }
19
20
  //# sourceMappingURL=data-model-params.control-model.d.ts.map
@@ -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,MAAM,sCAAsC,CAAC;AAE3E,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;IAkDjC,WAAW,CAAC,IAAI,OAAO;CAGxB"}
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"}
@@ -30,6 +30,9 @@ class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
30
30
  'A property key is missing in ' + this.dataName + ' model.');
31
31
  }
32
32
  this.properties[key].key = key;
33
+ if (this.properties[key].subObjectParams) {
34
+ this.setKeysForSubObjectParams(this.properties[key]);
35
+ }
33
36
  });
34
37
  if (!this?.modelType || this?.modelType == data_model_type_enum_1.DyFM_DataModel_Type.data) {
35
38
  this.modelType = data_model_type_enum_1.DyFM_DataModel_Type.data;
@@ -51,6 +54,20 @@ class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
51
54
  constructed() {
52
55
  return true;
53
56
  }
57
+ setKeysForSubObjectParams(property) {
58
+ if (property.subObjectParams) {
59
+ Object.keys(property.subObjectParams).forEach((key) => {
60
+ if (!key) {
61
+ log_util_1.DyFM_Log.error('DyFM_DataModel_Params.setKeysForSubObjectParams: ' +
62
+ 'A subObjectParams key is missing in ' + this.dataName + ' model.');
63
+ }
64
+ property.subObjectParams[key].key = key;
65
+ if (property.subObjectParams[key].subObjectParams) {
66
+ this.setKeysForSubObjectParams(property.subObjectParams[key]);
67
+ }
68
+ });
69
+ }
70
+ }
54
71
  }
55
72
  exports.DyFM_DataModel_Params = DyFM_DataModel_Params;
56
73
  //# sourceMappingURL=data-model-params.control-model.js.map
@@ -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":";;;AACA,gEAA6D;AAC7D,4EAAwE;AACxE,4EAAmE;AAKnE,MAAa,uBAAiD,SAAQ,mCAAa;IACjF,QAAQ,CAAS;IACjB,SAAS,CAAuB;IAChC,MAAM,CAAU;IAChB,UAAU,CAAW;IACrB,UAAU,CAAyB;CACpC;AAND,0DAMC;AAID,MAAa,qBAA+C,SAAQ,uBAA0B;IAE5F,mDAAmD;IAEnD,YACE,GAA+B;QAE/B,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5D,mBAAQ,CAAC,KAAK,CACZ,qCAAqC;gBACrC,4BAA4B,GAAG,IAAI,CAAC,QAAQ,GAAG,SAAS,CACzD,CAAC;YAEF,IAAI,CAAC,UAAU,GAAG,EAA4B,CAAC;QACjD,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAQ,EAAE;YACzD,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,mBAAQ,CAAC,KAAK,CACZ,qCAAqC;oBACrC,+BAA+B,GAAG,IAAI,CAAC,QAAQ,GAAG,SAAS,CAC5D,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,IAAI,0CAAmB,CAAC,IAAI,EAAE,CAAC;YACpE,IAAI,CAAC,SAAS,GAAG,0CAAmB,CAAC,IAAI,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,SAAS,IAAI,0CAAmB,CAAC,IAAI,EAAE,CAAC;YAChE,0BAA0B;YAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAE7E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,KAAa,EAAQ,EAAE;gBAClE,IACE,KAAK,GAAG,CAAC;oBACT,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG;oBAC9B,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,EAC3B,CAAC;oBACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC;wBAC3B,IAAI,CAAC,WAAW,EAAE;wBAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA1DD,sDA0DC"}
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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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@futdevpro/fsm-dynamo",
3
- "version": "01.10.05",
3
+ "version": "01.10.06",
4
4
  "description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
5
5
  "scripts": {
6
6
  "prep": "npm i pnpm -g && npm i rimraf nodemon -g",
@@ -2,7 +2,7 @@
2
2
  import { DyFM_Log } from '../../_collections/utils/log.util';
3
3
  import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
4
4
  import { DyFM_Metadata } from '../data-models/metadata.data-model';
5
- import { DyFM_DataProperties } from './data-property-params.control-model';
5
+ import { DyFM_DataProperties, DyFM_DataProperty_Params } from './data-property-params.control-model';
6
6
 
7
7
  export type DyFM_Data_S<T> = DyFM_DataModel_Settings<T>;
8
8
  export type DyFM_Data_Settings<T> = DyFM_DataModel_Settings<T>;
@@ -47,6 +47,10 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
47
47
  }
48
48
 
49
49
  this.properties[key].key = key;
50
+
51
+ if (this.properties[key].subObjectParams) {
52
+ this.setKeysForSubObjectParams(this.properties[key]);
53
+ }
50
54
  });
51
55
 
52
56
  if (!this?.modelType || this?.modelType == DyFM_DataModel_Type.data) {
@@ -74,4 +78,23 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
74
78
  constructed?(): boolean {
75
79
  return true;
76
80
  }
81
+
82
+ setKeysForSubObjectParams?(property: DyFM_DataProperty_Params<any>): void {
83
+ if (property.subObjectParams) {
84
+ Object.keys(property.subObjectParams).forEach((key: string): void => {
85
+ if (!key) {
86
+ DyFM_Log.error(
87
+ 'DyFM_DataModel_Params.setKeysForSubObjectParams: ' +
88
+ 'A subObjectParams key is missing in ' + this.dataName + ' model.'
89
+ );
90
+ }
91
+
92
+ property.subObjectParams[key].key = key;
93
+
94
+ if (property.subObjectParams[key].subObjectParams) {
95
+ this.setKeysForSubObjectParams(property.subObjectParams[key]);
96
+ }
97
+ });
98
+ }
99
+ }
77
100
  }
Binary file