ArraySchema.items does need typeDSL after all

Author: mr-c

cwltool/schemas/v1.0/salad/schema_salad/metaschema/metaschema_base.yml

@@ -168,4 +168,5 @@ $graph:
         _id: "sld:items"
         _type: "@vocab"
         refScope: 2
+        typeDSL: true
       doc: "Defines the type of the array elements."

cwltool/schemas/v1.1/salad/schema_salad/metaschema/metaschema_base.yml

@@ -173,4 +173,5 @@ $graph:
         _id: "sld:items"
         _type: "@vocab"
         refScope: 2
+        typeDSL: true
       doc: "Defines the type of the array elements."

cwltool/schemas/v1.2/salad/schema_salad/metaschema/metaschema_base.yml

@@ -173,4 +173,5 @@ $graph:
         _id: "sld:items"
         _type: "@vocab"
         refScope: 2
+        typeDSL: true
       doc: "Defines the type of the array elements."

tests/test_examples.py

@@ -1587,3 +1587,15 @@ def test_custom_type_in_step_process() -> None:
         ]
     )
     assert err_code == 0
+
+
+@pytest.mark.parametrize("version", ["1_0", "1_1", "1_2"])
+def test_array_items_typedsl(version) -> None:
+    """Demonstrate that 'type: array, items: SomeType[]' works."""
+    err_code, _, stderr = get_main_output(
+        [
+            get_data(f"tests/wf/nested_typedsl_v{version}.cwl"),
+            get_data("tests/wf/nested_typedsl_job.yml"),
+        ]
+    )
+    assert err_code == 0

tests/wf/nested_typedsl_job.yml

@@ -0,0 +1,5 @@
+cat_in: 
+ - - class: File
+     location: echo.cwl
+   - class: File
+     location: cat.cwl

tests/wf/nested_typedsl_v1_0.cwl

@@ -0,0 +1,14 @@
+#!/usr/bin/env cwl-runner
+cwlVersion: v1.0
+class: CommandLineTool
+baseCommand: cat
+inputs:
+  cat_in:
+    type:
+      type: array
+      items: File[]
+    inputBinding: {}
+stdout: all.txt
+outputs:
+  txt:
+    type: stdout

tests/wf/nested_typedsl_v1_1.cwl

@@ -0,0 +1,14 @@
+#!/usr/bin/env cwl-runner
+cwlVersion: v1.0
+class: CommandLineTool
+baseCommand: cat
+inputs:
+  cat_in:
+    type:
+      type: array
+      items: File[]
+    inputBinding: {}
+stdout: all.txt
+outputs:
+  txt:
+    type: stdout

tests/wf/nested_typedsl_v1_2.cwl

@@ -0,0 +1,14 @@
+#!/usr/bin/env cwl-runner
+cwlVersion: v1.0
+class: CommandLineTool
+baseCommand: cat
+inputs:
+  cat_in:
+    type:
+      type: array
+      items: File[]
+    inputBinding: {}
+stdout: all.txt
+outputs:
+  txt:
+    type: stdout