✨ Remove MutableMap from addOperations + fix regex for android (#42)

* ✨ Remove MutableMap from addOperations * ✨ Fixes regex error for android
ZupIT · Jun 22, 2022 · 198b565 · 198b565
1 parent 5ddaaf2
commit 198b565
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/commonMain/kotlin/com/zup/nimbus/core/Nimbus.kt b/src/commonMain/kotlin/com/zup/nimbus/core/Nimbus.kt
@@ -92,7 +92,7 @@ class Nimbus(config: ServerDrivenConfig) {
     actionObservers.addAll(observers)
   }
 
-  fun addOperations(newOperations: MutableMap<String, OperationHandler>) {
+  fun addOperations(newOperations: Map<String, OperationHandler>) {
     addAll(operations, newOperations, "Operation")
   }
 }
diff --git a/src/commonMain/kotlin/com/zup/nimbus/core/render/expression.kt b/src/commonMain/kotlin/com/zup/nimbus/core/render/expression.kt
@@ -4,11 +4,11 @@ package com.zup.nimbus.core.render
 import com.zup.nimbus.core.OperationHandler
 import com.zup.nimbus.core.log.Logger
 import com.zup.nimbus.core.tree.ServerDrivenState
-import com.zup.nimbus.core.utils.then
 import com.zup.nimbus.core.utils.untypedValueOf
 
-private val expressionRegex = """(\\*)@\{(([^'}]|('([^'\\]|\\.)*'))*)}""".toRegex()
-private val fullMatchExpressionRegex = """^@\{(([^'}]|('([^'\\]|\\.)*'))*)}$""".toRegex()
+//Do not remove the Redundant character escape '\}' in RegExp, this causes error when using android regex implementation
+private val expressionRegex = """(\\*)@\{(([^'}]|('([^'\\]|\\.)*'))*)\}""".toRegex()
+private val fullMatchExpressionRegex = """^@\{(([^'}]|('([^'\\]|\\.)*'))*)\}$""".toRegex()
 private val dpaTransitions: Map<String, List<Transition>> = mapOf(
   "initial" to listOf(
     Transition(""",|$""".toRegex(), null, null, "final"), // end of parameter