features: Differ optional dependencies and features

Store in database if feature comes from optional
dependency. At the same time resolve rename
as optional dependency might use same package
multiple times under different name.

Author: almusil

src/db/add_package.rs

@@ -237,7 +237,16 @@ fn get_optional_dependencies(pkg: &MetadataPackage) -> Vec<Feature> {
     pkg.dependencies
         .iter()
         .filter(|dep| dep.optional)
-        .map(|dep| Feature::new(dep.name.clone(), Vec::new()))
+        .map(|dep| {
+            let name = if let Some(rename) = &dep.rename {
+                rename.clone()
+            } else {
+                dep.name.clone()
+            };
+            let mut feature = Feature::new(name, Vec::new());
+            feature.set_optional_dependency(true);
+            feature
+        })
         .collect()
 }
 

src/db/migrate.rs

@@ -488,6 +488,20 @@ pub fn migrate(version: Option<Version>, conn: &mut Client) -> CratesfyiResult<(
             "
                 ALTER TABLE queue DROP COLUMN registry;
             "
+        ),
+        migration!(
+            context,
+            21,
+            // description
+            "Add mark for features that are derived from optional dependencies",
+            // upgrade query
+            "
+                ALTER TYPE feature ADD ATTRIBUTE optional_dependency BOOL;
+            ",
+            // downgrade query
+            "
+                 ALTER TYPE feature DROP ATTRIBUTE optional_dependency;
+            "
         )
     ];
 

src/db/types.rs

@@ -6,11 +6,20 @@ use serde::Serialize;
 pub struct Feature {
     pub(crate) name: String,
     pub(crate) subfeatures: Vec<String>,
+    pub(crate) optional_dependency: bool,
 }
 
 impl Feature {
     pub fn new(name: String, subfeatures: Vec<String>) -> Self {
-        Feature { name, subfeatures }
+        Feature {
+            name,
+            subfeatures,
+            optional_dependency: false,
+        }
+    }
+
+    pub fn set_optional_dependency(&mut self, optional_dependency: bool) {
+        self.optional_dependency = optional_dependency
     }
 
     pub fn is_private(&self) -> bool {

src/test/fakes.rs

@@ -49,6 +49,7 @@ impl<'a> FakeRelease<'a> {
                     name: "fake-dependency".into(),
                     req: "^1.0.0".into(),
                     kind: None,
+                    rename: None,
                     optional: false,
                 }],
                 targets: vec![Target::dummy_lib("fake_package".into(), None)],

src/utils/cargo_metadata.rs

@@ -132,6 +132,7 @@ pub(crate) struct Dependency {
     pub(crate) name: String,
     pub(crate) req: String,
     pub(crate) kind: Option<String>,
+    pub(crate) rename: Option<String>,
     pub(crate) optional: bool,
 }