Skip to content

Commit ffaa14d

Browse files
author
Peter Amstutz
committed
Introduce draft3-dev5. Moves secondaryFiles out of Binding up one level to
Schema.
1 parent 4ec03d4 commit ffaa14d

File tree

5 files changed

+213
-111
lines changed

5 files changed

+213
-111
lines changed

draft-3/CommandLineTool.yml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ $graph:
128128

129129
- type: record
130130
name: CommandLineBinding
131-
extends: "#Binding"
131+
extends: "#InputBinding"
132132
doc: |
133133
134134
When listed under `inputBinding` in the input schema, the term
@@ -207,7 +207,7 @@ $graph:
207207
208208
- type: record
209209
name: CommandOutputBinding
210-
extends: "#Binding"
210+
extends: "#OutputBinding"
211211
doc: |
212212
Describes how to generate an output parameter based on the files produced
213213
by a CommandLineTool.
@@ -231,19 +231,30 @@ $graph:
231231
pathname matching. If provided an array, find files that match any
232232
pattern in the array. If provided an expression, the expression must
233233
return a string or an array of strings, which will then be evaluated as
234-
one or more glob patterns. Only files which actually exist will be
235-
matched and returned.
234+
one or more glob patterns. Must only match and return files which
235+
actually exist.
236+
- name: loadContents
237+
type:
238+
- "null"
239+
- boolean
240+
jsonldPredicate: "cwl:loadContents"
241+
doc: |
242+
For each file matched in `glob`, read up to
243+
the first 64 KiB of text from the file and place it in the `contents`
244+
field of the file object for manipulation by `outputEval`.
236245
- name: outputEval
237246
type:
238247
- "null"
239248
- string
240249
- "#Expression"
241250
doc: |
242251
Evaluate an expression to generate the output value. If `glob` was
243-
specified, the value of `self` must be an array containing any files
244-
that were matched. Additionally, if `loadContents` is `true`, the File
245-
objects will include up to the first 64 KiB of file contents in the
246-
`contents` field.
252+
specified, the value of `self` must be an array containing file objects
253+
that were matched. If no files were matched, `self' must be a zero
254+
length array; if a single file was matched, the value of `self` is an
255+
array of a single element. Additionally, if `loadContents` is `true`,
256+
the File objects must include up to the first 64 KiB of file contents
257+
in the `contents` field.
247258
248259
249260
- name: CommandInputRecordField
@@ -256,7 +267,7 @@ $graph:
256267
specializeTo: "#CommandInputEnumSchema"
257268
- specializeFrom: "#InputArraySchema"
258269
specializeTo: "#CommandInputArraySchema"
259-
- specializeFrom: "#Binding"
270+
- specializeFrom: "#InputBinding"
260271
specializeTo: "#CommandLineBinding"
261272

262273

@@ -272,7 +283,7 @@ $graph:
272283
type: record
273284
extends: "#InputEnumSchema"
274285
specialize:
275-
- specializeFrom: "#Binding"
286+
- specializeFrom: "#InputBinding"
276287
specializeTo: "#CommandLineBinding"
277288

278289

@@ -286,7 +297,7 @@ $graph:
286297
specializeTo: "#CommandInputEnumSchema"
287298
- specializeFrom: "#InputArraySchema"
288299
specializeTo: "#CommandInputArraySchema"
289-
- specializeFrom: "#Binding"
300+
- specializeFrom: "#InputBinding"
290301
specializeTo: "#CommandLineBinding"
291302

292303

@@ -300,7 +311,7 @@ $graph:
300311
specializeTo: "#CommandOutputEnumSchema"
301312
- specializeFrom: "#OutputArraySchema"
302313
specializeTo: "#CommandOutputArraySchema"
303-
- specializeFrom: "#Binding"
314+
- specializeFrom: "#OutputBinding"
304315
specializeTo: "#CommandOutputBinding"
305316

306317

@@ -322,7 +333,7 @@ $graph:
322333
specializeTo: "#CommandOutputEnumSchema"
323334
- specializeFrom: "#OutputArraySchema"
324335
specializeTo: "#CommandOutputArraySchema"
325-
- specializeFrom: "#Binding"
336+
- specializeFrom: "#OutputBinding"
326337
specializeTo: "#CommandOutputBinding"
327338

328339

@@ -336,7 +347,7 @@ $graph:
336347
specializeTo: "#CommandOutputEnumSchema"
337348
- specializeFrom: "#OutputArraySchema"
338349
specializeTo: "#CommandOutputArraySchema"
339-
- specializeFrom: "#Binding"
350+
- specializeFrom: "#OutputBinding"
340351
specializeTo: "#CommandOutputBinding"
341352

342353

@@ -351,7 +362,7 @@ $graph:
351362
specializeTo: "#CommandInputEnumSchema"
352363
- specializeFrom: "#InputArraySchema"
353364
specializeTo: "#CommandInputArraySchema"
354-
- specializeFrom: "#Binding"
365+
- specializeFrom: "#InputBinding"
355366
specializeTo: "#CommandLineBinding"
356367

357368

@@ -366,7 +377,7 @@ $graph:
366377
specializeTo: "#CommandOutputEnumSchema"
367378
- specializeFrom: "#OutputArraySchema"
368379
specializeTo: "#CommandOutputArraySchema"
369-
- specializeFrom: "#Binding"
380+
- specializeFrom: "#OutputBinding"
370381
specializeTo: "#CommandOutputBinding"
371382

372383

0 commit comments

Comments
 (0)