Skip to content

Support for v5 dependencies / incompatibilities #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fleeym merged 2 commits into from
Feb 1, 2026
Merged

Support for v5 dependencies / incompatibilities #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2434188
implement dependency parsing for v5
Fleeym Feb 1, 2026
7851177
add breaking / required in dependency / incompat responses
Fleeym Feb 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 100 additions & 13 deletions src/types/mod_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,30 @@ pub enum ModJsonDependencyType {
}

#[derive(Deserialize, Debug)]
pub struct ModJsonDependency {
pub struct ModJsonDependencyOnlyVersion {
version: String,
}

#[derive(Deserialize, Debug)]
pub struct ModJsonDependencyWithImportance {
version: String,
#[serde(default)]
importance: DependencyImportance,
}

#[derive(Deserialize, Debug)]
pub struct ModJsonDependencyWithRequired {
version: String,
required: bool,
}

#[derive(Deserialize, Debug)]
#[serde(untagged)]
pub enum ModJsonDependency {
WithImportance(ModJsonDependencyWithImportance),
WithRequired(ModJsonDependencyWithRequired),
OnlyVersion(ModJsonDependencyOnlyVersion),
}

#[derive(Deserialize, Debug)]
pub struct OldModJsonDependency {
pub id: String,
Expand All @@ -107,10 +125,27 @@ pub enum ModJsonIncompatibilityType {
}

#[derive(Deserialize, Debug)]
pub struct ModJsonIncompatibility {
pub struct ModJsonIncompatibilityOnlyVersion {
version: String,
#[serde(default)]
pub importance: IncompatibilityImportance,
}

#[derive(Deserialize, Debug)]
pub struct ModJsonIncompatibilityWithImportance {
version: String,
importance: IncompatibilityImportance,
}

#[derive(Deserialize, Debug)]
pub struct ModJsonIncompatibilityWithBreaking {
version: String,
breaking: bool,
}

#[derive(Deserialize, Debug)]
pub enum ModJsonIncompatibility {
WithImportance(ModJsonIncompatibilityWithImportance),
WithBreaking(ModJsonIncompatibilityWithBreaking),
OnlyVersion(ModJsonIncompatibilityOnlyVersion),
}

#[derive(Deserialize, Debug)]
Expand Down Expand Up @@ -250,18 +285,33 @@ impl ModJson {
});
}
ModJsonDependencyType::Detailed(detailed) => {
let (dependency_ver, compare) =
split_version_and_compare(&(detailed.version)).map_err(|_| {
let (dep_ver, importance) = match detailed {
ModJsonDependency::OnlyVersion(data) => {
(&data.version, DependencyImportance::default())
}
ModJsonDependency::WithRequired(data) => (
&data.version,
match data.required {
true => DependencyImportance::Required,
false => DependencyImportance::Recommended,
},
),
ModJsonDependency::WithImportance(data) => {
(&data.version, data.importance)
}
};
let (dependency_ver, compare) = split_version_and_compare(dep_ver)
.map_err(|_| {
ModZipError::InvalidModJson(format!(
"Invalid semver {}",
detailed.version
dep_ver
))
})?;
ret.push(DependencyCreate {
dependency_id: id.clone(),
version: dependency_ver.to_string(),
compare,
importance: detailed.importance,
importance,
});
}
}
Expand Down Expand Up @@ -336,18 +386,33 @@ impl ModJson {
});
}
ModJsonIncompatibilityType::Detailed(detailed) => {
let (ver, compare) = split_version_and_compare(&(detailed.version))
.map_err(|_| {
let (inc_ver, importance) = match detailed {
ModJsonIncompatibility::OnlyVersion(data) => {
(&data.version, IncompatibilityImportance::default())
}
ModJsonIncompatibility::WithBreaking(data) => (
&data.version,
match data.breaking {
true => IncompatibilityImportance::Breaking,
false => IncompatibilityImportance::Conflicting,
},
),
ModJsonIncompatibility::WithImportance(data) => {
(&data.version, data.importance)
}
};
let (ver, compare) =
split_version_and_compare(inc_ver).map_err(|_| {
ModZipError::InvalidModJson(format!(
"Invalid semver {}",
detailed.version
inc_ver
))
})?;
ret.push(IncompatibilityCreate {
incompatibility_id: id.clone(),
version: ver.to_string(),
compare,
importance: detailed.importance,
importance,
});
}
}
Expand Down Expand Up @@ -393,6 +458,28 @@ impl ModJson {
));
}

let v5: bool = {
let geode = Version::parse(self.geode.trim_start_matches('v'))
.map_err(|_| ModZipError::InvalidModJson("Invalid geode version".into()))?;
geode.major >= 5
};

// Don't allow array syntax for geode >= v5
if let Some(ModJsonDependencies::Old(_)) = &self.dependencies
&& v5
{
return Err(ModZipError::InvalidModJson(
"Invalid dependencies key: should be an object".into(),
));
}
if let Some(ModJsonIncompatibilities::Old(_)) = &self.incompatibilities
&& v5
{
return Err(ModZipError::InvalidModJson(
"Invalid incompatibilities key: should be an object".into(),
));
}

if let Some(l) = &self.links {
if let Some(community) = &l.community {
if let Err(e) = Url::parse(community) {
Expand Down
5 changes: 4 additions & 1 deletion src/types/models/dependency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ pub struct ResponseDependency {
pub mod_id: String,
pub version: String,
pub importance: DependencyImportance,
pub required: bool,
}

#[derive(sqlx::FromRow, Clone, Debug)]
Expand All @@ -44,6 +45,7 @@ impl FetchedDependency {
}
},
importance: self.importance,
required: self.importance == DependencyImportance::Required
}
}
pub fn to_response(&self) -> ResponseDependency {
Expand All @@ -57,6 +59,7 @@ impl FetchedDependency {
}
},
importance: self.importance,
required: self.importance == DependencyImportance::Required
}
}
}
Expand Down Expand Up @@ -93,7 +96,7 @@ impl Display for ModVersionCompare {
}
}

#[derive(sqlx::Type, Debug, Deserialize, Serialize, Clone, Copy, Default)]
#[derive(sqlx::Type, Debug, Deserialize, Serialize, Clone, Copy, Default, PartialEq)]
#[sqlx(type_name = "dependency_importance", rename_all = "lowercase")]
#[serde(rename_all = "lowercase")]
pub enum DependencyImportance {
Expand Down
3 changes: 3 additions & 0 deletions src/types/models/incompatibility.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ pub struct ResponseIncompatibility {
pub mod_id: String,
pub version: String,
pub importance: IncompatibilityImportance,
pub breaking: bool,
}

impl FetchedIncompatibility {
Expand All @@ -68,6 +69,7 @@ impl FetchedIncompatibility {
}
},
importance: self.importance,
breaking: self.importance == IncompatibilityImportance::Breaking,
}
}

Expand All @@ -82,6 +84,7 @@ impl FetchedIncompatibility {
}
},
importance: self.importance,
breaking: self.importance == IncompatibilityImportance::Breaking,
}
}
}
Expand Down
Loading