@futdevpro/fsm-dynamo 1.7.14 → 1.8.2

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

@@ -0,0 +1,39 @@
+
+import { Dynamo_DataModelType } from '../../_enums';
+import { Dynamo_Metadata } from '../data-models';
+import { Dynamo_DataProperty_Params } from './data-property-params.control-model';
+
+export type D_Data_S = Dynamo_DataModel_Settings;
+export type D_Data_Settings = Dynamo_DataModel_Settings;
+export class Dynamo_DataModel_Settings extends Dynamo_Metadata {
+  dataName: string;
+  modelType?: Dynamo_DataModelType;
+  dbName?: string;
+  properties?: Dynamo_DataProperty_Params[];
+}
+
+export type D_Data_P = Dynamo_DataModel_Params;
+export type D_Data_Params = Dynamo_DataModel_Params;
+export class Dynamo_DataModel_Params extends Dynamo_DataModel_Settings {
+  
+  properties?: Dynamo_DataProperty_Params[] = [];
+
+  constructor(
+    set: Dynamo_DataModel_Settings
+  ) {
+    super(set);
+
+    if (!set?.modelType || set?.modelType == Dynamo_DataModelType.data) {
+      set.modelType = Dynamo_DataModelType.data;
+      set.dbName = set.dataName.charAt(0).toUpperCase() + set.dataName.slice(1);
+    }
+
+    if (set) {
+      Object.assign(this, set);
+    }
+  }
+
+  constructed?(): boolean { 
+    return true; 
+  }
+}

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

@@ -1,12 +1,6 @@
 import { Dynamo_BasicPropertyType } from '../../_enums/basic-property-type.enum';
 
