Move key binding groups to config crate

Cargo.lock

@@ -281,6 +281,7 @@ dependencies = [
 name = "cove-config"
 version = "0.6.1"
 dependencies = [
+ "cove-input",
  "cove-macro",
  "serde",
  "toml",

cove-config/Cargo.toml

@@ -4,6 +4,7 @@ version = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+cove-input = { path = "../cove-input" }
 cove-macro = { path = "../cove-macro" }
 
 serde = { workspace = true }

cove-config/src/keys.rs

@@ -1,6 +1,4 @@
-use cove_macro::Group;
+use cove_input::{Group, KeyBinding};
-
-use crate::KeyBinding;
 
 #[derive(Debug, Group)]
 pub struct General {

cove-config/src/lib.rs

@@ -11,6 +11,7 @@
 
 pub mod doc;
 mod euph;
+mod keys;
 
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -19,6 +20,7 @@ use doc::Document;
 use serde::Deserialize;
 
 pub use crate::euph::*;
+pub use crate::keys::*;
 
 #[derive(Debug, Default, Deserialize, Document)]
 pub struct Config {

cove-input/src/keys.rs

@@ -173,11 +173,35 @@ impl<'de> Deserialize<'de> for KeyPress {
 pub struct KeyBinding(Vec<KeyPress>);
 
 impl KeyBinding {
+    pub fn new() -> Self {
+        Self(vec![])
+    }
+
+    pub fn with_key(self, key: &str) -> Result<Self, ParseKeysError> {
+        self.with_keys([key])
+    }
+
+    pub fn with_keys<'a, I>(mut self, keys: I) -> Result<Self, ParseKeysError>
+    where
+        I: IntoIterator<Item = &'a str>,
+    {
+        for key in keys {
+            self.0.push(key.parse()?);
+        }
+        Ok(self)
+    }
+
     pub fn matches(&self, event: KeyEvent) -> bool {
         self.0.iter().any(|kp| kp.matches(event))
     }
 }
 
+impl Default for KeyBinding {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Serialize for KeyBinding {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         if self.0.len() == 1 {

cove-input/src/lib.rs

@@ -1,8 +1,8 @@
-mod groups;
 mod input;
 mod keys;
 
-pub use groups::*;
+pub use cove_macro::Group;
+
 pub use input::*;
 pub use keys::*;
 

cove-macro/src/group.rs

@@ -49,10 +49,10 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result<TokenStream> {
             #( #enum_variants )*
         }
 
-        impl crate::Group for #struct_ident {
+        impl ::cove_input::Group for #struct_ident {
             type Action = #enum_ident;
 
-            fn action(&self, input: &mut crate::Input) -> Option<Self::Action> {
+            fn action(&self, input: &mut ::cove_input::Input) -> Option<Self::Action> {
                 match () {
                     #( #match_cases )*
                     () => None,