optional command patterns, improved default config examples (#17)

DenysVuika · Nov 15, 2024 · d72b387 · d72b387
1 parent 7d8d509
commit d72b387
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 22 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -24,18 +24,32 @@ impl Default for Config {
     fn default() -> Self {
         Config {
             base: Some("main".to_string()),
-            tasks: Some(vec![Task {
-                name: "lint".to_string(),
-                description: Some("Runs eslint for all affected files".to_string()),
-                patterns: vec![
-                    "*.ts".to_string(),
-                    "*.tsx".to_string(),
-                    "*.js".to_string(),
-                    "*.jsx".to_string(),
-                ],
-                commands: vec!["echo {files}".to_string()],
-                ..Default::default()
-            }]),
+            tasks: Some(vec![
+                Task {
+                    name: "lint".to_string(),
+                    description: Some("Runs eslint for all affected files (example)".to_string()),
+                    patterns: Some(vec![
+                        "*.ts".to_string(),
+                        "*.tsx".to_string(),
+                        "*.js".to_string(),
+                        "*.jsx".to_string(),
+                    ]),
+                    commands: vec!["eslint {files}".to_string()],
+                    ..Default::default()
+                },
+                Task {
+                    name: "prettier".to_string(),
+                    description: Some("Runs prettier for all affected files (example)".to_string()),
+                    patterns: Some(vec![
+                        "*.ts".to_string(),
+                        "*.tsx".to_string(),
+                        "*.js".to_string(),
+                        "*.jsx".to_string(),
+                    ]),
+                    commands: vec!["prettier --check {files}".to_string()],
+                    ..Default::default()
+                },
+            ]),
         }
     }
 }
@@ -45,7 +59,7 @@ impl Default for Config {
 pub struct Task {
     pub name: String,
     pub description: Option<String>,
-    pub patterns: Vec<String>,
+    pub patterns: Option<Vec<String>>,
     pub separator: Option<String>,
     pub commands: Vec<String>,
 }

diff --git a/src/tasks.rs b/src/tasks.rs
@@ -30,16 +30,20 @@ pub async fn run_task_by_name(
         return Ok(());
     }
 
-    let filtered_paths: Vec<_> = file_paths
-        .into_iter()
-        .filter(|path| {
-            task.patterns.iter().any(|pattern| {
-                Pattern::new(pattern)
-                    .map(|p| p.matches(path))
-                    .unwrap_or(false)
+    let filtered_paths: Vec<_> = if let Some(patterns) = &task.patterns {
+        file_paths
+            .into_iter()
+            .filter(|path| {
+                patterns.iter().any(|pattern| {
+                    Pattern::new(pattern)
+                        .map(|p| p.matches(path))
+                        .unwrap_or(false)
+                })
             })
-        })
-        .collect();
+            .collect()
+    } else {
+        file_paths
+    };
 
     if filtered_paths.is_empty() {
         println!("No files matched the patterns");