mirror of
https://github.com/denoland/deno.git
synced 2024-11-01 09:24:20 -04:00
c03e0f3853
This is just a straight refactor and doesn't make any improvements to the code that could now be made. Closes #16493
979 lines
29 KiB
Rust
979 lines
29 KiB
Rust
// 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<String>,
|
|
}
|
|
|
|
impl NpmPackageReference {
|
|
pub fn from_specifier(
|
|
specifier: &ModuleSpecifier,
|
|
) -> Result<NpmPackageReference, AnyError> {
|
|
Self::from_str(specifier.as_str())
|
|
}
|
|
|
|
pub fn from_str(specifier: &str) -> Result<NpmPackageReference, AnyError> {
|
|
let original_text = specifier;
|
|
let specifier = match specifier.strip_prefix("npm:") {
|
|
Some(s) => {
|
|
// Strip leading slash, which might come from import map
|
|
s.strip_prefix('/').unwrap_or(s)
|
|
}
|
|
None => {
|
|
// don't allocate a string here and instead use a static string
|
|
// because this is hit a lot when a url is not an npm specifier
|
|
return Err(generic_error("Not an npm specifier"));
|
|
}
|
|
};
|
|
let parts = specifier.split('/').collect::<Vec<_>>();
|
|
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 {
|
|
let sub_path = parts[name_part_len..].join("/");
|
|
if sub_path.is_empty() {
|
|
None
|
|
} else {
|
|
Some(sub_path)
|
|
}
|
|
};
|
|
|
|
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));
|
|
}
|
|
}
|
|
|
|
if name.is_empty() {
|
|
let msg = format!(
|
|
"Invalid npm specifier '{}'. Did not contain a package name.",
|
|
original_text
|
|
);
|
|
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<SpecifierVersionReq>,
|
|
}
|
|
|
|
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<Self, AnyError> {
|
|
// 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<NpmPackageReq> {
|
|
fn collect_specifiers<'a>(
|
|
graph: &'a ModuleGraph,
|
|
module: &'a deno_graph::Module,
|
|
) -> Vec<&'a ModuleSpecifier> {
|
|
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);
|
|
}
|
|
}
|
|
}
|
|
|
|
// flatten any data urls into this list of specifiers
|
|
for i in (0..specifiers.len()).rev() {
|
|
if specifiers[i].scheme() == "data" {
|
|
let data_specifier = specifiers.swap_remove(i);
|
|
if let Some(module) = graph.get(data_specifier) {
|
|
specifiers.extend(collect_specifiers(graph, module));
|
|
}
|
|
}
|
|
}
|
|
|
|
specifiers
|
|
}
|
|
|
|
fn analyze_module(
|
|
module: &deno_graph::Module,
|
|
graph: &ModuleGraph,
|
|
specifier_graph: &mut SpecifierTree,
|
|
seen: &mut HashSet<ModuleSpecifier>,
|
|
) {
|
|
if !seen.insert(module.specifier.clone()) {
|
|
return; // already visited
|
|
}
|
|
|
|
let parent_specifier = get_folder_path_specifier(&module.specifier);
|
|
let leaf = specifier_graph.get_leaf(&parent_specifier);
|
|
|
|
let specifiers = collect_specifiers(graph, module);
|
|
|
|
// fill this leaf's information
|
|
for specifier in &specifiers {
|
|
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_folder_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_folder_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::<Vec<_>>();
|
|
reqs.sort_by(cmp_package_req);
|
|
result.extend(reqs);
|
|
|
|
let mut deps = std::mem::take(&mut leaf.dependencies)
|
|
.into_iter()
|
|
.collect::<Vec<_>>();
|
|
deps.sort_by(cmp_folder_specifiers);
|
|
|
|
for dep in deps {
|
|
pending_specifiers.push_back(dep);
|
|
}
|
|
}
|
|
|
|
result
|
|
}
|
|
|
|
fn get_folder_path_specifier(specifier: &ModuleSpecifier) -> ModuleSpecifier {
|
|
let mut specifier = specifier.clone();
|
|
specifier.set_query(None);
|
|
specifier.set_fragment(None);
|
|
if !specifier.path().ends_with('/') {
|
|
// remove the last path part, but keep the trailing slash
|
|
let mut path_parts = specifier.path().split('/').collect::<Vec<_>>();
|
|
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] = "";
|
|
}
|
|
specifier.set_path(&path_parts.join("/"));
|
|
}
|
|
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<String, SpecifierTreeNode>,
|
|
}
|
|
|
|
impl SpecifierTreeParentNode {
|
|
pub fn into_leaf(self) -> SpecifierTreeLeafNode {
|
|
fn fill_new_leaf(
|
|
deps: HashMap<String, SpecifierTreeNode>,
|
|
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<NpmPackageReq>,
|
|
dependencies: HashSet<ModuleSpecifier>,
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct SpecifierTree {
|
|
root_nodes: HashMap<ModuleSpecifier, SpecifierTreeNode>,
|
|
}
|
|
|
|
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<Ordering> {
|
|
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 pretty_assertions::assert_eq;
|
|
|
|
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"
|
|
);
|
|
|
|
// should parse leading slash
|
|
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/").unwrap(),
|
|
NpmPackageReference {
|
|
req: NpmPackageReq {
|
|
name: "test".to_string(),
|
|
version_req: None,
|
|
},
|
|
sub_path: None,
|
|
}
|
|
);
|
|
|
|
// should error for no name
|
|
assert_eq!(
|
|
NpmPackageReference::from_str("npm:/")
|
|
.err()
|
|
.unwrap()
|
|
.to_string(),
|
|
"Invalid npm specifier 'npm:/'. Did not contain a package name."
|
|
);
|
|
assert_eq!(
|
|
NpmPackageReference::from_str("npm://test")
|
|
.err()
|
|
.unwrap()
|
|
.to_string(),
|
|
"Invalid npm specifier 'npm://test'. Did not contain a package name."
|
|
);
|
|
}
|
|
|
|
#[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_folder_path_specifier() {
|
|
fn get(a: &str) -> String {
|
|
get_folder_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/test/");
|
|
assert_eq!(
|
|
get("https://deno.land/test/other"),
|
|
"https://deno.land/test/"
|
|
);
|
|
assert_eq!(
|
|
get("https://deno.land/test/other/"),
|
|
"https://deno.land/test/other/"
|
|
);
|
|
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';",
|
|
"import 'https://deno.land/x/module_e/';",
|
|
)
|
|
.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: concat!(
|
|
"export * from 'npm:package-b@local_module_b';",
|
|
"import * as test from 'data:application/typescript,export%20*%20from%20%22npm:package-data%40local_module_b%22;';",
|
|
).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,
|
|
},
|
|
),
|
|
(
|
|
// ensure a module at a directory is treated as being at a directory
|
|
"https://deno.land/x/module_e/".to_string(),
|
|
deno_graph::source::Source::Module {
|
|
specifier: "https://deno.land/x/module_e/"
|
|
.to_string(),
|
|
content: "import 'npm:package-a@module_e';".to_string(),
|
|
maybe_headers: Some(vec![(
|
|
"content-type".to_string(),
|
|
"application/javascript".to_string(),
|
|
)]),
|
|
},
|
|
),
|
|
],
|
|
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,
|
|
module_analyzer: Some(&analyzer),
|
|
reporter: None,
|
|
},
|
|
)
|
|
.await;
|
|
let reqs = resolve_npm_package_reqs(&graph)
|
|
.into_iter()
|
|
.map(|r| r.to_string())
|
|
.collect::<Vec<_>>();
|
|
|
|
assert_eq!(
|
|
reqs,
|
|
vec![
|
|
"package-a@local_module_a",
|
|
"package-b@local_module_a",
|
|
"package-b@local_module_b",
|
|
"package-data@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_e",
|
|
"package-a@module_b",
|
|
"package-a@module_c",
|
|
"package-b@module_c",
|
|
]
|
|
);
|
|
}
|
|
}
|