1 files changed, 40 insertions, 53 deletions

diff --git a/cli/tsc/mod.rs b/cli/tsc/mod.rs
index eaa7aba36..57a4a1be8 100644
--- a/cli/tsc/mod.rs
+++ b/cli/tsc/mod.rs
@@ -4,9 +4,8 @@ use crate::args::TsConfig;
 use crate::args::TypeCheckMode;
 use crate::cache::FastInsecureHasher;
 use crate::node;
-use crate::node::node_resolve_npm_reference;
+use crate::node::CliNodeResolver;
 use crate::node::NodeResolution;
-use crate::npm::NpmPackageResolver;
 use crate::util::checksum;
 use crate::util::path::mapped_specifier_for_tsc;
 
@@ -36,7 +35,6 @@ use deno_graph::ModuleGraph;
 use deno_graph::ResolutionResolved;
 use deno_runtime::deno_node::NodeResolutionMode;
 use deno_runtime::permissions::PermissionsContainer;
-use deno_semver::npm::NpmPackageNvReference;
 use deno_semver::npm::NpmPackageReqReference;
 use lsp_types::Url;
 use once_cell::sync::Lazy;
@@ -307,7 +305,7 @@ pub struct Request {
   pub debug: bool,
   pub graph: Arc<ModuleGraph>,
   pub hash_data: u64,
-  pub maybe_npm_resolver: Option<Arc<NpmPackageResolver>>,
+  pub maybe_node_resolver: Option<Arc<CliNodeResolver>>,
   pub maybe_tsbuildinfo: Option<String>,
   /// A vector of strings that represent the root/entry point modules for the
   /// program.
@@ -331,7 +329,7 @@ struct State {
   graph: Arc<ModuleGraph>,
   maybe_tsbuildinfo: Option<String>,
   maybe_response: Option<RespondArgs>,
-  maybe_npm_resolver: Option<Arc<NpmPackageResolver>>,
+  maybe_node_resolver: Option<Arc<CliNodeResolver>>,
   remapped_specifiers: HashMap<String, ModuleSpecifier>,
   root_map: HashMap<String, ModuleSpecifier>,
   current_dir: PathBuf,
@@ -341,7 +339,7 @@ impl State {
   pub fn new(
     graph: Arc<ModuleGraph>,
     hash_data: u64,
-    maybe_npm_resolver: Option<Arc<NpmPackageResolver>>,
+    maybe_node_resolver: Option<Arc<CliNodeResolver>>,
     maybe_tsbuildinfo: Option<String>,
     root_map: HashMap<String, ModuleSpecifier>,
     remapped_specifiers: HashMap<String, ModuleSpecifier>,
@@ -350,7 +348,7 @@ impl State {
     State {
       hash_data,
       graph,
-      maybe_npm_resolver,
+      maybe_node_resolver,
       maybe_tsbuildinfo,
       maybe_response: None,
       remapped_specifiers,
@@ -483,7 +481,7 @@ fn op_load(state: &mut OpState, args: Value) -> Result<Value, AnyError> {
         }
       }
     } else if state
-      .maybe_npm_resolver
+      .maybe_node_resolver
       .as_ref()
       .map(|resolver| resolver.in_npm_package(specifier))
       .unwrap_or(false)
@@ -636,24 +634,26 @@ fn resolve_graph_specifier_types(
       Ok(Some((module.specifier.clone(), module.media_type)))
     }
     Some(Module::Npm(module)) => {
-      if let Some(npm_resolver) = &state.maybe_npm_resolver {
-        resolve_npm_package_reference_types(&module.nv_reference, npm_resolver)
-          .map(Some)
+      if let Some(node_resolver) = &state.maybe_node_resolver {
+        let maybe_resolution = node_resolver.resolve_npm_reference(
+          &module.nv_reference,
+          NodeResolutionMode::Types,
+          &mut PermissionsContainer::allow_all(),
+        )?;
+        Ok(Some(NodeResolution::into_specifier_and_media_type(
+          maybe_resolution,
+        )))
       } else {
         Ok(None)
       }
     }
     Some(Module::External(module)) => {
       // we currently only use "External" for when the module is in an npm package
-      Ok(state.maybe_npm_resolver.as_ref().map(|npm_resolver| {
+      Ok(state.maybe_node_resolver.as_ref().map(|node_resolver| {
         let specifier =
           node::resolve_specifier_into_node_modules(&module.specifier);
         NodeResolution::into_specifier_and_media_type(
-          node::url_to_node_resolution(
-            specifier,
-            &npm_resolver.as_require_npm_resolver(),
-          )
-          .ok(),
+          node_resolver.url_to_node_resolution(specifier).ok(),
         )
       }))
     }
@@ -666,60 +666,47 @@ fn resolve_non_graph_specifier_types(
   referrer: &ModuleSpecifier,
   state: &State,
 ) -> Result<Option<(ModuleSpecifier, MediaType)>, AnyError> {
-  let npm_resolver = match state.maybe_npm_resolver.as_ref() {
-    Some(npm_resolver) => npm_resolver,
+  let node_resolver = match state.maybe_node_resolver.as_ref() {
+    Some(node_resolver) => node_resolver,
     None => return Ok(None), // we only support non-graph types for npm packages
   };
-  if npm_resolver.in_npm_package(referrer) {
+  if node_resolver.in_npm_package(referrer) {
     // we're in an npm package, so use node resolution
     Ok(Some(NodeResolution::into_specifier_and_media_type(
-      node::node_resolve(
-        specifier,
-        referrer,
-        NodeResolutionMode::Types,
-        &npm_resolver.as_require_npm_resolver(),
-        &mut PermissionsContainer::allow_all(),
-      )
-      .ok()
-      .flatten(),
+      node_resolver
+        .resolve(
+          specifier,
+          referrer,
+          NodeResolutionMode::Types,
+          &mut PermissionsContainer::allow_all(),
+        )
+        .ok()
+        .flatten(),
     )))
   } else if let Ok(npm_ref) = NpmPackageReqReference::from_str(specifier) {
     // todo(dsherret): add support for injecting this in the graph so
     // we don't need this special code here.
     // This could occur when resolving npm:@types/node when it is
     // injected and not part of the graph
-    let node_id = npm_resolver.resolve_pkg_id_from_pkg_req(&npm_ref.req)?;
-    let npm_id_ref = NpmPackageNvReference {
-      nv: node_id.nv,
-      sub_path: npm_ref.sub_path,
-    };
-    resolve_npm_package_reference_types(&npm_id_ref, npm_resolver).map(Some)
+    let maybe_resolution = node_resolver.resolve_npm_req_reference(
+      &npm_ref,
+      NodeResolutionMode::Types,
+      &mut PermissionsContainer::allow_all(),
+    )?;
+    Ok(Some(NodeResolution::into_specifier_and_media_type(
+      maybe_resolution,
+    )))
   } else {
     Ok(None)
   }
 }
 
-pub fn resolve_npm_package_reference_types(
-  npm_ref: &NpmPackageNvReference,
-  npm_resolver: &Arc<NpmPackageResolver>,
-) -> Result<(ModuleSpecifier, MediaType), AnyError> {
-  let maybe_resolution = node_resolve_npm_reference(
-    npm_ref,
-    NodeResolutionMode::Types,
-    npm_resolver,
-    &mut PermissionsContainer::allow_all(),
-  )?;
-  Ok(NodeResolution::into_specifier_and_media_type(
-    maybe_resolution,
-  ))
-}
-
 #[op]
 fn op_is_node_file(state: &mut OpState, path: &str) -> bool {
   let state = state.borrow::<State>();
   match ModuleSpecifier::parse(path) {
     Ok(specifier) => state
-      .maybe_npm_resolver
+      .maybe_node_resolver
       .as_ref()
       .map(|r| r.in_npm_package(&specifier))
       .unwrap_or(false),
@@ -783,7 +770,7 @@ pub fn exec(request: Request) -> Result<Response, AnyError> {
       state.put(State::new(
         options.request.graph,
         options.request.hash_data,
-        options.request.maybe_npm_resolver,
+        options.request.maybe_node_resolver,
         options.request.maybe_tsbuildinfo,
         options.root_map,
         options.remapped_specifiers,
@@ -955,7 +942,7 @@ mod tests {
       debug: false,
       graph: Arc::new(graph),
       hash_data,
-      maybe_npm_resolver: None,
+      maybe_node_resolver: None,
       maybe_tsbuildinfo: None,
       root_names: vec![(specifier.clone(), MediaType::TypeScript)],
       check_mode: TypeCheckMode::All,