@futdevpro/fsm-dynamo 1.9.43 → 1.9.46

package/build/_collections/utils/array.util.d.ts

@@ -6,6 +6,7 @@ export declare class DyFM_Array {
     static asyncMap<T, R>(list: T[], mapFunc: (element: T, index?: number, array?: T[]) => Promise<R>): Promise<R[]>;
     static last<T>(array: T[]): T;
     static lastString(array: string): string;
+    static first<T>(array: T[]): T;
     static remove<T>(array: T[], element: T): T[];
     static findNRemove<T>(array: T[], func: (element: T, index?: number, array?: T[]) => boolean): T[];
     static shuffle<T>(array: T[]): T[];

package/build/_collections/utils/array.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array.util.d.ts","sourceRoot":"","sources":["../../../src/_collections/utils/array.util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"array.util.d.ts","sourceRoot":"","sources":["../../../src/_collections/utils/array.util.ts"],"names":[],"mappings":"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"}

package/build/_collections/utils/array.util.js

@@ -32,6 +32,9 @@ class DyFM_Array {
     static lastString(array) {
         return array?.length ? array[array.length - 1] : null;
     }
+    static first(array) {
+        return array?.length ? array[0] : null;
+    }
     static remove(array, element) {
         const index = array.indexOf(element);
         if (-1 < index) {

package/build/_collections/utils/array.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"array.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/array.util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"array.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/array.util.ts"],"names":[],"mappings":"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"}

package/build/_models/control-models/data-model-params.control-model.d.ts

@@ -1,20 +1,19 @@
 import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
 import { DyFM_Metadata } from '../data-models/metadata.data-model';
-import { DyFM_DataProperty_Params } from './data-property-params.control-model';
-export type DyFM_Data_S = DyFM_DataModel_Settings;
-export type DyFM_Data_Settings = DyFM_DataModel_Settings;
-export declare class DyFM_DataModel_Settings extends DyFM_Metadata {
+import { DyFM_DataProperties } from './data-property-params.control-model';
+export type DyFM_Data_S<T> = DyFM_DataModel_Settings<T>;
+export type DyFM_Data_Settings<T> = DyFM_DataModel_Settings<T>;
+export declare class DyFM_DataModel_Settings<T extends DyFM_Metadata> extends DyFM_Metadata {
     dataName: string;
     modelType?: DyFM_DataModel_Type;
     dbName?: string;
     addArchive?: boolean;
-    properties?: DyFM_DataProperty_Params[];
+    properties: DyFM_DataProperties<T>;
 }
-export type DyFM_Data_P = DyFM_DataModel_Params;
-export type DyFM_Data_Params = DyFM_DataModel_Params;
-export declare class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
-    properties?: DyFM_DataProperty_Params[];
-    constructor(set: DyFM_DataModel_Settings);
+export type DyFM_Data_P<T> = DyFM_DataModel_Params<T>;
+export type DyFM_Data_Params<T> = DyFM_DataModel_Params<T>;
+export declare class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataModel_Settings<T> {
+    constructor(set: DyFM_DataModel_Settings<T>);
     constructed?(): boolean;
 }
 //# sourceMappingURL=data-model-params.control-model.d.ts.map

package/build/_models/control-models/data-model-params.control-model.d.ts.map

@@ -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":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG,uBAAuB,CAAC;AAClD,MAAM,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AACzD,qBAAa,uBAAwB,SAAQ,aAAa;IACxD,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,wBAAwB,EAAE,CAAC;CACzC;AAED,MAAM,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAChD,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,CAAC;AACrD,qBAAa,qBAAsB,SAAQ,uBAAuB;IAEvD,UAAU,CAAC,EAAE,wBAAwB,EAAE,CAAM;gBAGpD,GAAG,EAAE,uBAAuB;IA8B9B,WAAW,CAAC,IAAI,OAAO;CAGxB"}
+{"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"}

package/build/_models/control-models/data-model-params.control-model.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DyFM_DataModel_Params = exports.DyFM_DataModel_Settings = void 0;
+const log_util_1 = require("../../_collections/utils/log.util");
 const data_model_type_enum_1 = require("../../_enums/data-model-type.enum");
 const metadata_data_model_1 = require("../data-models/metadata.data-model");
 class DyFM_DataModel_Settings extends metadata_data_model_1.DyFM_Metadata {
@@ -12,12 +13,24 @@ class DyFM_DataModel_Settings extends metadata_data_model_1.DyFM_Metadata {
 }
 exports.DyFM_DataModel_Settings = DyFM_DataModel_Settings;
 class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
-    properties = [];
+    /* override properties?: DyFM_DataProperties<T>; */
     constructor(set) {
         super(set);
         if (set) {
             Object.assign(this, set);
         }
+        if (!this.properties || typeof this.properties !== 'object') {
+            log_util_1.DyFM_Log.error('DyFM_DataModel_Params.constructor: ' +
+                'Properties are missing in ' + this.dataName + ' model.');
+            this.properties = {};
+        }
+        Object.keys(this.properties).forEach((key) => {
+            if (!key) {
+                log_util_1.DyFM_Log.error('DyFM_DataModel_Params.constructor: ' +
+                    'A property key is missing in ' + this.dataName + ' model.');
+            }
+            this.properties[key].key = key;
+        });
         if (!this?.modelType || this?.modelType == data_model_type_enum_1.DyFM_DataModel_Type.data) {
             this.modelType = data_model_type_enum_1.DyFM_DataModel_Type.data;
         }

package/build/_models/control-models/data-model-params.control-model.js.map

@@ -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,4EAAwE;AACxE,4EAAmE;AAKnE,MAAa,uBAAwB,SAAQ,mCAAa;IACxD,QAAQ,CAAS;IACjB,SAAS,CAAuB;IAChC,MAAM,CAAU;IAChB,UAAU,CAAW;IACrB,UAAU,CAA8B;CACzC;AAND,0DAMC;AAID,MAAa,qBAAsB,SAAQ,uBAAuB;IAEvD,UAAU,GAAgC,EAAE,CAAC;IAEtD,YACE,GAA4B;QAE5B,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,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;AAtCD,sDAsCC"}
+{"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"}

package/build/_models/control-models/data-property-params.control-model.d.ts

@@ -1,7 +1,9 @@
 import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
+export type DyFM_DataProperties<T> = {
+    [K in keyof T]: DyFM_DataProperty_Params<T[K]>;
+};
 export type DyFM_DataPropertySettings<T = any> = DyFM_DataProperty_Settings<T>;
-export declare class DyFM_DataProperty_Settings<T = any> {
-    key: string;
+export declare class DyFM_DataProperty_Settings<T> {
     type: DyFM_BasicProperty_Type | string;
     default?: T;
     unique?: boolean;
@@ -20,19 +22,19 @@ export declare class DyFM_DataProperty_Settings<T = any> {
     dependencyDataName?: string;
     minlength?: number;
     maxlength?: number;
-    subObjectParams?: DyFM_DataProperty_Params[];
+    subObjectParams?: DyFM_DataProperties<T>;
     additionalValidators?: ((data: any) => void)[];
 }
-export type DyFM_DataPropertyParams = DyFM_DataProperty_Params;
-export type DyFM_DPropPs = DyFM_DataProperty_Params;
+export type DyFM_DataPropertyParams<T> = DyFM_DataProperty_Params<T>;
+export type DyFM_DPropPs<T> = DyFM_DataProperty_Params<T>;
 /**
  * This will be used for setting up db.
  * DataServices also uses this to prehook tools, as db service and dependency db service.
  */
-export declare class DyFM_DataProperty_Params extends DyFM_DataProperty_Settings {
-    subObjectParams?: DyFM_DataProperty_Params[];
+export declare class DyFM_DataProperty_Params<T> extends DyFM_DataProperty_Settings<T> {
+    key?: string;
     additionalValidators?: ((data: any) => void)[];
-    constructor(set: DyFM_DataProperty_Settings);
+    constructor(set: DyFM_DataProperty_Settings<T>);
     constructed?(): boolean;
     getBEType?(): String | Number | Boolean | Object | Function | Array<any> | Date;
 }

package/build/_models/control-models/data-property-params.control-model.d.ts.map

@@ -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,yBAAyB,CAAC,CAAC,GAAG,GAAG,IAAI,0BAA0B,CAAC,CAAC,CAAC,CAAC;AAE/E,qBAAa,0BAA0B,CAAC,CAAC,GAAG,GAAG;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,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,CAAQ;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,eAAe,CAAC,EAAE,wBAAwB,EAAE,CAAC;IAE7C,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAiB,IAAI,CAAC,EAAE,CAAC;CAC5D;AAGD,MAAM,MAAM,uBAAuB,GAAG,wBAAwB,CAAC;AAC/D,MAAM,MAAM,YAAY,GAAG,wBAAwB,CAAC;AACpD;;;GAGG;AACH,qBAAa,wBAAyB,SAAQ,0BAA0B;IAE7D,eAAe,CAAC,EAAE,wBAAwB,EAAE,CAAM;IAElD,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,EAAE,CAAM;gBAG3D,GAAG,EAAE,0BAA0B;IA6BjC,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"}
+{"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,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;IAE5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,eAAe,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAEzC,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;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IAKJ,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"}

package/build/_models/control-models/data-property-params.control-model.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DyFM_DataProperty_Params = exports.DyFM_DataProperty_Settings = void 0;
 const basic_property_type_enum_1 = require("../../_enums/basic-property-type.enum");
 class DyFM_DataProperty_Settings {
-    key;
     type;
     default;
     unique;
     readonly;
-    required = true;
+    required;
     index;
     isDependencyHook;
     /**
@@ -31,17 +30,20 @@ exports.DyFM_DataProperty_Settings = DyFM_DataProperty_Settings;
  * DataServices also uses this to prehook tools, as db service and dependency db service.
  */
 class DyFM_DataProperty_Params extends DyFM_DataProperty_Settings {
-    subObjectParams = [];
+    key;
+    /* override subObjectParams?: DyFM_DataProperty_Params<>[] = []; */
+    /* override subObjectParams?: DyFM_Data_Params<T> = {}; */
     additionalValidators = [];
     constructor(set) {
         super();
         if (set) {
-            if (!set.key || !set.type) {
-                console.error(`DYNAMO ERROR: `, `\n key or type is missing from DynamoBEDataPropertyParams`);
+            if (!set.type) {
+                console.error(`DYNAMO ERROR: `, `\n type is missing from DynamoBEDataPropertyParams`);
             }
             if (set.isDependencyHook && !set.dependencyDataName) {
                 console.error(`DYNAMO ERROR: `, `\n dependencyName missing for dependencyHook from ` +
-                    `DynamoBEDataPropertyParams (${set.key})`);
+                    `DynamoBEDataPropertyParams` // (${set.key})`, 
+                );
             }
             Object.assign(this, set);
         }

package/build/_models/control-models/data-property-params.control-model.js.map

@@ -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;AAIhF,MAAa,0BAA0B;IACrC,GAAG,CAAS;IACZ,IAAI,CAAmC;IACvC,OAAO,CAAK;IAEZ,MAAM,CAAW;IACjB,QAAQ,CAAW;IACnB,QAAQ,GAAa,IAAI,CAAC;IAC1B,KAAK,CAAW;IAEhB,gBAAgB,CAAW;IAC3B;;;;;;;OAOG;IACH,kBAAkB,CAAU;IAE5B,SAAS,CAAU;IACnB,SAAS,CAAU;IAEnB,eAAe,CAA8B;IAE7C,oBAAoB,CAAuC;CAC5D;AA3BD,gEA2BC;AAKD;;;GAGG;AACH,MAAa,wBAAyB,SAAQ,0BAA0B;IAE7D,eAAe,GAAgC,EAAE,CAAC;IAElD,oBAAoB,GAA6B,EAAE,CAAC;IAE7D,YACE,GAA+B;QAE/B,KAAK,EAAE,CAAC;QAER,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC1B,OAAO,CAAC,KAAK,CACX,gBAAgB,EAChB,2DAA2D,CAC5D,CAAC;YACJ,CAAC;YAED,IAAI,GAAG,CAAC,gBAAgB,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;gBACpD,OAAO,CAAC,KAAK,CACX,gBAAgB,EAChB,oDAAoD;oBAClD,+BAA+B,GAAG,CAAC,GAAG,GAAG,CAC5C,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;AAlED,4DAkEC"}
+{"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,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;IAE5B,SAAS,CAAU;IACnB,SAAS,CAAU;IAEnB,eAAe,CAA0B;IAEzC,oBAAoB,CAAuC;CAC5D;AA1BD,gEA0BC;AAKD;;;GAGG;AACH,MAAa,wBAA4B,SAAQ,0BAA6B;IAC5E,GAAG,CAAU;IAEb,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;AApED,4DAoEC"}

package/build/_modules/custom-data/_models/cud.data-model.d.ts

@@ -5,5 +5,5 @@ export declare class DyFM_CustomData<T = any> extends DyFM_Metadata {
     data?: T;
     constructor(set?: DyFM_CustomData<T>);
 }
-export declare const DyFM_customData_dataParams: DyFM_DataModel_Params;
+export declare const DyFM_customData_dataParams: DyFM_DataModel_Params<DyFM_CustomData>;
 //# sourceMappingURL=cud.data-model.d.ts.map

package/build/_modules/custom-data/_models/cud.data-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cud.data-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/custom-data/_models/cud.data-model.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACtB,MAAM,iEAAiE,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AAEjF,MAAM,MAAM,YAAY,GAAG,eAAe,CAAC;AAC3C,qBAAa,eAAe,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,aAAa;IACzD,IAAI,CAAC,EAAE,CAAC,CAAC;gBAGP,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;CAQ3B;AAED,eAAO,MAAM,0BAA0B,EAAE,qBAMrC,CAAC"}
+{"version":3,"file":"cud.data-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/custom-data/_models/cud.data-model.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACtB,MAAM,iEAAiE,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AAEjF,MAAM,MAAM,YAAY,GAAG,eAAe,CAAC;AAC3C,qBAAa,eAAe,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,aAAa;IACzD,IAAI,CAAC,EAAE,CAAC,CAAC;gBAGP,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;CAQ3B;AAED,eAAO,MAAM,0BAA0B,EAAE,qBAAqB,CAAC,eAAe,CAM1E,CAAC"}

package/build/_modules/custom-data/_models/cud.data-model.js

@@ -15,8 +15,8 @@ class DyFM_CustomData extends metadata_data_model_1.DyFM_Metadata {
 exports.DyFM_CustomData = DyFM_CustomData;
 exports.DyFM_customData_dataParams = new data_model_params_control_model_1.DyFM_DataModel_Params({
     dataName: 'customData',
-    properties: [
-        { key: 'data', type: 'string', required: true },
-    ],
+    properties: {
+        data: { key: 'data', type: 'string', required: true },
+    },
 });
 //# sourceMappingURL=cud.data-model.js.map

package/build/_modules/custom-data/_models/cud.data-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"cud.data-model.js","sourceRoot":"","sources":["../../../../src/_modules/custom-data/_models/cud.data-model.ts"],"names":[],"mappings":";;;AACA,qHAEyE;AACzE,0FAAiF;AAGjF,MAAa,eAAyB,SAAQ,mCAAa;IACzD,IAAI,CAAK;IAET,YACE,GAAwB;QAExB,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;CACF;AAZD,0CAYC;AAEY,QAAA,0BAA0B,GACrC,IAAI,uDAAqB,CAAC;IACxB,QAAQ,EAAE,YAAY;IACtB,UAAU,EAAE;QACV,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;KAChD;CACF,CAAC,CAAC"}
+{"version":3,"file":"cud.data-model.js","sourceRoot":"","sources":["../../../../src/_modules/custom-data/_models/cud.data-model.ts"],"names":[],"mappings":";;;AACA,qHAEyE;AACzE,0FAAiF;AAGjF,MAAa,eAAyB,SAAQ,mCAAa;IACzD,IAAI,CAAK;IAET,YACE,GAAwB;QAExB,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;CACF;AAZD,0CAYC;AAEY,QAAA,0BAA0B,GACrC,IAAI,uDAAqB,CAAkB;IACzC,QAAQ,EAAE,YAAY;IACtB,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;KACtD;CACF,CAAC,CAAC"}

package/build/_modules/usage/_models/usg-session.data-model.d.ts

@@ -1,5 +1,5 @@
-import { DyFM_Metadata } from '../../../_models/data-models/metadata.data-model';
 import { DyFM_DataModel_Params } from '../../../_models/control-models/data-model-params.control-model';
+import { DyFM_Metadata } from '../../../_models/data-models/metadata.data-model';
 import { DyFM_GeoIpLocation } from '../../location/_models/loc-geo-ip-location.interface';
 import { DyFM_UsageData } from './usg-data.control-model';
 export declare class DyFM_UsageSession extends DyFM_Metadata {
@@ -14,5 +14,5 @@ export declare class DyFM_UsageSession extends DyFM_Metadata {
     loggedInAs?: string;
     constructor(set?: DyFM_UsageSession);
 }
-export declare const DyFM_usageSession_dataParams: DyFM_DataModel_Params;
+export declare const DyFM_usageSession_dataParams: DyFM_DataModel_Params<DyFM_UsageSession>;
 //# sourceMappingURL=usg-session.data-model.d.ts.map

package/build/_modules/usage/_models/usg-session.data-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usg-session.data-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AACjF,OAAO,EACL,qBAAqB,EACtB,MAAM,iEAAiE,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAE1F,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,qBAAa,iBAAkB,SAAQ,aAAa;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAElC,SAAS,CAAC,EAAE,cAAc,EAAE,CAAM;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;gBAGlB,GAAG,CAAC,EAAE,iBAAiB;CAY1B;AAED,eAAO,MAAM,4BAA4B,EAAE,qBAkBvC,CAAC"}
+{"version":3,"file":"usg-session.data-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACtB,MAAM,iEAAiE,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAE1F,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,qBAAa,iBAAkB,SAAQ,aAAa;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAElC,SAAS,CAAC,EAAE,cAAc,EAAE,CAAM;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;gBAGlB,GAAG,CAAC,EAAE,iBAAiB;CAY1B;AAED,eAAO,MAAM,4BAA4B,EAAE,qBAAqB,CAAC,iBAAiB,CAkB9E,CAAC"}

package/build/_modules/usage/_models/usg-session.data-model.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DyFM_usageSession_dataParams = exports.DyFM_UsageSession = void 0;
-const metadata_data_model_1 = require("../../../_models/data-models/metadata.data-model");
 const data_model_params_control_model_1 = require("../../../_models/control-models/data-model-params.control-model");
+const metadata_data_model_1 = require("../../../_models/data-models/metadata.data-model");
 class DyFM_UsageSession extends metadata_data_model_1.DyFM_Metadata {
     date;
     sessionStart;
@@ -26,20 +26,20 @@ class DyFM_UsageSession extends metadata_data_model_1.DyFM_Metadata {
 exports.DyFM_UsageSession = DyFM_UsageSession;
 exports.DyFM_usageSession_dataParams = new data_model_params_control_model_1.DyFM_DataModel_Params({
     dataName: 'usageSession',
-    properties: [
-        { key: 'date', type: 'string',
+    properties: {
+        date: { key: 'date', type: 'string',
             required: true, index: true,
         },
-        { key: 'sessionStart', type: 'Date',
+        sessionStart: { key: 'sessionStart', type: 'Date',
             required: true, index: true,
         },
-        { key: 'sessionEnd', type: 'Date' },
-        { key: 'address', type: 'string' },
-        { key: 'issuer', type: 'string' },
-        { key: 'locationData', type: 'IpApiLocation' },
-        { key: 'usageData', type: 'UsageData[]' },
-        { key: 'totalSessionTime', type: 'number' },
-        { key: 'loggedInAs', type: 'string' },
-    ],
+        sessionEnd: { key: 'sessionEnd', type: 'Date' },
+        address: { key: 'address', type: 'string' },
+        issuer: { key: 'issuer', type: 'string' },
+        locationData: { key: 'locationData', type: 'IpApiLocation' },
+        usageData: { key: 'usageData', type: 'UsageData[]' },
+        totalSessionTime: { key: 'totalSessionTime', type: 'number' },
+        loggedInAs: { key: 'loggedInAs', type: 'string' },
+    },
 });
 //# sourceMappingURL=usg-session.data-model.js.map

package/build/_modules/usage/_models/usg-session.data-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"usg-session.data-model.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.ts"],"names":[],"mappings":";;;AACA,0FAAiF;AACjF,qHAEyE;AAKzE,MAAa,iBAAkB,SAAQ,mCAAa;IAClD,IAAI,CAAU;IACd,YAAY,CAAQ;IACpB,UAAU,CAAQ;IAClB,OAAO,CAAU;IACjB,MAAM,CAAU;IAChB,YAAY,CAAsB;IAElC,SAAS,GAAsB,EAAE,CAAC;IAClC,gBAAgB,CAAU;IAC1B,UAAU,CAAU;IAEpB,YACE,GAAuB;QAEvB,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;gBAClC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;CACF;AAzBD,8CAyBC;AAEY,QAAA,4BAA4B,GACvC,IAAI,uDAAqB,CAAC;IACxB,QAAQ,EAAE,cAAc;IACxB,UAAU,EAAE;QACV,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ;YAC3B,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI;SAC5B;QACD,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM;YACjC,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI;SAC5B;QACD,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE;QACnC,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;QAClC,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QACjC,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,eAAe,EAAE;QAC9C,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE;QACzC,EAAE,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3C,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;KACtC;CACF,CAAC,CAAC"}
+{"version":3,"file":"usg-session.data-model.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.ts"],"names":[],"mappings":";;;AACA,qHAEyE;AACzE,0FAAiF;AAKjF,MAAa,iBAAkB,SAAQ,mCAAa;IAClD,IAAI,CAAU;IACd,YAAY,CAAQ;IACpB,UAAU,CAAQ;IAClB,OAAO,CAAU;IACjB,MAAM,CAAU;IAChB,YAAY,CAAsB;IAElC,SAAS,GAAsB,EAAE,CAAC;IAClC,gBAAgB,CAAU;IAC1B,UAAU,CAAU;IAEpB,YACE,GAAuB;QAEvB,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;gBAClC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;CACF;AAzBD,8CAyBC;AAEY,QAAA,4BAA4B,GACvC,IAAI,uDAAqB,CAAoB;IAC3C,QAAQ,EAAE,cAAc;IACxB,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ;YACjC,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI;SAC5B;QACD,YAAY,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM;YAC/C,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI;SAC5B;QACD,UAAU,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE;QAC/C,OAAO,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3C,MAAM,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzC,YAAY,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,eAAe,EAAE;QAC5D,SAAS,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE;QACpD,gBAAgB,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7D,UAAU,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;KAClD;CACF,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/fsm-dynamo",
-  "version": "01.09.43",
+  "version": "01.09.46",
   "description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
   "scripts": {
     "prep": "npm i pnpm -g && npm i rimraf nodemon -g",

package/src/_collections/utils/array.util.ts

@@ -57,6 +57,10 @@ export class DyFM_Array {
     return array?.length ? array[array.length - 1] : null;
   }
 
+  static first<T>(array: T[]): T {
+    return array?.length ? array[0] : null;
+  }
+
   static remove<T>(array: T[], element: T): T[] {
     const index = array.indexOf(element);
 

package/src/_models/control-models/data-model-params.control-model.ts

@@ -1,26 +1,27 @@
 
+import { DyFM_Log } from '../../_collections/utils/log.util';
 import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
 import { DyFM_Metadata } from '../data-models/metadata.data-model';
-import { DyFM_DataProperty_Params } from './data-property-params.control-model';
+import { DyFM_DataProperties } from './data-property-params.control-model';
 
-export type DyFM_Data_S = DyFM_DataModel_Settings;
-export type DyFM_Data_Settings = DyFM_DataModel_Settings;
-export class DyFM_DataModel_Settings extends DyFM_Metadata {
+export type DyFM_Data_S<T> = DyFM_DataModel_Settings<T>;
+export type DyFM_Data_Settings<T> = DyFM_DataModel_Settings<T>;
+export class DyFM_DataModel_Settings<T extends DyFM_Metadata> extends DyFM_Metadata {
   dataName: string;
   modelType?: DyFM_DataModel_Type;
   dbName?: string;
   addArchive?: boolean;
-  properties?: DyFM_DataProperty_Params[];
+  properties: DyFM_DataProperties<T>;
 }
 
-export type DyFM_Data_P = DyFM_DataModel_Params;
-export type DyFM_Data_Params = DyFM_DataModel_Params;
-export class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
+export type DyFM_Data_P<T> = DyFM_DataModel_Params<T>;
+export type DyFM_Data_Params<T> = DyFM_DataModel_Params<T>;
+export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataModel_Settings<T> {
   
-  override properties?: DyFM_DataProperty_Params[] = [];
+  /* override properties?: DyFM_DataProperties<T>; */
 
   constructor(
-    set: DyFM_DataModel_Settings
+    set: DyFM_DataModel_Settings<T>
   ) {
     super(set);
 
@@ -28,6 +29,26 @@ export class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
       Object.assign(this, set);
     }
 
+    if (!this.properties || typeof this.properties !== 'object') {
+      DyFM_Log.error(
+        'DyFM_DataModel_Params.constructor: ' +
+        'Properties are missing in ' + this.dataName + ' model.'
+      );
+
+      this.properties = {} as DyFM_DataProperties<T>;
+    }
+
+    Object.keys(this.properties).forEach((key: string): void => {
+      if (!key) {
+        DyFM_Log.error(
+          'DyFM_DataModel_Params.constructor: ' +
+          'A property key is missing in ' + this.dataName + ' model.'
+        );
+      }
+      
+      this.properties[key].key = key;
+    });
+
     if (!this?.modelType || this?.modelType == DyFM_DataModel_Type.data) {
       this.modelType = DyFM_DataModel_Type.data;
     }

package/src/_models/control-models/data-property-params.control-model.ts

@@ -1,15 +1,18 @@
 import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
 
+export type DyFM_DataProperties<T> = {
+  [K in keyof T]: DyFM_DataProperty_Params<T[K]>;
+}
+
 export type DyFM_DataPropertySettings<T = any> = DyFM_DataProperty_Settings<T>;
 
-export class DyFM_DataProperty_Settings<T = any>{
-  key: string;
+export class DyFM_DataProperty_Settings<T>{
   type: DyFM_BasicProperty_Type | string;
   default?: T;
 
   unique?: boolean;
   readonly?: boolean;
-  required?: boolean = true;
+  required?: boolean;
   index?: boolean;
 
   isDependencyHook?: boolean;
@@ -26,34 +29,36 @@ export class DyFM_DataProperty_Settings<T = any>{
   minlength?: number;
   maxlength?: number;
 
-  subObjectParams?: DyFM_DataProperty_Params[];
+  subObjectParams?: DyFM_DataProperties<T>;
 
   additionalValidators?: ((data: any/* : T[K] */) => void)[];
 }
 
 
-export type DyFM_DataPropertyParams = DyFM_DataProperty_Params;
-export type DyFM_DPropPs = DyFM_DataProperty_Params;
+export type DyFM_DataPropertyParams<T> = DyFM_DataProperty_Params<T>;
+export type DyFM_DPropPs<T> = DyFM_DataProperty_Params<T>;
 /**
  * This will be used for setting up db. 
  * DataServices also uses this to prehook tools, as db service and dependency db service.
  */
-export class DyFM_DataProperty_Params extends DyFM_DataProperty_Settings {
+export class DyFM_DataProperty_Params<T> extends DyFM_DataProperty_Settings<T> {
+  key?: string;
 
-  override subObjectParams?: DyFM_DataProperty_Params[] = [];
+  /* override subObjectParams?: DyFM_DataProperty_Params<>[] = []; */
+  /* override subObjectParams?: DyFM_Data_Params<T> = {}; */
 
   override additionalValidators?: ((data: any) => void)[] = [];
 
   constructor(
-    set: DyFM_DataProperty_Settings
+    set: DyFM_DataProperty_Settings<T>
   ) {
     super();
     
     if (set) {
-      if (!set.key || !set.type) {
+      if (!set.type) {
         console.error(
           `DYNAMO ERROR: `,
-          `\n key or type is missing from DynamoBEDataPropertyParams`, 
+          `\n type is missing from DynamoBEDataPropertyParams`, 
         );
       }
 
@@ -61,7 +66,7 @@ export class DyFM_DataProperty_Params extends DyFM_DataProperty_Settings {
         console.error(
           `DYNAMO ERROR: `,
           `\n dependencyName missing for dependencyHook from ` +
-            `DynamoBEDataPropertyParams (${set.key})`, 
+            `DynamoBEDataPropertyParams`// (${set.key})`, 
         );
       }
       

package/src/_modules/custom-data/_models/cud.data-model.ts

@@ -1,6 +1,6 @@
 
-import { 
-  DyFM_DataModel_Params 
+import {
+  DyFM_DataModel_Params
 } from '../../../_models/control-models/data-model-params.control-model';
 import { DyFM_Metadata } from '../../../_models/data-models/metadata.data-model';
 
@@ -19,11 +19,11 @@ export class DyFM_CustomData<T = any> extends DyFM_Metadata {
   }
 }
 
-export const DyFM_customData_dataParams: DyFM_DataModel_Params = 
-  new DyFM_DataModel_Params({
+export const DyFM_customData_dataParams: DyFM_DataModel_Params<DyFM_CustomData> = 
+  new DyFM_DataModel_Params<DyFM_CustomData>({
     dataName: 'customData',
-    properties: [
-      { key: 'data', type: 'string', required: true },
-    ],
+    properties: {
+      data: { key: 'data', type: 'string', required: true },
+    },
   });
 

package/src/_modules/usage/_models/usg-session.data-model.ts

@@ -1,8 +1,8 @@
 
-import { DyFM_Metadata } from '../../../_models/data-models/metadata.data-model';
-import { 
-  DyFM_DataModel_Params 
+import {
+  DyFM_DataModel_Params
 } from '../../../_models/control-models/data-model-params.control-model';
+import { DyFM_Metadata } from '../../../_models/data-models/metadata.data-model';
 import { DyFM_GeoIpLocation } from '../../location/_models/loc-geo-ip-location.interface';
 
 import { DyFM_UsageData } from './usg-data.control-model';
@@ -34,22 +34,22 @@ export class DyFM_UsageSession extends DyFM_Metadata {
   }
 }
 
-export const DyFM_usageSession_dataParams: DyFM_DataModel_Params = 
-  new DyFM_DataModel_Params({
+export const DyFM_usageSession_dataParams: DyFM_DataModel_Params<DyFM_UsageSession> = 
+  new DyFM_DataModel_Params<DyFM_UsageSession>({
     dataName: 'usageSession',
-    properties: [
-      { key: 'date', type: 'string',
+    properties: {
+      date: { key: 'date', type: 'string',
         required: true, index: true,
       },
-      { key: 'sessionStart', type: 'Date',
+      sessionStart: { key: 'sessionStart', type: 'Date',
         required: true, index: true,
       },
-      { key: 'sessionEnd', type: 'Date' },
-      { key: 'address', type: 'string' },
-      { key: 'issuer', type: 'string' },
-      { key: 'locationData', type: 'IpApiLocation' },
-      { key: 'usageData', type: 'UsageData[]' },
-      { key: 'totalSessionTime', type: 'number' },
-      { key: 'loggedInAs', type: 'string' },
-    ],
+      sessionEnd: { key: 'sessionEnd', type: 'Date' },
+      address: { key: 'address', type: 'string' },
+      issuer: { key: 'issuer', type: 'string' },
+      locationData: { key: 'locationData', type: 'IpApiLocation' },
+      usageData: { key: 'usageData', type: 'UsageData[]' },
+      totalSessionTime: { key: 'totalSessionTime', type: 'number' },
+      loggedInAs: { key: 'loggedInAs', type: 'string' },
+    },
   });