fix: Do not escape regex in d2:validatePattern [DHIS2-21359]

build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
     mavenCentral()
 }
 
-version = "1.4.1-SNAPSHOT"
+version = "1.4.2-SNAPSHOT"
 group = "org.hisp.dhis.lib.expression"
 
 if (project.hasProperty("removeSnapshotSuffix")) {
@@ -107,4 +107,4 @@ sonarqube {
 
 tasks.named("sonar").configure {
     dependsOn(":koverXmlReport")
-}
+}

src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt

@@ -2,6 +2,7 @@ package org.hisp.dhis.lib.expression.eval
 
 import kotlinx.datetime.LocalDate
 import org.hisp.dhis.lib.expression.ast.*
+import org.hisp.dhis.lib.expression.ast.Nodes.Utf8StringNode
 import org.hisp.dhis.lib.expression.ast.UnaryOperator.Companion.negate
 import org.hisp.dhis.lib.expression.spi.*
 
@@ -139,7 +140,7 @@ internal class Calculator(
                 evalToInteger(fn.child(2)))
             NamedFunction.d2_validatePattern -> functions.d2_validatePattern(
                 evalToString(fn.child(0)),
-                evalToString(fn.child(1)))
+                evalToRawString(fn.child(1)))
             NamedFunction.d2_weeksBetween -> functions.d2_weeksBetween(
                 evalToDate(fn.child(0)),
                 evalToDate(fn.child(1)))
@@ -301,6 +302,15 @@ internal class Calculator(
         return eval(node, "String", Typed::toStringTypeCoercion)
     }
 
+    private fun evalToRawString(node: Node<*>): String? {
+        return when (node.getType()) {
+            NodeType.STRING -> node.getRawValue()
+            NodeType.ARGUMENT -> evalToRawString(node.child(0))
+            NodeType.PAR -> evalToRawString(node.child(0))
+            else -> evalToString(node)
+        }
+    }
+
     fun evalToBoolean(node: Node<*>): Boolean? {
         return eval(node, "Boolean", Typed::toBooleanTypeCoercion)
     }

src/commonMain/kotlin/org/hisp/dhis/lib/expression/spi/ExpressionFunctions.kt

@@ -315,7 +315,7 @@ fun interface ExpressionFunctions {
     }
 
     fun d2_validatePattern(input: String?, regex: String?): Boolean {
-        return input != null && regex != null && input.matches(regex.toRegex())
+        return input != null && regex != null && matchesPattern(input, regex)
     }
 
     fun d2_weeksBetween(start: LocalDate?, end: LocalDate?): Int {

src/commonMain/kotlin/org/hisp/dhis/lib/expression/spi/RegexMatch.kt

@@ -0,0 +1,3 @@
+package org.hisp.dhis.lib.expression.spi
+
+internal expect fun matchesPattern(input: String, pattern: String): Boolean

src/commonTest/kotlin/org/hisp/dhis/lib/expression/function/ValidatePatternTest.kt

@@ -29,15 +29,17 @@ internal class ValidatePatternTest {
     fun testValidatePattern_Match() {
         assertTrue(evaluate("d2:validatePattern(\"124\", \"[0-9]+\")"))
         assertTrue(evaluate("d2:validatePattern(\"12x4\", \"[0-9x]+\")"))
+        assertTrue(evaluate("d2:validatePattern(\"John\",(\"[a-zA-Z0-9À-ȕ\\'\\-\\‘\\`\\’\\ ]+\"))"))
     }
 
     @Test
     fun testValidatePattern_NoMatch() {
         assertFalse(evaluate("d2:validatePattern(\"12x4\", \"[0-9]+\")"))
         assertFalse(evaluate("d2:validatePattern(\"ab0\", \"[0-9x]+\")"))
+        assertFalse(evaluate("d2:validatePattern(\"Иван\",(\"[a-zA-Z0-9À-ȕ\\'\\-\\‘\\`\\’\\ ]+\"))"))
     }
 
     private fun evaluate(expression: String): Boolean {
         return Expression(expression, ExpressionMode.RULE_ENGINE_ACTION).evaluate() as Boolean
     }
-}
+}

src/jsMain/kotlin/org/hisp/dhis/lib/expression/spi/RegexMatch.kt

@@ -0,0 +1,7 @@
+package org.hisp.dhis.lib.expression.spi
+
+internal actual fun matchesPattern(input: String, pattern: String): Boolean {
+    // Avoid Kotlin stdlib's Regex wrapper which may add the JS `u` flag and reject unknown backslash
+    // escapes. Use RegExp directly with ^(?:...)$ anchoring to replicate full-string matching.
+    return js("new RegExp('^(?:' + pattern + ')$').test(input)") as Boolean
+}

src/jvmMain/kotlin/org/hisp/dhis/lib/expression/spi/RegexMatch.kt

@@ -0,0 +1,4 @@
+package org.hisp.dhis.lib.expression.spi
+
+internal actual fun matchesPattern(input: String, pattern: String): Boolean =
+    input.matches(pattern.toRegex())

src/nativeMain/kotlin/org/hisp/dhis/lib/expression/spi/RegexMatch.kt

@@ -0,0 +1,4 @@
+package org.hisp.dhis.lib.expression.spi
+
+internal actual fun matchesPattern(input: String, pattern: String): Boolean =
+    input.matches(pattern.toRegex())