-export type D_DataPropertyParams = Dynamo_DataPropertyParams;
-export type D_DPropPs = Dynamo_DataPropertyParams;
-/**
- * This will be used for setting up db. 
- * DataServices also uses this to prehook tools, as db service and dependency db service.
- */
-export class Dynamo_DataPropertyParams {
+export class Dynamo_DataProperty_Settings {
   key: string;
   type: Dynamo_BasicPropertyType | string;
 
@@ -28,13 +22,29 @@ export class Dynamo_DataPropertyParams {
   minlength?: number;
   maxlength?: number;
 
-  subObjectParams?: Dynamo_DataPropertyParams[] = [];
+  subObjectParams?: Dynamo_DataProperty_Params[];
+
+  additionalValidators?: ((data: any/* : T[K] */) => void)[];
+}
+
+
+export type D_DataPropertyParams = Dynamo_DataProperty_Params;
+export type D_DPropPs = Dynamo_DataProperty_Params;
+/**
+ * This will be used for setting up db. 
+ * DataServices also uses this to prehook tools, as db service and dependency db service.
+ */
+export class Dynamo_DataProperty_Params extends Dynamo_DataProperty_Settings {
+
+  subObjectParams?: Dynamo_DataProperty_Params[] = [];
 
   additionalValidators?: ((data: any/* : T[K] */) => void)[] = [];
 
   constructor(
-    set: Dynamo_DataPropertyParams
+    set: Dynamo_DataProperty_Settings
   ) {
+    super();
+    
     if (set) {
       if (!set.key || !set.type) {
         console.log(
@@ -63,6 +73,10 @@ export class Dynamo_DataPropertyParams {
     }
   }
 
+  constructed?(): boolean { 
+    return true; 
+  }
+
   // tslint:disable-next-line: ban-types
   getBEType?(): String | Number | Boolean | Object | Function | Array<any> | Date {
     switch (this.type) {

package/src/_models/control-models/error.control-model.spec.ts

@@ -1,6 +1,6 @@
 
 
-import { dynamo_error_default } from '../../_constants/error-defaults.const';
+import { Dynamo_error_defaults } from '../../_constants/error-defaults.const';
 import { Dynamo_Log } from '../../_utils/log.util';
 import { Dynamo_Error } from './error.control-model';
 
@@ -16,7 +16,7 @@ describe('Dynamo_Error;', (): void => {
   const message_base: string = '-TEST ERROR: something failed!-';
   const message_1: string = 'TEST ERROR MSG (1)';
   const message_2: string = 'TEST ERROR MSG (2)';
-  const message_selfDefined: string = dynamo_error_default.message + 
+  const message_selfDefined: string = Dynamo_error_defaults.message + 
     '; error.control-model.spec.js:78:29)';
   
   const errorCode_0: string = 'ASD-ASD-001';
@@ -159,7 +159,7 @@ describe('Dynamo_Error;', (): void => {
     });
 
     it('on self defined error', (): void => {
-      expect(error_selfDefined._errorCode).toBe(dynamo_error_default.errorCode);
+      expect(error_selfDefined._errorCode).toBe(Dynamo_error_defaults.errorCode);
     });
   });
 
@@ -177,7 +177,7 @@ describe('Dynamo_Error;', (): void => {
     });
 
     it('on self defined error', (): void => {
-      expect(error_selfDefined._errorCodes).toEqual([ dynamo_error_default.errorCode ]);
+      expect(error_selfDefined._errorCodes).toEqual([ Dynamo_error_defaults.errorCode ]);
     });
   });
 
@@ -242,18 +242,18 @@ describe('Dynamo_Error;', (): void => {
 
     it('on error_stack_1', (): void => {
       expect(error_stack_1.__userMessages).toEqual(
-        [ userMessageResult_0, dynamo_error_default.userMessage ]
+        [ userMessageResult_0, Dynamo_error_defaults.userMessage ]
       );
     });
 
     it('on error_stack_2', (): void => {
       expect(error_stack_2.__userMessages).toEqual(
-        [ userMessageResult_0, dynamo_error_default.userMessage, userMessageResult_2 ]
+        [ userMessageResult_0, Dynamo_error_defaults.userMessage, userMessageResult_2 ]
       );
     });
 
     it('on self defined error', (): void => {
-      expect(error_selfDefined.__userMessages).toEqual([ dynamo_error_default.userMessage ]);
+      expect(error_selfDefined.__userMessages).toEqual([ Dynamo_error_defaults.userMessage ]);
     });
   });
 
@@ -343,7 +343,7 @@ describe('Dynamo_Error;', (): void => {
     });
 
     it('on self defined error', (): void => {
-      expect(error_selfDefined.___issuer).toBe(dynamo_error_default.issuer);
+      expect(error_selfDefined.___issuer).toBe(Dynamo_error_defaults.issuer);
     });
   });
   
@@ -379,7 +379,7 @@ describe('Dynamo_Error;', (): void => {
     });
 
     it('on self defined error', (): void => {
-      expect(error_selfDefined.___issuerSystem).toBe(dynamo_error_default.issuerSystem);
+      expect(error_selfDefined.___issuerSystem).toBe(Dynamo_error_defaults.issuerSystem);
     });
   });
 
@@ -397,7 +397,7 @@ describe('Dynamo_Error;', (): void => {
     });
 
     it('on self defined error', (): void => {
-      expect(error_selfDefined.___issuerService).toBe(dynamo_error_default.issuerService);
+      expect(error_selfDefined.___issuerService).toBe(Dynamo_error_defaults.issuerService);
     });
   });
 

package/src/_models/control-models/error.control-model.ts

@@ -1,4 +1,4 @@
-import { dynamo_error_default } from '../../_constants/error-defaults.const';
+import { Dynamo_error_defaults } from '../../_constants/error-defaults.const';
 import { Dynamo_ErrorLevel } from '../../_enums';
 import { Dynamo_Log } from '../../_utils/log.util';
 import { Dynamo_Metadata } from '../data-models/metadata.data-model';
@@ -120,7 +120,7 @@ export class Dynamo_Error extends Dynamo_Metadata {
       { 
         issuer: set?.issuerService ?? 
           (set?.error as Dynamo_Error)?.___issuerService ?? 
-            dynamo_error_default.issuerService 
+            Dynamo_error_defaults.issuerService 
       }
     );
     
