Merge branch 'main' into bump-cargo-version

Author: KeisukeYamashita

.github/workflows/bump.yaml

@@ -17,7 +17,7 @@ jobs:
       - id: bump
         uses: tj-actions/cargo-bump@v3
 
-      - uses: peter-evans/create-pull-request@v6
+      - uses: peter-evans/create-pull-request@v7
         with:
           author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
           branch: "bump-${{ steps.bump.outputs.new_version }}"

.github/workflows/release.yaml

@@ -26,11 +26,11 @@ jobs:
             rust_target: x86_64-unknown-linux-gnu
             ext: ""
             args: ""
-          - os: macos-13 (Intel x86)
+          - os: macos-13 # (Intel x86)
             rust_target: x86_64-apple-darwin
             ext: ""
             args: ""
-          - os: macos-latest (Apple Silicon)
+          - os: macos-latest # (Apple Silicon)
             rust_target: aarch64-apple-darwin
             ext: ""
             args: ""

Cargo.lock

@@ -23,9 +23,9 @@ futures = "0.3.30"
 regex = "1.10.5"
 schemars = { version = "0.8.21", optional = true }
 serde = { version = "1.0.201", features = ["derive"] }
-serde_json = "1.0.121"
+serde_json = "1.0.140"
 serde_yaml = "0.9.34"
-tokio = { version = "1.37.0", features = ["full"] }
+tokio = { version = "1.43.1", features = ["full"] }
 
 [features]
 schemars = ["dep:schemars"]

cli/Cargo.toml

@@ -27,20 +27,12 @@ impl Rule for BodyMaxLength {
     }
 
     fn validate(&self, message: &Message) -> Option<Violation> {
-        match &message.body {
-            Some(body) => {
-                if body.len() >= self.length {
-                    return Some(Violation {
-                        level: self.level.unwrap_or(Self::LEVEL),
-                        message: self.message(message),
-                    });
-                }
-            }
-            None => {
+        if let Some(body) = &message.body {
+            if body.len() >= self.length {
                 return Some(Violation {
                     level: self.level.unwrap_or(Self::LEVEL),
                     message: self.message(message),
-                })
+                });
             }
         }
 
@@ -84,6 +76,25 @@ Hey!"
         assert!(rule.validate(&message).is_none());
     }
 
+    #[test]
+    fn test_no_body() {
+        let rule = BodyMaxLength {
+            length: usize::MAX, // Long length for testing
+            ..Default::default()
+        };
+        let message = Message {
+            body: None,
+            description: Some("broadcast $destroy event on scope destruction".to_string()),
+            footers: None,
+            r#type: Some("feat".to_string()),
+            raw: "feat(scope): broadcast $destroy event on scope destruction".to_string(),
+            scope: Some("scope".to_string()),
+            subject: Some("feat(scope): broadcast $destroy event on scope destruction".to_string()),
+        };
+
+        assert!(rule.validate(&message).is_none());
+    }
+
     #[test]
     fn test_short_body() {
         let rule = BodyMaxLength {

cli/src/rule/body_max_length.rs

@@ -27,20 +27,12 @@ impl Rule for ScopeMaxLength {
     }
 
     fn validate(&self, message: &Message) -> Option<Violation> {
-        match &message.scope {
-            Some(scope) => {
-                if scope.len() >= self.length {
-                    return Some(Violation {
-                        level: self.level.unwrap_or(Self::LEVEL),
-                        message: self.message(message),
-                    });
-                }
-            }
-            None => {
+        if let Some(scope) = &message.scope {
+            if scope.len() >= self.length {
                 return Some(Violation {
                     level: self.level.unwrap_or(Self::LEVEL),
                     message: self.message(message),
-                })
+                });
             }
         }
 
@@ -81,6 +73,25 @@ mod tests {
         assert!(rule.validate(&message).is_none());
     }
 
+    #[test]
+    fn test_no_scope() {
+        let rule = ScopeMaxLength {
+            length: usize::MAX, // Long length for testing
+            ..Default::default()
+        };
+        let message = Message {
+            body: None,
+            description: Some("desc".to_string()),
+            footers: None,
+            r#type: Some("feat".to_string()),
+            raw: "feat(scope): desc".to_string(),
+            scope: None,
+            subject: Some("feat(scope): desc".to_string()),
+        };
+
+        assert!(rule.validate(&message).is_none());
+    }
+
     #[test]
     fn test_short_scope() {
         let rule = ScopeMaxLength {

cli/src/rule/scope_max_length.rs

@@ -27,20 +27,12 @@ impl Rule for TypeMaxLength {
     }
 
     fn validate(&self, message: &Message) -> Option<Violation> {
-        match &message.r#type {
-            Some(t) => {
-                if t.len() >= self.length {
-                    return Some(Violation {
-                        level: self.level.unwrap_or(Self::LEVEL),
-                        message: self.message(message),
-                    });
-                }
-            }
-            None => {
+        if let Some(t) = &message.r#type {
+            if t.len() >= self.length {
                 return Some(Violation {
                     level: self.level.unwrap_or(Self::LEVEL),
                     message: self.message(message),
-                })
+                });
             }
         }
 
@@ -81,6 +73,25 @@ mod tests {
         assert!(rule.validate(&message).is_none());
     }
 
+    #[test]
+    fn test_no_type() {
+        let rule = TypeMaxLength {
+            length: usize::MAX, // Long length for testing
+            ..Default::default()
+        };
+        let message = Message {
+            body: None,
+            description: Some("broadcast $destroy event on scope destruction".to_string()),
+            footers: None,
+            r#type: None,
+            raw: "feat(scope): broadcast $destroy event on scope destruction".to_string(),
+            scope: Some("scope".to_string()),
+            subject: Some("feat(scope): broadcast $destroy event on scope destruction".to_string()),
+        };
+
+        assert!(rule.validate(&message).is_none());
+    }
+
     #[test]
     fn test_short_type() {
         let rule = TypeMaxLength {

cli/src/rule/type_max_length.rs

@@ -16,4 +16,4 @@ clap = { version = "4.5.21", features = ["derive"] }
 cli = { path = "../cli", features = ["schemars"], package = "commitlint-rs" }
 schemars = { version = "0.8.21" }
 serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.133"
+serde_json = "1.0.140"

schema/Cargo.toml

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/starlight": "^0.25.2",
-    "astro": "^4.16.16",
+    "astro": "^4.16.18",
     "sharp": "^0.33.4"
   }
 }