Make LoopInput extend OutputSink

common-workflow-language · Jan 3, 2023 · 4e5d223 · 4e5d223
1 parent 240a33b
commit 4e5d223
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/Workflow.yml b/Workflow.yml
@@ -447,20 +447,8 @@ $graph:
 
 - name: LoopInput
   type: record
-  extends: [Identified, Sink]
+  extends: [Identified, OutputSink]
   fields:
-    - name: source
-      doc: |
-        Specifies one or more of the step output parameters that will
-        provide input to the loop iterations after the first one (inputs
-        of the first iteration are the step input parameters).
-      jsonldPredicate:
-        "_id": "cwl:source"
-        "_type": "@id"
-        refScope: 1
-      type:
-        - string?
-        - string[]?
     - name: default
       type: ["null", File, Directory, Any]
       doc: |
@@ -715,7 +703,7 @@ $graph:
       jsonldPredicate:
         _id: "cwl:loop"
         mapSubject: id
-        mapPredicate: source
+        mapPredicate: outputSource
     - name: outputMethod
       doc: |
         Required if `loop` is defined.

diff --git a/tests/loop/default-value-loop.cwl b/tests/loop/default-value-loop.cwl
@@ -17,7 +17,7 @@ steps:
     when: $(inputs.i1 < 20)
     loop:
       i1:
-        source: o1
+        outputSource: o1
         default: 5
     outputMethod: all
     run:

diff --git a/tests/loop/invalid-multi-source-loop-no-requirement.cwl b/tests/loop/invalid-multi-source-loop-no-requirement.cwl
@@ -18,7 +18,7 @@ steps:
     when: $(inputs.i1 < 20)
     loop:
       i1:
-        source: [ osmall, obig ]
+        outputSource: [ osmall, obig ]
         pickValue: the_only_non_null
     outputMethod: all
     run:

diff --git a/tests/loop/multi-source-loop.cwl b/tests/loop/multi-source-loop.cwl
@@ -19,7 +19,7 @@ steps:
     when: $(inputs.i1 < 20)
     loop:
       i1:
-        source: [ osmall, obig ]
+        outputSource: [ osmall, obig ]
         pickValue: the_only_non_null
     outputMethod: all
     run: