refactor: extract out FileFetcher to deno_cache_dir

Cargo.toml

@@ -55,7 +55,7 @@ deno_config = { version = "=0.39.3", features = ["workspace", "sync"] }
 deno_lockfile = "=0.23.2"
 deno_media_type = { version = "0.2.0", features = ["module_specifier"] }
 deno_npm = "=0.26.0"
-deno_path_util = "=0.2.1"
+deno_path_util = "=0.2.2"
 deno_permissions = { version = "0.42.0", path = "./runtime/permissions" }
 deno_runtime = { version = "0.191.0", path = "./runtime" }
 deno_semver = "=0.6.1"
@@ -104,7 +104,7 @@ async-trait = "0.1.73"
 base32 = "=0.5.1"
 base64 = "0.21.7"
 bencher = "0.1"
-boxed_error = "0.2.2"
+boxed_error = "0.2.3"
 brotli = "6.0.0"
 bytes = "1.4.0"
 cache_control = "=0.2.0"
@@ -117,8 +117,9 @@ color-print = "0.3.5"
 console_static_text = "=0.8.1"
 dashmap = "5.5.3"
 data-encoding = "2.3.3"
-data-url = "=0.3.0"
-deno_cache_dir = "=0.14.0"
+data-url = "=0.3.1"
+deno_cache_dir = "=0.15.0"
+deno_error = "=0.5.2"
 deno_package_json = { version = "0.2.1", default-features = false }
 deno_unsync = "0.4.2"
 dlopen2 = "0.6.1"

cli/Cargo.toml

@@ -73,6 +73,7 @@ deno_cache_dir.workspace = true
 deno_config.workspace = true
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_doc = { version = "=0.161.2", features = ["rust", "comrak"] }
+deno_error.workspace = true
 deno_graph = { version = "=0.86.3" }
 deno_lint = { version = "=0.68.2", features = ["docs"] }
 deno_lockfile.workspace = true
@@ -93,6 +94,7 @@ anstream = "0.6.14"
 async-trait.workspace = true
 base64.workspace = true
 bincode = "=1.3.3"
+boxed_error.workspace = true
 bytes.workspace = true
 cache_control.workspace = true
 chrono = { workspace = true, features = ["now"] }

cli/args/import_map.rs

@@ -4,21 +4,21 @@ use deno_core::error::AnyError;
 use deno_core::serde_json;
 use deno_core::url::Url;
 
-use crate::file_fetcher::FileFetcher;
+use crate::file_fetcher::CliFileFetcher;
+use crate::file_fetcher::TextDecodedFile;
 
 pub async fn resolve_import_map_value_from_specifier(
   specifier: &Url,
-  file_fetcher: &FileFetcher,
+  file_fetcher: &CliFileFetcher,
 ) -> Result<serde_json::Value, AnyError> {
   if specifier.scheme() == "data" {
     let data_url_text =
       deno_graph::source::RawDataUrl::parse(specifier)?.decode()?;
     Ok(serde_json::from_str(&data_url_text)?)
   } else {
-    let file = file_fetcher
-      .fetch_bypass_permissions(specifier)
-      .await?
-      .into_text_decoded()?;
+    let file = TextDecodedFile::decode(
+      file_fetcher.fetch_bypass_permissions(specifier).await?,
+    )?;
     Ok(serde_json::from_str(&file.source)?)
   }
 }

cli/args/mod.rs

@@ -9,6 +9,7 @@ mod package_json;
 
 use deno_ast::MediaType;
 use deno_ast::SourceMapOption;
+use deno_cache_dir::file_fetcher::CacheSetting;
 use deno_config::deno_json::NodeModulesDirMode;
 use deno_config::workspace::CreateResolverOptions;
 use deno_config::workspace::FolderConfigs;
@@ -27,7 +28,6 @@ use deno_npm::npm_rc::NpmRc;
 use deno_npm::npm_rc::ResolvedNpmRc;
 use deno_npm::resolution::ValidSerializedNpmResolutionSnapshot;
 use deno_npm::NpmSystemInfo;
-use deno_npm_cache::NpmCacheSetting;
 use deno_path_util::normalize_path;
 use deno_semver::npm::NpmPackageReqReference;
 use deno_telemetry::OtelConfig;
@@ -85,7 +85,7 @@ use thiserror::Error;
 
 use crate::cache;
 use crate::cache::DenoDirProvider;
-use crate::file_fetcher::FileFetcher;
+use crate::file_fetcher::CliFileFetcher;
 use crate::util::fs::canonicalize_path_maybe_not_exists;
 use crate::version;
 
@@ -217,52 +217,6 @@ pub fn ts_config_to_transpile_and_emit_options(
   ))
 }
 
-/// Indicates how cached source files should be handled.
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub enum CacheSetting {
-  /// Only the cached files should be used.  Any files not in the cache will
-  /// error.  This is the equivalent of `--cached-only` in the CLI.
-  Only,
-  /// No cached source files should be used, and all files should be reloaded.
-  /// This is the equivalent of `--reload` in the CLI.
-  ReloadAll,
-  /// Only some cached resources should be used.  This is the equivalent of
-  /// `--reload=jsr:@std/http/file-server` or
-  /// `--reload=jsr:@std/http/file-server,jsr:@std/assert/assert-equals`.
-  ReloadSome(Vec<String>),
-  /// The usability of a cached value is determined by analyzing the cached
-  /// headers and other metadata associated with a cached response, reloading
-  /// any cached "non-fresh" cached responses.
-  RespectHeaders,
-  /// The cached source files should be used for local modules.  This is the
-  /// default behavior of the CLI.
-  Use,
-}
-
-impl CacheSetting {
-  pub fn as_npm_cache_setting(&self) -> NpmCacheSetting {
-    match self {
-      CacheSetting::Only => NpmCacheSetting::Only,
-      CacheSetting::ReloadAll => NpmCacheSetting::ReloadAll,
-      CacheSetting::ReloadSome(values) => {
-        if values.iter().any(|v| v == "npm:") {
-          NpmCacheSetting::ReloadAll
-        } else {
-          NpmCacheSetting::ReloadSome {
-            npm_package_names: values
-              .iter()
-              .filter_map(|v| v.strip_prefix("npm:"))
-              .map(|n| n.to_string())
-              .collect(),
-          }
-        }
-      }
-      CacheSetting::RespectHeaders => unreachable!(), // not supported
-      CacheSetting::Use => NpmCacheSetting::Use,
-    }
-  }
-}
-
 pub struct WorkspaceBenchOptions {
   pub filter: Option<String>,
   pub json: bool,
@@ -1091,7 +1045,7 @@ impl CliOptions {
 
   pub async fn create_workspace_resolver(
     &self,
-    file_fetcher: &FileFetcher,
+    file_fetcher: &CliFileFetcher,
     pkg_json_dep_resolution: PackageJsonDepResolution,
   ) -> Result<WorkspaceResolver, AnyError> {
     let overrode_no_import_map: bool = self