From 6e34f6a7cca11ba245f0b55c3b956b59948b37b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 17 Jul 2020 15:50:17 +0200 Subject: fix: providing empty source code for missing compiled files (#6760) This commit adds a fallback mechanism for absent compiled source file. Because imported type declaration files are not emitted by TS compiler and their imports are not elided users often hit "No such file or directory" error. With this commit in such situation an empty source file will be provided to V8 with a warning to the user suggesting using "import type"/ "export type" syntax instead. --- cli/global_state.rs | 27 ++++++++++++++++----------- cli/tests/integration_tests.rs | 5 +++++ cli/tests/ts_type_only_import.d.ts | 3 +++ cli/tests/ts_type_only_import.ts | 1 + cli/tests/ts_type_only_import.ts.out | 4 ++++ 5 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 cli/tests/ts_type_only_import.d.ts create mode 100644 cli/tests/ts_type_only_import.ts create mode 100644 cli/tests/ts_type_only_import.ts.out (limited to 'cli') diff --git a/cli/global_state.rs b/cli/global_state.rs index 3290be25f..8e5808c90 100644 --- a/cli/global_state.rs +++ b/cli/global_state.rs @@ -9,7 +9,6 @@ use crate::module_graph::ModuleGraphFile; use crate::module_graph::ModuleGraphLoader; use crate::msg; use crate::msg::MediaType; -use crate::op_error::OpError; use crate::permissions::Permissions; use crate::state::exit_unstable; use crate::tsc::CompiledModule; @@ -236,16 +235,22 @@ impl GlobalState { }; let compiled_module = if was_compiled { - state1 - .ts_compiler - .get_compiled_module(&out.url) - .map_err(|e| { - let msg = e.to_string(); - OpError::other(format!( - "Failed to get compiled source code of {}.\nReason: {}", - out.url, msg - )) - })? + match state1.ts_compiler.get_compiled_module(&out.url) { + Ok(module) => module, + Err(e) => { + let msg = format!( + "Failed to get compiled source code of \"{}\".\nReason: {}\n\ + If the source file provides only type exports, prefer to use \"import type\" or \"export type\" syntax instead.", + out.url, e.to_string() + ); + info!("{} {}", crate::colors::yellow("Warning"), msg); + + CompiledModule { + code: "".to_string(), + name: out.url.to_string(), + } + } + } } else { CompiledModule { code: String::from_utf8(out.source_code.clone())?, diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs index f832358ff..baed26523 100644 --- a/cli/tests/integration_tests.rs +++ b/cli/tests/integration_tests.rs @@ -1972,6 +1972,11 @@ itest!(ts_decorators { output: "ts_decorators.ts.out", }); +itest!(ts_type_only_import { + args: "run --reload ts_type_only_import.ts", + output: "ts_type_only_import.ts.out", +}); + itest!(swc_syntax_error { args: "run --reload swc_syntax_error.ts", output: "swc_syntax_error.ts.out", diff --git a/cli/tests/ts_type_only_import.d.ts b/cli/tests/ts_type_only_import.d.ts new file mode 100644 index 000000000..d48e4b48a --- /dev/null +++ b/cli/tests/ts_type_only_import.d.ts @@ -0,0 +1,3 @@ +export interface HelloWorld { + a: string; +} diff --git a/cli/tests/ts_type_only_import.ts b/cli/tests/ts_type_only_import.ts new file mode 100644 index 000000000..53e114373 --- /dev/null +++ b/cli/tests/ts_type_only_import.ts @@ -0,0 +1 @@ +export * from "./ts_type_only_import.d.ts"; diff --git a/cli/tests/ts_type_only_import.ts.out b/cli/tests/ts_type_only_import.ts.out new file mode 100644 index 000000000..d7120966f --- /dev/null +++ b/cli/tests/ts_type_only_import.ts.out @@ -0,0 +1,4 @@ +Check [WILDCARD]ts_type_only_import.ts +Warning Failed to get compiled source code of "[WILDCARD]ts_type_only_import.d.ts". +Reason: [WILDCARD] (os error 2) +If the source file provides only type exports, prefer to use "import type" or "export type" syntax instead. -- cgit v1.2.3