Skip to content
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

Jump to bottom

Improved config #5068

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improved config #5068

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
64756e6
Expose ciborium and toml
syrusakbary Sep 5, 2024
b301c47
Added more derives into config. Added cbor to annotations
syrusakbary Sep 5, 2024
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
7 changes: 7 additions & 0 deletions lib/config/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ pub mod app;
pub mod cargo_annotations;
pub mod hash;
pub mod package;

pub mod ciborium {
pub use ciborium::*;
}
pub mod toml {
pub use toml::*;
}
17 changes: 11 additions & 6 deletions lib/config/src/package/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const LICENSE_PATHS: &[&str; 3] = &["LICENSE", "LICENSE.md", "COPYING"];
/// Package definition for a Wasmer package.
///
/// Usually stored in a `wasmer.toml` file.
#[derive(Clone, Debug, Deserialize, Serialize, derive_builder::Builder)]
#[derive(Clone, Debug, Deserialize, Serialize, derive_builder::Builder, PartialEq, Eq, Default)]
#[non_exhaustive]
pub struct Package {
/// The package's name in the form `namespace/name`.
Expand Down Expand Up @@ -203,7 +203,7 @@ impl PackageBuilder {
}
}

#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
#[serde(untagged)]
pub enum Command {
V1(CommandV1),
Expand Down Expand Up @@ -234,7 +234,7 @@ impl Command {
/// by looking at the [`Abi`] from the [`Module`] it refers to.
///
/// If possible, prefer to use the [`CommandV2`] format.
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
#[serde(deny_unknown_fields)] // Note: needed to prevent accidentally parsing
// a CommandV2 as a CommandV1
#[deprecated(since = "0.9.2", note = "Prefer the CommandV2 syntax")]
Expand All @@ -246,7 +246,7 @@ pub struct CommandV1 {
}

/// An executable command.
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
pub struct CommandV2 {
/// The name of the command.
pub name: String,
Expand All @@ -267,6 +267,7 @@ impl CommandV2 {
pub fn get_annotations(&self, basepath: &Path) -> Result<Option<ciborium::Value>, String> {
match self.annotations.as_ref() {
Some(CommandAnnotations::Raw(v)) => Ok(Some(toml_to_cbor_value(v))),
Some(CommandAnnotations::CBOR(v)) => Ok(Some(v.clone())),
Some(CommandAnnotations::File(FileCommandAnnotations { file, kind })) => {
let path = basepath.join(file.clone());
let file = std::fs::read_to_string(&path).map_err(|e| {
Expand Down Expand Up @@ -311,7 +312,7 @@ impl CommandV2 {
/// # Serialization
///
/// A [`ModuleReference`] is serialized via its [`String`] representation.
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum ModuleReference {
/// A module in the current package.
CurrentPackage {
Expand Down Expand Up @@ -462,8 +463,12 @@ pub enum CommandAnnotations {
File(FileCommandAnnotations),
/// Annotations that are specified inline.
Raw(toml::Value),
/// Annotations that are specified inline.
CBOR(ciborium::Value),
}

impl Eq for CommandAnnotations {}

/// Annotations on disk.
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
pub struct FileCommandAnnotations {
Expand Down Expand Up @@ -707,7 +712,7 @@ pub enum ImportsError {
}

/// The manifest represents the file used to describe a Wasm package.
#[derive(Clone, Debug, Deserialize, Serialize, derive_builder::Builder)]
#[derive(Clone, Debug, Deserialize, Serialize, derive_builder::Builder, PartialEq, Eq)]
#[non_exhaustive]
pub struct Manifest {
/// Metadata about the package itself.
Expand Down
Loading