summaryrefslogtreecommitdiff
path: root/ext/node
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2023-06-22 05:50:48 -0400
committerGitHub <noreply@github.com>2023-06-22 11:50:48 +0200
commit1301a03b5141f9275e19c9d2fed64fae03c123eb (patch)
treee764a31284fd2743005bf223c0437bc3f44c29fa /ext/node
parent4e013565866b3a4c02214b392c4aca8a4e5e9a91 (diff)
refactor(npm): remove needless resolve_nv_ref_from_pkg_req_ref on NpmResolver (#19582)
Diffstat (limited to 'ext/node')
-rw-r--r--ext/node/lib.rs7
-rw-r--r--ext/node/resolution.rs8
2 files changed, 6 insertions, 9 deletions
diff --git a/ext/node/lib.rs b/ext/node/lib.rs
index e77b3c089..d144d89ca 100644
--- a/ext/node/lib.rs
+++ b/ext/node/lib.rs
@@ -17,9 +17,7 @@ use deno_fs::sync::MaybeSync;
use deno_npm::resolution::PackageReqNotFoundError;
use deno_npm::NpmPackageId;
use deno_semver::npm::NpmPackageNv;
-use deno_semver::npm::NpmPackageNvReference;
use deno_semver::npm::NpmPackageReq;
-use deno_semver::npm::NpmPackageReqReference;
use once_cell::sync::Lazy;
pub mod analyze;
@@ -93,11 +91,6 @@ pub trait NpmResolver: std::fmt::Debug + MaybeSend + MaybeSync {
req: &NpmPackageReq,
) -> Result<NpmPackageId, PackageReqNotFoundError>;
- fn resolve_nv_ref_from_pkg_req_ref(
- &self,
- req_ref: &NpmPackageReqReference,
- ) -> Result<NpmPackageNvReference, PackageReqNotFoundError>;
-
fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool;
fn in_npm_package_at_path(&self, path: &Path) -> bool {
diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs
index 966491505..6db2a9655 100644
--- a/ext/node/resolution.rs
+++ b/ext/node/resolution.rs
@@ -310,9 +310,13 @@ impl NodeResolver {
mode: NodeResolutionMode,
permissions: &dyn NodePermissions,
) -> Result<Option<NodeResolution>, AnyError> {
- let reference = self
+ let pkg_id = self
.npm_resolver
- .resolve_nv_ref_from_pkg_req_ref(reference)?;
+ .resolve_pkg_id_from_pkg_req(&reference.req)?;
+ let reference = NpmPackageNvReference {
+ nv: pkg_id.nv,
+ sub_path: reference.sub_path.clone(),
+ };
self.resolve_npm_reference(&reference, mode, permissions)
}