export patchdb types

core/startos/src/s9pk/v1/manifest.rs

@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
+use emver::VersionRange;
 use imbl_value::InOMap;
 pub use models::PackageId;
 use models::VolumeId;
@@ -8,7 +9,6 @@ use serde::{Deserialize, Serialize};
 use url::Url;
 
 use super::git_hash::GitHash;
-use crate::dependencies::Dependencies;
 use crate::prelude::*;
 use crate::s9pk::manifest::{Alerts, Description, HardwareRequirements};
 use crate::util::Version;
@@ -43,7 +43,7 @@ pub struct Manifest {
     pub alerts: Alerts,
     pub volumes: BTreeMap<VolumeId, Value>,
     #[serde(default)]
-    pub dependencies: Dependencies,
+    pub dependencies: BTreeMap<PackageId, DepInfo>,
     pub config: Option<InOMap<String, Value>>,
 
     #[serde(default)]
@@ -53,6 +53,29 @@ pub struct Manifest {
     pub hardware_requirements: HardwareRequirements,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+#[serde(tag = "type")]
+pub enum DependencyRequirement {
+    OptIn { how: String },
+    OptOut { how: String },
+    Required,
+}
+impl DependencyRequirement {
+    pub fn required(&self) -> bool {
+        matches!(self, &DependencyRequirement::Required)
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+pub struct DepInfo {
+    pub version: VersionRange,
+    pub requirement: DependencyRequirement,
+    pub description: Option<String>,
+}
+
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Assets {

core/startos/src/s9pk/v2/compat.rs

@@ -7,6 +7,7 @@ use tokio::fs::File;
 use tokio::io::{AsyncRead, AsyncSeek, AsyncWriteExt};
 use tokio::process::Command;
 
+use crate::dependencies::{DepInfo, Dependencies};
 use crate::prelude::*;
 use crate::s9pk::manifest::Manifest;
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
@@ -347,7 +348,21 @@ impl From<ManifestV1> for Manifest {
                 .map(|(id, _)| id.clone())
                 .collect(),
             alerts: value.alerts,
-            dependencies: value.dependencies,
+            dependencies: Dependencies(
+                value
+                    .dependencies
+                    .into_iter()
+                    .map(|(id, value)| {
+                        (
+                            id,
+                            DepInfo {
+                                description: value.description,
+                                optional: !value.requirement.required(),
+                            },
+                        )
+                    })
+                    .collect(),
+            ),
             hardware_requirements: value.hardware_requirements,
             git_hash: value.git_hash,
             os_version: value.eos_version,

core/startos/src/s9pk/v2/manifest.rs

@@ -5,6 +5,7 @@ use helpers::const_true;
 pub use models::PackageId;
 use models::{ImageId, VolumeId};
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 use url::Url;
 
 use crate::dependencies::Dependencies;
@@ -18,21 +19,28 @@ fn current_version() -> Version {
     Current::new().semver().into()
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct Manifest {
     pub id: PackageId,
     pub title: String,
+    #[ts(type = "string")]
     pub version: Version,
     pub release_notes: String,
     pub license: String, // type of license
     #[serde(default)]
     pub replaces: Vec<String>,
+    #[ts(type = "string")]
     pub wrapper_repo: Url,
+    #[ts(type = "string")]
     pub upstream_repo: Url,
+    #[ts(type = "string")]
     pub support_site: Url,
+    #[ts(type = "string")]
     pub marketing_site: Url,
+    #[ts(type = "string | null")]
     pub donation_url: Option<Url>,
     pub description: Description,
     pub images: Vec<ImageId>,
@@ -45,23 +53,28 @@ pub struct Manifest {
     #[serde(default)]
     pub hardware_requirements: HardwareRequirements,
     #[serde(default)]
+    #[ts(type = "string | null")]
     pub git_hash: Option<GitHash>,
     #[serde(default = "current_version")]
+    #[ts(type = "string")]
     pub os_version: Version,
     #[serde(default = "const_true")]
     pub has_config: bool,
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct HardwareRequirements {
     #[serde(default)]
+    #[ts(type = "{ [key: string]: string }")]
     device: BTreeMap<String, Regex>,
     ram: Option<u64>,
     pub arch: Option<Vec<String>>,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
 pub struct Description {
     pub short: String,
     pub long: String,
@@ -84,8 +97,9 @@ impl Description {
     }
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct Alerts {
     pub install: Option<String>,
     pub uninstall: Option<String>,