Add Defaultable for CommandInputRecordField

Process.yml

@@ -61,6 +61,23 @@ $graph:
       jsonldPredicate: "rdfs:label"
       doc: "A short, human-readable label of this object."
 
+- name: Defaultable
+  type: record
+  abstract: true
+  fields:
+    - name: default
+      type: CWLObjectType?
+      jsonldPredicate:
+        _id: "sld:default"
+        _container: "@list"
+        noLinkCheck: true
+      doc: |
+        The default value for this parameter.  When it occurs in a CommandLineTool,
+        it is used if the parameter is missing from the input object, or if the value
+        of the parameter in the input object is `null`.  When it occurs in a Workflow,
+        it is used if there is no `source` field, or the value produced by the `source`
+        is `null`.  Default values are applied before scattering or evaluating expressions
+        (e.g. dependent `valueFrom` fields).
 
 - name: Identified
   type: record
@@ -286,7 +303,7 @@ $graph:
 
 - name: InputRecordField
   type: record
-  extends: [CWLRecordField, FieldBase, InputFormat, LoadContents]
+  extends: [CWLRecordField, FieldBase, InputFormat, LoadContents, Defaultable]
   specialize:
     - specializeFrom: CWLRecordSchema
       specializeTo: InputRecordSchema
@@ -372,19 +389,7 @@ $graph:
 - name: InputParameter
   type: record
   abstract: true
-  extends: [Parameter, InputFormat, LoadContents]
-  fields:
-    - name: default
-      type: CWLObjectType?
-      jsonldPredicate:
-        _id: "sld:default"
-        _container: "@list"
-        noLinkCheck: true
-      doc: |
-        The default value to use for this parameter if the parameter is missing
-        from the input object, or if the value of the parameter in the input
-        object is `null`.  Default values are applied before evaluating expressions
-        (e.g. dependent `valueFrom` fields).
+  extends: [Parameter, InputFormat, LoadContents, Defaultable]
 
 
 - name: OutputParameter

Workflow.yml

@@ -274,7 +274,7 @@ $graph:
 
 - type: record
   name: WorkflowStepInput
-  extends: [Identified, InputSink, LoadContents, Labeled]
+  extends: [Identified, InputSink, LoadContents, Labeled, Defaultable]
   docParent: "#WorkflowStep"
   doc: |
     The input of a workflow step connects an upstream parameter (from the
@@ -387,16 +387,6 @@ $graph:
        should be filtered out.
 
   fields:
-    - name: default
-      type: CWLObjectType?
-      doc: |
-        The default value for this parameter to use if either there is no
-        `source` field, or the value produced by the `source` is `null`.  The
-        default must be applied prior to scattering or evaluating `valueFrom`.
-      jsonldPredicate:
-        _id: "sld:default"
-        _container: "@list"
-        noLinkCheck: true
     - name: valueFrom
       type:
         - "null"

conformance_tests.yaml

@@ -3525,3 +3525,12 @@
       an_array_of_mixed_booleans: [ false, true, false ]
       an_array_of_trues: [ true, true, true ]
       an_int: 42
+
+- id: record_default_field
+  job: tests/empty.json
+  tool: tests/record-default-field.cwl
+  doc: handling default value in fields of a record object
+  tags: [ required, command_line_tool ]
+  output:
+    v1: f1
+    v2: f2

tests/record-default-field.cwl

@@ -0,0 +1,23 @@
+cwlVersion: v1.3.0-dev1
+class: CommandLineTool
+inputs:
+  record_input:
+    type:
+      type: record
+      fields:
+        f1:
+          type: string
+          default: "f1"
+        f2:
+          type: string
+          default: "f2"
+arguments: ['true']
+outputs:
+    v1:
+        type: string
+        outputBinding:
+            outputEval: $(inputs.record_input.f1)
+    v2:
+        type: string
+        outputBinding:
+            outputEval: $(inputs.record_input.f2)