Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: do not panic running .d.cts and .d.mts files #14917

Merged
merged 2 commits into from
Jun 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 15 additions & 8 deletions cli/proc_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,8 @@ impl ProcState {
);

let graph_data = self.graph_data.read();
let found = graph_data.follow_redirect(&specifier);
match graph_data.get(&found) {
let found_url = graph_data.follow_redirect(&specifier);
match graph_data.get(&found_url) {
Some(ModuleEntry::Module {
code, media_type, ..
}) => {
Expand All @@ -627,25 +627,32 @@ impl ProcState {
code.to_string()
}
}
MediaType::Dts => "".to_string(),
_ => {
MediaType::Dts | MediaType::Dcts | MediaType::Dmts => "".to_string(),
MediaType::TypeScript
| MediaType::Mts
| MediaType::Cts
| MediaType::Jsx
| MediaType::Tsx => {
let emit_path = self
.dir
.gen_cache
.get_cache_filename_with_extension(&found, "js")
.get_cache_filename_with_extension(&found_url, "js")
.unwrap_or_else(|| {
unreachable!("Unable to get cache filename: {}", &found)
unreachable!("Unable to get cache filename: {}", &found_url)
});
match self.dir.gen_cache.get(&emit_path) {
Ok(b) => String::from_utf8(b).unwrap(),
Err(_) => unreachable!("Unexpected missing emit: {}", found),
Err(_) => unreachable!("Unexpected missing emit: {}\n\nTry reloading with the --reload CLI flag or deleting your DENO_DIR.", found_url),
}
}
MediaType::TsBuildInfo | MediaType::Wasm | MediaType::SourceMap => {
panic!("Unexpected media type {} for {}", media_type, found_url)
}
};
Ok(ModuleSource {
code: code.into_bytes().into_boxed_slice(),
module_url_specified: specifier.to_string(),
module_url_found: found.to_string(),
module_url_found: found_url.to_string(),
module_type: match media_type {
MediaType::Json => ModuleType::Json,
_ => ModuleType::JavaScript,
Expand Down
19 changes: 19 additions & 0 deletions cli/tests/integration/run_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2709,3 +2709,22 @@ itest!(custom_inspect_url {
args: "run custom_inspect_url.js",
output: "custom_inspect_url.js.out",
});

#[test]
fn running_declaration_files() {
let temp_dir = TempDir::new();
let files = vec!["file.d.ts", "file.d.cts", "file.d.mts"];

for file in files {
temp_dir.write(file, "");
let mut deno_cmd = util::deno_cmd_with_deno_dir(&temp_dir);
let output = deno_cmd
.current_dir(temp_dir.path())
.args(["run", file])
.spawn()
.unwrap()
.wait_with_output()
.unwrap();
assert!(output.status.success());
}
}