fix: absolute paths in build info (#121)

Closes foundry-rs/foundry#7878

Removes paths stripping logic from solc implementation, instead we now
use `CompilerInput::strip_prefix` and `CompilerOutput::join_all`
directly in `compile_*` functions, and only join output paths after
writing build info.

src/artifacts/mod.rs

@@ -1648,18 +1648,6 @@ impl CompilerOutput {
         self.contracts.extend(other.contracts);
         self.sources.extend(other.sources);
     }
-
-    pub fn join_all(&mut self, root: impl AsRef<Path>) {
-        let root = root.as_ref();
-        self.contracts = std::mem::take(&mut self.contracts)
-            .into_iter()
-            .map(|(path, contracts)| (root.join(path), contracts))
-            .collect();
-        self.sources = std::mem::take(&mut self.sources)
-            .into_iter()
-            .map(|(path, source)| (root.join(path), source))
-            .collect();
-    }
 }
 
 /// A wrapper helper type for the `Contracts` type alias

src/compile/project.rs

@@ -558,15 +558,16 @@ fn compile_sequential<C: Compiler>(
                 input.sources().keys()
             );
 
-            let input = input.with_remappings(paths.remappings.clone());
+            let mut input = input.with_remappings(paths.remappings.clone());
+            input.strip_prefix(paths.root.as_path());
 
             let start = Instant::now();
             report::compiler_spawn(
                 &input.compiler_name(),
                 compiler.version(),
                 actually_dirty.as_slice(),
             );
-            let (input, output) = compiler.compile(input)?;
+            let mut output = compiler.compile(&input)?;
             report::compiler_success(&input.compiler_name(), compiler.version(), &start.elapsed());
             // trace!("compiled input, output has error: {}", output.has_error());
             trace!("received compiler output: {:?}", output.contracts.keys());
@@ -577,6 +578,8 @@ fn compile_sequential<C: Compiler>(
                 aggregated.build_infos.insert(version.clone(), build_info);
             }
 
+            output.join_all(paths.root.as_path());
+
             aggregated.extend(version.clone(), output);
         }
     }
@@ -645,7 +648,8 @@ fn compile_parallel<C: Compiler>(
                 input.sources().keys()
             );
 
-            let input = input.with_remappings(paths.remappings.clone());
+            let mut input = input.with_remappings(paths.remappings.clone());
+            input.strip_prefix(paths.root.as_path());
 
             jobs.push((compiler.clone(), version.clone(), input, actually_dirty));
         }
@@ -677,7 +681,7 @@ fn compile_parallel<C: Compiler>(
                     compiler.version(),
                     actually_dirty.as_slice(),
                 );
