finish restoring allowable types for parameters

Author: mr-c

draft-4/CommandLineTool.yml

@@ -359,27 +359,38 @@ $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
   extends: "#OutputParameter"
   doc: An output parameter for a CommandLineTool.
   specialize:
-    - specializeFrom: "#OutputRecordSchema"
-      specializeTo: "#CommandOutputRecordSchema"
-    - specializeFrom: "#OutputEnumSchema"
-      specializeTo: "#CommandOutputEnumSchema"
-    - specializeFrom: "#OutputArraySchema"
-      specializeTo: "#CommandOutputArraySchema"
     - specializeFrom: "#OutputBinding"
       specializeTo: "#CommandOutputBinding"
   fields:
@@ -389,16 +400,16 @@ $graph:
         - "#CWLType"
         - "#stdout"
         - "#stderr"
-        - "sld:RecordSchema"
-        - "sld:EnumSchema"
-        - "sld:ArraySchema"
+        - "#CommandOutputRecordSchema"
+        - "#CommandOutputEnumSchema"
+        - "#CommandOutputArraySchema"
         - string
         - type: array
           items:
             - "#CWLType"
-            - "sld:RecordSchema"
-            - "sld:EnumSchema"
-            - "sld:ArraySchema"
+            - "#CommandOutputRecordSchema"
+            - "#CommandOutputEnumSchema"
+            - "#CommandOutputArraySchema"
             - string
       jsonldPredicate:
         "_id": "sld:type"

draft-4/Process.yml

@@ -378,29 +378,6 @@ $graph:
     - specializeFrom: "sld:ArraySchema"
       specializeTo: "#InputArraySchema"
   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.
-
     - name: id
       type: string
       jsonldPredicate: "@id"

draft-4/Workflow.yml

@@ -104,6 +104,28 @@ $graph:
       doc: |
         The method to use to merge multiple sources into a single array.
         If not specified, the default method is "merge_nested".
+    - name: type
+      type:
+        - "null"
+        - "#CWLType"
+        - "#OutputRecordSchema"
+        - "#OutputEnumSchema"
+        - "#OutputArraySchema"
+        - string
+        - type: array
+          items:
+            - "#CWLType"
+            - "#OutputRecordSchema"
+            - "#OutputEnumSchema"
+            - "#OutputArraySchema"
+            - 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: Sink