lsp: support configurable npm registry

Author: marcushultman

cli/args/config_file.rs

@@ -16,6 +16,7 @@ use deno_core::serde::Serializer;
 use deno_core::serde_json;
 use deno_core::serde_json::json;
 use deno_core::serde_json::Value;
+use deno_core::url::Url;
 use deno_core::ModuleSpecifier;
 use indexmap::IndexMap;
 use std::borrow::Cow;
@@ -664,6 +665,7 @@ pub struct ConfigFileJson {
   pub lock: Option<Value>,
   pub exclude: Option<Value>,
   pub node_modules_dir: Option<bool>,
+  pub npm_registry: Option<String>,
 }
 
 #[derive(Clone, Debug)]
@@ -859,6 +861,14 @@ impl ConfigFile {
     self.json.node_modules_dir
   }
 
+  pub fn to_npm_registry(&self) -> Option<Url> {
+    self
+      .json
+      .npm_registry
+      .as_ref()
+      .and_then(|r| Url::parse(r).ok())
+  }
+
   pub fn to_import_map_value(&self) -> Value {
     let mut value = serde_json::Map::with_capacity(2);
     if let Some(imports) = &self.json.imports {

cli/args/mod.rs

@@ -655,6 +655,13 @@ impl CliOptions {
     &self.initial_cwd
   }
 
+  pub fn maybe_npm_registry(&self) -> Option<Url> {
+    self
+      .maybe_config_file
+      .as_ref()
+      .and_then(|f| f.to_npm_registry())
+  }
+
   pub fn maybe_config_file_specifier(&self) -> Option<ModuleSpecifier> {
     self.maybe_config_file.as_ref().map(|f| f.specifier.clone())
   }

cli/factory.rs

@@ -46,6 +46,7 @@ use crate::worker::HasNodeSpecifierChecker;
 
 use deno_core::error::AnyError;
 use deno_core::parking_lot::Mutex;
+use deno_core::url::Url;
 
 use deno_runtime::deno_fs;
 use deno_runtime::deno_node::analyze::NodeCodeTranslator;
@@ -266,6 +267,13 @@ impl CliFactory {
       .get_or_init(|| self.options.maybe_lockfile())
   }
 
+  fn npm_registry(&self) -> Url {
+    self
+      .options
+      .maybe_npm_registry()
+      .unwrap_or_else(|| CliNpmRegistryApi::default_url().to_owned())
+  }
+
   pub fn npm_cache(&self) -> Result<&Arc<NpmCache>, AnyError> {
     self.services.npm_cache.get_or_try_init(|| {
       Ok(Arc::new(NpmCache::new(
@@ -280,7 +288,7 @@ impl CliFactory {
   pub fn npm_api(&self) -> Result<&Arc<CliNpmRegistryApi>, AnyError> {
     self.services.npm_api.get_or_try_init(|| {
       Ok(Arc::new(CliNpmRegistryApi::new(
-        CliNpmRegistryApi::default_url().to_owned(),
+        self.npm_registry(),
         self.npm_cache()?.clone(),
         self.http_client().clone(),
         self.text_only_progress_bar().clone(),
@@ -317,7 +325,7 @@ impl CliFactory {
           fs.clone(),
           self.npm_cache()?.clone(),
           self.text_only_progress_bar(),
-          CliNpmRegistryApi::default_url().to_owned(),
+          self.npm_registry(),
           npm_resolution.clone(),
           self.options.node_modules_dir_path(),
           self.options.npm_system_info(),
@@ -340,7 +348,7 @@ impl CliFactory {
       self.fs().clone(),
       self.npm_cache()?.clone(),
       self.text_only_progress_bar(),
-      CliNpmRegistryApi::default_url().to_owned(),
+      self.npm_registry(),
       self.npm_resolution().await?.clone(),
       // when an explicit path is provided here, it will create the
       // local node_modules variant of an npm fs resolver

cli/lsp/language_server.rs

@@ -966,12 +966,13 @@ impl Inner {
       return; // no need to do anything
     }
 
-    let registry_url = CliNpmRegistryApi::default_url();
+    let registry_url = self.npm_registry();
+
     let progress_bar = ProgressBar::new(ProgressBarStyle::TextOnly);
     (self.npm.api, self.npm.cache) = create_npm_api_and_cache(
       &deno_dir,
       self.http_client.clone(),
-      registry_url,
+      &registry_url,
       &progress_bar,
     );
     let maybe_snapshot = match self.maybe_lockfile() {
@@ -988,7 +989,7 @@ impl Inner {
     };
     (self.npm.resolver, self.npm.resolution) =
       create_npm_resolver_and_resolution(
-        registry_url,
+        &registry_url,
         progress_bar,
         self.npm.api.clone(),
         self.npm.cache.clone(),
@@ -1218,6 +1219,13 @@ impl Inner {
     self.maybe_config_file_info.as_ref().map(|c| &c.config_file)
   }
 
+  fn npm_registry(&self) -> Url {
+    self
+      .maybe_config_file()
+      .and_then(|f| f.to_npm_registry())
+      .unwrap_or_else(|| CliNpmRegistryApi::default_url().clone())
+  }
+
   fn maybe_lockfile(&self) -> Option<&Arc<Mutex<Lockfile>>> {
     self
       .maybe_config_file_info