Using Dirent.

Author: Peter Amstutz

draft-4/CommandLineTool.yml

@@ -639,11 +639,12 @@ $graph:
     template.
   fields:
     - name: entryname
-      type: [string, Expression]
+      type: ["null", string, Expression]
       jsonldPredicate:
         _id: cwl:entryname
       doc: |
         The name of the file or subdirectory to create in the output directory.
+        If `entry` is a File or Directory, this overrides `basename`.  Optional.
     - name: entry
       type: [string, Expression]
       jsonldPredicate:

draft-4/draft-4/rename.cwl

@@ -4,9 +4,7 @@ baseCommand: "true"
 requirements:
   InitialWorkDirRequirement:
     listing:
-      - class: File
-        basename: $(inputs.newname)
-        location: $(inputs.srcfile.location)
+      $(inputs.newname): $(inputs.srcfile.location)
 inputs:
   srcfile: File
   newname: string

draft-4/draft-4/search.cwl

@@ -9,7 +9,7 @@ $graph:
   requirements:
     - class: InitialWorkDirRequirement
       listing:
-        - $(inputs.file)
+        input.txt: $(inputs.file)
     - class: InlineJavascriptRequirement
 
   inputs:

draft-4/draft-4/stagefile.cwl

@@ -3,8 +3,7 @@ cwlVersion: draft-4.dev3
 requirements:
   InitialWorkDirRequirement:
     listing:
-      - class: File
-        location: $(inputs.infile.location)
+      - entry: $(inputs.infile)
         writable: true
 inputs:
   infile: File

draft-4/draft-4/template-tool.cwl

@@ -10,9 +10,7 @@ requirements:
       - "var t = function(s) { return _.template(s)({'inputs': inputs}); };"
   - class: InitialWorkDirRequirement
     listing:
-      - class: File
-        basename: foo.txt
-        contents: $(t("The file is <%= inputs.file1.path.split('/').slice(-1)[0] %>\n"))
+      foo.txt: $(t("The file is <%= inputs.file1.path.split('/').slice(-1)[0] %>\n"))
 inputs:
   - id: file1
     type: File