Merge branch 'master' of https://github.com/michael-kotliar/common-workflow-language into michael-kotliar-master

Author: Peter Amstutz

v1.0/conformance_test_v1.0.yaml

@@ -995,4 +995,10 @@
     args: [-A,'2',-B,baz,-C,'10','9','8','7','6','5','4','3','2','1']
   job: v1.0/empty.json
   tool: v1.0/inline-js.cwl
-  doc: Test InlineJavascriptRequirement with multiple expressions in the same tool
+  doc: Test InlineJavascriptRequirement with multiple expressions in the same tool
+
+- job: v1.0/sum-job.json
+  output:
+    result: 12
+  tool: v1.0/sum-wf.cwl
+  doc: Test step input with multiple sources with multiple types

v1.0/v1.0/sum-job.json

@@ -0,0 +1,4 @@
+{
+  "int_1": 5,
+  "int_2": 7
+}

v1.0/v1.0/sum-wf.cwl

@@ -0,0 +1,49 @@
+cwlVersion: v1.0
+class: Workflow
+
+requirements:
+  - class: StepInputExpressionRequirement
+  - class: MultipleInputFeatureRequirement
+  - class: InlineJavascriptRequirement
+
+inputs:
+  int_1:
+    type:
+      - int
+      - string
+  int_2:
+    type:
+      - int
+      - string
+
+outputs:
+  result:
+    type: int
+    outputSource: sum/result
+
+steps:
+  sum:
+    in:
+      data:
+        source: [int_1, int_2]
+        valueFrom: |
+          ${
+            var sum = 0;
+            for (var i = 0; i < self.length; i++){
+              sum += self[i];
+            };
+            return sum;
+          }
+    out:
+    - result
+    run:
+      class: ExpressionTool
+      inputs:
+        data:
+          type: int
+      outputs:
+        result: int
+      expression: |
+        ${
+          return {"result": inputs.data};
+        }