pesde-pkg/pesde
1
1
Fork 0
mirror of https://github.com/pesde-pkg/pesde.git synced 2025-04-05 11:20:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor: make specifier index not an option

Browse source 
Instead, we use the `default` serde attribute
to deserialize the index as `DEFAULT_INDEX_NAME`
if it is not present. This removes a lot of
redundancy around the codebase about getting
the index name.
This commit is contained in:
daimond113 2025-02-12 17:41:49 +01:00
parent b384dbe6a0
commit 04aaa40c69
No known key found for this signature in database
GPG key ID: 640DC95EC1190354
13 changed files with 284 additions and 331 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
registry/src/endpoints/publish_version.rs
View file

@ -289,32 +289,26 @@ pub async fn publish_package(
match specifier {
DependencySpecifiers::Pesde(specifier) => {
if specifier
.index
.as_deref()
.filter(|index| match gix::Url::try_from(*index) {
let allowed = match gix::Url::try_from(&*specifier.index) {
Ok(url) => config
.other_registries_allowed
.is_allowed_or_same(source.repo_url().clone(), url),
Err(_) => false,
})
.is_none()
{
};
if !allowed {
return Err(RegistryError::InvalidArchive(format!(
"invalid index in pesde dependency {specifier}"
)));
}
}
DependencySpecifiers::Wally(specifier) => {
if specifier
.index
.as_deref()
.filter(|index| match gix::Url::try_from(*index) {
let allowed = match gix::Url::try_from(&*specifier.index) {
Ok(url) => config.wally_allowed.is_allowed(url),
Err(_) => false,
})
.is_none()
{
};
if !allowed {
return Err(RegistryError::InvalidArchive(format!(
"invalid index in wally dependency {specifier}"
)));

12
src/cli/commands/add.rs
View file

@ -77,7 +77,7 @@ impl AddCommand {
let specifier = DependencySpecifiers::Pesde(PesdeDependencySpecifier {
name: name.clone(),
version: version.clone().unwrap_or(VersionReq::STAR),
index: self.index,
index: self.index.unwrap_or_else(|| DEFAULT_INDEX_NAME.to_string()),
target: self.target,
});
@ -102,7 +102,7 @@ impl AddCommand {
pesde::source::wally::specifier::WallyDependencySpecifier {
name: name.clone(),
version: version.clone().unwrap_or(VersionReq::STAR),
index: self.index,
index: self.index.unwrap_or_else(|| DEFAULT_INDEX_NAME.to_string()),
},
);
@ -210,8 +210,8 @@ impl AddCommand {
field["target"] = toml_edit::value(version_id.target().to_string());
}
if let Some(index) = spec.index.filter(|i| i != DEFAULT_INDEX_NAME) {
field["index"] = toml_edit::value(index);
if spec.index != DEFAULT_INDEX_NAME {
field["index"] = toml_edit::value(spec.index);
}
println!(
@ -228,8 +228,8 @@ impl AddCommand {
field["wally"] = toml_edit::value(name_str);
field["version"] = toml_edit::value(format!("^{}", version_id.version()));
if let Some(index) = spec.index.filter(|i| i != DEFAULT_INDEX_NAME) {
field["index"] = toml_edit::value(index);
if spec.index != DEFAULT_INDEX_NAME {
field["index"] = toml_edit::value(spec.index);
}
println!(

4
src/cli/commands/execute.rs
View file

@ -21,7 +21,7 @@ use pesde::{
},
PackageSources,
},
Project, RefreshedSources,
Project, RefreshedSources, DEFAULT_INDEX_NAME,
};
use semver::VersionReq;
use std::{
@ -86,7 +86,7 @@ impl ExecuteCommand {
let specifier = PesdeDependencySpecifier {
name: self.package.0.clone(),
version: version_req.clone(),
index: None,
index: DEFAULT_INDEX_NAME.into(),
target: None,
};

2
src/cli/commands/init.rs
View file

@ -199,7 +199,7 @@ impl InitCommand {
&PesdeDependencySpecifier {
name: scripts_pkg_name.clone(),
version: VersionReq::STAR,
index: None,
index: DEFAULT_INDEX_NAME.into(),
target: None,
},
&ResolveOptions {

34
src/cli/commands/publish.rs
View file

@ -429,37 +429,23 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
{
match specifier {
DependencySpecifiers::Pesde(specifier) => {
let index_name = specifier
.index
.as_deref()
.unwrap_or(DEFAULT_INDEX_NAME)
.to_string();
specifier.index = Some(
manifest
specifier.index = manifest
.indices
.get(&index_name)
.get(&specifier.index)
.with_context(|| {
format!("index {index_name} not found in indices field")
format!("index {} not found in indices field", specifier.index)
})?
.to_string(),
);
.to_string();
}
#[cfg(feature = "wally-compat")]
DependencySpecifiers::Wally(specifier) => {
let index_name = specifier
.index
.as_deref()
.unwrap_or(DEFAULT_INDEX_NAME)
.to_string();
specifier.index = Some(
manifest
specifier.index = manifest
.wally_indices
.get(&index_name)
.get(&specifier.index)
.with_context(|| {
format!("index {index_name} not found in wally_indices field")
format!("index {} not found in wally_indices field", specifier.index)
})?
.to_string(),
);
.to_string();
}
DependencySpecifiers::Git(_) => {}
DependencySpecifiers::Workspace(spec) => {
@ -503,13 +489,11 @@ info: otherwise, the file was deemed unnecessary, if you don't understand why, p
v => VersionReq::parse(&format!("{v}{}", manifest.version))
.with_context(|| format!("failed to parse version for {v}"))?,
},
index: Some(
manifest
index: manifest
.indices
.get(DEFAULT_INDEX_NAME)
.context("missing default index in workspace package manifest")?
.to_string(),
),
target: Some(spec.target.unwrap_or(manifest.target.kind())),
});
}

4
src/lib.rs
View file

@ -66,6 +66,10 @@ pub(crate) const LINK_LIB_NO_FILE_FOUND: &str = "____pesde_no_export_file_found"
/// The folder in which scripts are linked
pub const SCRIPTS_LINK_FOLDER: &str = ".pesde";
pub(crate) fn default_index_name() -> String {
DEFAULT_INDEX_NAME.into()
}
#[derive(Debug, Default)]
struct AuthConfigShared {
tokens: HashMap<gix::Url, String>,

20
src/resolver.rs
View file

@ -8,7 +8,7 @@ use crate::{
traits::{PackageRef, PackageSource, RefreshOptions, ResolveOptions},
PackageSources,
},
Project, RefreshedSources, DEFAULT_INDEX_NAME,
Project, RefreshedSources,
};
use std::collections::{btree_map::Entry, HashMap, VecDeque};
use tracing::{instrument, Instrument};
@ -179,17 +179,16 @@ impl Project {
let source = match &specifier {
DependencySpecifiers::Pesde(specifier) => {
let index_url = if !is_published_package && (depth == 0 || overridden) {
let index_name = specifier.index.as_deref().unwrap_or(DEFAULT_INDEX_NAME);
manifest
.indices
.get(index_name)
.get(&specifier.index)
.ok_or(errors::DependencyGraphError::IndexNotFound(
index_name.to_string(),
specifier.index.to_string(),
))?
.clone()
} else {
specifier.index.as_deref().unwrap()
specifier.index
.as_str()
.try_into()
// specifiers in indices store the index url in this field
.unwrap()
@ -200,17 +199,16 @@ impl Project {
#[cfg(feature = "wally-compat")]
DependencySpecifiers::Wally(specifier) => {
let index_url = if !is_published_package && (depth == 0 || overridden) {
let index_name = specifier.index.as_deref().unwrap_or(DEFAULT_INDEX_NAME);
manifest
.wally_indices
.get(index_name)
.get(&specifier.index)
.ok_or(errors::DependencyGraphError::WallyIndexNotFound(
index_name.to_string(),
specifier.index.to_string(),
))?
.clone()
} else {
specifier.index.as_deref().unwrap()
specifier.index
.as_str()
.try_into()
// specifiers in indices store the index url in this field
.unwrap()

32
src/source/git/mod.rs
View file

@ -13,7 +13,7 @@ use crate::{
IGNORED_FILES,
},
util::hash,
Project, DEFAULT_INDEX_NAME, LOCKFILE_FILE_NAME, MANIFEST_FILE_NAME,
Project, LOCKFILE_FILE_NAME, MANIFEST_FILE_NAME,
};
use fs_err::tokio as fs;
use gix::{bstr::BStr, traverse::tree::Recorder, ObjectId, Url};
@ -72,43 +72,29 @@ fn transform_pesde_dependencies(
.map(|(alias, (mut spec, ty))| {
match &mut spec {
DependencySpecifiers::Pesde(specifier) => {
let index_name = specifier
.index
.as_deref()
.unwrap_or(DEFAULT_INDEX_NAME)
.to_string();
specifier.index = Some(
manifest
specifier.index = manifest
.indices
.get(&index_name)
.get(&specifier.index)
.ok_or_else(|| {
errors::ResolveError::PesdeIndexNotFound(
index_name.clone(),
specifier.index.to_string(),
Box::new(repo_url.clone()),
)
})?
.to_string(),
);
.to_string();
}
#[cfg(feature = "wally-compat")]
DependencySpecifiers::Wally(specifier) => {
let index_name = specifier
.index
.as_deref()
.unwrap_or(DEFAULT_INDEX_NAME)
.to_string();
specifier.index = Some(
manifest
specifier.index = manifest
.wally_indices
.get(&index_name)
.get(&specifier.index)
.ok_or_else(|| {
errors::ResolveError::WallyIndexNotFound(
index_name.clone(),
specifier.index.to_string(),
Box::new(repo_url.clone()),
)
})?
.to_string(),
);
.to_string();
}
DependencySpecifiers::Git(_) => {}
DependencySpecifiers::Workspace(specifier) => {

25
src/source/path/mod.rs
View file

@ -11,7 +11,6 @@ use crate::{
traits::{DownloadOptions, GetTargetOptions, PackageSource, ResolveOptions},
ResolveResult,
},
DEFAULT_INDEX_NAME,
};
use std::collections::BTreeMap;
use tracing::instrument;
@ -49,37 +48,29 @@ impl PackageSource for PathPackageSource {
.map(|(alias, (mut spec, ty))| {
match &mut spec {
DependencySpecifiers::Pesde(spec) => {
let index_name = spec.index.as_deref().unwrap_or(DEFAULT_INDEX_NAME);
spec.index = Some(
manifest
spec.index = manifest
.indices
.get(index_name)
.get(&spec.index)
.ok_or_else(|| {
errors::ResolveError::IndexNotFound(
index_name.to_string(),
spec.index.to_string(),
specifier.path.clone(),
)
})?
.to_string(),
)
.to_string();
}
#[cfg(feature = "wally-compat")]
DependencySpecifiers::Wally(spec) => {
let index_name = spec.index.as_deref().unwrap_or(DEFAULT_INDEX_NAME);
spec.index = Some(
manifest
spec.index = manifest
.wally_indices
.get(index_name)
.get(&spec.index)
.ok_or_else(|| {
errors::ResolveError::IndexNotFound(
index_name.to_string(),
spec.index.to_string(),
specifier.path.clone(),
)
})?
.to_string(),
)
.to_string();
}
DependencySpecifiers::Git(_) => {}
DependencySpecifiers::Workspace(_) => {}

4
src/source/pesde/specifier.rs
View file

@ -13,8 +13,8 @@ pub struct PesdeDependencySpecifier {
#[cfg_attr(test, schemars(with = "String"))]
pub version: VersionReq,
/// The index to use for the package
#[serde(default, skip_serializing_if = "Option::is_none")]
pub index: Option<String>,
#[serde(default = "crate::default_index_name")]
pub index: String,
/// The target to use for the package
#[serde(default, skip_serializing_if = "Option::is_none")]
pub target: Option<TargetKind>,

11
src/source/wally/manifest.rs
View file

@ -42,7 +42,8 @@ pub fn deserialize_specifiers<'de, D: Deserializer<'de>>(
WallyDependencySpecifier {
name: name.parse().map_err(serde::de::Error::custom)?,
version: VersionReq::parse(version).map_err(serde::de::Error::custom)?,
index: None,
// doesn't matter, will be replaced later
index: "".to_string(),
},
))
})
@ -54,11 +55,11 @@ pub fn deserialize_specifiers<'de, D: Deserializer<'de>>(
pub struct WallyManifest {
pub package: WallyPackage,
#[serde(default, deserialize_with = "deserialize_specifiers")]
pub dependencies: BTreeMap<Alias, WallyDependencySpecifier>,
dependencies: BTreeMap<Alias, WallyDependencySpecifier>,
#[serde(default, deserialize_with = "deserialize_specifiers")]
pub server_dependencies: BTreeMap<Alias, WallyDependencySpecifier>,
server_dependencies: BTreeMap<Alias, WallyDependencySpecifier>,
#[serde(default, deserialize_with = "deserialize_specifiers")]
pub dev_dependencies: BTreeMap<Alias, WallyDependencySpecifier>,
dev_dependencies: BTreeMap<Alias, WallyDependencySpecifier>,
}
impl WallyManifest {
@ -77,7 +78,7 @@ impl WallyManifest {
] {
for (alias, spec) in deps {
let mut spec = spec.clone();
spec.index = Some(self.package.registry.to_string());
spec.index = self.package.registry.to_string();
if all_deps
.insert(alias.clone(), (DependencySpecifiers::Wally(spec), ty))

4
src/source/wally/specifier.rs
View file

@ -16,8 +16,8 @@ pub struct WallyDependencySpecifier {
#[cfg_attr(test, schemars(with = "String"))]
pub version: VersionReq,
/// The index to use for the package
#[serde(default, skip_serializing_if = "Option::is_none")]
pub index: Option<String>,
#[serde(default = "crate::default_index_name")]
pub index: String,
}
impl DependencySpecifier for WallyDependencySpecifier {}

33
src/source/workspace/mod.rs
View file

@ -11,7 +11,6 @@ use crate::{
workspace::pkg_ref::WorkspacePackageRef,
ResolveResult,
},
DEFAULT_INDEX_NAME,
};
use futures::StreamExt;
use relative_path::RelativePathBuf;
@ -82,33 +81,29 @@ impl PackageSource for WorkspacePackageSource {
.map(|(alias, (mut spec, ty))| {
match &mut spec {
DependencySpecifiers::Pesde(spec) => {
let index_name = spec.index.as_deref().unwrap_or(DEFAULT_INDEX_NAME);
spec.index = Some(
manifest
spec.index = manifest
.indices
.get(index_name)
.ok_or(errors::ResolveError::IndexNotFound(
index_name.to_string(),
.get(&spec.index)
.ok_or_else(|| {
errors::ResolveError::IndexNotFound(
spec.index.to_string(),
manifest.name.to_string(),
))?
.to_string(),
)
})?
.to_string();
}
#[cfg(feature = "wally-compat")]
DependencySpecifiers::Wally(spec) => {
let index_name = spec.index.as_deref().unwrap_or(DEFAULT_INDEX_NAME);
spec.index = Some(
manifest
spec.index = manifest
.wally_indices
.get(index_name)
.ok_or(errors::ResolveError::IndexNotFound(
index_name.to_string(),
.get(&spec.index)
.ok_or_else(|| {
errors::ResolveError::IndexNotFound(
spec.index.to_string(),
manifest.name.to_string(),
))?
.to_string(),
)
})?
.to_string();
}
DependencySpecifiers::Git(_) => {}
DependencySpecifiers::Workspace(_) => {}