From 1301a03b5141f9275e19c9d2fed64fae03c123eb Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Thu, 22 Jun 2023 05:50:48 -0400
Subject: refactor(npm): remove needless resolve_nv_ref_from_pkg_req_ref on
 NpmResolver (#19582)

---
 cli/npm/resolution.rs    | 13 -------------
 cli/npm/resolvers/mod.rs |  9 ---------
 ext/node/lib.rs          |  7 -------
 ext/node/resolution.rs   |  8 ++++++--
 4 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/cli/npm/resolution.rs b/cli/npm/resolution.rs
index c02a992e7..1f4dda1e1 100644
--- a/cli/npm/resolution.rs
+++ b/cli/npm/resolution.rs
@@ -24,9 +24,7 @@ use deno_npm::NpmPackageId;
 use deno_npm::NpmResolutionPackage;
 use deno_npm::NpmSystemInfo;
 use deno_semver::npm::NpmPackageNv;
-use deno_semver::npm::NpmPackageNvReference;
 use deno_semver::npm::NpmPackageReq;
-use deno_semver::npm::NpmPackageReqReference;
 use deno_semver::VersionReq;
 
 use crate::args::Lockfile;
@@ -154,17 +152,6 @@ impl NpmResolution {
     Ok(())
   }
 
-  pub fn resolve_nv_ref_from_pkg_req_ref(
-    &self,
-    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.clone(),
-    })
-  }
-
   pub fn resolve_package_cache_folder_id_from_id(
     &self,
     id: &NpmPackageId,
diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs
index 1b7e8891c..abfe668c3 100644
--- a/cli/npm/resolvers/mod.rs
+++ b/cli/npm/resolvers/mod.rs
@@ -25,9 +25,7 @@ use deno_runtime::deno_node::NodeResolutionMode;
 use deno_runtime::deno_node::NpmResolver;
 use deno_runtime::deno_node::PathClean;
 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;
@@ -275,13 +273,6 @@ impl NpmResolver for CliNpmResolver {
     self.resolution.resolve_pkg_id_from_pkg_req(req)
   }
 
-  fn resolve_nv_ref_from_pkg_req_ref(
-    &self,
-    req_ref: &NpmPackageReqReference,
-  ) -> Result<NpmPackageNvReference, PackageReqNotFoundError> {
-    self.resolution.resolve_nv_ref_from_pkg_req_ref(req_ref)
-  }
-
   fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool {
     self
       .resolve_package_folder_from_specifier(specifier)
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)
   }
 
-- 
cgit v1.2.3