@futdevpro/fsm-dynamo 1.11.37 → 1.11.39

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>,

package/src/_modules/pipe/_collections/utils/pip-smart-replace-pipe.util.spec.ts

@@ -1,4 +1,5 @@
 
+import { DyFM_Log } from '../../../../_collections/utils/log.util';
 import { DyFM_smartReplace_pipeTransform } from './pip-smart-replace-pipe.util';
 
 describe('| DyFM_smartReplace_pipeTransform', () => {
@@ -9,18 +10,18 @@ describe('| DyFM_smartReplace_pipeTransform', () => {
 
   it('| should replace keys with values from replacer', () => {
     const replacer = { name: { value: 'World', pipes: [] } };
-    spyOn(console, 'warn');
+    spyOn(DyFM_Log, 'warn');
     const result = DyFM_smartReplace_pipeTransform('Hello, {name}!', replacer);
     expect(result).toBe('Hello, World!');
-    expect(console.warn).not.toHaveBeenCalled();
+    expect(DyFM_Log.warn).not.toHaveBeenCalled();
   });
 
   it('| should warn if replacer key has no pipes', () => {
     const replacer = { name: { value: 'World' } };
-    spyOn(console, 'warn');
+    spyOn(DyFM_Log, 'warn');
     const result = DyFM_smartReplace_pipeTransform('Hello, {name}!', replacer);
     expect(result).toBeUndefined();
-    expect(console.warn).toHaveBeenCalledWith(
+    expect(DyFM_Log.warn).toHaveBeenCalledWith(
       'DYNAMO WARNING: ' +
       '\nSmartReplacePipe: replaceTo[name].multiPipe is not defined...',
       '\n\n',
@@ -30,10 +31,10 @@ describe('| DyFM_smartReplace_pipeTransform', () => {
 
   it('| should warn if replacer key pipes is not an array', () => {
     const replacer = { name: { value: 'World', pipes: 'not-an-array' } };
-    spyOn(console, 'warn');
+    spyOn(DyFM_Log, 'warn');
     const result = DyFM_smartReplace_pipeTransform('Hello, {name}!', replacer);
     expect(result).toBeUndefined();
-    expect(console.warn).toHaveBeenCalledWith(
+    expect(DyFM_Log.warn).toHaveBeenCalledWith(
       'DYNAMO WARNING: ' +
       '\nSmartReplacePipe: replaceTo[name].multiPipe is not an array...',
       '\n\n',

package/src/_modules/pipe/_collections/utils/pip-smart-replace-pipe.util.ts

@@ -5,6 +5,7 @@
 
 
 
+import { DyFM_Log } from '../../../../_collections/utils/log.util';
 import { DyFM_MultiPipe_Setting } from '../../_models/pip-multi-pipe-settings.type';
 import { DyFM_multiPipe_pipeTransform } from './pip-multi-pipe-pipe.util';
 
@@ -25,7 +26,7 @@ export function DyFM_smartReplace_pipeTransform(
 ): string {
 
   if (!replacer) {
-    console.warn(
+    DyFM_Log.warn(
       'DYNAMO WARNING: ' +
       '\nSmartReplacePipe: replaceTo is not defined...',
       '\n\n',
@@ -38,7 +39,7 @@ export function DyFM_smartReplace_pipeTransform(
   for (const key in replacer) {
     if (replacer[key]?.value) {
       if (!replacer[key]?.pipes) {
-        console.warn(
+        DyFM_Log.warn(
           'DYNAMO WARNING: ' +
           '\nSmartReplacePipe: replaceTo[' + key + '].multiPipe is not defined...',
           '\n\n',
@@ -49,7 +50,7 @@ export function DyFM_smartReplace_pipeTransform(
       }
 
       if (!Array.isArray(replacer[key].pipes)) {
-        console.warn(
+        DyFM_Log.warn(
           'DYNAMO WARNING: ' +
           '\nSmartReplacePipe: replaceTo[' + key + '].multiPipe is not an array...',
           '\n\n',

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

@@ -1,3 +1,4 @@
+import { DyFM_BasicProperty_Type } from '../../../_enums/basic-property-type.enum';
 import { DyFM_DataProperties } from '../../../_models/control-models/data-property-params.control-model';
 import { DyFM_GeoIpLocation } from '../../location/_models/loc-geo-ip-location.interface';
 import { DyFM_UsageData } from './usg-data.control-model';
@@ -61,34 +62,36 @@ describe('| DyFM_usageSession_dataParams', () => {
   it('| should have the correct properties configuration', () => {
     const properties: DyFM_DataProperties<DyFM_UsageSession> = DyFM_usageSession_dataParams.properties;
     expect(properties.date.key).toBe('date');
-    expect(properties.date.type).toBe('string');
+    expect(properties.date.type).toBe(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(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(DyFM_BasicProperty_Type.date);
 
     expect(properties.address.key).toBe('address');
-    expect(properties.address.type).toBe('string');
+    expect(properties.address.type).toBe(DyFM_BasicProperty_Type.string);
 
     expect(properties.issuer.key).toBe('issuer');
-    expect(properties.issuer.type).toBe('string');
+    expect(properties.issuer.type).toBe(DyFM_BasicProperty_Type.string);
 
     expect(properties.locationData.key).toBe('locationData');
-    expect(properties.locationData.type).toBe('IpApiLocation');
+    expect(properties.locationData.type).toBe(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(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(DyFM_BasicProperty_Type.number);
 
     expect(properties.loggedInAs.key).toBe('loggedInAs');
-    expect(properties.loggedInAs.type).toBe('string');
+    expect(properties.loggedInAs.type).toBe(DyFM_BasicProperty_Type.string);
   });
 });