From 49a3186d26b055e9d4b75edaaaaa8dac7fb7e1ef Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Tue, 19 May 2026 02:58:57 +0200
Subject: [PATCH] Diagnostic conversion

---
 src/builder.rs | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main.rs    |  5 ++--
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 src/builder.rs

diff --git a/src/builder.rs b/src/builder.rs
new file mode 100644
index 0000000..247385d
--- /dev/null
+++ b/src/builder.rs
@@ -0,0 +1,73 @@
+use std::{
+    collections::{HashMap, HashSet},
+    fs,
+    process::{Command, Stdio},
+};
+
+use cargo_metadata::Message;
+use mist_parser::rev_mapper::{MistMap, RustMap, find_mapping, get_mapping};
+
+#[derive(Debug, Clone)]
+pub struct MistDiagnosticMessage {
+    pub message: String,
+    pub src_path: String,
+    pub line: usize,
+    pub column: usize,
+}
+
+#[derive(Debug, Clone)]
+pub enum MistDiagnostic {
+    Error(MistDiagnosticMessage),
+}
+
+pub fn build(mut args: Vec<String>) -> Result<Vec<MistDiagnostic>, Vec<MistDiagnostic>> {
+    args.remove(0);
+    args.insert(1, "--message-format=json".to_string());
+
+    let mut command = Command::new("cargo")
+        .args(args)
+        .stdout(Stdio::piped())
+        .spawn()
+        .unwrap();
+
+    let reader = std::io::BufReader::new(command.stdout.take().unwrap());
+
+    let mut diagnostics = Vec::new();
+
+    let mut mapping: HashMap<String, HashSet<(RustMap, MistMap)>> = HashMap::new();
+
+    for message in cargo_metadata::Message::parse_stream(reader) {
+        match message {
+            Ok(Message::CompilerMessage(msg)) => {
+                let file_name = msg.target.src_path.as_str().to_string().clone();
+
+                let map = mapping
+                    .entry(file_name.clone())
+                    .or_insert_with(|| get_mapping(&fs::read_to_string(file_name).unwrap()));
+
+                for span in msg.message.spans {
+                    let mist_span =
+                        find_mapping(&map, &RustMap(span.line_end, span.column_start)).unwrap();
+
+                    diagnostics.push(MistDiagnostic::Error(MistDiagnosticMessage {
+                        message: span.label.unwrap_or(msg.message.message.clone()),
+                        src_path: span.file_name,
+                        line: mist_span.1.0,
+                        column: mist_span.1.1,
+                    }));
+                }
+            }
+
+            Ok(Message::BuildFinished(finish)) => {
+                if finish.success {
+                    return Ok(diagnostics);
+                } else {
+                    return Err(diagnostics);
+                }
+            }
+            _ => {}
+        }
+    }
+
+    Ok(diagnostics)
+}
diff --git a/src/main.rs b/src/main.rs
index 0532797..db15837 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,6 @@
-use std::process::{self, Command};
+use std::process::{self};
 
+pub mod builder;
 pub mod codegen;
 pub mod transpiler;
 
@@ -14,7 +15,7 @@ fn main() {
     match args[1].as_str() {
         "run" | "build" | "r" | "b" => {
             transpiler::build();
-            Command::new("cargo").args(&args[1..]).status().unwrap();
+            builder::build(args).unwrap();
         }
         "transpile" | "t" => transpiler::build(),
         "version" | "--version" | "-v" => {