Add typescript declarations

.gitignore

@@ -2,4 +2,4 @@ node_modules/
 logs/
 yarn.lock
 out/
-.history/
+esm/

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+   // Use IntelliSense to learn about possible attributes.
+   // Hover to view descriptions of existing attributes.
+   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+   "version": "0.2.0",
+   "configurations": [
+      {
+         "type": "pwa-node",
+         "request": "launch",
+         "name": "Launch Program",
+         "skipFiles": ["<node_internals>/**"],
+         "program": "${workspaceFolder}/out/test.js",
+         "preLaunchTask": "tsc: build - tsconfig.json",
+         "outFiles": ["${workspaceFolder}/out/**/*.js"]
+      }
+   ]
+}

README.md

@@ -1,29 +1,29 @@
+# Logging
+
 Simple logging module, that supports terminal coloring and different plugins
 
-# Getting Started
+## Getting Started
 
-``` javascript
+```javascript
-
+const Logging = require("@hibas123/logging").default;
-const Logging = require("@hibas123/logging").Logging;
 
 Logging.log("Hello there");
-
 ```
 
 There are different Logging levels, that also apply terminal coloring:
 
-``` javascript
+```javascript
-Logging.debug("Debug message")
+Logging.debug("Debug message");
-Logging.log("Log message")
+Logging.log("Log message");
-Logging.warning("Warning")
+Logging.warning("Warning");
-Logging.error(new Error("To less creativity"))
+Logging.error(new Error("To less creativity"));
-Logging.error("Just an simple message as error")
+Logging.error("Just an simple message as error");
-Logging.errorMessage("Nearly the same as error")
+Logging.errorMessage("Nearly the same as error");
 ```
 
 All Logging types except the simple error take as many arguments as you want. These will be joined with spaces and serialized with the node util.inspect function.
 
-# Setup
+## Setup
 
 This logging module doesn't require any setup per default, but sometimes it makes sense to configure a few things.
 
@@ -31,57 +31,66 @@ For example can you disable the console output. This may be helpful, if you inse
 
 Also you can set a name. All messages that are send with this instance are prefixed by this name.
 
-``` javascript
+```javascript
-   const CustomLogging = new LoggingBase(name | {
+const CustomLogging = new LoggingBase(
-      name: "custom", // default undefined
+   name |
-      console: false // default true
+      {
-   });
+         name: "custom", // default undefined
+         console: false, // default true
+      }
+);
 ```
 
-
+## Plugins
-# Plugins
 
 There is a Plugin API available, that makes is possible to add custom Logging Adapter.
 
-``` javascript
+```javascript
 const Demo = new LoggingBase("Demo");
 Demo.addAdapter(new DemoAdapter({ color: "rainbow" }));
 ```
 
 The adapters need to provide a very simple Interface:
 
