feat(unstable/pm): support version contraints in 'deno add' (#22646)

1 files changed, 7 insertions, 12 deletions

diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs
index 276cae0a2..722cd77f6 100644
--- a/cli/lsp/documents.rs
+++ b/cli/lsp/documents.rs
@@ -3,7 +3,6 @@
 use super::cache::calculate_fs_version;
 use super::cache::calculate_fs_version_at_path;
 use super::cache::LSP_DISALLOW_GLOBAL_TO_LOCAL_COPY;
-use super::jsr::JsrResolver;
 use super::language_server::StateNpmSnapshot;
 use super::text::LineIndex;
 use super::tsc;
@@ -15,6 +14,7 @@ use crate::args::ConfigFile;
 use crate::args::JsxImportSourceConfig;
 use crate::cache::FastInsecureHasher;
 use crate::cache::HttpCache;
+use crate::jsr::JsrCacheResolver;
 use crate::lsp::logging::lsp_warn;
 use crate::npm::CliNpmResolver;
 use crate::resolver::CliGraphResolver;
@@ -893,7 +893,7 @@ pub struct Documents {
   /// A resolver that takes into account currently loaded import map and JSX
   /// settings.
   resolver: Arc<CliGraphResolver>,
-  jsr_resolver: Arc<JsrResolver>,
+  jsr_resolver: Arc<JsrCacheResolver>,
   /// The npm package requirements found in npm specifiers.
   npm_specifier_reqs: Arc<Vec<PackageReq>>,
   /// Gets if any document had a node: specifier such that a @types/node package
@@ -928,10 +928,7 @@ impl Documents {
         bare_node_builtins_enabled: false,
         sloppy_imports_resolver: None,
       })),
-      jsr_resolver: Arc::new(JsrResolver::from_cache_and_lockfile(
-        cache.clone(),
-        None,
-      )),
+      jsr_resolver: Arc::new(JsrCacheResolver::new(cache.clone(), None)),
       npm_specifier_reqs: Default::default(),
       has_injected_types_node_package: false,
       redirect_resolver: Arc::new(RedirectResolver::new(cache)),
@@ -1336,7 +1333,7 @@ impl Documents {
     Ok(())
   }
 
-  pub fn get_jsr_resolver(&self) -> &Arc<JsrResolver> {
+  pub fn get_jsr_resolver(&self) -> &Arc<JsrCacheResolver> {
     &self.jsr_resolver
   }
 
@@ -1344,10 +1341,8 @@ impl Documents {
     &mut self,
     lockfile: Option<Arc<Mutex<Lockfile>>>,
   ) {
-    self.jsr_resolver = Arc::new(JsrResolver::from_cache_and_lockfile(
-      self.cache.clone(),
-      lockfile,
-    ));
+    self.jsr_resolver =
+      Arc::new(JsrCacheResolver::new(self.cache.clone(), lockfile));
   }
 
   pub fn update_config(&mut self, options: UpdateDocumentConfigOptions) {
@@ -1452,7 +1447,7 @@ impl Documents {
       // specifier for free.
       sloppy_imports_resolver: None,
     }));
-    self.jsr_resolver = Arc::new(JsrResolver::from_cache_and_lockfile(
+    self.jsr_resolver = Arc::new(JsrCacheResolver::new(
       self.cache.clone(),
       options.maybe_lockfile,
     ));