finish better error reporting

compiler/src/render.rs

@@ -1,6 +1,6 @@
-use std::{collections::HashMap, num::NonZeroU32, str::FromStr, cell::Ref};
+use std::{cell::Ref, collections::HashMap, num::NonZeroU32, str::FromStr};
 
-use ariadne::{Config, FnCache, Label, Report, ReportKind, Source, Span};
+use ariadne::{Cache, Config, Fmt, FnCache, Label, Report, ReportKind, Source};
 // use ariadne::{Report, ReportKind};
 use fast_image_resize as fr;
 use fr::Resizer;
@@ -11,7 +11,7 @@ use typst::{
     syntax::FileId,
 };
 use wasm_bindgen::Clamped;
-use web_sys::ImageData;
+use web_sys::{console, ImageData};
 
 use crate::file_entry::FileEntry;
 
@@ -76,42 +76,51 @@ pub fn to_image(
     );
 }
 
-// impl Into<()> for FileId {
-
-// }
-
 pub fn format_diagnostic(
     sources: Ref<HashMap<FileId, FileEntry>>,
     diagnostics: &[SourceDiagnostic],
 ) -> String {
+    let config = Config::default().with_color(false).with_tab_width(2);
     let mut bytes = Vec::new();
 
-    let cache = FnCache::new(|id| {
+    let mut cache = FnCache::new(|id: &_| Ok(sources.get(id).unwrap().source().text().to_string()));
-        return sources.get(&id);
-    });
 
     for diagnostic in diagnostics {
         let id = diagnostic.span.id();
         let source = sources.get(&id).unwrap().source();
         let range = source.range(diagnostic.span);
-        let report = Report::build(
+        let mut report = Report::build(
             match diagnostic.severity {
                 Severity::Error => ReportKind::Error,
                 Severity::Warning => ReportKind::Warning,
             },
-            "arst",
+            id,
-            // id.path().to_str().unwrap(),
             range.start,
         )
-        .with_config(Config::default().with_color(false).with_tab_width(2))
+        .with_config(config)
         .with_message(&diagnostic.message)
-        .with_label(Label::new(range))
+        .with_label(Label::new((id, range)));
-        .finish();
+        if !diagnostic.hints.is_empty() {
-        report
+            report.set_help(diagnostic.hints.join("\n"))
-            .write(Source::from(source.text()), &mut bytes)
+        }
-            .unwrap();
+        report.finish().write(&mut cache, &mut bytes).unwrap();
+
         bytes.push(b'\n');
+        for point in &diagnostic.trace {
+            let id = point.span.id();
+            let source = sources.get(&id).unwrap().source();
+            let range = source.range(point.span);
+
+            Report::build(ReportKind::Advice, id, range.start)
+                .with_config(config)
+                .with_message(point.v.to_string())
+                .with_label(Label::new((id, range)))
+                .finish()
+                .write(&mut cache, &mut bytes)
+                .unwrap();
+            bytes.push(b'\n');
+        }
     }
 
-    return String::from_utf8(bytes).unwrap();
+    return String::from_utf8(bytes).unwrap().trim().to_string();
 }

src/typst-canvas-element.ts

@@ -64,8 +64,14 @@ export default class TypstCanvasElement extends HTMLCanvasElement {
                     image =
                         await TypstCanvasElement.compile(this.path, this.source, this.size, this.display, fontSize)
                 } catch (error) {
+                    // For some reason it is uncaught so remove "Uncaught "
+                    error = error.slice(9)
                     console.error(error);
-                    let pre = createEl("pre")//"<pre> </pre>"
+                    let pre = createEl("pre", {
+                        attr: {
+                            style: "white-space: pre;"
+                        }
+                    })//"<pre> </pre>"
                     pre.textContent = error
                     this.outerHTML = pre.outerHTML
                     // this.innerText = error