chore: merge pull request #11 from websublime/feature/repo-url

feat: method to format repo url

Cargo.toml

@@ -13,8 +13,8 @@ path = "src/lib.rs"
 
 [dependencies]
 execute = "0.2.13"
-serde = { version = "1.0.195", features = ["derive"] }
-serde_json = "1.0.111"
+serde = { version = "1.0.204", features = ["derive"] }
+serde_json = "1.0.120"
 regex = "1.10.3"
 wax = { version = "0.6.0", features = ["walk"] }
 napi-derive = "2.16.8"

packages/package-a/package.json

@@ -3,6 +3,10 @@
   "version": "1.0.0",
   "description": "",
   "main": "index.mjs",
+  "repository": {
+    "url": "git+ssh://git@github.com/websublime/workspace-node-binding-tools.git",
+    "type": "git"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "node index.mjs"

packages/package-b/package.json

@@ -3,6 +3,10 @@
   "version": "1.0.0",
   "description": "",
   "main": "index.mjs",
+  "repository": {
+    "url": "git+ssh://git@github.com/websublime/workspace-node-binding-tools.git",
+    "type": "git"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "node index.mjs"

src/git/commands.rs

@@ -14,7 +14,9 @@ use version_compare::{Cmp, Version};
 
 use crate::{
     filesystem::paths::get_project_root_path,
-    monorepo::{packages::PackageInfo, utils::package_scope_name_version},
+    monorepo::{
+        packages::PackageInfo, packages::PackageRepositoryInfo, utils::package_scope_name_version,
+    },
 };
 
 use super::conventional::{ConventionalPackage, ConventionalPackageOptions};
@@ -509,37 +511,35 @@ impl Git {
 
         let convention_options = match conventional_options {
             Some(options) => ConventionalPackageOptions {
-                owner: options.owner.or(Some(String::from("orga"))),
-                repo: options.repo.or(Some(String::from("tenant"))),
                 version: options.version.or(Some(String::from("0.0.0"))),
-                domain: options.domain.or(Some(String::from("https://github.com"))),
                 title: options.title,
             },
             None => ConventionalPackageOptions {
-                owner: Some(String::from("orga")),
-                repo: Some(String::from("tenant")),
                 version: Some(String::from("0.0.0")),
-                domain: Some(String::from("https://github.com")),
                 title: None,
             },
         };
 
+        let repo_info = package_info.repository_info.clone();
+        let repository_info = match repo_info {
+            Some(info) => info,
+            None => PackageRepositoryInfo {
+                orga: String::from("my-orga"),
+                project: String::from("my-repo"),
+                domain: String::from("https://github.com"),
+            },
+        };
+
         let commits_since = Self::get_commits_since(
             Some(current_working_dir),
             hash,
             Some(package_info.package_relative_path.clone()),
         );
         let mut conventional_package = ConventionalPackage::new(package_info);
         let conventional_config = conventional_package.define_config(
-            convention_options
-                .owner
-                .expect("Owner repo needs to be defined"),
-            convention_options
-                .repo
-                .expect("Repo scope needs to be defined"),
-            convention_options
-                .domain
-                .expect("Github main domain url need to be defined"),
+            repository_info.orga,
+            repository_info.project,
+            repository_info.domain,
             convention_options.title,
             None,
         );

src/git/conventional.rs

@@ -26,10 +26,7 @@ pub struct ConventionalPackage {
 #[napi(object)]
 #[derive(Debug, Clone)]
 pub struct ConventionalPackageOptions {
-    pub owner: Option<String>,
-    pub repo: Option<String>,
     pub version: Option<String>,
-    pub domain: Option<String>,
     pub title: Option<String>,
 }
 

src/monorepo/errors.rs

@@ -0,0 +1,42 @@
+use std::fmt::{Display, Error, Formatter};
+
+#[derive(Debug)]
+pub enum PackageJsonErrorEnum {
+    InvalidName(String),
+    InvalidDescription(String),
+    InvalidVersion(String),
+    InvalidRepository(String),
+    InvalidFiles(String),
+    InvalidLicense(String),
+    UnknownErr,
+}
+
+impl std::error::Error for PackageJsonErrorEnum {}
+
+impl Display for PackageJsonErrorEnum {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        match self {
+            PackageJsonErrorEnum::InvalidName(message) => {
+                write!(f, "{}", message)
+            }
+            PackageJsonErrorEnum::InvalidDescription(message) => {
+                write!(f, "{}", message)
+            }
+            PackageJsonErrorEnum::InvalidVersion(message) => {
+                write!(f, "{}", message)
+            }
+            PackageJsonErrorEnum::InvalidRepository(message) => {
+                write!(f, "{}", message)
+            }
+            PackageJsonErrorEnum::InvalidFiles(message) => {
+                write!(f, "{}", message)
+            }
+            PackageJsonErrorEnum::InvalidLicense(message) => {
+                write!(f, "{}", message)
+            }
+            _ => todo!(),
+        }
+    }
+}
+
+// Err(PackageJsonErrorEnum::InvalidName("No valid name"))

src/monorepo/mod.rs

@@ -1,2 +1,3 @@
+pub mod errors;
 pub mod packages;
 pub mod utils;