Merge pull request #164 from bytecodealliance/version-0-11

Bump version to 0.11

Author: lann

Cargo.lock

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.10.0"
+version = "0.11.0"
 authors = ["The Wasmtime Project Developers"]
 license = "Apache-2.0 WITH LLVM-exception"
 
@@ -36,9 +36,9 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
     "fmt",
     "env-filter",
 ] }
-wasm-pkg-common = { version = "0.10.0", path = "crates/wasm-pkg-common" }
-wasm-pkg-client = { version = "0.10.0", path = "crates/wasm-pkg-client" }
-wasm-pkg-core = { version = "0.10.0", path = "crates/wasm-pkg-core" }
-wasm-metadata = "0.227"
-wit-component = "0.227"
-wit-parser = "0.227"
+wasm-pkg-common = { version = "0.11.0", path = "crates/wasm-pkg-common" }
+wasm-pkg-client = { version = "0.11.0", path = "crates/wasm-pkg-client" }
+wasm-pkg-core = { version = "0.11.0", path = "crates/wasm-pkg-core" }
+wasm-metadata = "0.235"
+wit-component = "0.235"
+wit-parser = "0.235"

Cargo.toml

@@ -4,7 +4,7 @@ use std::{collections::HashSet, path::Path, str::FromStr};
 
 use anyhow::{Context, Result};
 use semver::{Version, VersionReq};
-use wasm_metadata::AddMetadata;
+use wasm_metadata::{AddMetadata, AddMetadataField};
 use wasm_pkg_client::{
     caching::{CachingClient, FileCache},
     PackageRef,
@@ -83,20 +83,25 @@ pub async fn build_package(
     let processed_by_version = option_env!("WIT_VERSION_INFO").unwrap_or(env!("CARGO_PKG_VERSION"));
 
     let metadata = config.metadata.clone().unwrap_or_default();
-    let add_metadata = AddMetadata {
-        name: Some(format!("{}:{}", pkg.name.namespace, pkg.name.name)),
-        processed_by: vec![(
+    let add_metadata = {
+        /// MetadataField::Set iff the given Option is Some
+        fn set<T: std::fmt::Debug + Clone>(opt: Option<T>) -> AddMetadataField<T> {
+            opt.map(AddMetadataField::Set).unwrap_or_default()
+        }
+        let mut add = AddMetadata::default();
+        add.name = set(Some(format!("{}:{}", pkg.name.namespace, pkg.name.name)));
+        add.processed_by = vec![(
             env!("CARGO_PKG_NAME").to_string(),
             processed_by_version.to_string(),
-        )],
-        authors: metadata.authors.map(|v| v.parse()).transpose()?,
-        description: metadata.description.map(|v| v.parse()).transpose()?,
-        licenses: metadata.licenses.map(|v| v.parse()).transpose()?,
-        source: metadata.source.map(|v| v.parse()).transpose()?,
-        homepage: metadata.homepage.map(|v| v.parse()).transpose()?,
-        revision: metadata.revision.map(|v| v.parse()).transpose()?,
-        version,
-        ..Default::default()
+        )];
+        add.authors = set(metadata.authors.map(|v| v.parse()).transpose()?);
+        add.description = set(metadata.description.map(|v| v.parse()).transpose()?);
+        add.licenses = set(metadata.licenses.map(|v| v.parse()).transpose()?);
+        add.source = set(metadata.source.map(|v| v.parse()).transpose()?);
+        add.homepage = set(metadata.homepage.map(|v| v.parse()).transpose()?);
+        add.revision = set(metadata.revision.map(|v| v.parse()).transpose()?);
+        add.version = set(version);
+        add
     };
     let bytes = add_metadata.to_wasm(&bytes)?;