-``` typescript
+```typescript
 interface Adapter {
-    init(observable: ObservableInterface<Message>, name?: string): void | Promise<void>;
+   init(): void | Promise<void>;
 
-    flush(sync: true): void;
+   onMessage(message: Message): void;
-    flush(sync: false): void | Promise<void>;
+
+   flush(sync: true): void;
+   flush(sync: false): void | Promise<void>;
 }
 
 interface Message {
-    type: LoggingTypes;
+   type: LoggingTypes;
-    name?:string;
+   names?: string[];
-    text: {
+   text: IFormatted;
-    	raw: string[],
+   date: Date;
-    	formatted: string[]
+   file: string;
-    };
+}
-    date: Date;
+
-    file: string;
+export interface IFormatted {
+   color?: IColors;
+   bgcolor?: IColors;
+   bold?: boolean;
+   italic?: boolean;
+   blink?: boolean;
+   underscore?: boolean;
+
+   content: string;
 }
 
 enum LoggingTypes {
    Log,
    Warning,
    Error,
-   Debug
+   Debug,
 }
 ```
 
-The `ObservableInterface` comes from `@hibas123/utils`. It provides a very simple api for subscribing and unsubscribing from the message events.
+## License
 
-More Details on Observable [git](https://git.stamm.me/OpenServer/Utils) or [npm](https://www.npmjs.com/package/@hibas123/utils)
-
-# License
 MIT
 
 Copyright (c) 2018 Fabian Stamm
@@ -90,4 +99,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

benchmark.js

@@ -0,0 +1,54 @@
+const { LoggingBase } = require("./out/index.js");
+let results = {};
+
+function benchmark(name, count, runner) {
+   console.profile(name);
+   const start = process.hrtime.bigint()
+
+   runner(count);
+
+   const diffNS = process.hrtime.bigint() - start;
+   const diffMS = Number(diffNS / 1000n / 1000n);
+   console.profileEnd(name)
+
+   results[name]= {
+      count,
+      time: diffMS,
+      timePerI: (diffMS / count).toFixed(4)
+   }
+}
+
+benchmark("simple", 10000000, (cnt) => {
+   const l = new LoggingBase({
+      console: false
+   });
+   for (let i = 0; i < cnt; i++) {
+      l.log("simple log")
+   }
+})
+
+benchmark("complex", 1000000, (cnt) => {
+   const l = new LoggingBase({
+      console: false
+   });
+   for (let i = 0; i < cnt; i++) {
+      l.log("complex log", {
+         a: 1,
+         b: {
+            c:"test"
+         }
+      })
+   }
+})
+
+benchmark("very long", 10000000, (cnt) => {
+   const l = new LoggingBase({
+      console: false
+   });
+   const longText = "complex log".repeat(100);
+   for (let i = 0; i < cnt; i++) {
+      l.log(longText)
+   }
+})
+
+console.table(results)

deno_build.js

@@ -0,0 +1,8 @@
+const pkg = JSON.parse(await Deno.readTextFile("package.json"));
+const meta = JSON.parse(await Deno.readTextFile("meta.json"));
+
+meta.version = pkg.version;
+
+await Deno.copyFile("README.md", "esm/README.md");
+
+await Deno.writeTextFile("meta.json", JSON.stringify(meta, undefined, 3));

meta.json

@@ -0,0 +1,16 @@
+{
+   "name": "logging",
+   "version": "3.1.2",
+   "description": "",
+   "author": "Fabian Stamm <dev@fabianstamm.de>",
+   "contributors": [],
+   "hooks": {
+      "prepublish": "deno_build.js"
+   },
+   "root": "esm",
+   "files": [
+      "esm/**/*.ts",
+      "esm/**/*.js",
+      "esm/README.md"
+   ]
+}

package.json

@@ -1,16 +1,18 @@
 {
    "name": "@hibas123/logging",
-   "version": "2.3.0",
+   "version": "4.0.1",
    "description": "",
-   "main": "out/index.js",
+   "type": "module",
-   "types": "out/index.d.ts",
+   "main": "esm/index.js",
+   "types": "esm/index.d.ts",
+   "module": "esm/index.js",
    "scripts": {
-      "prepublish": "tsc",
+      "prepublishOnly": "npm run build",
       "build": "tsc",
-      "watch-ts": "tsc --watch",
+      "test": "tsc && node esm/test.js",
-      "watch-js": "nodemon out/test.js",
+      "postpublish": "denreg publish",
-      "watch": "concurrently npm:watch-*",
+      "bench": "tsc && node benchmark.js",
-      "test": "node out/test.js"
+      "prof": "tsc && ndb --prof benchmark.js"
    },
    "repository": {
       "type": "git",
@@ -20,16 +22,15 @@
    "license": "MIT",
    "files": [
       "src/",
-      "out/",
+      "esm/",
       "tsconfig.json",
       "readme.md"
    ],
    "devDependencies": {
-      "concurrently": "^5.1.0",
+      "concurrently": "^6.0.2",
-      "nodemon": "^2.0.2",
+      "ndb": "^1.1.5",
-      "typescript": "^3.8.3"
+      "nodemon": "^2.0.7",
-   },
+      "ts-node": "^9.1.1",
-   "dependencies": {
+      "typescript": "^4.2.4"
-      "@hibas123/utils": "^2.2.3"
    }
-}
+}

src/base.ts

@@ -1,37 +1,19 @@
-import { Observable } from "@hibas123/utils";
+import { ConsoleAdapter } from "./consolewriter.js";
-import { ConsoleAdapter } from "./consolewriter";
+import inspect from "./inspect.js";
-import inspect from "./inspect";
 import {
    Adapter,
-   LoggingTypes,
-   Message,
-   FormatConfig,
    DefaultFormatConfig,
    Format,
-   FormatTypes,
+   FormatConfig,
-   Colors,
+   Formatted,
-   FormattedText,
+   ILoggingInterface,
-   FormattedLine,
+   LoggingTypes,
-} from "./types";
+   Message,
-import Logging from ".";
+} from "./types.js";
 
 const browser = typeof window !== "undefined";
 
-export function removeColors(text: string) {
+export interface ILoggingOptions {
-   text = text.replace(
-      /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
-      ""
-   );
-
-   // let index = text.indexOf("\x1b");
-   // while (index >= 0) {
-   //     text = text.substring(0, index) + text.substring(index + 5, text.length);
-   //     index = text.indexOf("\x1b");
-   // }
-   return text;
-}
-
-export interface LoggingBaseOptions {
    /**
     * Name will be prefixed on Console output and added to logfiles, if not specified here
     */
@@ -40,198 +22,110 @@ export interface LoggingBaseOptions {
     * Prints output to console
     */
    console: boolean;
+
+   /**
+    * Enables printing of calling file
+    */
+   resolve_filename: boolean;
 }
 
-const adapterCache = new WeakMap<Adapter, number>();
+export interface INativeFunctions {
-export class LoggingBase {
+   startTimer(): any;
-   private _formatMap: FormatConfig = new DefaultFormatConfig();
+   endTimer(start: any): number;
+}
 
-   public set formatMap(value: FormatConfig) {
+export const DefaultNativeFunctions = {
-      this._formatMap = value;
+   startTimer: () => {
-   }
-
-   private adapter = new Set<Adapter>();
-   private adapter_init: Promise<void>[] = [];
-
-   private timerMap = new Map<string, { name: string; start: any }>();
-
-   private messageObservable = new Observable<Message>();
-   protected _name: string;
-
-   private _logLevel = LoggingTypes.Debug;
-
-   get logLevel() {
-      return this._logLevel;
-   }
-
-   set logLevel(value: LoggingTypes) {
-      this._logLevel = value;
-   }
-
-   get name() {
-      return this._name;
-   }
-
-   constructor(options?: Partial<LoggingBaseOptions> | string) {
-      let opt: Partial<LoggingBaseOptions>;
-      if (!options) opt = {};
-      else if (typeof options === "string") {
-         opt = { name: options };
-      } else {
-         opt = options;
-      }
-
-      let config: LoggingBaseOptions = {
-         name: undefined,
-         console: true,
-         ...opt,
-      };
-
-      if (config.name) this._name = config.name;
-
-      for (let key in this) {
-         if (typeof this[key] === "function")
-            this[key] = (<any>this[key]).bind(this);
-      }
-
-      if (config.console) {
-         this.addAdapter(new ConsoleAdapter());
-      }
-
-      //Binding function to this
-      this.debug = this.debug.bind(this);
-      this.log = this.log.bind(this);
-      this.warn = this.warn.bind(this);
-      this.warning = this.warning.bind(this);
-      this.error = this.error.bind(this);
-      this.errorMessage = this.errorMessage.bind(this);
-      this.flush = this.flush.bind(this);
-   }
-
-   addAdapter(adapter: Adapter) {
-      if (!this.adapter.has(adapter)) {
-         this.adapter.add(adapter);
-
-         let cached = adapterCache.get(adapter) || 0;
-         adapterCache.set(adapter, cached + 1);
-
-         let prms = Promise.resolve(
-            adapter.init(this.messageObservable.getPublicApi())
-         );
-         this.adapter_init.push(prms);
-      }
-   }
-
-   flush(sync: true): void;
-   flush(sync: false): Promise<void>;
-   flush(sync: boolean): void | Promise<void> {
-      if (sync) {
-         this.adapter.forEach((elm) => elm.flush(true));
-      } else {
-         let adapters: (void | Promise<void>)[] = [];
-         this.adapter.forEach((elm) => adapters.push(elm.flush(false)));
-         return Promise.all(adapters).then(() => {});
-      }
-   }
-
-   private $closed = false;
-
-   public close() {
-      if (this.$closed) return;
-      this.$closed = true;
-
-      this.adapter.forEach((adapter) => {
-         let cached = adapterCache.get(adapter);
-
-         if (cached) {
-            cached--;
-            if (cached <= 0) {
-               adapterCache.delete(adapter);
-               adapter.close();
-            } else adapterCache.set(adapter, cached);
-         }
-
-         adapter.close ? adapter.close() : undefined;
-      });
-
-      this.adapter = undefined;
-
-      this.messageObservable.close();
-   }
-
-   public waitForSetup() {
-      return Promise.all(this.adapter_init);
-   }
-
-   debug(...message: any[]) {
-      if (this._logLevel <= LoggingTypes.Debug)
-         this.message(LoggingTypes.Debug, message);
-   }
-
-   log(...message: any[]) {
-      if (this._logLevel <= LoggingTypes.Log)
-         this.message(LoggingTypes.Log, message);
-   }
-
-   warning(...message: any[]) {
-      if (this._logLevel <= LoggingTypes.Warning)
-         this.message(LoggingTypes.Warning, message);
-   }
-
-   warn(...message: any[]) {
-      if (this._logLevel <= LoggingTypes.Warning)
-         this.message(LoggingTypes.Warning, message);
-   }
-
-   error(error: Error | string) {
-      if (this._logLevel > LoggingTypes.Error) return;
-      if (!error)
-         error = "Empty ERROR was passed, so no informations available";
-      if (typeof error === "string") {
-         let e = new Error("This is a fake error, to get a stack trace");
-         this.message(LoggingTypes.Error, [error, "\n", e.stack]);
-      } else {
-         this.message(
-            LoggingTypes.Error,
-            [error.message, "\n", error.stack],
-            getCallerFromExisting(error)
-         );
-      }
-   }
-
-   errorMessage(...message: any[]) {
-      if (this._logLevel <= LoggingTypes.Error)
-         this.message(LoggingTypes.Error, message);
-   }
-
-   protected getCurrentTime(): any {
       if (browser && window.performance && window.performance.now) {
          return window.performance.now();
       } else {
          return Date.now();
       }
-   }
+   },
-
+   endTimer: (start: any) => {
-   /**
-    * The time difference in milliseconds (fractions allowed!)
-    * @param start Start time from getCurrentTime
-    */
-   protected getTimeDiff(start: any) {
       if (browser && window.performance && window.performance.now) {
          return window.performance.now() - start;
       } else {
          return Date.now() - start;
       }
+   },
+} as INativeFunctions;
+
+const consoleAdapter = new ConsoleAdapter();
+declare var process: { cwd: () => string };
+const PROJECT_ROOT = typeof process !== "undefined" ? process.cwd() : undefined;
+
+const InitialisedAdapters = Symbol("@hibas123/logging:initialisedAdapters");
+
+export abstract class LoggingInterface implements ILoggingInterface {
+   #names: string[];
+   #timerMap = new Map<string, { name: string; start: any }>();
+
+   get names() {
+      return [...this.#names];
    }
 
-   time(id?: string, name = id) {
+   protected abstract message(
-      if (!id) {
+      type: LoggingTypes,
-         id = Math.floor(Math.random() * 899999 + 100000).toString();
+      names: string[],
-      }
+      message: any[],
+      caller?: { file: string; line: number; column?: number }
+   ): void;
 
-      this.timerMap.set(id, {
+   constructor(names: string[]) {
-         name,
+      this.#names = names;
-         start: this.getCurrentTime(),
+
+      for (const key in this) {
+         if (typeof this[key] === "function") {
+            this[key] = (this[key] as never as Function).bind(this);
+         }
+      }
+   }
+
+   debug(...message: any[]) {
+      this.message(LoggingTypes.Debug, this.#names, message);
+   }
+
+   log(...message: any[]) {
+      this.message(LoggingTypes.Log, this.#names, message);
+   }
+
+   warning(...message: any[]) {
+      this.message(LoggingTypes.Warn, this.#names, message);
+   }
+
+   warn(...message: any[]) {
+      this.message(LoggingTypes.Warn, this.#names, message);
+   }
+
+   error(error: Error | string, ...message: any[]) {
+      if (!error)
+         error = "Empty ERROR was passed, so no informations available";
+      if (typeof error === "string") {
+         let e = new Error("This is a fake error, to get a stack trace");
+         this.message(LoggingTypes.Error, this.#names, [
+            error,
+            ...message,
+            "\n",
+            e.stack,
+            "\n",
+         ]);
+      } else {
+         this.message(
+            LoggingTypes.Error,
+            this.#names,
+            [error.message, "\n", error.stack, "\n", ...message],
+            getCallerFromExisting(error)
+         );
+      }
+   }
+
+   time(id?: string) {
+      if (!id) id = Math.floor(Math.random() * 899999 + 100000).toString();
+
+      this.#timerMap.set(id, {
+         name: id,
+         start: LoggingBase.nativeFunctions.startTimer(),
       });
 
       return {
@@ -241,169 +135,278 @@ export class LoggingBase {
    }
 
    timeEnd(id: string) {
-      let timer = this.timerMap.get(id);
+      let timer = this.#timerMap.get(id);
       if (timer) {
-         let diff = this.getTimeDiff(timer.start);
+         let diff = LoggingBase.nativeFunctions.endTimer(timer.start);
-         Logging.message(LoggingTypes.Debug, [
+
-            withColor(Colors.GREEN, `[${timer.name}]`),
+         this.message(LoggingTypes.Debug, this.#names, [
+            Format.green(`[${timer.name}]`),
             `->`,
-            withColor(Colors.BLUE, diff.toFixed(4)),
+            Format.blue(diff.toFixed(4)),
             "ms",
          ]);
+
+         return diff;
+      }
+      return -1;
+   }
+
+   abstract getChild(name: string): ILoggingInterface;
+}
+
+export class LoggingBase extends LoggingInterface {
+   private static [InitialisedAdapters] = new Map<Adapter, number>();
+   public static nativeFunctions: INativeFunctions = DefaultNativeFunctions;
+
+   static DecoupledLogging = class extends LoggingInterface {
+      #lg: LoggingBase;
+      constructor(names: string[], lg: LoggingBase) {
+         super(names);
+         this.#lg = lg;
+      }
+
+      message(...params: [any, any, any, any]) {
+         this.#lg.message(...params);
+      }
+
+      getChild(name: string) {
+         return new LoggingBase.DecoupledLogging(
+            [...this.names, name],
+            this.#lg
+         );
+      }
+   };
+
+   #closed = false;
+   #logLevel = LoggingTypes.Debug;
+   #resolve_filename: boolean;
+   #format_map: FormatConfig = new DefaultFormatConfig();
+   #adapters = new Set<Adapter>();
+
+   set logLevel(level: LoggingTypes) {
+      this.#logLevel = level;
+   }
+
+   get logLevel() {
+      return this.#logLevel;
+   }
+
+   constructor(options?: Partial<ILoggingOptions>) {
+      super(options?.name ? [options.name] : []);
+      options = {
+         console: true,
+         resolve_filename: true,
+         ...options,
+      };
+
+      if (options.console) {
+         this.addAdapter(consoleAdapter);
       }
    }
 
-   private message(
+   async addAdapter(adapter: Adapter) {
+      const init = adapter.init();
+
+      const add = () => {
+         this.#adapters.add(adapter);
+         if (LoggingBase[InitialisedAdapters].has(adapter)) {
+            LoggingBase[InitialisedAdapters].set(
+               adapter,
+               LoggingBase[InitialisedAdapters].get(adapter) + 1
+            );
+         } else {
+            LoggingBase[InitialisedAdapters].set(adapter, 1);
+         }
+      };
+
+      if (!init) {
+         add();
+      } else {
+         await Promise.resolve(init).then(add);
+      }
+   }
+
+   getChild(name: string): ILoggingInterface {
+      return new LoggingBase.DecoupledLogging([...this.names, name], this);
+   }
+
+   protected message(
       type: LoggingTypes,
+      names: string[],
       message: any[],
-      caller?: { file: string; line: number }
+      caller?: { file: string; line: number; column?: number }
    ) {
-      if (this.$closed) return;
+      if (this.#logLevel > type) return;
+      if (this.#closed) {
+         //TODO: Maybe error?
+         return;
+      }
 
-      let date = new Date().toISOString().replace(/T/, " ").replace(/\..+/, "");
+      const date = new Date();
+      const isoStr = date.toISOString();
+      const date_str = isoStr.substring(0, 10) + " " + isoStr.substring(11, 19);
 
-      let file_raw = caller || getCallerFile();
+      let file: string | undefined = undefined;
-      let file = `${file_raw.file}:${String(file_raw.line).padEnd(3, " ")}`;
+      if (this.#resolve_filename) {
+         let file_raw = caller;
+         if (!file_raw) {
+            try {
+               file_raw = getCallerFile();
+            } catch (err) {
+               file_raw = {
+                  file: "<unknown>",
+                  line: 0,
+                  column: 0,
+               };
+            }
+         }
+
+         if (
+            PROJECT_ROOT &&
+            file_raw.file &&
+            file_raw.file.startsWith(PROJECT_ROOT)
+         ) {
+            let newF = file_raw.file.substring(PROJECT_ROOT.length);
+
+            if (newF.startsWith("/") || newF.startsWith("\\"))
+               newF = newF.substring(1);
+
+            file_raw.file = newF;
+         }
+         file = `${file_raw.file || "<unknown>"}:${file_raw.line}:${
+            file_raw.column || 0
+         }`;
+      }
 
       let type_str = LoggingTypes[type].toUpperCase().padEnd(5, " ");
-      let type_format: Format[] = [];
+      let type_format: Formatted;
       switch (type) {
          case LoggingTypes.Log:
-            type_format = this._formatMap.log;
+            type_format = this.#format_map.log;
             break;
          case LoggingTypes.Error:
-            type_format = this._formatMap.error;
+            type_format = this.#format_map.error;
             break;
          case LoggingTypes.Debug:
-            type_format = this._formatMap.debug;
+            type_format = this.#format_map.debug;
             break;
-         case LoggingTypes.Warning:
+         case LoggingTypes.Warn:
-            type_format = this._formatMap.warning;
+            type_format = this.#format_map.warning;
             break;
       }
 
-      const prefix: FormattedText[] = [];
+      const nameFormatted: Formatted<string>[] = [];
-      const a = (text: string, formats: Format[] = []) => {
+      if (names.length > 0) {
-         prefix.push({
+         nameFormatted.push(new Formatted("["));
-            text,
+         for (let i = 0; i < names.length; i++) {
-            formats,
+            nameFormatted.push(new Formatted(names[i], this.#format_map.names));
-         });
+            if (i < names.length - 1) {
-      };
+               nameFormatted.push(this.#format_map.names_delimiter);
-
-      a("[");
-      a(date, this._formatMap.date);
-      a("][");
-      a(type_str, type_format);
-      if (file_raw.file) {
-         a("][");
-         a(file, this._formatMap.file);
-      }
-      a("]: ");
-
-      let raw: string[] = [];
-
-      const formatted: FormattedLine[] = [];
-      let line: FormattedLine;
-      const newLine = () => {
-         if (line && line.length > 0) {
-            formatted.push(line);
-            raw.push(line.map((e) => e.text).join(""));
-         }
-         line = [...prefix];
-      };
-      newLine();
-
-      message.forEach((e, i) => {
-         let formats: Format[] = [];
-         if (typeof e !== "string") {
-            if (e && typeof e === "object") {
-               if (e[colorSymbol]) {
-                  formats.push({
-                     type: FormatTypes.COLOR,
-                     color: e[colorSymbol],
-                  });
-                  e = e.value;
-               }
             }
-            if (typeof e !== "string")
+         }
-               e = inspect(e, {
+         nameFormatted.push(new Formatted("]"));
-                  colors: true,
+      }
-                  showHidden: true,
+
-                  depth: 3,
+      let linePrefix = [
-               }) as string;
+         new Formatted("["),
+         new Formatted(date_str, this.#format_map.date),
+         new Formatted("]["),
+         new Formatted(type_str, type_format),
+         ...(file
+            ? [new Formatted("]["), new Formatted(file, this.#format_map.file)]
+            : []),
+         new Formatted("]"),
+         ...nameFormatted,
+         new Formatted(": "),
+      ];
+
+      let formattedMessage: Formatted<string>[] = [...linePrefix];
+      message.forEach((msg, idx) => {
+         let format: Formatted;
+         if (msg instanceof Formatted) {
+            format = msg;
+            msg = msg.content;
+         } else {
+            format = new Formatted();
          }
 
-         removeColors(e)
+         if (typeof msg !== "string") {
-            .split("\n")
+            msg = inspect(msg, {
-            .map((text, index, { length }) => {
+               colors: false, //TODO: Maybe change when changing the removeColors to return formatted text?
-               line.push({ text, formats });
+               showHidden: true,
-               if (index < length - 1) {
+               depth: 3,
-                  newLine();
+            }) as string;
-               }
-            });
-
-         if (!e.endsWith("\n") && i < message.length - 1) {
-            line.push({ text: " ", formats: [] });
          }
+
+         // removeColors(msg) // Remove colors is uncommented for now, since there are no real benefits of having it and it reduces performance
+         msg.split("\n").forEach((text, index, { length }) => {
+            if (index != length - 1) {
+               formattedMessage.push(
+                  new Formatted(text + "\n", format),
+                  ...linePrefix
+               );
+            } else {
+               formattedMessage.push(new Formatted(text, format));
+            }
+         });
+         formattedMessage.push(new Formatted(" "));
       });
 
-      newLine();
-
       let msg: Message = {
-         date: new Date(),
+         date,
          file,
-         name: this._name,
+         names,
-         text: {
+         text: formattedMessage,
-            raw,
-            formatted,
-         },
          type,
       };
 
-      this.messageObservable.send(msg);
+      this.#adapters.forEach((adapter) => {
+         if (adapter.level <= type) {
+            adapter.onMessage(msg);
+         }
+      });
    }
-}
 
-const colorSymbol = Symbol("color");
+   async close() {
+      if (this.#closed) return;
+      this.#closed = true;
 
-export interface ColorFormat {
+      for (const adapter of this.#adapters) {
-   [colorSymbol]: Colors;
+         const cnt = LoggingBase[InitialisedAdapters].get(adapter);
-   value: any;
+         if (!cnt) {
-}
+            //TODO: should not happen!
-
+         } else {
-export function withColor(color: Colors, value: any): ColorFormat {
+            if (cnt <= 1) {
-   return {
+               if (adapter.close) await adapter.close();
-      [colorSymbol]: color,
+               LoggingBase[InitialisedAdapters].delete(adapter);
-      value,
+            } else {
-   };
+               LoggingBase[InitialisedAdapters].set(adapter, cnt - 1);
+            }
+         }
+      }
+   }
 }
 
 function getStack() {
    // Save original Error.prepareStackTrace
    let origPrepareStackTrace = (<any>Error).prepareStackTrace;
+   try {
+      // Override with function that just returns `stack`
+      (<any>Error).prepareStackTrace = function (_, stack) {
+         return stack;
+      };
+
+      // Create a new `Error`, which automatically gets `stack`
+      let err = new Error();
+
+      // Evaluate `err.stack`, which calls our new `Error.prepareStackTrace`
+      let stack: any[] = <any>err.stack;
 
-   // Override with function that just returns `stack`
-   (<any>Error).prepareStackTrace = function (_, stack) {
       return stack;
-   };
+   } finally {
-
+      // Restore original `Error.prepareStackTrace`
-   // Create a new `Error`, which automatically gets `stack`
+      (<any>Error).prepareStackTrace = origPrepareStackTrace;
-   let err = new Error();
+   }
-
-   // Evaluate `err.stack`, which calls our new `Error.prepareStackTrace`
-   let stack: any[] = <any>err.stack;
-
-   // Restore original `Error.prepareStackTrace`
-   (<any>Error).prepareStackTrace = origPrepareStackTrace;
-
-   // Remove superfluous function call on stack
-   stack.shift(); // getStack --> Error
-
-   return stack;
-}
-
-function baseName(path) {
-   return path.split(/[\\/]/).pop();
 }
 
 function getCallerFile() {
@@ -414,29 +417,57 @@ function getCallerFile() {
 
       while (stack.length) {
          let caller_file = stack.shift();
-         if (current_file !== caller_file.getFileName())
+         if (current_file !== caller_file.getFileName()) {
             return {
-               file: baseName(caller_file.getFileName()),
+               file: caller_file.getFileName(),
                line: caller_file.getLineNumber(),
+               column: caller_file.getColumnNumber(),
             };
+         }
       }
    } catch (err) {}
    return { file: undefined, line: 0 };
 }
 
-function getCallerFromExisting(err: Error): { file: string; line: number } {
+function getCallerFromExisting(err: Error): {
+   file: string;
+   line: number;
+   column?: number;
+} {
    if (!err || !err.stack) return { file: "NOFILE", line: 0 };
    let lines = err.stack.split("\n");
    lines.shift(); // removing first line
    while (lines.length > 0) {
       let line = lines.shift();
-      let matches = line.match(/[a-zA-Z_-]+[.][a-zA-Z_-]+[:][0-9]+/g);
+      let matches = line.match(
+         /[<]?([a-zA-Z]:)?([\/\\]?[a-zA-Z_-])+[.>][a-zA-Z_-]*([:][0-9]+)+/g
+      );
       if (matches && matches.length > 0) {
-         let [f, line] = matches[0].split(":");
+         let match = matches[0].trim();
+         let locationString = match.match(/([:][0-9]+)+$/gm)[0];
+         let line: number;
+         let column: number;
+         if (locationString) {
+            match = match.slice(0, match.length - locationString.length);
+            locationString = locationString.substring(1);
+            [line, column] = locationString.split(":").map(Number);
+         }
+         let file = match;
          return {
-            file: f,
+            file,
-            line: Number(line),
+            line,
+            column,
          };
       }
    }
 }
+
+export function removeColors(text: string) {
+   text = text.replace(
+      // Putting regex here directly instead of externally actually improves performance. The cause of that is not clear for now.
+      /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
+      ""
+   );
+
+   return text;
+}

src/consolewriter.ts

@@ -1,22 +1,30 @@
-import { ObservableInterface } from "@hibas123/utils";
+import { Colors } from "./index.js";
-import { Colors } from "./index";
 import {
    Adapter,
    Message,
-   FormattedLine,
    TerminalFormats,
-   FormatTypes,
+   Formatted,
-} from "./types";
+   IFormatted,
+   LoggingTypes,
+} from "./types.js";
 
-const browser = typeof window !== "undefined";
+declare const Deno: any;
+declare const process: any;
+
+const browser = typeof window !== "undefined" && typeof Deno === "undefined";
+const deno = typeof Deno !== "undefined";
+const NodeJS = typeof process !== undefined;
 
 export class ConsoleAdapter implements Adapter {
-   init(observable: ObservableInterface<Message>) {
+   level: LoggingTypes = LoggingTypes.Debug;
-      observable.subscribe(this.onMessage.bind(this));
+   constructor(private colors: boolean = true) {}
-   }
 
+   init() {}
    flush() {}
 
+   setLevel(level: LoggingTypes) {
+      this.level = level;
+   }
    // TODO: Check if required!
    // private escape(text: string): string {
    //    return text
@@ -24,102 +32,161 @@ export class ConsoleAdapter implements Adapter {
    //       .replace(/%c/g, "%%c")
    // }
 
-   private formatLine(line: FormattedLine): [string, string[] | undefined] {
+   private format(
+      formatted: IFormatted<string>[]
+   ): [string, string[] | undefined] {
       let text = "";
       let style_formats: string[] = [];
 
       if (!browser) {
-         for (let part of line) {
+         // NodeJS or Deno
+         for (const format of formatted) {
             let formats = "";
-            for (let format of part.formats) {
+            if (format.bold) {
-               switch (format.type) {
+               formats += TerminalFormats.Bold;
-                  case FormatTypes.BOLD:
+            }
-                     formats += TerminalFormats.Bold;
+
+            if (format.blink) {
+               formats += TerminalFormats.Blink;
+            }
+
+            if (format.underscore) {
+               formats += TerminalFormats.Underscore;
+            }
+
+            if (format.color) {
+               switch (format.color) {
+                  case Colors.RED:
+                     formats += TerminalFormats.FgRed;
                      break;
-                  case FormatTypes.UNDERSCORE:
+                  case Colors.GREEN:
-                     formats += TerminalFormats.Underscore;
+                     formats += TerminalFormats.FgGreen;
                      break;
-                  case FormatTypes.BLINK:
+                  case Colors.YELLOW:
-                     formats += TerminalFormats.Blink;
+                     formats += TerminalFormats.FgYellow;
                      break;
-                  case FormatTypes.COLOR:
+                  case Colors.BLUE:
-                     switch (format.color) {
+                     formats += TerminalFormats.FgBlue;
-                        case Colors.RED:
+                     break;
-                           formats += TerminalFormats.FgRed;
+                  case Colors.MAGENTA:
-                           break;
+                     formats += TerminalFormats.FgMagenta;
-                        case Colors.GREEN:
+                     break;
-                           formats += TerminalFormats.FgGreen;
+                  case Colors.CYAN:
-                           break;
+                     formats += TerminalFormats.FgCyan;
-                        case Colors.YELLOW:
+                     break;
-                           formats += TerminalFormats.FgYellow;
+                  case Colors.WHITE:
-                           break;
+                     formats += TerminalFormats.FgWhite;
-                        case Colors.BLUE:
-                           formats += TerminalFormats.FgBlue;
-                           break;
-                        case Colors.MAGENTA:
-                           formats += TerminalFormats.FgMagenta;
-                           break;
-                        case Colors.CYAN:
-                           formats += TerminalFormats.FgCyan;
-                           break;
-                        case Colors.WHITE:
-                           formats += TerminalFormats.FgWhite;
-                           break;
-                     }
                      break;
                }
             }
-            text += formats + part.text + TerminalFormats.Reset;
+
+            if (format.bgcolor) {
+               switch (format.bgcolor) {
+                  case Colors.RED:
+                     formats += TerminalFormats.BgRed;
+                     break;
+                  case Colors.GREEN:
+                     formats += TerminalFormats.BgGreen;
+                     break;
+                  case Colors.YELLOW:
+                     formats += TerminalFormats.BgYellow;
+                     break;
+                  case Colors.BLUE:
+                     formats += TerminalFormats.BgBlue;
+                     break;
+                  case Colors.MAGENTA:
+                     formats += TerminalFormats.BgMagenta;
+                     break;
+                  case Colors.CYAN:
+                     formats += TerminalFormats.BgCyan;
+                     break;
+                  case Colors.WHITE:
+                     formats += TerminalFormats.BgWhite;
+                     break;
+               }
+            }
+
+            text += formats + format.content + TerminalFormats.Reset;
+            // (formats.length > 0 ? TerminalFormats.Reset : ""); //TODO: Benchmark if this is better
          }
       } else {
-         for (let part of line) {
+         for (const format of formatted) {
             let styles: string[] = [];
             let resetStyles: string[] = [];
-            for (let format of part.formats) {
+            if (format.bold) {
-               switch (format.type) {
+               styles.push("font-weight: bold;");
-                  case FormatTypes.BOLD:
+               resetStyles.push("font-weight: unset");
-                     styles.push("font-weight: bold;");
+            }
-                     resetStyles.push("font-weight: unset");
+
+            if (format.underscore) {
+               styles.push("text-decoration: underline");
+               resetStyles.push("text-decoration: unset");
+            }
+
+            if (format.blink) {
+               styles.push("text-decoration: blink");
+               resetStyles.push("text-decoration: unset");
+            }
+
+            if (format.color) {
+               let color = "";
+               switch (format.color) {
+                  case Colors.RED:
+                     color = "red";
                      break;
-                  case FormatTypes.UNDERSCORE:
+                  case Colors.GREEN:
-                     styles.push("text-decoration: underline");
+                     color = "green";
-                     resetStyles.push("text-decoration: unset");
                      break;
-                  case FormatTypes.BLINK:
+                  case Colors.YELLOW:
-                     styles.push("text-decoration: blink");
+                     color = "gold";
-                     resetStyles.push("text-decoration: unset");
                      break;
-                  case FormatTypes.COLOR:
+                  case Colors.BLUE:
-                     let color = "";
+                     color = "blue";
-                     switch (format.color) {
+                     break;
-                        case Colors.RED:
+                  case Colors.MAGENTA:
-                           color = "red";
+                     color = "magenta";
-                           break;
+                     break;
-                        case Colors.GREEN:
+                  case Colors.CYAN:
-                           color = "green";
+                     color = "cyan";
-                           break;
+                     break;
-                        case Colors.YELLOW:
+                  case Colors.WHITE:
-                           color = "gold";
+                     color = "white";
-                           break;
-                        case Colors.BLUE:
-                           color = "blue";
-                           break;
-                        case Colors.MAGENTA:
-                           color = "magenta";
-                           break;
-                        case Colors.CYAN:
-                           color = "cyan";
-                           break;
-                        case Colors.WHITE:
-                           color = "white";
-                           break;
-                     }
-                     styles.push("color: " + color);
-                     resetStyles.push("color: unset");
                      break;
                }
+               styles.push("color: " + color);
+               resetStyles.push("color: unset");
             }
-            text += "%c" + part.text.replace(/%c/g, "%%c") + "%c";
+
+            if (format.bgcolor) {
+               let color = "";
+               switch (format.bgcolor) {
+                  case Colors.RED:
+                     color = "red";
+                     break;
+                  case Colors.GREEN:
+                     color = "green";
+                     break;
+                  case Colors.YELLOW:
+                     color = "gold";
+                     break;
+                  case Colors.BLUE:
+                     color = "blue";
+                     break;
+                  case Colors.MAGENTA:
+                     color = "magenta";
+                     break;
+                  case Colors.CYAN:
+                     color = "cyan";
+                     break;
+                  case Colors.WHITE:
+                     color = "white";
+                     break;
+               }
+               styles.push("background-color: " + color);
+               resetStyles.push("background-color: unset");
+            }
+
+            text += "%c" + format.content.replace(/%c/g, "%%c") + "%c";
             style_formats.push(styles.join(";"), resetStyles.join(";"));
          }
       }
@@ -128,27 +195,27 @@ export class ConsoleAdapter implements Adapter {
    }
 
    onMessage(message: Message) {
-      let lines = message.text.formatted;
-
-      let prefix = "";
-      if (message.name) prefix = `[${message.name}]=>`;
-
       if (browser) {
-         let formats: string[] = [];
+         if (this.colors) {
-         let text = lines
+            const [text, formats] = this.format(message.text);
-            .map((line) => {
+            console.log(text, ...formats);
-               let [t, fmts] = this.formatLine(line);
+         } else {
-               formats.push(...fmts);
+            console.log(Formatted.strip(message.text));
-               return prefix + t;
+         }
-            })
-            .join("\n");
-         // console.log(formats);
-         console.log(text, ...formats);
       } else {
-         lines.forEach((line) => {
+         const text = this.colors
-            let [text] = this.formatLine(line);
+            ? this.format(message.text)[0]
-            console.log(prefix + text);
+            : Formatted.strip(message.text);
-         });
+
+         if (deno) {
+            //TODO: Deno specific thing
+            console.log(text);
+         } else if (typeof process !== "undefined") {
+            //NodeJS
+            process.stdout.write(text + "\n");
+         } else {
+            console.log(text);
+         }
       }
    }
 }

src/index.ts

@@ -1,27 +1,23 @@
-import { LoggingBase } from "./base";
+import { LoggingBase } from "./base.js";
-export { ConsoleAdapter } from "./consolewriter";
+export { LoggingBase } from "./base.js";
-export {
+export { ConsoleAdapter } from "./consolewriter.js";
-   LoggingBase,
+export { ILoggingOptions, INativeFunctions } from "./base.js";
-   LoggingBaseOptions,
+
-   removeColors,
-   withColor,
-} from "./base";
 export {
    Adapter,
    LoggingTypes,
    Message,
    FormatConfig,
-   FormattedLine,
    DefaultFormatConfig as DefaultColorMap,
-   FormattedText,
+   IColors as Colors,
-   Colors,
    Format,
-   FormatTypes,
    TerminalFormats,
-} from "./types";
+   Formatted,
+   IFormatted,
+   ILoggingInterface,
+   ILoggingTimer,
+} from "./types.js";
 
-export { ObservableInterface } from "@hibas123/utils";
+const Logging = new LoggingBase();
 
-export let Logging: LoggingBase = undefined;
-Logging = new LoggingBase();
 export default Logging;

src/test.ts

@@ -1,20 +1,19 @@
-import { Logging, LoggingBase, LoggingTypes, Colors, withColor } from ".";
+import Logging from "./index.js";
+
+import { LoggingBase, LoggingTypes, Format } from "./index.js";
 
 Logging.log("test");
 Logging.log("i", "am", { a: "an" }, 1000);
 Logging.error(new Error("fehler 001"));
 Logging.debug("Some Debug infos");
-Logging.errorMessage("i", "am", "an", "error");
+Logging.error("i", "am", "an", "error");
 
 Logging.log(
    "\x1b[31m\x1b[31m\x1b[31m\x1b[31m\x1b[31m\x1b[31m TEST \x1b[31m\x1b[31m\x1b[31m"
 );
 
-Logging.log(
+Logging.log(Format.magenta("This text should be magenta!"), "This not!");
-   withColor(Colors.MAGENTA, "This text should be magenta!"),
+Logging.log(Format.magenta({ somekey: "Some value" }));
-   "This not!"
-);
-Logging.log(withColor(Colors.MAGENTA, { somekey: "Some value" }));
 
 let err = new Error();
 if (typeof err.stack !== "string") console.log("Stacktrace invalid", err.stack);
@@ -23,10 +22,10 @@ let cus = new LoggingBase({ name: "test" });
 cus.log("Hello from custom Logger");
 cus.log("This has some %c symbols inside of it!");
 
-let cus2 = new LoggingBase("test2");
+let cus2 = new LoggingBase({ name: "test2" });
 cus2.log("Hello from custom Logger 2");
 
-let cus22 = new LoggingBase("test2");
+let cus22 = new LoggingBase({ name: "test2" });
 cus22.log("Hello from custom Logger 22");
 cus2.log("Hello from custom Logger 2");
 cus22.log("Hello from custom Logger 22");
@@ -47,7 +46,27 @@ Logging.warn("This should not be there 3");
 Logging.warning("This should not be there 4");
 
 Logging.error("This should be there 1");
-Logging.errorMessage("This should be there 2");
+Logging.error("This should be there 2");
 
-const timer = Logging.time("timer1", "Test Timer");
+Logging.logLevel = LoggingTypes.Debug;
+
+const c1 = Logging.getChild("child-level-1");
+
+c1.log("Hello from Child 1");
+
+const c2 = c1.getChild("child-level-2");
+
+c2.log("Hello from Child 2");
+
+c2.log("MSG from C2");
+c1.log("MSG from C1");
+Logging.log("MSG from root");
+
+const timer = Logging.time("timer1");
 setTimeout(() => timer.end(), 1000);
+
+const withoutFile = new LoggingBase({
+   resolve_filename: false,
+});
+
+withoutFile.log("This should not have a file attached");

src/types.ts

@@ -1,9 +1,7 @@
-import { ObservableInterface } from "@hibas123/utils";
-
 export enum LoggingTypes {
    Debug,
    Log,
-   Warning,
+   Warn,
    Error,
 }
 
@@ -34,14 +32,7 @@ export const TerminalFormats = {
    BgWhite: "\x1b[47m",
 };
 
-export enum FormatTypes {
+export enum IColors {
-   COLOR,
-   BOLD,
-   UNDERSCORE,
-   BLINK,
-}
-
-export enum Colors {
    NONE,
    RED,
    GREEN,
@@ -52,70 +43,194 @@ export enum Colors {
    WHITE,
 }
 
-export interface FormatConfig {
+export interface IFormatted<T = any> {
-   error: Format[];
+   color?: IColors;
-   warning: Format[];
+   bgcolor?: IColors;
-   log: Format[];
+   bold?: boolean;
-   debug: Format[];
+   italic?: boolean;
+   blink?: boolean;
+   underscore?: boolean;
 
-   date: Format[];
+   content: T;
-   file: Format[];
 }
 
-function colorFormat(color: Colors) {
+export class Formatted<T = any> implements IFormatted<T> {
-   return {
+   static strip(formatted: IFormatted<string> | IFormatted<string>[]) {
-      type: FormatTypes.COLOR,
+      if (Array.isArray(formatted)) {
-      color,
+         return formatted.reduce((p, c) => p + c.content, "");
-   };
+      } else {
+         return formatted.content;
+      }
+   }
+
+   constructor(content?: T, apply?: Formatted) {
+      if (content instanceof Formatted) {
+         this.color = content.color;
+         this.bgcolor = content.bgcolor;
+         this.bold = content.bold;
+         this.italic = content.italic;
+         this.blink = content.blink;
+         this.underscore = content.underscore;
+         this.content = content.content;
+      } else {
+         this.content = content;
+      }
+
+      if (apply) {
+         this.color = apply.color;
+         this.bgcolor = apply.bgcolor;
+         this.bold = apply.bold;
+         this.italic = apply.italic;
+         this.blink = apply.blink;
+         this.underscore = apply.underscore;
+      }
+   }
+
+   color?: IColors;
+   bgcolor?: IColors;
+   bold?: boolean;
+   italic?: boolean;
+   blink?: boolean;
+   underscore?: boolean;
+
+   content: T;
+
+   _color(c: IColors) {
+      this.color = c;
+      return this;
+   }
+
+   _bgcolor(c: IColors) {
+      this.bgcolor = c;
+      return this;
+   }
+
+   _bold(active = true) {
+      this.bold = active;
+      return this;
+   }
+
+   _italic(active = true) {
+      this.italic = active;
+      return this;
+   }
+
+   _blink(active = true) {
+      this.blink = active;
+      return this;
+   }
 }
 
-const boldFormat = {
+const AddColorFormat = (color: IColors) => (content: any) => {
-   type: FormatTypes.BOLD,
+   if (content instanceof Formatted) {
+      content.color = color;
+      return content;
+   } else {
+      const d = new Formatted(content);
+      d.color = color;
+      return d;
+   }
 };
 
+const AddBGColorFormat = (color: IColors) => (content: any) => {
+   if (content instanceof Formatted) {
+      content.bgcolor = color;
+      return content;
+   } else {
+      const d = new Formatted(content);
+      d.bgcolor = color;
+      return d;
+   }
+};
+
+export const Format = {
+   none: AddColorFormat(IColors.NONE),
+   red: AddColorFormat(IColors.RED),
+   green: AddColorFormat(IColors.GREEN),
+   yellow: AddColorFormat(IColors.YELLOW),
+   blue: AddColorFormat(IColors.BLUE),
+   magenta: AddColorFormat(IColors.MAGENTA),
+   cyan: AddColorFormat(IColors.CYAN),
+   white: AddColorFormat(IColors.WHITE),
+   bgnone: AddBGColorFormat(IColors.NONE),
+   bgred: AddBGColorFormat(IColors.RED),
+   bggreen: AddBGColorFormat(IColors.GREEN),
+   bgyellow: AddBGColorFormat(IColors.YELLOW),
+   bgblue: AddBGColorFormat(IColors.BLUE),
+   bgmagenta: AddBGColorFormat(IColors.MAGENTA),
+   bgcyan: AddBGColorFormat(IColors.CYAN),
+   bgwhite: AddBGColorFormat(IColors.WHITE),
+   bold: (content: any) => {
+      if (content instanceof Formatted) {
+         content.bold = true;
+         return content;
+      } else {
+         const d = new Formatted(content);
+         d.bold = true;
+         return d;
+      }
+   },
+   italic: (content: any) => {
+      if (content instanceof Formatted) {
+         content.italic = true;
+         return content;
+      } else {
+         const d = new Formatted(content);
+         d.italic = true;
+         return d;
+      }
+   },
+};
+
+export interface FormatConfig {
+   error: Formatted;
+   warning: Formatted;
+   log: Formatted;
+   debug: Formatted;
+
+   date: Formatted;
+   file: Formatted;
+
+   names: Formatted;
+   names_delimiter: Formatted;
+}
+
 export class DefaultFormatConfig implements FormatConfig {
-   error = [colorFormat(Colors.RED), boldFormat];
+   error = new Formatted()._color(IColors.RED)._bold();
-   warning = [colorFormat(Colors.YELLOW), boldFormat];
+   warning = new Formatted()._color(IColors.YELLOW)._bold();
-   log = [colorFormat(Colors.NONE), boldFormat];
+   log = new Formatted()._color(IColors.NONE)._bold();
-   debug = [colorFormat(Colors.CYAN), boldFormat];
+   debug = new Formatted()._color(IColors.CYAN)._bold();
 
-   date = [colorFormat(Colors.NONE)];
+   date = new Formatted()._color(IColors.NONE);
-   file = [colorFormat(Colors.NONE)];
+   file = new Formatted()._color(IColors.NONE);
+   names = new Formatted()._bold()._color(IColors.CYAN);
+   names_delimiter = new Formatted(" -> ")._bold();
 }
 
-export interface Format {
-   type: FormatTypes;
-   color?: Colors;
-}
-
-export interface FormattedText {
-   text: string;
-   formats: Format[];
-}
-
-export type FormattedLine = FormattedText[];
-
 export interface Message {
    type: LoggingTypes;
-   name?: string;
+   names?: string[];
-   text: {
+   text: IFormatted<string>[];
-      raw: string[];
-      formatted: FormattedLine[];
-   };
    date: Date;
    file: string;
 }
 
 export interface Adapter {
+   readonly level: LoggingTypes;
+
    /**
     * This function initialises the Adapter. It might be called multiple times, when added to multiple instances
     * @param observable An observable to subscribe to messages
     */
-   init(observable: ObservableInterface<Message>): void | Promise<void>;
+   init(): void | Promise<void>;
 
    flush(sync: true): void;
    flush(sync: false): void | Promise<void>;
 
+   setLevel(level: LoggingTypes): void;
+
+   onMessage(message: Message): void;
+
    /**
     * When a close function is available, it will be called when no logging instance references it anymore.
     *
@@ -123,3 +238,19 @@ export interface Adapter {
     */
    close?(): void;
 }
+
+export interface ILoggingTimer {
+   end: () => number;
+}
+
+export interface ILoggingInterface {
+   debug(...message: any[]): void;
+   log(...message: any[]): void;
+   warn(...message: any[]): void;
+   error(...message: any[]): void;
+
+   time(name?: string): ILoggingTimer;
+   timeEnd(id: string): number;
+
+   getChild(name: string): ILoggingInterface;
+}

tsconfig.json

@@ -1,19 +1,13 @@
 {
    "compilerOptions": {
-      "module": "commonjs",
+      "module": "ESNext",
-      "target": "es2017",
+      "target": "ESNext",
+      "moduleResolution": "node",
+      "outDir": "esm",
       "noImplicitAny": false,
       "sourceMap": true,
-      "outDir": "out",
+      "declaration": true
-      "declaration": true,
-      "typeRoots": [
-         "node_modules/@types"
-      ]
    },
-   "exclude": [
+   "exclude": ["node_modules"],
-      "node_modules"
+   "include": ["src"]
-   ],
+}
-   "include": [
-      "src"
-   ]
-}