chore(library): move the model of the library in the library module o…

…f the commands

src/cmd/library/generate/generator.rs

@@ -8,8 +8,8 @@ use crate::cmd::library::generate::tasks::item::parse_item;
 use crate::cmd::library::generate::tasks::library::parse_library;
 use crate::cmd::library::generate::tasks::module::parse_module;
 use crate::cmd::library::generate::tasks::package::parse_package;
+use crate::cmd::library::manifest::library::Library;
 use crate::counter::Counter;
-use crate::manifest::library::Library;
 use crate::plantuml::PlantUML;
 use crate::result::Result;
 use crate::urn::Urn;
@@ -157,7 +157,7 @@ mod tests {
             &config.plantuml_jar,
             &config.plantuml_version,
         )
-            .unwrap();
+        .unwrap();
         let yaml = &read_to_string(Path::new("test/library-full.yaml")).unwrap();
         let library: &Library = &serde_yaml::from_str(yaml).unwrap();
         let generator = &Generator::create(config, library, &[]).unwrap();
@@ -188,7 +188,7 @@ mod tests {
             &config.plantuml_jar,
             &config.plantuml_version,
         )
-            .unwrap();
+        .unwrap();
         let yaml = &read_to_string(Path::new("test/library-icon_reference.yaml")).unwrap();
         let library: &Library = &serde_yaml::from_str(yaml).unwrap();
         let generator = &Generator::create(config, library, &[]).unwrap();

src/cmd/library/generate/mod.rs

@@ -8,8 +8,8 @@ use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::generator::Generator;
 use crate::cmd::library::generate::task::CleanupScope;
 use crate::cmd::library::generate::templates::TEMPLATES;
+use crate::cmd::library::manifest::library::Library;
 use crate::error::Error;
-use crate::manifest::library::Library;
 use crate::plantuml::create_plantuml;
 use crate::result::Result;
 use crate::tera::create_tera;

src/cmd/library/generate/tasks/item/element_snippet.rs

@@ -10,11 +10,11 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::element::{Element, Shape};
+use crate::cmd::library::manifest::item::Item;
+use crate::cmd::library::manifest::library::Library;
+use crate::cmd::library::manifest::package::Package;
 use crate::error::Error;
-use crate::manifest::element::{Element, Shape};
-use crate::manifest::item::Item;
-use crate::manifest::library::Library;
-use crate::manifest::package::Package;
 use crate::plantuml::PlantUML;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
@@ -325,8 +325,10 @@ mod test {
                 technical_label: None,
                 description_label: None,
                 template: "custom_item_snippet.tera".to_string(),
-                full_destination_source_path: "target/tests/element_snippet/source.Custom.puml".to_string(),
-                full_destination_image_path: "target/tests/element_snippet/source.Custom.png".to_string(),
+                full_destination_source_path: "target/tests/element_snippet/source.Custom.puml"
+                    .to_string(),
+                full_destination_image_path: "target/tests/element_snippet/source.Custom.png"
+                    .to_string(),
                 properties: HashMap::default(),
             };
             generator.cleanup(&[CleanupScope::All]).unwrap();

src/cmd/library/generate/tasks/item/item_documentation.rs

@@ -6,9 +6,9 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::item::Item;
+use crate::cmd::library::manifest::library::Library;
 use crate::error::Error;
-use crate::manifest::item::Item;
-use crate::manifest::library::Library;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 

src/cmd/library/generate/tasks/item/item_icon.rs

@@ -9,10 +9,10 @@ use image::GenericImageView;
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::icon::Icon;
+use crate::cmd::library::manifest::item::Item;
+use crate::cmd::library::manifest::library::Library;
 use crate::error::Error;
-use crate::manifest::icon::Icon;
-use crate::manifest::item::Item;
-use crate::manifest::library::Library;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 

src/cmd/library/generate/tasks/item/item_source.rs

@@ -1,5 +1,5 @@
 use std::collections::HashMap;
-use std::fs::{File, read_to_string};
+use std::fs::{read_to_string, File};
 use std::path::Path;
 
 use serde::{Deserialize, Serialize};
@@ -8,10 +8,10 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
-use crate::constants::{SPRITE_LG, SPRITES};
+use crate::cmd::library::manifest::element::Shape;
+use crate::cmd::library::manifest::item::Item;
+use crate::constants::{SPRITES, SPRITE_LG};
 use crate::error::Error;
-use crate::manifest::element::Shape;
-use crate::manifest::item::Item;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 
@@ -172,7 +172,7 @@ impl ItemSourceTask {
         })
     }
     fn get_relative_source_path(&self) -> Box<Path> {
-        Box::from(Path::new(format!("{}.puml", self.item_urn, ).as_str()))
+        Box::from(Path::new(format!("{}.puml", self.item_urn,).as_str()))
     }
     fn get_full_source_path(&self) -> Box<Path> {
         Path::new(&self.output_directory)
@@ -303,7 +303,7 @@ mod test {
             "{}/{}.puml",
             generator.output_directory, generator.item_urn,
         ))
