re-add types to ExpressionTool, InputParameter

Author: mr-c

draft-4/CommandLineTool.yml

@@ -359,32 +359,14 @@ $graph:
   extends: "#InputParameter"
   doc: An input parameter for a CommandLineTool.
   specialize:
+    - specializeFrom: "#InputRecordSchema"
+      specializeTo: "#CommandInputRecordSchema"
+    - specializeFrom: "#InputEnumSchema"
+      specializeTo: "#CommandInputEnumSchema"
+    - specializeFrom: "#InputArraySchema"
+      specializeTo: "#CommandInputArraySchema"
     - specializeFrom: "#InputBinding"
       specializeTo: "#CommandLineBinding"
-  fields:
-    - name: type
-      type:
-        - "null"
-        - "#CWLType"
-        - "#CommandInputRecordSchema"
-        - "#CommandInputEnumSchema"
-        - "#CommandInputArraySchema"
-        - string
-        - type: array
-          items:
-            - "#CWLType"
-            - "#CommandInputRecordSchema"
-            - "#CommandInputEnumSchema"
-            - "#CommandInputArraySchema"
-            - string
-      jsonldPredicate:
-        "_id": "sld:type"
-        "_type": "@vocab"
-        refScope: 2
-        typeDSL: True
-      doc: |
-        Specify valid types of data that may be assigned to this parameter.
-
 
 - type: record
   name: CommandOutputParameter

draft-4/Process.yml

@@ -370,13 +370,6 @@ $graph:
 - name: InputParameter
   type: record
   extends: "#Parameter"
-  specialize:
-    - specializeFrom: "sld:RecordSchema"
-      specializeTo: "#InputRecordSchema"
-    - specializeFrom: "sld:EnumSchema"
-      specializeTo: "#InputEnumSchema"
-    - specializeFrom: "sld:ArraySchema"
-      specializeTo: "#InputArraySchema"
   fields:
     - name: id
       type: string
@@ -397,6 +390,28 @@ $graph:
         The default value for this parameter if not provided in the input
         object.
 
+    - name: type
+      type:
+        - "null"
+        - "#CWLType"
+        - "#InputRecordSchema"
+        - "#InputEnumSchema"
+        - "#InputArraySchema"
+        - string
+        - type: array
+          items:
+            - "#CWLType"
+            - "#InputRecordSchema"
+            - "#InputEnumSchema"
+            - "#InputArraySchema"
+            - string
+      jsonldPredicate:
+        "_id": "sld:type"
+        "_type": "@vocab"
+        refScope: 2
+        typeDSL: True
+      doc: |
+        Specify valid types of data that may be assigned to this parameter.
 
 - name: OutputParameter
   type: record

draft-4/Workflow.yml

@@ -50,10 +50,39 @@ $graph:
 
     - {$include: concepts.md}
 
+- name: ExpressionToolOutputParameter
+  type: record
+  extends: Parameter
+  fields:
+    - name: type
+      type:
+        - "null"
+        - "#CWLType"
+        - "sld:RecordSchema"
+        - "sld:EnumSchema"
+        - "sld:ArraySchema"
+        - string
+        - type: array
+          items:
+            - "#CWLType"
+            - "sld:RecordSchema"
+            - "sld:EnumSchema"
+            - "sld:ArraySchema"
+            - string
+      jsonldPredicate:
+        "_id": "sld:type"
+        "_type": "@vocab"
+        refScope: 2
+        typeDSL: True
+      doc: |
+        Specify valid types of data that may be assigned to this parameter.
 
 - type: record
   name: ExpressionTool
   extends: Process
+  specialize:
+    - specializeFrom: "#OutputParameter"
+      specializeTo: "#ExpressionToolOutputParameter"
   documentRoot: true
   doc: |
     Execute an expression as a process step.