fix: Add verbose flag in js interface[DHIS2-18247]

dhis2 · Oct 22, 2024 · 326c489 · 326c489
1 parent 5fa1af7
commit 326c489
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
     maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
 }
 
-version = "3.1.0-SNAPSHOT"
+version = "3.2.0-SNAPSHOT"
 group = "org.hisp.dhis.rules"
 
 if (project.hasProperty("removeSnapshotSuffix")) {

diff --git a/src/jsMain/kotlin/org/hisp/dhis/rules/Logger.kt b/src/jsMain/kotlin/org/hisp/dhis/rules/Logger.kt
@@ -1,5 +1,9 @@
 package org.hisp.dhis.rules
 
-actual fun createLogger(className: String): Logger {
-    return Logger({message -> println(message)}, {message: String -> println(message)})
-}
+actual fun createLogger(className: String): Logger =
+    Logger(
+        severe = { message -> console.error(message) },
+        fine = { message ->
+            if (RuleEngineJs.verbose) console.info(message)
+        },
+    )
diff --git a/src/jsMain/kotlin/org/hisp/dhis/rules/RuleDataValueJs.kt b/src/jsMain/kotlin/org/hisp/dhis/rules/RuleDataValueJs.kt
diff --git a/src/jsMain/kotlin/org/hisp/dhis/rules/RuleEngineJs.kt b/src/jsMain/kotlin/org/hisp/dhis/rules/RuleEngineJs.kt
@@ -10,7 +10,11 @@ import org.hisp.dhis.rules.api.RuleEngineContext
 import org.hisp.dhis.rules.models.*
 
 @JsExport
-class RuleEngineJs {
+class RuleEngineJs(verbose: Boolean = false) {
+    init {
+        RuleEngineJs.verbose = verbose
+    }
+
     fun validate(expression: String, dataItemStore: JsMap<String, DataItemJs>): RuleValidationResult{
         return RuleEngine.getInstance().validate(expression, toMap(dataItemStore, {it}, ::toDataItemJava))
     }
@@ -190,4 +194,8 @@ class RuleEngineJs {
             )
         }
     }
+
+    internal companion object {
+        var verbose: Boolean = false
+    }
 }