Merge pull request #478 from anatawa12/dependencies-key-in-locked

fix(vpm): Empty `depeneencies` block of `locked` section in `vpm-manifest.json` is removed

CHANGELOG.md

@@ -16,6 +16,8 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Empty `depeneencies` block of `locked` section in `vpm-manifest.json` is removed `#478`
+  - This follows the changed behavior of the official VPM command.
 
 ### Security
 

vrc-get-vpm/src/unity_project.rs

@@ -18,6 +18,7 @@ use crate::version::{UnityVersion, Version, VersionRange};
 use futures::future::try_join;
 use futures::prelude::*;
 use indexmap::IndexMap;
+use lazy_static::lazy_static;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 
@@ -184,7 +185,7 @@ impl<IO: ProjectIo> UnityProject<IO> {
             .unlocked_packages
             .iter()
             .filter_map(|(_, json)| json.as_ref())
-            .map(|x| LockedDependencyInfo::new(x.name(), x.version(), x.vpm_dependencies()));
+            .map(|x| LockedDependencyInfo::new(x.name(), x.version(), Some(x.vpm_dependencies())));
 
         dependencies_locked.chain(dependencies_unlocked)
     }
@@ -237,12 +238,15 @@ impl<'a> LockedDependencyInfo<'a> {
     fn new(
         name: &'a str,
         version: &'a Version,
-        dependencies: &'a IndexMap<Box<str>, VersionRange>,
+        dependencies: Option<&'a IndexMap<Box<str>, VersionRange>>,
     ) -> Self {
+        lazy_static! {
+            static ref EMPTY_DEPENDENCIES: IndexMap<Box<str>, VersionRange> = IndexMap::new();
+        }
         Self {
             name,
             version,
-            dependencies,
+            dependencies: dependencies.unwrap_or(&*EMPTY_DEPENDENCIES),
         }
     }
 

vrc-get-vpm/src/unity_project/resolve.rs

@@ -177,7 +177,7 @@ impl<IO: ProjectIo> UnityProject<IO> {
         for x in changes.get_all_installing() {
             virtual_locked_dependencies.insert(
                 x.name(),
-                LockedDependencyInfo::new(x.name(), x.version(), x.vpm_dependencies()),
+                LockedDependencyInfo::new(x.name(), x.version(), Some(x.vpm_dependencies())),
             );
         }
 

vrc-get-vpm/src/unity_project/vpm_manifest.rs

@@ -25,8 +25,8 @@ struct VpmDependency {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 struct VpmLockedDependency {
     pub version: Version,
-    #[serde(default, skip_serializing_if = "indexmap::IndexMap::is_empty")]
-    pub dependencies: IndexMap<Box<str>, VersionRange>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub dependencies: Option<IndexMap<Box<str>, VersionRange>>,
 }
 
 #[derive(Debug)]
@@ -59,15 +59,17 @@ impl VpmManifest {
 
     pub(super) fn all_locked(&self) -> impl Iterator<Item = LockedDependencyInfo> {
         self.controller.locked.iter().map(|(name, dep)| {
-            LockedDependencyInfo::new(name.as_ref(), &dep.version, &dep.dependencies)
+            LockedDependencyInfo::new(name.as_ref(), &dep.version, dep.dependencies.as_ref())
         })
     }
 
     pub(super) fn get_locked(&self, package: &str) -> Option<LockedDependencyInfo> {
         self.controller
             .locked
             .get_key_value(package)
-            .map(|(package, x)| LockedDependencyInfo::new(package, &x.version, &x.dependencies))
+            .map(|(package, x)| {
+                LockedDependencyInfo::new(package, &x.version, x.dependencies.as_ref())
+            })
     }
 
     pub(super) fn add_dependency(&mut self, name: &str, version: DependencyRange) {
@@ -87,7 +89,7 @@ impl VpmManifest {
             name.into(),
             VpmLockedDependency {
                 version,
-                dependencies,
+                dependencies: Some(dependencies),
             },
         );
     }