Merge pull request #1009 from bids-standard/1008_add_datasettype_to_dsdesc

add DataType to dataset_description.json schema

Author: rwblair

bids-validator/tests/json.spec.js

@@ -306,4 +306,46 @@ describe('JSON', function() {
       assert(issues.length === 1 && issues[0].code == 55)
     })
   })
+
+  var dataset_description_file = {
+    name: 'dataset_description.json',
+    relativePath: '/dataset_description.json',
+  }
+
+  it('dataset_description.json should validate with enum of DatasetType', function() {
+    var jsonObj = {
+      Name: 'Example Name',
+      BIDSVersion: '1.4.0',
+      Authors: ['example author'],
+      DatasetType: 'raw',
+    }
+    jsonDict[dataset_description_file.relativePath] = jsonObj
+    validate.JSON(dataset_description_file, jsonDict, function(issues) {
+      assert(issues.length === 0)
+    })
+  })
+
+  it('dataset_description.json should NOT validate with wrong enum of DatasetType', function() {
+    var jsonObj = {
+      Name: 'Example Name',
+      BIDSVersion: '1.4.0',
+      Authors: ['example author'],
+      DatasetType: 'badenum',
+    }
+    jsonDict[dataset_description_file.relativePath] = jsonObj
+    validate.JSON(dataset_description_file, jsonDict, function(issues) {
+      assert(issues.length === 1 && issues[0].code == 55)
+    })
+  })
+
+  it('dataset_description.json should validate with only required fields, no recommended', function() {
+    var jsonObj = {
+      Name: 'Example Name',
+      BIDSVersion: '1.4.0',
+    }
+    jsonDict[dataset_description_file.relativePath] = jsonObj
+    validate.JSON(dataset_description_file, jsonDict, function(issues) {
+      assert(issues.length === 0)
+    })
+  })
 })

bids-validator/validators/json/schemas/dataset_description.json

@@ -44,6 +44,10 @@
     "DatasetDOI": {
       "type": "string"
     },
+    "DatasetType": {
+      "type": "string",
+      "enum": ["raw", "derivative"]
+    },
     "Genetics": {
       "type": "object",
       "properties": {