-                compiler.compile(input).map(move |(input, output)| {
+                compiler.compile(&input).map(move |output| {
                     report::compiler_success(
                         &input.compiler_name(),
                         compiler.version(),
@@ -690,12 +694,13 @@ fn compile_parallel<C: Compiler>(
     })?;
 
     let mut aggregated = AggregatedCompilerOutput::default();
-    for (version, input, output) in outputs {
+    for (version, input, mut output) in outputs {
         // if configured also create the build info
         if create_build_info {
             let build_info = RawBuildInfo::new(&input, &output, &version)?;
             aggregated.build_infos.insert(version.clone(), build_info);
         }
+        output.join_all(paths.root.as_path());
         aggregated.extend(version, output);
     }
 

src/compilers/mod.rs

@@ -52,6 +52,9 @@ pub trait CompilerInput: Serialize + Send + Sync + Sized {
 
     /// Returns compiler name used by reporters to display output during compilation.
     fn compiler_name(&self) -> String;
+
+    /// Strips given prefix from all paths.
+    fn strip_prefix(&mut self, base: &Path);
 }
 
 /// Parser of the source files which is used to identify imports and version requirements of the
@@ -105,6 +108,18 @@ impl<E> CompilerOutput<E> {
         self.contracts.extend(other.contracts);
         self.sources.extend(other.sources);
     }
+
+    pub fn join_all(&mut self, root: impl AsRef<Path>) {
+        let root = root.as_ref();
+        self.contracts = std::mem::take(&mut self.contracts)
+            .into_iter()
+            .map(|(path, contracts)| (root.join(path), contracts))
+            .collect();
+        self.sources = std::mem::take(&mut self.sources)
+            .into_iter()
+            .map(|(path, source)| (root.join(path), source))
+            .collect();
+    }
 }
 
 impl<E> Default for CompilerOutput<E> {
@@ -132,10 +147,7 @@ pub trait Compiler: Send + Sync + Clone {
     /// Main entrypoint for the compiler. Compiles given input into [CompilerOutput]. Takes
     /// ownership over the input and returns back version with potential modifications made to it.
     /// Returned input is always the one which was seen by the binary.
-    fn compile(
-        &self,
-        input: Self::Input,
-    ) -> Result<(Self::Input, CompilerOutput<Self::CompilationError>)>;
+    fn compile(&self, input: &Self::Input) -> Result<CompilerOutput<Self::CompilationError>>;
 
     /// Returns the version of the compiler.
     fn version(&self) -> &Version;

src/compilers/solc/mod.rs

@@ -20,7 +20,7 @@ use crate::{
 use semver::Version;
 use std::{
     collections::{BTreeMap, BTreeSet},
-    path::PathBuf,
+    path::{Path, PathBuf},
 };
 
 impl Compiler for Solc {
@@ -31,28 +31,16 @@ impl Compiler for Solc {
     type ParsedSource = SolData;
     type Settings = SolcSettings;
 
-    fn compile(
-        &self,
-        mut input: Self::Input,
-    ) -> Result<(Self::Input, CompilerOutput<Self::CompilationError>)> {
-        if let Some(base_path) = self.base_path.clone() {
-            // Strip prefix from all sources to ensure deterministic metadata.
-            input.strip_prefix(base_path);
-        }
-
-        let mut solc_output = self.compile(&input)?;
-
-        if let Some(ref base_path) = self.base_path {
-            solc_output.join_all(base_path);
-        }
+    fn compile(&self, input: &Self::Input) -> Result<CompilerOutput<Self::CompilationError>> {
+        let solc_output = self.compile(&input)?;
 
         let output = CompilerOutput {
             errors: solc_output.errors,
             contracts: solc_output.contracts,
             sources: solc_output.sources,
         };
 
-        Ok((input, output))
+        Ok(output)
     }
 
     fn version(&self) -> &Version {
@@ -123,6 +111,10 @@ impl CompilerInput for SolcInput {
     fn compiler_name(&self) -> String {
         "Solc".to_string()
     }
+
+    fn strip_prefix(&mut self, base: &Path) {
+        self.strip_prefix(base)
+    }
 }
 
 impl CompilerSettings for SolcSettings {

src/compilers/vyper/input.rs

@@ -1,3 +1,5 @@
+use std::path::Path;
+
 use super::settings::VyperSettings;
 use crate::{artifacts::Sources, compilers::CompilerInput};
 use semver::Version;
@@ -24,4 +26,11 @@ impl CompilerInput for VyperInput {
     fn compiler_name(&self) -> String {
         "Vyper".to_string()
     }
+
+    fn strip_prefix(&mut self, base: &Path) {
+        self.sources = std::mem::take(&mut self.sources)
+            .into_iter()
+            .map(|(path, s)| (path.strip_prefix(base).map(Into::into).unwrap_or(path), s))
+            .collect();
+    }
 }

src/compilers/vyper/mod.rs

@@ -150,10 +150,8 @@ impl Compiler for Vyper {
     type ParsedSource = VyperParsedSource;
     type Input = VyperInput;
 
-    fn compile(&self, input: Self::Input) -> Result<(Self::Input, VyperCompilerOutput)> {
-        let output = self.compile(&input)?;
-
-        Ok((input, output))
+    fn compile(&self, input: &Self::Input) -> Result<VyperCompilerOutput> {
+        self.compile(input)
     }
 
     fn version(&self) -> &Version {