feat: expand the types supported by the event system

yazi-config/src/keymap/control.rs

@@ -15,9 +15,7 @@ pub struct Control {
 
 impl Control {
 	#[inline]
-	pub fn to_seq(&self) -> VecDeque<Cmd> {
-		self.run.iter().map(|e| e.clone_without_data()).collect()
-	}
+	pub fn to_seq(&self) -> VecDeque<Cmd> { self.run.iter().map(|c| c.shallow_clone()).collect() }
 }
 
 impl Control {

yazi-config/src/keymap/run.rs

@@ -1,30 +1,37 @@
-use std::fmt;
+use std::{fmt, mem};
 
 use anyhow::{bail, Result};
 use serde::{de::{self, Visitor}, Deserializer};
-use yazi_shared::event::Cmd;
+use yazi_shared::event::{Cmd, Data};
 
 pub(super) fn run_deserialize<'de, D>(deserializer: D) -> Result<Vec<Cmd>, D::Error>
 where
 	D: Deserializer<'de>,
 {
 	struct RunVisitor;
 
+	#[allow(clippy::explicit_counter_loop)]
 	fn parse(s: &str) -> Result<Cmd> {
-		let s = shell_words::split(s)?;
-		if s.is_empty() {
-			bail!("`run` cannot be empty");
-		}
+		let mut args = shell_words::split(s)?;
+		let mut cmd = Cmd { name: mem::take(&mut args[0]), ..Default::default() };
+
+		let mut i = 0usize;
+		for arg in args.into_iter().skip(1) {
+			let Some(arg) = arg.strip_prefix("--") else {
+				cmd.args.insert(i.to_string(), Data::String(arg));
+				i += 1;
+				continue;
+			};
+
+			let mut parts = arg.splitn(2, '=');
+			let Some(key) = parts.next().map(|s| s.to_owned()) else {
+				bail!("invalid argument: {arg}");
+			};
 
-		let mut cmd = Cmd { name: s[0].clone(), ..Default::default() };
-		for arg in s.into_iter().skip(1) {
-			if arg.starts_with("--") {
-				let mut arg = arg.splitn(2, '=');
-				let key = arg.next().unwrap().trim_start_matches('-');
-				let val = arg.next().unwrap_or("").to_string();
-				cmd.named.insert(key.to_string(), val);
+			if let Some(val) = parts.next() {
+				cmd.args.insert(key, Data::String(val.to_owned()));
 			} else {
-				cmd.args.push(arg);
+				cmd.args.insert(key, Data::Boolean(true));
 			}
 		}
 		Ok(cmd)

yazi-core/src/completion/commands/arrow.rs

@@ -8,7 +8,7 @@ pub struct Opt {
 
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
-		Self { step: c.take_first().and_then(|s| s.parse().ok()).unwrap_or(0) }
+		Self { step: c.take_first_str().and_then(|s| s.parse().ok()).unwrap_or(0) }
 	}
 }
 

yazi-core/src/completion/commands/close.rs

@@ -8,7 +8,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self { Self { submit: c.named.contains_key("submit") } }
+	fn from(c: Cmd) -> Self { Self { submit: c.get_bool("submit") } }
 }
 
 impl Completion {

yazi-core/src/completion/commands/show.rs

@@ -16,10 +16,10 @@ pub struct Opt {
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
 		Self {
-			cache:      mem::take(&mut c.args),
-			cache_name: c.take_name("cache-name").unwrap_or_default(),
-			word:       c.take_name("word").unwrap_or_default(),
-			ticket:     c.take_name("ticket").and_then(|v| v.parse().ok()).unwrap_or(0),
+			cache:      c.take_any("cache").unwrap_or_default(),
+			cache_name: c.take_str("cache-name").unwrap_or_default(),
+			word:       c.take_str("word").unwrap_or_default(),
+			ticket:     c.take_str("ticket").and_then(|v| v.parse().ok()).unwrap_or(0),
 		}
 	}
 }
@@ -63,7 +63,7 @@ impl Completion {
 		}
 
 		if !opt.cache.is_empty() {
-			self.caches.insert(opt.cache_name.to_owned(), opt.cache.clone());
+			self.caches.insert(opt.cache_name.to_owned(), opt.cache);
 		}
 		let Some(cache) = self.caches.get(&opt.cache_name) else {
 			return;

yazi-core/src/completion/commands/trigger.rs

@@ -19,8 +19,8 @@ pub struct Opt {
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
 		Self {
-			word:   c.take_first().unwrap_or_default(),
-			ticket: c.take_name("ticket").and_then(|s| s.parse().ok()).unwrap_or(0),
+			word:   c.take_first_str().unwrap_or_default(),
+			ticket: c.take_str("ticket").and_then(|s| s.parse().ok()).unwrap_or(0),
 		}
 	}
 }
@@ -57,7 +57,8 @@ impl Completion {
 
 			if !cache.is_empty() {
 				emit!(Call(
-					Cmd::args("show", cache)
+					Cmd::new("show")
+						.with_any("cache", cache)
 						.with("cache-name", parent)
 						.with("word", child)
 						.with("ticket", ticket),

yazi-core/src/folder/filter.rs

@@ -45,7 +45,7 @@ pub enum FilterCase {
 
 impl From<&Cmd> for FilterCase {
 	fn from(c: &Cmd) -> Self {
-		match (c.named.contains_key("smart"), c.named.contains_key("insensitive")) {
+		match (c.get_bool("smart"), c.get_bool("insensitive")) {
 			(true, _) => Self::Smart,
 			(_, false) => Self::Sensitive,
 			(_, true) => Self::Insensitive,

yazi-core/src/help/commands/arrow.rs

@@ -8,7 +8,7 @@ pub struct Opt {
 
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
-		Self { step: c.take_first().and_then(|s| s.parse().ok()).unwrap_or(0) }
+		Self { step: c.take_first_str().and_then(|s| s.parse().ok()).unwrap_or(0) }
 	}
 }
 impl From<isize> for Opt {

yazi-core/src/input/commands/backspace.rs

@@ -7,7 +7,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self { Self { under: c.named.contains_key("under") } }
+	fn from(c: Cmd) -> Self { Self { under: c.get_bool("under") } }
 }
 impl From<bool> for Opt {
 	fn from(under: bool) -> Self { Self { under } }

yazi-core/src/input/commands/close.rs

@@ -8,7 +8,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self { Self { submit: c.named.contains_key("submit") } }
+	fn from(c: Cmd) -> Self { Self { submit: c.get_bool("submit") } }
 }
 impl From<bool> for Opt {
 	fn from(submit: bool) -> Self { Self { submit } }

yazi-core/src/input/commands/complete.rs

@@ -18,8 +18,8 @@ pub struct Opt {
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
 		Self {
-			word:   c.take_first().unwrap_or_default(),
-			ticket: c.take_name("ticket").and_then(|s| s.parse().ok()).unwrap_or(0),
+			word:   c.take_first_str().unwrap_or_default(),
+			ticket: c.take_str("ticket").and_then(|s| s.parse().ok()).unwrap_or(0),
 		}
 	}
 }

yazi-core/src/input/commands/delete.rs

@@ -8,9 +8,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self {
-		Self { cut: c.named.contains_key("cut"), insert: c.named.contains_key("insert") }
-	}
+	fn from(c: Cmd) -> Self { Self { cut: c.get_bool("cut"), insert: c.get_bool("insert") } }
 }
 
 impl Input {

yazi-core/src/input/commands/forward.rs

@@ -7,7 +7,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self { Self { end_of_word: c.named.contains_key("end-of-word") } }
+	fn from(c: Cmd) -> Self { Self { end_of_word: c.get_bool("end-of-word") } }
 }
 
 impl Input {

yazi-core/src/input/commands/insert.rs

@@ -7,7 +7,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self { Self { append: c.named.contains_key("append") } }
+	fn from(c: Cmd) -> Self { Self { append: c.get_bool("append") } }
 }
 impl From<bool> for Opt {
 	fn from(append: bool) -> Self { Self { append } }

yazi-core/src/input/commands/kill.rs

@@ -9,7 +9,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(mut c: Cmd) -> Self { Self { kind: c.take_first().unwrap_or_default() } }
+	fn from(mut c: Cmd) -> Self { Self { kind: c.take_first_str().unwrap_or_default() } }
 }
 
 impl Input {

yazi-core/src/input/commands/move_.rs

@@ -11,8 +11,8 @@ pub struct Opt {
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
 		Self {
-			step:         c.take_first().and_then(|s| s.parse().ok()).unwrap_or(0),
-			in_operating: c.named.contains_key("in-operating"),
+			step:         c.take_first_str().and_then(|s| s.parse().ok()).unwrap_or(0),
+			in_operating: c.get_bool("in-operating"),
 		}
 	}
 }

yazi-core/src/input/commands/paste.rs

@@ -7,7 +7,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self { Self { before: c.named.contains_key("before") } }
+	fn from(c: Cmd) -> Self { Self { before: c.get_bool("before") } }
 }
 
 impl Input {

yazi-core/src/input/commands/show.rs

@@ -1,10 +1,24 @@
-use yazi_proxy::options::InputOpt;
-use yazi_shared::render;
+use tokio::sync::mpsc;
+use yazi_config::popup::InputCfg;
+use yazi_shared::{event::Cmd, render, InputError};
 
 use crate::input::Input;
 
+pub struct Opt {
+	cfg: InputCfg,
+	tx:  mpsc::UnboundedSender<Result<String, InputError>>,
+}
+
+impl TryFrom<Cmd> for Opt {
+	type Error = ();
+
+	fn try_from(mut c: Cmd) -> Result<Self, Self::Error> {
+		Ok(Self { cfg: c.take_any("cfg").ok_or(())?, tx: c.take_any("tx").ok_or(())? })
+	}
+}
+
 impl Input {
-	pub fn show(&mut self, opt: impl TryInto<InputOpt>) {
+	pub fn show(&mut self, opt: impl TryInto<Opt>) {
 		let Ok(opt) = opt.try_into() else { return };
 
 		self.close(false);

yazi-core/src/manager/commands/create.rs

@@ -12,7 +12,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self { Self { force: c.named.contains_key("force") } }
+	fn from(c: Cmd) -> Self { Self { force: c.get_bool("force") } }
 }
 
 impl Manager {

yazi-core/src/manager/commands/hover.rs

@@ -9,7 +9,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(mut c: Cmd) -> Self { Self { url: c.take_first().map(Url::from) } }
+	fn from(mut c: Cmd) -> Self { Self { url: c.take_first_str().map(Url::from) } }
 }
 impl From<Option<Url>> for Opt {
 	fn from(url: Option<Url>) -> Self { Self { url } }

yazi-core/src/manager/commands/link.rs

@@ -8,9 +8,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self {
-		Self { relative: c.named.contains_key("relative"), force: c.named.contains_key("force") }
-	}
+	fn from(c: Cmd) -> Self { Self { relative: c.get_bool("relative"), force: c.get_bool("force") } }
 }
 
 impl Manager {

yazi-core/src/manager/commands/open.rs

@@ -17,10 +17,7 @@ pub struct Opt {
 
 impl From<Cmd> for Opt {
 	fn from(c: Cmd) -> Self {
-		Self {
-			interactive: c.named.contains_key("interactive"),
-			hovered:     c.named.contains_key("hovered"),
-		}
+		Self { interactive: c.get_bool("interactive"), hovered: c.get_bool("hovered") }
 	}
 }
 

yazi-core/src/manager/commands/paste.rs

@@ -8,9 +8,7 @@ pub struct Opt {
 }
 
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self {
-		Self { force: c.named.contains_key("force"), follow: c.named.contains_key("follow") }
-	}
+	fn from(c: Cmd) -> Self { Self { force: c.get_bool("force"), follow: c.get_bool("follow") } }
 }
 
 impl Manager {

yazi-core/src/manager/commands/peek.rs

@@ -13,10 +13,10 @@ pub struct Opt {
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
 		Self {
-			skip:        c.take_first().and_then(|s| s.parse().ok()),
-			force:       c.named.contains_key("force"),
-			only_if:     c.take_name("only-if").map(Url::from),
-			upper_bound: c.named.contains_key("upper-bound"),
+			skip:        c.take_first_str().and_then(|s| s.parse().ok()),
+			force:       c.get_bool("force"),
+			only_if:     c.take_str("only-if").map(Url::from),
+			upper_bound: c.get_bool("upper-bound"),
 		}
 	}
 }

yazi-core/src/manager/commands/quit.rs

@@ -12,7 +12,7 @@ impl From<()> for Opt {
 	fn from(_: ()) -> Self { Self::default() }
 }
 impl From<Cmd> for Opt {
-	fn from(c: Cmd) -> Self { Self { no_cwd_file: c.named.contains_key("no-cwd-file") } }
+	fn from(c: Cmd) -> Self { Self { no_cwd_file: c.get_bool("no-cwd-file") } }
 }
 
 impl Manager {

yazi-core/src/manager/commands/remove.rs

@@ -13,9 +13,9 @@ pub struct Opt {
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
 		Self {
-			force:       c.named.contains_key("force"),
-			permanently: c.named.contains_key("permanently"),
-			targets:     c.take_data().unwrap_or_default(),
+			force:       c.get_bool("force"),
+			permanently: c.get_bool("permanently"),
+			targets:     c.take_any("targets").unwrap_or_default(),
 		}
 	}
 }

yazi-core/src/manager/commands/rename.rs

@@ -18,9 +18,9 @@ pub struct Opt {
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
 		Self {
-			force:  c.named.contains_key("force"),
-			empty:  c.take_name("empty").unwrap_or_default(),
-			cursor: c.take_name("cursor").unwrap_or_default(),
+			force:  c.get_bool("force"),
+			empty:  c.take_str("empty").unwrap_or_default(),
+			cursor: c.take_str("cursor").unwrap_or_default(),
 		}
 	}
 }

yazi-core/src/manager/commands/seek.rs

@@ -11,7 +11,7 @@ pub struct Opt {
 
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
-		Self { units: c.take_first().and_then(|s| s.parse().ok()).unwrap_or(0) }
+		Self { units: c.take_first_str().and_then(|s| s.parse().ok()).unwrap_or(0) }
 	}
 }
 

yazi-core/src/manager/commands/tab_close.rs

@@ -8,7 +8,7 @@ pub struct Opt {
 
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
-		Self { idx: c.take_first().and_then(|i| i.parse().ok()).unwrap_or(0) }
+		Self { idx: c.take_first_str().and_then(|i| i.parse().ok()).unwrap_or(0) }
 	}
 }
 

yazi-core/src/manager/commands/tab_create.rs

@@ -13,11 +13,11 @@ pub struct Opt {
 
 impl From<Cmd> for Opt {
 	fn from(mut c: Cmd) -> Self {
-		if c.named.contains_key("current") {
+		if c.get_bool("current") {
 			Self { url: Default::default(), current: true }
 		} else {
 			Self {
-				url:     c.take_first().map_or_else(|| Url::from(&BOOT.cwd), Url::from),
+				url:     c.take_first_str().map_or_else(|| Url::from(&BOOT.cwd), Url::from),
 				current: false,
 			}
 		}