Updates switch to dowload berry from npm

Author: bgotink

packages/zpm-switch/src/cache.rs

@@ -2,13 +2,12 @@ use std::{future::Future, io::Write};
 
 use serde::{Deserialize, Serialize};
 use zpm_parsers::JsonDocument;
-use zpm_semver::{Version, VersionRc};
-use zpm_utils::{DataType, Hash64, Path, ToFileString, ToHumanString, Unit, is_terminal};
-use zpm_utils::eco_vec;
+use zpm_semver::{Range, VersionRc};
+use zpm_utils::{DataType, FromFileString, Hash64, Path, ToFileString, ToHumanString, Unit, is_terminal};
 
 use crate::errors::Error;
 
-pub const CACHE_VERSION: usize = 1;
+pub const CACHE_VERSION: usize = 2;
 
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -26,18 +25,17 @@ fn get_npm_registry_server() -> String {
 impl CacheKey {
     pub fn to_npm_url(&self) -> Option<String> {
         if self.version.rc.as_ref().map_or(true, |rc| !rc.starts_with(&[VersionRc::String("git".into())])) {
-            // Older RC versions (<6.0.0-rc.9) are not available in npm
-            let first_npm_release = Version::new_from_components(
-                6,
-                0,
-                0,
-                Some(eco_vec![VersionRc::String("rc".into()), VersionRc::Number(9)]),
-            );
-
-            if self.version >= first_npm_release {
+            // zpm is available on npm since 6.0.0-rc.9
+            if Range::from_file_string(">=6.0.0-rc.9").unwrap().check_ignore_rc(&self.version) {
                 let registry = get_npm_registry_server();
                 return Some(format!("{}/@yarnpkg/yarn-{}/-/yarn-{}-{}.tgz", registry, self.platform, self.platform, self.version.to_file_string()));
             }
+
+            // berry has been published to npm since 2.4.1
+            if Range::from_file_string(">=2.4.1 <6.0.0-0").unwrap().check_ignore_rc(&self.version) {
+                let registry = get_npm_registry_server();
+                return Some(format!("{}/@yarnpkg/cli-bin/-/cli-bin-{}.tgz", registry, self.version.to_file_string()));
+            }
         }
 
         None

packages/zpm-switch/src/install.rs

@@ -119,10 +119,10 @@ async fn install_node_js_from_url(source: &cache::CacheKey) -> Result<Command, E
     Ok(command)
 }
 
-async fn install_node_js_from_package(source: &cache::CacheKey, main_file: &Path) -> Result<Command, Error> {
+async fn install_node_js_from_package(source: &cache::CacheKey, url: &str, main_file: &Path) -> Result<Command, Error> {
     let cache_path = cache::ensure(source, |p| async move {
         let compressed_data
-            = fetch(&source.to_url()).await?;
+            = fetch(url).await?;
 
         tokio::task::spawn_blocking(move || -> Result<(), Error> {
             let data
@@ -153,6 +153,18 @@ async fn install_node_js_from_package(source: &cache::CacheKey, main_file: &Path
     Ok(command)
 }
 
+async fn install_berry(source: &cache:: CacheKey) -> Result<Command, Error> {
+    if let Some(npm_url) = source.to_npm_url() {
+        install_node_js_from_package(source, &npm_url, &Path::from_str("bin/yarn.js").unwrap()).await
+    } else {
+        install_node_js_from_url(source).await
+    }
+}
+
+async fn install_yarnpkg_legacy(source: &cache:: CacheKey) -> Result<Command, Error> {
+    install_node_js_from_package(source, &source.to_url(), &Path::from_str("bin/yarn.js").unwrap()).await
+}
+
 pub async fn install_package_manager(package_manager: &VersionPackageManagerReference) -> Result<Command, Error> {
     let version_platform = cache::CacheKey {
         cache_version: cache::CACHE_VERSION,
@@ -165,11 +177,11 @@ pub async fn install_package_manager(package_manager: &VersionPackageManagerRefe
     }
 
     if zpm_semver::Range::from_file_string(">=2.0.0-0").unwrap().check_ignore_rc(&package_manager.version) {
-        return install_node_js_from_url(&version_platform).await;
+        return install_berry(&version_platform).await;
     }
 
     if zpm_semver::Range::from_file_string(">=0.0.0-0").unwrap().check_ignore_rc(&package_manager.version) {
-        return install_node_js_from_package(&version_platform, &Path::from_str("bin/yarn.js").unwrap()).await;
+        return install_yarnpkg_legacy(&version_platform).await;
     }
 
     unreachable!()

packages/zpm/src/http_npm.rs

@@ -62,6 +62,21 @@ macro_rules! scope_registry_setting {
                 }
             }
 
+            let host = url::Url::parse($registry).ok()?.origin().ascii_serialization();
+            if let Some(host_settings) = $config.settings.npm_hosts.get(&host) {
+                if let Some(value) = host_settings.$field.value.as_ref() {
+                    return Some(value);
+                }
+            }
+
+            // Also try with trailing slash (for normalization)
+            let host_with_slash = format!("{}/", host);
+            if let Some(host_settings) = $config.settings.npm_hosts.get(&host_with_slash) {
+                if let Some(value) = host_settings.$field.value.as_ref() {
+                    return Some(value);
+                }
+            }
+
             None
         })()
     }