allow relative imports to be imported without ./ at the start

Author: ialarmedalien

linkml_runtime/utils/schemaview.py

@@ -298,14 +298,14 @@ def imports_closure(self, imports: bool = True, traverse: Optional[bool] = None,
                     # path, and the target import doesn't have : (as in a curie or a URI)
                     # we prepend the relative path. This WILL make the key in the `schema_map` not
                     # equal to the literal text specified in the importing schema, but this is
-                    # essential to sensible deduplication: eg. for
+                    # essential to sensible deduplication: e.g. for
                     # - main.yaml (imports ./types.yaml, ./subdir/subschema.yaml)
                     # - types.yaml
                     # - subdir/subschema.yaml (imports ./types.yaml)
                     # - subdir/types.yaml
                     # we should treat the two `types.yaml` as separate schemas from the POV of the
                     # origin schema.
-                    if sn.startswith('.') and ':' not in i:
+                    if '/' in sn and ':' not in i:
                         if WINDOWS:
                             # This cannot be simplified. os.path.normpath() must be called before .as_posix()
                             i = PurePath(os.path.normpath(PurePath(sn).parent / i)).as_posix()

tests/test_utils/input/imports_relative/L0_0/L1_0_0/L2_0_0_2/four.yaml

@@ -0,0 +1,13 @@
+id: four
+name: import_four
+title: Import Four
+description: |
+  Import loaded by the StepChild class.
+imports:
+  - linkml:types
+classes:
+  Four:
+    attributes:
+      value:
+        range: string
+        ifabsent: "Four"

tests/test_utils/input/imports_relative/L0_0/L1_0_0/L2_0_0_2/one.yaml

@@ -0,0 +1,14 @@
+id: one
+name: import_one
+title: Import One
+description: |
+  Import loaded by the StepChild class.
+imports:
+  - linkml:types
+  - two
+classes:
+  One:
+    attributes:
+      value:
+        range: string
+        ifabsent: "One"

tests/test_utils/input/imports_relative/L0_0/L1_0_0/L2_0_0_2/stepchild.yaml

@@ -0,0 +1,16 @@
+id: stepchild
+name: stepchild
+title: stepchild
+description: |
+  Child class that imports files in the same directory as itself without consistently using `./` in the link notation.
+imports:
+  - linkml:types
+  - one
+  - two
+  - ./three
+classes:
+  StepChild:
+    attributes:
+      value:
+        range: string
+        ifabsent: "StepChild"

tests/test_utils/input/imports_relative/L0_0/L1_0_0/L2_0_0_2/three.yaml

@@ -0,0 +1,14 @@
+id: three
+name: import_three
+title: Import Three
+description: |
+  Import loaded by the StepChild class.
+imports:
+  - linkml:types
+  - ./four
+classes:
+  Three:
+    attributes:
+      value:
+        range: string
+        ifabsent: "Three"

tests/test_utils/input/imports_relative/L0_0/L1_0_0/L2_0_0_2/two.yaml

@@ -0,0 +1,13 @@
+id: two
+name: import_two
+title: Import Two
+description: |
+  Import loaded by the StepChild class.
+imports:
+  - linkml:types
+classes:
+  Two:
+    attributes:
+      value:
+        range: string
+        ifabsent: "Two"

tests/test_utils/input/imports_relative/L0_0/L1_0_0/main.yaml

@@ -8,10 +8,11 @@ imports:
   - ../../L0_1/cousin
   - ./L2_0_0_0/child
   - ./L2_0_0_1/child
+  - L2_0_0_2/stepchild
 classes:
   Main:
     description: "Our intrepid main class!"
     attributes:
       value:
         range: string
-        ifabsent: "Main"
+        ifabsent: "Main"

tests/test_utils/test_schemaview.py

@@ -539,6 +539,11 @@ def test_imports_relative():
         '../L1_0_1/dupe',
         './L2_0_0_0/child',
         './L2_0_0_1/child',
+        'L2_0_0_2/two',
+        'L2_0_0_2/one',
+        'L2_0_0_2/four',
+        'L2_0_0_2/three',
+        'L2_0_0_2/stepchild',
         'main'
     ]
 
@@ -896,4 +901,4 @@ def test_materialize_nonscalar_slot_usage():
     assert cls.attributes["tempo"].annotations.expected_value.value == "a number between 0 and 200"
     assert cls.attributes["tempo"].annotations.preferred_unit.value == "BPM"
     assert cls.attributes["tempo"].domain_of == ["DJController"]
-    assert cls.slot_usage["tempo"].domain_of == []
+    assert cls.slot_usage["tempo"].domain_of == []