diff --git a/site/cwlsite-draft3-job.json b/site/cwlsite-draft3-job.json index 9f332f9f..2f38df85 100644 --- a/site/cwlsite-draft3-job.json +++ b/site/cwlsite-draft3-job.json @@ -9,7 +9,7 @@ "brandlink": "../index.html", "brandimg": "", "primtype": null, - "extra": { "class": "File", "path": "empty" } + "extra": [] }, { "source": { @@ -26,7 +26,7 @@ "brandlink": "index.html", "brandimg": "", "primtype": "#CWLType", - "extra": { "class": "File", "path": "empty" } + "extra": [] }, { "source": { @@ -50,7 +50,7 @@ "brandlink": "index.html", "brandimg": "", "primtype": "#CWLType", - "extra": { "class": "File", "path": "empty" } + "extra": [] }, { "source": {$import: draft3-metaschema.json}, @@ -65,6 +65,6 @@ "brandlink": "index.html", "brandimg": "", "primtype": null, - "extra": { "class": "File", "path": "empty" } + "extra": [] } ] diff --git a/site/cwlsite-v1.0.0-job.json b/site/cwlsite-v1.0.0-job.json index 16258f03..6a798fc6 100644 --- a/site/cwlsite-v1.0.0-job.json +++ b/site/cwlsite-v1.0.0-job.json @@ -9,7 +9,7 @@ "brandlink": "../index.html", "brandimg": "", "primtype": null, - "extra": { "class": "File", "path": "empty" } + "extra": [] }, { "source": { @@ -26,7 +26,7 @@ "brandlink": "index.html", "brandimg": "", "primtype": "#CWLType", - "extra": { "class": "File", "path": "empty" } + "extra": [] }, { "source": { @@ -50,7 +50,7 @@ "brandlink": "index.html", "brandimg": "", "primtype": "#CWLType", - "extra": { "class": "File", "path": "empty" } + "extra": [] }, { "source": {$import: v1.0.0-metaschema.json}, @@ -65,7 +65,7 @@ "brandlink": "index.html", "brandimg": "", "primtype": null, - "extra": { "class": "File", "path": "empty" } + "extra": [] } ] diff --git a/site/cwlsite-v1.1.0-job.yaml b/site/cwlsite-v1.1.0-job.yaml index 1e3baa37..df582574 100644 --- a/site/cwlsite-v1.1.0-job.yaml +++ b/site/cwlsite-v1.1.0-job.yaml @@ -6,7 +6,7 @@ renderlist: [] source: {class: File, path: ../v1.1/index.md} target: v1.1/index.html - extra: {class: File, path: empty} + extra: [] - brandimg: '' brandlink: index.html @@ -19,8 +19,8 @@ secondaryFiles: {$import: v1.1.0-deps.yaml} target: v1.1/CommandLineTool.html extra: - class: File - path: ../v1.1/cwl-runner.cwl + - class: File + path: ../v1.1/cwl-runner.cwl - brandimg: '' brandlink: index.html @@ -37,7 +37,7 @@ path: ../v1.1/CommonWorkflowLanguage.yml secondaryFiles: {$import: v1.1.0-deps.yaml} target: v1.1/Workflow.html - extra: {class: File, path: empty} + extra: [] - brandimg: '' brandlink: index.html @@ -48,4 +48,4 @@ 'https://w3id.org/cwl/salad#Documentation'] source: {$import: v1.1.0-metaschema.yaml} target: v1.1/SchemaSalad.html - extra: {class: File, path: empty} + extra: [] diff --git a/site/cwlsite-v1.2-job.yaml b/site/cwlsite-v1.2-job.yaml index 905b444f..7fad56d8 100644 --- a/site/cwlsite-v1.2-job.yaml +++ b/site/cwlsite-v1.2-job.yaml @@ -6,7 +6,7 @@ renderlist: [] source: {class: File, path: ../v1.2/index.md} target: v1.2/index.html - extra: {class: File, path: empty} + extra: [] - brandimg: '' brandlink: index.html @@ -19,8 +19,11 @@ secondaryFiles: {$import: v1.2-deps.yaml} target: v1.2/CommandLineTool.html extra: - class: File - path: ../v1.2/cwl-runner.cwl + - class: File + path: ../v1.2/cwl-runner.cwl + - class: File + basename: cwl-json-schema.yaml + path: ../v1.2/json-schema/cwl.yaml - brandimg: '' brandlink: index.html @@ -37,7 +40,7 @@ path: ../v1.2/CommonWorkflowLanguage.yml secondaryFiles: {$import: v1.2-deps.yaml} target: v1.2/Workflow.html - extra: {class: File, path: empty} + extra: [] - brandimg: '' brandlink: index.html @@ -48,4 +51,4 @@ 'https://w3id.org/cwl/salad#Documentation'] source: {$import: v1.2-metaschema.yaml} target: v1.2/SchemaSalad.html - extra: {class: File, path: empty} + extra: [] diff --git a/site/cwlsite-v1.3-job.yaml b/site/cwlsite-v1.3-job.yaml index 13070669..b3c29250 100644 --- a/site/cwlsite-v1.3-job.yaml +++ b/site/cwlsite-v1.3-job.yaml @@ -6,7 +6,7 @@ renderlist: [] source: {class: File, path: ../v1.3/index.md} target: v1.3/index.html - extra: {class: File, path: empty} + extra: [] - brandimg: '' brandlink: index.html @@ -19,8 +19,8 @@ secondaryFiles: {$import: v1.3-deps.yaml} target: v1.3/CommandLineTool.html extra: - class: File - path: ../v1.3/cwl-runner.cwl + - class: File + path: ../v1.3/cwl-runner.cwl - brandimg: '' brandlink: index.html @@ -37,7 +37,7 @@ path: ../v1.3/CommonWorkflowLanguage.yml secondaryFiles: {$import: v1.3-deps.yaml} target: v1.3/Workflow.html - extra: {class: File, path: empty} + extra: [] - brandimg: '' brandlink: index.html @@ -48,4 +48,4 @@ 'https://w3id.org/cwl/salad#Documentation'] source: {$import: v1.3-metaschema.yaml} target: v1.3/SchemaSalad.html - extra: {class: File, path: empty} + extra: [] diff --git a/site/cwlsite.cwl b/site/cwlsite.cwl index 240bedd6..e34be380 100755 --- a/site/cwlsite.cwl +++ b/site/cwlsite.cwl @@ -25,7 +25,7 @@ inputs: brandlink: string brandimg: string primtype: string? - extra: File + extra: File[] schemas: type: type: array diff --git a/site/makedoc.cwl b/site/makedoc.cwl index f39fdd3e..eab5e4eb 100755 --- a/site/makedoc.cwl +++ b/site/makedoc.cwl @@ -41,7 +41,7 @@ inputs: primtype: type: string? inputBinding: {prefix: "--primtype"} - extra: File + extra: File[] baseCommand: schema-salad-doc stdout: $(inputs.target) outputs: @@ -58,6 +58,6 @@ outputs: return ""; } extra_out: - type: File + type: File[] outputBinding: outputEval: $(inputs.extra) diff --git a/site/mergesecondary.cwl b/site/mergesecondary.cwl index b4fb323d..0484f09f 100755 --- a/site/mergesecondary.cwl +++ b/site/mergesecondary.cwl @@ -6,7 +6,11 @@ inputs: secondary: type: type: array - items: [File, Directory] + items: + - File + - type: array + items: File + - Directory dirs: string[] expression: | ${ @@ -19,7 +23,7 @@ expression: | inputs.primary.secondaryFiles.push({ class: "Directory", basename: inputs.dirs[i], - listing: [k] + listing: Array.isArray(k) ? k: [k] }); } else { inputs.primary.secondaryFiles.push(k);