@futdevpro/fsm-dynamo 1.5.60 → 1.5.63

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

@@ -66,7 +66,6 @@ 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;
@@ -75,6 +74,10 @@ export class Dynamo_Error extends Dynamo_Metadata {
       if (!set.errorCode) {
         set.errorCode = dynamo_error_default.errorCode;
       }
+      /** set default error (self defined) */
+      if (!set?.error) {
+        set.error = new Error();
+      }
 
       /** set errorCodes */
       const previousErrorCodes: string[] = [];
@@ -85,16 +88,22 @@ export class Dynamo_Error extends Dynamo_Metadata {
         set.errorCode = dynamo_error_default.errorCode;
       }
       this._errorCodes = [ ...previousErrorCodes, set?.errorCode ].filter(Boolean);
-      this._errorCode = this._errorCodes?.[0];
+
+      /** bring up non NTS and non default first error */
+      const filteredErrorCodes: string[] = this._errorCodes.filter(
+        (code: string) => code && code !== dynamo_error_default.errorCode && !code.includes('NTS-')
+      );
+      this._errorCode = filteredErrorCodes[0] ?? this._errorCodes?.[0];
+      const highlightedErrorCodeIndex: number = this._errorCodes.findIndex(code => code === filteredErrorCodes?.[0]);
 
       /** set message */
       if (!set.message) {
         /** 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')?.[2]?.split('\\');
           set.message = dynamo_error_default.message + '; ' + posFull[posFull.length - 1];
         }
       }
@@ -106,7 +115,11 @@ export class Dynamo_Error extends Dynamo_Metadata {
         previousErrorCodes.push((set?.error as Error)?.message);
       }
       this._messages = [ ...previousMessages, set?.message, ].filter(Boolean);
-      this._message = this._messages?.[0];
+      if (-1 < highlightedErrorCodeIndex && this._messages[highlightedErrorCodeIndex]) {
+        this._message = this._messages[highlightedErrorCodeIndex];
+      } else {
+        this._message = this._messages?.[0];
+      }
 
       /** set userMessages */
       const previousUserMessages: string[] = [];
@@ -116,11 +129,17 @@ 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);
-      this.__userMessage = this.__userMessages.filter((msg: string) => msg && msg !== dynamo_error_default.userMessage)?.[0];
+      if (-1 < highlightedErrorCodeIndex && this.__userMessages[highlightedErrorCodeIndex]) {
+        this.__userMessage = this.__userMessages[highlightedErrorCodeIndex];
+      } else {
+        this.__userMessage = this.__userMessages.filter(
+          (msg: string) => msg && msg !== dynamo_error_default.userMessage
+        )?.[0];
+      }
 
       /** set errors */
       const previousErrors: (Error | Dynamo_Error)[] = [];
@@ -129,6 +148,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)
@@ -148,10 +178,13 @@ export class Dynamo_Error extends Dynamo_Metadata {
   }
 
   getErrorSimplified(): Dynamo_Error {
-    const error = this;
+    const error = { ...this };
 
     delete 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;
     }
@@ -160,15 +193,27 @@ export class Dynamo_Error extends Dynamo_Metadata {
   }
 
   getErrorsFlat(): Dynamo_Error {
-    const error = this;
+    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.forEach((err: Dynamo_Error) => {
-      if (err.errors) {
-        delete err.errors;
+    error.errors.map((err: Dynamo_Error) => {
+      const subError = { ...err };
+
+      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 ((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

@@ -8,16 +8,15 @@ export type D_L = Dynamo_Log;
 
 export class Dynamo_Log {
   static highlightedLog(message: string, ...optionalParams: any[]): void {
-    console.log('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+    console.log('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! TEST !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n');
     console.log(message, ...optionalParams);
-    console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
+    console.log('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! TEST !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
   }
   
   static testLog(message: string, ...optionalParams: any[]): void {
-    console.log('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
-    console.log('TEST');
+    console.log('\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! TEST !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n');
     console.log(message, ...optionalParams);
-    console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
+    console.log('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! TEST !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n');
   }
 
   static setStyle(styles: Dynamo_LogStyle[]): void {