fix loadContents for File[] (#2036)

Author: fmigneault

.gitignore

@@ -1,6 +1,8 @@
 # Generated during tests
 pytestdebug.log
 tmp/
+*.sif
+involucro
 
 # Python temps
 __pycache__/
@@ -59,4 +61,3 @@ cwltool/_version.py
 cwltool_deps
 docs/_build/
 docs/autoapi/
-

cwltool/builder.py

@@ -282,7 +282,7 @@ def bind_input(
                 and "itemSeparator" not in binding
             ):
                 st["inputBinding"] = {}
-            for k in ("secondaryFiles", "format", "streamable"):
+            for k in ("secondaryFiles", "format", "streamable", "loadContents"):
                 if k in schema:
                     st[k] = schema[k]
             if value_from_expression:
@@ -349,7 +349,7 @@ def bind_input(
                         "type": schema["items"],
                         "inputBinding": b2,
                     }
-                    for k in ("secondaryFiles", "format", "streamable"):
+                    for k in ("secondaryFiles", "format", "streamable", "loadContents"):
                         if k in schema:
                             itemschema[k] = schema[k]
                     bindings.extend(

tests/load_contents-1.txt

@@ -0,0 +1 @@
+1

tests/load_contents-2.txt

@@ -0,0 +1 @@
+2

tests/load_contents-array.cwl

@@ -0,0 +1,24 @@
+cwlVersion: "v1.2"
+class: CommandLineTool
+baseCommand: echo
+requirements:
+  InlineJavascriptRequirement: {}
+inputs:
+  files:
+    type:
+      type: array
+      items: File
+    loadContents: true
+    inputBinding:
+      valueFrom: |
+        ${
+          return JSON.stringify({
+            "data": inputs.files.map(item => parseInt(item.contents))
+          });
+        }
+outputs:
+  out:
+    type: File
+    outputBinding:
+      glob: "data.json"
+stdout: "data.json"

tests/load_contents-array.yml

@@ -0,0 +1,5 @@
+files:
+  - class: File
+    path: load_contents-1.txt
+  - class: File
+    path: load_contents-2.txt

tests/test_load_contents.py

@@ -0,0 +1,22 @@
+"""Test the loadContents feature."""
+
+import json
+from pathlib import Path
+
+from cwltool.main import main
+
+from .util import get_data
+
+
+def test_load_contents_file_array(tmp_path: Path) -> None:
+    """Ensures that a File[] input with loadContents loads each file."""
+    params = [
+        "--outdir",
+        str(tmp_path),
+        get_data("tests/load_contents-array.cwl"),
+        str(Path(__file__) / "../load_contents-array.yml"),
+    ]
+    assert main(params) == 0
+    with open(tmp_path / "data.json") as out_fd:
+        data = json.load(out_fd)
+    assert data == {"data": [1, 2]}