mirror of
https://github.com/denoland/deno.git
synced 2024-12-20 22:34:46 -05:00
1d49b3cb0f
This commit adds support for understanding "workpace:^" and "workspace:~" version constraints in npm/pnpm workspaces. This is done by upgrading various crates to their latest versions. Closes https://github.com/denoland/deno/issues/26726 --------- Co-authored-by: David Sherret <dsherret@gmail.com>
192 lines
6 KiB
Rust
192 lines
6 KiB
Rust
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
|
|
use deno_config::workspace::Workspace;
|
|
use deno_core::serde_json;
|
|
use deno_core::url::Url;
|
|
use deno_package_json::PackageJsonDepValue;
|
|
use deno_package_json::PackageJsonDepValueParseError;
|
|
use deno_package_json::PackageJsonDepWorkspaceReq;
|
|
use deno_semver::npm::NpmPackageReqReference;
|
|
use deno_semver::package::PackageReq;
|
|
use deno_semver::VersionReq;
|
|
use thiserror::Error;
|
|
|
|
#[derive(Debug)]
|
|
pub struct InstallNpmRemotePkg {
|
|
pub alias: Option<String>,
|
|
pub base_dir: PathBuf,
|
|
pub req: PackageReq,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct InstallNpmWorkspacePkg {
|
|
pub alias: Option<String>,
|
|
pub target_dir: PathBuf,
|
|
}
|
|
|
|
#[derive(Debug, Error, Clone)]
|
|
#[error("Failed to install '{}'\n at {}", alias, location)]
|
|
pub struct PackageJsonDepValueParseWithLocationError {
|
|
pub location: Url,
|
|
pub alias: String,
|
|
#[source]
|
|
pub source: PackageJsonDepValueParseError,
|
|
}
|
|
|
|
#[derive(Debug, Default)]
|
|
pub struct NpmInstallDepsProvider {
|
|
remote_pkgs: Vec<InstallNpmRemotePkg>,
|
|
workspace_pkgs: Vec<InstallNpmWorkspacePkg>,
|
|
pkg_json_dep_errors: Vec<PackageJsonDepValueParseWithLocationError>,
|
|
}
|
|
|
|
impl NpmInstallDepsProvider {
|
|
pub fn empty() -> Self {
|
|
Self::default()
|
|
}
|
|
|
|
pub fn from_workspace(workspace: &Arc<Workspace>) -> Self {
|
|
// todo(dsherret): estimate capacity?
|
|
let mut workspace_pkgs = Vec::new();
|
|
let mut remote_pkgs = Vec::new();
|
|
let mut pkg_json_dep_errors = Vec::new();
|
|
let workspace_npm_pkgs = workspace.npm_packages();
|
|
|
|
for (_, folder) in workspace.config_folders() {
|
|
// deal with the deno.json first because it takes precedence during resolution
|
|
if let Some(deno_json) = &folder.deno_json {
|
|
// don't bother with externally referenced import maps as users
|
|
// should inline their import map to get this behaviour
|
|
if let Some(serde_json::Value::Object(obj)) = &deno_json.json.imports {
|
|
let mut pkg_pkgs = Vec::with_capacity(obj.len());
|
|
for (_alias, value) in obj {
|
|
let serde_json::Value::String(specifier) = value else {
|
|
continue;
|
|
};
|
|
let Ok(npm_req_ref) = NpmPackageReqReference::from_str(specifier)
|
|
else {
|
|
continue;
|
|
};
|
|
let pkg_req = npm_req_ref.into_inner().req;
|
|
let workspace_pkg = workspace_npm_pkgs
|
|
.iter()
|
|
.find(|pkg| pkg.matches_req(&pkg_req));
|
|
|
|
if let Some(pkg) = workspace_pkg {
|
|
workspace_pkgs.push(InstallNpmWorkspacePkg {
|
|
alias: None,
|
|
target_dir: pkg.pkg_json.dir_path().to_path_buf(),
|
|
});
|
|
} else {
|
|
pkg_pkgs.push(InstallNpmRemotePkg {
|
|
alias: None,
|
|
base_dir: deno_json.dir_path(),
|
|
req: pkg_req,
|
|
});
|
|
}
|
|
}
|
|
|
|
// sort within each package (more like npm resolution)
|
|
pkg_pkgs.sort_by(|a, b| a.req.cmp(&b.req));
|
|
remote_pkgs.extend(pkg_pkgs);
|
|
}
|
|
}
|
|
|
|
if let Some(pkg_json) = &folder.pkg_json {
|
|
let deps = pkg_json.resolve_local_package_json_deps();
|
|
let mut pkg_pkgs = Vec::with_capacity(
|
|
deps.dependencies.len() + deps.dev_dependencies.len(),
|
|
);
|
|
for (alias, dep) in deps
|
|
.dependencies
|
|
.into_iter()
|
|
.chain(deps.dev_dependencies.into_iter())
|
|
{
|
|
let dep = match dep {
|
|
Ok(dep) => dep,
|
|
Err(err) => {
|
|
pkg_json_dep_errors.push(
|
|
PackageJsonDepValueParseWithLocationError {
|
|
location: pkg_json.specifier(),
|
|
alias,
|
|
source: err,
|
|
},
|
|
);
|
|
continue;
|
|
}
|
|
};
|
|
match dep {
|
|
PackageJsonDepValue::Req(pkg_req) => {
|
|
let workspace_pkg = workspace_npm_pkgs.iter().find(|pkg| {
|
|
pkg.matches_req(&pkg_req)
|
|
// do not resolve to the current package
|
|
&& pkg.pkg_json.path != pkg_json.path
|
|
});
|
|
|
|
if let Some(pkg) = workspace_pkg {
|
|
workspace_pkgs.push(InstallNpmWorkspacePkg {
|
|
alias: Some(alias),
|
|
target_dir: pkg.pkg_json.dir_path().to_path_buf(),
|
|
});
|
|
} else {
|
|
pkg_pkgs.push(InstallNpmRemotePkg {
|
|
alias: Some(alias),
|
|
base_dir: pkg_json.dir_path().to_path_buf(),
|
|
req: pkg_req,
|
|
});
|
|
}
|
|
}
|
|
PackageJsonDepValue::Workspace(workspace_version_req) => {
|
|
let version_req = match workspace_version_req {
|
|
PackageJsonDepWorkspaceReq::VersionReq(version_req) => {
|
|
version_req
|
|
}
|
|
PackageJsonDepWorkspaceReq::Tilde
|
|
| PackageJsonDepWorkspaceReq::Caret => {
|
|
VersionReq::parse_from_npm("*").unwrap()
|
|
}
|
|
};
|
|
if let Some(pkg) = workspace_npm_pkgs.iter().find(|pkg| {
|
|
pkg.matches_name_and_version_req(&alias, &version_req)
|
|
}) {
|
|
workspace_pkgs.push(InstallNpmWorkspacePkg {
|
|
alias: Some(alias),
|
|
target_dir: pkg.pkg_json.dir_path().to_path_buf(),
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// sort within each package as npm does
|
|
pkg_pkgs.sort_by(|a, b| a.alias.cmp(&b.alias));
|
|
remote_pkgs.extend(pkg_pkgs);
|
|
}
|
|
}
|
|
|
|
remote_pkgs.shrink_to_fit();
|
|
workspace_pkgs.shrink_to_fit();
|
|
Self {
|
|
remote_pkgs,
|
|
workspace_pkgs,
|
|
pkg_json_dep_errors,
|
|
}
|
|
}
|
|
|
|
pub fn remote_pkgs(&self) -> &[InstallNpmRemotePkg] {
|
|
&self.remote_pkgs
|
|
}
|
|
|
|
pub fn workspace_pkgs(&self) -> &[InstallNpmWorkspacePkg] {
|
|
&self.workspace_pkgs
|
|
}
|
|
|
|
pub fn pkg_json_dep_errors(
|
|
&self,
|
|
) -> &[PackageJsonDepValueParseWithLocationError] {
|
|
&self.pkg_json_dep_errors
|
|
}
|
|
}
|