refactor: move redirect handling into deno_graph (#23444)

5 files changed, 16 insertions, 10 deletions

diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs
index 763022c1f..47841b037 100644
--- a/cli/tools/coverage/mod.rs
+++ b/cli/tools/coverage/mod.rs
@@ -529,7 +529,7 @@ pub async fn cover_files(
       file_fetcher.get_source(&module_specifier)
     } else {
       file_fetcher
-        .fetch_cached(&module_specifier, None, 10)
+        .fetch_cached(&module_specifier, 10)
         .with_context(|| {
           format!("Failed to fetch \"{module_specifier}\" from cache.")
         })?
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs
index 68f7663f4..1ff5623cc 100644
--- a/cli/tools/doc.rs
+++ b/cli/tools/doc.rs
@@ -54,17 +54,17 @@ async fn generate_doc_nodes_for_builtin_types(
       vec![source_file_specifier.clone()],
       &loader,
       deno_graph::BuildOptions {
-        module_analyzer: analyzer,
-        file_system: &NullFileSystem,
-        is_dynamic: false,
         imports: Vec::new(),
+        is_dynamic: false,
+        passthrough_jsr_specifiers: false,
+        workspace_members: &[],
         executor: Default::default(),
+        file_system: &NullFileSystem,
         jsr_url_provider: Default::default(),
-        passthrough_jsr_specifiers: false,
+        module_analyzer: analyzer,
         npm_resolver: None,
         reporter: None,
         resolver: None,
-        workspace_members: &[],
       },
     )
     .await;
diff --git a/cli/tools/repl/mod.rs b/cli/tools/repl/mod.rs
index 80ab2a2d2..03b8e512e 100644
--- a/cli/tools/repl/mod.rs
+++ b/cli/tools/repl/mod.rs
@@ -145,7 +145,7 @@ async fn read_eval_file(
     deno_core::resolve_url_or_path(eval_file, cli_options.initial_cwd())?;
 
   let file = file_fetcher
-    .fetch(&specifier, PermissionsContainer::allow_all())
+    .fetch(&specifier, &PermissionsContainer::allow_all())
     .await?;
 
   Ok(file.into_text_decoded()?.source)
diff --git a/cli/tools/test/mod.rs b/cli/tools/test/mod.rs
index 390a60762..013d8c084 100644
--- a/cli/tools/test/mod.rs
+++ b/cli/tools/test/mod.rs
@@ -1277,7 +1277,7 @@ async fn fetch_inline_files(
   for specifier in specifiers {
     let fetch_permissions = PermissionsContainer::allow_all();
     let file = file_fetcher
-      .fetch(&specifier, fetch_permissions)
+      .fetch(&specifier, &fetch_permissions)
       .await?
       .into_text_decoded()?;
 
@@ -1688,7 +1688,7 @@ async fn fetch_specifiers_with_test_mode(
 
   for (specifier, mode) in &mut specifiers_with_mode {
     let file = file_fetcher
-      .fetch(specifier, PermissionsContainer::allow_all())
+      .fetch(specifier, &PermissionsContainer::allow_all())
       .await?;
 
     let (media_type, _) = file.resolve_media_type_and_charset();
diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs
index 21efc0d8f..b4993565d 100644
--- a/cli/tools/vendor/test.rs
+++ b/cli/tools/vendor/test.rs
@@ -116,7 +116,13 @@ impl Loader for TestLoader {
     specifier: &ModuleSpecifier,
     _options: deno_graph::source::LoadOptions,
   ) -> LoadFuture {
-    let specifier = self.redirects.get(specifier).unwrap_or(specifier);
+    if let Some(redirect) = self.redirects.get(specifier) {
+      return Box::pin(futures::future::ready(Ok(Some(
+        LoadResponse::Redirect {
+          specifier: redirect.clone(),
+        },
+      ))));
+    }
     let result = self.files.get(specifier).map(|result| match result {
       Ok(result) => Ok(LoadResponse::Module {
         specifier: specifier.clone(),