From 4b7c6049ef9d40394eb823859c82cbf8d293430d Mon Sep 17 00:00:00 2001 From: David Sherret Date: Wed, 31 Jan 2024 22:15:22 -0500 Subject: refactor: load bytes in deno_graph (#22212) Upgrades deno_graph to 0.64 where deno_graph is now responsible for turning bytes into a string. This is in preparation for Wasm modules. --- cli/tsc/mod.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cli/tsc/mod.rs') 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, -- cgit v1.2.3