@futdevpro/fsm-dynamo 1.5.61 → 1.5.64

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

@@ -7,26 +7,29 @@ export type D_Error = Dynamo_Error;
 export class Dynamo_Error extends Dynamo_Metadata {
   readonly flag = 'DYNAMO-ERROR-OBJECT-v2';
 
-  _errorCode: string;
-  _errorCodes: string[] = [];
+  _errorCode?: string;
+  _errorCodes?: string[] = [];
 
   /** contains all sub error messages, in reversed order */
-  _message: string;
-  _messages: string[] = [];
+  _message?: string;
+  _messages?: string[] = [];
 
-  __userMessage: string;
+  __userMessage?: string;
   /** contains all sub error messages, in reversed order */
-  __userMessages: string[] = [];
+  __userMessages?: string[] = [];
 
-  ___handled: boolean;
-  ___status: number;
+  ___handled?: boolean;
+  ___status?: number;
 
-  ___issuer: string;
-  ___issuerSystem: string;
-  ___issuerService: string;
+  ___issuer?: string;
+  ___issuerSystem?: string;
+  ___issuerService?: string;
 
-  error: Error | Dynamo_Error;
-  errors: (Error | Dynamo_Error)[] = [];
+  error?: Error | Dynamo_Error;
+  errors?: (Error | Dynamo_Error)[] = [];
+  
+  levelUpThis?: boolean;
+  additionalContent?: any;
 
   constructor(
     set?: {
@@ -45,6 +48,9 @@ export class Dynamo_Error extends Dynamo_Metadata {
       issuer?: string,
       issuerSystem?: string,
       issuerService?: string,
+  
+      levelUpThis?: boolean;
+      additionalContent?: any;
       
       modestLog?: boolean,
       log?: boolean,
@@ -66,15 +72,23 @@ export class Dynamo_Error extends Dynamo_Metadata {
       /** set simple properties */
       this.___handled = Boolean(set?.handled ?? (set?.error as Dynamo_Error)?.___handled);
       this.___status = set?.status ?? (set?.error as Dynamo_Error)?.___status;
-
       this.___issuer = set?.issuer ?? (set?.error as Dynamo_Error)?.___issuer ?? dynamo_error_default.issuer;
       this.___issuerSystem = set?.issuerSystem ?? (set?.error as Dynamo_Error)?.___issuerSystem ?? dynamo_error_default.issuerSystem;
       this.___issuerService = set?.issuerService ?? (set?.error as Dynamo_Error)?.___issuerService ?? dynamo_error_default.issuerService;
+      this.levelUpThis = set?.levelUpThis;
+      this.additionalContent = set?.additionalContent;
 
       /** set default error code */
       if (!set.errorCode) {
         set.errorCode = dynamo_error_default.errorCode;
       }
+      /** set default error (self defined) */
+      if (!set?.error) {
+        set.error = new Error();
+        const errorStack: string[] = set.error.stack.split('\n');
+        errorStack.splice(1, 1);
+        set.error.stack = errorStack.join('\n');
+      }
 
       /** set errorCodes */
       const previousErrorCodes: string[] = [];
@@ -84,6 +98,7 @@ export class Dynamo_Error extends Dynamo_Metadata {
       if (!set.errorCode) {
         set.errorCode = dynamo_error_default.errorCode;
       }
+      /* if (this.levelUpThis) */
       this._errorCodes = [ ...previousErrorCodes, set?.errorCode ].filter(Boolean);
 
       /** bring up non NTS and non default first error */
@@ -98,9 +113,9 @@ export class Dynamo_Error extends Dynamo_Metadata {
         /** simple - non-dynamo - error */
         if (!(set?.error as Dynamo_Error)?.flag?.includes('DYNAMO') && (set?.error as Error)?.message) {
           set.message = (set?.error as Error)?.message;
-        } else {
+        } else if ((set.error as Error).stack) {
         /** error not defined */
-          const posFull = new Error().stack.split('\n')?.[2]?.split('\\');
+          const posFull = (set.error as Error).stack.split('\n')?.[1]?.split('\\');
           set.message = dynamo_error_default.message + '; ' + posFull[posFull.length - 1];
         }
       }
@@ -126,7 +141,7 @@ export class Dynamo_Error extends Dynamo_Metadata {
       if (!set.userMessage) {
         set.userMessage = dynamo_error_default.userMessage;
       }
-      if (set.addECToUserMsg && set.errorCode) {
+      if (set.addECToUserMsg && set.userMessage !== dynamo_error_default.userMessage && set.errorCode) {
         set.userMessage += `\nErrorCode: ${set.errorCode}`
       }
       this.__userMessages = [ ...previousUserMessages, set?.userMessage ].filter(Boolean);
@@ -145,6 +160,17 @@ export class Dynamo_Error extends Dynamo_Metadata {
       }
       this.errors = [ ...previousErrors, set?.error ].filter(Boolean);
       this.error = this.errors?.[0];
+      this.errors.map((error: Error | Dynamo_Error) => {
+        if ((error as Dynamo_Error)?.flag?.includes('DYNAMO')) {
+          const subError = { ...error };
+          
+          if ((subError as Dynamo_Error)?.errors) {
+            delete (subError as Dynamo_Error).errors;
+          }
+
+          return subError;
+        }
+      });
       
       if (set?.modestLog) {
         console.error(this._message ?? this.__userMessage ?? this.error)
@@ -168,29 +194,38 @@ export class Dynamo_Error extends Dynamo_Metadata {
 
     delete error.errors;
 
-    if ((error.error as Dynamo_Error)?.errors) {
-      delete (error.error as Dynamo_Error).errors;
-    }
     if ((error.error as Dynamo_Error)?.error) {
       delete (error.error as Dynamo_Error).error;
     }
+    if ((error.error as Dynamo_Error)?.errors) {
+      delete (error.error as Dynamo_Error).errors;
+    }
 
     return error;
   }
 
   getErrorsFlat(): Dynamo_Error {
     const error = { ...this };
+    
+    if ((error.error as Dynamo_Error)?.error) {
+      delete (error.error as Dynamo_Error).error;
+    }
+    if ((error.error as Dynamo_Error)?.errors) {
+      delete (error.error as Dynamo_Error).errors;
+    }
+
+    error.errors.map((err: Dynamo_Error) => {
+      const subError = { ...err };
 
-    error.errors.forEach((err: Dynamo_Error) => {
-      if (err.errors) {
-        delete err.errors;
+      if (subError.errors) {
+        delete subError.errors;
       }
 
-      if ((err.error as Dynamo_Error)?.errors) {
-        delete (err.error as Dynamo_Error).errors;
+      if ((subError.error as Dynamo_Error)?.errors) {
+        delete (subError.error as Dynamo_Error).errors;
       }
-      if ((err.error as Dynamo_Error)?.error) {
-        delete (err.error as Dynamo_Error).error;
+      if ((subError.error as Dynamo_Error)?.error) {
+        delete (subError.error as Dynamo_Error).error;
       }
     });
 

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

@@ -1,4 +1,3 @@
-import { Dynamo_Error } from '../control-models';
 
 export type D_Metadata = Dynamo_Metadata;
 export type D_MetaD = Dynamo_Metadata;
@@ -58,9 +57,7 @@ export class Dynamo_Metadata {
 
     if (forceUpdate?.issuer) {
       if (!this._id && forceUpdate.throwOnMissingId) {
-        throw new Dynamo_Error({
-          message: `Dynamo_Metadata.constructor: missing _id`,
-        });
+        throw new Error(`Dynamo_Metadata.constructor: missing _id`);
       }
       this.__lastModified = new Date();
       this.__lastModifiedBy = forceUpdate.issuer;

package/src/_utils/log.util.ts

@@ -7,18 +7,6 @@ export type D_Log = Dynamo_Log;
 export type D_L = Dynamo_Log;
 
 export class Dynamo_Log {
-  static highlightedLog(message: string, ...optionalParams: any[]): void {
-    console.log('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
-    console.log(message, ...optionalParams);
-    console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
-  }
-  
-  static testLog(message: string, ...optionalParams: any[]): void {
-    console.log('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
-    console.log('TEST');
-    console.log(message, ...optionalParams);
-    console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
-  }
 
   static setStyle(styles: Dynamo_LogStyle[]): void {
     let styleSets = '';
@@ -43,7 +31,7 @@ export class Dynamo_Log {
     return result;
   }
 
-  static success(message: string, ...optionalParams: any[]): void {
+  static success(message: any, ...optionalParams: any[]): void {
     if (0 < optionalParams.length) {
       console.log(`${Dynamo_LogStyle.green}${Dynamo_LogStyle.bright}${message}`, ...optionalParams, Dynamo_LogStyle.reset);
     } else {
@@ -53,11 +41,11 @@ export class Dynamo_Log {
   /** 
    * @deprecated use Dynamo_Log.success instead
    */
-  static logSuccess(message: string, ...optionalParams: any[]) {
+  static logSuccess(message: any, ...optionalParams: any[]) {
     this.success(message, ...optionalParams);
   } 
 
-  static error(message: string, ...optionalParams: any[]): void {
+  static error(message: any, ...optionalParams: any[]): void {
     if (0 < optionalParams.length) {
       console.error(`${Dynamo_LogStyle.red}${Dynamo_LogStyle.bright}${message}`, ...optionalParams, Dynamo_LogStyle.reset);
     } else {
@@ -67,11 +55,11 @@ export class Dynamo_Log {
   /** 
    * @deprecated use Dynamo_Log.error instead
    */
-  static logError(message: string, ...optionalParams: any[]) {
+  static logError(message: any, ...optionalParams: any[]) {
     this.error(message, ...optionalParams);
   }
 
-  static warn(message: string, ...optionalParams: any[]): void {
+  static warn(message: any, ...optionalParams: any[]): void {
     if (0 < optionalParams.length) {
       console.warn(`${Dynamo_LogStyle.yellow}${Dynamo_LogStyle.bright}${message}`, ...optionalParams, Dynamo_LogStyle.reset);
     } else {
@@ -81,25 +69,54 @@ export class Dynamo_Log {
   /** 
    * @deprecated use Dynamo_Log.warn instead
    */
-  static warning(message: string, ...optionalParams: any[]) {
+  static warning(message: any, ...optionalParams: any[]) {
     this.warn(message, ...optionalParams);
   }
   /** 
    * @deprecated use Dynamo_Log.warn instead
    */
-  static logWarning(message: string, ...optionalParams: any[]) {
+  static logWarning(message: any, ...optionalParams: any[]) {
     this.warn(message, ...optionalParams);
   }
 
-  static highlighted(message: string, ...optionalParams: any[]): void {
+  static highlighted(message: any, ...optionalParams: any[]): void {
     if (0 < optionalParams.length) {
       console.log(`${Dynamo_LogStyle.white}${Dynamo_LogStyle.bright}${message}`, ...optionalParams, Dynamo_LogStyle.reset);
     } else {
       console.log(`${Dynamo_LogStyle.white}${Dynamo_LogStyle.bright}${message}${Dynamo_LogStyle.reset}`);
     }
   }
+  static highlightedLog(message: any, ...optionalParams: any[]): void {
+    console.log('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n');
+    console.log(message, ...optionalParams);
+    console.log('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
+  }
+  
+  static test(message: any, ...optionalParams: any[]): void {
+    console.log('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n');
+    console.log(message, ...optionalParams);
+    console.log('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
+  }
+  /** 
+   * @deprecated use Dynamo_Log.success instead
+   */
+  static testLog(message: any, ...optionalParams: any[]): void {
+    this.test(message, ...optionalParams);
+  }
+
+  static testError(message: any, ...optionalParams: any[]): void {
+    this.error('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n');
+    this.error(message, ...optionalParams);
+    this.error('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
+  }
+
+  static testWarn(message: any, ...optionalParams: any[]): void {
+    this.warn('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n');
+    this.warn(message, ...optionalParams);
+    this.warn('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
+  }
 
-  static removeLogStyles(message: string): string {
+  static removeLogStyles(message: any): string {
     for (let styleKey of Object(Dynamo_LogStyle)) {
       message = message.replace(new RegExp(Dynamo_LogStyle[styleKey], 'g'), '');
     }