diff --git a/cli/graph_util.rs b/cli/graph_util.rs index e619f8a12d..cfd79d4916 100644 --- a/cli/graph_util.rs +++ b/cli/graph_util.rs @@ -3,6 +3,7 @@ use crate::colors; use crate::emit::TsTypeLib; use crate::errors::get_error_class_name; +use crate::npm::resolve_npm_package_reqs; use crate::npm::NpmPackageReference; use crate::npm::NpmPackageReq; @@ -50,7 +51,7 @@ pub enum ModuleEntry { #[derive(Debug, Default)] pub struct GraphData { modules: HashMap, - npm_packages: HashSet, + npm_packages: Vec, /// Map of first known referrer locations for each module. Used to enhance /// error messages. referrer_map: HashMap>, @@ -76,16 +77,20 @@ impl GraphData { self.graph_imports.push(graph_import.clone()) } + let mut has_npm_specifier_in_graph = false; + for (specifier, result) in graph.specifiers() { + if specifier.scheme() == "npm" + && NpmPackageReference::from_specifier(&specifier).is_ok() + { + has_npm_specifier_in_graph = true; + continue; + } + if !reload && self.modules.contains_key(&specifier) { continue; } - if specifier.scheme() == "npm" { - if let Ok(reference) = NpmPackageReference::from_specifier(&specifier) { - self.npm_packages.insert(reference.req); - continue; - } - } + if let Some(found) = graph.redirects.get(&specifier) { let module_entry = ModuleEntry::Redirect(found.clone()); self.modules.insert(specifier.clone(), module_entry); @@ -139,6 +144,10 @@ impl GraphData { } } } + + if has_npm_specifier_in_graph { + self.npm_packages.extend(resolve_npm_package_reqs(graph)); + } } pub fn entries( @@ -147,9 +156,10 @@ impl GraphData { self.modules.iter() } - /// Gets the unique npm package requirements from all the encountered graphs. - pub fn npm_package_reqs(&self) -> Vec { - self.npm_packages.iter().cloned().collect() + /// Gets the npm package requirements from all the encountered graphs + /// in the order that they should be resolved. + pub fn npm_package_reqs(&self) -> &Vec { + &self.npm_packages } /// Walk dependencies from `roots` and return every encountered specifier. @@ -220,7 +230,9 @@ impl GraphData { for (dep_specifier, dep) in dependencies.iter().rev() { // todo(dsherret): ideally there would be a way to skip external dependencies // in the graph here rather than specifically npm package references - if NpmPackageReference::from_str(dep_specifier).is_ok() { + if dep_specifier.starts_with("npm:") + && NpmPackageReference::from_str(dep_specifier).is_ok() + { continue; } diff --git a/cli/npm/cache.rs b/cli/npm/cache.rs index 2d983fa06e..e5ce3dfdd6 100644 --- a/cli/npm/cache.rs +++ b/cli/npm/cache.rs @@ -25,7 +25,7 @@ use super::tarball::verify_and_extract_tarball; /// For some of the tests, we want downloading of packages /// to be deterministic so that the output is always the same pub fn should_sync_download() -> bool { - std::env::var("DENO_UNSTABLE_NPM_SYNC_DOWNLOAD") == Ok("1".to_string()) + std::env::var("DENO_UNSTABLE_NPM_SYNC_DOWNLOAD").is_ok() } const NPM_PACKAGE_SYNC_LOCK_FILENAME: &str = ".deno_sync_lock"; diff --git a/cli/npm/mod.rs b/cli/npm/mod.rs index 86ed8572c2..8c34643451 100644 --- a/cli/npm/mod.rs +++ b/cli/npm/mod.rs @@ -14,6 +14,7 @@ pub use cache::NpmCache; pub use registry::NpmPackageVersionDistInfo; pub use registry::NpmRegistryApi; pub use registry::RealNpmRegistryApi; +pub use resolution::resolve_npm_package_reqs; pub use resolution::NpmPackageId; pub use resolution::NpmPackageReference; pub use resolution::NpmPackageReq; diff --git a/cli/npm/resolution/mod.rs b/cli/npm/resolution/mod.rs index 381e350c9f..4a8c2e8e17 100644 --- a/cli/npm/resolution/mod.rs +++ b/cli/npm/resolution/mod.rs @@ -3,10 +3,7 @@ use std::collections::HashMap; use std::collections::HashSet; -use deno_ast::ModuleSpecifier; -use deno_core::anyhow::bail; use deno_core::anyhow::Context; -use deno_core::error::generic_error; use deno_core::error::AnyError; use deno_core::futures; use deno_core::parking_lot::RwLock; @@ -23,14 +20,17 @@ use super::cache::NpmPackageCacheFolderId; use super::registry::NpmPackageVersionDistInfo; use super::registry::RealNpmRegistryApi; use super::semver::NpmVersion; -use super::semver::SpecifierVersionReq; use super::NpmRegistryApi; mod graph; mod snapshot; +mod specifier; use graph::Graph; pub use snapshot::NpmResolutionSnapshot; +pub use specifier::resolve_npm_package_reqs; +pub use specifier::NpmPackageReference; +pub use specifier::NpmPackageReq; /// The version matcher used for npm schemed urls is more strict than /// the one used by npm packages and so we represent either via a trait. @@ -40,137 +40,6 @@ pub trait NpmVersionMatcher { fn version_text(&self) -> String; } -#[derive(Clone, Debug, Default, PartialEq, Eq)] -pub struct NpmPackageReference { - pub req: NpmPackageReq, - pub sub_path: Option, -} - -impl NpmPackageReference { - pub fn from_specifier( - specifier: &ModuleSpecifier, - ) -> Result { - Self::from_str(specifier.as_str()) - } - - pub fn from_str(specifier: &str) -> Result { - let specifier = match specifier.strip_prefix("npm:") { - Some(s) => s, - None => { - bail!("Not an npm specifier: {}", specifier); - } - }; - let parts = specifier.split('/').collect::>(); - let name_part_len = if specifier.starts_with('@') { 2 } else { 1 }; - if parts.len() < name_part_len { - return Err(generic_error(format!("Not a valid package: {}", specifier))); - } - let name_parts = &parts[0..name_part_len]; - let last_name_part = &name_parts[name_part_len - 1]; - let (name, version_req) = if let Some(at_index) = last_name_part.rfind('@') - { - let version = &last_name_part[at_index + 1..]; - let last_name_part = &last_name_part[..at_index]; - let version_req = SpecifierVersionReq::parse(version) - .with_context(|| "Invalid version requirement.")?; - let name = if name_part_len == 1 { - last_name_part.to_string() - } else { - format!("{}/{}", name_parts[0], last_name_part) - }; - (name, Some(version_req)) - } else { - (name_parts.join("/"), None) - }; - let sub_path = if parts.len() == name_parts.len() { - None - } else { - Some(parts[name_part_len..].join("/")) - }; - - if let Some(sub_path) = &sub_path { - if let Some(at_index) = sub_path.rfind('@') { - let (new_sub_path, version) = sub_path.split_at(at_index); - let msg = format!( - "Invalid package specifier 'npm:{}/{}'. Did you mean to write 'npm:{}{}/{}'?", - name, sub_path, name, version, new_sub_path - ); - return Err(generic_error(msg)); - } - } - - Ok(NpmPackageReference { - req: NpmPackageReq { name, version_req }, - sub_path, - }) - } -} - -impl std::fmt::Display for NpmPackageReference { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - if let Some(sub_path) = &self.sub_path { - write!(f, "npm:{}/{}", self.req, sub_path) - } else { - write!(f, "npm:{}", self.req) - } - } -} - -#[derive( - Clone, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize, -)] -pub struct NpmPackageReq { - pub name: String, - pub version_req: Option, -} - -impl std::fmt::Display for NpmPackageReq { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match &self.version_req { - Some(req) => write!(f, "{}@{}", self.name, req), - None => write!(f, "{}", self.name), - } - } -} - -impl NpmPackageReq { - pub fn from_str(text: &str) -> Result { - // probably should do something more targetted in the future - let reference = NpmPackageReference::from_str(&format!("npm:{}", text))?; - Ok(reference.req) - } -} - -impl NpmVersionMatcher for NpmPackageReq { - fn tag(&self) -> Option<&str> { - match &self.version_req { - Some(version_req) => version_req.tag(), - None => Some("latest"), - } - } - - fn matches(&self, version: &NpmVersion) -> bool { - match self.version_req.as_ref() { - Some(req) => { - assert_eq!(self.tag(), None); - match req.range() { - Some(range) => range.satisfies(version), - None => false, - } - } - None => version.pre.is_empty(), - } - } - - fn version_text(&self) -> String { - self - .version_req - .as_ref() - .map(|v| format!("{}", v)) - .unwrap_or_else(|| "non-prerelease".to_string()) - } -} - #[derive( Debug, Clone, PartialOrd, Ord, PartialEq, Eq, Hash, Serialize, Deserialize, )] @@ -413,15 +282,12 @@ impl NpmResolution { async fn add_package_reqs_to_snapshot( &self, - mut package_reqs: Vec, + package_reqs: Vec, snapshot: NpmResolutionSnapshot, ) -> Result { // convert the snapshot to a traversable graph let mut graph = Graph::from_snapshot(snapshot); - // multiple packages are resolved in alphabetical order - package_reqs.sort_by(|a, b| a.name.cmp(&b.name)); - // go over the top level package names first, then down the // tree one level at a time through all the branches let mut unresolved_tasks = Vec::with_capacity(package_reqs.len()); @@ -457,6 +323,8 @@ impl NpmResolution { let mut resolver = GraphDependencyResolver::new(&mut graph, &self.api); + // These package_reqs should already be sorted in the order they should + // be resolved in. for package_req in package_reqs { // avoid loading the info if this is already in the graph if !resolver.has_package_req(&package_req) { @@ -549,105 +417,6 @@ impl NpmResolution { mod tests { use super::*; - #[test] - fn parse_npm_package_ref() { - assert_eq!( - NpmPackageReference::from_str("npm:@package/test").unwrap(), - NpmPackageReference { - req: NpmPackageReq { - name: "@package/test".to_string(), - version_req: None, - }, - sub_path: None, - } - ); - - assert_eq!( - NpmPackageReference::from_str("npm:@package/test@1").unwrap(), - NpmPackageReference { - req: NpmPackageReq { - name: "@package/test".to_string(), - version_req: Some(SpecifierVersionReq::parse("1").unwrap()), - }, - sub_path: None, - } - ); - - assert_eq!( - NpmPackageReference::from_str("npm:@package/test@~1.1/sub_path").unwrap(), - NpmPackageReference { - req: NpmPackageReq { - name: "@package/test".to_string(), - version_req: Some(SpecifierVersionReq::parse("~1.1").unwrap()), - }, - sub_path: Some("sub_path".to_string()), - } - ); - - assert_eq!( - NpmPackageReference::from_str("npm:@package/test/sub_path").unwrap(), - NpmPackageReference { - req: NpmPackageReq { - name: "@package/test".to_string(), - version_req: None, - }, - sub_path: Some("sub_path".to_string()), - } - ); - - assert_eq!( - NpmPackageReference::from_str("npm:test").unwrap(), - NpmPackageReference { - req: NpmPackageReq { - name: "test".to_string(), - version_req: None, - }, - sub_path: None, - } - ); - - assert_eq!( - NpmPackageReference::from_str("npm:test@^1.2").unwrap(), - NpmPackageReference { - req: NpmPackageReq { - name: "test".to_string(), - version_req: Some(SpecifierVersionReq::parse("^1.2").unwrap()), - }, - sub_path: None, - } - ); - - assert_eq!( - NpmPackageReference::from_str("npm:test@~1.1/sub_path").unwrap(), - NpmPackageReference { - req: NpmPackageReq { - name: "test".to_string(), - version_req: Some(SpecifierVersionReq::parse("~1.1").unwrap()), - }, - sub_path: Some("sub_path".to_string()), - } - ); - - assert_eq!( - NpmPackageReference::from_str("npm:@package/test/sub_path").unwrap(), - NpmPackageReference { - req: NpmPackageReq { - name: "@package/test".to_string(), - version_req: None, - }, - sub_path: Some("sub_path".to_string()), - } - ); - - assert_eq!( - NpmPackageReference::from_str("npm:@package") - .err() - .unwrap() - .to_string(), - "Not a valid package: @package" - ); - } - #[test] fn serialize_npm_package_id() { let id = NpmPackageId { diff --git a/cli/npm/resolution/specifier.rs b/cli/npm/resolution/specifier.rs new file mode 100644 index 0000000000..77f4f0bf3c --- /dev/null +++ b/cli/npm/resolution/specifier.rs @@ -0,0 +1,881 @@ +// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. + +use std::cmp::Ordering; +use std::collections::HashMap; +use std::collections::HashSet; +use std::collections::VecDeque; + +use deno_ast::ModuleSpecifier; +use deno_core::anyhow::Context; +use deno_core::error::generic_error; +use deno_core::error::AnyError; +use deno_graph::ModuleGraph; +use deno_graph::Resolved; +use serde::Deserialize; +use serde::Serialize; + +use super::super::semver::NpmVersion; +use super::super::semver::SpecifierVersionReq; +use super::NpmVersionMatcher; + +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub struct NpmPackageReference { + pub req: NpmPackageReq, + pub sub_path: Option, +} + +impl NpmPackageReference { + pub fn from_specifier( + specifier: &ModuleSpecifier, + ) -> Result { + Self::from_str(specifier.as_str()) + } + + pub fn from_str(specifier: &str) -> Result { + let specifier = match specifier.strip_prefix("npm:") { + Some(s) => s, + None => { + return Err(generic_error(format!( + "Not an npm specifier: {}", + specifier + ))); + } + }; + let parts = specifier.split('/').collect::>(); + let name_part_len = if specifier.starts_with('@') { 2 } else { 1 }; + if parts.len() < name_part_len { + return Err(generic_error(format!("Not a valid package: {}", specifier))); + } + let name_parts = &parts[0..name_part_len]; + let last_name_part = &name_parts[name_part_len - 1]; + let (name, version_req) = if let Some(at_index) = last_name_part.rfind('@') + { + let version = &last_name_part[at_index + 1..]; + let last_name_part = &last_name_part[..at_index]; + let version_req = SpecifierVersionReq::parse(version) + .with_context(|| "Invalid version requirement.")?; + let name = if name_part_len == 1 { + last_name_part.to_string() + } else { + format!("{}/{}", name_parts[0], last_name_part) + }; + (name, Some(version_req)) + } else { + (name_parts.join("/"), None) + }; + let sub_path = if parts.len() == name_parts.len() { + None + } else { + Some(parts[name_part_len..].join("/")) + }; + + if let Some(sub_path) = &sub_path { + if let Some(at_index) = sub_path.rfind('@') { + let (new_sub_path, version) = sub_path.split_at(at_index); + let msg = format!( + "Invalid package specifier 'npm:{}/{}'. Did you mean to write 'npm:{}{}/{}'?", + name, sub_path, name, version, new_sub_path + ); + return Err(generic_error(msg)); + } + } + + Ok(NpmPackageReference { + req: NpmPackageReq { name, version_req }, + sub_path, + }) + } +} + +impl std::fmt::Display for NpmPackageReference { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + if let Some(sub_path) = &self.sub_path { + write!(f, "npm:{}/{}", self.req, sub_path) + } else { + write!(f, "npm:{}", self.req) + } + } +} + +#[derive( + Clone, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize, +)] +pub struct NpmPackageReq { + pub name: String, + pub version_req: Option, +} + +impl std::fmt::Display for NpmPackageReq { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match &self.version_req { + Some(req) => write!(f, "{}@{}", self.name, req), + None => write!(f, "{}", self.name), + } + } +} + +impl NpmPackageReq { + pub fn from_str(text: &str) -> Result { + // probably should do something more targetted in the future + let reference = NpmPackageReference::from_str(&format!("npm:{}", text))?; + Ok(reference.req) + } +} + +impl NpmVersionMatcher for NpmPackageReq { + fn tag(&self) -> Option<&str> { + match &self.version_req { + Some(version_req) => version_req.tag(), + None => Some("latest"), + } + } + + fn matches(&self, version: &NpmVersion) -> bool { + match self.version_req.as_ref() { + Some(req) => { + assert_eq!(self.tag(), None); + match req.range() { + Some(range) => range.satisfies(version), + None => false, + } + } + None => version.pre.is_empty(), + } + } + + fn version_text(&self) -> String { + self + .version_req + .as_ref() + .map(|v| format!("{}", v)) + .unwrap_or_else(|| "non-prerelease".to_string()) + } +} + +/// Resolves the npm package requirements from the graph attempting. The order +/// returned is the order they should be resolved in. +/// +/// This function will analyze the module graph for parent-most folder +/// specifiers of all modules, then group npm specifiers together as found in +/// those descendant modules and return them in the order found spreading out +/// from the root of the graph. +/// +/// For example, given the following module graph: +/// +/// file:///dev/local_module_a/mod.ts +/// ├── npm:package-a@1 +/// ├─┬ https://deno.land/x/module_d/mod.ts +/// │ └─┬ https://deno.land/x/module_d/other.ts +/// │ └── npm:package-a@3 +/// ├─┬ file:///dev/local_module_a/other.ts +/// │ └── npm:package-b@2 +/// ├─┬ file:///dev/local_module_b/mod.ts +/// │ └── npm:package-b@2 +/// └─┬ https://deno.land/x/module_a/mod.ts +/// ├── npm:package-a@4 +/// ├── npm:package-c@5 +/// ├─┬ https://deno.land/x/module_c/sub_folder/mod.ts +/// │ ├── https://deno.land/x/module_c/mod.ts +/// │ ├─┬ https://deno.land/x/module_d/sub_folder/mod.ts +/// │ │ └── npm:package-other@2 +/// │ └── npm:package-c@5 +/// └── https://deno.land/x/module_b/mod.ts +/// +/// The graph above would be grouped down to the topmost specifier folders like +/// so and npm specifiers under each path would be resolved for that group +/// prioritizing file specifiers and sorting by end folder name alphabetically: +/// +/// file:///dev/local_module_a/ +/// ├── file:///dev/local_module_b/ +/// ├─┬ https://deno.land/x/module_a/ +/// │ ├── https://deno.land/x/module_b/ +/// │ └─┬ https://deno.land/x/module_c/ +/// │ └── https://deno.land/x/module_d/ +/// └── https://deno.land/x/module_d/ +/// +/// Then it would resolve the npm specifiers in each of those groups according +/// to that tree going by tree depth. +pub fn resolve_npm_package_reqs(graph: &ModuleGraph) -> Vec { + fn analyze_module( + module: &deno_graph::Module, + graph: &ModuleGraph, + specifier_graph: &mut SpecifierTree, + seen: &mut HashSet, + ) { + if !seen.insert(module.specifier.clone()) { + return; // already visited + } + + let parent_specifier = get_parent_path_specifier(&module.specifier); + let leaf = specifier_graph.get_leaf(&parent_specifier); + + let mut specifiers = Vec::with_capacity(module.dependencies.len() * 2 + 1); + let maybe_types = module.maybe_types_dependency.as_ref().map(|(_, r)| r); + if let Some(Resolved::Ok { specifier, .. }) = &maybe_types { + specifiers.push(specifier); + } + for dep in module.dependencies.values() { + #[allow(clippy::manual_flatten)] + for resolved in [&dep.maybe_code, &dep.maybe_type] { + if let Resolved::Ok { specifier, .. } = resolved { + specifiers.push(specifier); + } + } + } + // fill this leaf's information + for specifier in &specifiers { + if specifier.scheme() == "npm" { + // this will error elsewhere if not the case + if let Ok(npm_ref) = NpmPackageReference::from_specifier(specifier) { + leaf.reqs.insert(npm_ref.req); + } + } else if !specifier.as_str().starts_with(&parent_specifier.as_str()) { + leaf + .dependencies + .insert(get_parent_path_specifier(specifier)); + } + } + + // now visit all the dependencies + for specifier in &specifiers { + if let Some(module) = graph.get(specifier) { + analyze_module(module, graph, specifier_graph, seen); + } + } + } + + let mut seen = HashSet::new(); + let mut specifier_graph = SpecifierTree::default(); + for (root, _) in graph.roots.iter() { + if let Some(module) = graph.get(root) { + analyze_module(module, graph, &mut specifier_graph, &mut seen); + } + } + + let mut seen = HashSet::new(); + let mut pending_specifiers = VecDeque::new(); + let mut result = Vec::new(); + + for (specifier, _) in &graph.roots { + match NpmPackageReference::from_specifier(specifier) { + Ok(npm_ref) => result.push(npm_ref.req), + Err(_) => { + pending_specifiers.push_back(get_parent_path_specifier(specifier)) + } + } + } + + while let Some(specifier) = pending_specifiers.pop_front() { + let leaf = specifier_graph.get_leaf(&specifier); + if !seen.insert(leaf.specifier.clone()) { + continue; // already seen + } + + let reqs = std::mem::take(&mut leaf.reqs); + let mut reqs = reqs.into_iter().collect::>(); + reqs.sort_by(cmp_package_req); + result.extend(reqs); + + let mut deps = std::mem::take(&mut leaf.dependencies) + .into_iter() + .collect::>(); + deps.sort_by(cmp_folder_specifiers); + + for dep in deps { + pending_specifiers.push_back(dep); + } + } + + result +} + +fn get_parent_path_specifier(specifier: &ModuleSpecifier) -> ModuleSpecifier { + let mut parent_specifier = specifier.clone(); + parent_specifier.set_query(None); + parent_specifier.set_fragment(None); + // remove the last path part, but keep the trailing slash + let mut path_parts = parent_specifier.path().split('/').collect::>(); + if path_parts[path_parts.len() - 1].is_empty() { + path_parts.pop(); + } + let path_parts_len = path_parts.len(); // make borrow checker happy for some reason + if path_parts_len > 0 { + path_parts[path_parts_len - 1] = ""; + } + parent_specifier.set_path(&path_parts.join("/")); + parent_specifier +} + +#[derive(Debug)] +enum SpecifierTreeNode { + Parent(SpecifierTreeParentNode), + Leaf(SpecifierTreeLeafNode), +} + +impl SpecifierTreeNode { + pub fn mut_to_leaf(&mut self) { + if let SpecifierTreeNode::Parent(node) = self { + let node = std::mem::replace( + node, + SpecifierTreeParentNode { + specifier: node.specifier.clone(), + dependencies: Default::default(), + }, + ); + *self = SpecifierTreeNode::Leaf(node.into_leaf()); + } + } +} + +#[derive(Debug)] +struct SpecifierTreeParentNode { + specifier: ModuleSpecifier, + dependencies: HashMap, +} + +impl SpecifierTreeParentNode { + pub fn into_leaf(self) -> SpecifierTreeLeafNode { + fn fill_new_leaf( + deps: HashMap, + new_leaf: &mut SpecifierTreeLeafNode, + ) { + for node in deps.into_values() { + match node { + SpecifierTreeNode::Parent(node) => { + fill_new_leaf(node.dependencies, new_leaf) + } + SpecifierTreeNode::Leaf(leaf) => { + for dep in leaf.dependencies { + // don't insert if the dependency is found within the new leaf + if !dep.as_str().starts_with(new_leaf.specifier.as_str()) { + new_leaf.dependencies.insert(dep); + } + } + new_leaf.reqs.extend(leaf.reqs); + } + } + } + } + + let mut new_leaf = SpecifierTreeLeafNode { + specifier: self.specifier, + reqs: Default::default(), + dependencies: Default::default(), + }; + fill_new_leaf(self.dependencies, &mut new_leaf); + new_leaf + } +} + +#[derive(Debug)] +struct SpecifierTreeLeafNode { + specifier: ModuleSpecifier, + reqs: HashSet, + dependencies: HashSet, +} + +#[derive(Default)] +struct SpecifierTree { + root_nodes: HashMap, +} + +impl SpecifierTree { + pub fn get_leaf( + &mut self, + specifier: &ModuleSpecifier, + ) -> &mut SpecifierTreeLeafNode { + let root_specifier = { + let mut specifier = specifier.clone(); + specifier.set_path(""); + specifier + }; + let root_node = self + .root_nodes + .entry(root_specifier.clone()) + .or_insert_with(|| { + SpecifierTreeNode::Parent(SpecifierTreeParentNode { + specifier: root_specifier.clone(), + dependencies: Default::default(), + }) + }); + let mut current_node = root_node; + if !matches!(specifier.path(), "" | "/") { + let mut current_parts = Vec::new(); + let path = specifier.path(); + for part in path[1..path.len() - 1].split('/') { + current_parts.push(part); + match current_node { + SpecifierTreeNode::Leaf(leaf) => return leaf, + SpecifierTreeNode::Parent(node) => { + current_node = node + .dependencies + .entry(part.to_string()) + .or_insert_with(|| { + SpecifierTreeNode::Parent(SpecifierTreeParentNode { + specifier: { + let mut specifier = root_specifier.clone(); + specifier.set_path(¤t_parts.join("/")); + specifier + }, + dependencies: Default::default(), + }) + }); + } + } + } + } + current_node.mut_to_leaf(); + match current_node { + SpecifierTreeNode::Leaf(leaf) => leaf, + _ => unreachable!(), + } + } +} + +// prefer file: specifiers, then sort by folder name, then by specifier +fn cmp_folder_specifiers(a: &ModuleSpecifier, b: &ModuleSpecifier) -> Ordering { + fn order_folder_name(path_a: &str, path_b: &str) -> Option { + let path_a = path_a.trim_end_matches('/'); + let path_b = path_b.trim_end_matches('/'); + match path_a.rfind('/') { + Some(a_index) => match path_b.rfind('/') { + Some(b_index) => match path_a[a_index..].cmp(&path_b[b_index..]) { + Ordering::Equal => None, + ordering => Some(ordering), + }, + None => None, + }, + None => None, + } + } + + fn order_specifiers(a: &ModuleSpecifier, b: &ModuleSpecifier) -> Ordering { + match order_folder_name(a.path(), b.path()) { + Some(ordering) => ordering, + None => a.as_str().cmp(b.as_str()), // fallback to just comparing the entire url + } + } + + if a.scheme() == "file" { + if b.scheme() == "file" { + order_specifiers(a, b) + } else { + Ordering::Less + } + } else if b.scheme() == "file" { + Ordering::Greater + } else { + order_specifiers(a, b) + } +} + +// Sort the package requirements alphabetically then the version +// requirement in a way that will lead to the least number of +// duplicate packages (so sort None last since it's `*`), but +// mostly to create some determinism around how these are resolved. +fn cmp_package_req(a: &NpmPackageReq, b: &NpmPackageReq) -> Ordering { + fn cmp_specifier_version_req( + a: &SpecifierVersionReq, + b: &SpecifierVersionReq, + ) -> Ordering { + match a.tag() { + Some(a_tag) => match b.tag() { + Some(b_tag) => b_tag.cmp(a_tag), // sort descending + None => Ordering::Less, // prefer a since tag + }, + None => { + match b.tag() { + Some(_) => Ordering::Greater, // prefer b since tag + None => { + // At this point, just sort by text descending. + // We could maybe be a bit smarter here in the future. + b.to_string().cmp(&a.to_string()) + } + } + } + } + } + + match a.name.cmp(&b.name) { + Ordering::Equal => { + match &b.version_req { + Some(b_req) => { + match &a.version_req { + Some(a_req) => cmp_specifier_version_req(a_req, b_req), + None => Ordering::Greater, // prefer b, since a is * + } + } + None => Ordering::Less, // prefer a, since b is * + } + } + ordering => ordering, + } +} + +#[cfg(test)] +mod tests { + use deno_graph::ModuleKind; + + use super::*; + + #[test] + fn parse_npm_package_ref() { + assert_eq!( + NpmPackageReference::from_str("npm:@package/test").unwrap(), + NpmPackageReference { + req: NpmPackageReq { + name: "@package/test".to_string(), + version_req: None, + }, + sub_path: None, + } + ); + + assert_eq!( + NpmPackageReference::from_str("npm:@package/test@1").unwrap(), + NpmPackageReference { + req: NpmPackageReq { + name: "@package/test".to_string(), + version_req: Some(SpecifierVersionReq::parse("1").unwrap()), + }, + sub_path: None, + } + ); + + assert_eq!( + NpmPackageReference::from_str("npm:@package/test@~1.1/sub_path").unwrap(), + NpmPackageReference { + req: NpmPackageReq { + name: "@package/test".to_string(), + version_req: Some(SpecifierVersionReq::parse("~1.1").unwrap()), + }, + sub_path: Some("sub_path".to_string()), + } + ); + + assert_eq!( + NpmPackageReference::from_str("npm:@package/test/sub_path").unwrap(), + NpmPackageReference { + req: NpmPackageReq { + name: "@package/test".to_string(), + version_req: None, + }, + sub_path: Some("sub_path".to_string()), + } + ); + + assert_eq!( + NpmPackageReference::from_str("npm:test").unwrap(), + NpmPackageReference { + req: NpmPackageReq { + name: "test".to_string(), + version_req: None, + }, + sub_path: None, + } + ); + + assert_eq!( + NpmPackageReference::from_str("npm:test@^1.2").unwrap(), + NpmPackageReference { + req: NpmPackageReq { + name: "test".to_string(), + version_req: Some(SpecifierVersionReq::parse("^1.2").unwrap()), + }, + sub_path: None, + } + ); + + assert_eq!( + NpmPackageReference::from_str("npm:test@~1.1/sub_path").unwrap(), + NpmPackageReference { + req: NpmPackageReq { + name: "test".to_string(), + version_req: Some(SpecifierVersionReq::parse("~1.1").unwrap()), + }, + sub_path: Some("sub_path".to_string()), + } + ); + + assert_eq!( + NpmPackageReference::from_str("npm:@package/test/sub_path").unwrap(), + NpmPackageReference { + req: NpmPackageReq { + name: "@package/test".to_string(), + version_req: None, + }, + sub_path: Some("sub_path".to_string()), + } + ); + + assert_eq!( + NpmPackageReference::from_str("npm:@package") + .err() + .unwrap() + .to_string(), + "Not a valid package: @package" + ); + } + + #[test] + fn sorting_folder_specifiers() { + fn cmp(a: &str, b: &str) -> Ordering { + let a = ModuleSpecifier::parse(a).unwrap(); + let b = ModuleSpecifier::parse(b).unwrap(); + cmp_folder_specifiers(&a, &b) + } + + // prefer file urls + assert_eq!( + cmp("file:///test/", "https://deno.land/x/module/"), + Ordering::Less + ); + assert_eq!( + cmp("https://deno.land/x/module/", "file:///test/"), + Ordering::Greater + ); + + // sort by folder name + assert_eq!( + cmp( + "https://deno.land/x/module_a/", + "https://deno.land/x/module_b/" + ), + Ordering::Less + ); + assert_eq!( + cmp( + "https://deno.land/x/module_b/", + "https://deno.land/x/module_a/" + ), + Ordering::Greater + ); + assert_eq!( + cmp( + "https://deno.land/x/module_a/", + "https://deno.land/std/module_b/" + ), + Ordering::Less + ); + assert_eq!( + cmp( + "https://deno.land/std/module_b/", + "https://deno.land/x/module_a/" + ), + Ordering::Greater + ); + + // by specifier, since folder names match + assert_eq!( + cmp( + "https://deno.land/std/module_a/", + "https://deno.land/x/module_a/" + ), + Ordering::Less + ); + } + + #[test] + fn sorting_package_reqs() { + fn cmp_req(a: &str, b: &str) -> Ordering { + let a = NpmPackageReq::from_str(a).unwrap(); + let b = NpmPackageReq::from_str(b).unwrap(); + cmp_package_req(&a, &b) + } + + // sort by name + assert_eq!(cmp_req("a", "b@1"), Ordering::Less); + assert_eq!(cmp_req("b@1", "a"), Ordering::Greater); + // prefer non-wildcard + assert_eq!(cmp_req("a", "a@1"), Ordering::Greater); + assert_eq!(cmp_req("a@1", "a"), Ordering::Less); + // prefer tag + assert_eq!(cmp_req("a@tag", "a"), Ordering::Less); + assert_eq!(cmp_req("a", "a@tag"), Ordering::Greater); + // sort tag descending + assert_eq!(cmp_req("a@latest-v1", "a@latest-v2"), Ordering::Greater); + assert_eq!(cmp_req("a@latest-v2", "a@latest-v1"), Ordering::Less); + // sort version req descending + assert_eq!(cmp_req("a@1", "a@2"), Ordering::Greater); + assert_eq!(cmp_req("a@2", "a@1"), Ordering::Less); + } + + #[test] + fn test_get_parent_path_specifier() { + fn get(a: &str) -> String { + get_parent_path_specifier(&ModuleSpecifier::parse(a).unwrap()).to_string() + } + + assert_eq!(get("https://deno.land/"), "https://deno.land/"); + assert_eq!(get("https://deno.land"), "https://deno.land/"); + assert_eq!(get("https://deno.land/test"), "https://deno.land/"); + assert_eq!(get("https://deno.land/test/"), "https://deno.land/"); + assert_eq!( + get("https://deno.land/test/other"), + "https://deno.land/test/" + ); + assert_eq!( + get("https://deno.land/test/other/"), + "https://deno.land/test/" + ); + assert_eq!( + get("https://deno.land/test/other/test?test#other"), + "https://deno.land/test/other/" + ); + } + + #[tokio::test] + async fn test_resolve_npm_package_reqs() { + let mut loader = deno_graph::source::MemoryLoader::new( + vec![ + ( + "file:///dev/local_module_a/mod.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "file:///dev/local_module_a/mod.ts".to_string(), + content: concat!( + "import 'https://deno.land/x/module_d/mod.ts';", + "import 'file:///dev/local_module_a/other.ts';", + "import 'file:///dev/local_module_b/mod.ts';", + "import 'https://deno.land/x/module_a/mod.ts';", + "import 'npm:package-a@local_module_a';", + ) + .to_string(), + maybe_headers: None, + }, + ), + ( + "file:///dev/local_module_a/other.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "file:///dev/local_module_a/other.ts".to_string(), + content: "import 'npm:package-b@local_module_a';".to_string(), + maybe_headers: None, + }, + ), + ( + "file:///dev/local_module_b/mod.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "file:///dev/local_module_b/mod.ts".to_string(), + content: "export * from 'npm:package-b@local_module_b';" + .to_string(), + maybe_headers: None, + }, + ), + ( + "https://deno.land/x/module_d/mod.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "https://deno.land/x/module_d/mod.ts".to_string(), + content: concat!( + "import './other.ts';", + "import 'npm:package-a@module_d';", + ) + .to_string(), + maybe_headers: None, + }, + ), + ( + "https://deno.land/x/module_d/other.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "https://deno.land/x/module_d/other.ts".to_string(), + content: "import 'npm:package-c@module_d'".to_string(), + maybe_headers: None, + }, + ), + ( + "https://deno.land/x/module_a/mod.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "https://deno.land/x/module_a/mod.ts".to_string(), + content: concat!( + "import 'npm:package-a@module_a';", + "import 'npm:package-b@module_a';", + "import '../module_c/sub/sub/mod.ts';", + "import '../module_b/mod.ts';", + ) + .to_string(), + maybe_headers: None, + }, + ), + ( + "https://deno.land/x/module_b/mod.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "https://deno.land/x/module_b/mod.ts".to_string(), + content: "import 'npm:package-a@module_b'".to_string(), + maybe_headers: None, + }, + ), + ( + "https://deno.land/x/module_c/sub/sub/mod.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "https://deno.land/x/module_c/sub/sub/mod.ts" + .to_string(), + content: concat!( + "import 'npm:package-a@module_c';", + "import '../../mod.ts';", + ) + .to_string(), + maybe_headers: None, + }, + ), + ( + "https://deno.land/x/module_c/mod.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "https://deno.land/x/module_c/mod.ts".to_string(), + content: concat!( + "import 'npm:package-b@module_c';", + "import '../module_d/sub_folder/mod.ts';", + ) + .to_string(), + maybe_headers: None, + }, + ), + ( + "https://deno.land/x/module_d/sub_folder/mod.ts".to_string(), + deno_graph::source::Source::Module { + specifier: "https://deno.land/x/module_d/sub_folder/mod.ts" + .to_string(), + content: "import 'npm:package-b@module_d';".to_string(), + maybe_headers: None, + }, + ), + ], + Vec::new(), + ); + let analyzer = deno_graph::CapturingModuleAnalyzer::default(); + let graph = deno_graph::create_graph( + vec![( + ModuleSpecifier::parse("file:///dev/local_module_a/mod.ts").unwrap(), + ModuleKind::Esm, + )], + &mut loader, + deno_graph::GraphOptions { + is_dynamic: false, + imports: None, + resolver: None, + locker: None, + module_analyzer: Some(&analyzer), + reporter: None, + }, + ) + .await; + let reqs = resolve_npm_package_reqs(&graph) + .into_iter() + .map(|r| r.to_string()) + .collect::>(); + + assert_eq!( + reqs, + vec![ + "package-a@local_module_a", + "package-b@local_module_a", + "package-b@local_module_b", + "package-a@module_a", + "package-b@module_a", + "package-a@module_d", + "package-b@module_d", + "package-c@module_d", + "package-a@module_b", + "package-a@module_c", + "package-b@module_c", + ] + ); + } +} diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs index bc6cb40607..f7c65c9e96 100644 --- a/cli/npm/resolvers/mod.rs +++ b/cli/npm/resolvers/mod.rs @@ -246,6 +246,8 @@ impl NpmPackageResolver { if self.no_npm { let fmt_reqs = packages + .iter() + .collect::>() // prevent duplicates .iter() .map(|p| format!("\"{}\"", p)) .collect::>() diff --git a/cli/proc_state.rs b/cli/proc_state.rs index 29f4ce3bd9..e50a4bdba6 100644 --- a/cli/proc_state.rs +++ b/cli/proc_state.rs @@ -23,6 +23,7 @@ use crate::lockfile::as_maybe_locker; use crate::lockfile::Lockfile; use crate::node; use crate::node::NodeResolution; +use crate::npm::resolve_npm_package_reqs; use crate::npm::NpmCache; use crate::npm::NpmPackageReference; use crate::npm::NpmPackageResolver; @@ -285,19 +286,16 @@ impl ProcState { reload_on_watch: bool, ) -> Result<(), AnyError> { let _pb_clear_guard = self.progress_bar.clear_guard(); - let mut npm_package_reqs = vec![]; - for root in &roots { - if let Ok(package_ref) = NpmPackageReference::from_specifier(root) { - npm_package_reqs.push(package_ref.req); - } - } + let has_root_npm_specifier = roots.iter().any(|r| { + r.scheme() == "npm" && NpmPackageReference::from_specifier(r).is_ok() + }); let roots = roots .into_iter() .map(|s| (s, ModuleKind::Esm)) .collect::>(); - if !reload_on_watch && npm_package_reqs.is_empty() { + if !reload_on_watch && !has_root_npm_specifier { let graph_data = self.graph_data.read(); if self.options.type_check_mode() == TypeCheckMode::None || graph_data.is_type_checked(&roots, &lib) @@ -395,7 +393,7 @@ impl ProcState { graph_data.entries().map(|(s, _)| s).cloned().collect() }; - { + let npm_package_reqs = { let mut graph_data = self.graph_data.write(); graph_data.add_graph(&graph, reload_on_watch); let check_js = self.options.check_js(); @@ -406,7 +404,7 @@ impl ProcState { check_js, ) .unwrap()?; - npm_package_reqs.extend(graph_data.npm_package_reqs()); + graph_data.npm_package_reqs().clone() }; if !npm_package_reqs.is_empty() { @@ -645,15 +643,10 @@ impl ProcState { ) .await; - // add the found npm package references to the npm resolver and cache them - let mut package_reqs = Vec::new(); - for (specifier, _) in graph.specifiers() { - if let Ok(reference) = NpmPackageReference::from_specifier(&specifier) { - package_reqs.push(reference.req); - } - } - if !package_reqs.is_empty() { - self.npm_resolver.add_package_reqs(package_reqs).await?; + // add the found npm package requirements to the npm resolver and cache them + let npm_package_reqs = resolve_npm_package_reqs(&graph); + if !npm_package_reqs.is_empty() { + self.npm_resolver.add_package_reqs(npm_package_reqs).await?; } Ok(graph)