@oino-ts/common 0.8.0 → 0.8.2

package/dist/cjs/OINOLog.js

@@ -28,7 +28,8 @@ var OINOLogLevel;
  */
 class OINOLog {
     static _instance;
-    _logLevels = { "*|*|*": OINOLogLevel.warning };
+    _logLevels = { "||": OINOLogLevel.warning };
+    _defaultLogLevel = OINOLogLevel.warning;
     /**
      * Abstract logging method to implement the actual logging operation.
      *
@@ -37,7 +38,8 @@ class OINOLog {
      */
     constructor(logLevel = OINOLogLevel.warning) {
         // console.log("OINOLog.constructor: logLevel=" + logLevel)
-        this._logLevels["*|*|*"] = logLevel;
+        this._logLevels["||"] = logLevel;
+        this._defaultLogLevel = logLevel;
     }
     /**
      * Abstract logging method to implement the actual logging operation.
@@ -52,9 +54,11 @@ class OINOLog {
         const log_levels = OINOLog._instance._logLevels;
         // console.log(log_levels)
         const min_level = log_levels[domain + "|" + channel + "|" + method] ||
-            log_levels[domain + "|" + channel + "|*"] ||
-            log_levels[domain + "|*|*"] ||
-            log_levels["*|*|*"];
+            log_levels[domain + "||" + method] ||
+            log_levels[domain + "|" + channel + "|"] ||
+            log_levels["|" + channel + "|"] ||
+            log_levels[domain + "||"] ||
+            log_levels["||"];
         // console.log("_log: level=" + level + ", min_level=" + min_level + ", levelStr=" + levelStr + ", message=" + message, data)
         if ((OINOLog._instance) && (level >= min_level)) {
             OINOLog._instance?._writeLog(levelStr, domain, channel, method, message, data);
@@ -87,7 +91,7 @@ class OINOLog {
      * @param method method of the log event (default: "*" for all)
      *
      */
-    static setLogLevel(logLevel, domain = "*", channel = "*", method = "*") {
+    static setLogLevel(logLevel, domain = "", channel = "", method = "") {
         if (OINOLog._instance) {
             OINOLog._instance._logLevels[domain + "|" + channel + "|" + method] = logLevel;
         }
@@ -157,6 +161,48 @@ class OINOLog {
     static debug(domain, channel, method, message, data) {
         OINOLog._log(OINOLogLevel.debug, "DEBUG", domain, channel, method, message, data);
     }
+    /**
+     * Get current log levels as an array of objects with domain, channel, method and level.
+     *
+     */
+    static exportLogLevels() {
+        let result = [];
+        if (OINOLog._instance) {
+            for (const key in OINOLog._instance._logLevels) {
+                const level = OINOLog._instance._logLevels[key];
+                if (level) {
+                    const parts = key.split("|");
+                    result.push({
+                        domain: parts[0],
+                        channel: parts[1],
+                        method: parts[2],
+                        level: level
+                    });
+                }
+            }
+        }
+        return result;
+    }
+    /**
+     * Import log levels from an array of objects with domain, channel, method and level.
+     *
+     * @param logLevels array of log level objects
+     *
+     */
+    static importLogLevels(logLevels) {
+        if (OINOLog._instance) {
+            OINOLog._instance._logLevels = { "||": OINOLog._instance._defaultLogLevel }; // reset to default log level
+            for (const logLevel of logLevels) {
+                const domain = logLevel.domain || "";
+                const channel = logLevel.channel || "";
+                const method = logLevel.method || "";
+                const level = logLevel.level;
+                if (level && OINOLogLevel[level]) {
+                    OINOLog._instance._logLevels[domain + "|" + channel + "|" + method] = level;
+                }
+            }
+        }
+    }
 }
 exports.OINOLog = OINOLog;
 /**

package/dist/esm/OINOLog.js

@@ -25,7 +25,8 @@ export var OINOLogLevel;
  */
 export class OINOLog {
     static _instance;
-    _logLevels = { "*|*|*": OINOLogLevel.warning };
+    _logLevels = { "||": OINOLogLevel.warning };
+    _defaultLogLevel = OINOLogLevel.warning;
     /**
      * Abstract logging method to implement the actual logging operation.
      *
@@ -34,7 +35,8 @@ export class OINOLog {
      */
     constructor(logLevel = OINOLogLevel.warning) {
         // console.log("OINOLog.constructor: logLevel=" + logLevel)
-        this._logLevels["*|*|*"] = logLevel;
+        this._logLevels["||"] = logLevel;
+        this._defaultLogLevel = logLevel;
     }
     /**
      * Abstract logging method to implement the actual logging operation.
@@ -49,9 +51,11 @@ export class OINOLog {
         const log_levels = OINOLog._instance._logLevels;
         // console.log(log_levels)
         const min_level = log_levels[domain + "|" + channel + "|" + method] ||
-            log_levels[domain + "|" + channel + "|*"] ||
-            log_levels[domain + "|*|*"] ||
-            log_levels["*|*|*"];
+            log_levels[domain + "||" + method] ||
+            log_levels[domain + "|" + channel + "|"] ||
+            log_levels["|" + channel + "|"] ||
+            log_levels[domain + "||"] ||
+            log_levels["||"];
         // console.log("_log: level=" + level + ", min_level=" + min_level + ", levelStr=" + levelStr + ", message=" + message, data)
         if ((OINOLog._instance) && (level >= min_level)) {
             OINOLog._instance?._writeLog(levelStr, domain, channel, method, message, data);
@@ -84,7 +88,7 @@ export class OINOLog {
      * @param method method of the log event (default: "*" for all)
      *
      */
-    static setLogLevel(logLevel, domain = "*", channel = "*", method = "*") {
+    static setLogLevel(logLevel, domain = "", channel = "", method = "") {
         if (OINOLog._instance) {
             OINOLog._instance._logLevels[domain + "|" + channel + "|" + method] = logLevel;
         }
@@ -154,6 +158,48 @@ export class OINOLog {
     static debug(domain, channel, method, message, data) {
         OINOLog._log(OINOLogLevel.debug, "DEBUG", domain, channel, method, message, data);
     }
+    /**
+     * Get current log levels as an array of objects with domain, channel, method and level.
+     *
+     */
+    static exportLogLevels() {
+        let result = [];
+        if (OINOLog._instance) {
+            for (const key in OINOLog._instance._logLevels) {
+                const level = OINOLog._instance._logLevels[key];
+                if (level) {
+                    const parts = key.split("|");
+                    result.push({
+                        domain: parts[0],
+                        channel: parts[1],
+                        method: parts[2],
+                        level: level
+                    });
+                }
+            }
+        }
+        return result;
+    }
+    /**
+     * Import log levels from an array of objects with domain, channel, method and level.
+     *
+     * @param logLevels array of log level objects
+     *
+     */
+    static importLogLevels(logLevels) {
+        if (OINOLog._instance) {
+            OINOLog._instance._logLevels = { "||": OINOLog._instance._defaultLogLevel }; // reset to default log level
+            for (const logLevel of logLevels) {
+                const domain = logLevel.domain || "";
+                const channel = logLevel.channel || "";
+                const method = logLevel.method || "";
+                const level = logLevel.level;
+                if (level && OINOLogLevel[level]) {
+                    OINOLog._instance._logLevels[domain + "|" + channel + "|" + method] = level;
+                }
+            }
+        }
+    }
 }
 /**
  * Logging implementation based on console.log.

package/dist/types/OINOLog.d.ts

@@ -20,6 +20,7 @@ export declare enum OINOLogLevel {
 export declare abstract class OINOLog {
     protected static _instance: OINOLog;
     protected _logLevels: Record<string, OINOLogLevel>;
+    protected _defaultLogLevel: OINOLogLevel;
     /**
      * Abstract logging method to implement the actual logging operation.
      *
@@ -127,6 +128,18 @@ export declare abstract class OINOLog {
      *
      */
     static debug(domain: string, channel: string, method: string, message: string, data?: any): void;
+    /**
+     * Get current log levels as an array of objects with domain, channel, method and level.
+     *
+     */
+    static exportLogLevels(): any[];
+    /**
+     * Import log levels from an array of objects with domain, channel, method and level.
+     *
+     * @param logLevels array of log level objects
+     *
+     */
+    static importLogLevels(logLevels: any[]): void;
 }
 /**
  * Logging implementation based on console.log.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/common",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "OINO TS package for common classes.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,7 +19,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@oino-ts/types": "0.8.0"
+    "@oino-ts/types": "0.8.2"
   },
   "files": [
     "src/*.ts",

package/src/OINOLog.ts

@@ -28,7 +28,8 @@ export enum OINOLogLevel {
 export abstract class OINOLog {
     protected static _instance:OINOLog
 
-    protected _logLevels:Record<string, OINOLogLevel> = { "*|*|*": OINOLogLevel.warning }
+    protected _logLevels:Record<string, OINOLogLevel> = { "||": OINOLogLevel.warning }
+    protected _defaultLogLevel:OINOLogLevel = OINOLogLevel.warning
 
     /**
      * Abstract logging method to implement the actual logging operation.
@@ -38,7 +39,8 @@ export abstract class OINOLog {
      */
     constructor (logLevel:OINOLogLevel = OINOLogLevel.warning) {
         // console.log("OINOLog.constructor: logLevel=" + logLevel)
-        this._logLevels["*|*|*"] = logLevel
+        this._logLevels["||"] = logLevel
+        this._defaultLogLevel = logLevel
     }
 
 
@@ -68,9 +70,11 @@ export abstract class OINOLog {
         const log_levels = OINOLog._instance!._logLevels
         // console.log(log_levels)
         const min_level = log_levels[domain + "|" + channel + "|" + method] ||
-            log_levels[domain + "|" + channel + "|*"] || 
-            log_levels[domain + "|*|*"] ||
-            log_levels["*|*|*"]
+            log_levels[domain + "||" + method] || 
+            log_levels[domain + "|" + channel + "|"] || 
+            log_levels["|" + channel + "|"] || 
+            log_levels[domain + "||"] ||
+            log_levels["||"]
         // console.log("_log: level=" + level + ", min_level=" + min_level + ", levelStr=" + levelStr + ", message=" + message, data)
         if ((OINOLog._instance) && (level >= min_level)) {
             OINOLog._instance?._writeLog(levelStr, domain, channel, method, message, data)
@@ -105,7 +109,7 @@ export abstract class OINOLog {
      * @param method method of the log event (default: "*" for all)
      * 
      */
-    static setLogLevel(logLevel:OINOLogLevel, domain:string = "*", channel:string = "*", method:string = "*") {
+    static setLogLevel(logLevel:OINOLogLevel, domain:string = "", channel:string = "", method:string = "") {
         if (OINOLog._instance) {
             OINOLog._instance._logLevels[domain + "|" + channel + "|" + method] = logLevel
         }
@@ -180,6 +184,51 @@ export abstract class OINOLog {
     static debug(domain:string, channel:string, method:string, message:string, data?:any) {
         OINOLog._log(OINOLogLevel.debug, "DEBUG", domain, channel, method, message, data)
     }
+
+    /**
+     * Get current log levels as an array of objects with domain, channel, method and level.
+     * 
+     */
+    static exportLogLevels():any[] {
+        let result:any = []
+        if (OINOLog._instance) {
+            for (const key in OINOLog._instance._logLevels) {
+                const level = OINOLog._instance._logLevels[key]
+                if (level) {
+                    const parts = key.split("|")
+                    result.push({
+                        domain: parts[0],
+                        channel: parts[1],
+                        method: parts[2],
+                        level: level
+                    })
+                }
+            }
+        }
+        return result
+    }
+
+
+    /**
+     * Import log levels from an array of objects with domain, channel, method and level.
+     * 
+     * @param logLevels array of log level objects
+     * 
+     */
+    static importLogLevels(logLevels:any[]):void {
+        if (OINOLog._instance) {
+            OINOLog._instance._logLevels = {"||": OINOLog._instance._defaultLogLevel} // reset to default log level
+            for (const logLevel of logLevels) {
+                const domain = logLevel.domain || ""
+                const channel = logLevel.channel || ""
+                const method = logLevel.method || ""
+                const level = logLevel.level
+                if (level && OINOLogLevel[level]) {
+                    OINOLog._instance._logLevels[domain + "|" + channel + "|" + method] = level
+                }
+            }
+        }
+    }
 }
 
 /**