refactor: move tests directly to command

CHANGELOG.md

@@ -6,6 +6,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### [Unreleased](https://github.com/hougesen/mdsf/compare/v0.4.1...HEAD)
 
+- feat: add metadata to plugin command schema [`68cc23a`](https://github.com/hougesen/mdsf/commit/68cc23a3b49c07d5de314492ad286155c126f90c)
+
 #### [v0.4.1](https://github.com/hougesen/mdsf/compare/v0.4.0...v0.4.1)
 
 > 18 January 2025

codegen/src/tools.rs

@@ -4,38 +4,35 @@ use convert_case::{Case, Casing};
 
 const INDENT: &str = "    ";
 
-#[derive(Debug, serde::Deserialize, schemars::JsonSchema, Hash)]
+#[derive(Debug, serde::Deserialize, schemars::JsonSchema, Hash, Clone)]
 #[schemars(deny_unknown_fields)]
-pub struct ToolTest {
+pub struct ToolCommandTest {
     /// Codeblock language used when generating tests
     pub language: String,
 
-    pub command: String,
-
     pub test_input: String,
 
     pub test_output: String,
 }
 
-#[derive(Debug, serde::Deserialize, schemars::JsonSchema)]
+#[derive(Debug, serde::Deserialize, schemars::JsonSchema, Clone)]
 #[schemars(deny_unknown_fields)]
 pub struct ToolCommand {
-    pub command: Vec<String>,
+    pub arguments: Vec<String>,
 
     #[expect(unused)]
     pub ignore_output: bool,
 
     #[expect(unused)]
-    pub description: String,
+    pub description: Option<String>,
 
     #[expect(unused)]
-    pub homepage: String,
+    pub homepage: Option<String>,
 
-    #[expect(unused)]
-    pub tests: Vec<ToolTest>,
+    pub tests: Option<Vec<ToolCommandTest>>,
 }
 
-#[derive(Debug, serde::Deserialize, schemars::JsonSchema)]
+#[derive(Debug, serde::Deserialize, schemars::JsonSchema, Clone)]
 #[schemars(deny_unknown_fields)]
 pub struct Tool {
     #[expect(unused)]
@@ -61,8 +58,6 @@ pub struct Tool {
     pub categories: std::collections::HashSet<String>,
 
     pub languages: std::collections::HashSet<String>,
-
-    pub tests: Option<Vec<ToolTest>>,
 }
 
 #[derive(Debug)]
@@ -99,12 +94,14 @@ impl Tool {
         )
     }
 
-    fn generate_test(&self, test: &ToolTest) -> (String, String) {
+    fn generate_test(&self, command: &str, test: &ToolCommandTest) -> (String, String) {
         let mut hasher = DefaultHasher::new();
+
         test.hash(&mut hasher);
+
         let id = format!("{:x}", hasher.finish());
 
-        let module_name = self.get_command_name(&test.command).to_case(Case::Snake);
+        let module_name = self.get_command_name(command).to_case(Case::Snake);
 
         let language = test.language.to_case(Case::Snake);
 
@@ -140,17 +137,6 @@ impl Tool {
     fn generate(&self) -> Vec<GeneratedCommand> {
         let mut all_commands = Vec::new();
 
-        let mut generated_tests: std::collections::HashMap<String, Vec<String>> =
-            std::collections::HashMap::new();
-
-        if let Some(tests) = &self.tests {
-            for test in tests {
-                let (module, code) = self.generate_test(test);
-
-                generated_tests.entry(module).or_default().push(code);
-            }
-        }
-
         for (cmd, options) in &self.commands {
             let command_name = self.get_command_name(cmd);
 
@@ -187,7 +173,7 @@ impl Tool {
             let mut args_includes_path = false;
 
             let string_args = options
-                .command
+                .arguments
                 .iter()
                 .map(|arg| {
                     if arg == "$PATH" {
@@ -218,15 +204,20 @@ impl Tool {
 
             let module_name = command_name.to_case(Case::Snake);
 
-            let tests = generated_tests
-                .remove(&module_name)
+            let mut tests = options
+                .tests
+                .clone()
                 .unwrap_or_default()
-                .join("\n\n");
+                .iter()
+                .map(|test| self.generate_test(cmd, test).1)
+                .collect::<Vec<_>>();
 
             let tests = if tests.is_empty() {
                 String::new()
             } else {
-                format!("\n{tests}\n")
+                tests.sort_unstable();
+
+                format!("\n{}\n", tests.join("\n\n"))
             };
 
             let code = format!(
@@ -278,13 +269,11 @@ mod test_{module_name} {{{tests}}}
                     if cmd.is_empty() { "" } else { ":" },
                     cmd
                 ),
-                args: options.command.clone(),
+                args: options.arguments.clone(),
                 binary: self.binary.clone(),
             });
         }
 
-        assert!(generated_tests.is_empty());
-
         all_commands
     }
 }

mdsf/src/tools/alejandra.rs

@@ -34,7 +34,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_alejandra {
     #[test_with::executable(alejandra)]
-    fn test_alejandra_nix_7414a8a930f85473() {
+    fn test_alejandra_nix_f38bff8f20c2aa02() {
         let input = r#"{
             lib, buildPythonPackage, fetchFromGitHub, redis }:
 

mdsf/src/tools/auto_optional.rs

@@ -33,7 +33,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_auto_optional {
     #[test_with::executable(auto-optional)]
-    fn test_auto_optional_python_8164e93f38554b33() {
+    fn test_auto_optional_python_c43199b18f48026d() {
         let input = r#"def foo(bar: str = None):
     pass
 "#;

mdsf/src/tools/autoflake.rs

@@ -35,7 +35,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_autoflake {
     #[test_with::executable(autoflake)]
-    fn test_autoflake_python_a7a00a63bb271a62() {
+    fn test_autoflake_python_27cfd9b948e80d7f() {
         let input = r#"import math
 import re
 import os

mdsf/src/tools/autopep_8.rs

@@ -34,7 +34,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_autopep_8 {
     #[test_with::executable(autopep8)]
-    fn test_autopep_8_python_32e3f57971ad5635() {
+    fn test_autopep_8_python_a868b5ad9905fc3f() {
         let input = r#"def add( a: int ,  b:int)->int: return a+b"#;
         let output = r#"def add(a: int,  b: int) -> int: return a+b
 "#;

mdsf/src/tools/beautysh.rs

@@ -33,20 +33,20 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_beautysh {
     #[test_with::executable(beautysh)]
-    fn test_beautysh_shell_cb36b80a8b253f58() {
-        let input = r#"#!/bin/shell
+    fn test_beautysh_bash_a6831a7ad31bd0a6() {
+        let input = r#"#!/bin/bash
 
        add() {
     echo "$1" + "$2"
              }
 "#;
-        let output = r#"#!/bin/shell
+        let output = r#"#!/bin/bash
 
 add() {
     echo "$1" + "$2"
 }
 "#;
-        let file_ext = crate::fttype::get_file_extension("shell");
+        let file_ext = crate::fttype::get_file_extension("bash");
         let snippet =
             crate::execution::setup_snippet(input, &file_ext).expect("it to create a snippet file");
         let result = crate::tools::beautysh::run(snippet.path())
@@ -57,20 +57,20 @@ add() {
     }
 
     #[test_with::executable(beautysh)]
-    fn test_beautysh_bash_256eb200f416406f() {
-        let input = r#"#!/bin/bash
+    fn test_beautysh_shell_f8c934ee37e2888() {
+        let input = r#"#!/bin/shell
 
        add() {
     echo "$1" + "$2"
              }
 "#;
-        let output = r#"#!/bin/bash
+        let output = r#"#!/bin/shell
 
 add() {
     echo "$1" + "$2"
 }
 "#;
-        let file_ext = crate::fttype::get_file_extension("bash");
+        let file_ext = crate::fttype::get_file_extension("shell");
         let snippet =
             crate::execution::setup_snippet(input, &file_ext).expect("it to create a snippet file");
         let result = crate::tools::beautysh::run(snippet.path())

mdsf/src/tools/biome_format.rs

@@ -39,23 +39,20 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_biome_format {
     #[test_with::executable(npx)]
-    fn test_biome_format_json_844b1c8732d73ac3() {
+    fn test_biome_format_javascript_4845e9b01c23667f() {
         let input = r#"
-              {
-              "key": "value",
-  "key2": [
-      "value2",
-      "value3",
-      1
-            , null]
- }
-  "#;
-        let output = r#"{
-	"key": "value",
-	"key2": ["value2", "value3", 1, null]
+    async function asyncAddition(
+            a,b
+        ) {
+        return a+b
+    }
+
+            "#;
+        let output = r#"async function asyncAddition(a, b) {
+	return a + b;
 }
 "#;
-        let file_ext = crate::fttype::get_file_extension("json");
+        let file_ext = crate::fttype::get_file_extension("javascript");
         let snippet =
             crate::execution::setup_snippet(input, &file_ext).expect("it to create a snippet file");
         let result = crate::tools::biome_format::run(snippet.path())
@@ -66,20 +63,23 @@ mod test_biome_format {
     }
 
     #[test_with::executable(npx)]
-    fn test_biome_format_javascript_8a9233d85bad9eb0() {
+    fn test_biome_format_json_90a326e29048e3cd() {
         let input = r#"
-    async function asyncAddition(
-            a,b
-        ) {
-        return a+b
-    }
-
-            "#;
-        let output = r#"async function asyncAddition(a, b) {
-	return a + b;
+              {
+              "key": "value",
+  "key2": [
+      "value2",
+      "value3",
+      1
+            , null]
+ }
+  "#;
+        let output = r#"{
+	"key": "value",
+	"key2": ["value2", "value3", 1, null]
 }
 "#;
-        let file_ext = crate::fttype::get_file_extension("javascript");
+        let file_ext = crate::fttype::get_file_extension("json");
         let snippet =
             crate::execution::setup_snippet(input, &file_ext).expect("it to create a snippet file");
         let result = crate::tools::biome_format::run(snippet.path())
@@ -90,7 +90,7 @@ mod test_biome_format {
     }
 
     #[test_with::executable(npx)]
-    fn test_biome_format_typescript_5d686094d584dd57() {
+    fn test_biome_format_typescript_8154bfdbd3b72275() {
         let input = r#"
     async function asyncAddition(
             a:number,b:number

mdsf/src/tools/black.rs

@@ -34,7 +34,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_black {
     #[test_with::executable(black)]
-    fn test_black_python_8156ff26fe126797() {
+    fn test_black_python_229ec2b01c2bfe3c() {
         let input = r#"def add( a: int ,  b:int)->int: return a+b"#;
         let output = r#"def add(a: int, b: int) -> int:
     return a + b

mdsf/src/tools/blade_formatter.rs

@@ -38,7 +38,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_blade_formatter {
     #[test_with::executable(npx)]
-    fn test_blade_formatter_blade_9d6620376a93202f() {
+    fn test_blade_formatter_blade_9ddeaf972bfb08c1() {
         let input = r#"@extends('frontend.layouts.app')
 @section('title') foo
 @endsection

mdsf/src/tools/blue.rs

@@ -34,7 +34,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_blue {
     #[test_with::executable(blue)]
-    fn test_blue_python_8156ff26fe126797() {
+    fn test_blue_python_229ec2b01c2bfe3c() {
         let input = r#"def add( a: int ,  b:int)->int: return a+b"#;
         let output = r#"def add(a: int, b: int) -> int:
     return a + b

mdsf/src/tools/brunette.rs

@@ -34,7 +34,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_brunette {
     #[test_with::executable(brunette)]
-    fn test_brunette_python_8156ff26fe126797() {
+    fn test_brunette_python_229ec2b01c2bfe3c() {
         let input = r#"def add( a: int ,  b:int)->int: return a+b"#;
         let output = r#"def add(a: int, b: int) -> int:
     return a + b

mdsf/src/tools/buf_format.rs

@@ -39,7 +39,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_buf_format {
     #[test_with::executable(npx)]
-    fn test_buf_format_protobuf_a873b41888af5cc8() {
+    fn test_buf_format_protobuf_10af516c8a015ab5() {
         let input = r#"service SearchService {
                               rpc Search (SearchRequest) returns (SearchResponse);
                                }"#;

mdsf/src/tools/cabal_format.rs

@@ -34,7 +34,7 @@ pub fn run(file_path: &std::path::Path) -> Result<(bool, Option<String>), MdsfEr
 #[cfg(test)]
 mod test_cabal_format {
     #[test_with::executable(cabal)]
-    fn test_cabal_format_cabal_6118c31ea8b76f3b() {
+    fn test_cabal_format_cabal_38e9e2aad5619a6a() {
         let input = r#"cabal-version: 2.4
 name: mdsf
 version: 0