feat: improve patterns list/test output

getgrit · Mar 23, 2024 · 5ae9bfc · 5ae9bfc
1 parent cf59ebf
commit 5ae9bfc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/crates/cli/src/commands/plumbing.rs b/crates/cli/src/commands/plumbing.rs
@@ -257,7 +257,8 @@ pub(crate) async fn run_plumbing(
                     )
                 })?;
 
-            let libs = get_grit_files_from(None).await?;
+            let cwd = std::env::current_dir()?;
+            let libs = get_grit_files_from(Some(cwd)).await?;
             get_marzano_pattern_test_results(
                 patterns,
                 &libs,

diff --git a/crates/gritmodule/src/config.rs b/crates/gritmodule/src/config.rs
@@ -172,7 +172,6 @@ pub struct ResolvedGritDefinition {
     pub local_name: String,
     pub body: String,
     pub kind: DefinitionKind,
-    #[serde(skip)]
     pub language: PatternLanguage,
     pub visibility: PatternVisibility,
 }

diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml
@@ -28,6 +28,7 @@ tree-sitter-sql = { path = "../../resources/language-metavariables/tree-sitter-s
 tree-sitter-vue = { path = "../../resources/language-metavariables/tree-sitter-vue", optional = true }
 tree-sitter-toml = { path = "../../resources/language-metavariables/tree-sitter-toml", optional = true }
 serde_json = { version = "1.0.91", features = ["preserve_order"] }
+serde = { version = "1.0.91", features = ["derive"] }
 marzano-util = { path = "../util" }
 regex = "1.7.1"
 anyhow = "1.0.70"

diff --git a/crates/language/src/target_language.rs b/crates/language/src/target_language.rs
@@ -24,6 +24,7 @@ use crate::{
 };
 use anyhow::Result;
 use enum_dispatch::enum_dispatch;
+use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 use std::fmt;
 use std::hash::Hash;
@@ -42,7 +43,8 @@ use std::path::PathBuf;
 #[cfg(feature = "finder")]
 use std::str::FromStr;
 
-#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash, Deserialize, Serialize)]
+#[serde(rename_all = "lowercase")]
 pub enum PatternLanguage {
     JavaScript,
     TypeScript,