Fix resolve_local returning CWD-anchored URI for commonwl share lookups

cwltool/resolver.py

@@ -28,15 +28,21 @@ def resolve_local(document_loader: Loader | None, uri: str) -> str | None:
         os.environ.get("XDG_DATA_HOME", os.path.join(os.path.expanduser("~"), ".local", "share"))
     ]
     sharepaths.extend(os.environ.get("XDG_DATA_DIRS", "/usr/local/share/:/usr/share/").split(":"))
-    shares = [os.path.join(s, "commonwl", uri) for s in sharepaths]
+    shares = [os.path.join(s, "commonwl", pathpart) for s in sharepaths]
 
     _logger.debug("Search path is %s", shares)
 
     for path in shares:
-        if os.path.exists(path):
-            return Path(uri).as_uri()
-        if os.path.exists(f"{path}.cwl"):
-            return Path(f"{path}.cwl").as_uri()
+        pathobj = Path(path)
+        if pathobj.is_file():
+            if frag:
+                return f"{pathobj.as_uri()}#{frag}"
+            return pathobj.as_uri()
+        path_with_ext = Path(f"{path}.cwl")
+        if path_with_ext.is_file():
+            if frag:
+                return f"{path_with_ext.as_uri()}#{frag}"
+            return path_with_ext.as_uri()
     return None
 
 

tests/test_resolver.py

@@ -0,0 +1,41 @@
+import os
+from pathlib import Path
+from unittest.mock import Mock
+
+from cwltool.resolver import resolve_local
+
+
+def test_resolve_local_finds_tool_in_commonwl_share(tmp_path: Path, monkeypatch) -> None:
+    share = tmp_path / "share" / "commonwl"
+    share.mkdir(parents=True)
+    (share / "my-tool.cwl").write_text("cwlVersion: v1.2\n", encoding="utf-8")
+    monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path / "share"))
+    monkeypatch.setenv("XDG_DATA_DIRS", "/nonexistent-share/")
+    os.chdir(tmp_path)
+
+    resolved = resolve_local(Mock(), "my-tool.cwl")
+    assert resolved == (share / "my-tool.cwl").as_uri()
+
+
+def test_resolve_local_share_preserves_fragment(tmp_path: Path, monkeypatch) -> None:
+    share = tmp_path / "share" / "commonwl"
+    share.mkdir(parents=True)
+    (share / "my-tool.cwl").write_text("cwlVersion: v1.2\n", encoding="utf-8")
+    monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path / "share"))
+    monkeypatch.setenv("XDG_DATA_DIRS", "/nonexistent-share/")
+    os.chdir(tmp_path)
+
+    resolved = resolve_local(Mock(), "my-tool.cwl#main")
+    assert resolved == f"{(share / 'my-tool.cwl').as_uri()}#main"
+
+
+def test_resolve_local_share_with_cwl_extension(tmp_path: Path, monkeypatch) -> None:
+    share = tmp_path / "share" / "commonwl"
+    share.mkdir(parents=True)
+    (share / "my-tool.cwl").write_text("cwlVersion: v1.2\n", encoding="utf-8")
+    monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path / "share"))
+    monkeypatch.setenv("XDG_DATA_DIRS", "/nonexistent-share/")
+    os.chdir(tmp_path)
+
+    resolved = resolve_local(Mock(), "my-tool")
+    assert resolved == (share / "my-tool.cwl").as_uri()