Moved loop_source and loop_when to camel case

Author: GlassOfWhiskey

cwltool/extensions-v1.2.yml

@@ -127,7 +127,7 @@ $graph:
       type: string?
       jsonldPredicate: "@id"
       doc: "It must reference the `id` of one of the elements in the `in` field of the step."
-    loop_source:
+    loopSource:
       doc: |
         Specifies one or more of the step output parameters that will
         provide input to the loop iterations after the first one (inputs
@@ -193,9 +193,9 @@ $graph:
     Valid only under `requirements` of a https://www.commonwl.org/v1.2/Workflow.html#WorkflowStep.
     Unlike other CWL requirements, Loop requirement is not propagated to inner steps.
 
-    `loop_when` is an expansion of the CWL v1.2 `when` construct which controls
+    `loopWhen` is an expansion of the CWL v1.2 `when` construct which controls
     conditional execution and thus when using `Loop` do not also specify a `when` as
-    the `loop_when` expanded definition is intended to replace `when` in a
+    the `loopWhen` expanded definition is intended to replace `when` in a
     future version of the CWL standards.
 
     Loops are evaluated after any specified `scatter`ing; the implicit gathering
@@ -207,7 +207,7 @@ $graph:
       jsonldPredicate:
         _id: "@type"
         _type: "@vocab"
-    loop_when:
+    loopWhen:
       type: cwl:Expression
       doc: |
         Only run the step while the expression evaluates to `true`.
@@ -223,7 +223,7 @@ $graph:
       jsonldPredicate:
         _id: "cwltool:loop"
         mapSubject: id
-        mapPredicate: loop_source
+        mapPredicate: loopSource
       doc: |
         Defines the input parameters of the loop iterations after the first one
         (inputs of the first iteration are the step input parameters). If no

tests/loop/all-output-loop.cwl

@@ -26,7 +26,7 @@ steps:
     out: [o1]
     requirements:
       cwltool:Loop:
-        loop_when: $(inputs.i1 < 10)
+        loopWhen: $(inputs.i1 < 10)
         loop:
           i1: o1
         outputMethod: all

tests/loop/default-value-loop.cwl

@@ -43,9 +43,9 @@ steps:
     out: [ o1 ]
     requirements:
       cwltool:Loop:
-        loop_when: $(inputs.i1 < 20)
+        loopWhen: $(inputs.i1 < 20)
         loop:
           i1:
-            loop_source: o1
+            loopSource: o1
             default: 5
         outputMethod: all

tests/loop/invalid-loop-scatter.cwl

@@ -27,7 +27,7 @@ steps:
         ${return {'o1': inputs.i1 + inputs.i2};}
     requirements:
       cwltool:Loop:
-        loop_when: $(inputs.i1 < 10)
+        loopWhen: $(inputs.i1 < 10)
         loop:
           i1: o1
         outputMethod: last

tests/loop/invalid-loop-when.cwl

@@ -27,7 +27,7 @@ steps:
         ${return {'o1': inputs.i1 + inputs.i2};}
     requirements:
       cwltool:Loop:
-        loop_when: $(inputs.i1 < 10)
+        loopWhen: $(inputs.i1 < 10)
         loop:
           i1: o1
         outputMethod: last

tests/loop/loop-inside-loop-all.cwl

@@ -46,7 +46,7 @@ steps:
           out: [o1]
           requirements:
             cwltool:Loop:
-              loop_when: $(inputs.i1 <= inputs.i2)
+              loopWhen: $(inputs.i1 <= inputs.i2)
               loop:
                 i1: o1
               outputMethod: all
@@ -56,7 +56,7 @@ steps:
     out: [o1]
     requirements:
       cwltool:Loop:
-        loop_when: $(inputs.i2 < 4)
+        loopWhen: $(inputs.i2 < 4)
         loop:
           i2:
             valueFrom: $(inputs.i2 + 1)

tests/loop/loop-inside-loop.cwl

@@ -42,7 +42,7 @@ steps:
           out: [o1]
           requirements:
             cwltool:Loop:
-              loop_when: $(inputs.i1 <= inputs.i2)
+              loopWhen: $(inputs.i1 <= inputs.i2)
               loop:
                 i1: o1
               outputMethod: last
@@ -52,7 +52,7 @@ steps:
     out: [o1]
     requirements:
       cwltool:Loop:
-        loop_when: $(inputs.i2 < 4)
+        loopWhen: $(inputs.i2 < 4)
         loop:
           i2:
             valueFrom: $(inputs.i2 + 1)

tests/loop/loop-inside-scatter.cwl

@@ -42,7 +42,7 @@ steps:
           out: [o1]
           requirements:
             cwltool:Loop:
-              loop_when: $(inputs.i1 < 10)
+              loopWhen: $(inputs.i1 < 10)
               loop:
                 i1: o1
               outputMethod: last

tests/loop/multi-source-loop.cwl

@@ -60,9 +60,9 @@ steps:
     out: [osmall, obig]
     requirements:
       cwltool:Loop:
-        loop_when: $(inputs.i1 < 20)
+        loopWhen: $(inputs.i1 < 20)
         loop:
           i1:
-            loop_source: [osmall, obig]
+            loopSource: [osmall, obig]
             pickValue: the_only_non_null
         outputMethod: all

tests/loop/single-var-loop.cwl

@@ -27,7 +27,7 @@ steps:
     out: [o1]
     requirements:
       cwltool:Loop:
-        loop_when: $(inputs.i1 < 10)
+        loopWhen: $(inputs.i1 < 10)
         loop:
           i1: o1
         outputMethod: last