Merge pull request #231 from common-workflow-language/restore-workflow-outparam-type

finish restoring allowable types for parameters

Author: mr-c

draft-4/CommandLineTool.yml

@@ -368,18 +368,11 @@ $graph:
     - specializeFrom: "#InputBinding"
       specializeTo: "#CommandLineBinding"
 
-
 - 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 +382,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"
@@ -413,7 +406,8 @@ $graph:
   symbols: [ "cwl:stdout" ]
   docParent: "#CommandOutputParameter"
   doc: |
-    Only valid as a `type` for an output.
+    Only valid as a `type` for a `CommandLineTool` output with no
+    `outputBinding` set.
 
     The following
     ```
@@ -442,7 +436,8 @@ $graph:
   symbols: [ "cwl:stderr" ]
   docParent: "#CommandOutputParameter"
   doc: |
-    Only valid as a `type` for an output.
+    Only valid as a `type` for a `CommandLineTool` output with no
+    `outputBinding` set.
 
     The following
     ```

draft-4/Process.yml

@@ -370,37 +370,7 @@ $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: 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"
@@ -420,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.
@@ -104,6 +133,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