feat(core): refactor form's choice and list values to accept multiline strings. Fix #855

espanso/src/cli/worker/engine/process/middleware/render/extension/form.rs

@@ -63,14 +63,7 @@ fn convert_fields(fields: &Params) -> HashMap<String, FormField> {
             .cloned(),
           values: params
             .get("values")
-            .and_then(|val| val.as_array())
+            .and_then(|v| extract_values(v, params.get("trim_string_values")))
-            .map(|arr| {
-              arr
-                .iter()
-                .flat_map(|choice| choice.as_string())
-                .cloned()
-                .collect()
-            })
             .unwrap_or_default(),
         }),
         Some(Value::String(field_type)) if field_type == "list" => Some(FormField::List {
@@ -80,14 +73,7 @@ fn convert_fields(fields: &Params) -> HashMap<String, FormField> {
             .cloned(),
           values: params
             .get("values")
-            .and_then(|val| val.as_array())
+            .and_then(|v| extract_values(v, params.get("trim_string_values")))
-            .map(|arr| {
-              arr
-                .iter()
-                .flat_map(|choice| choice.as_string())
-                .cloned()
-                .collect()
-            })
             .unwrap_or_default(),
         }),
         // By default, it's considered type 'text'
@@ -113,3 +99,38 @@ fn convert_fields(fields: &Params) -> HashMap<String, FormField> {
   }
   out
 }
+
+fn extract_values(value: &Value, trim_string_values: Option<&Value>) -> Option<Vec<String>> {
+  let trim_string_values = *trim_string_values
+    .and_then(|v| v.as_bool())
+    .unwrap_or(&true);
+
+  match value {
+    Value::Array(values) => Some(
+      values
+        .iter()
+        .flat_map(|choice| choice.as_string())
+        .cloned()
+        .collect(),
+    ),
+    Value::String(values) => Some(
+      values
+        .lines()
+        .filter_map(|line| {
+          if trim_string_values {
+            let trimmed_line = line.trim();
+            if !trimmed_line.is_empty() {
+              Some(trimmed_line)
+            } else {
+              None
+            }
+          } else {
+            Some(line)
+          }
+        })
+        .map(String::from)
+        .collect(),
+    ),
+    _ => None,
+  }
+}