Merge branch '1.2.1_proposed' into dir_with_executable_file

Author: mr-c

conformance_tests.yaml

@@ -3474,10 +3474,18 @@
       checksum: sha1$0074b1841ab5103cc0442f739d9fb41a33b602ee
   tags: [ step_input, workflow ]
 
+- id: nested_types
+  job: tests/nested_types.yaml
+  tool: tests/nested_types.cwl
+  doc: demonstrate usage of nested types
+  output:
+    their_name: "Foo Bar"
+  tags: [ require, command_line_tool ]
+
 - id: input_directory_with_executable_file
   job: tests/input_dir_with_executable_file.yaml
   tool: tests/input_dir_with_executable_file.cwl
   doc: Executable files in input directories retain their execute permissions
   output:
     args: [ "1", "two", "3" ]
-  tags: [ required, command_line_tool ]
+  tags: [ required, command_line_tool ]

tests/nested_types.cwl

@@ -0,0 +1,33 @@
+#!/usr/bin/env cwl-runner
+cwlVersion: v1.2
+class: CommandLineTool
+
+requirements:
+  SchemaDefRequirement:
+    types:
+      - name: name
+        type: record
+        fields:
+          - name: first
+            type: string
+          - name: last
+            type: string
+      - name: person
+        type: record
+        fields:
+          - name: name
+            type: name
+          - name: age
+            type: int
+inputs:
+  my_person: person
+
+outputs:
+  their_name: string
+
+baseCommand: echo
+
+stdout: cwl.output.json
+
+arguments:
+ - '{"their_name": "$(inputs.my_person.name.first) $(inputs.my_person.name.last)" }'

tests/nested_types.yaml

@@ -0,0 +1,5 @@
+my_person:
+  name:
+    first: Foo
+    last: Bar
+  age: 42