bugfix(parse): Allow '-' in element names (fixes #3)

Author: tcjennings

src/lsst/cmservice/parsing/string.py

@@ -48,11 +48,11 @@ def parse_element_fullname(fullname: str) -> Fullname:
     fullname_r = re.compile(
         (
             r"^"
-            r"(?P<campaign>[\w]+){1}(?:\/)*"
-            r"(?P<step>[\w]+){0,1}(?:\/)*"
-            r"(?P<group>[\w]+){0,1}(?:\/)*"
-            r"(?P<job>[\w]+){0,1}(?:\/)*"
-            r"(?P<script>[\w]+){0,1}"
+            r"(?P<campaign>[\w-]+){1}(?:\/)*"
+            r"(?P<step>[\w-]+){0,1}(?:\/)*"
+            r"(?P<group>[\w-]+){0,1}(?:\/)*"
+            r"(?P<job>[\w-]+){0,1}(?:\/)*"
+            r"(?P<script>[\w-]+){0,1}"
             r"$"
         ),
         re.MULTILINE,

tests/test_parsing.py

@@ -11,6 +11,7 @@
         ("campaign_name/step_name/group0", "group"),
         ("campaign_name/step_name", "step"),
         ("campaign_name", "campaign"),
+        ("campaign-name", "campaign"),
     ],
 )
 def test_fullname_parsing(fullname: str, expected: str) -> None: