feat(compiler): rework diagnostics to support multiple files

crates/apollo-compiler/Cargo.toml

@@ -18,19 +18,20 @@ edition = "2021"
 
 [dependencies]
 apollo-parser = { path = "../apollo-parser", version = "0.4.0" }
+ariadne = { package = "apollo-ariadne", version = "0.2.0-alpha.0" }
 indexmap = "1.9.2"
 rowan = "0.15.5"
 salsa = "0.16.1"
 ordered-float = { version = "2.10.0", features = ["std"] }
-miette = { version = "5.5.0", features = ["fancy"] }
 thiserror = "1.0.31"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 uuid = { version = "1.1", features = ["serde", "v4", "js"] }
 
 [dev-dependencies]
-expect-test = "1.1"
 anyhow = "1.0"
+expect-test = "1.1"
+miette = "5.0"
 notify = "4.0.0"
 criterion = "0.3.0"
 

crates/apollo-compiler/examples/documents/get_dog_name.graphql

@@ -11,4 +11,5 @@ query getDogName {
       name
     }
   }
-}
+  doesNotExist
+}

crates/apollo-compiler/examples/documents/schema.graphql

@@ -48,4 +48,4 @@ type Cat implements Pet {
 
 union CatOrDog = Cat | Dog
 union DogOrHuman = Dog | Human
-union HumanOrAlien = Human | Alien
+union HumanOrAlien = Human | Alien

crates/apollo-compiler/src/database/ast.rs

@@ -1,7 +1,9 @@
 use apollo_parser::{Parser as ApolloParser, SyntaxTree};
 use rowan::GreenNode;
 
-use crate::{database::inputs::InputDatabase, diagnostics::SyntaxError, ApolloDiagnostic, FileId};
+use crate::database::inputs::InputDatabase;
+use crate::diagnostics::{ApolloDiagnostic, DiagnosticData, Label};
+use crate::FileId;
 
 #[salsa::query_group(AstStorage)]
 pub trait AstDatabase: InputDatabase {
@@ -46,11 +48,17 @@ fn syntax_errors(db: &dyn AstDatabase) -> Vec<ApolloDiagnostic> {
                 .errors()
                 .into_iter()
                 .map(|err| {
-                    ApolloDiagnostic::SyntaxError(SyntaxError {
-                        src: db.source_code(file_id),
-                        span: (err.index(), err.data().len()).into(), // (offset, length of error token)
-                        message: err.message().into(),
-                    })
+                    ApolloDiagnostic::new(
+                        db,
+                        (file_id, err.index(), err.data().len()).into(),
+                        DiagnosticData::SyntaxError {
+                            message: err.message().into(),
+                        },
+                    )
+                    .label(Label::new(
+                        (file_id, err.index(), err.data().len()),
+                        err.message(),
+                    ))
                 })
                 .collect::<Vec<ApolloDiagnostic>>()
         })

crates/apollo-compiler/src/database/document.rs

@@ -258,7 +258,7 @@ pub(crate) fn operation_definition_variables(
         .iter()
         .map(|v| Variable {
             name: v.name().to_owned(),
-            loc: *v.loc(),
+            loc: v.loc(),
         })
         .collect();
     Arc::new(vars)