@@ -134,13 +134,13 @@ export class Dynamo_Error extends Dynamo_Metadata {
       this.___status = set?.status ?? (set?.error as Dynamo_Error)?.___status;
       this.___issuer = set?.issuer ?? 
         (set?.error as Dynamo_Error)?.___issuer ?? 
-          dynamo_error_default.issuer;
+          Dynamo_error_defaults.issuer;
       this.___issuerSystem = set?.issuerSystem ??
         (set?.error as Dynamo_Error)?.___issuerSystem ?? 
-          dynamo_error_default.issuerSystem;
+          Dynamo_error_defaults.issuerSystem;
       this.___issuerService = set?.issuerService ?? 
         (set?.error as Dynamo_Error)?.___issuerService ?? 
-          dynamo_error_default.issuerService;
+          Dynamo_error_defaults.issuerService;
       
       this.level = set?.level ?? (set?.error as Dynamo_Error)?.level ?? Dynamo_ErrorLevel.error;
 
@@ -150,7 +150,7 @@ export class Dynamo_Error extends Dynamo_Metadata {
 
       /** set default error code */
       if (!set.errorCode) {
-        set.errorCode = dynamo_error_default.errorCode;
+        set.errorCode = Dynamo_error_defaults.errorCode;
       }
 
       /** set default error (self defined) */
@@ -170,7 +170,7 @@ export class Dynamo_Error extends Dynamo_Metadata {
       }
 
       if (!set.errorCode) {
-        set.errorCode = dynamo_error_default.errorCode;
+        set.errorCode = Dynamo_error_defaults.errorCode;
       }
       previousErrorCodes = previousErrorCodes.filter(
         (code: string): boolean => code !== set.errorCode
@@ -180,7 +180,7 @@ export class Dynamo_Error extends Dynamo_Metadata {
       /** bring up non NTS and non default first error */
       const filteredErrorCodes: string[] = this._errorCodes.filter(
         (code: string): boolean => 
-          code && code !== dynamo_error_default.errorCode && !code.includes('NTS-')
+          code && code !== Dynamo_error_defaults.errorCode && !code.includes('NTS-')
       );
 
       this._errorCode = filteredErrorCodes[0] ?? this._errorCodes?.[0];
@@ -200,7 +200,7 @@ export class Dynamo_Error extends Dynamo_Metadata {
         /** error not defined - self defining */
           const posFull = (set.error as Error).stack.split('\n')?.[1]?.split('\\');
 
-          set.message = dynamo_error_default.message + '; ' + posFull[posFull.length - 1];
+          set.message = Dynamo_error_defaults.message + '; ' + posFull[posFull.length - 1];
         }
       }
       /** set messages */
@@ -219,7 +219,7 @@ export class Dynamo_Error extends Dynamo_Metadata {
       if (
         -1 < highlightedErrorCodeIndex && 
         this._messages[highlightedErrorCodeIndex] && 
-        this._messages[highlightedErrorCodeIndex] !== dynamo_error_default.message
+        this._messages[highlightedErrorCodeIndex] !== Dynamo_error_defaults.message
       ) {
         this._message = this._messages[highlightedErrorCodeIndex];
       } else {
@@ -234,12 +234,12 @@ export class Dynamo_Error extends Dynamo_Metadata {
       }
 
       if (!set.userMessage) {
-        set.userMessage = dynamo_error_default.userMessage;
+        set.userMessage = Dynamo_error_defaults.userMessage;
       }
 
       if (
         set.addECToUserMsg && 
-        set.userMessage !== dynamo_error_default.userMessage && 
+        set.userMessage !== Dynamo_error_defaults.userMessage && 
         set.errorCode
       ) {
         set.userMessage += `\nErrorCode: ${set.errorCode}`;
@@ -252,12 +252,12 @@ export class Dynamo_Error extends Dynamo_Metadata {
       if (
         -1 < highlightedErrorCodeIndex && 
         this.__userMessages[highlightedErrorCodeIndex] && 
-        this.__userMessages[highlightedErrorCodeIndex] !== dynamo_error_default.userMessage
+        this.__userMessages[highlightedErrorCodeIndex] !== Dynamo_error_defaults.userMessage
       ) {
         this.__userMessage = this.__userMessages[highlightedErrorCodeIndex];
       } else {
         this.__userMessage = this.__userMessages.filter(
-          (msg: string): boolean => msg && msg !== dynamo_error_default.userMessage
+          (msg: string): boolean => msg && msg !== Dynamo_error_defaults.userMessage
         )?.[0];
       }
 

package/src/_models/control-models/index.ts

@@ -1,7 +1,7 @@
 
 // CONTROL MODELS
 export * from './daily-usage-data.control-model';
-export * from './data-params.control-model';
+export * from './data-model-params.control-model';
 export * from './data-property-params.control-model';
 export * from './error.control-model';
 export * from './poll.control-model';

package/src/_models/control-models/range-value.control-model.ts

@@ -4,9 +4,6 @@ export type D_RangeValue<T> = Dynamo_RangeValue<T>;
 export type D_RangeV<T> = Dynamo_RangeValue<T>;
 export class Dynamo_RangeValue<T = number> {
   readonly isRange: boolean = true;
-  get constructed(): boolean { 
-    return true;
-  }
 
   from: T;
   to: T;
@@ -25,62 +22,66 @@ export class Dynamo_RangeValue<T = number> {
       this.to = to ?? from as T;
     }
   }
+  
+  constructed?(): boolean { 
+    return true; 
+  }
 
-  newValues(value: Dynamo_RangeValue<T>): void {
+  newValues?(value: Dynamo_RangeValue<T>): void {
     this.from = value.from;
     this.to = value.to;
   }
 
-  addRange(range: Dynamo_RangeValue<number>): void {
+  addRange?(range: Dynamo_RangeValue<number>): void {
     (this as Dynamo_RangeValue<number>).from += range.from;
     (this as Dynamo_RangeValue<number>).to += range.to;
   }
   
-  subtractRange(range: Dynamo_RangeValue<number>): void {
+  subtractRange?(range: Dynamo_RangeValue<number>): void {
     (this as Dynamo_RangeValue<number>).from -= range.from;
     (this as Dynamo_RangeValue<number>).to -= range.to;
   }
 
-  multiplyRange(range: Dynamo_RangeValue<number>): void {
+  multiplyRange?(range: Dynamo_RangeValue<number>): void {
     (this as Dynamo_RangeValue<number>).from *= range.from;
     (this as Dynamo_RangeValue<number>).to *= range.to;
   }
 
-  divideRange(range: Dynamo_RangeValue<number>): void {
+  divideRange?(range: Dynamo_RangeValue<number>): void {
     (this as Dynamo_RangeValue<number>).from /= range.from;
     (this as Dynamo_RangeValue<number>).to /= range.to;
   }
 
-  add(value: number): void {
+  add?(value: number): void {
     (this as Dynamo_RangeValue<number>).from += value;
     (this as Dynamo_RangeValue<number>).to += value;
   }
 
-  subtract(value: number): void {
+  subtract?(value: number): void {
     (this as Dynamo_RangeValue<number>).from -= value;
     (this as Dynamo_RangeValue<number>).to -= value;
   }
 
-  multiply(value: number): void {
+  multiply?(value: number): void {
     (this as Dynamo_RangeValue<number>).from *= value;
     (this as Dynamo_RangeValue<number>).to *= value;
   }
 
-  divide(value: number): void {
+  divide?(value: number): void {
     (this as Dynamo_RangeValue<number>).from /= value;
     (this as Dynamo_RangeValue<number>).to /= value;
   }
 
-  clone(): Dynamo_RangeValue<T> {
+  clone?(): Dynamo_RangeValue<T> {
     return new Dynamo_RangeValue<T>(this.from, this.to);
   }
 
-  applyTransform<K = T>(transform: (value: T) => K): Dynamo_RangeValue<K> {
+  applyTransform?<K = T>(transform: (value: T) => K): Dynamo_RangeValue<K> {
     return new Dynamo_RangeValue<K>(transform(this.from), transform(this.to));
   }
 
-  toString = this.stringify;
-  stringify(spaces: boolean = true, auto: boolean = true): string {
+  toString? = this.stringify;
+  stringify?(spaces: boolean = true, auto: boolean = true): string {
     if (auto && this.from === this.to) {
       return `${this.from}`;
     } else if (spaces) {

package/src/_models/data-models/custom-data.data-model.ts

@@ -1,14 +1,14 @@
 
-import { Dynamo_DataParams } from '../control-models/data-params.control-model';
+import { Dynamo_DataModel_Params } from '../control-models/data-model-params.control-model';
 import { Dynamo_Metadata } from './metadata.data-model';
 
 export type D_CustomData = Dynamo_CustomData;
 export type D_CustomD = Dynamo_CustomData;
-export class Dynamo_CustomData extends Dynamo_Metadata {
-  data?: string;
+export class Dynamo_CustomData<T = any> extends Dynamo_Metadata {
+  data?: T;
 
   constructor(
-    set?: Dynamo_CustomData
+    set?: Dynamo_CustomData<T>
   ) {
     super(set);
 
@@ -18,9 +18,9 @@ export class Dynamo_CustomData extends Dynamo_Metadata {
   }
 }
 
-export const customDataModelParams = new Dynamo_DataParams({
+export const customDataModelParams = new Dynamo_DataModel_Params({
   dataName: 'customData',
-  modelParams: [
+  properties: [
     { key: 'data', type: 'string', required: true },
   ]
 });

package/src/_models/data-models/metadata.data-model.ts

@@ -56,4 +56,28 @@ export class Dynamo_Metadata {
       }
     }
   }
+  
+  static updateMetadata<T extends Dynamo_Metadata>(data: T, issuer: string, id?: string): T {
+    if (!data) {
+      return data;
+    }
+
+    if (!data._id && id) {
+      data._id = id;
+    }
+
+    if (!data.__created) {
+      data.__created = new Date();
+    }
+    
+    if (!data.__createdBy) {
+      data.__createdBy = issuer;
+    }
+
+    data.__lastModified = new Date();
+    data.__lastModifiedBy = issuer;
+    data.__v = data.__v ? data.__v + 1 : 1;
+
+    return data;
+  }
 }

package/src/_models/data-models/usage-session.data-model.ts

@@ -1,8 +1,8 @@
 
 import { Dynamo_Metadata } from './metadata.data-model';
 import { Dynamo_UsageData } from '../control-models/usage-data.control-model';
-import { Dynamo_DataParams } from '../control-models/data-params.control-model';
-import { GeoIpLocation } from '../interfaces/location/geo-ip-location.interface';
+import { Dynamo_DataModel_Params } from '../control-models/data-model-params.control-model';
+import { Dynamo_GeoIpLocation } from '../interfaces/location/geo-ip-location.interface';
 
 export type D_UsageSession = Dynamo_UsageSession;
 export class Dynamo_UsageSession extends Dynamo_Metadata {
@@ -11,7 +11,7 @@ export class Dynamo_UsageSession extends Dynamo_Metadata {
   sessionEnd?: Date;
   address?: string;
   issuer?: string;
-  locationData?: GeoIpLocation;
+  locationData?: Dynamo_GeoIpLocation;
 
   usageData?: Dynamo_UsageData[] = [];
   totalSessionTime?: number;
@@ -32,9 +32,9 @@ export class Dynamo_UsageSession extends Dynamo_Metadata {
   }
 }
 
-export const usageSessionModelParams = new Dynamo_DataParams({
+export const usageSessionModelParams = new Dynamo_DataModel_Params({
   dataName: 'usageSession',
-  modelParams: [
+  properties: [
     { key: 'date', type: 'string',
       required: true, index: true
     },

package/src/_models/interfaces/location/country-division.interface.ts

@@ -1,6 +1,6 @@
 
 
-export interface CountryDivision {
+export interface Dynamo_CountryDivision {
   iso: string;
   code: string;
   name: string;

package/src/_models/interfaces/location/country-iso.interface.ts

@@ -2,9 +2,9 @@
 
 import { Dynamo_Region } from '../../../_enums/region.enum';
 import { Dynamo_SubRegion } from '../../../_enums/sub-region.enum';
-import { CountryDivision } from './country-division.interface';
+import { Dynamo_CountryDivision } from './country-division.interface';
 
-export interface CountryISO {
+export interface Dynamo_CountryISO {
   name: string;
   iso2: string;
   iso3: string;
@@ -17,5 +17,5 @@ export interface CountryISO {
   subdivisionRegion: string;
   subdivisionRegionCode: string;
   phoneCode?: string;
-  divisions?: CountryDivision[];
+  divisions?: Dynamo_CountryDivision[];
 }

package/src/_models/interfaces/location/country-phone-code.interface.ts

@@ -1,5 +1,5 @@
 
-export interface CountryPhoneCode {
+export interface Dynamo_CountryPhoneCode {
   iso: string;
   country: string;
   code: string;

package/src/_models/interfaces/location/division-collection.interface.ts

@@ -1,5 +1,5 @@
 
-export interface DivisionCollection {
+export interface Dynamo_DivisionCollection {
   [iso2: string]: {
     name: string;
     divisions: {

package/src/_models/interfaces/location/division-region-data.interface.ts

@@ -1,7 +1,7 @@
 import { Dynamo_SubdivisionRegionType } from '../../../_enums/subdivision-region-type.enum';
-import { CountryISO } from './country-iso.interface';
+import { Dynamo_CountryISO } from './country-iso.interface';
 
-export interface SubdivisionRegionData extends CountryISO {  
+export interface Dynamo_SubdivisionRegionData extends Dynamo_CountryISO {  
   type?: Dynamo_SubdivisionRegionType;
 }
 

package/src/_models/interfaces/location/geo-ip-location.interface.ts

@@ -1,5 +1,5 @@
 
-export interface GeoIpLocation {
+export interface Dynamo_GeoIpLocation {
   /** [ <low bound of IP block>, <high bound of IP block> ] */
   range: [number, number];
   /** 2 letter ISO-3166-1 country code https://www.iban.com/country-codes */

package/src/_models/interfaces/location/location-coordinates.interface.ts

@@ -1,5 +1,5 @@
 
-export interface LocationCoordinates {
+export interface Dynamo_LocationCoordinates {
   longitude: number;
   latitude: number;
 }

package/src/_models/interfaces/random-weight.interface.ts

@@ -1,6 +1,6 @@
 
 
-export interface RandomWeight<T> {
+export interface Dynamo_RandomWeight<T> {
   chance: number;
   result: T;
 }

package/src/_models/interfaces/route-settings.interface.ts

@@ -1,7 +1,7 @@
 
-export type D_RouteSettings = Dynamo_RouteSettings;
-export type D_RouteS = Dynamo_RouteSettings;
-export interface Dynamo_RouteSettings {
+export type D_RouteSettings = Dynamo_Route_Settings;
+export type D_RouteS = Dynamo_Route_Settings;
+export interface Dynamo_Route_Settings {
   mainRoute: string;
 
   endPoints: {

package/src/_modules/data-modules.index.ts

@@ -1,7 +1,7 @@
 
 // DATA MODULE
 export * from '../_models/data-models/metadata.data-model';
-export * from '../_models/control-models/data-params.control-model';
+export * from '../_models/control-models/data-model-params.control-model';
 export * from '../_models/control-models/data-property-params.control-model';
 export * from '../_models/control-models/error.control-model';
 export * from '../_enums/data-model-type.enum';

package/src/_utils/array.util.spec.ts

@@ -1,7 +1,7 @@
 
 
 import { Dynamo_Array } from './array.util';
-import { delay } from './utilities.util';
+import { Dynamo_delay } from './utilities.util';
 
 describe('Dynamo_Array', (): void => {
 
@@ -10,7 +10,7 @@ describe('Dynamo_Array', (): void => {
       const list = [1, 2, 3];
       const result = [];
       const func = async (e, i): Promise<void> => { 
-        await delay(30);
+        await Dynamo_delay(30);
         result.push(e);
       };
 
@@ -25,12 +25,12 @@ describe('Dynamo_Array', (): void => {
       const list = [1, 2, 3];
       
       const func = async (e, i): Promise<number> => { 
-        await delay(30);
+        await Dynamo_delay(30);
 
         return e * 2;
       };
 
-      const result = await Dynamo_Array.asyncMapArray(list, func);
+      const result = await Dynamo_Array.asyncMap(list, func);
 
       expect(result).toEqual([2, 4, 6]);
     });

package/src/_utils/array.util.ts

@@ -13,7 +13,7 @@ export class Dynamo_Array {
     }
   }
   
-  static async asyncMapArray<T, R>(
+  static async asyncMap<T, R>(
     list: T[], 
     mapFunc: (element: T, index?: number, array?: T[]) => Promise<R>
   ): Promise<R[]> {
@@ -27,7 +27,7 @@ export class Dynamo_Array {
   }
 
   static last<T>(array: T[]): T {
-    return array[array.length - 1];
+    return array.length ? array[array.length - 1] : null;
   }
 
   static remove<T>(array: T[], element: T): T[] {