-            .unwrap();
+        .unwrap();
         assert!(content.contains("LX_6N8UPcPbT0G"));
         assert!(content.contains(
             r"IconElement($id, 'IconElement', 'Package/Module/Family/BuiltInItem', $name, $tech, $desc)"
@@ -325,7 +325,7 @@ mod test {
             keyB: [ itemA, itemB ]
         "#,
         )
-            .unwrap();
+        .unwrap();
         let generator = ItemSourceTask {
             item_urn: "Package/Module/Family/CustomItem".to_string(),
             cached_sprite_paths: vec![],
@@ -343,7 +343,7 @@ mod test {
             "{}/{}.puml",
             generator.output_directory, generator.item_urn,
         ))
-            .unwrap();
+        .unwrap();
         assert!(content.contains("' valueA"));
         assert!(content.contains("' itemA,itemB"));
         assert!(content.contains("!procedure CustomItem($id)"));

src/cmd/library/generate/tasks/item/mod.rs

@@ -8,12 +8,12 @@ use crate::cmd::library::generate::tasks::item::item_icon::ItemIconTask;
 use crate::cmd::library::generate::tasks::item::item_source::ItemSourceTask;
 use crate::cmd::library::generate::tasks::item::sprite_icon::SpriteIconTask;
 use crate::cmd::library::generate::tasks::item::sprite_value::SpriteValueTask;
+use crate::cmd::library::manifest::icon::Icon;
+use crate::cmd::library::manifest::item::Item;
+use crate::cmd::library::manifest::library::Library;
+use crate::cmd::library::manifest::module::Module;
+use crate::cmd::library::manifest::package::Package;
 use crate::error::Error;
-use crate::manifest::icon::Icon;
-use crate::manifest::item::Item;
-use crate::manifest::library::Library;
-use crate::manifest::module::Module;
-use crate::manifest::package::Package;
 
 mod element_snippet;
 mod item_documentation;
@@ -28,7 +28,7 @@ pub fn parse_item(
     _package: &Package,
     _module: &Module,
     _item: &Item,
-) -> std::result::Result<Vec<Box<dyn Task>>, Error> {
+) -> Result<Vec<Box<dyn Task>>, Error> {
     log::debug!("parse item {}", &_item.urn);
 
     let mut tasks: Vec<Box<dyn Task>> = vec![];

src/cmd/library/generate/tasks/item/sprite_icon.rs

@@ -5,9 +5,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::icon::Icon;
+use crate::cmd::library::manifest::item::Item;
 use crate::error::Error;
-use crate::manifest::icon::Icon;
-use crate::manifest::item::Item;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 

src/cmd/library/generate/tasks/item/sprite_value.rs

@@ -8,9 +8,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::icon::Icon;
+use crate::cmd::library::manifest::item::Item;
 use crate::error::Error;
-use crate::manifest::icon::Icon;
-use crate::manifest::item::Item;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 

src/cmd/library/generate/tasks/library/library_bootstrap.rs

@@ -6,8 +6,8 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::library::Library;
 use crate::error::Error;
-use crate::manifest::library::Library;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 

src/cmd/library/generate/tasks/library/library_documentation.rs

@@ -6,8 +6,8 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::library::Library;
 use crate::error::Error;
-use crate::manifest::library::Library;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 

src/cmd/library/generate/tasks/library/library_summary.rs

@@ -6,8 +6,8 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::library::Library;
 use crate::error::Error;
-use crate::manifest::library::Library;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 

src/cmd/library/generate/tasks/library/mod.rs

@@ -3,7 +3,7 @@ use crate::cmd::library::generate::task::Task;
 use crate::cmd::library::generate::tasks::library::library_bootstrap::LibraryBootstrapTask;
 use crate::cmd::library::generate::tasks::library::library_documentation::LibraryDocumentationTask;
 use crate::cmd::library::generate::tasks::library::library_summary::LibrarySummaryTask;
-use crate::manifest::library::Library;
+use crate::cmd::library::manifest::library::Library;
 use crate::result::Result;
 
 mod library_bootstrap;

src/cmd/library/generate/tasks/module/mod.rs

@@ -1,9 +1,9 @@
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::Task;
 use crate::cmd::library::generate::tasks::module::module_documentation::ModuleDocumentationTask;
-use crate::manifest::library::Library;
-use crate::manifest::module::Module;
-use crate::manifest::package::Package;
+use crate::cmd::library::manifest::library::Library;
+use crate::cmd::library::manifest::module::Module;
+use crate::cmd::library::manifest::package::Package;
 use crate::result::Result;
 
 mod module_documentation;

src/cmd/library/generate/tasks/module/module_documentation.rs

@@ -6,13 +6,13 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::library::Library;
+use crate::cmd::library::manifest::module::Module;
 use crate::error::Error;
-use crate::manifest::library::Library;
-use crate::manifest::module::Module;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 
-type ItemManifest = crate::manifest::item::Item;
+type ItemManifest = crate::cmd::library::manifest::item::Item;
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Item {
@@ -87,7 +87,7 @@ impl ModuleDocumentationTask {
     }
     fn get_relative_destination_path(&self) -> Box<Path> {
         Box::from(Path::new(
-            format!("{}/README.md", self.module_urn, ).as_str(),
+            format!("{}/README.md", self.module_urn,).as_str(),
         ))
     }
     fn get_full_destination_path(&self) -> Box<Path> {
@@ -190,7 +190,7 @@ mod test {
             "{}/Package/Module/README.md",
             generator.output_directory
         ))
-            .unwrap();
+        .unwrap();
         assert!(content.contains("The module contains 4 items."));
         assert!(content.contains("[Package/Module/itemD](../../Package/Module/itemD.md)"));
         assert!(content.contains("## FamilyA"));

src/cmd/library/generate/tasks/package/mod.rs

@@ -6,8 +6,8 @@ use crate::cmd::library::generate::tasks::package::package_embedded::{
     EmbeddedMode, PackageEmbeddedTask,
 };
 use crate::cmd::library::generate::tasks::package::package_example::PackageExampleTask;
-use crate::manifest::library::Library;
-use crate::manifest::package::Package;
+use crate::cmd::library::manifest::library::Library;
+use crate::cmd::library::manifest::package::Package;
 use crate::result::Result;
 
 mod package_bootstrap;

src/cmd/library/generate/tasks/package/package_bootstrap.rs

@@ -6,8 +6,8 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::package::Package;
 use crate::error::Error;
-use crate::manifest::package::Package;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 
@@ -103,7 +103,7 @@ mod test {
             "{}/Package/bootstrap.puml",
             generator.output_directory
         ))
-            .unwrap();
+        .unwrap();
         assert!(content.trim().contains("header"));
         assert!(content.trim().contains("content"));
         assert!(content.trim().contains("footer"));

src/cmd/library/generate/tasks/package/package_documentation.rs

@@ -6,9 +6,9 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::library::Library;
+use crate::cmd::library::manifest::package::Package;
 use crate::error::Error;
-use crate::manifest::library::Library;
-use crate::manifest::package::Package;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};
 

src/cmd/library/generate/tasks/package/package_embedded.rs

@@ -6,8 +6,8 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::package::Package;
 use crate::error::Error;
-use crate::manifest::package::Package;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file, read_file_to_string};
 
@@ -109,7 +109,7 @@ impl PackageEmbeddedTask {
                     EmbeddedMode::Full => "full",
                 }
             )
