url: Decouple user regex to RE_USER

Author: tony

src/libvcs/url/constants.py

@@ -0,0 +1,6 @@
+"""Constants shared across ``libvcs.url``."""
+
+RE_USER = r"""
+    ((?P<user>[^/:@]+)@)?
+"""
+"""Optional user, e.g. 'git@'"""

src/libvcs/url/git.py

@@ -23,13 +23,12 @@
 from libvcs._internal.dataclasses import SkipDefaultFieldsReprMixin
 
 from .base import Rule, RuleMap, URLProtocol
+from .constants import RE_USER
 
 # Credit, pip (license: MIT):
 # https://github.com/pypa/pip/blob/22.1.2/src/pip/_internal/vcs/git.py#L39-L52
 # We modified it to have groupings
 SCP_REGEX = r"""
-    # Optional user, e.g. 'git@'
-    ((?P<user>\w+)@)?
     # Server, e.g. 'github.com'.
     (?P<hostname>([^/:]+))
     (?P<separator>:)
@@ -40,7 +39,6 @@
     """
 
 RE_PATH = r"""
-    ((?P<user>\w+)@)?
     (?P<hostname>([^/:]+))
     (:(?P<port>\d{1,5}))?
     (?P<separator>[:,/])?
@@ -69,6 +67,7 @@
             rf"""
         ^{RE_SCHEME}
         ://
+        {RE_USER}
         {RE_PATH}
         {RE_SUFFIX}?
         """,
@@ -83,6 +82,7 @@
         pattern=re.compile(
             rf"""
         ^(?P<scheme>ssh)?
+        {RE_USER}
         {SCP_REGEX}
         {RE_SUFFIX}?
         """,
@@ -125,7 +125,6 @@
     (@(?P<rev>.*))
 """
 
-
 PIP_DEFAULT_RULES: list[Rule] = [
     Rule(
         label="pip-url",
@@ -134,6 +133,7 @@
             rf"""
         {RE_PIP_SCHEME}
         ://
+        {RE_USER}
         {RE_PATH}
         {RE_SUFFIX}?
         {RE_PIP_REV}?
@@ -148,6 +148,7 @@
         pattern=re.compile(
             rf"""
         {RE_PIP_SCP_SCHEME}
+        {RE_USER}
         {SCP_REGEX}?
         {RE_SUFFIX}?
         {RE_PIP_REV}?

src/libvcs/url/hg.py

@@ -25,9 +25,9 @@
 from libvcs.url.git import RE_PIP_REV, RE_SUFFIX, SCP_REGEX
 
 from .base import Rule, RuleMap, URLProtocol
+from .constants import RE_USER
 
 RE_PATH = r"""
-    ((?P<user>\w+)@)?
     (?P<hostname>([^/:]+))
     (:(?P<port>\d{1,5}))?
     (?P<separator>[:,/])?
@@ -53,6 +53,7 @@
             rf"""
         ^{RE_SCHEME}
         ://
+        {RE_USER}
         {RE_PATH}
         {RE_SUFFIX}?
         {RE_PIP_REV}?
@@ -66,6 +67,7 @@
         pattern=re.compile(
             rf"""
         ^(?P<scheme>ssh)?
+        {RE_USER}
         {SCP_REGEX}
         {RE_SUFFIX}?
         """,
@@ -100,6 +102,7 @@
             rf"""
         ^{RE_PIP_SCHEME}
         ://
+        {RE_USER}
         {RE_PATH}
         {RE_SUFFIX}?
         {RE_PIP_REV}?

src/libvcs/url/svn.py

@@ -26,9 +26,9 @@
 from libvcs.url.git import RE_PIP_REV, SCP_REGEX
 
 from .base import Rule, RuleMap, URLProtocol
+from .constants import RE_USER
 
 RE_PATH = r"""
-    ((?P<user>[^/:@]+)@)?
     (?P<hostname>([^/:@]+))
     (:(?P<port>\d{1,5}))?
     (?P<separator>[:,/])?
@@ -56,6 +56,7 @@
             rf"""
         ^{RE_SCHEME}
         ://
+        {RE_USER}
         {RE_PATH}
         {RE_PIP_REV}?
         """,
@@ -68,6 +69,7 @@
         pattern=re.compile(
             rf"""
         ^(?P<scheme>ssh)?
+        {RE_USER}
         {SCP_REGEX}
         {RE_PIP_REV}?
         """,
@@ -101,6 +103,7 @@
             rf"""
         ^{RE_PIP_SCHEME}
         ://
+        {RE_USER}
         {RE_PATH}
         {RE_PIP_REV}?
         """,