fix: try binary before using npx (#276)

hougesen · Jun 13, 2024 · 56e7beb · 56e7beb
1 parent 30dd6b8
commit 56e7beb
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 26 deletions.
diff --git a/mdsf.json b/mdsf.json
@@ -42,6 +42,7 @@
     "toml": "taplo",
     "typescript": [["prettier", "biome", "deno_fmt"]],
     "yaml": [["prettier", "yamlfmt", "yamlfix"]],
-    "zig": "zigfmt"
+    "zig": "zigfmt",
+    "vue": "prettier"
   }
 }
diff --git a/src/formatters/blade_formatter.rs b/src/formatters/blade_formatter.rs
@@ -7,7 +7,7 @@ fn set_blade_formatter_args(cmd: &mut std::process::Command, snippet_path: &std:
 }
 
 #[inline]
-fn invote_blade_formatter(
+fn invoke_blade_formatter(
     mut cmd: std::process::Command,
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
@@ -20,15 +20,22 @@ fn invote_blade_formatter(
 pub fn format_using_blade_formatter(
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
-    invote_blade_formatter(setup_npm_script("blade-formatter"), snippet_path)
+    if let Ok(path_result) =
+        invoke_blade_formatter(std::process::Command::new("blade-formatter"), snippet_path)
+    {
+        if !path_result.0 {
+            return Ok(path_result);
+        }
+    }
+
+    invoke_blade_formatter(setup_npm_script("blade-formatter"), snippet_path)
 }
 
 #[cfg(test)]
 mod test_blade_formatter {
     use crate::{formatters::setup_snippet, generated::language_to_ext};
 
-    #[test_with::executable(npx)]
-    #[test]
+    #[test_with::executable(blade-formatter)]
     fn it_should_format_blade() {
         let input = r#"@extends('frontend.layouts.app')
 @section('title') foo

diff --git a/src/formatters/elm_format.rs b/src/formatters/elm_format.rs
@@ -20,6 +20,14 @@ fn invoke_elm_format(
 pub fn format_using_elm_format(
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
+    if let Ok(path_result) =
+        invoke_elm_format(std::process::Command::new("elm-format"), snippet_path)
+    {
+        if !path_result.0 {
+            return Ok(path_result);
+        }
+    }
+
     invoke_elm_format(setup_npm_script("elm-format"), snippet_path)
 }
 
@@ -30,7 +38,7 @@ mod test_elm_format {
         generated::language_to_ext,
     };
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_elm() {
         let input = r#"import   Html       exposing   (text)
 

diff --git a/src/formatters/prettier.rs b/src/formatters/prettier.rs
@@ -58,7 +58,7 @@ mod test_prettier {
         generated::language_to_ext,
     };
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_json() {
         let input = "
               {
@@ -90,7 +90,7 @@ mod test_prettier {
         assert_eq!(expected_output, output);
     }
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_javascript() {
         let input = "
     async function asyncAddition(
@@ -117,7 +117,7 @@ mod test_prettier {
         assert_eq!(expected_output, output);
     }
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_typescript() {
         let input = "
     async function asyncAddition(
@@ -147,7 +147,7 @@ number>
         assert_eq!(expected_output, output);
     }
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_markdown() {
         let input = "
 
@@ -174,7 +174,7 @@ this is a paragraph
         assert_eq!(expected_output, output);
     }
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_not_format_code_snippets_in_markdown() {
         let input = "```typescript
     async function asyncAddition(
@@ -201,7 +201,7 @@ number>
         assert_eq!(input, output);
     }
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_html() {
         let input = " <!doctype html> <html> <head> <style> body {background-color: powderblue;} h1   {color: blue;} p    {color: red;} </style> </head> <body>  <h1>This is a heading</h1> <p>This is a paragraph.</p>  </body> </html> ";
 
@@ -238,7 +238,7 @@ number>
         assert_eq!(expected_output, output);
     }
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_css() {
         let input = " h1   {color: blue;} p    {color: red;} ";
 
@@ -261,7 +261,7 @@ p {
         assert_eq!(expected_output, output);
     }
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_yaml() {
         let input = "
 
@@ -317,7 +317,7 @@ updates:
         assert_eq!(expected_output, output);
     }
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_vue() {
         let input = "<script lang=\"ts\"   setup >
 import {
@@ -363,7 +363,7 @@ function add(a: number, b: number): number {
         assert_eq!(expected_output, output);
     }
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_graphql() {
         let input = "{   hero {     name
             # Queries can have comments!

diff --git a/src/formatters/purs_tidy.rs b/src/formatters/purs_tidy.rs
@@ -20,6 +20,13 @@ fn invoke_purs_tidy(
 pub fn format_using_purs_tidy(
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
+    if let Ok(path_result) = invoke_purs_tidy(std::process::Command::new("purs-tidy"), snippet_path)
+    {
+        if !path_result.0 {
+            return Ok(path_result);
+        }
+    }
+
     invoke_purs_tidy(setup_npm_script("purs-tidy"), snippet_path)
 }
 
@@ -29,6 +36,7 @@ mod test_purs_tidy {
     use crate::{formatters::setup_snippet, generated::language_to_ext};
 
     #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_purescript() {
         let input = r#"module       Test.Main   where
 

diff --git a/src/formatters/rescript_format.rs b/src/formatters/rescript_format.rs
@@ -7,7 +7,7 @@ fn set_rescript_format_args(cmd: &mut std::process::Command, snippet_path: &std:
 }
 
 #[inline]
-fn invote_rescript_format(
+fn invoke_rescript_format(
     mut cmd: std::process::Command,
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
@@ -20,14 +20,22 @@ fn invote_rescript_format(
 pub fn format_using_rescript_format(
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
-    invote_rescript_format(setup_npm_script("rescript"), snippet_path)
+    if let Ok(path_result) =
+        invoke_rescript_format(std::process::Command::new("rescript"), snippet_path)
+    {
+        if !path_result.0 {
+            return Ok(path_result);
+        }
+    }
+
+    invoke_rescript_format(setup_npm_script("rescript"), snippet_path)
 }
 
 #[cfg(test)]
 mod test_rescript_format {
     use crate::{formatters::setup_snippet, generated::language_to_ext};
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_rescript() {
         let input = r#"module Button = {
   @react.component

diff --git a/src/formatters/sql_formatter.rs b/src/formatters/sql_formatter.rs
@@ -7,7 +7,7 @@ fn set_sql_formatter_args(cmd: &mut std::process::Command, snippet_path: &std::p
 }
 
 #[inline]
-fn invote_sql_formatter(
+fn invoke_sql_formatter(
     mut cmd: std::process::Command,
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
@@ -20,14 +20,22 @@ fn invote_sql_formatter(
 pub fn format_using_sql_formatter(
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
-    invote_sql_formatter(setup_npm_script("sql-formatter"), snippet_path)
+    if let Ok(path_result) =
+        invoke_sql_formatter(std::process::Command::new("sql-formatter"), snippet_path)
+    {
+        if !path_result.0 {
+            return Ok(path_result);
+        }
+    }
+
+    invoke_sql_formatter(setup_npm_script("sql-formatter"), snippet_path)
 }
 
 #[cfg(test)]
 mod test_sql_formatter {
     use crate::{formatters::setup_snippet, generated::language_to_ext};
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_sql() {
         let input = "SELECT * FROM tbl WHERE foo = 'bar';";
 

diff --git a/src/formatters/sqlfluff.rs b/src/formatters/sqlfluff.rs
@@ -11,7 +11,7 @@ fn set_sqlfluff_args(cmd: &mut std::process::Command, snippet_path: &std::path::
 }
 
 #[inline]
-fn invote_sqlfluff(
+fn invoke_sqlfluff(
     mut cmd: std::process::Command,
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
@@ -24,15 +24,14 @@ fn invote_sqlfluff(
 pub fn format_using_sqlfluff(
     snippet_path: &std::path::Path,
 ) -> Result<(bool, Option<String>), MdsfError> {
-    invote_sqlfluff(std::process::Command::new("sqlfluff"), snippet_path)
+    invoke_sqlfluff(std::process::Command::new("sqlfluff"), snippet_path)
 }
 
 #[cfg(test)]
 mod test_sqlfluff {
     use crate::{formatters::setup_snippet, generated::language_to_ext};
 
     #[test_with::executable(sqlfluff)]
-    #[test]
     fn it_should_format_sql() {
         let input = "SELECT  *                  FROM  tbl
                         WHERE                      foo   = 'bar';         ";

diff --git a/src/formatters/taplo.rs b/src/formatters/taplo.rs
@@ -36,7 +36,7 @@ mod test_taplo {
         generated::language_to_ext,
     };
 
-    #[test]
+    #[test_with::executable(npx)]
     fn it_should_format_toml() {
         let input = "          package         =              \"mdsf\"
   author   = \"Mads Hougesen\"