refactor: only specify scope delimiters once

Author: ddluke

conventional_pre_commit/format.py

@@ -126,9 +126,9 @@ def r_types(self):
     @property
     def r_scope(self):
         """Regex str for an optional (scope)."""
+        escaped_delimiters = list(map(re.escape, [":", ",", "-", "/", "."]))  # type: ignore
         if self.scopes:
             scopes = self._r_or(self.scopes)
-            escaped_delimiters = list(map(re.escape, [":", ",", "-", "/", "."]))  # type: ignore
             delimiters_pattern = self._r_or(escaped_delimiters)
             scope_pattern = rf"\(\s*(?:(?i:{scopes}))(?:\s*(?:{delimiters_pattern})\s*(?:(?i:{scopes})))*\s*\)"
 
@@ -137,10 +137,11 @@ def r_scope(self):
             else:
                 return scope_pattern
 
+        joined_delimiters = "".join(escaped_delimiters)
         if self.scope_optional:
-            return r"(\([\w \/:,-\.]+\))?"
+            return rf"(\([\w {joined_delimiters}]+\))?"
         else:
-            return r"(\([\w \/:,-\.]+\))"
+            return rf"(\([\w {joined_delimiters}]+\))"
 
     @property
     def r_delim(self):

tests/test_format.py

@@ -560,6 +560,16 @@ def test_match_multiline(conventional_commit):
     assert match.group("body").strip() == "body copy"
 
 
+def test_match_dots(conventional_commit):
+    match = conventional_commit.match("""feat(foo.bar): hello world""")
+    assert isinstance(match, re.Match)
+    assert match.group("type") == "feat"
+    assert match.group("scope") == "(foo.bar)"
+    assert match.group("delim") == ":"
+    assert match.group("subject").strip() == "hello world"
+    assert match.group("body").strip() == ""
+
+
 def test_match_invalid_type(conventional_commit):
     match = conventional_commit.match(
         """invalid(scope): subject line