mirror of
https://github.com/denoland/deno.git
synced 2024-11-04 08:54:20 -05:00
3479bc7661
This PR fixes peer dependency resolution to only resolve peers based on the current graph traversal path. Previously, it would resolve a peers by looking at a graph node's ancestors, which is not correct because graph nodes are shared by different resolutions. It also stores more information about peer dependency resolution in the lockfile.
158 lines
4.3 KiB
Rust
158 lines
4.3 KiB
Rust
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use std::collections::HashSet;
|
|
use std::io::ErrorKind;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
|
|
use deno_ast::ModuleSpecifier;
|
|
use deno_core::error::AnyError;
|
|
use deno_core::futures;
|
|
use deno_core::futures::future::BoxFuture;
|
|
use deno_core::url::Url;
|
|
use deno_graph::npm::NpmPackageReq;
|
|
use deno_runtime::deno_node::NodePermissions;
|
|
use deno_runtime::deno_node::NodeResolutionMode;
|
|
|
|
use crate::args::Lockfile;
|
|
use crate::npm::cache::should_sync_download;
|
|
use crate::npm::resolution::NpmResolutionSnapshot;
|
|
use crate::npm::NpmCache;
|
|
use crate::npm::NpmPackageId;
|
|
use crate::npm::NpmResolutionPackage;
|
|
|
|
pub trait InnerNpmPackageResolver: Send + Sync {
|
|
fn resolve_package_folder_from_deno_module(
|
|
&self,
|
|
pkg_req: &NpmPackageReq,
|
|
) -> Result<PathBuf, AnyError>;
|
|
|
|
fn resolve_package_folder_from_package(
|
|
&self,
|
|
name: &str,
|
|
referrer: &ModuleSpecifier,
|
|
mode: NodeResolutionMode,
|
|
) -> Result<PathBuf, AnyError>;
|
|
|
|
fn resolve_package_folder_from_specifier(
|
|
&self,
|
|
specifier: &ModuleSpecifier,
|
|
) -> Result<PathBuf, AnyError>;
|
|
|
|
fn package_size(&self, package_id: &NpmPackageId) -> Result<u64, AnyError>;
|
|
|
|
fn has_packages(&self) -> bool;
|
|
|
|
fn add_package_reqs(
|
|
&self,
|
|
packages: Vec<NpmPackageReq>,
|
|
) -> BoxFuture<'static, Result<(), AnyError>>;
|
|
|
|
fn set_package_reqs(
|
|
&self,
|
|
packages: HashSet<NpmPackageReq>,
|
|
) -> BoxFuture<'static, Result<(), AnyError>>;
|
|
|
|
fn cache_packages(&self) -> BoxFuture<'static, Result<(), AnyError>>;
|
|
|
|
fn ensure_read_permission(
|
|
&self,
|
|
permissions: &mut dyn NodePermissions,
|
|
path: &Path,
|
|
) -> Result<(), AnyError>;
|
|
|
|
fn snapshot(&self) -> NpmResolutionSnapshot;
|
|
|
|
fn lock(&self, lockfile: &mut Lockfile) -> Result<(), AnyError>;
|
|
}
|
|
|
|
/// Caches all the packages in parallel.
|
|
pub async fn cache_packages(
|
|
mut packages: Vec<NpmResolutionPackage>,
|
|
cache: &NpmCache,
|
|
registry_url: &Url,
|
|
) -> Result<(), AnyError> {
|
|
let sync_download = should_sync_download();
|
|
if sync_download {
|
|
// we're running the tests not with --quiet
|
|
// and we want the output to be deterministic
|
|
packages.sort_by(|a, b| a.pkg_id.cmp(&b.pkg_id));
|
|
}
|
|
|
|
let mut handles = Vec::with_capacity(packages.len());
|
|
for package in packages {
|
|
assert_eq!(package.copy_index, 0); // the caller should not provide any of these
|
|
let cache = cache.clone();
|
|
let registry_url = registry_url.clone();
|
|
let handle = tokio::task::spawn(async move {
|
|
cache
|
|
.ensure_package(
|
|
(package.pkg_id.nv.name.as_str(), &package.pkg_id.nv.version),
|
|
&package.dist,
|
|
®istry_url,
|
|
)
|
|
.await
|
|
});
|
|
if sync_download {
|
|
handle.await??;
|
|
} else {
|
|
handles.push(handle);
|
|
}
|
|
}
|
|
let results = futures::future::join_all(handles).await;
|
|
for result in results {
|
|
// surface the first error
|
|
result??;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub fn ensure_registry_read_permission(
|
|
permissions: &mut dyn NodePermissions,
|
|
registry_path: &Path,
|
|
path: &Path,
|
|
) -> Result<(), AnyError> {
|
|
// allow reading if it's in the node_modules
|
|
if path.starts_with(registry_path)
|
|
&& path
|
|
.components()
|
|
.all(|c| !matches!(c, std::path::Component::ParentDir))
|
|
{
|
|
// todo(dsherret): cache this?
|
|
if let Ok(registry_path) = std::fs::canonicalize(registry_path) {
|
|
match std::fs::canonicalize(path) {
|
|
Ok(path) if path.starts_with(registry_path) => {
|
|
return Ok(());
|
|
}
|
|
Err(e) if e.kind() == ErrorKind::NotFound => {
|
|
return Ok(());
|
|
}
|
|
_ => {} // ignore
|
|
}
|
|
}
|
|
}
|
|
|
|
permissions.check_read(path)
|
|
}
|
|
|
|
/// Gets the corresponding @types package for the provided package name.
|
|
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
|
|
format!("@types/{}", package_name.replace('/', "__"))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::types_package_name;
|
|
|
|
#[test]
|
|
fn test_types_package_name() {
|
|
assert_eq!(types_package_name("name"), "@types/name");
|
|
assert_eq!(
|
|
types_package_name("@scoped/package"),
|
|
"@types/@scoped__package"
|
|
);
|
|
}
|
|
}
|