Merge pull request #229 from VisLab/update-tokenizer

Completed implementation of HED validator

bids/schema.js

@@ -2,7 +2,7 @@ import castArray from 'lodash/castArray'
 import semver from 'semver'
 
 import { buildSchemas } from '../schema/init'
-import { generateIssue, IssueError } from '../common/issues/issues'
+import { IssueError } from '../common/issues/issues'
 import { SchemaSpec, SchemasSpec } from '../schema/specs'
 
 const alphabeticRegExp = new RegExp('^[a-zA-Z]+$')

bids/types/basic.js

@@ -1,4 +1,5 @@
 import { BidsHedIssue } from './issues'
+import { generateIssue } from '../../common/issues/issues'
 
 /**
  * A BIDS file.
@@ -36,15 +37,27 @@ export class BidsFile {
     return false
   }
 
-  validate(hedSchemas) {
+  /**
+   * Validate this validator's tsv file
+   *
+   * @param {Schemas} schemas
+   * @returns {BidsIssue[]} Any issues found during validation of this TSV file.
+   */
+  validate(schemas) {
     if (!this.hasHedData()) {
       return []
-    } else if (hedSchemas === null) {
-      return null
+    }
+    if (!schemas) {
+      BidsHedIssue.fromHedIssue(
+        generateIssue('genericError', {
+          message: 'BIDS file HED validation requires a HED schema, but the schema received was null.',
+        }),
+        { path: this.file.file, relativePath: this.file.file },
+      )
     }
 
     try {
-      const validator = new this.validatorClass(this, hedSchemas)
+      const validator = new this.validatorClass(this, schemas)
       return validator.validate()
     } catch (internalError) {
       return BidsHedIssue.fromHedIssues(internalError, this.file)

bids/types/dataset.js

@@ -1,5 +1,3 @@
-import { fallbackDatasetDescription } from './json'
-
 export class BidsDataset {
   /**
    * The dataset's event file data.
@@ -22,7 +20,7 @@ export class BidsDataset {
    */
   datasetRootDirectory
 
-  constructor(eventData, sidecarData, datasetDescription = fallbackDatasetDescription, datasetRootDirectory = null) {
+  constructor(eventData, sidecarData, datasetDescription, datasetRootDirectory = null) {
     this.eventData = eventData
     this.sidecarData = sidecarData
     this.datasetDescription = datasetDescription

bids/types/issues.js

@@ -38,7 +38,7 @@ export class BidsIssue {
    * Determine if any of the passed issues are errors.
    *
    * @param {BidsIssue[]} issues A list of issues.
-   * @return {boolean} Whether any of the passed issues are errors (rather than warnings).
+   * @returns {boolean} Whether any of the passed issues are errors (rather than warnings).
    */
   static anyAreErrors(issues) {
     return issues.some((issue) => issue.isError())