@futdevpro/fsm-dynamo 1.9.5 → 1.9.7

package/src/{_utils → _collections/utils}/regions.util.ts

@@ -1,16 +1,16 @@
 
-import * as ISOs from '../_constants/location/country-codes-ISO-3166.json';
+import * as ISOs from '../assets/location/country-codes-ISO-3166.json';
 
-import * as PhoneCodes from '../_constants/location/country-phone-codes.json';
-import * as Divisions from '../_constants/location/country-divisions-ISO-3166-all-list.json';
+import * as PhoneCodes from '../assets/location/country-phone-codes.json';
+import * as Divisions from '../assets/location/country-divisions-ISO-3166-all-list.json';
 
-import { DynamoFM_Region } from '../_enums/region.enum';
-import { DynamoFM_Error } from '../_models';
+import { DynamoFM_Region } from '../../_enums/location/region.enum';
+import { DynamoFM_Error } from '../../_models';
 import { 
   DynamoFM_CountryPhoneCode 
-} from '../_models/interfaces/location/country-phone-code.interface';
-import { DynamoFM_CountryISO } from '../_models/interfaces/location/country-iso.interface';
-import { DynamoFM_CountryDivision } from '../_models/interfaces/location/country-division.interface';
+} from '../../_models/interfaces/location/country-phone-code.interface';
+import { DynamoFM_CountryISO } from '../../_models/interfaces/location/country-iso.interface';
+import { DynamoFM_CountryDivision } from '../../_models/interfaces/location/country-division.interface';
 
 import { DynamoFM_JSONListify } from './utilities.util';
 
