Address more feedback.

Signed-off-by: victor.linroth.sensmetry <victor.linroth@sensmetry.com>

Author: victor-linroth-sensmetry

core/src/env/local_directory/metadata.rs

@@ -90,7 +90,7 @@ impl Lock {
 #[derive(Debug, Deserialize)]
 pub struct EnvMetadata {
     pub version: String,
-    #[serde(rename = "project", skip_serializing_if = "Vec::is_empty", default)]
+    #[serde(rename = "project", default)]
     pub projects: Vec<EnvProject>,
 }
 
@@ -176,7 +176,7 @@ impl EnvMetadata {
 
     pub fn add_project(&mut self, project: EnvProject) {
         if let Some(found) = self.find_project(&project.identifiers, &project.version) {
-            self.projects[found].merge(&project);
+            self.projects[found].merge_identifiers(&project);
         } else {
             self.projects.push(project);
         }
@@ -249,22 +249,22 @@ pub struct EnvProject {
     /// identifier, and if the project is not `editable` this
     /// is the IRI it is installed as. The rest are considered
     /// as aliases. Can only be empty for `editable` projects.
-    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    #[serde(default)]
     pub identifiers: Vec<String>,
     /// Usages of the project. Intended for tools needing to
     /// track the interdependence of project in the environment.
-    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    #[serde(default)]
     pub usages: Vec<String>,
     /// Indicator of wether the project is fully installed in
     /// the environment or located elsewhere.
-    #[serde(skip_serializing_if = "bool::is_false", default)]
+    #[serde(default)]
     pub editable: bool,
     /// In case of an `editable` project these are the files
     /// belonging to the project. Intended for tools that
     /// are not able to natively parse and understand the
     /// projects `.meta.json` file. Paths should be relative
     /// to the `path` of the project.
-    #[serde(skip_serializing_if = "bool::is_false", default)]
+    #[serde(default)]
     pub workspace: bool,
 }
 
@@ -291,17 +291,20 @@ impl EnvProject {
         if self.editable {
             table.insert("editable", value(true));
         }
+        if self.workspace {
+            table.insert("workspace", value(true));
+        }
 
         table
     }
 
     /// Adds identifiers from other project.
     /// Should only be done if the underlying projects are the same.
     /// In particular they must have the same version.
-    pub fn merge(&mut self, other: &EnvProject) {
+    pub fn merge_identifiers(&mut self, other: &EnvProject) {
         assert_eq!(
             self.version, other.version,
-            "attempting to merge projects with different versions"
+            "attempting to merge identifiers for projects with different versions"
         );
 
         for iri in &other.identifiers {

core/src/project/utils.rs

@@ -220,11 +220,14 @@ pub mod wrapfs {
             .map_err(|e| Box::new(FsIoError::WriteFile(path.as_ref().into(), e)))
     }
 
+    /// Canonicalizes UTF-8 path. If canonicalized path is not valid
+    /// UTF-8, returns `io::Error` of `InvalidData` kind.
+    /// On Windows this returns most compatible form of a path instead of UNC.
     pub fn canonicalize<P: AsRef<Utf8Path>>(path: P) -> Result<Utf8PathBuf, Box<FsIoError>> {
         dunce::canonicalize(path.as_ref())
-            .map(|path| {
+            .and_then(|path| {
                 Utf8PathBuf::from_path_buf(path)
-                    .expect("expected Dunce not to introduce non UTF8 characters")
+                    .map_err(|_| io::Error::from(io::ErrorKind::InvalidData))
             })
             .map_err(|e| Box::new(FsIoError::Canonicalize(path.as_ref().into(), e)))
     }

sysand/src/commands/env.rs

@@ -13,7 +13,10 @@ use sysand_core::{
     commands::{env::do_env_local_dir, lock::LockOutcome},
     config::Config,
     context::ProjectContext,
-    env::local_directory::{LocalDirectoryEnvironment, metadata::load_env_metadata},
+    env::local_directory::{
+        LocalDirectoryEnvironment,
+        metadata::{EnvMetadata, load_env_metadata},
+    },
     lock::Lock,
     model::InterchangeProjectUsage,
     project::{
@@ -36,7 +39,9 @@ use crate::{
 };
 
 pub fn command_env<P: AsRef<Utf8Path>>(path: P) -> Result<LocalDirectoryEnvironment> {
-    Ok(do_env_local_dir(path)?)
+    let env = do_env_local_dir(path)?;
+    wrapfs::write(env.metadata_path(), EnvMetadata::default().to_string())?;
+    Ok(env)
 }
 
 // TODO: Factor out provided_iris logic