Added flatten field to CWLObjectType array

common-workflow-language · Feb 17, 2023 · 7ab983b · 7ab983b
1 parent a4d962d
commit 7ab983b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Base.yml b/Base.yml
@@ -400,7 +400,6 @@ $graph:
 - name: CWLObjectType
   type: union
   names:
-    - "null"
     - boolean
     - int
     - long
@@ -410,9 +409,14 @@ $graph:
     - File
     - Directory
     - type: array
-      items: CWLObjectType
+      items:
+        - "null"
+        - CWLObjectType
+      flatten: false
     - type: map
-      values: CWLObjectType
+      values:
+        - "null"
+        - CWLObjectType
   doc: |
     Generic type representing a valid CWL object. It is used to represent
     `default` values passed to CWL `InputParameter` and `WorkflowStepInput`

diff --git a/Process.yml b/Process.yml
@@ -372,7 +372,7 @@ $graph:
   extends: [Parameter, InputFormat, LoadContents]
   fields:
     - name: default
-      type: CWLObjectType
+      type: CWLObjectType?
       jsonldPredicate:
         _id: sld:default
         noLinkCheck: true

diff --git a/Workflow.yml b/Workflow.yml
@@ -419,7 +419,7 @@ $graph:
 
   fields:
     - name: default
-      type: CWLObjectType
+      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
@@ -814,8 +814,9 @@ $graph:
 - name: CWLInputFile
   type: map
   values:
+   - "null"
    - type: array
      items: ProcessRequirement
    - CWLObjectType
   doc: |
-    Type representing a valid CWL input file as a `map<string, CWLObjectType>`.
+    Type representing a valid CWL input file as a `map<string, union<array<ProcessRequirement>, CWLObjectType>>`.