diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-04-17 15:36:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 15:36:23 -0400 |
| commit | d2d62b6312f9c09f91e26acd0b4d88b3ddcf94cf (patch) | |
| tree | f2f5f0eb14e76e38876b3c219c859405fa664aef /cli/npm | |
| parent | 559a61b879366c01fbbc078c03743cd836189ae7 (diff) | |
refactor(npm): add CliNodeResolver (#18742)
Diffstat (limited to 'cli/npm')
| -rw-r--r-- | cli/npm/mod.rs | 1 | ||||
| -rw-r--r-- | cli/npm/resolution.rs | 4 | ||||
| -rw-r--r-- | cli/npm/resolvers/mod.rs | 10 |
3 files changed, 4 insertions, 11 deletions
diff --git a/cli/npm/mod.rs b/cli/npm/mod.rs index 8433a8f0c..8a38ee079 100644 --- a/cli/npm/mod.rs +++ b/cli/npm/mod.rs @@ -15,3 +15,4 @@ pub use resolution::NpmResolution; pub use resolvers::create_npm_fs_resolver; pub use resolvers::NpmPackageResolver; pub use resolvers::NpmProcessState; +pub use resolvers::RequireNpmPackageResolver; diff --git a/cli/npm/resolution.rs b/cli/npm/resolution.rs index 375191b2d..26fc356ff 100644 --- a/cli/npm/resolution.rs +++ b/cli/npm/resolution.rs @@ -156,12 +156,12 @@ impl NpmResolution { pub fn pkg_req_ref_to_nv_ref( &self, - req_ref: NpmPackageReqReference, + req_ref: &NpmPackageReqReference, ) -> Result<NpmPackageNvReference, PackageReqNotFoundError> { let node_id = self.resolve_pkg_id_from_pkg_req(&req_ref.req)?; Ok(NpmPackageNvReference { nv: node_id.nv, - sub_path: req_ref.sub_path, + sub_path: req_ref.sub_path.clone(), }) } diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs index c8b841b54..5d3eb52b0 100644 --- a/cli/npm/resolvers/mod.rs +++ b/cli/npm/resolvers/mod.rs @@ -23,9 +23,7 @@ use deno_runtime::deno_node::NodeResolutionMode; use deno_runtime::deno_node::PathClean; use deno_runtime::deno_node::RequireNpmResolver; use deno_semver::npm::NpmPackageNv; -use deno_semver::npm::NpmPackageNvReference; use deno_semver::npm::NpmPackageReq; -use deno_semver::npm::NpmPackageReqReference; use global::GlobalNpmPackageResolver; use serde::Deserialize; use serde::Serialize; @@ -87,13 +85,6 @@ impl NpmPackageResolver { self.resolution.resolve_pkg_id_from_pkg_req(req) } - pub fn pkg_req_ref_to_nv_ref( - &self, - req_ref: NpmPackageReqReference, - ) -> Result<NpmPackageNvReference, PackageReqNotFoundError> { - self.resolution.pkg_req_ref_to_nv_ref(req_ref) - } - /// Resolves an npm package folder path from a Deno module. pub fn resolve_package_folder_from_deno_module( &self, @@ -245,6 +236,7 @@ impl NpmPackageResolver { } } +#[derive(Debug)] pub struct RequireNpmPackageResolver(Arc<NpmPackageResolver>); impl RequireNpmResolver for RequireNpmPackageResolver { |