Better support type links with fragments

common-workflow-language · May 17, 2023 · 406aae8 · 406aae8
1 parent 064be75
commit 406aae8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/cwl_utils/utils.py b/cwl_utils/utils.py
@@ -195,14 +195,9 @@ def resolved_path(
             if link == "":
                 return base_url
             else:
-                return base_url._replace(
-                    path=str(
-                        (
-                            pathlib.Path(base_url.path).parent / pathlib.Path(link)
-                        ).resolve()
-                    )
+                return urllib.parse.urlparse(
+                    urllib.parse.urljoin(base_url.geturl(), link_url.geturl())
                 )
-
         else:
             # Remote relative path
             return urllib.parse.urlparse(

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -0,0 +1,14 @@
+from urllib.parse import urlparse
+
+from cwl_utils.utils import resolved_path
+
+
+def test_resoled_path() -> None:
+    base_url = urlparse(
+        "schemas/bclconvert-run-configuration/2.0.0--4.0.3/bclconvert-run-configuration__2.0.0--4.0.3.yaml"
+    )
+    link = "../../../schemas/samplesheet/2.0.0--4.0.3/samplesheet__2.0.0--4.0.3.yaml#samplesheet"
+    rpath = resolved_path(base_url, link)
+    assert rpath == urlparse(
+        "schemas/samplesheet/2.0.0--4.0.3/samplesheet__2.0.0--4.0.3.yaml#samplesheet"
+    )