Only use basename of $import-ed SchemaDef for types

Closes #80
rabix · Feb 6, 2020 · a8ee30a · a8ee30a
1 parent d4e29e7
commit a8ee30a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/benten/cwl/linkedschemadeftype.py b/benten/cwl/linkedschemadeftype.py
@@ -1,5 +1,8 @@
 #  Copyright (c) 2019 Seven Bridges. See LICENSE
 
+import pathlib
+from urllib.parse import urlparse
+
 from .linkedfiletype import CWLLinkedFile
 from .basetype import IntelligenceContext, Intelligence, MapSubjectPredicate
 from ..langserver.lspobjects import Diagnostic, DiagnosticSeverity, Range
@@ -36,7 +39,9 @@ def parse(self,
             ]
             return
 
+        fname = pathlib.Path(urlparse(self.prefix).path).name
+
         for _type in _type_list:
             if "name" in _type:
-                name = self.prefix + "#" + _type.pop("name")
+                name = fname + "#" + _type.pop("name")
                 code_intel.type_defs[name] = _type
diff --git a/tests/cwl/misc/cl-schemadef-import.cwl b/tests/cwl/misc/cl-schemadef-import.cwl
@@ -10,4 +10,4 @@ requirements:
   - class: InlineJavascriptRequirement
   - class: SchemaDefRequirement
     types:
-      - $import: paired_end_record.yml
+      - $import: ./paired_end_record.yml