From 9002ea263ff55ebf8501c099218eea34e15af0a6 Mon Sep 17 00:00:00 2001
From: rvcas <x@rvcas.dev>
Date: Tue, 10 Jan 2023 10:19:13 -0500
Subject: [PATCH] feat(check): make match tests flag fancier

---
 crates/aiken-project/src/lib.rs     | 59 ++++++++++++++++++++++++-----
 crates/aiken-project/src/options.rs |  2 +-
 crates/aiken/src/cmd/check.rs       |  2 +-
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/crates/aiken-project/src/lib.rs b/crates/aiken-project/src/lib.rs
index 606e540d..0e56d8a0 100644
--- a/crates/aiken-project/src/lib.rs
+++ b/crates/aiken-project/src/lib.rs
@@ -152,7 +152,7 @@ where
     pub fn check(
         &mut self,
         skip_tests: bool,
-        match_tests: Option<String>,
+        match_tests: Option<Vec<String>>,
         verbose: bool,
     ) -> Result<(), Error> {
         let options = Options {
@@ -692,7 +692,11 @@ where
         Ok(programs)
     }
 
-    fn eval_scripts(&self, scripts: Vec<Script>, match_name: Option<String>) -> Vec<EvalInfo> {
+    fn eval_scripts(
+        &self,
+        scripts: Vec<Script>,
+        match_tests: Option<Vec<String>>,
+    ) -> Vec<EvalInfo> {
         use rayon::prelude::*;
 
         // TODO: in the future we probably just want to be able to
@@ -702,14 +706,51 @@ where
             cpu: i64::MAX,
         };
 
-        scripts
-            .into_iter()
-            .filter(|script| -> bool {
-                let path = format!("{}{}", script.module, script.name);
+        let scripts = if let Some(match_tests) = match_tests {
+            let match_tests: Vec<(&str, Option<Vec<String>>)> = match_tests
+                .iter()
+                .map(|match_test| {
+                    let mut match_split_dot = match_test.split('.');
 
-                !matches!(&match_name, Some(search_str) if !path.contains(search_str))
-            })
-            .collect::<Vec<Script>>()
+                    let match_module = match_split_dot.next().unwrap_or("");
+
+                    let match_names = match_split_dot.next().map(|names| {
+                        let names = names.replace(&['{', '}'][..], "");
+
+                        let names_split_comma = names.split(',');
+
+                        names_split_comma.map(str::to_string).collect()
+                    });
+
+                    (match_module, match_names)
+                })
+                .collect();
+
+            scripts
+                .into_iter()
+                .filter(|script| -> bool {
+                    match_tests.iter().any(|(match_module, match_names)| {
+                        if *match_module == script.module {
+                            if let Some(match_names) = match_names {
+                                match_names
+                                    .iter()
+                                    .any(|name| name == &script.name || script.name.contains(name))
+                            } else {
+                                true
+                            }
+                        } else {
+                            false
+                        }
+                    })
+
+                    // !matches!(&match_tests, Some(search_str) if !path.contains(search_str))
+                })
+                .collect::<Vec<Script>>()
+        } else {
+            scripts
+        };
+
+        scripts
             .into_par_iter()
             .map(|script| match script.program.eval(initial_budget) {
                 (Ok(result), remaining_budget, logs) => EvalInfo {
diff --git a/crates/aiken-project/src/options.rs b/crates/aiken-project/src/options.rs
index dd09960d..58531b89 100644
--- a/crates/aiken-project/src/options.rs
+++ b/crates/aiken-project/src/options.rs
@@ -4,7 +4,7 @@ pub struct Options {
 
 pub enum CodeGenMode {
     Test {
-        match_tests: Option<String>,
+        match_tests: Option<Vec<String>>,
         verbose: bool,
     },
     Build(bool),
diff --git a/crates/aiken/src/cmd/check.rs b/crates/aiken/src/cmd/check.rs
index 6e6e860a..c033b080 100644
--- a/crates/aiken/src/cmd/check.rs
+++ b/crates/aiken/src/cmd/check.rs
@@ -16,7 +16,7 @@ pub struct Args {
 
     /// Only run tests if their path + name match the given string
     #[clap(short, long)]
-    match_tests: Option<String>,
+    match_tests: Option<Vec<String>>,
 }
 
 pub fn exec(