Add ValuesMapBuilder::take

ValuesMapBuilder::build is updated to have the more idiomatic behavior
of consuming the builder, while 'take' adopts 'build's old behavor of
resetting the builder to empty.

Also add doc comments to all ValuesMapBuilder methods.

Signed-off-by: Lann Martin <lann.martin@fermyon.com>

Author: lann

crates/app/src/values.rs

@@ -9,14 +9,17 @@ pub type ValuesMap = serde_json::Map<String, Value>;
 pub struct ValuesMapBuilder(ValuesMap);
 
 impl ValuesMapBuilder {
+    /// Returns a new empty ValuesMapBuilder.
     pub fn new() -> Self {
         Self::default()
     }
 
+    /// Inserts a string value into the map.
     pub fn string(&mut self, key: impl Into<String>, value: impl Into<String>) -> &mut Self {
         self.entry(key, value.into())
     }
 
+    /// Inserts a string value into the map only if the given Option is Some.
     pub fn string_option(
         &mut self,
         key: impl Into<String>,
@@ -28,6 +31,7 @@ impl ValuesMapBuilder {
         self
     }
 
+    /// Inserts a string array into the map.
     pub fn string_array<T: Into<String>>(
         &mut self,
         key: impl Into<String>,
@@ -36,11 +40,13 @@ impl ValuesMapBuilder {
         self.entry(key, iter.into_iter().map(|s| s.into()).collect::<Vec<_>>())
     }
 
+    /// Inserts an entry into the map using the value's `impl Into<Value>`.
     pub fn entry(&mut self, key: impl Into<String>, value: impl Into<Value>) -> &mut Self {
         self.0.insert(key.into(), value.into());
         self
     }
 
+    /// Inserts an entry into the map using the value's `impl Serialize`.
     pub fn serializable(
         &mut self,
         key: impl Into<String>,
@@ -51,7 +57,13 @@ impl ValuesMapBuilder {
         Ok(self)
     }
 
-    pub fn build(&mut self) -> ValuesMap {
+    /// Returns the built ValuesMap.
+    pub fn build(self) -> ValuesMap {
+        self.0
+    }
+
+    /// Returns the build ValuesMap and resets the builder to empty.
+    pub fn take(&mut self) -> ValuesMap {
         std::mem::take(&mut self.0)
     }
 }

crates/trigger/src/locked.rs

@@ -130,7 +130,7 @@ impl LockedAppBuilder {
         let metadata = ValuesMapBuilder::new()
             .string_option("description", component.description)
             .string_array("allowed_http_hosts", component.wasm.allowed_http_hosts)
-            .build();
+            .take();
 
         let source = {
             let path = match component.source {