mirror of
https://github.com/astral-sh/uv.git
synced 2025-07-07 21:35:00 +00:00

## Summary Implements `uv add --optional <group>`, which adds a dependency to `project.optional-dependency.<group>`. Resolves https://github.com/astral-sh/uv/issues/4585.
454 lines
15 KiB
Rust
454 lines
15 KiB
Rust
use std::str::FromStr;
|
|
use std::{fmt, mem};
|
|
|
|
use thiserror::Error;
|
|
use toml_edit::{Array, DocumentMut, Item, RawString, Table, TomlError, Value};
|
|
|
|
use pep508_rs::{ExtraName, PackageName, Requirement, VersionOrUrl};
|
|
|
|
use crate::pyproject::{DependencyType, PyProjectToml, Source};
|
|
|
|
/// Raw and mutable representation of a `pyproject.toml`.
|
|
///
|
|
/// This is useful for operations that require editing an existing `pyproject.toml` while
|
|
/// preserving comments and other structure, such as `uv add` and `uv remove`.
|
|
pub struct PyProjectTomlMut {
|
|
doc: DocumentMut,
|
|
}
|
|
|
|
#[derive(Error, Debug)]
|
|
pub enum Error {
|
|
#[error("Failed to parse `pyproject.toml`")]
|
|
Parse(#[from] Box<TomlError>),
|
|
#[error("Failed to serialize `pyproject.toml`")]
|
|
Serialize(#[from] Box<toml::ser::Error>),
|
|
#[error("Dependencies in `pyproject.toml` are malformed")]
|
|
MalformedDependencies,
|
|
#[error("Sources in `pyproject.toml` are malformed")]
|
|
MalformedSources,
|
|
#[error("Cannot perform ambiguous update; multiple entries with matching package names.")]
|
|
Ambiguous,
|
|
}
|
|
|
|
impl PyProjectTomlMut {
|
|
/// Initialize a `PyProjectTomlMut` from a `PyProjectToml`.
|
|
pub fn from_toml(pyproject: &PyProjectToml) -> Result<Self, Error> {
|
|
Ok(Self {
|
|
doc: pyproject.raw.parse().map_err(Box::new)?,
|
|
})
|
|
}
|
|
|
|
/// Adds a dependency to `project.dependencies`.
|
|
pub fn add_dependency(
|
|
&mut self,
|
|
req: Requirement,
|
|
source: Option<Source>,
|
|
) -> Result<(), Error> {
|
|
// Get or create `project.dependencies`.
|
|
let dependencies = self
|
|
.doc
|
|
.entry("project")
|
|
.or_insert(Item::Table(Table::new()))
|
|
.as_table_mut()
|
|
.ok_or(Error::MalformedDependencies)?
|
|
.entry("dependencies")
|
|
.or_insert(Item::Value(Value::Array(Array::new())))
|
|
.as_array_mut()
|
|
.ok_or(Error::MalformedDependencies)?;
|
|
|
|
let name = req.name.clone();
|
|
add_dependency(req, dependencies, source.is_some())?;
|
|
|
|
if let Some(source) = source {
|
|
self.add_source(&name, &source)?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Adds a development dependency to `tool.uv.dev-dependencies`.
|
|
pub fn add_dev_dependency(
|
|
&mut self,
|
|
req: Requirement,
|
|
source: Option<Source>,
|
|
) -> Result<(), Error> {
|
|
// Get or create `tool.uv.dev-dependencies`.
|
|
let dev_dependencies = self
|
|
.doc
|
|
.entry("tool")
|
|
.or_insert(implicit())
|
|
.as_table_mut()
|
|
.ok_or(Error::MalformedSources)?
|
|
.entry("uv")
|
|
.or_insert(Item::Table(Table::new()))
|
|
.as_table_mut()
|
|
.ok_or(Error::MalformedSources)?
|
|
.entry("dev-dependencies")
|
|
.or_insert(Item::Value(Value::Array(Array::new())))
|
|
.as_array_mut()
|
|
.ok_or(Error::MalformedDependencies)?;
|
|
|
|
let name = req.name.clone();
|
|
add_dependency(req, dev_dependencies, source.is_some())?;
|
|
|
|
if let Some(source) = source {
|
|
self.add_source(&name, &source)?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Adds a dependency to `project.optional-dependencies`.
|
|
pub fn add_optional_dependency(
|
|
&mut self,
|
|
req: Requirement,
|
|
group: &ExtraName,
|
|
source: Option<Source>,
|
|
) -> Result<(), Error> {
|
|
// Get or create `project.optional-dependencies`.
|
|
let optional_dependencies = self
|
|
.doc
|
|
.entry("project")
|
|
.or_insert(Item::Table(Table::new()))
|
|
.as_table_mut()
|
|
.ok_or(Error::MalformedDependencies)?
|
|
.entry("optional-dependencies")
|
|
.or_insert(Item::Table(Table::new()))
|
|
.as_table_mut()
|
|
.ok_or(Error::MalformedDependencies)?;
|
|
|
|
let group = optional_dependencies
|
|
.entry(group.as_ref())
|
|
.or_insert(Item::Value(Value::Array(Array::new())))
|
|
.as_array_mut()
|
|
.ok_or(Error::MalformedDependencies)?;
|
|
|
|
let name = req.name.clone();
|
|
add_dependency(req, group, source.is_some())?;
|
|
|
|
if let Some(source) = source {
|
|
self.add_source(&name, &source)?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Adds a source to `tool.uv.sources`.
|
|
fn add_source(&mut self, name: &PackageName, source: &Source) -> Result<(), Error> {
|
|
// Get or create `tool.uv.sources`.
|
|
let sources = self
|
|
.doc
|
|
.entry("tool")
|
|
.or_insert(implicit())
|
|
.as_table_mut()
|
|
.ok_or(Error::MalformedSources)?
|
|
.entry("uv")
|
|
.or_insert(implicit())
|
|
.as_table_mut()
|
|
.ok_or(Error::MalformedSources)?
|
|
.entry("sources")
|
|
.or_insert(Item::Table(Table::new()))
|
|
.as_table_mut()
|
|
.ok_or(Error::MalformedSources)?;
|
|
|
|
add_source(name, source, sources)?;
|
|
Ok(())
|
|
}
|
|
|
|
/// Removes all occurrences of dependencies with the given name.
|
|
pub fn remove_dependency(&mut self, req: &PackageName) -> Result<Vec<Requirement>, Error> {
|
|
// Try to get `project.dependencies`.
|
|
let Some(dependencies) = self
|
|
.doc
|
|
.get_mut("project")
|
|
.map(|project| project.as_table_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
.and_then(|project| project.get_mut("dependencies"))
|
|
.map(|dependencies| dependencies.as_array_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
else {
|
|
return Ok(Vec::new());
|
|
};
|
|
|
|
let requirements = remove_dependency(req, dependencies);
|
|
self.remove_source(req)?;
|
|
|
|
Ok(requirements)
|
|
}
|
|
|
|
/// Removes all occurrences of development dependencies with the given name.
|
|
pub fn remove_dev_dependency(&mut self, req: &PackageName) -> Result<Vec<Requirement>, Error> {
|
|
// Try to get `tool.uv.dev-dependencies`.
|
|
let Some(dev_dependencies) = self
|
|
.doc
|
|
.get_mut("tool")
|
|
.map(|tool| tool.as_table_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
.and_then(|tool| tool.get_mut("uv"))
|
|
.map(|tool_uv| tool_uv.as_table_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
.and_then(|tool_uv| tool_uv.get_mut("dev-dependencies"))
|
|
.map(|dependencies| dependencies.as_array_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
else {
|
|
return Ok(Vec::new());
|
|
};
|
|
|
|
let requirements = remove_dependency(req, dev_dependencies);
|
|
self.remove_source(req)?;
|
|
|
|
Ok(requirements)
|
|
}
|
|
|
|
/// Removes all occurrences of optional dependencies in the group with the given name.
|
|
pub fn remove_optional_dependency(
|
|
&mut self,
|
|
req: &PackageName,
|
|
group: &ExtraName,
|
|
) -> Result<Vec<Requirement>, Error> {
|
|
// Try to get `project.optional-dependencies.<group>`.
|
|
let Some(optional_dependencies) = self
|
|
.doc
|
|
.get_mut("project")
|
|
.map(|project| project.as_table_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
.and_then(|project| project.get_mut("optional-dependencies"))
|
|
.map(|extras| extras.as_table_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
.and_then(|extras| extras.get_mut(group.as_ref()))
|
|
.map(|dependencies| dependencies.as_array_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
else {
|
|
return Ok(Vec::new());
|
|
};
|
|
|
|
let requirements = remove_dependency(req, optional_dependencies);
|
|
self.remove_source(req)?;
|
|
|
|
Ok(requirements)
|
|
}
|
|
|
|
// Remove a matching source from `tool.uv.sources`, if it exists.
|
|
fn remove_source(&mut self, name: &PackageName) -> Result<(), Error> {
|
|
if let Some(sources) = self
|
|
.doc
|
|
.get_mut("tool")
|
|
.map(|tool| tool.as_table_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
.and_then(|tool| tool.get_mut("uv"))
|
|
.map(|tool_uv| tool_uv.as_table_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
.and_then(|tool_uv| tool_uv.get_mut("sources"))
|
|
.map(|sources| sources.as_table_mut().ok_or(Error::MalformedSources))
|
|
.transpose()?
|
|
{
|
|
sources.remove(name.as_ref());
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Returns all the places in this `pyproject.toml` that contain a dependency with the given
|
|
/// name.
|
|
///
|
|
/// This method searches `project.dependencies`, `tool.uv.dev-dependencies`, and
|
|
/// `tool.uv.optional-dependencies`.
|
|
pub fn find_dependency(&self, name: &PackageName) -> Vec<DependencyType> {
|
|
let mut types = Vec::new();
|
|
|
|
if let Some(project) = self.doc.get("project").and_then(Item::as_table) {
|
|
// Check `project.dependencies`.
|
|
if let Some(dependencies) = project.get("dependencies").and_then(Item::as_array) {
|
|
if !find_dependencies(name, dependencies).is_empty() {
|
|
types.push(DependencyType::Production);
|
|
}
|
|
}
|
|
|
|
// Check `project.optional-dependencies`.
|
|
if let Some(extras) = project
|
|
.get("optional-dependencies")
|
|
.and_then(Item::as_table)
|
|
{
|
|
for (extra, dependencies) in extras {
|
|
let Some(dependencies) = dependencies.as_array() else {
|
|
continue;
|
|
};
|
|
let Ok(extra) = ExtraName::new(extra.to_string()) else {
|
|
continue;
|
|
};
|
|
|
|
if !find_dependencies(name, dependencies).is_empty() {
|
|
types.push(DependencyType::Optional(extra));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Check `tool.uv.dev-dependencies`.
|
|
if let Some(dev_dependencies) = self
|
|
.doc
|
|
.get("tool")
|
|
.and_then(Item::as_table)
|
|
.and_then(|tool| tool.get("uv"))
|
|
.and_then(Item::as_table)
|
|
.and_then(|tool| tool.get("dev-dependencies"))
|
|
.and_then(Item::as_array)
|
|
{
|
|
if !find_dependencies(name, dev_dependencies).is_empty() {
|
|
types.push(DependencyType::Dev);
|
|
}
|
|
}
|
|
|
|
types
|
|
}
|
|
}
|
|
|
|
/// Returns an implicit table.
|
|
fn implicit() -> Item {
|
|
let mut table = Table::new();
|
|
table.set_implicit(true);
|
|
Item::Table(table)
|
|
}
|
|
|
|
/// Adds a dependency to the given `deps` array.
|
|
pub fn add_dependency(req: Requirement, deps: &mut Array, has_source: bool) -> Result<(), Error> {
|
|
// Find matching dependencies.
|
|
let mut to_replace = find_dependencies(&req.name, deps);
|
|
match to_replace.as_slice() {
|
|
[] => deps.push(req.to_string()),
|
|
[_] => {
|
|
let (i, mut old_req) = to_replace.remove(0);
|
|
update_requirement(&mut old_req, req, has_source);
|
|
deps.replace(i, old_req.to_string());
|
|
}
|
|
// Cannot perform ambiguous updates.
|
|
_ => return Err(Error::Ambiguous),
|
|
}
|
|
reformat_array_multiline(deps);
|
|
Ok(())
|
|
}
|
|
|
|
/// Update an existing requirement.
|
|
fn update_requirement(old: &mut Requirement, new: Requirement, has_source: bool) {
|
|
// Add any new extras.
|
|
old.extras.extend(new.extras);
|
|
old.extras.sort_unstable();
|
|
old.extras.dedup();
|
|
|
|
// Clear the requirement source if we are going to add to `tool.uv.sources`.
|
|
if has_source {
|
|
old.version_or_url = None;
|
|
}
|
|
|
|
// Update the source if a new one was specified.
|
|
match new.version_or_url {
|
|
None => {}
|
|
Some(VersionOrUrl::VersionSpecifier(specifier)) if specifier.is_empty() => {}
|
|
Some(version_or_url) => old.version_or_url = Some(version_or_url),
|
|
}
|
|
|
|
// Update the marker expression.
|
|
if let Some(marker) = new.marker {
|
|
old.marker = Some(marker);
|
|
}
|
|
}
|
|
|
|
/// Removes all occurrences of dependencies with the given name from the given `deps` array.
|
|
fn remove_dependency(req: &PackageName, deps: &mut Array) -> Vec<Requirement> {
|
|
// Remove matching dependencies.
|
|
let removed = find_dependencies(req, deps)
|
|
.into_iter()
|
|
.rev() // Reverse to preserve indices as we remove them.
|
|
.filter_map(|(i, _)| {
|
|
deps.remove(i)
|
|
.as_str()
|
|
.and_then(|req| Requirement::from_str(req).ok())
|
|
})
|
|
.collect::<Vec<_>>();
|
|
|
|
if !removed.is_empty() {
|
|
reformat_array_multiline(deps);
|
|
}
|
|
|
|
removed
|
|
}
|
|
|
|
// Returns a `Vec` containing the all dependencies with the given name, along with their positions
|
|
// in the array.
|
|
fn find_dependencies(name: &PackageName, deps: &Array) -> Vec<(usize, Requirement)> {
|
|
let mut to_replace = Vec::new();
|
|
for (i, dep) in deps.iter().enumerate() {
|
|
if let Some(req) = dep.as_str().and_then(try_parse_requirement) {
|
|
if req.name == *name {
|
|
to_replace.push((i, req));
|
|
}
|
|
}
|
|
}
|
|
to_replace
|
|
}
|
|
|
|
// Add a source to `tool.uv.sources`.
|
|
fn add_source(req: &PackageName, source: &Source, sources: &mut Table) -> Result<(), Error> {
|
|
// Serialize as an inline table.
|
|
let mut doc = toml::to_string(&source)
|
|
.map_err(Box::new)?
|
|
.parse::<DocumentMut>()
|
|
.unwrap();
|
|
let table = mem::take(doc.as_table_mut()).into_inline_table();
|
|
|
|
sources.insert(req.as_ref(), Item::Value(Value::InlineTable(table)));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
impl fmt::Display for PyProjectTomlMut {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
self.doc.fmt(f)
|
|
}
|
|
}
|
|
|
|
fn try_parse_requirement(req: &str) -> Option<Requirement> {
|
|
Requirement::from_str(req).ok()
|
|
}
|
|
|
|
/// Reformats a TOML array to multi line while trying to preserve all comments
|
|
/// and move them around. This also formats the array to have a trailing comma.
|
|
fn reformat_array_multiline(deps: &mut Array) {
|
|
fn find_comments(s: Option<&RawString>) -> impl Iterator<Item = &str> {
|
|
s.and_then(|x| x.as_str())
|
|
.unwrap_or("")
|
|
.lines()
|
|
.filter_map(|line| {
|
|
let line = line.trim();
|
|
line.starts_with('#').then_some(line)
|
|
})
|
|
}
|
|
|
|
for item in deps.iter_mut() {
|
|
let decor = item.decor_mut();
|
|
let mut prefix = String::new();
|
|
for comment in find_comments(decor.prefix()).chain(find_comments(decor.suffix())) {
|
|
prefix.push_str("\n ");
|
|
prefix.push_str(comment);
|
|
}
|
|
prefix.push_str("\n ");
|
|
decor.set_prefix(prefix);
|
|
decor.set_suffix("");
|
|
}
|
|
|
|
deps.set_trailing(&{
|
|
let mut comments = find_comments(Some(deps.trailing())).peekable();
|
|
let mut rv = String::new();
|
|
if comments.peek().is_some() {
|
|
for comment in comments {
|
|
rv.push_str("\n ");
|
|
rv.push_str(comment);
|
|
}
|
|
}
|
|
if !rv.is_empty() || !deps.is_empty() {
|
|
rv.push('\n');
|
|
}
|
|
rv
|
|
});
|
|
deps.set_trailing_comma(true);
|
|
}
|