@@ -19,12 +19,16 @@ export class DynamoFM_Regions {
   /* static divisions: DivisionCollection = DynamoFM_Regions.getSubdivisionCollection(); */
   static divisions: DynamoFM_CountryDivision[] = DynamoFM_Regions.getAllDivisions();
   static phoneCodes: DynamoFM_CountryPhoneCode[] = DynamoFM_Regions.getAllPhoneCodes();
-  static ISOs: DynamoFM_CountryISO[] = DynamoFM_Regions.getAllCountryISO();
+  static countryISOs: DynamoFM_CountryISO[] = DynamoFM_Regions.getAllCountryISO();
 
   private static getAllDivisions(): DynamoFM_CountryDivision[] {
+    if (!Divisions) throw new DynamoFM_Error({ message: 'Cannot find ISO-3166 JSON file.' });
+
     return DynamoFM_JSONListify(Divisions);
   }
   private static getAllPhoneCodes(): DynamoFM_CountryPhoneCode[] {
+    if (!PhoneCodes) throw new DynamoFM_Error({ message: 'Cannot find ISO-3166 JSON file.' });
+    
     return DynamoFM_JSONListify(PhoneCodes);
   }
 
@@ -32,6 +36,8 @@ export class DynamoFM_Regions {
     return Divisions as DivisionCollection;
   } */
   private static getAllCountryISO(): DynamoFM_CountryISO[] {
+    if (!ISOs) throw new DynamoFM_Error({ message: 'Cannot find ISO-3166 JSON file.' });
+
     const result: DynamoFM_CountryISO[] = DynamoFM_JSONListify(ISOs);
 
     result.forEach((iso: DynamoFM_CountryISO): void => {
@@ -47,13 +53,13 @@ export class DynamoFM_Regions {
   }
 
   static isoToCountryIso(iso2: string): DynamoFM_CountryISO {
-    const country: DynamoFM_CountryISO = this.ISOs.find(
+    const country: DynamoFM_CountryISO = this.countryISOs.find(
       (iso: DynamoFM_CountryISO): boolean => iso.iso2 == iso2
     );
 
     if (!country) {
       throw new DynamoFM_Error({ 
-        message: `Cannot find ISO-3166 code for this: ${iso2}` 
+        message: `Cannot find ISO-3166 code for this: ${iso2}`,
       });
     } else {
       return country;
@@ -61,13 +67,13 @@ export class DynamoFM_Regions {
   }
 
   static isoToRegion(iso2: string): DynamoFM_Region {
-    const region: DynamoFM_Region = this.ISOs.find(
+    const region: DynamoFM_Region = this.countryISOs.find(
       (iso: DynamoFM_CountryISO): boolean => iso.iso2 == iso2
     )?.region;
 
     if (!region) {
       throw new DynamoFM_Error({ 
-        message: `Cannot find ISO-3166 code for this: ${iso2}` 
+        message: `Cannot find ISO-3166 code for this: ${iso2}`,
       });
     } else {
       return region;
@@ -81,7 +87,7 @@ export class DynamoFM_Regions {
 
     if (!phoneCode) {
       throw new DynamoFM_Error({ 
-        message: `Cannot find ISO-3166 code for this: ${iso2}` 
+        message: `Cannot find ISO-3166 code for this: ${iso2}`,
       });
     } else {
       return phoneCode;

package/src/_collections/utils/time.util.spec.ts

@@ -0,0 +1,50 @@
+
+import { DynamoFM_LogStyle } from '../../_enums';
+import { DynamoFM_Log } from './log.util';
+import { DynamoFM_Time } from './time.util';
+
+describe('DynamoFM_Time', () => {
+  xit(DynamoFM_Log.addStyle('tenYearsAgo', [DynamoFM_LogStyle.yellow]) +' should return correct date', () => {
+    const date = DynamoFM_Time.tenYearsAgo(new Date('2021-01-01'));
+    const expected = new Date('2011-01-01');
+
+    expect(date).toEqual(expected);
+  });
+  
+  xit(DynamoFM_Log.addStyle('oneYearAgo', [DynamoFM_LogStyle.yellow]) +' should return correct date', () => {
+    const date = DynamoFM_Time.oneYearAgo(new Date('2021-01-01'));
+    const expected = new Date('2020-01-01');
+
+    expect(date).toEqual(expected);
+  });
+
+  xit(DynamoFM_Log.addStyle('oneMonthAgo', [DynamoFM_LogStyle.yellow]) +' should return correct date', () => {
+    const date = DynamoFM_Time.oneMonthAgo(new Date('2021-01-01'));
+    const expected = new Date('2020-12-01');
+
+    expect(date).toEqual(expected);
+  });
+
+  it(DynamoFM_Log.addStyle('oneWeekAgo', [DynamoFM_LogStyle.yellow]) +' should return correct date', () => {
+    const date = DynamoFM_Time.oneWeekAgo(new Date('2021-01-01'));
+    const expected = new Date('2020-12-25');
+
+    expect(date).toEqual(expected);
+  });
+
+  it(DynamoFM_Log.addStyle('oneDayAgo', [DynamoFM_LogStyle.yellow]) +' should return correct date', () => {
+    const date = DynamoFM_Time.oneDayAgo(new Date('2021-01-01'));
+    const expected = new Date('2020-12-31');
+
+    expect(date).toEqual(expected);
+  });
+
+  it(DynamoFM_Log.addStyle('oneHourAgo', [DynamoFM_LogStyle.yellow]) +' should return correct date', () => {
+    const date = DynamoFM_Time.oneHourAgo(new Date('2021-01-01T00:00:00'));
+    const expected = new Date('2020-12-31T23:00:00');
+
+    expect(date).toEqual(expected);
+  });
+
+
+});

package/src/{_utils → _collections/utils}/time.util.ts

@@ -1,8 +1,8 @@
 
-import { day, hour, minute, month, second, week, year } from '../_constants/times.const';
-import { DynamoFM_Month } from '../_enums';
-import { DynamoFM_DayOfWeek } from '../_enums/day-of-week.enum';
-import { DynamoFM_RelativeDate } from '../_enums/relative-date.enum';
+import { day, hour, minute, month, second, week, year } from '../constants/times.const';
+import { DynamoFM_Month } from '../../_enums/time/month.enum';
+import { DynamoFM_DayOfWeek } from '../../_enums/time/day-of-week.enum';
+import { DynamoFM_RelativeDate } from '../../_enums/time/relative-date.enum';
 
 export type DFM_Time = DynamoFM_Time;
 export type DFM_T = DynamoFM_Time;
@@ -61,22 +61,25 @@ export class DynamoFM_Time {
    * @param relativeDate 
    * @returns 
    */
-  static getDateByRelativeDate(relativeDate: DynamoFM_RelativeDate): Date {
+  static getDateByRelativeDate(
+    relativeDate: DynamoFM_RelativeDate, 
+    comparedTo?: Date
+  ): Date {
     switch (relativeDate) {
       case DynamoFM_RelativeDate.lastDay:
-        return this.oneDayAgo();
+        return this.oneDayAgo(comparedTo);
 
       case DynamoFM_RelativeDate.lastWeek:
-        return this.oneWeekAgo();
+        return this.oneWeekAgo(comparedTo);
 
       case DynamoFM_RelativeDate.lastMonth:
-        return this.oneMonthAgo();
+        return this.oneMonthAgo(comparedTo);
 
       case DynamoFM_RelativeDate.lastYear:
-        return this.oneYearAgo();
+        return this.oneYearAgo(comparedTo);
 
       case DynamoFM_RelativeDate.last10Years:
-        return this.tenYearsAgo();
+        return this.tenYearsAgo(comparedTo);
 
       case DynamoFM_RelativeDate.allTime:
         return new Date(0);
@@ -90,48 +93,48 @@ export class DynamoFM_Time {
    * returns the date one hour ago
    * @returns 
    */
-  static oneHourAgo(): Date {
-    return new Date(+new Date() - hour);
+  static oneHourAgo(comparedTo: Date = new Date()): Date {
+    return new Date(+comparedTo - hour);
   }
 
   /**
    * returns the date one day ago
    * @returns 
    */
-  static oneDayAgo(): Date {
-    return new Date(+new Date() - day);
+  static oneDayAgo(comparedTo: Date = new Date()): Date {
+    return new Date(+comparedTo - day);
   }
 
   /**
    * returns the date one week ago
    * @returns 
    */
-  static oneWeekAgo(): Date {
-    return new Date(+new Date() - week);
+  static oneWeekAgo(comparedTo: Date = new Date()): Date {
+    return new Date(+comparedTo - week);
   }
 
   /**
    * returns the date one month ago
    * @returns 
    */
-  static oneMonthAgo(): Date {
-    return new Date(+new Date() - month);
+  static oneMonthAgo(comparedTo: Date = new Date()): Date {
+    return new Date(+comparedTo - month);
   }
   
   /**
    * returns the date one year ago
    * @returns 
    */
-  static oneYearAgo(): Date {
-    return new Date(+new Date() - year);
+  static oneYearAgo(comparedTo: Date = new Date()): Date {
+    return new Date(+comparedTo - year);
   }
   
   /**
    * returns the date ten years ago
    * @returns 
    */
-  static tenYearsAgo(): Date {
-    return new Date(+new Date() - (10 * year));
+  static tenYearsAgo(comparedTo: Date = new Date()): Date {
+    return new Date(+comparedTo - (10 * year));
   }
 
   /**

package/src/_enums/index.ts

@@ -1,15 +1,16 @@
 
 // ENUMS
+
+export * from './location';
+export * from './time';
+
 export * from './basic-property-type.enum';
 export * from './data-model-type.enum';
-export * from './day-of-week.enum';
 export * from './error-level.enum';
-export * from './log-style.enum';
-export * from './month.enum';
-export * from './region.enum';
-export * from './relative-date.enum';
-export * from './sub-region.enum';
-export * from './subdivision-region-type.enum';
 export * from './error-level.enum';
+export * from './log-style.enum';
+export * from './pipe.enum';
+export * from './range-pipe-setting.enum';
+
 
 

package/src/_enums/location/index.ts

@@ -0,0 +1,4 @@
+
+export * from './region.enum';
+export * from './sub-region.enum';
+export * from './subdivision-region-type.enum';

package/src/_enums/location/region.enum.ts

@@ -0,0 +1,9 @@
+
+export enum DynamoFM_Region {
+  europe = 'Europe',
+  asia = 'Asia',
+  africa = 'Africa',
+  oceania = 'Oceania',
+  americas = 'Americas',
+}
+

package/src/_enums/location/sub-region.enum.ts

@@ -0,0 +1,26 @@
+
+export enum DynamoFM_SubRegion {
+  northernEurope = 'Northern Europe',
+  southernEurope = 'Southern Europe',
+  westernEurope = 'Western Europe',
+  easternEurope = 'Eastern Europe',
+
+  northernAfrica = 'Northern Africa',
+  subSaharanAfrica = 'Sub-Saharan Africa',
+
+  northernAmerica = 'Northern America',
+  latinAmericaAndTheCaribbean = 'Latin America and the Caribbean',
+
+  southEasternAsia = 'South-eastern Asia',
+  easternAsia = 'Eastern Asia',
+  southernAsia = 'Southern Asia',
+  
+  westernAsia = 'Western Asia',
+  centralAsia = 'Central Asia',
+
+  australiaAndNewZealand = 'Australia and New Zealand',
+  melanesia = 'Melanesia',
+  micronesia = 'Micronesia',
+  polynesia = 'Polynesia',
+}
+

package/src/_enums/location/subdivision-region-type.enum.ts

@@ -0,0 +1,44 @@
+
+
+export enum DynamoFM_SubdivisionRegionType {
+  parish,
+  emirate,
+  province,
+  dependency,
+  county,
+  city,
+  region,
+  state,
+  territory,
+  autonomousRepublic,
+  municipate,
+  rayon,
+  division,
+  district,
+  governorate,
+  department,
+  specialMunicipality,
+  federalDistrict,
+  island,
+  town,
+  oblast,
+  commune,
+  prefecture,
+  economicPrefecture,
+  canton,
+  autonomousRegion,
+  specialAdministrativeRegion,
+  capitalDistrict,
+  geographicalRegion,
+  capitalCity,
+  ruralMunicipality,
+  urbanMunicipality,
+  autonomousCommunity,
+  autonomousCity,
+  administration,
+  regionalState,
+  metropolitanRegion,
+  overseasCollectivity,
+  // ... reduce specials // non-finished
+} 
+

package/src/_enums/pipe.enum.ts

@@ -0,0 +1,45 @@
+
+
+export type DynamoFM_MultiPipeAvailable = 
+  DynamoFM_AngularMultiPipeAvailable | DynamoFM_Pipe;
+
+export enum DynamoFM_Pipe {
+  country = 'country',
+  custom = 'custom',
+  division = 'division',
+  list = 'list',
+  multiPipe = 'multiPipe',
+  objKey = 'objKey',
+  range = 'range',
+  region = 'region',
+  replace = 'replace',
+  slider = 'slider',
+  smartReplace = 'smartReplace',
+}
+
+export enum DynamoFM_AngularMultiPipeAvailable {
+  number = 'number',
+  decimal = 'decimal',
+  currency = 'currency',
+  date = 'date',
+  percent = 'percent',
+}
+
+export const DynamoFM_allMultiPipesAvailable: DynamoFM_MultiPipeAvailable[] = [ 
+  ...Object.values(DynamoFM_AngularMultiPipeAvailable), 
+
+  DynamoFM_Pipe.country,
+  DynamoFM_Pipe.custom,
+  DynamoFM_Pipe.division,
+  DynamoFM_Pipe.list,
+  DynamoFM_Pipe.objKey,
+  DynamoFM_Pipe.range,
+  DynamoFM_Pipe.region,
+  DynamoFM_Pipe.replace,
+  DynamoFM_Pipe.smartReplace,
+] as DynamoFM_MultiPipeAvailable[];
+
+export const DynamoFM_allDynamoPipes: DynamoFM_Pipe[] = Object.values(DynamoFM_Pipe);
+
+export const DynamoFM_allMultiPipeAngularPipes: DynamoFM_AngularMultiPipeAvailable[] = 
+  Object.values(DynamoFM_AngularMultiPipeAvailable);

package/src/_enums/range-pipe-setting.enum.ts

@@ -0,0 +1,11 @@
+
+export enum DynamoFM_RangePipeSetting {
+  avg = 'avg',
+  average = 'average',
+  min = 'min',
+  from = 'from',
+  max = 'max',
+  to = 'to',
+  both = 'both',
+  fromTo = 'from-to',
+}

package/src/_enums/time/day-of-week.enum.ts

@@ -0,0 +1,28 @@
+
+
+
+export enum DynamoFM_DayOfWeek {
+  monday = 'monday',
+  tuesday = 'tuesday',
+  wednesday = 'wednesday',
+  thursday = 'thursday',
+  friday = 'friday',
+  saturday = 'saturday',
+  sunday = 'sunday',
+}
+
+export const DynamoFM_allDaysOfWeek = Object.values(DynamoFM_DayOfWeek);
+
+/** stupid style */
+export const DynamoFM_allDaysOfWeekAmericanStyle = [
+  DynamoFM_DayOfWeek.sunday,
+  DynamoFM_DayOfWeek.monday,
+  DynamoFM_DayOfWeek.tuesday,
+  DynamoFM_DayOfWeek.wednesday,
+  DynamoFM_DayOfWeek.thursday,
+  DynamoFM_DayOfWeek.friday,
+  DynamoFM_DayOfWeek.saturday,
+];
+export const DynamoFM_allDaysOfWeekStupid = DynamoFM_allDaysOfWeekAmericanStyle;
+
+

package/src/_enums/time/index.ts

@@ -0,0 +1,4 @@
+
+export * from './day-of-week.enum';
+export * from './month.enum';
+export * from './relative-date.enum';

package/src/_enums/time/month.enum.ts

@@ -0,0 +1,16 @@
+
+
+export enum DynamoFM_Month {
+  january = 'january',
+  february = 'february',
+  march = 'march',
+  april = 'april',
+  may = 'may',
+  june = 'june',
+  july = 'july',
+  august = 'august',
+  september = 'september',
+  october = 'october',
+  november = 'november',
+  december = 'december',
+}

package/src/_enums/time/relative-date.enum.ts

@@ -0,0 +1,13 @@
+
+
+export enum DynamoFM_RelativeDate {
+  lastDay = 'lastDay',
+  lastWeek = 'lastWeek',
+  lastMonth = 'lastMonth',
+  lastYear = 'lastYear',
+  last10Years = 'last10Years',
+  allTime = 'allTime',
+}
+
+
+

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

@@ -1,7 +1,7 @@
 
 
-import { DynamoFM_error_defaults } from '../../_constants/error-defaults.const';
-import { DynamoFM_Log } from '../../_utils/log.util';
+import { DynamoFM_error_defaults } from '../../_collections/constants/error-defaults.const';
+import { DynamoFM_Log } from '../../_collections/utils/log.util';
 import { DynamoFM_Error } from './error.control-model';
 
 describe('DynamoFM_Error;', (): void => {
@@ -17,7 +17,7 @@ describe('DynamoFM_Error;', (): void => {
   const message_1: string = 'TEST ERROR MSG (1)';
   const message_2: string = 'TEST ERROR MSG (2)';
   const message_selfDefined: string = DynamoFM_error_defaults.message + 
-    '; error.control-model.spec.js:78:29)';
+    '; error.control-model.spec.js:83:29)';
   
   const errorCode_0: string = 'ASD-ASD-001';
   const errorCode_1: string = 'ASD-ASD-002';
@@ -38,6 +38,10 @@ describe('DynamoFM_Error;', (): void => {
     test: 'test',
     test2: 'test2',
   };
+  const additionalContent_2 = {
+    test2: 'testZ',
+    test3: 'test3',
+  };
   
   const log: boolean = false;
   /* const log: boolean = true; */
@@ -80,6 +84,7 @@ describe('DynamoFM_Error;', (): void => {
       userMessage: userMessage_2,
       addECToUserMsg: true,
       errorCode: errorCode_2,
+      additionalContent: additionalContent_2,
       error: error_stack_1,
     });
 
@@ -353,11 +358,14 @@ describe('DynamoFM_Error;', (): void => {
     });
 
     it('on error_stack_1', (): void => {
-      expect(error_stack_1.additionalContent).toBe(additionalContent_1);
+      expect(error_stack_1.additionalContent).toEqual(additionalContent_1);
     });
 
     it('on error_stack_2', (): void => {
-      expect(error_stack_2.additionalContent).toBe(additionalContent_1);
+      expect(error_stack_2.additionalContent).toEqual({ 
+        ...additionalContent_1,
+        ...additionalContent_2, 
+      });
     });
 
     it('on self defined error', (): void => {

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

@@ -1,6 +1,6 @@
-import { DynamoFM_error_defaults } from '../../_constants/error-defaults.const';
+import { DynamoFM_error_defaults } from '../../_collections/constants/error-defaults.const';
 import { DynamoFM_ErrorLevel } from '../../_enums';
-import { DynamoFM_Log } from '../../_utils/log.util';
+import { DynamoFM_Log } from '../../_collections/utils/log.util';
 import { DynamoFM_Metadata } from '../data-models/metadata.data-model';
 
 export type DFM_Error = DynamoFM_Error;
@@ -40,47 +40,6 @@ export interface DynamoFM_Error_Settings {
   __v?: number;
 }
 
-/* export class DynamoFM_Error_SettingsBuilder {
-
-  constructor(
-    private serviceName: string,
-    private issuer: string,
-  ) {}
-
-  getErrorSettings(
-    set: {
-      functionName: string,
-
-      error?: DynamoFM_AnyError,
-      errorMessage?: string,
-      userMessge?: string,
-      errorLevel?: DynamoFM_ErrorLevel,
-      errorCode?: string,
-      defaultErrorUserMsg: string,
-      issuer: string,
-    }
-  ): DynamoFM_Error_Settings {
-    return {
-      status:  417,
-      message: 
-        set.errorMessage ?? 
-        (set.error as Error)?.message ?? 
-        `${set.functionName} was UNSUCCESFUL (WB)`,
-      userMessage: 
-        set.userMessge ??
-          set.errorLevel === DynamoFM_ErrorLevel.user ? 
-          (set.error as Error)?.message :
-          (set.error as DynamoFM_Error)?.__userMessage ?? set.defaultErrorUserMsg,
-      addECToUserMsg: 
-        !(set.error as DynamoFM_Error)?.__userMessage && 
-        !set.errorLevel,
-      issuer: this.issuer,
-      issuerService: this.serviceName,
-      error: set.error ?? new Error(set.errorMessage),
-    };
-  }
-} */
-
 export type DynamoFM_AnyError = Error | DynamoFM_Error;
 
 export class DynamoFM_Error extends DynamoFM_Metadata {
@@ -111,8 +70,8 @@ export class DynamoFM_Error extends DynamoFM_Metadata {
   level?: DynamoFM_ErrorLevel;
   
   levelUpThis?: boolean;
-  additionalContent?: any;
-  confidentialContent?: any;
+  additionalContent?: any = {};
+  confidentialContent?: any = {};
 
   constructor(
     set?: DynamoFM_Error_Settings
@@ -122,7 +81,7 @@ export class DynamoFM_Error extends DynamoFM_Metadata {
       { 
         issuer: set?.issuerService ?? 
           (set?.error as DynamoFM_Error)?.___issuerService ?? 
-            DynamoFM_error_defaults.issuerService 
+            DynamoFM_error_defaults.issuerService,
       }
     );
     
@@ -147,10 +106,28 @@ export class DynamoFM_Error extends DynamoFM_Metadata {
       this.level = set?.level ?? (set?.error as DynamoFM_Error)?.level ?? DynamoFM_ErrorLevel.error;
 
       this.levelUpThis = set?.levelUpThis;
-      this.additionalContent = set?.additionalContent ?? 
-        (set?.error as DynamoFM_Error)?.additionalContent ?? {};
-      this.confidentialContent = set?.confidentialContent ??
-        (set?.error as DynamoFM_Error)?.confidentialContent ?? {};
+
+      if (set?.additionalContent && (set?.error as DynamoFM_Error)?.additionalContent) {
+        this.additionalContent = {
+          ...(set?.error as DynamoFM_Error)?.additionalContent,
+          ...set.additionalContent,
+        };
+      } else if (set?.additionalContent) {
+        this.additionalContent = set.additionalContent;
+      } else if ((set?.error as DynamoFM_Error)?.additionalContent) {
+        this.additionalContent = (set?.error as DynamoFM_Error)?.additionalContent;
+      }
+
+      if (set?.confidentialContent && (set?.error as DynamoFM_Error)?.confidentialContent) {
+        this.confidentialContent = {
+          ...(set?.error as DynamoFM_Error)?.confidentialContent,
+          ...set.confidentialContent,
+        };
+      } else if (set?.confidentialContent) {
+        this.confidentialContent = set.confidentialContent;
+      } else if ((set?.error as DynamoFM_Error)?.confidentialContent) {
+        this.confidentialContent = (set?.error as DynamoFM_Error)?.confidentialContent;
+      }
 
       /** set default error code */
       if (!set.errorCode) {
@@ -194,11 +171,14 @@ export class DynamoFM_Error extends DynamoFM_Metadata {
 
       /** set message */
       if (!set.message) {
-        /** simple - non-dynamo - error */
-        if (
+        if (typeof set?.error === 'string') {
+        /** string error */
+          set.message = set.error;
+        } else if (
           !(set?.error as DynamoFM_Error)?.flag?.includes('DYNAMO') && 
           (set?.error as Error)?.message
         ) {
+        /** simple - non-dynamo - error */
           set.message = (set?.error as Error)?.message;
         } else if ((set.error as Error).stack) {
         /** error not defined - self defining */

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

@@ -1,7 +1,7 @@
 
 
-import { DynamoFM_Region } from '../../../_enums/region.enum';
-import { DynamoFM_SubRegion } from '../../../_enums/sub-region.enum';
+import { DynamoFM_Region } from '../../../_enums/location/region.enum';
+import { DynamoFM_SubRegion } from '../../../_enums/location/sub-region.enum';
 import { DynamoFM_CountryDivision } from './country-division.interface';
 
 export interface DynamoFM_CountryISO {