consolidate, cleanup

Author: nathanwhit

cli/lsp/resolver.rs

@@ -190,13 +190,13 @@ impl LspScopeResolver {
         .iter()
         .flat_map(|(name, _)| {
           let mut deps = Vec::with_capacity(2);
+          let Some(req_ref) =
+            NpmPackageReqReference::from_str(&format!("npm:{name}")).ok()
+          else {
+            return vec![];
+          };
           for kind in [NodeResolutionKind::Types, NodeResolutionKind::Execution]
           {
-            let Some(req_ref) =
-              NpmPackageReqReference::from_str(&format!("npm:{name}")).ok()
-            else {
-              continue;
-            };
             let Some(req) = npm_pkg_req_resolver
               .resolve_req_reference(
                 &req_ref,
@@ -517,22 +517,6 @@ impl LspResolver {
     referrer: &ModuleSpecifier,
     resolution_mode: ResolutionMode,
     file_referrer: Option<&ModuleSpecifier>,
-  ) -> Option<(ModuleSpecifier, MediaType)> {
-    self.npm_to_file_url_with_kind(
-      req_ref,
-      referrer,
-      resolution_mode,
-      file_referrer,
-      NodeResolutionKind::Types,
-    )
-  }
-  pub fn npm_to_file_url_with_kind(
-    &self,
-    req_ref: &NpmPackageReqReference,
-    referrer: &ModuleSpecifier,
-    resolution_mode: ResolutionMode,
-    file_referrer: Option<&ModuleSpecifier>,
-    resolution_kind: NodeResolutionKind,
   ) -> Option<(ModuleSpecifier, MediaType)> {
     let resolver = self.get_scope_resolver(file_referrer);
     let npm_pkg_req_resolver = resolver.npm_pkg_req_resolver.as_ref()?;
@@ -542,7 +526,7 @@ impl LspResolver {
           req_ref,
           referrer,
           resolution_mode,
-          resolution_kind,
+          NodeResolutionKind::Types,
         )
         .ok()?
         .into_url()

resolvers/deno/npm/mod.rs

@@ -17,6 +17,7 @@ use node_resolver::errors::PackageNotFoundError;
 use node_resolver::errors::PackageResolveErrorKind;
 use node_resolver::errors::PackageSubpathResolveError;
 use node_resolver::errors::TypesNotFoundError;
+use node_resolver::types_package_name;
 use node_resolver::InNpmPackageChecker;
 use node_resolver::IsBuiltInNodeModuleChecker;
 use node_resolver::NodeResolution;
@@ -26,6 +27,7 @@ use node_resolver::NpmPackageFolderResolver;
 use node_resolver::ResolutionMode;
 use node_resolver::UrlOrPath;
 use node_resolver::UrlOrPathRef;
+
 use sys_traits::FsCanonicalize;
 use sys_traits::FsMetadata;
 use sys_traits::FsRead;
@@ -397,7 +399,7 @@ impl<
               Some(
                 PackageReq::from_str(&format!(
                   "{}@*",
-                  definitely_typed_package_name(&req.name)
+                  types_package_name(&req.name)
                 ))
                 .unwrap(),
               )
@@ -539,10 +541,6 @@ impl<
   }
 }
 
-pub fn definitely_typed_package_name(name: &str) -> String {
-  format!("@types/{}", name.trim_start_matches('@').replace("/", "__"))
-}
-
 /// Attempt to choose the "best" `@types/*` package
 /// if possible. If multiple versions exist, try to match
 /// the major and minor versions of the `@types` package with the
@@ -551,7 +549,7 @@ pub fn find_definitely_typed_package<'a>(
   nv: &'a PackageNv,
   packages: impl IntoIterator<Item = (&'a PackageReq, &'a PackageNv)>,
 ) -> Option<(&PackageReq, &PackageNv)> {
-  let types_name = definitely_typed_package_name(&nv.name);
+  let types_name = types_package_name(&nv.name);
   let mut best_patch = 0;
   let mut highest: Option<(&PackageReq, &PackageNv)> = None;
   let mut best = None;

resolvers/node/lib.rs

@@ -31,6 +31,7 @@ pub use path::UrlOrPath;
 pub use path::UrlOrPathRef;
 pub use resolution::parse_npm_pkg_name;
 pub use resolution::resolve_specifier_into_node_modules;
+pub use resolution::types_package_name;
 pub use resolution::ConditionsFromResolutionMode;
 pub use resolution::NodeResolution;
 pub use resolution::NodeResolutionKind;

resolvers/node/resolution.rs

@@ -2090,7 +2090,7 @@ fn pattern_key_compare(a: &str, b: &str) -> i32 {
 }
 
 /// Gets the corresponding @types package for the provided package name.
-fn types_package_name(package_name: &str) -> String {
+pub fn types_package_name(package_name: &str) -> String {
   debug_assert!(!package_name.starts_with("@types/"));
   // Scoped packages will get two underscores for each slash
   // https://github.com/DefinitelyTyped/DefinitelyTyped/tree/15f1ece08f7b498f4b9a2147c2a46e94416ca777#what-about-scoped-packages