-                .as_str(),
+            .as_str(),
         ))
     }
     fn get_embedded_destination_path(&self) -> Box<Path> {

src/cmd/library/generate/tasks/package/package_example.rs

@@ -6,10 +6,10 @@ use tera::{Context, Tera};
 
 use crate::cmd::library::generate::config::Config;
 use crate::cmd::library::generate::task::{CleanupScope, Task};
+use crate::cmd::library::manifest::example::Example;
+use crate::cmd::library::manifest::library::Library;
+use crate::cmd::library::manifest::package::Package;
 use crate::error::Error;
-use crate::manifest::example::Example;
-use crate::manifest::library::Library;
-use crate::manifest::package::Package;
 use crate::plantuml::PlantUML;
 use crate::result::Result;
 use crate::utils::{create_parent_directory, delete_file};

src/manifest/item.rs → src/cmd/library/manifest/item.rs

@@ -1,8 +1,8 @@
 use serde::{Deserialize, Serialize};
 
-use crate::manifest::element::Element;
-use crate::manifest::icon::Icon;
-use crate::manifest::item::templates::ItemTemplates;
+use crate::cmd::library::manifest::element::Element;
+use crate::cmd::library::manifest::icon::Icon;
+use crate::cmd::library::manifest::item::templates::ItemTemplates;
 use crate::urn::Urn;
 
 mod templates {

src/manifest/library.rs → src/cmd/library/manifest/library.rs

@@ -1,8 +1,8 @@
 use serde::{Deserialize, Serialize};
 
-use crate::manifest::library::customization::Customization;
-use crate::manifest::library::templates::LibraryTemplates;
-use crate::manifest::package::Package;
+use crate::cmd::library::manifest::library::customization::Customization;
+use crate::cmd::library::manifest::library::templates::LibraryTemplates;
+use crate::cmd::library::manifest::package::Package;
 
 pub mod customization {
     use serde::{Deserialize, Serialize};

src/manifest/module.rs → src/cmd/library/manifest/module.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
-use crate::manifest::item::Item;
-use crate::manifest::module::templates::ModuleTemplates;
+use crate::cmd::library::manifest::item::Item;
+use crate::cmd::library::manifest::module::templates::ModuleTemplates;
 use crate::urn::Urn;
 
 mod templates {