diff options
Diffstat (limited to 'cli/tsc')
| -rw-r--r-- | cli/tsc/diagnostics.rs | 2 | ||||
| -rw-r--r-- | cli/tsc/mod.rs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cli/tsc/diagnostics.rs b/cli/tsc/diagnostics.rs index 56610106b..2030b5ba2 100644 --- a/cli/tsc/diagnostics.rs +++ b/cli/tsc/diagnostics.rs @@ -298,7 +298,7 @@ impl Diagnostics { { if let Ok(Some(module)) = graph.try_get_prefer_types(&specifier) { if let Some(fast_check_module) = - module.esm().and_then(|m| m.fast_check_module()) + module.js().and_then(|m| m.fast_check_module()) { // todo(dsherret): use a short lived cache to prevent parsing // source maps so often diff --git a/cli/tsc/mod.rs b/cli/tsc/mod.rs index db5d80a1f..18316b750 100644 --- a/cli/tsc/mod.rs +++ b/cli/tsc/mod.rs @@ -492,7 +492,7 @@ fn op_load( }; let maybe_source = if let Some(module) = graph.get(specifier) { match module { - Module::Esm(module) => { + Module::Js(module) => { media_type = module.media_type; let source = module .fast_check_module() @@ -597,7 +597,7 @@ fn op_resolve( let graph = &state.graph; let resolved_dep = graph .get(&referrer) - .and_then(|m| m.esm()) + .and_then(|m| m.js()) .and_then(|m| m.dependencies_prefer_fast_check().get(&specifier)) .and_then(|d| d.maybe_type.ok().or_else(|| d.maybe_code.ok())); @@ -653,7 +653,7 @@ fn resolve_graph_specifier_types( let maybe_module = graph.get(specifier); // follow the types reference directive, which may be pointing at an npm package let maybe_module = match maybe_module { - Some(Module::Esm(module)) => { + Some(Module::Js(module)) => { let maybe_types_dep = module .maybe_types_dependency .as_ref() @@ -668,7 +668,7 @@ fn resolve_graph_specifier_types( // now get the types from the resolved module match maybe_module { - Some(Module::Esm(module)) => { + Some(Module::Js(module)) => { Ok(Some((module.specifier.clone(), module.media_type))) } Some(Module::Json(module)) => { @@ -913,7 +913,7 @@ mod tests { .replace("://", "_") .replace('/', "-"); let source_path = self.fixtures.join(specifier_text); - let response = source_path.read_to_string_if_exists().map(|c| { + let response = source_path.read_to_bytes_if_exists().map(|c| { Some(deno_graph::source::LoadResponse::Module { specifier: specifier.clone(), maybe_headers: None, |