fixes

0.3.2

.github/workflows/kdocs.yml

@@ -17,5 +17,5 @@ jobs:
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./docs/build/dokka/html
+          publish_dir: ./build/dokka/html
           publish_branch: kdocs

CHANGELOG.md

@@ -1,5 +1,52 @@
 # Changelog
 
+## 0.4.0
+
+**THIS UPDATE CONTAINS BREAKING CHANGES**
+
+* **BREAKING CHANGE** Any `KSLog` now accept any object. It was made to allow to work with structured logging
+* New factory for `TagLogger`: fun `taggedLogger`
+* New logger has been added: `TypedLogger`
+* New logger has been added: `FilterLogger`
+* **BREAKING CHANGE** Logger `DefaultKSLog` lost its constructor with `filter`. Currently, it is still available as factory function
+
+## 0.3.2
+
+* Add duplication functions for all extensions which allow to send log without tag but with exception and message builder
+
+## 0.3.1
+
+* Technical fixes for compatibility with Java 8
+
+## 0.3.0
+
+* **BREAKING CHANGE**: Filters will not accept message since this update
+* New `KSLog` realization `DefaultKSLog`
+* Now platforms realize their default loggers callbacks instead of `KSLog` factories
+
+## 0.2.0
+
+* Full rewrite of API
+
+## 0.1.1
+
+* Changes in `JVM` levels
+* Fixes in TagLogger
+
+## 0.1.0
+
+* All the platform specific logged factories has been renamed
+
+## 0.0.3
+
+* Fixes in `JVM` logging
+
+## 0.0.2
+
+* New logger `TagLogger` and now extension `Any#logger` will use it to decrease objects allocations
+* Now it is possible to create `KSLog` using any iterable
+* Now it is possible to create `KSLog` using vararg log levels
+
 ## 0.0.1
 
 * Project has been inited

README.md

