diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-07-23 17:34:46 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-23 17:34:46 -0400 |
commit | 6055629ee7f48a4e887392ccac13788aa4008249 (patch) | |
tree | 453a06a5926a19814902ade6259ddc3631a1b181 /cli/args/deno_json.rs | |
parent | f0df54fc70ec1781a3ffec232fefc38cabf39c37 (diff) |
refactor: update to use deno_package_json (#24688)
This is in preparation for extracting out node resolution code from
ext/node (which is something I'm going to do gradually over time).
Uses https://github.com/denoland/deno_package_json
Diffstat (limited to 'cli/args/deno_json.rs')
-rw-r--r-- | cli/args/deno_json.rs | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/cli/args/deno_json.rs b/cli/args/deno_json.rs index 2b3261a0b..cbc33aa0b 100644 --- a/cli/args/deno_json.rs +++ b/cli/args/deno_json.rs @@ -7,6 +7,62 @@ use deno_semver::jsr::JsrDepPackageReq; use deno_semver::jsr::JsrPackageReqReference; use deno_semver::npm::NpmPackageReqReference; +#[cfg(test)] // happens to only be used by the tests at the moment +pub struct DenoConfigFsAdapter<'a>( + pub &'a dyn deno_runtime::deno_fs::FileSystem, +); + +#[cfg(test)] +impl<'a> deno_config::fs::DenoConfigFs for DenoConfigFsAdapter<'a> { + fn read_to_string_lossy( + &self, + path: &std::path::Path, + ) -> Result<String, std::io::Error> { + self + .0 + .read_text_file_lossy_sync(path, None) + .map_err(|err| err.into_io_error()) + } + + fn stat_sync( + &self, + path: &std::path::Path, + ) -> Result<deno_config::fs::FsMetadata, std::io::Error> { + self + .0 + .stat_sync(path) + .map(|stat| deno_config::fs::FsMetadata { + is_file: stat.is_file, + is_directory: stat.is_directory, + is_symlink: stat.is_symlink, + }) + .map_err(|err| err.into_io_error()) + } + + fn read_dir( + &self, + path: &std::path::Path, + ) -> Result<Vec<deno_config::fs::FsDirEntry>, std::io::Error> { + self + .0 + .read_dir_sync(path) + .map_err(|err| err.into_io_error()) + .map(|entries| { + entries + .into_iter() + .map(|e| deno_config::fs::FsDirEntry { + path: path.join(e.name), + metadata: deno_config::fs::FsMetadata { + is_file: e.is_file, + is_directory: e.is_directory, + is_symlink: e.is_symlink, + }, + }) + .collect() + }) + } +} + pub fn deno_json_deps( config: &deno_config::deno_json::ConfigFile, ) -> HashSet<JsrDepPackageReq> { |