Generate additional features for new WAGI bindle handling (#18)

Author: itowlson

README.md

@@ -79,53 +79,70 @@ bindleVersion = '1.0.0'
 
 [bindle]
 name = 'birdsondemand'
-version = '1.2.3-ivan-2021.05.18.10.51.09.084'
+version = '1.2.3-ivan-2021.05.31.16.49.09.990'
 description = 'provides birds as a service'
 authors = ['Joan Q Programmer']
 
 # Parcels representing handler WASM modules have a `requires` attribute
+# and a `wagi.route` feature
 
 [[parcel]]
 [parcel.label]
 sha256 = '0a4346f806b28b3ce94905c3ac56fcd5ee2337d8613161696aba52eb0c3551cc'
 name = 'bin/penguin.wasm'
+[parcel.label.feature.wagi]
+file = 'false'
+route = '/birds/flightless'
 [parcel.conditions]
 requires = ['bin/penguin.wasm-files']
 
 [[parcel]]
 [parcel.label]
 sha256 = '1f71511371129511321c45be058c60e23cf9ba898d8a3f3309555985b5027490'
 name = 'bin/cassowary.wasm'
+[parcel.label.feature.wagi]
+file = 'false'
+route = '/birds/irritable/fighty'
 [parcel.conditions]
 requires = ['bin/cassowary.wasm-files']
 
 [[parcel]]
 [parcel.label]
 sha256 = 'bab02c178882085bf20defd15c0e8971edd95488a1ecb4a6273e6afcfb3c4030'
 name = 'bin/kea.wasm'
+[parcel.label.feature.wagi]
+file = 'false'
+route = '/birds/naughty'
 [parcel.conditions]
 requires = ['bin/kea.wasm-files']
 
-# Parcels derived from `files` patterns have a `memberOf` attribute
+# Parcels derived from `files` patterns have a `memberOf` attribute and a
+# `wagi.file` feature of "true"
 
 [[parcel]]
 [parcel.label]
 sha256 = 'e99f19705a23cbeeeade5d2b4f8b83fff09beb093552e82073cdb302ee10eb76'
 name = 'photo/adelie.png'
+[parcel.label.feature.wagi]
+file = 'true'
 [parcel.conditions]
 memberOf = ['bin/penguin.wasm-files']
 
 [[parcel]]
 [parcel.label]
 sha256 = 'e8f7b60dfe5ee560edd1ac616463a0682a0e7c57a5ce2a8fe5c0990e500d0ac5'
 name = 'photo/rockhopper.png'
+[parcel.label.feature.wagi]
+file = 'true'
 [parcel.conditions]
 memberOf = ['bin/penguin.wasm-files']
 
 [[parcel]]
 [parcel.label]
 sha256 = '843baaf5a63cbc38d4d4c00036b95e435254eece7480fb717c8a17dcdc2aeefc'
 name = 'stock/little-blue.jpg'
+[parcel.label.feature.wagi]
+file = 'true'
 [parcel.conditions]
 memberOf = ['bin/penguin.wasm-files']
 
@@ -135,6 +152,8 @@ memberOf = ['bin/penguin.wasm-files']
 [parcel.label]
 sha256 = '6451ab5be799a6aa52ce8b8a084a12066bb2dd8e1a73a692627bb96b4b9a72f0'
 name = 'stock/wipers.jpg'
+[parcel.label.feature.wagi]
+file = 'true'
 [parcel.conditions]
 memberOf = [
     'bin/penguin.wasm-files',
@@ -145,6 +164,8 @@ memberOf = [
 [parcel.label]
 sha256 = '93c3a391d842e3b8032d560db4870b5426c5c05a9f2a60b187e567ae69d8e658'
 name = 'stock/kea.jpg'
+[parcel.label.feature.wagi]
+file = 'true'
 [parcel.conditions]
 memberOf = [
     'bin/penguin.wasm-files',

src/expander.rs

@@ -1,4 +1,6 @@
+use std::collections::BTreeMap;
 use std::convert::TryFrom;
+use std::iter::FromIterator;
 use std::path::{Path, PathBuf};
 
 use bindle::{BindleSpec, Condition, Group, Invoice, Label, Parcel};
@@ -128,6 +130,7 @@ fn expand_handler_modules_to_parcels(
         convert_one_match_to_parcel(
             PathBuf::from(expansion_context.to_absolute(&handler.name)),
             expansion_context,
+            vec![("route", &handler.route), ("file", "false")],
             None,
             Some(&group_name(handler)),
         )
@@ -180,13 +183,17 @@ fn try_convert_one_match_to_parcel(
 ) -> anyhow::Result<Parcel> {
     match path {
         Err(e) => Err(anyhow::Error::new(e)),
-        Ok(path) => convert_one_match_to_parcel(path, expansion_context, Some(member_of), None),
+        Ok(path) => {
+            let features = vec![("file", "true")];
+            convert_one_match_to_parcel(path, expansion_context, features, Some(member_of), None)
+        }
     }
 }
 
 fn convert_one_match_to_parcel(
     path: PathBuf,
     expansion_context: &ExpansionContext,
+    wagi_features: Vec<(&str, &str)>,
     member_of: Option<&str>,
     requires: Option<&str>,
 ) -> anyhow::Result<Parcel> {
@@ -204,12 +211,16 @@ fn convert_one_match_to_parcel(
         .first_or_octet_stream()
         .to_string();
 
+    // let features = vec![("route", route)];
+    let feature = Some(wagi_feature_of(wagi_features));
+
     Ok(Parcel {
         label: Label {
             name,
             sha256: digest_string,
             media_type,
             size,
+            feature,
             ..Label::default()
         },
         conditions: Some(Condition {
@@ -303,6 +314,17 @@ fn vector_of(option: Option<&str>) -> Option<Vec<String>> {
     option.map(|val| vec![val.to_owned()])
 }
 
+fn wagi_feature_of(values: Vec<(&str, &str)>) -> BTreeMap<String, BTreeMap<String, String>> {
+    BTreeMap::from_iter(vec![("wagi".to_owned(), feature_map_of(values))])
+}
+
+fn feature_map_of(values: Vec<(&str, &str)>) -> BTreeMap<String, String> {
+    values
+        .into_iter()
+        .map(|(k, v)| (k.to_owned(), v.to_owned()))
+        .collect()
+}
+
 #[cfg(test)]
 mod test {
     use std::str::FromStr;
@@ -332,6 +354,25 @@ mod test {
             .unwrap()
     }
 
+    fn parcel_feature_value<'a>(
+        invoice: &'a Invoice,
+        parcel_name: &str,
+        feature_name: &str,
+        item_name: &str,
+    ) -> &'a str {
+        parcel_named(invoice, parcel_name)
+            .label
+            .feature
+            .as_ref()
+            .unwrap()
+            .get(feature_name)
+            .as_ref()
+            .unwrap()
+            .get(item_name)
+            .as_ref()
+            .unwrap()
+    }
+
     fn parcel_conditions<'a>(invoice: &'a Invoice, parcel_name: &str) -> &'a Condition {
         parcel_named(invoice, parcel_name)
             .conditions
@@ -356,6 +397,24 @@ mod test {
         assert_eq!("weather", invoice.bindle.id.name());
     }
 
+    #[test]
+    fn test_route_is_mapped() {
+        let invoice = expand_test_invoice("app1").unwrap();
+        assert_eq!(
+            "/fake",
+            parcel_feature_value(&invoice, "out/fake.wasm", "wagi", "route")
+        );
+    }
+
+    #[test]
+    fn test_handler_parcel_is_not_asset() {
+        let invoice = expand_test_invoice("app1").unwrap();
+        assert_eq!(
+            "false",
+            parcel_feature_value(&invoice, "out/fake.wasm", "wagi", "file")
+        );
+    }
+
     #[test]
     fn test_group_is_created_per_handler() {
         let invoice = expand_test_invoice("app1").unwrap();
@@ -386,6 +445,15 @@ mod test {
         );
     }
 
+    #[test]
+    fn test_assets_parcels_are_marked_as_assets() {
+        let invoice = expand_test_invoice("app1").unwrap();
+        assert_eq!(
+            "true",
+            parcel_feature_value(&invoice, "scripts/real.js", "wagi", "file")
+        );
+    }
+
     #[test]
     fn test_handler_parcels_are_not_members_of_groups() {
         let invoice = expand_test_invoice("app1").unwrap();