Custom labels for readability and CLI output (#1481)

maestro-orchestra-models/src/main/java/maestro/orchestra/Condition.kt

@@ -8,7 +8,8 @@ data class Condition(
     val platform: Platform? = null,
     val visible: ElementSelector? = null,
     val notVisible: ElementSelector? = null,
-    val scriptCondition: String? = null
+    val scriptCondition: String? = null,
+    val label: String? = null,
 ) {
 
     fun evaluateScripts(jsEngine: JsEngine): Condition {
@@ -20,6 +21,10 @@ data class Condition(
     }
 
     fun description(): String {
+        if(label != null){
+            return label
+        }
+
         val descriptions = mutableListOf<String>()
 
         platform?.let {

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlAction.kt

@@ -0,0 +1,21 @@
+package maestro.orchestra.yaml
+
+data class YamlActionBack(
+    val label: String? = null,
+)
+
+data class YamlActionClearKeychain(
+    val label: String? = null,
+)
+
+data class YamlActionHideKeyboard(
+    val label: String? = null,
+)
+
+data class YamlActionPasteText(
+    val label: String? = null,
+)
+
+data class YamlActionScroll(
+    val label: String? = null,
+)

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlAssertTrue.kt

@@ -0,0 +1,30 @@
+package maestro.orchestra.yaml
+
+import com.fasterxml.jackson.annotation.JsonCreator
+
+data class YamlAssertTrue(
+    val condition: String? = null,
+    val label: String? = null,
+){
+    companion object {
+
+        @JvmStatic
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+        fun parse(condition: Any): YamlAssertTrue {
+            val evaluatedCondition = when (condition) {
+                is String -> condition
+                is Int, is Long, is Char, is Boolean, is Float, is Double -> condition.toString()
+                is Map<*, *> -> {
+                    val evaluatedCondition = condition.getOrDefault("condition", "") as String
+                    val label = condition.getOrDefault("label", "") as String
+                    return YamlAssertTrue(evaluatedCondition, label)
+                }
+                else -> throw UnsupportedOperationException("Cannot deserialize assert true with data type ${condition.javaClass}")
+            }
+            return YamlAssertTrue(
+                condition = evaluatedCondition,
+            )
+        }
+    }
+}
+

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlClearState.kt

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator
 
 data class YamlClearState(
     val appId: String? = null,
+    val label: String? = null,
 ) {
     companion object {
         @JvmStatic

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlCondition.kt

@@ -9,4 +9,5 @@ data class YamlCondition(
     val visible: YamlElementSelectorUnion? = null,
     val notVisible: YamlElementSelectorUnion? = null,
     val `true`: String? = null,
+    val label: String? = null,
 )

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlElementSelector.kt

@@ -49,5 +49,6 @@ data class YamlElementSelector(
     val repeat: Int? = null,
     val delay: Int? = null,
     val waitToSettleTimeoutMs: Int? = null,
-    val childOf: YamlElementSelectorUnion? = null
+    val childOf: YamlElementSelectorUnion? = null,
+    val label: String? = null
 ) : YamlElementSelectorUnion

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlEraseTextUnion.kt

@@ -2,7 +2,10 @@ package maestro.orchestra.yaml
 
 import com.fasterxml.jackson.annotation.JsonCreator
 
-data class YamlEraseText(val charactersToErase: Int? = null) {
+data class YamlEraseText(
+    val charactersToErase: Int? = null,
+    val label: String? = null,
+) {
 
     companion object {
 

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlEvalScript.kt

@@ -0,0 +1,31 @@
+package maestro.orchestra.yaml
+
+import com.fasterxml.jackson.annotation.JsonCreator
+import java.lang.UnsupportedOperationException
+
+data class YamlEvalScript(
+    val script: String,
+    val label: String? = null,
+){
+    companion object {
+
+        @JvmStatic
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+        fun parse(script: Any): YamlEvalScript {
+            val evalScript = when (script) {
+                is String -> script
+                is Map<*, *> -> {
+                    val evaluatedScript = script.getOrDefault("script", "") as String
+                    val label = script.getOrDefault("label", "") as String
+                    return YamlEvalScript(evaluatedScript, label)
+                }
+                is Int, is Long, is Char, is Boolean, is Float, is Double -> script.toString()
+                else -> throw UnsupportedOperationException("Cannot deserialize evaluate script with data type ${script.javaClass}")
+            }
+            return YamlEvalScript(
+                script = evalScript,
+            )
+        }
+    }
+}
+

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlExtendedWaitUntil.kt

@@ -4,4 +4,5 @@ data class YamlExtendedWaitUntil(
     val visible: YamlElementSelectorUnion? = null,
     val notVisible: YamlElementSelectorUnion? = null,
     val timeout: String? = null,
+    val label: String? = null
 )