Render inheritance graph

Author: Peter Amstutz

site/cwlsite-draft3-schemas.json

@@ -5,9 +5,11 @@
             "secondaryFiles": {"$import": "draft3-deps.json"}
         },
         "context_target": "draft-3/cwl-context.json",
-        "rdfs_target": "draft-3/cwl.ttl"
+    "rdfs_target": "draft-3/cwl.ttl",
+        "graph_target": "draft-3/cwl.svg"
     }, {
         "schema_in": {$import: draft3-metaschema.json},
         "context_target": "draft-3/salad-context.json",
-        "rdfs_target": "draft-3/salad.ttl"
+        "rdfs_target": "draft-3/salad.ttl",
+        "graph_target": "draft-3/salad.svg"
     }]

site/cwlsite-v1.0.0-schemas.json

@@ -5,10 +5,12 @@
             "secondaryFiles": {"$import": "v1.0.0-deps.json"}
         },
         "context_target": "v1.0/cwl-context.json",
-        "rdfs_target": "v1.0/cwl.ttl"
+    "rdfs_target": "v1.0/cwl.ttl",
+        "graph_target": "v1.0/cwl.svg"
     }, {
         "schema_in": {$import: v1.0.0-metaschema.json},
         "context_target": "v1.0/salad-context.json",
-        "rdfs_target": "v1.0/salad.ttl"
+        "rdfs_target": "v1.0/salad.ttl",
+        "graph_target": "v1.0/salad.svg"
     }
 ]

site/cwlsite-v1.1.0-dev1-schemas.yaml

@@ -1,9 +1,11 @@
 - context_target: v1.1.0-dev1/cwl-context.json
   rdfs_target: v1.1.0-dev1/cwl.ttl
+  graph_target: v1.1.0-dev1/cwl.svg
   schema_in:
     class: File
     path: ../v1.1.0-dev1/CommonWorkflowLanguage.yml
     secondaryFiles: {$import: v1.1.0-dev1-deps.yaml}
 - context_target: v1.1.0-dev1/salad-context.json
   rdfs_target: v1.1.0-dev1/salad.ttl
+  graph_target: v1.1.0-dev1/salad.svg
   schema_in: {$import: v1.1.0-dev1-metaschema.yaml}

site/cwlsite.cwl

@@ -26,6 +26,7 @@ inputs:
           schema_in: File
           context_target: string
           rdfs_target: string
+          graph_target: string
   brandimg: File
   empty:
     type: string?
@@ -52,43 +53,44 @@ hints:
 
 steps:
   rdfs:
-    scatter: [schema, target]
-    scatterMethod: dotproduct
+    scatter: ver
     in:
-      schema: { source: schemas, valueFrom: $(self.schema_in) }
-      target: { source: schemas, valueFrom: $(self.rdfs_target) }
+      ver: schemas
+      schema: { valueFrom: $(inputs.ver.schema_in) }
+      target: { valueFrom: $(inputs.ver.rdfs_target) }
     out: [out, targetdir]
     run: makerdfs.cwl
 
   context:
-    scatter: [schema, target]
-    scatterMethod: dotproduct
+    scatter: ver
     in:
-      schema: { source: schemas, valueFrom: $(self.schema_in) }
-      target: { source: schemas, valueFrom: $(self.context_target) }
+      ver: schemas
+      schema: { valueFrom: $(inputs.ver.schema_in) }
+      target: { valueFrom: $(inputs.ver.context_target) }
     out: [out, targetdir]
     run: makecontext.cwl
 
+  inheritance:
+    scatter: ver
+    in:
+      ver: schemas
+      schema: { valueFrom: $(inputs.ver.schema_in) }
+      target: { valueFrom: $(inputs.ver.graph_target) }
+    out: [svg, targetdir]
+    run: inheritance.cwl
+
   docs:
-    scatter:
-      - source
-      - target
-      - renderlist
-      - redirect
-      - brandlink
-      - brand
-      - primtype
-      - extra
-    scatterMethod: dotproduct
+    scatter: ver
     in:
-      source: { source: render, valueFrom: $(self.source) }
-      target: { source: render, valueFrom: $(self.target) }
-      renderlist: { source: render, valueFrom: $(self.renderlist) }
-      redirect: { source: render, valueFrom: $(self.redirect) }
-      brandlink: { source: render, valueFrom: $(self.brandlink) }
-      brand: { source: render, valueFrom: $(self.brandimg) }
-      primtype: { source: render, valueFrom: $(self.primtype) }
-      extra: { source: render, valueFrom: $(self.extra) }
+      ver: render
+      source:     { valueFrom: $(inputs.ver.source) }
+      target:     { valueFrom: $(inputs.ver.target) }
+      renderlist: { valueFrom: $(inputs.ver.renderlist) }
+      redirect:   { valueFrom: $(inputs.ver.redirect) }
+      brandlink:  { valueFrom: $(inputs.ver.brandlink) }
+      brand:      { valueFrom: $(inputs.ver.brandimg) }
+      primtype:   { valueFrom: $(inputs.ver.primtype) }
+      extra:      { valueFrom: $(inputs.ver.extra) }
     out: [out, targetdir, extra_out]
     run:  makedoc.cwl
 
@@ -98,11 +100,11 @@ steps:
         source: docs/out
         valueFrom: $(self[0])
       secondary:
-        source: [docs/out, rdfs/out, context/out, brandimg, docs/extra_out]
+        source: [docs/out, rdfs/out, context/out, brandimg, docs/extra_out, inheritance/svg]
         linkMerge: merge_flattened
         valueFrom: $(self.slice(1))
       dirs:
-        source: [docs/targetdir, rdfs/targetdir, context/targetdir, empty, docs/targetdir]
+        source: [docs/targetdir, rdfs/targetdir, context/targetdir, empty, docs/targetdir, inheritance/targetdir]
         linkMerge: merge_flattened
         valueFrom: $(self.slice(1))
     out: [dir]

site/inheritance.cwl

@@ -0,0 +1,22 @@
+cwlVersion: v1.0
+class: CommandLineTool
+requirements:
+  ShellCommandRequirement: {}
+inputs:
+  schema:
+    type: File
+  target: string
+outputs:
+  svg: stdout
+  targetdir:
+    type: string
+    outputBinding:
+      outputEval: $(inputs.target.match(/^([^/]+)\/[^/]/)[1])
+stdout: $(inputs.target)
+baseCommand: schema-salad-tool
+arguments:
+  - "--print-inheritance-dot"
+  - $(inputs.schema)
+  - {valueFrom: "|", shellQuote: false}
+  - dot
+  - "-Tsvg"