modality-kit 0.1.3 → 0.1.5

package/dist/index.js

@@ -56,7 +56,6 @@ function formatErrorResponse(errorData, operation, meta) {
 }
 // src/util_logger.ts
 class ModalityLogger {
-  static instance;
   options = {};
   logLevel = "info";
   constructor(logOption, logLevel = "info") {
@@ -68,10 +67,7 @@ class ModalityLogger {
     this.logLevel = logLevel;
   }
   static getInstance(logOption, logLevel) {
-    if (!ModalityLogger.instance) {
-      ModalityLogger.instance = new ModalityLogger(logOption, logLevel);
-    }
-    return ModalityLogger.instance;
+    return new ModalityLogger(logOption, logLevel);
   }
   getTimestamp() {
     if (this.options.timestampFormat === false)
@@ -117,74 +113,99 @@ class ModalityLogger {
     if (categroy) {
       prefix += ` [${categroy}]`;
     }
-    console.log(`
-`);
-    console.log(prefix);
-    return payload;
+    return { prefix, result: payload };
   }
   log(level, payload, categroy) {
     if (!this.shouldLog(level))
       return;
-    const formatted = this.format(level, payload, categroy);
+    const { prefix, result } = this.format(level, payload, categroy);
     switch (level) {
       case "debug":
-        console.debug(formatted);
+        console.debug(`
+`, prefix, result, `
+`);
         break;
       case "info":
-        console.dir(formatted, {
+        console.log(`
+`, prefix);
+        console.dir(result, {
           depth: null,
           colors: true,
           maxArrayLength: null
         });
+        console.log(`
+`);
         break;
       case "warn":
-        console.warn(formatted);
+        console.log(`
+`, prefix);
+        console.warn(result);
+        console.log(`
+`);
         break;
       case "error":
-        const error = formatted.error;
+        const error = result.error;
         if (error instanceof Error) {
-          delete formatted.error;
-          console.error(formatted);
+          delete result.error;
           const { message, stack } = error;
-          if (message) {
-            console.log(message);
-          }
           if (stack) {
-            console.log(stack);
+            if (Object.keys(result).length) {
+              console.error(`
+`, prefix, result, stack, `
+`);
+            } else {
+              console.error(`
+`, prefix, stack, `
+`);
+            }
+          } else {
+            if (message) {
+              result.error = message;
+            }
+            console.error(`
+`, prefix, result, `
+`);
           }
         } else {
-          console.error(formatted);
+          console.error(`
+`, prefix, result, `
+`);
         }
         break;
       case "success":
-        console.log(formatted);
+        console.log(`
+`, prefix, result, `
+`);
         break;
       default:
-        console.log(formatted);
+        console.log(`
+`, prefix, result, `
+`);
         break;
     }
-    console.log(`
-`);
-  }
-  debug(message, error) {
-    this.log("debug", { message, error });
   }
-  info(message, data) {
-    const payload = { message };
+  cook(message, data) {
+    const payload = typeof message === "string" ? { message } : message;
     if (data) {
       payload.data = data;
     }
-    this.log("info", payload);
+    return payload;
+  }
+  debug(message, data) {
+    this.log("debug", this.cook(message, data));
+  }
+  info(message, data) {
+    this.log("info", this.cook(message, data));
   }
-  warn(message, resolution) {
-    this.log("warn", { message, resolution });
+  warn(message, data) {
+    this.log("warn", this.cook(message, data));
   }
   error(message, error, additionalData) {
-    const data = { message, additionalData, error };
-    this.log("error", data);
+    const payload = { error };
+    this.log("error", this.cook(payload, additionalData), message);
   }
   success(message, data) {
-    this.log("success", { message, data });
+    this.log("success", this.cook(message, data));
   }
 }
 var loggerInstance = ModalityLogger.getInstance.bind(ModalityLogger);

package/dist/types/util_logger.d.ts

@@ -8,19 +8,19 @@ export interface LoggerOptions {
     name?: string;
 }
 export declare class ModalityLogger {
-    private static instance;
     private options;
     private logLevel;
-    constructor(logOption: string | LoggerOptions, logLevel?: LogLevel);
+    private constructor();
     static getInstance(logOption: string | LoggerOptions, logLevel?: LogLevel): ModalityLogger;
     private getTimestamp;
     private shouldLog;
     setLogLevel(level: LogLevel): void;
     private format;
     log(level: LogLevel, payload: any, categroy?: string): void;
-    debug(message: string, error?: Error): void;
+    cook(message: any, data?: any): any;
+    debug(message: string, data?: any): void;
     info(message: string, data?: any): void;
-    warn(message: string, resolution?: any): void;
+    warn(message: string, data?: any): void;
     error(message: string, error?: Error | unknown, additionalData?: any): void;
     success(message: string, data?: any): void;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.3",
+  "version": "0.1.5",
   "name": "modality-kit",
   "repository": {
     "type": "git",