@@ -4,6 +4,9 @@
 ![Android](https://img.shields.io/badge/Android-green?style=for-the-badge&logo=android&logoColor=white)
 ![Js](https://img.shields.io/badge/JavaScript-323330?style=for-the-badge&logo=javascript&logoColor=F7DF1E)
 
+[![KDocs](https://img.shields.io/badge/KDocs-323330?style=for-the-badge&logo=Kotlin&logoColor=7F52FF)](https://insanusmokrassar.github.io/KSLog/)
+[![Tutorials](https://img.shields.io/badge/Tutorials-0288D1?style=for-the-badge&logo=bookstack&logoColor=white)](https://bookstack.inmo.dev/books/kslog)
+
 It is simple logging tool which is using built-in tools for logging:
 
 * `java.util.logging.Logger` for `JVM`
@@ -22,18 +25,26 @@ KSLog.i("Some message")
 KSLog.i("Some tag", "Some message")
 // OR
 KSLog.i("Some tag", "Some message", IllegalArgumentException("So, that is exception :)"))
+// OR
+KSLog.i("Some optional tag", Exception("Optional")) { "Lazy inited message" }
+// OR
+KSLog.iS("Some optional tag", Exception("Optional")) { "Lazy inited message for suspendable calculation of text" }
 // OR EVEN
 KSLog.l(LogLevel.INFO, "Some tag", "Some message", IllegalArgumentException("So, that is exception :)"))
+// OR
+KSLog.l(LogLevel.INFO, "Some optional tag", IllegalArgumentException("So, that is exception :)")) { "And lazily inited message" }
 ```
 
 ### A little bit deeper
 
-There are several important things in context of this library:
+There are several important "terms" in context of this library:
 
-* Default logger (available via `KSLog`)
+* Default logger (available via `KSLog.default`)
 * Local logger (can be created via `KSLog` functions and passed anywhere as `KSLog`)
 * Logging shortcuts like `KSLog.i`/`KSLog.info`
 
+Every logging extension (like `KSLog.i`) have its analog with lazy inited message text and the same one with suffix `S` (like `KSLog.iS`) for the suspendable message calculation.
+
 Default logger can be created by passing `defaultTag` and one of variants log level filters: set or minimal loggable level. In `JVM` you also may setup any logger as base logger for default realizations of `KSLog`. Besides, you may use your own callback (on **any target platform**) as output of logging:
 
 ```kotlin

build.gradle

@@ -33,7 +33,13 @@ repositories {
 }
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
     js(IR) {
         browser()
         nodejs()
@@ -52,9 +58,8 @@ kotlin {
 }
 
 java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 apply from: "defaultAndroidSettings.gradle"

gradle.properties

@@ -9,5 +9,5 @@ android.enableJetifier=true
 # Project data
 
 group=dev.inmo
-version=0.0.1
-android_code_version=1
+version=0.4.0
+android_code_version=10

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ android-minSdk = "21"
 android-compileSdk = "32"
 android-buildTools = "32.0.0"
 
-github-release = "2.3.7"
+github-release = "2.4.1"
 
 [libraries]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/commonMain/kotlin/AutoLoggers.kt

@@ -2,7 +2,7 @@ package dev.inmo.kslog.common
 
 val Any.logTag
     get() = this::class.simpleName ?: error("Unable to retrieve log tag")
-val Any.logger
-    get() = CallbackKSLog { l, t, m, e ->
-        KSLog.default.performLog(l, t ?: logTag, m, e)
-    }
+val Any.logger: KSLog
+    get() = TagLogger(logTag)
+
+fun taggedLogger(tagBase: Any): KSLog = tagBase.logger

src/commonMain/kotlin/CallbackKSLog.kt

@@ -0,0 +1,9 @@
+package dev.inmo.kslog.common
+
+typealias SimpleKSLogCallback = (level: LogLevel, tag: String?, message: Any, throwable: Throwable?) -> Unit
+
+class CallbackKSLog(
+    private val performLogCallback: SimpleKSLogCallback
+) : KSLog {
+    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) = performLogCallback(level, tag, message, throwable)
+}

src/commonMain/kotlin/DefaultKSLog.kt

@@ -0,0 +1,45 @@
+package dev.inmo.kslog.common
+
+import dev.inmo.kslog.common.filter.filtered
+
+class DefaultKSLog(
+    private val defaultTag: String,
+    private val messageFormatter: MessageFormatter = defaultMessageFormatter,
+    private val logging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = defaultLogging
+) : KSLog {
+    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) {
+        val tag = tag ?: defaultTag
+
+        val text = messageFormatter(level, tag, message, throwable)
+        logging(level, tag, text, throwable)
+    }
+
+    override fun performLog(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: () -> Any) {
+        val tag = tag ?: defaultTag
+
+        val text = messageFormatter(level, tag, messageBuilder(), throwable)
+        logging(level, tag, text, throwable)
+    }
+
+    override suspend fun performLogS(
+        level: LogLevel,
+        tag: String?,
+        throwable: Throwable?,
+        messageBuilder: suspend () -> Any
+    ) {
+        val tag = tag ?: defaultTag
+
+        val text = messageFormatter(level, tag, messageBuilder(), throwable)
+        logging(level, tag, text, throwable)
+    }
+}
+
+@Deprecated("Filtering should be replaced with FilterKSLog")
+fun DefaultKSLog(
+    defaultTag: String,
+    filter: MessageFilter = { _, _, _ -> true },
+    messageFormatter: MessageFormatter = defaultMessageFormatter,
+    logging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = defaultLogging
+) = DefaultKSLog(
+    defaultTag, messageFormatter, logging
+).filtered(filter)

src/commonMain/kotlin/Extensions.kt

@@ -2,72 +2,114 @@
 
 package dev.inmo.kslog.common
 
-inline fun KSLog.log(level: LogLevel, tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = performLog(level, tag, messageBuilder(), e)
-inline fun KSLog.log(level: LogLevel, message: String, e: Throwable? = null) = log(level, null, e) { message }
-inline fun KSLog.log(level: LogLevel, tag: String, message: String, e: Throwable? = null) = log(level, tag, e) { message }
+inline fun KSLog.log(level: LogLevel, tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = performLog(level, tag, e, messageBuilder)
+suspend inline fun KSLog.logS(level: LogLevel, tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = performLogS(level, tag, e, messageBuilder)
+inline fun KSLog.log(level: LogLevel, e: Throwable? = null, noinline messageBuilder: () -> Any) = performLog(level, null, e, messageBuilder)
+suspend inline fun KSLog.logS(level: LogLevel, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = performLogS(level, null, e, messageBuilder)
+inline fun KSLog.log(level: LogLevel, message: Any, e: Throwable? = null) = performLog(level, message, e)
+inline fun KSLog.log(level: LogLevel, tag: String, message: Any, e: Throwable? = null) = performLog(level, tag, message, e)
 
 
-inline fun KSLog.verbose(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.VERBOSE, tag, e, messageBuilder)
-inline fun KSLog.verbose(message: String, e: Throwable? = null) = log(LogLevel.VERBOSE, message, e)
-inline fun KSLog.verbose(tag: String, message: String, e: Throwable? = null) = log(LogLevel.VERBOSE, tag, message, e)
+inline fun KSLog.debug(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.DEBUG, null, e, messageBuilder)
+inline fun KSLog.debug(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.DEBUG, tag, e, messageBuilder)
+suspend inline fun KSLog.debugS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.DEBUG, null, e, messageBuilder)
+suspend inline fun KSLog.debugS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.DEBUG, tag, e, messageBuilder)
+inline fun KSLog.debug(message: Any, e: Throwable? = null) = log(LogLevel.DEBUG, message, e)
+inline fun KSLog.debug(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.DEBUG, tag, message, e)
 
 
-inline fun KSLog.info(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.INFO, tag, e, messageBuilder)
-inline fun KSLog.info(message: String, e: Throwable? = null) = log(LogLevel.INFO, message, e)
-inline fun KSLog.info(tag: String, message: String, e: Throwable? = null) = log(LogLevel.INFO, tag, message, e)
+inline fun KSLog.verbose(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.VERBOSE, null, e, messageBuilder)
+inline fun KSLog.verbose(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.VERBOSE, tag, e, messageBuilder)
+suspend inline fun KSLog.verboseS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.VERBOSE, null, e, messageBuilder)
+suspend inline fun KSLog.verboseS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.VERBOSE, tag, e, messageBuilder)
+inline fun KSLog.verbose(message: Any, e: Throwable? = null) = log(LogLevel.VERBOSE, message, e)
+inline fun KSLog.verbose(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.VERBOSE, tag, message, e)
 
 
-inline fun KSLog.warning(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.WARNING, tag, e, messageBuilder)
-inline fun KSLog.warning(message: String, e: Throwable? = null) = log(LogLevel.WARNING, message, e)
-inline fun KSLog.warning(tag: String, message: String, e: Throwable? = null) = log(LogLevel.WARNING, tag, message, e)
+inline fun KSLog.info(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.INFO, null, e, messageBuilder)
+inline fun KSLog.info(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.INFO, tag, e, messageBuilder)
+suspend inline fun KSLog.infoS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.INFO, null, e, messageBuilder)
+suspend inline fun KSLog.infoS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.INFO, tag, e, messageBuilder)
+inline fun KSLog.info(message: Any, e: Throwable? = null) = log(LogLevel.INFO, message, e)
+inline fun KSLog.info(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.INFO, tag, message, e)
 
 
-inline fun KSLog.error(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.ERROR, tag, e, messageBuilder)
-inline fun KSLog.error(message: String, e: Throwable? = null) = log(LogLevel.ERROR, message, e)
-inline fun KSLog.error(tag: String, message: String, e: Throwable? = null) = log(LogLevel.ERROR, tag, message, e)
+inline fun KSLog.warning(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.WARNING, null, e, messageBuilder)
+inline fun KSLog.warning(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.WARNING, tag, e, messageBuilder)
+suspend inline fun KSLog.warningS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.WARNING, null, e, messageBuilder)
+suspend inline fun KSLog.warningS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.WARNING, tag, e, messageBuilder)
+inline fun KSLog.warning(message: Any, e: Throwable? = null) = log(LogLevel.WARNING, message, e)
+inline fun KSLog.warning(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.WARNING, tag, message, e)
 
 
-inline fun KSLog.assert(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.ASSERT, tag, e, messageBuilder)
-inline fun KSLog.assert(message: String, e: Throwable? = null) = log(LogLevel.ASSERT, message, e)
-inline fun KSLog.assert(tag: String, message: String, e: Throwable? = null) = log(LogLevel.ASSERT, tag, message, e)
+inline fun KSLog.error(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.ERROR, null, e, messageBuilder)
+inline fun KSLog.error(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.ERROR, tag, e, messageBuilder)
+suspend inline fun KSLog.errorS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.ERROR, null, e, messageBuilder)
+suspend inline fun KSLog.errorS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.ERROR, tag, e, messageBuilder)
+inline fun KSLog.error(message: Any, e: Throwable? = null) = log(LogLevel.ERROR, message, e)
+inline fun KSLog.error(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.ERROR, tag, message, e)
 
 
-inline fun KSLog.debug(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(LogLevel.DEBUG, tag, e, messageBuilder)
-inline fun KSLog.debug(message: String, e: Throwable? = null) = log(LogLevel.DEBUG, message, e)
-inline fun KSLog.debug(tag: String, message: String, e: Throwable? = null) = log(LogLevel.DEBUG, tag, message, e)
+inline fun KSLog.assert(e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.ASSERT, null, e, messageBuilder)
+inline fun KSLog.assert(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(LogLevel.ASSERT, tag, e, messageBuilder)
+suspend inline fun KSLog.assertS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.ASSERT, null, e, messageBuilder)
+suspend inline fun KSLog.assertS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(LogLevel.ASSERT, tag, e, messageBuilder)
+inline fun KSLog.assert(message: Any, e: Throwable? = null) = log(LogLevel.ASSERT, message, e)
+inline fun KSLog.assert(tag: String, message: Any, e: Throwable? = null) = log(LogLevel.ASSERT, tag, message, e)
 
 // ----- Short names
 
 
-inline fun KSLog.l(level: LogLevel, tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = log(level, tag, e, messageBuilder)
-inline fun KSLog.l(level: LogLevel, message: String, e: Throwable? = null) = log(level, message, e)
-inline fun KSLog.l(level: LogLevel, tag: String, message: String, e: Throwable? = null) = log(level, tag, message, e)
-
-inline fun KSLog.v(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = verbose(tag, e, messageBuilder)
-inline fun KSLog.v(message: String, e: Throwable? = null) = verbose(message, e)
-inline fun KSLog.v(tag: String, message: String, e: Throwable? = null) = verbose(tag, message, e)
+inline fun KSLog.l(level: LogLevel, tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(level, tag, e, messageBuilder)
+inline fun KSLog.l(level: LogLevel, e: Throwable? = null, noinline messageBuilder: () -> Any) = log(level, e, messageBuilder)
+suspend inline fun KSLog.lS(level: LogLevel, tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(level, tag, e, messageBuilder)
+suspend inline fun KSLog.lS(level: LogLevel, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = logS(level, e, messageBuilder)
+inline fun KSLog.l(level: LogLevel, message: Any, e: Throwable? = null) = log(level, message, e)
+inline fun KSLog.l(level: LogLevel, tag: String, message: Any, e: Throwable? = null) = log(level, tag, message, e)
 
 
-inline fun KSLog.i(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = info(tag, e, messageBuilder)
-inline fun KSLog.i(message: String, e: Throwable? = null) = info(message, e)
-inline fun KSLog.i(tag: String, message: String, e: Throwable? = null) = info(tag, message, e)
+inline fun KSLog.d(e: Throwable? = null, noinline messageBuilder: () -> Any) = debug(e, messageBuilder)
+inline fun KSLog.d(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = debug(tag, e, messageBuilder)
+suspend inline fun KSLog.dS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = debugS(e, messageBuilder)
+suspend inline fun KSLog.dS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = debugS(tag, e, messageBuilder)
+inline fun KSLog.d(message: Any, e: Throwable? = null) = debug(message, e)
+inline fun KSLog.d(tag: String, message: Any, e: Throwable? = null) = debug(tag, message, e)
+
+inline fun KSLog.v(e: Throwable? = null, noinline messageBuilder: () -> Any) = verbose(e, messageBuilder)
+inline fun KSLog.v(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = verbose(tag, e, messageBuilder)
+suspend inline fun KSLog.vS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = verboseS(e, messageBuilder)
+suspend inline fun KSLog.vS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = verboseS(tag, e, messageBuilder)
+inline fun KSLog.v(message: Any, e: Throwable? = null) = verbose(message, e)
+inline fun KSLog.v(tag: String, message: Any, e: Throwable? = null) = verbose(tag, message, e)
 
 
-inline fun KSLog.w(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = warning(tag, e, messageBuilder)
-inline fun KSLog.w(message: String, e: Throwable? = null) = warning(message, e)
-inline fun KSLog.w(tag: String, message: String, e: Throwable? = null) = warning(tag, message, e)
+inline fun KSLog.i(e: Throwable? = null, noinline messageBuilder: () -> Any) = info(e, messageBuilder)
+inline fun KSLog.i(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = info(tag, e, messageBuilder)
+suspend inline fun KSLog.iS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = infoS(e, messageBuilder)
+suspend inline fun KSLog.iS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = infoS(tag, e, messageBuilder)
+inline fun KSLog.i(message: Any, e: Throwable? = null) = info(message, e)
+inline fun KSLog.i(tag: String, message: Any, e: Throwable? = null) = info(tag, message, e)
 
 
-inline fun KSLog.e(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = error(tag, e, messageBuilder)
-inline fun KSLog.e(message: String, e: Throwable? = null) = error(message, e)
-inline fun KSLog.e(tag: String, message: String, e: Throwable? = null) = error(tag, message, e)
+inline fun KSLog.w(e: Throwable? = null, noinline messageBuilder: () -> Any) = warning(e, messageBuilder)
+inline fun KSLog.w(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = warning(tag, e, messageBuilder)
+suspend inline fun KSLog.wS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = warningS(e, messageBuilder)
+suspend inline fun KSLog.wS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = warningS(tag, e, messageBuilder)
+inline fun KSLog.w(message: Any, e: Throwable? = null) = warning(message, e)
+inline fun KSLog.w(tag: String, message: Any, e: Throwable? = null) = warning(tag, message, e)
 
 
-inline fun KSLog.wtf(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = assert(tag, e, messageBuilder)
-inline fun KSLog.wtf(message: String, e: Throwable? = null) = assert(message, e)
-inline fun KSLog.wtf(tag: String, message: String, e: Throwable? = null) = assert(tag, message, e)
+inline fun KSLog.e(e: Throwable? = null, noinline messageBuilder: () -> Any) = error(e, messageBuilder)
+inline fun KSLog.e(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = error(tag, e, messageBuilder)
+suspend inline fun KSLog.eS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = errorS(e, messageBuilder)
+suspend inline fun KSLog.eS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = errorS(tag, e, messageBuilder)
+inline fun KSLog.e(message: Any, e: Throwable? = null) = error(message, e)
+inline fun KSLog.e(tag: String, message: Any, e: Throwable? = null) = error(tag, message, e)
 
 
-inline fun KSLog.d(tag: String? = null, e: Throwable? = null, messageBuilder: () -> String) = debug(tag, e, messageBuilder)
-inline fun KSLog.d(message: String, e: Throwable? = null) = debug(message, e)
-inline fun KSLog.d(tag: String, message: String, e: Throwable? = null) = debug(tag, message, e)
+inline fun KSLog.wtf(e: Throwable? = null, noinline messageBuilder: () -> Any) = assert(e, messageBuilder)
+inline fun KSLog.wtf(tag: String?, e: Throwable? = null, noinline messageBuilder: () -> Any) = assert(tag, e, messageBuilder)
+suspend inline fun KSLog.wtfS(e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = assertS(e, messageBuilder)
+suspend inline fun KSLog.wtfS(tag: String?, e: Throwable? = null, noinline messageBuilder: suspend () -> Any) = assertS(tag, e, messageBuilder)
+inline fun KSLog.wtf(message: Any, e: Throwable? = null) = assert(message, e)
+inline fun KSLog.wtf(tag: String, message: Any, e: Throwable? = null) = assert(tag, message, e)

src/commonMain/kotlin/KSLog.kt

@@ -1,17 +1,34 @@
 package dev.inmo.kslog.common
 
+import dev.inmo.kslog.common.filter.filtered
+
 
 enum class LogLevel {
+    DEBUG,
     VERBOSE,
     INFO,
     WARNING,
     ERROR,
     ASSERT,
-    DEBUG
 }
 
 interface KSLog {
-    fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?)
+    fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?)
+    fun performLog(level: LogLevel, message: Any, throwable: Throwable?) = performLog(level, null, message, throwable)
+    fun performLog(
+        level: LogLevel,
+        tag: String?,
+        throwable: Throwable?,
+        messageBuilder: () -> Any
+    ) = performLog(level, tag, messageBuilder(), throwable)
+    suspend fun performLogS(
+        level: LogLevel,
+        tag: String?,
+        throwable: Throwable?,
+        messageBuilder: suspend () -> Any
+    ) = performLog(level, tag, messageBuilder(), throwable)
+
+
     companion object : KSLog {
         private var defaultLogger: KSLog? = null
         var default: KSLog
@@ -23,35 +40,73 @@ interface KSLog {
             set(value) {
                 defaultLogger = value
             }
-        override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) = default.performLog(level, tag, message, throwable)
+        override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) = default.performLog(level, tag, message, throwable)
+        override fun performLog(level: LogLevel, message: Any, throwable: Throwable?) = default.performLog(level, message, throwable)
+        override fun performLog(
+            level: LogLevel,
+            tag: String?,
+            throwable: Throwable?,
+            messageBuilder: () -> Any
+        ) = default.performLog(level, tag, throwable, messageBuilder)
+        override suspend fun performLogS(
+            level: LogLevel,
+            tag: String?,
+            throwable: Throwable?,
+            messageBuilder: suspend () -> Any
+        ) = default.performLogS(level, tag, throwable, messageBuilder)
     }
 }
 
 
-operator fun KSLog.invoke(performLogCallback: (level: LogLevel, tag: String?, message: String, throwable: Throwable?) -> Unit) = CallbackKSLog(performLogCallback)
+operator fun KSLog.invoke(performLogCallback: (level: LogLevel, tag: String?, message: Any, throwable: Throwable?) -> Unit) = CallbackKSLog(performLogCallback)
 
-class CallbackKSLog(
-    private val performLogCallback: (level: LogLevel, tag: String?, message: String, throwable: Throwable?) -> Unit
-) : KSLog {
-    override fun performLog(level: LogLevel, tag: String?, message: String, throwable: Throwable?) = performLogCallback(level, tag, message, throwable)
-}
-
-
-expect fun KSLog(
-    defaultTag: String,
-    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean
-) : KSLog
+internal expect val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
 
 fun KSLog(
     defaultTag: String,
-    levels: Set<LogLevel>
-): KSLog = KSLog (defaultTag) { l, _, _, _ ->
-    l in levels
+    messageFormatter: MessageFormatter = defaultMessageFormatter
+): KSLog = DefaultKSLog(
+    defaultTag,
+    messageFormatter
+)
+
+@Deprecated("Filtering should be replaced with FilterKSLog")
+fun KSLog(
+    defaultTag: String,
+    filter: MessageFilter,
+    messageFormatter: MessageFormatter = defaultMessageFormatter
+): KSLog = DefaultKSLog(
+    defaultTag,
+    filter,
+    messageFormatter
+)
+
+fun KSLog(
+    defaultTag: String,
+    levels: Iterable<LogLevel>,
+    messageFormatter: MessageFormatter = defaultMessageFormatter
+): KSLog {
+    val levels = levels.toSet()
+    return KSLog (defaultTag, messageFormatter).filtered { l, _, _ ->
+        l in levels
+    }
 }
 
 fun KSLog(
     defaultTag: String,
-    minLoggingLevel: LogLevel = LogLevel.VERBOSE
-): KSLog = KSLog (defaultTag) { l, _, _, _ ->
+    firstLevel: LogLevel,
+    secondLevel: LogLevel,
+    vararg otherLevels: LogLevel,
+    messageFormatter: MessageFormatter = defaultMessageFormatter,
+): KSLog = KSLog(defaultTag, setOf(firstLevel, secondLevel, *otherLevels), messageFormatter)
+
+fun KSLog(
+    defaultTag: String,
+    minLoggingLevel: LogLevel,
+    messageFormatter: MessageFormatter = defaultMessageFormatter,
+): KSLog = KSLog (
+    defaultTag,
+    messageFormatter
+).filtered { l, _, _ ->
     minLoggingLevel.ordinal <= l.ordinal
 }

src/commonMain/kotlin/KSLogTypealiases.kt

@@ -0,0 +1,6 @@
+package dev.inmo.kslog.common
+
+typealias MessageFormatter = (l: LogLevel, t: String, m: Any, Throwable?) -> String
+typealias MessageFilter = (l: LogLevel, t: String?, Throwable?) -> Boolean
+val defaultMessageFormatter: MessageFormatter = { l, t, m, _ -> "[$l] $t - $m" }
+

src/commonMain/kotlin/TagLogger.kt

@@ -0,0 +1,10 @@
+package dev.inmo.kslog.common
+
+import kotlin.jvm.JvmInline
+
+@JvmInline
+value class TagLogger(val tag: String) : KSLog {
+    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) {
+        KSLog.performLog(level, tag ?: this.tag, message, throwable)
+    }
+}

src/commonMain/kotlin/filter/FilterKSLog.kt

@@ -0,0 +1,32 @@
+package dev.inmo.kslog.common.filter
+
+import dev.inmo.kslog.common.*
+
+class FilterKSLog(
+    private val fallbackLogger: KSLog,
+    private val messageFilter: MessageFilter
+) : KSLog {
+    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) {
+        if (messageFilter(level, tag, throwable)) {
+            fallbackLogger.performLog(level, tag, message, throwable)
+        }
+    }
+
+    override fun performLog(level: LogLevel, message: Any, throwable: Throwable?) {
+        if (messageFilter(level, null, throwable)) {
+            fallbackLogger.performLog(level, message, throwable)
+        }
+    }
+
+    override fun performLog(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: () -> Any) {
+        if (messageFilter(level, tag, throwable)) {
+            fallbackLogger.performLog(level, tag, throwable, messageBuilder)
+        }
+    }
+
+    override suspend fun performLogS(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: suspend () -> Any) {
+        if (messageFilter(level, tag, throwable)) {
+            fallbackLogger.performLogS(level, tag, throwable, messageBuilder)
+        }
+    }
+}

src/commonMain/kotlin/filter/FilteredExtension.kt

@@ -0,0 +1,8 @@
+package dev.inmo.kslog.common.filter
+
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.kslog.common.MessageFilter
+
+fun KSLog.filtered(
+    filter: MessageFilter
+) = FilterKSLog(this, filter)

src/commonMain/kotlin/typed/TypedKSLog.kt

@@ -0,0 +1,23 @@
+package dev.inmo.kslog.common.typed
+
+import dev.inmo.kslog.common.*
+import kotlin.reflect.KClass
+
+class TypedKSLog(
+    private val typedLoggers: Map<KClass<*>?, KSLog>
+) : KSLog {
+    override fun performLog(level: LogLevel, tag: String?, message: Any, throwable: Throwable?) {
+        (typedLoggers[message::class] ?: typedLoggers[null]) ?.performLog(level, tag, message, throwable)
+    }
+    override fun performLog(level: LogLevel, message: Any, throwable: Throwable?) {
+        (typedLoggers[message::class] ?: typedLoggers[null]) ?.performLog(level, message, throwable)
+    }
+    override fun performLog(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: () -> Any) {
+        val message = messageBuilder()
+        (typedLoggers[message::class] ?: typedLoggers[null]) ?.performLog(level, tag, message, throwable)
+    }
+    override suspend fun performLogS(level: LogLevel, tag: String?, throwable: Throwable?, messageBuilder: suspend () -> Any) {
+        val message = messageBuilder()
+        (typedLoggers[message::class] ?: typedLoggers[null]) ?.performLog(level, tag, message, throwable)
+    }
+}

src/commonMain/kotlin/typed/TypedKSLogBuilder.kt

@@ -0,0 +1,28 @@
+package dev.inmo.kslog.common.typed
+
+import dev.inmo.kslog.common.*
+import kotlin.reflect.KClass
+
+class TypedKSLogBuilder(
+    private val preset: Map<KClass<*>?, KSLog> = emptyMap()
+) {
+    private val loggers = mutableMapOf<KClass<*>?, KSLog>().apply {
+        putAll(preset)
+    }
+
+    fun on(kClass: KClass<*>?, with: KSLog) = loggers.put(kClass, with)
+    fun on(kClass: KClass<*>?, with: SimpleKSLogCallback) = loggers.put(kClass, CallbackKSLog(with))
+
+    fun default(with: KSLog) = on(null, with)
+    fun default(with: SimpleKSLogCallback) = on(null, with)
+
+    inline fun <reified T: Any> on(with: KSLog) = on(T::class, with)
+    inline fun <reified T: Any> on(noinline with: SimpleKSLogCallback) = on(T::class, with)
+
+    fun build() = TypedKSLog(loggers.toMap())
+}
+
+inline fun buildTypedLogger(
+    preset: Map<KClass<*>?, KSLog> = emptyMap(),
+    block: TypedKSLogBuilder.() -> Unit
+) = TypedKSLogBuilder(preset).apply(block).build()

src/jsMain/kotlin/ActualLogger.kt

@@ -1,30 +1,15 @@
 package dev.inmo.kslog.common
 
-fun KSLog(
-    messageFormatter: (l: LogLevel, t: String?, m: String, Throwable?) -> String,
-    filter: (l: LogLevel, t: String?, m: String, Throwable?) -> Boolean
-) = KSLog { l, t, m, e ->
-    if (!filter(l, t, m, e)) return@KSLog
-    val text = messageFormatter(l,t,m,e)
+internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = { l, t, m, e ->
     val args = e ?.let {
-        arrayOf(text, e)
-    } ?: arrayOf(text)
+        arrayOf(m, e)
+    } ?: arrayOf(m)
     when (l) {
+        LogLevel.DEBUG -> console.log(*args)
         LogLevel.VERBOSE,
         LogLevel.INFO -> console.info(*args)
         LogLevel.WARNING -> console.warn(*args)
         LogLevel.ERROR,
         LogLevel.ASSERT -> console.error(*args)
-        LogLevel.DEBUG -> console.log(*args)
     }
 }
-
-actual fun KSLog(
-    defaultTag: String,
-    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean
-): KSLog {
-    return KSLog(
-        { l, t, m, _ -> "[$l] ${t ?: defaultTag} - $m" },
-        { l, t, m, e -> filter(l, t ?: defaultTag, m, e) }
-    )
-}

src/jvmMain/kotlin/ActualLogger.kt

@@ -1,46 +1,73 @@
 package dev.inmo.kslog.common
 
+import dev.inmo.kslog.common.filter.filtered
 import java.util.logging.Level
+import java.util.logging.Logger
 
+private val defaultKSLogLogger by lazy {
+    Logger.getLogger("KSLog")
+}
+private fun Logger.doLog(
+    l: LogLevel, t: String, m: String, e: Throwable?
+) = log(
+    when(l) {
+        LogLevel.DEBUG -> Level.FINEST
+        LogLevel.VERBOSE -> Level.FINE
+        LogLevel.INFO -> Level.INFO
+        LogLevel.WARNING -> Level.WARNING
+        LogLevel.ERROR -> Level.SEVERE
+        LogLevel.ASSERT -> Level.SEVERE
+    },
+    m,
+    e
+)
+internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = { l, t, m, e ->
+    defaultKSLogLogger.doLog(l, t, m.toString(), e)
+}
+
+@Deprecated("Filtering should be replaced with FilterKSLog")
 fun KSLog(
-    logger: java.util.logging.Logger,
-    filter: (l: LogLevel, t: String?, m: String, Throwable?) -> Boolean,
-    messageFormatter: (l: LogLevel, t: String?, m: String, Throwable?) -> String
+    defaultTag: String,
+    logger: Logger,
+    filter: MessageFilter,
+    messageFormatter: MessageFormatter = defaultMessageFormatter
 ) = KSLog { l, t, m, e ->
-    if (!filter(l, t, m, e)) return@KSLog
-    val text = messageFormatter(l,t,m,e)
-    logger.log(
-        when(l) {
-            LogLevel.VERBOSE -> Level.FINEST
-            LogLevel.INFO -> Level.INFO
-            LogLevel.WARNING -> Level.WARNING
-            LogLevel.ERROR -> Level.SEVERE
-            LogLevel.ASSERT -> Level.OFF
-            LogLevel.DEBUG -> Level.ALL
-        },
-        text,
-        e
-    )
+    if (!filter(l, t, e)) return@KSLog
+    val text = messageFormatter(l,t ?: defaultTag,m.toString(),e)
+    logger.doLog(l, t ?: defaultTag, text, e)
 }
 
 fun KSLog(
     defaultTag: String,
-    logger: java.util.logging.Logger,
-    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean = { _, _, _, _ -> true }
-): KSLog {
-    return KSLog(
-        logger,
-        { l, t, m, e -> filter(l, t ?: defaultTag, m, e) }
-    ) { _, t, m, _ -> "${t ?: defaultTag} - $m" }
+    logger: Logger,
+    messageFormatter: MessageFormatter = defaultMessageFormatter
+) = KSLog { l, t, m, e ->
+    val text = messageFormatter(l,t ?: defaultTag,m.toString(),e)
+    logger.doLog(l, t ?: defaultTag, text, e)
 }
 
-actual fun KSLog(
+fun KSLog(
     defaultTag: String,
-    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean
+    logger: Logger,
+    levels: Iterable<LogLevel>,
+    messageFormatter: MessageFormatter = defaultMessageFormatter
 ): KSLog {
-    return KSLog(
-        defaultTag,
-        logger = java.util.logging.Logger.getAnonymousLogger(),
-        filter = { l, t, m, e -> filter(l, t, m, e) }
-    )
+    val levels = levels.toSet()
+    return KSLog (defaultTag, logger, messageFormatter).filtered { l, _, _ -> l in levels }
 }
+
+fun KSLog(
+    defaultTag: String,
+    logger: Logger,
+    firstLevel: LogLevel,
+    secondLevel: LogLevel,
+    vararg otherLevels: LogLevel,
+    messageFormatter: MessageFormatter = defaultMessageFormatter,
+): KSLog = KSLog (defaultTag, logger, setOf(firstLevel, secondLevel, *otherLevels), messageFormatter)
+
+fun KSLog(
+    defaultTag: String,
+    logger: Logger,
+    minLoggingLevel: LogLevel = LogLevel.values().first(),
+    messageFormatter: MessageFormatter = defaultMessageFormatter
+): KSLog = KSLog (defaultTag, logger, messageFormatter).filtered { l, _, _ -> minLoggingLevel.ordinal <= l.ordinal }

src/main/kotlin/ActualLogger.kt

@@ -2,20 +2,15 @@ package dev.inmo.kslog.common
 
 import android.util.Log
 
-actual fun KSLog(
-    defaultTag: String,
-    filter: (l: LogLevel, t: String, m: String, Throwable?) -> Boolean
-): KSLog {
-    return KSLog { l, t, m, e ->
-        val tag = t ?: defaultTag
-        if (!filter(l, t ?: defaultTag, m, e)) return@KSLog
-        when(l) {
-            LogLevel.VERBOSE -> Log.v(tag, m, e)
-            LogLevel.INFO -> Log.i(tag, m, e)
-            LogLevel.WARNING -> Log.w(tag, m, e)
-            LogLevel.ERROR -> Log.e(tag, m, e)
-            LogLevel.ASSERT -> Log.wtf(tag, m, e)
-            LogLevel.DEBUG -> Log.d(tag, m, e)
-        }
+
+internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit = { l, t, m, e ->
+    val messageString = m.toString()
+    when(l) {
+        LogLevel.DEBUG -> Log.d(t, messageString, e)
+        LogLevel.VERBOSE -> Log.v(t, messageString, e)
+        LogLevel.INFO -> Log.i(t, messageString, e)
+        LogLevel.WARNING -> Log.w(t, messageString, e)
+        LogLevel.ERROR -> Log.e(t, messageString, e)
+        LogLevel.ASSERT -> Log.wtf(t, messageString, e)
     }
 }