summaryrefslogtreecommitdiff
path: root/cli/tools/coverage
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-06-05 11:04:16 -0400
committerGitHub <noreply@github.com>2024-06-05 17:04:16 +0200
commit7ed90a20d04982ae15a52ae2378cbffd4b6839df (patch)
tree3297d6f7227fbf1cf80e17a2a376ef4dfa52e6ad /cli/tools/coverage
parent0544d60012006b1c7799d8b6eafacec9567901ad (diff)
fix: better handling of npm resolution occurring on workers (#24094)
Closes https://github.com/denoland/deno/issues/24063
Diffstat (limited to 'cli/tools/coverage')
-rw-r--r--cli/tools/coverage/mod.rs13
1 files changed, 7 insertions, 6 deletions
diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs
index 030bf425e..6175bd964 100644
--- a/cli/tools/coverage/mod.rs
+++ b/cli/tools/coverage/mod.rs
@@ -25,7 +25,6 @@ use deno_core::serde_json;
use deno_core::sourcemap::SourceMap;
use deno_core::url::Url;
use deno_core::LocalInspectorSession;
-use deno_core::ModuleCodeString;
use regex::Regex;
use std::fs;
use std::fs::File;
@@ -565,7 +564,7 @@ pub async fn cover_files(
| MediaType::Cjs
| MediaType::Mjs
| MediaType::Json => None,
- MediaType::Dts | MediaType::Dmts | MediaType::Dcts => Some(String::new()),
+ MediaType::Dts | MediaType::Dmts | MediaType::Dcts => Some(Vec::new()),
MediaType::TypeScript
| MediaType::Jsx
| MediaType::Mts
@@ -586,11 +585,13 @@ pub async fn cover_files(
unreachable!()
}
};
- let runtime_code: ModuleCodeString = transpiled_code
- .map(|c| c.into())
- .unwrap_or_else(|| original_source.clone().into());
+ let runtime_code: String = match transpiled_code {
+ Some(code) => String::from_utf8(code)
+ .with_context(|| format!("Failed decoding {}", file.specifier))?,
+ None => original_source.to_string(),
+ };
- let source_map = source_map_from_code(&runtime_code);
+ let source_map = source_map_from_code(runtime_code.as_bytes());
let coverage_report = generate_coverage_report(
&script_coverage,
runtime_code.as_str().to_owned(),