From fc990471f1b6883fd474242a5b57dbf5e8f30a22 Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Wed, 2 Dec 2020 10:40:37 +0100
Subject: [PATCH 1/3] some defaults should not be set using 'default'

To implement the slightly complicated default value rules for
ResourceRequirement
---
 CommandLineTool.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CommandLineTool.yml b/CommandLineTool.yml
index a91c2443..0e9b881c 100644
--- a/CommandLineTool.yml
+++ b/CommandLineTool.yml
@@ -1138,6 +1138,10 @@ $graph:
         "_type": "@vocab"
     - name: coresMin
       type: ["null", long, float, Expression]
+      # default: 1
+      # Don't set the default here, we need to be able to distinguish between
+      # a value not provided and the textual default to be able to implement
+      # the rules written in the ResourceRequirement doc above
       doc: |
         Minimum reserved number of CPU cores (default is 1).
 
@@ -1174,6 +1178,12 @@ $graph:
 
     - name: ramMin
       type: ["null", long, float, Expression]
+      # default: 256
+      # Don't set the default here, we need to be able to distinguish between
+      # a value not provided and the textual default to be able to implement
+      # the rules written in the ResourceRequirement doc above.
+      # Consumers of ResourceRequirement must apply the default value algorithm
+      # themselves and not rely on schema-salad rules
       doc: |
         Minimum reserved RAM in mebibytes (2**20) (default is 256)
 
@@ -1192,6 +1202,12 @@ $graph:
 
     - name: tmpdirMin
       type: ["null", long, float, Expression]
+      # default: 1024
+      # Don't set the default here, we need to be able to distinguish between
+      # a value not provided and the textual default to be able to implement
+      # the rules written in the ResourceRequirement doc above
+      # Consumers of ResourceRequirement must apply the default value algorithm
+      # themselves and not rely on schema-salad rules
       doc: |
         Minimum reserved filesystem based storage for the designated temporary directory, in mebibytes (2**20) (default is 1024)
 
@@ -1210,6 +1226,12 @@ $graph:
 
     - name: outdirMin
       type: ["null", long, float, Expression]
+      # default: 1024
+      # Don't set the default here, we need to be able to distinguish between
+      # a value not provided and the textual default to be able to implement
+      # the rules written in the ResourceRequirement doc above
+      # Consumers of ResourceRequirement must apply the default value algorithm
+      # themselves and not rely on schema-salad rules
       doc: |
         Minimum reserved filesystem based storage for the designated output directory, in mebibytes (2**20) (default is 1024)
 

From bdf32cad5f64279d7833ee56894f48b071ddd86c Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Thu, 17 Dec 2020 09:58:46 +0100
Subject: [PATCH 2/3] InputBinding.position default is 0.

---
 CommandLineTool.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CommandLineTool.yml b/CommandLineTool.yml
index 0e9b881c..b83cf439 100644
--- a/CommandLineTool.yml
+++ b/CommandLineTool.yml
@@ -180,10 +180,12 @@ $graph:
   fields:
     - name: position
       type: [ "null", int, Expression ]
+      default: 0
       doc: |
-        The sorting key.  Default position is 0. If the inputBinding is
-        associated with an input parameter, then the value of `self` in the
-        expression will be the value of the input parameter.  Input parameter
+        The sorting key.  Default position is 0. If a [CWL Parameter Reference](#Parameter_references)
+        or [CWL Expression](#Expressions_(Optional)) is used and if the
+        inputBinding is associated with an input parameter, then the value of
+        `self` will be the value of the input parameter.  Input parameter
         defaults (as specified by the `InputParameter.default` field) must be
         applied before evaluating the expression. Expressions must return a
         single value of type int or a null.

From 967525fadb0b33c699d324703eb7ccfddd96828c Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Thu, 17 Dec 2020 09:58:56 +0100
Subject: [PATCH 3/3] File.streamable default is false.

---
 Process.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Process.yml b/Process.yml
index cc8a9f50..496d0594 100644
--- a/Process.yml
+++ b/Process.yml
@@ -558,6 +558,7 @@ $graph:
 
     streamable:
       type: boolean?
+      default: false
       doc: |
         Only valid when `type: File` or is an array of `items: File`.