Merge pull request #248 from common-workflow-language/fix/requirement_class

Fix/requirement class

Author: mr-c

draft-4/CommandLineTool.yml

@@ -611,6 +611,12 @@ $graph:
     environment as defined by Docker.
 
   fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'DockerRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
     - name: dockerPull
       type: ["null", "string"]
       doc: "Specify a Docker image to retrieve using `docker pull`."
@@ -653,6 +659,12 @@ $graph:
     namespaced. The optional `identifier` field is recommended so that users
     and platforms can distinguish between software that has the same name.
   fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'SoftwareRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
     - name: spec
       type:
         type: array
@@ -728,6 +740,12 @@ $graph:
     workflow platform in the designated output directory prior to executing the
     command line tool.
   fields:
+    - name: "class"
+      type: "string"
+      doc: "InitialWorkDirRequirement"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
     - name: listing
       type:
         - type: array
@@ -751,6 +769,12 @@ $graph:
     Define a list of environment variables which will be set in the
     execution environment of the tool.  See `EnvironmentDef` for details.
   fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'EnvVarRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
     - name: envDef
       type:
         type: "array"
@@ -772,6 +796,13 @@ $graph:
     contains `shellQuote: false`.  If `shellQuote: false` is specified, the
     argument is joined into the command string without quoting, which allows
     the use of shell metacharacters such as `|` for pipes.
+  fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'ShellCommandRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
 
 
 - type: record
@@ -800,6 +831,12 @@ $graph:
     If neither "min" nor "max" is specified for a resource, an implementation may provide a default.
 
   fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'ResourceRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
     - name: coresMin
       type: ["null", long, string, "#Expression"]
       doc: Minimum reserved number of CPU cores

draft-4/Process.yml

@@ -608,14 +608,6 @@ $graph:
     Process requirements are the primary mechanism for specifying extensions to
     the CWL core specification.
 
-  fields:
-    - name: "class"
-      type: "string"
-      doc: "The specific requirement type."
-      jsonldPredicate:
-        "_id": "@type"
-        "_type": "@vocab"
-
 
 - type: record
   name: Process
@@ -713,6 +705,12 @@ $graph:
     If this requirement is not present, the workflow platform must not perform expression
     interpolatation.
   fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'InlineJavascriptRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
     - name: expressionLib
       type:
         - "null"
@@ -736,6 +734,12 @@ $graph:
     processed in the order listed such that later schema definitions may refer
     to earlier schema definitions.
   fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'SchemaDefRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
     - name: types
       type:
         type: array

draft-4/Workflow.yml

@@ -506,24 +506,52 @@ $graph:
   doc: |
     Indicates that the workflow platform must support nested workflows in
     the `run` field of [WorkflowStep](#WorkflowStep).
+  fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'SubworkflowFeatureRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
 
 - name: ScatterFeatureRequirement
   type: record
   extends: ProcessRequirement
   doc: |
     Indicates that the workflow platform must support the `scatter` and
     `scatterMethod` fields of [WorkflowStep](#WorkflowStep).
+  fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'ScatterFeatureRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
 
 - name: MultipleInputFeatureRequirement
   type: record
   extends: ProcessRequirement
   doc: |
     Indicates that the workflow platform must support multiple inbound data links
     listed in the `source` field of [WorkflowStepInput](#WorkflowStepInput).
+  fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'MultipleInputFeatureRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"
 
 - type: record
   name: StepInputExpressionRequirement
   extends: ProcessRequirement
   doc: |
     Indicate that the workflow platform must support the `valueFrom` field
     of [WorkflowStepInput](#WorkflowStepInput).
+  fields:
+    - name: "class"
+      type: "string"
+      doc: "Always 'StepInputExpressionRequirement'"
+      jsonldPredicate:
+        "_id": "@type"
+        "_type": "@vocab"