@futdevpro/fsm-dynamo 1.11.37 → 1.11.38

package/build/_modules/pipe/_collections/utils/pip-smart-replace-pipe.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"pip-smart-replace-pipe.util.js","sourceRoot":"","sources":["../../../../../src/_modules/pipe/_collections/utils/pip-smart-replace-pipe.util.ts"],"names":[],"mappings":";;AAsBA,0EAwDC;AAtED,yEAA0E;AAG1E;;;;;;;;;;GAUG;AACH,SAAgB,+BAA+B,CAC7C,KAAa,EAAE,QAAgB,EAAE,UAAqC;IAGtE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,CAAC,IAAI,CACV,kBAAkB;YAClB,iDAAiD,EACjD,MAAM,EACN,IAAI,KAAK,EAAE,CACZ,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;gBAC1B,OAAO,CAAC,IAAI,CACV,kBAAkB;oBAClB,gCAAgC,GAAG,GAAG,GAAG,+BAA+B,EACxE,MAAM,EACN,IAAI,KAAK,EAAE,CACZ,CAAC;gBAEF,OAAO;YACT,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxC,OAAO,CAAC,IAAI,CACV,kBAAkB;oBAClB,gCAAgC,GAAG,GAAG,GAAG,gCAAgC,EACzE,MAAM,EACN,IAAI,KAAK,EAAE,CACZ,CAAC;gBAEF,OAAO;YACT,CAAC;YAED,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAA,uDAA4B,EAC1C,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EACnB,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,CACpB,CAAC;QACJ,CAAC;QAED,IAAI,UAAU,EAAE,MAAM,EAAE,CAAC;YACvB,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAA,uDAA4B,EAC1C,QAAQ,CAAC,GAAG,CAAC,EACb,UAAU,CACX,CAAC;QACJ,CAAC;QAED,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"pip-smart-replace-pipe.util.js","sourceRoot":"","sources":["../../../../../src/_modules/pipe/_collections/utils/pip-smart-replace-pipe.util.ts"],"names":[],"mappings":";;AAuBA,0EAwDC;AAxED,sEAAmE;AAEnE,yEAA0E;AAG1E;;;;;;;;;;GAUG;AACH,SAAgB,+BAA+B,CAC7C,KAAa,EAAE,QAAgB,EAAE,UAAqC;IAGtE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,mBAAQ,CAAC,IAAI,CACX,kBAAkB;YAClB,iDAAiD,EACjD,MAAM,EACN,IAAI,KAAK,EAAE,CACZ,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;gBAC1B,mBAAQ,CAAC,IAAI,CACX,kBAAkB;oBAClB,gCAAgC,GAAG,GAAG,GAAG,+BAA+B,EACxE,MAAM,EACN,IAAI,KAAK,EAAE,CACZ,CAAC;gBAEF,OAAO;YACT,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxC,mBAAQ,CAAC,IAAI,CACX,kBAAkB;oBAClB,gCAAgC,GAAG,GAAG,GAAG,gCAAgC,EACzE,MAAM,EACN,IAAI,KAAK,EAAE,CACZ,CAAC;gBAEF,OAAO;YACT,CAAC;YAED,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAA,uDAA4B,EAC1C,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EACnB,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,CACpB,CAAC;QACJ,CAAC;QAED,IAAI,UAAU,EAAE,MAAM,EAAE,CAAC;YACvB,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAA,uDAA4B,EAC1C,QAAQ,CAAC,GAAG,CAAC,EACb,UAAU,CACX,CAAC;QACJ,CAAC;QAED,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/build/_modules/pipe/_collections/utils/pip-smart-replace-pipe.util.spec.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const log_util_1 = require("../../../../_collections/utils/log.util");
 const pip_smart_replace_pipe_util_1 = require("./pip-smart-replace-pipe.util");
 describe('| DyFM_smartReplace_pipeTransform', () => {
     it('| should return the original value if replacer is not defined', () => {
@@ -8,25 +9,25 @@ describe('| DyFM_smartReplace_pipeTransform', () => {
     });
     it('| should replace keys with values from replacer', () => {
         const replacer = { name: { value: 'World', pipes: [] } };
-        spyOn(console, 'warn');
+        spyOn(log_util_1.DyFM_Log, 'warn');
         const result = (0, pip_smart_replace_pipe_util_1.DyFM_smartReplace_pipeTransform)('Hello, {name}!', replacer);
         expect(result).toBe('Hello, World!');
-        expect(console.warn).not.toHaveBeenCalled();
+        expect(log_util_1.DyFM_Log.warn).not.toHaveBeenCalled();
     });
     it('| should warn if replacer key has no pipes', () => {
         const replacer = { name: { value: 'World' } };
-        spyOn(console, 'warn');
+        spyOn(log_util_1.DyFM_Log, 'warn');
         const result = (0, pip_smart_replace_pipe_util_1.DyFM_smartReplace_pipeTransform)('Hello, {name}!', replacer);
         expect(result).toBeUndefined();
-        expect(console.warn).toHaveBeenCalledWith('DYNAMO WARNING: ' +
+        expect(log_util_1.DyFM_Log.warn).toHaveBeenCalledWith('DYNAMO WARNING: ' +
             '\nSmartReplacePipe: replaceTo[name].multiPipe is not defined...', '\n\n', jasmine.any(Error));
     });
     it('| should warn if replacer key pipes is not an array', () => {
         const replacer = { name: { value: 'World', pipes: 'not-an-array' } };
-        spyOn(console, 'warn');
+        spyOn(log_util_1.DyFM_Log, 'warn');
         const result = (0, pip_smart_replace_pipe_util_1.DyFM_smartReplace_pipeTransform)('Hello, {name}!', replacer);
         expect(result).toBeUndefined();
-        expect(console.warn).toHaveBeenCalledWith('DYNAMO WARNING: ' +
+        expect(log_util_1.DyFM_Log.warn).toHaveBeenCalledWith('DYNAMO WARNING: ' +
             '\nSmartReplacePipe: replaceTo[name].multiPipe is not an array...', '\n\n', jasmine.any(Error));
     });
     /* it('| should apply multiPipes if provided', () => {

package/build/_modules/pipe/_collections/utils/pip-smart-replace-pipe.util.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"pip-smart-replace-pipe.util.spec.js","sourceRoot":"","sources":["../../../../../src/_modules/pipe/_collections/utils/pip-smart-replace-pipe.util.spec.ts"],"names":[],"mappings":";;AACA,+EAAgF;AAEhF,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC;QACzD,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACrC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC;QAC9C,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,oBAAoB,CACvC,kBAAkB;YAClB,iEAAiE,EACjE,MAAM,EACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC;QACrE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,oBAAoB,CACvC,kBAAkB;YAClB,kEAAkE,EAClE,MAAM,EACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH;;;;;;;UAOM;IAEN,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,QAAQ,GAAG;YACf,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;YACvC,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;SACtC,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gCAAgC,EAAE,QAAQ,CAAC,CAAC;QAC3F,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"pip-smart-replace-pipe.util.spec.js","sourceRoot":"","sources":["../../../../../src/_modules/pipe/_collections/utils/pip-smart-replace-pipe.util.spec.ts"],"names":[],"mappings":";;AACA,sEAAmE;AACnE,+EAAgF;AAEhF,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC;QACzD,KAAK,CAAC,mBAAQ,EAAE,MAAM,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACrC,MAAM,CAAC,mBAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC;QAC9C,KAAK,CAAC,mBAAQ,EAAE,MAAM,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QAC/B,MAAM,CAAC,mBAAQ,CAAC,IAAI,CAAC,CAAC,oBAAoB,CACxC,kBAAkB;YAClB,iEAAiE,EACjE,MAAM,EACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC;QACrE,KAAK,CAAC,mBAAQ,EAAE,MAAM,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;QAC/B,MAAM,CAAC,mBAAQ,CAAC,IAAI,CAAC,CAAC,oBAAoB,CACxC,kBAAkB;YAClB,kEAAkE,EAClE,MAAM,EACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH;;;;;;;UAOM;IAEN,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,QAAQ,GAAG;YACf,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;YACvC,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;SACtC,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,6DAA+B,EAAC,gCAAgC,EAAE,QAAQ,CAAC,CAAC;QAC3F,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const basic_property_type_enum_1 = require("../../../_enums/basic-property-type.enum");
 const usg_session_data_model_1 = require("./usg-session.data-model");
 describe('| DyFM_UsageSession', () => {
     it('| should create an instance with default values', () => {
@@ -53,27 +54,29 @@ describe('| DyFM_usageSession_dataParams', () => {
     it('| should have the correct properties configuration', () => {
         const properties = usg_session_data_model_1.DyFM_usageSession_dataParams.properties;
         expect(properties.date.key).toBe('date');
-        expect(properties.date.type).toBe('string');
+        expect(properties.date.type).toBe(basic_property_type_enum_1.DyFM_BasicProperty_Type.string);
         expect(properties.date.required).toBe(true);
         expect(properties.date.index).toBe(true);
         expect(properties.sessionStart.key).toBe('sessionStart');
-        expect(properties.sessionStart.type).toBe('Date');
+        expect(properties.sessionStart.type).toBe(basic_property_type_enum_1.DyFM_BasicProperty_Type.date);
         expect(properties.sessionStart.required).toBe(true);
         expect(properties.sessionStart.index).toBe(true);
         expect(properties.sessionEnd.key).toBe('sessionEnd');
-        expect(properties.sessionEnd.type).toBe('Date');
+        expect(properties.sessionEnd.type).toBe(basic_property_type_enum_1.DyFM_BasicProperty_Type.date);
         expect(properties.address.key).toBe('address');
-        expect(properties.address.type).toBe('string');
+        expect(properties.address.type).toBe(basic_property_type_enum_1.DyFM_BasicProperty_Type.string);
         expect(properties.issuer.key).toBe('issuer');
-        expect(properties.issuer.type).toBe('string');
+        expect(properties.issuer.type).toBe(basic_property_type_enum_1.DyFM_BasicProperty_Type.string);
         expect(properties.locationData.key).toBe('locationData');
-        expect(properties.locationData.type).toBe('IpApiLocation');
+        expect(properties.locationData.type).toBe(basic_property_type_enum_1.DyFM_BasicProperty_Type.object);
+        expect(properties.locationData.nonBasicType).toBe('IpApiLocation');
         expect(properties.usageData.key).toBe('usageData');
-        expect(properties.usageData.type).toBe('UsageData[]');
+        expect(properties.usageData.type).toBe(basic_property_type_enum_1.DyFM_BasicProperty_Type.array);
+        expect(properties.usageData.nonBasicType).toBe('UsageData[]');
         expect(properties.totalSessionTime.key).toBe('totalSessionTime');
-        expect(properties.totalSessionTime.type).toBe('number');
+        expect(properties.totalSessionTime.type).toBe(basic_property_type_enum_1.DyFM_BasicProperty_Type.number);
         expect(properties.loggedInAs.key).toBe('loggedInAs');
-        expect(properties.loggedInAs.type).toBe('string');
+        expect(properties.loggedInAs.type).toBe(basic_property_type_enum_1.DyFM_BasicProperty_Type.string);
     });
 });
 //# sourceMappingURL=usg-session.data-model.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"usg-session.data-model.spec.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"usg-session.data-model.spec.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/fsm-dynamo",
-  "version": "01.11.37",
+  "version": "01.11.38",
   "description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
   "DyBu_settings": {
     "packageType": "full-stack-package",

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

@@ -1,3 +1,4 @@
+import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
 
 /**
  * checks if the value is not null or undefined
@@ -5,3 +6,47 @@
 export function DyFM_notNull(value: any): boolean {
   return value !== null && value !== undefined;
 }
+
+/**
+ * checks if the value is a function
+ */
+export function DyFM_getBasicPropertyType(type: string): DyFM_BasicProperty_Type {
+  if (!type) {
+    throw new Error('Type is missing');
+  }
+
+  switch (type.toLocaleLowerCase()) {
+    case DyFM_BasicProperty_Type.string:
+    case 'string':
+      return DyFM_BasicProperty_Type.string;
+
+    case DyFM_BasicProperty_Type.number:
+    case 'number':
+      return DyFM_BasicProperty_Type.number;
+
+    case DyFM_BasicProperty_Type.boolean:
+    case 'boolean':
+      return DyFM_BasicProperty_Type.boolean;
+
+    case DyFM_BasicProperty_Type.date:
+    case 'date':
+      return DyFM_BasicProperty_Type.date;
+
+    case DyFM_BasicProperty_Type.object:
+    case 'object':
+      return DyFM_BasicProperty_Type.object;
+
+    case DyFM_BasicProperty_Type.array:
+    case 'array':
+      return DyFM_BasicProperty_Type.array;
+      
+    default:
+      if (type.includes('[]') || type.includes('array')) {
+        return DyFM_BasicProperty_Type.array;
+      } else if (type.includes('=>') || type.includes('function')) {
+        return DyFM_BasicProperty_Type.function;
+      } else {
+        return DyFM_BasicProperty_Type.object;
+      }
+  }
+}

package/src/_enums/basic-property-type.enum.ts

@@ -13,6 +13,8 @@ export enum DyFM_BasicProperty_Type {
   string = 'string',
   number = 'number',
   boolean = 'boolean',
-  date = 'Date',
+  date = 'date',
   object = 'object',
+  array = 'array',
+  function = 'function',
 }

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

@@ -1,8 +1,10 @@
 import { DyFM_Log } from '../../_collections/utils/log.util';
+import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
 import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
 import { DyFM_Metadata } from '../data-models/metadata.data-model';
 import { DyFM_DataModel_Params, DyFM_DataModel_Settings } from './data-model-params.control-model';
 import { DyFM_DataProperties } from './data-property-params.control-model';
+import { DyFM_Error } from './error.control-model';
 
 describe('| DyFM_DataModel_Params', () => {
   class MockMetadata extends DyFM_Metadata {
@@ -35,9 +37,25 @@ describe('| DyFM_DataModel_Params', () => {
     expect(params.properties).toEqual({});
   });
 
+  it('| should log an error if a property type is missing', () => {
+    spyOn(DyFM_Error, 'logSimple');
+    spyOn(DyFM_Log, 'warn');
+    mockSettings.properties = { '': { key: 'asd', type: '' } } as any;
+    const params = new DyFM_DataModel_Params(mockSettings);
+    expect(DyFM_Error.logSimple).toHaveBeenCalledWith(
+      'DyFM_DataModel_Params.constructor error:',
+      new Error('Type is missing')
+    );
+    expect(DyFM_Log.warn).toHaveBeenCalledWith(
+      'Due to the error, the Params contruction failed, therefore the model is not constructed properly. ' +
+      `("test_model" model)` +
+      `\nstackLocation: ${params.stackLocation}`
+    );
+  });
+
   it('| should log an error if a property key is missing', () => {
     spyOn(DyFM_Log, 'error');
-    mockSettings.properties = { '': { key: '' } } as any;
+    mockSettings.properties = { '': { key: '', type: 'any' } } as any;
     const params = new DyFM_DataModel_Params(mockSettings);
     expect(DyFM_Log.error).toHaveBeenCalledWith(
       'DyFM_DataModel_Params.constructor: A property key is missing in "test_model" model.' +
@@ -45,6 +63,16 @@ describe('| DyFM_DataModel_Params', () => {
     );
   });
 
+  it('| should log an error if dataName is missing', () => {
+    spyOn(DyFM_Log, 'error');
+    mockSettings.dataName = '';
+    const params = new DyFM_DataModel_Params(mockSettings);
+    expect(DyFM_Log.error).toHaveBeenCalledWith(
+      'DyFM_DataModel_Params.constructor: dataName is missing in "" model.' +
+      `\nstackLocation: ${params.stackLocation}\n`
+    );
+  });
+
   it('| should set modelType to data if not provided or is data', () => {
     const params = new DyFM_DataModel_Params(mockSettings);
     expect(params.modelType).toBe(DyFM_DataModel_Type.data);

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

@@ -1,9 +1,11 @@
 import { DyFM_Log } from '../../_collections/utils/log.util';
 import { DyFM_getConstructionStackLocation } from '../../_collections/utils/stack.util';
+import { DyFM_getBasicPropertyType } from '../../_collections/utils/utilities.util';
 import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
 import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
 import { DyFM_Metadata } from '../data-models/metadata.data-model';
 import { DyFM_DataProperties, DyFM_DataProperty_Params } from './data-property-params.control-model';
+import { DyFM_Error } from './error.control-model';
 
 /* export type DyFM_Data_S<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>;
 export type DyFM_Data_Settings<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>; */
@@ -45,170 +47,198 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
   ) {
     super(set);
 
-    if (set) {
-      Object.assign(this, set);
-    }
-
-    this.stackLocation = DyFM_getConstructionStackLocation();
-
-    if (!this.properties || typeof this.properties !== 'object') {
-      DyFM_Log.error(
-        'DyFM_DataModel_Params.constructor: ' +
-        `Properties are missing in "${this.dataName}" model.` +
-        `\nstackLocation: ${this.stackLocation}\n`
-      );
-
-      this.properties = {} as DyFM_DataProperties<T>;
-    }
-
-    const keys: string[] = Object.keys(this.properties);
-    keys.forEach((key: string): void => {
-      if (!key) {
+    try {
+      if (set) {
+        Object.assign(this, set);
+      }
+  
+      this.stackLocation = DyFM_getConstructionStackLocation();
+  
+      if (!this.properties || typeof this.properties !== 'object') {
         DyFM_Log.error(
           'DyFM_DataModel_Params.constructor: ' +
-          `A property key is missing in "${this.dataName}" model.` +
+          `Properties are missing in "${this.dataName}" model.` +
           `\nstackLocation: ${this.stackLocation}\n`
         );
+  
+        this.properties = {} as DyFM_DataProperties<T>;
       }
-      
-      const property: DyFM_DataProperty_Params<any, T> = new DyFM_DataProperty_Params({
-        ...this.properties[key],
-        key: key,
-      }, this);
-      this.properties[key] = property;
-
-      if (property.subObjectParams) {
-        this.setKeysForSubObjectParams(property);
-      }
-    });
-
-    keys.forEach((key: string): void => {
-      const property: DyFM_DataProperty_Params<any, T> = this.properties[key];
-      /* if (property.vectorizeTo) {
-        if (!this.properties[property.vectorizeTo]) {
-          throw new Error(
-            `Vectorize to property "${property.vectorizeTo}" is not found in ` +
-            `"${this.dataName}" model.`
+  
+      const keys: string[] = Object.keys(this.properties);
+      keys.forEach((key: string): void => {
+        if (!key) {
+          DyFM_Log.error(
+            'DyFM_DataModel_Params.constructor: ' +
+            `A property key is missing in "${this.dataName}" model.` +
+            `\nstackLocation: ${this.stackLocation}\n`
           );
         }
-
-        this.properties[property.vectorizeTo].vectorizeFrom ??= key;
-      } */
-
-      if (property.vectorizedFrom) {
-        property.vectorizedFrom.forEach((fromKey: string): void => {
-          if (!this.properties[fromKey]) {
+        
+        const propertyParams: DyFM_DataProperty_Params<any, T> = new DyFM_DataProperty_Params({
+          ...this.properties[key],
+          key: key,
+        }, this);
+        const basicType: DyFM_BasicProperty_Type = DyFM_getBasicPropertyType(propertyParams.type);
+        if (basicType !== propertyParams.type) {
+          propertyParams.nonBasicType = propertyParams.type;
+          propertyParams.type = basicType;
+        }
+        this.properties[key] = propertyParams;
+  
+        if (propertyParams.subObjectParams) {
+          this.setKeysForSubObjectParams(propertyParams);
+        }
+      });
+  
+      keys.forEach((key: string): void => {
+        const property: DyFM_DataProperty_Params<any, T> = this.properties[key];
+        /* if (property.vectorizeTo) {
+          if (!this.properties[property.vectorizeTo]) {
+            throw new Error(
+              `Vectorize to property "${property.vectorizeTo}" is not found in ` +
+              `"${this.dataName}" model.`
+            );
+          }
+  
+          this.properties[property.vectorizeTo].vectorizeFrom ??= key;
+        } */
+  
+        if (property.vectorizedFrom) {
+          property.vectorizedFrom.forEach((fromKey: string): void => {
+            if (!this.properties[fromKey]) {
+              DyFM_Log.error(
+                `Vectorized from property "${fromKey}" is not found in ` +
+                `"${this.dataName}" model.` +
+                `\nstackLocation: ${this.stackLocation}\n`
+              );
+            }
+  
+            /* if (!this.properties[fromKey].vectorizeUseIndex) {
+              DyFM_Log.error(
+                `Vectorized from property "${fromKey}" has no vectorizeUseIndex in ` +
+                `"${this.dataName}" model.` +
+                `\nstackLocation: ${this.stackLocation}\n`
+              );
+            } */
+  
+            /* if (
+              (this.properties[fromKey] as DyFM_DataProperty_Params<any>)?.type !== DyFM_BasicProperty_Type.string
+            ) {
+              DyFM_Log.error(
+                `Vectorized from property "${property.vectorizedFrom}" is not a string property in ` +
+                `"${this.dataName}" model.` +
+                `\nstackLocation: ${this.stackLocation}\n`
+              );
+            } */
+          });
+  
+          /* this.properties[property.vectorizedFrom].vectorizeTo ??= key; */
+  
+          if (property.type !== 'number[]') {
             DyFM_Log.error(
-              `Vectorized from property "${fromKey}" is not found in ` +
+              `Vectorized from property "${property.vectorizedFrom}" is not a number[] property in ` +
               `"${this.dataName}" model.` +
               `\nstackLocation: ${this.stackLocation}\n`
             );
           }
-
-          /* if (!this.properties[fromKey].vectorizeUseIndex) {
+  
+          if (!property.vectorizeUseIndex) {
             DyFM_Log.error(
-              `Vectorized from property "${fromKey}" has no vectorizeUseIndex in ` +
+              'vectorizeUseIndex is required if vectorizedFrom is set. ' +
               `"${this.dataName}" model.` +
               `\nstackLocation: ${this.stackLocation}\n`
             );
-          } */
-
-          /* if (
-            (this.properties[fromKey] as DyFM_DataProperty_Params<any>)?.type !== DyFM_BasicProperty_Type.string
-          ) {
-            DyFM_Log.error(
-              `Vectorized from property "${property.vectorizedFrom}" is not a string property in ` +
+          }
+  
+          if (property.index) {
+            /** {@link DyFM_DataProperty_Params.vectorizeUseIndex} */
+            DyFM_Log.warn(
+              `index is not recommended to be set for vectorized properties in ` +
+              `"${this.dataName}" model. ` +
+              `\n(you should set it in the Atlas and vectorizeUseIndex, ` +
+              `more info at DyFM_DataProperty_Params.vectorizeUseIndex))` +
+              `\nstackLocation: ${this.stackLocation}\n`
+            );
+          }
+  
+          /* if (!this.properties[property.vectorizeUseIndex]) {
+            throw new Error(
+              `vectorizeUseIndex property "${property.vectorizeUseIndex}" is not found in ` +
               `"${this.dataName}" model.` +
               `\nstackLocation: ${this.stackLocation}\n`
             );
+          }
+  
+          if (!(this.properties[property.vectorizeUseIndex] as DyFM_DataProperty_Params<any>).index) {
+            throw new Error(
+              `vectorizeUseIndex property "${property.vectorizeUseIndex}" is not an ` +
+              `index property in "${this.dataName}" model.` +
+              `\nstackLocation: ${this.stackLocation}`
+            );
           } */
-        });
-
-        /* this.properties[property.vectorizedFrom].vectorizeTo ??= key; */
-
-        if (property.type !== 'number[]') {
-          DyFM_Log.error(
-            `Vectorized from property "${property.vectorizedFrom}" is not a number[] property in ` +
-            `"${this.dataName}" model.` +
-            `\nstackLocation: ${this.stackLocation}\n`
-          );
-        }
-
-        if (!property.vectorizeUseIndex) {
-          DyFM_Log.error(
-            'vectorizeUseIndex is required if vectorizedFrom is set. ' +
-            `"${this.dataName}" model.` +
-            `\nstackLocation: ${this.stackLocation}\n`
-          );
-        }
-
-        if (property.index) {
-          /** {@link DyFM_DataProperty_Params.vectorizeUseIndex} */
-          DyFM_Log.warn(
-            `index is not recommended to be set for vectorized properties in ` +
-            `"${this.dataName}" model. ` +
-            `\n(you should set it in the Atlas and vectorizeUseIndex, ` +
-            `more info at DyFM_DataProperty_Params.vectorizeUseIndex))` +
-            `\nstackLocation: ${this.stackLocation}\n`
-          );
-        }
-
-        /* if (!this.properties[property.vectorizeUseIndex]) {
-          throw new Error(
-            `vectorizeUseIndex property "${property.vectorizeUseIndex}" is not found in ` +
-            `"${this.dataName}" model.` +
-            `\nstackLocation: ${this.stackLocation}\n`
-          );
-        }
-
-        if (!(this.properties[property.vectorizeUseIndex] as DyFM_DataProperty_Params<any>).index) {
-          throw new Error(
-            `vectorizeUseIndex property "${property.vectorizeUseIndex}" is not an ` +
-            `index property in "${this.dataName}" model.` +
-            `\nstackLocation: ${this.stackLocation}`
-          );
-        } */
-      }
-    });
-
-    if (!this?.modelType || this?.modelType == DyFM_DataModel_Type.data) {
-      this.modelType = DyFM_DataModel_Type.data;
-    }
-
-    /* if (!this.dbName && this?.modelType == DyFM_DataModel_Type.data) {
-      // upper case first letter
-      this.dbName = this.dataName.charAt(0).toUpperCase() + this.dataName.slice(1);
-      
-      this.dbName.split('').forEach((char: string, index: number): void => {
-        if (
-          index > 0 && 
-          this.dbName[index - 1] === '_' && 
-          char === char.toUpperCase()
-        ) {
-          this.dbName = this.dbName.slice(0, index) + 
-                        char.toLowerCase() + 
-                        this.dbName.slice(index + 1);
         }
       });
-    } */
-
-    // check for any Uppercase letters in dbName
-    if (RegExp(/[A-Z]/).exec(this.dataName)) {
+  
+      if (!this?.modelType || this?.modelType == DyFM_DataModel_Type.data) {
+        this.modelType = DyFM_DataModel_Type.data;
+      }
+  
+      /* if (!this.dbName && this?.modelType == DyFM_DataModel_Type.data) {
+        // upper case first letter
+        this.dbName = this.dataName.charAt(0).toUpperCase() + this.dataName.slice(1);
+        
+        this.dbName.split('').forEach((char: string, index: number): void => {
+          if (
+            index > 0 && 
+            this.dbName[index - 1] === '_' && 
+            char === char.toUpperCase()
+          ) {
+            this.dbName = this.dbName.slice(0, index) + 
+                          char.toLowerCase() + 
+                          this.dbName.slice(index + 1);
+          }
+        });
+      } */
+  
+      if (!this.dataName) {
+        DyFM_Log.error(
+          'DyFM_DataModel_Params.constructor: ' +
+          `dataName is missing in "${this.dataName}" model.` +
+          `\nstackLocation: ${this.stackLocation}\n`
+        );
+        this.dataName = 'UNNAMED_MODEL';
+      }
+  
+      // check for any Uppercase letters in dbName
+      if (RegExp(/[A-Z]/).exec(this.dataName)) {
+        DyFM_Log.warn(
+          'DyFM_DataModel_Params.constructor: ' +
+          `dbName should be in snake_case in "${this.dataName}" model.` +
+          'For future compatibility.' +
+          `\nstackLocation: ${this.stackLocation}\n`
+        );
+      }
+  
+      if (this.dataName.includes('-')) {
+        DyFM_Log.warn(
+          'DyFM_DataModel_Params.constructor: ' +
+          `dataName should be in snake_case in "${this.dataName}" model.` +
+          'For future compatibility.' +
+          `\nstackLocation: ${this.stackLocation}\n`
+        );
+      }
+    } catch (error) {
+      DyFM_Error.logSimple('DyFM_DataModel_Params.constructor error:', error);
       DyFM_Log.warn(
-        'DyFM_DataModel_Params.constructor: ' +
-        `dbName should be in snake_case in "${this.dataName}" model.` +
-        'For future compatibility.' +
-        `\nstackLocation: ${this.stackLocation}\n`
+        'Due to the error, the Params contruction failed, therefore the model is not constructed properly. ' +
+        `("${this.dataName}" model)` +
+        `\nstackLocation: ${this.stackLocation}`
       );
-    }
-
-    if (this.dataName.includes('-')) {
-      DyFM_Log.warn(
+      /* DyFM_Log.error(
         'DyFM_DataModel_Params.constructor: ' +
-        `dataName should be in snake_case in "${this.dataName}" model.` +
-        'For future compatibility.' +
+        `An error occurred while constructing the "${this.dataName}" model.` +
         `\nstackLocation: ${this.stackLocation}\n`
-      );
+      ); */
     }
   }
 
@@ -227,10 +257,17 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
           );
         }
 
-        property.subObjectParams[key].key = key;
+        const subObjectPropertyParams: DyFM_DataProperty_Params<any, T> = property.subObjectParams[key];
+
+        subObjectPropertyParams.key = key;
+        const basicType: DyFM_BasicProperty_Type = DyFM_getBasicPropertyType(subObjectPropertyParams.type);
+        if (basicType !== subObjectPropertyParams.type) {
+          subObjectPropertyParams.nonBasicType = subObjectPropertyParams.type;
+          subObjectPropertyParams.type = basicType;
+        }
 
-        if (property.subObjectParams[key].subObjectParams) {
-          this.setKeysForSubObjectParams(property.subObjectParams[key]);
+        if (subObjectPropertyParams.subObjectParams) {
+          this.setKeysForSubObjectParams(subObjectPropertyParams);
         }
       });
     }

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

@@ -13,6 +13,7 @@ export type DyFM_DataProperties<T_Data> = {
 export class DyFM_DataProperty_Settings<T_Property, T_Data>{
   key?: string;
   type!: DyFM_BasicProperty_Type | string;
+  nonBasicType?: string;
   default?: T_Property;
 
   unique?: boolean;
@@ -70,7 +71,7 @@ export class DyFM_DataProperty_Settings<T_Property, T_Data>{
 
   subObjectParams?: DyFM_DataProperties<any>;
 
-  additionalValidators?: ((property: T_Property, data: T_Data) => void)[];
+  additionalValidators?: ((propertyValue: T_Property, data: T_Data) => void)[];
 }
 
 
@@ -85,7 +86,7 @@ export class DyFM_DataProperty_Params<T_Property, T_Data> extends DyFM_DataPrope
   /* override subObjectParams?: DyFM_DataProperty_Params<>[] = []; */
   /* override subObjectParams?: DyFM_Data_Params<T> = {}; */
 
-  override additionalValidators?: ((property: T_Property, data: T_Data) => void)[] = [];
+  override additionalValidators?: ((propertyValue: T_Property, data: T_Data) => void)[] = [];
 
   constructor(
     set: DyFM_DataProperty_Settings<T_Property, T_Data>,