feat(unstable): record raw coverage into a directory (#8642)

cli/flags.rs

@@ -10,6 +10,7 @@ use log::Level;
 use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::str::FromStr;
+use tempfile::TempDir;
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum DenoSubcommand {
@@ -108,7 +109,7 @@ pub struct Flags {
   pub ca_file: Option<String>,
   pub cached_only: bool,
   pub config_path: Option<String>,
-  pub coverage: bool,
+  pub coverage_dir: Option<String>,
   pub ignore: Vec<PathBuf>,
   pub import_map_path: Option<String>,
   pub inspect: Option<SocketAddr>,
@@ -614,11 +615,23 @@ fn test_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
   let allow_none = matches.is_present("allow-none");
   let quiet = matches.is_present("quiet");
   let filter = matches.value_of("filter").map(String::from);
-  let coverage = matches.is_present("coverage");
 
-  if coverage {
+  flags.coverage_dir = if matches.is_present("coverage") {
-    flags.coverage = true;
+    if let Some(coverage_dir) = matches.value_of("coverage") {
-  }
+      Some(coverage_dir.to_string())
+    } else {
+      Some(
+        TempDir::new()
+          .unwrap()
+          .into_path()
+          .to_str()
+          .unwrap()
+          .to_string(),
+      )
+    }
+  } else {
+    None
+  };
 
   if matches.is_present("script_arg") {
     let script_arg: Vec<String> = matches
@@ -1282,7 +1295,10 @@ fn test_subcommand<'a, 'b>() -> App<'a, 'b> {
     .arg(
       Arg::with_name("coverage")
         .long("coverage")
-        .takes_value(false)
+        .min_values(0)
+        .max_values(1)
+        .require_equals(true)
+        .takes_value(true)
         .requires("unstable")
         .conflicts_with("inspect")
         .conflicts_with("inspect-brk")
@@ -3050,7 +3066,7 @@ mod tests {
   #[test]
   fn test_with_flags() {
     #[rustfmt::skip]
-    let r = flags_from_vec_safe(svec!["deno", "test", "--unstable", "--no-run", "--filter", "- foo", "--coverage", "--allow-net", "--allow-none", "dir1/", "dir2/", "--", "arg1", "arg2"]);
+    let r = flags_from_vec_safe(svec!["deno", "test", "--unstable", "--no-run", "--filter", "- foo", "--coverage=cov", "--allow-net", "--allow-none", "dir1/", "dir2/", "--", "arg1", "arg2"]);
     assert_eq!(
       r.unwrap(),
       Flags {
@@ -3063,7 +3079,7 @@ mod tests {
           include: Some(svec!["dir1/", "dir2/"]),
         },
         unstable: true,
-        coverage: true,
+        coverage_dir: Some("cov".to_string()),
         allow_net: true,
         argv: svec!["arg1", "arg2"],
         ..Flags::default()

cli/main.rs

@@ -116,7 +116,7 @@ fn create_web_worker_callback(
     });
 
     let attach_inspector = program_state.maybe_inspector_server.is_some()
-      || program_state.flags.coverage;
+      || program_state.coverage_dir.is_some();
     let maybe_inspector_server = program_state.maybe_inspector_server.clone();
 
     let module_loader = CliModuleLoader::new_for_worker(program_state.clone());
@@ -192,7 +192,7 @@ pub fn create_main_worker(
 
   let attach_inspector = program_state.maybe_inspector_server.is_some()
     || program_state.flags.repl
-    || program_state.flags.coverage;
+    || program_state.coverage_dir.is_some();
   let maybe_inspector_server = program_state.maybe_inspector_server.clone();
   let should_break_on_first_statement =
     program_state.flags.inspect_brk.is_some();
@@ -1018,16 +1018,23 @@ async fn test_command(
   let mut worker =
     create_main_worker(&program_state, main_module.clone(), permissions);
 
-  let mut maybe_coverage_collector = if flags.coverage {
+  if let Some(ref coverage_dir) = flags.coverage_dir {
-    let session = worker.create_inspector_session();
+    env::set_var("DENO_UNSTABLE_COVERAGE_DIR", coverage_dir);
-    let mut coverage_collector =
+  }
-      tools::coverage::CoverageCollector::new(session);
-    coverage_collector.start_collecting().await?;
 
-    Some(coverage_collector)
+  let mut maybe_coverage_collector =
-  } else {
+    if let Some(ref coverage_dir) = program_state.coverage_dir {
-    None
+      let session = worker.create_inspector_session();
-  };
+
+      let coverage_dir = PathBuf::from(coverage_dir);
+      let mut coverage_collector =
+        tools::coverage::CoverageCollector::new(coverage_dir, session);
+      coverage_collector.start_collecting().await?;
+
+      Some(coverage_collector)
+    } else {
+      None
+    };
 
   let execute_result = worker.execute_module(&main_module).await;
   execute_result?;
@@ -1037,19 +1044,19 @@ async fn test_command(
   worker.run_event_loop().await?;
 
   if let Some(coverage_collector) = maybe_coverage_collector.as_mut() {
-    let coverages = coverage_collector.collect().await?;
     coverage_collector.stop_collecting().await?;
 
-    let filtered_coverages = tools::coverage::filter_script_coverages(
+    // TODO(caspervonb) extract reporting into it's own subcommand.
-      coverages,
+    // For now, we'll only report for the command that passed --coverage as a flag.
-      main_module.as_url().clone(),
+    if flags.coverage_dir.is_some() {
-      test_modules,
+      let mut exclude = test_modules.clone();
-    );
+      let main_module_url = main_module.as_url().to_owned();
-
+      exclude.push(main_module_url);
-    let mut coverage_reporter =
+      tools::coverage::report_coverages(
-      tools::coverage::PrettyCoverageReporter::new(quiet);
+        &coverage_collector.dir,
-    for coverage in filtered_coverages {
+        quiet,
-      coverage_reporter.visit_coverage(&coverage);
+        exclude,
+      )?;
     }
   }
 

cli/program_state.rs

@@ -45,6 +45,7 @@ pub struct ProgramState {
   /// Flags parsed from `argv` contents.
   pub flags: flags::Flags,
   pub dir: deno_dir::DenoDir,
+  pub coverage_dir: Option<String>,
   pub file_fetcher: FileFetcher,
   pub modules:
     Arc<Mutex<HashMap<ModuleSpecifier, Result<ModuleSource, AnyError>>>>,
@@ -105,8 +106,14 @@ impl ProgramState {
       None => None,
     };
 
+    let coverage_dir = flags
+      .coverage_dir
+      .clone()
+      .or_else(|| env::var("DENO_UNSTABLE_COVERAGE_DIR").ok());
+
     let program_state = ProgramState {
       dir,
+      coverage_dir,
       flags,
       file_fetcher,
       modules: Default::default(),

cli/tests/integration_tests.rs

@@ -3310,6 +3310,18 @@ itest!(deno_test_coverage {
   exit_code: 0,
 });
 
+itest!(deno_test_coverage_explicit {
+  args: "test --coverage=.test_coverage --unstable test_coverage.ts",
+  output: "test_coverage.out",
+  exit_code: 0,
+});
+
+itest!(deno_test_run_test_coverage {
+  args: "test --allow-all --coverage --unstable test_run_test_coverage.ts",
+  output: "test_run_test_coverage.out",
+  exit_code: 0,
+});
+
 itest!(deno_lint {
   args: "lint --unstable lint/file1.js lint/file2.ts lint/ignored_file.ts",
   output: "lint/expected.out",

cli/tests/test_coverage.out

@@ -15,11 +15,11 @@ cover [WILDCARD]/cli/tests/subdir/mod1.ts ... 35.714% (5/14)
   11 | export function throwsError() {
   12 |     throw Error("exception from mod1");
   13 | }
-cover [WILDCARD]/cli/tests/subdir/subdir2/mod2.ts ... 62.500% (5/8)
-   5 | export function printHello2() {
-   6 |     printHello();
-   7 | }
 cover [WILDCARD]/cli/tests/subdir/print_hello.ts ... 25.000% (1/4)
    1 | export function printHello() {
    2 |     console.log("Hello");
    3 | }
+cover [WILDCARD]/cli/tests/subdir/subdir2/mod2.ts ... 62.500% (5/8)
+   5 | export function printHello2() {
+   6 |     printHello();
+   7 | }

cli/tests/test_run_test_coverage.out

@@ -0,0 +1,32 @@
+Check [WILDCARD]/$deno$test.ts
+running 1 tests
+test spawn test ... Check [WILDCARD]/$deno$test.ts
+running 1 tests
+test returnsFooSuccess ... ok ([WILDCARD])
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out ([WILDCARD])
+
+ok ([WILDCARD])
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out ([WILDCARD])
+
+cover [WILDCARD]/subdir/mod1.ts ... 35.714% (5/14)
+   2 | export function returnsHi() {
+   3 |     return "Hi";
+   4 | }
+-----|-----
+   8 | export function printHello3() {
+   9 |     printHello2();
+  10 | }
+  11 | export function throwsError() {
+  12 |     throw Error("exception from mod1");
+  13 | }
+cover [WILDCARD]/subdir/print_hello.ts ... 25.000% (1/4)
+   1 | export function printHello() {
+   2 |     console.log("Hello");
+   3 | }
+cover [WILDCARD]/subdir/subdir2/mod2.ts ... 62.500% (5/8)
+   5 | export function printHello2() {
+   6 |     printHello();
+   7 | }
+cover [WILDCARD]/test_coverage.ts ... 100.000% (5/5)

cli/tests/test_run_test_coverage.ts

@@ -0,0 +1,14 @@
+Deno.test("spawn test", async function () {
+  const process = Deno.run({
+    cmd: [
+      Deno.execPath(),
+      "test",
+      "--allow-all",
+      "--unstable",
+      "test_coverage.ts",
+    ],
+  });
+
+  await process.status();
+  process.close();
+});

cli/tools/coverage.rs

@@ -7,14 +7,19 @@ use deno_core::serde_json::json;
 use deno_core::url::Url;
 use deno_runtime::inspector::InspectorSession;
 use serde::Deserialize;
+use serde::Serialize;
+use std::fs;
+use std::path::PathBuf;
+use uuid::Uuid;
 
 pub struct CoverageCollector {
+  pub dir: PathBuf,
   session: Box<InspectorSession>,
 }
 
 impl CoverageCollector {
-  pub fn new(session: Box<InspectorSession>) -> Self {
+  pub fn new(dir: PathBuf, session: Box<InspectorSession>) -> Self {
-    Self { session }
+    Self { dir, session }
   }
 
   pub async fn start_collecting(&mut self) -> Result<(), AnyError> {
@@ -33,7 +38,7 @@ impl CoverageCollector {
     Ok(())
   }
 
-  pub async fn collect(&mut self) -> Result<Vec<Coverage>, AnyError> {
+  pub async fn stop_collecting(&mut self) -> Result<(), AnyError> {
     let result = self
       .session
       .post_message("Profiler.takePreciseCoverage", None)
@@ -42,9 +47,11 @@ impl CoverageCollector {
     let take_coverage_result: TakePreciseCoverageResult =
       serde_json::from_value(result)?;
 
-    let mut coverages: Vec<Coverage> = Vec::new();
+    fs::create_dir_all(&self.dir)?;
-    for script_coverage in take_coverage_result.result {
+
-      let result = self
+    let script_coverages = take_coverage_result.result;
+    for script_coverage in script_coverages {
+      let get_script_source_value = self
         .session
         .post_message(
           "Debugger.getScriptSource",
@@ -55,22 +62,28 @@ impl CoverageCollector {
         .await?;
 
       let get_script_source_result: GetScriptSourceResult =
-        serde_json::from_value(result)?;
+        serde_json::from_value(get_script_source_value)?;
 
-      coverages.push(Coverage {
+      let script_source = get_script_source_result.script_source.clone();
+
+      let coverage = Coverage {
         script_coverage,
-        script_source: get_script_source_result.script_source,
+        script_source,
-      })
+      };
+
+      // TODO(caspervonb) Would be much better to look up the source during the reporting stage
+      // instead of storing it here.
+      // Long term, that's what we should be doing.
+      let filename = format!("{}.json", Uuid::new_v4());
+      let json = serde_json::to_string(&coverage)?;
+      fs::write(self.dir.join(filename), &json)?;
     }
 
-    Ok(coverages)
-  }
-
-  pub async fn stop_collecting(&mut self) -> Result<(), AnyError> {
     self
       .session
       .post_message("Profiler.stopPreciseCoverage", None)
       .await?;
+
     self.session.post_message("Profiler.disable", None).await?;
     self.session.post_message("Debugger.disable", None).await?;
 
@@ -78,7 +91,9 @@ impl CoverageCollector {
   }
 }
 
-#[derive(Debug, Deserialize)]
+// TODO(caspervonb) all of these structs can and should be made private, possibly moved to
+// inspector::protocol.
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CoverageRange {
   pub start_offset: usize,
@@ -86,7 +101,7 @@ pub struct CoverageRange {
   pub count: usize,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FunctionCoverage {
   pub function_name: String,
@@ -94,7 +109,7 @@ pub struct FunctionCoverage {
   pub is_block_coverage: bool,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ScriptCoverage {
   pub script_id: String,
@@ -102,7 +117,7 @@ pub struct ScriptCoverage {
   pub functions: Vec<FunctionCoverage>,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Coverage {
   pub script_coverage: ScriptCoverage,
@@ -132,8 +147,12 @@ impl PrettyCoverageReporter {
     PrettyCoverageReporter { quiet }
   }
 
-  pub fn visit_coverage(&mut self, coverage: &Coverage) {
+  pub fn visit_coverage(
-    let lines = coverage.script_source.lines().collect::<Vec<_>>();
+    &mut self,
+    script_coverage: &ScriptCoverage,
+    script_source: &str,
+  ) {
+    let lines = script_source.lines().collect::<Vec<_>>();
 
     let mut covered_lines: Vec<usize> = Vec::new();
     let mut uncovered_lines: Vec<usize> = Vec::new();
@@ -143,7 +162,7 @@ impl PrettyCoverageReporter {
       let line_end_offset = line_start_offset + line.len();
 
       let mut count = 0;
-      for function in &coverage.script_coverage.functions {
+      for function in &script_coverage.functions {
         for range in &function.ranges {
           if range.start_offset <= line_start_offset
             && range.end_offset >= line_end_offset
@@ -167,7 +186,7 @@ impl PrettyCoverageReporter {
     }
 
     if !self.quiet {
-      print!("cover {} ... ", coverage.script_coverage.url);
+      print!("cover {} ... ", script_coverage.url);
 
       let line_coverage_ratio = covered_lines.len() as f32 / lines.len() as f32;
       let line_coverage = format!(
@@ -212,10 +231,41 @@ impl PrettyCoverageReporter {
   }
 }
 
-pub fn filter_script_coverages(
+fn collect_coverages(dir: &PathBuf) -> Result<Vec<Coverage>, AnyError> {
+  let mut coverages: Vec<Coverage> = Vec::new();
+
+  let entries = fs::read_dir(dir)?;
+  for entry in entries {
+    let json = fs::read_to_string(entry.unwrap().path())?;
+    let coverage: Coverage = serde_json::from_str(&json)?;
+
+    coverages.push(coverage);
+  }
+
+  // TODO(caspervonb) drain_filter would make this cleaner, its nightly at the moment.
+  if coverages.len() > 1 {
+    coverages.sort_by_key(|k| k.script_coverage.url.clone());
+
+    for i in (1..coverages.len() - 1).rev() {
+      if coverages[i].script_coverage.url
+        == coverages[i - 1].script_coverage.url
+      {
+        let current = coverages.remove(i);
+        let previous = &mut coverages[i - 1];
+
+        for function in current.script_coverage.functions {
+          previous.script_coverage.functions.push(function);
+        }
+      }
+    }
+  }
+
+  Ok(coverages)
+}
+
+fn filter_coverages(
   coverages: Vec<Coverage>,
-  test_file_url: Url,
+  exclude: Vec<Url>,
-  test_modules: Vec<Url>,
 ) -> Vec<Coverage> {
   coverages
     .into_iter()
@@ -225,20 +275,16 @@ pub fn filter_script_coverages(
           return false;
         }
 
-        if url == test_file_url {
+        for module_url in &exclude {
-          return false;
+          if &url == module_url {
-        }
-
-        for test_module_url in &test_modules {
-          if &url == test_module_url {
             return false;
           }
         }
 
         if let Ok(path) = url.to_file_path() {
-          for test_module_url in &test_modules {
+          for module_url in &exclude {
-            if let Ok(test_module_path) = test_module_url.to_file_path() {
+            if let Ok(module_path) = module_url.to_file_path() {
-              if path.starts_with(test_module_path.parent().unwrap()) {
+              if path.starts_with(module_path.parent().unwrap()) {
                 return true;
               }
             }
@@ -250,3 +296,21 @@ pub fn filter_script_coverages(
     })
     .collect::<Vec<Coverage>>()
 }
+
+pub fn report_coverages(
+  dir: &PathBuf,
+  quiet: bool,
+  exclude: Vec<Url>,
+) -> Result<(), AnyError> {
+  let coverages = collect_coverages(dir)?;
+  let coverages = filter_coverages(coverages, exclude);
+
+  let mut coverage_reporter = PrettyCoverageReporter::new(quiet);
+  for coverage in coverages {
+    let script_coverage = coverage.script_coverage;
+    let script_source = coverage.script_source;
+    coverage_reporter.visit_coverage(&script_coverage, &script_source);
+  }
+
+  Ok(())
+}

runtime/worker.rs

@@ -87,6 +87,7 @@ impl MainWorker {
     } else {
       None
     };
+
     let should_break_on_first_statement =
       inspector.is_some() && options.should_break_on_first_statement;