postprocessors

.github/workflows/rust.yml

@@ -36,6 +36,10 @@ jobs:
         with:
           packages: bc shfmt
           version: 1.0
+      - name: Install bshchk
+        run: |
+          sudo curl https://github.com/b1ek/bshchk/releases/download/1.1/bshchk.linux.amd64 -L -o /usr/bin/bshchk
+          sudo chmod +x /usr/bin/bshchk
       - uses: dtolnay/rust-toolchain@stable
       - name: Cache dependencies installed with cargo
         uses: actions/cache@v4

Cargo.toml

@@ -12,12 +12,13 @@ amber-meta = { path = "meta" }
 chrono = "0.4.38"
 clap = { version = "4.4.18", features = ["derive"] }
 colored = "2.0.0"
+glob = "0.3"
 heraclitus-compiler = "1.8.1"
 include_dir = "0.7.4"
 itertools = "0.13.0"
 similar-string = "1.4.2"
 test-generator = "0.3.1"
-glob = "0.3"
+wildmatch = "2.4.0"
 
 # test dependencies
 [dev-dependencies]

README.md

@@ -4,8 +4,7 @@
 
 # Amber
 
-Programming language that compiles to Bash. It's a high level programming language that makes it easy to create shell scripts. It's particularly well suited for cloud services.  
-If [shfmt](https://github.com/mvdan/sh) it is present in the machine it will be used after the compilation to prettify the Bash code generated.
+Programming language that compiles to Bash. It's a high level programming language that makes it easy to create shell scripts. It's particularly well suited for cloud services.
 
 > [!Warning]
 > This software is not ready for extended usage.

src/compiler.rs

@@ -1,14 +1,15 @@
 extern crate chrono;
 use crate::docs::module::DocumentationModule;
 use crate::modules::block::Block;
-use crate::modules::formatter::BashFormatter;
 use crate::translate::check_all_blocks;
 use crate::translate::module::TranslateModule;
 use crate::utils::{ParserMetadata, TranslateMetadata};
 use crate::{rules, Cli};
+use postprocessor::PostProcessor;
 use chrono::prelude::*;
 use colored::Colorize;
 use heraclitus_compiler::prelude::*;
+use wildmatch::WildMatchPattern;
 use std::env;
 use std::fs;
 use std::fs::File;
@@ -17,6 +18,8 @@ use std::path::PathBuf;
 use std::process::{Command, ExitStatus};
 use std::time::Instant;
 
+pub mod postprocessor;
+
 const NO_CODE_PROVIDED: &str = "No code has been provided to the compiler";
 const AMBER_DEBUG_PARSER: &str = "AMBER_DEBUG_PARSER";
 const AMBER_DEBUG_TIME: &str = "AMBER_DEBUG_TIME";
@@ -164,22 +167,23 @@ impl AmberCompiler {
 
         let mut result = result.join("\n") + "\n";
 
-        if !self.cli_opts.disable_format {
-            if let Some(formatter) = BashFormatter::get_available() {
-                result = formatter.format(result);
-            }
+        let filters = self.cli_opts.no_proc.iter()
+            .map(|x| WildMatchPattern::new(x)).collect();
+
+        let postprocessors = PostProcessor::filter_default(filters);
+
+        for postprocessor in postprocessors {
+            result = postprocessor.execute(result).unwrap_or_else(|_| panic!("Postprocessor {} failed!", postprocessor.name));
         }
 
-        let header = [
-            include_str!("header.sh"),
-            &("# version: ".to_owned() + env!("CARGO_PKG_VERSION").to_string().as_str()),
-            &("# date: ".to_owned()
-                + Local::now()
-                    .format("%Y-%m-%d %H:%M:%S")
-                    .to_string()
-                    .as_str()),
-        ].join("\n");
-        format!("{}\n{}", header, result)
+        let header = include_str!("header.sh")
+            .replace("{{ version }}", env!("CARGO_PKG_VERSION"))
+            .replace("{{ date }}", Local::now()
+                .format("%Y-%m-%d %H:%M:%S")
+                .to_string()
+                .as_str()
+            );
+        format!("{}{}", header, result)
     }
 
     pub fn document(&self, block: Block, meta: ParserMetadata, output: String) {
@@ -264,6 +268,7 @@ impl AmberCompiler {
 
     #[cfg(test)]
     pub fn test_eval(&mut self) -> Result<String, Message> {
+        self.cli_opts.no_proc = vec!["*".into()];
         self.compile().map_or_else(Err, |(_, code)| {
             if let Some(mut command) = Self::find_bash() {
                 let child = command.arg("-c").arg::<&str>(code.as_ref()).output().unwrap();

src/compiler/postprocessor.rs

@@ -0,0 +1,92 @@
+use std::cell::RefCell;
+use std::io::{BufWriter, Write};
+use std::path::PathBuf;
+use std::process::{Command, Stdio};
+use std::rc::Rc;
+
+use itertools::Itertools;
+use wildmatch::WildMatchPattern;
+
+#[derive(Debug, Clone)]
+pub struct PostProcessor {
+    pub name: String,
+    pub bin: PathBuf,
+    command: Rc<RefCell<Command>>,
+}
+
+impl PostProcessor {
+    pub fn new<N: Into<String>, B: Into<PathBuf>>(name: N, bin: B) -> Self {
+        let name: String = name.into();
+        let bin: PathBuf = bin.into();
+        let mut command = Command::new(bin.clone());
+        command.stdin(Stdio::piped());
+        command.stdout(Stdio::piped());
+        command.stderr(Stdio::piped());
+        let command = Rc::new(RefCell::new(command));
+        Self {
+            name,
+            bin,
+            command,
+        }
+    }
+
+    pub fn cmd(&self) -> Rc<RefCell<Command>> {
+        self.command.clone()
+    }
+
+    pub fn is_available(&self) -> bool {
+        match Command::new(self.bin.clone()).spawn() {
+            Ok(mut v) => {
+                v.kill().is_ok()
+            },
+            Err(_) => false
+        }
+    }
+
+    pub fn execute(&self, code: String) -> Result<String, Box<dyn std::error::Error>> {
+        if !self.is_available() { return Ok(code) }
+
+        let mut spawned = self.cmd().borrow_mut().spawn()?;
+
+        // send to stdin
+        if let Some(stdin) = spawned.stdin.as_mut() {
+            let mut writer = BufWriter::new(stdin);
+            writer.write_all(code.as_bytes())?;
+            writer.flush()?;
+        } else {
+            return Err(String::new().into())
+        }
+
+        // read from stdout
+        let res = spawned.wait_with_output()?;
+        Ok(String::from_utf8(res.stdout)?)
+    }
+
+    pub fn get_default() -> Vec<Self> {
+        let mut postprocessors = Vec::new();
+
+        let shfmt = PostProcessor::new("shfmt", "/usr/bin/shfmt");
+        shfmt.cmd().borrow_mut().arg("-i").arg("4");
+        shfmt.cmd().borrow_mut().arg("-ln").arg("bash");
+        postprocessors.push(shfmt);
+
+        let bshchk = PostProcessor::new("bshchk", "/usr/bin/bshchk");
+        bshchk.cmd().borrow_mut().arg("--ignore-shebang");
+        postprocessors.push(bshchk);
+
+        postprocessors
+    }
+
+    pub fn filter_default(filters: Vec<WildMatchPattern<'*', '?'>>) -> Vec<Self> {
+        let default = Self::get_default();
+
+        default
+            .iter()
+            .filter(|x| {
+                filters.iter()  
+                    .all(|xx| !xx.matches(&x.name))
+            })
+            .cloned()
+            .collect_vec()
+    }
+}

src/header.sh

@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-# Written in [Amber](https://amber-lang.com/)
+# Written in [Amber](https://amber-lang.com/)
+# version: {{ version }}
+# date: {{ date }}

src/main.rs

@@ -36,10 +36,13 @@ pub struct Cli {
     /// (OUTPUT is dir instead, default: `docs/` if missing it will generate the folder)
     #[arg(long)]
     docs: bool,
-
-    /// Don't format the output file
-    #[arg(long)]
-    disable_format: bool,
+
+    /// Disable a postprocessor
+    /// Available postprocessors: shfmt, bshchk
+    /// To select multiple, pass this argument multiple times with different values.
+    /// This argument also supports a wilcard match, like "*" or "s*mt"
+    #[arg(long, verbatim_doc_comment)]
+    no_proc: Vec<String>,
 
     /// Minify the resulting code
     #[arg(long)]

src/modules/mod.rs

@@ -11,7 +11,6 @@ pub mod types;
 pub mod imports;
 pub mod main;
 pub mod builtin;
-pub mod formatter;
 
 #[macro_export]
 macro_rules! handle_types {

src/tests/cli.rs

@@ -25,7 +25,8 @@ fn bash_error_exit_code() -> Result<(), Box<dyn std::error::Error>> {
 
     // Changes locale to default to prevent locale-specific error messages.
     cmd.env("LC_ALL", "C")
-        .arg("--disable-format")
+        .arg("--no-proc")
+        .arg("*")
         .arg(file.path());
 
     cmd.assert()