Minor cleanup and change of bids/validator class names back

bids/index.js

@@ -4,8 +4,8 @@ import { BidsJsonFile, BidsSidecar } from './types/json'
 import { BidsEventFile, BidsTabularFile, BidsTsvFile } from './types/tsv'
 import BidsDataset from './types/dataset'
 import { BidsHedIssue, BidsIssue } from './types/issues'
-import SidecarValidator from './validator/sidecarValidator'
-import TsvValidator from './validator/tsvValidator'
+import BidsHedSidecarValidator from './validator/sidecarValidator'
+import BidsHedTsvValidator from './validator/tsvValidator'
 
 export {
   BidsDataset,
@@ -16,8 +16,8 @@ export {
   BidsSidecar,
   BidsIssue,
   BidsHedIssue,
-  SidecarValidator,
-  TsvValidator,
+  BidsHedSidecarValidator,
+  BidsHedTsvValidator,
   buildBidsSchemas,
   validateBidsDataset,
 }
@@ -31,8 +31,8 @@ export default {
   BidsSidecar,
   BidsIssue,
   BidsHedIssue,
-  BidsHedSidecarValidator: SidecarValidator,
-  BidsHedTsvValidator: TsvValidator,
+  BidsHedSidecarValidator: BidsHedSidecarValidator,
+  BidsHedTsvValidator: BidsHedTsvValidator,
   buildBidsSchemas,
   validateBidsDataset,
 }

bids/types/json.js

@@ -4,7 +4,7 @@ import { sidecarValueHasHed } from '../utils'
 import { parseHedString } from '../../parser/parser'
 import ParsedHedString from '../../parser/parsedHedString'
 import { BidsFile } from './basic'
-import SidecarValidator from '../validator/sidecarValidator'
+import BidsHedSidecarValidator from '../validator/sidecarValidator'
 import { IssueError } from '../../common/issues/issues'
 
 const ILLEGAL_SIDECAR_KEYS = new Set(['hed', 'n/a'])
@@ -20,7 +20,7 @@ export class BidsJsonFile extends BidsFile {
   jsonData
 
   constructor(name, jsonData, file) {
-    super(name, file, SidecarValidator)
+    super(name, file, BidsHedSidecarValidator)
     this.jsonData = jsonData
   }
 }

bids/types/tsv.js

@@ -4,7 +4,7 @@ import { BidsFile } from './basic'
 import { convertParsedTSVData, parseTSV } from '../tsvParser'
 import { BidsSidecar } from './json'
 import ParsedHedString from '../../parser/parsedHedString'
-import TsvValidator from '../validator/tsvValidator'
+import BidsHedTsvValidator from '../validator/tsvValidator'
 import { IssueError } from '../../common/issues/issues'
 
 /**
@@ -49,7 +49,7 @@ export class BidsTsvFile extends BidsFile {
    * @param {object} mergedDictionary The merged sidecar data.
    */
   constructor(name, tsvData, file, potentialSidecars = [], mergedDictionary = {}) {
-    super(name, file, TsvValidator)
+    super(name, file, BidsHedTsvValidator)
 
     if (typeof tsvData === 'string') {
       this.parsedTsv = parseTSV(tsvData)

bids/validator/sidecarValidator.js

@@ -7,7 +7,7 @@ import { generateIssue, IssueError } from '../../common/issues/issues'
 /**
  * Validator for HED data in BIDS JSON sidecars.
  */
-export class SidecarValidator {
+export class BidsHedSidecarValidator {
   /**
    * The BIDS sidecar being validated.
    * @type {BidsSidecar}
@@ -143,4 +143,4 @@ export class SidecarValidator {
   }
 }
 
-export default SidecarValidator
+export default BidsHedSidecarValidator

bids/validator/tsvValidator.js

@@ -1,4 +1,4 @@
-import SidecarValidator from './sidecarValidator'
+import BidsHedSidecarValidator from './sidecarValidator'
 import { BidsHedIssue, BidsIssue } from '../types/issues'
 import { BidsTsvEvent, BidsTsvRow } from '../types/tsv'
 import { parseHedString } from '../../parser/parser'
@@ -12,7 +12,7 @@ import { validateHedString } from '../../validator/event/init'
 /**
  * Validator for HED data in BIDS TSV files.
  */
-export class TsvValidator {
+export class BidsHedTsvValidator {
   /**
    * The BIDS TSV file being validated.
    * @type {BidsTsvFile}
@@ -55,7 +55,10 @@ export class TsvValidator {
     if (BidsIssue.anyAreErrors(parsingIssues)) {
       return this.issues
     }
-    const curlyBraceIssues = new SidecarValidator(this.tsvFile.mergedSidecar, this.hedSchemas).validateCurlyBraces()
+    const curlyBraceIssues = new BidsHedSidecarValidator(
+      this.tsvFile.mergedSidecar,
+      this.hedSchemas,
+    ).validateCurlyBraces()
     const hedColumnIssues = this._validateHedColumn()
     this.issues.push(...curlyBraceIssues, ...hedColumnIssues)
     if (BidsIssue.anyAreErrors(this.issues)) {
@@ -383,4 +386,4 @@ export class BidsHedTsvParser {
   }
 }
 
-export default TsvValidator
+export default BidsHedTsvValidator